0
@@ -21,9 +21,9 @@
0
 #define SHOES_GTK_INVISIBLE_CHAR (gunichar)0x2022
0
 
0
 static VALUE
0
-shoes_make_font_list(FcFontSet *fonts)
0
+shoes_make_font_list(FcFontSet *fonts, VALUE ary)
0
 {
0
-  VALUE ary = rb_ary_new();
0
+  int i = 0;
0
   for (i = 0; i < fonts->nfont; i++)
0
   {
0
     FcValue val;
0
@@ -31,27 +31,32 @@ shoes_make_font_list(FcFontSet *fonts)
0
     if (FcPatternGet(p, FC_FAMILY, 0, &val) == FcResultMatch)
0
       rb_ary_push(ary, rb_str_new2(val.u.s));
0
   }
0
+  rb_funcall(ary, rb_intern("sort!"), 0);
0
   return ary;
0
 }
0
 
0
 VALUE
0
 shoes_font_list()
0
 {
0
+  VALUE ary = rb_ary_new();
0
   FcConfig *fc = FcConfigGetCurrent();
0
-  FcFontSet *fonts = FcConfigGetFonts(fc, FcSetSystem);
0
-  return shoes_make_font_list(fonts);
0
+  FcFontSet *fonts = FcConfigGetFonts(fc, FcSetApplication);
0
+  if (fonts) shoes_make_font_list(fonts, ary);
0
+  fonts = FcConfigGetFonts(fc, FcSetSystem);
0
+  if (fonts) shoes_make_font_list(fonts, ary);
0
+  return ary;
0
 }
0
 
0
 VALUE
0
 shoes_load_font(const char *filename)
0
 {
0
-  int i = 0;
0
   FcConfig *fc = FcConfigGetCurrent();
0
   FcFontSet *fonts = FcFontSetCreate();
0
   if (!FcFileScan(fonts, NULL, NULL, NULL, filename, FcTrue))
0
     return Qnil;
0
 
0
-  VALUE ary = shoes_make_font_list(fonts);
0
+  VALUE ary = rb_ary_new();
0
+  shoes_make_font_list(fonts, ary);
0
   FcFontSetDestroy(fonts);
0
 
0
   if (!FcConfigAppFontAddFile(fc, filename))