# HG changeset patch # User ib # Date 1308074482 0 # Node ID 6f20f2a42b765ffb592611554c5ba396f4ab8c69 # Parent 9f0812ccc4218c72df79f37696bf0ee168b12c8e Do some gtkInit() cleanup. Move debug message at top of function and revise message text. Remove commented code. diff -r 9f0812ccc421 -r 6f20f2a42b76 gui/mplayer/widgets.c --- a/gui/mplayer/widgets.c Tue Jun 14 17:53:40 2011 +0000 +++ b/gui/mplayer/widgets.c Tue Jun 14 18:01:22 2011 +0000 @@ -79,6 +79,8 @@ GdkPixmap *gdkIcon; GdkBitmap *gdkIconMask; + mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[widget] GTK init\n" ); + arg[argc++] = GMPlayer; if (mDisplayName) // MPlayer option '-display' was given @@ -87,12 +89,11 @@ arg[argc++] = mDisplayName; // to open the requested display for the GUI, too. } - mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[widget] init GTK ...\n" ); #ifdef CONFIG_GTK2 gtk_disable_setlocale(); #endif + gtk_init( &argc, &argv ); -// gdk_set_use_xshm( TRUE ); gdkIcon=gdk_pixmap_colormap_create_from_xpm_d( NULL,gdk_colormap_get_system(),&gdkIconMask,NULL,(gchar **) mplayer_xpm );