Mercurial > mplayer.hg

diff gui/dialog/dialog.c @ 37176:2208a16cc562
Remove GTK+ and GLib versions 1 relatedness from the GUI. This isn't really a cut-back, because although it seemed that compiling with GTK+ and GLib versions 1 were possible, compiling actually hadn't been possible for quite some time.
author: ib
date: Mon, 08 Sep 2014 20:17:01 +0000
parents: b28b632efeef
--- a/gui/dialog/dialog.c	Sun Sep 07 23:25:33 2014 +0000
+++ b/gui/dialog/dialog.c	Mon Sep 08 20:17:01 2014 +0000
@@ -113,9 +113,7 @@
 {
     int argc = 0;
     char *arg[3], **argv = arg;
-#ifdef CONFIG_GTK2
     char *env;
-#endif
     GtkIconTheme *theme;
     GdkPixmap *gdkIcon;
     GdkBitmap *gdkIconMask;
@@ -129,14 +127,12 @@
         arg[argc++] = display_name; // to open the requested display for the GUI, too.
     }
 
-#ifdef CONFIG_GTK2
     gtk_disable_setlocale();
 
     env = getenv("G_FILENAME_ENCODING");
 
     if ((!env && getenv("G_BROKEN_FILENAMES")) || (gstrncmp(env, "@locale", 7) == 0))
         mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_GUI_MSG_LocaleEncoding);
-#endif
 
     gtk_init(&argc, &argv);
     wsSetErrorHandler();      // GDK has just set its own handler
author	ib
date	Mon, 08 Sep 2014 20:17:01 +0000
parents	b28b632efeef
children