[MPlayer-cvslog] r36742 - trunk/gui/dialog/fileselect.c

[ib]

Author: ib
Date: Sun Jan 26 17:11:13 2014
New Revision: 36742

Log:
Revert r36709.

With CONFIG_FREETYPE set, *.desc font files can't be changed with
immediate effect which might confuse the GUI user.

It is still possible to select *.desc by the "all files" filter though.

Modified:
   trunk/gui/dialog/fileselect.c

Modified: trunk/gui/dialog/fileselect.c
==============================================================================
--- trunk/gui/dialog/fileselect.c	Sun Jan 26 13:53:26 2014	(r36741)
+++ trunk/gui/dialog/fileselect.c	Sun Jan 26 17:11:13 2014	(r36742)
@@ -125,10 +125,9 @@ char *fsFontFileNames[][2] = {
 #ifdef CONFIG_FREETYPE
     { MSGTR_Filter_TTF,       "*.ttf"              },
     { MSGTR_Filter_Type1,     "*.pfb"              },
-#endif
+    { MSGTR_Filter_AllFonts,  "*.pfb,*.ttf" },
+#else
     { MSGTR_Filter_FontFiles, "*.desc"             },
-#ifdef CONFIG_FREETYPE
-    { MSGTR_Filter_AllFonts,  "*.pfb,*.ttf,*.desc" },
 #endif
     { MSGTR_Filter_AllFiles,  "*"                  },
     { NULL,                   NULL                 }