# HG changeset patch
# User ib
# Date 1357816818 0
# Node ID 365dc9336f0de7276d59799aeae6ff9686ec67aa
# Parent  df90b5c825f7b8a464fc32e1ffb7ff17c445ec3d
Pass parameter instead of using global variable.

diff -r df90b5c825f7 -r 365dc9336f0d gui/dialog/dialog.c
--- a/gui/dialog/dialog.c	Thu Jan 10 11:12:40 2013 +0000
+++ b/gui/dialog/dialog.c	Thu Jan 10 11:20:18 2013 +0000
@@ -115,7 +115,7 @@
     return (pixbuf != NULL);
 }
 
-void gtkInit(void)
+void gtkInit(char *display_name)
 {
     int argc = 0;
     char *arg[3], **argv = arg;
@@ -127,9 +127,9 @@
 
     arg[argc++] = GMPlayer;
 
-    if (mDisplayName) {            // MPlayer option '-display' was given
+    if (display_name) {            // MPlayer option '-display' was given
         arg[argc++] = "--display"; // Pass corresponding command line arguments to GTK,
-        arg[argc++] = mDisplayName; // to open the requested display for the GUI, too.
+        arg[argc++] = display_name; // to open the requested display for the GUI, too.
     }
 
 #ifdef CONFIG_GTK2
diff -r df90b5c825f7 -r 365dc9336f0d gui/dialog/dialog.h
--- a/gui/dialog/dialog.h	Thu Jan 10 11:12:40 2013 +0000
+++ b/gui/dialog/dialog.h	Thu Jan 10 11:20:18 2013 +0000
@@ -64,7 +64,7 @@
 
 void widgetsCreate(void);
 
-void gtkInit(void);
+void gtkInit(char *display_name);
 void gtkAddIcon(GtkWidget *window);
 
 int gtkFillSkinList(gchar *dir);
diff -r df90b5c825f7 -r 365dc9336f0d gui/interface.c
--- a/gui/interface.c	Thu Jan 10 11:12:40 2013 +0000
+++ b/gui/interface.c	Thu Jan 10 11:20:18 2013 +0000
@@ -111,7 +111,7 @@
     /* initialize graphical user interfaces */
 
     wsXInit(mDisplay);
-    gtkInit();
+    gtkInit(mDisplayName);
 
     /* load skin */