Mercurial > mplayer.hg

changeset 36646:40c36c45384f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author ib
date Sun, 26 Jan 2014 16:11:13 +0000
parents 289d315088ad
children e5b30a00c9db
files gui/dialog/fileselect.c
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gui/dialog/fileselect.c	Sun Jan 26 12:53:26 2014 +0000
+++ b/gui/dialog/fileselect.c	Sun Jan 26 16:11:13 2014 +0000
@@ -125,10 +125,9 @@
 #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                 }