Mercurial > mplayer.hg

changeset 35629:365dc9336f0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pass parameter instead of using global variable.
author ib
date Thu, 10 Jan 2013 11:20:18 +0000
parents df90b5c825f7
children 099fb0aced44
files gui/dialog/dialog.c gui/dialog/dialog.h gui/interface.c
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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);
--- 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 */