[MPlayer-cvslog] r36123 - in trunk/gui/dialog: dialog.c dialog.h menu.c menu.h

[ib]

Author: ib
Date: Mon Apr  1 00:36:42 2013
New Revision: 36123

Log:
Move variable declarations and definitions where they belong.

Modified:
   trunk/gui/dialog/dialog.c
   trunk/gui/dialog/dialog.h
   trunk/gui/dialog/menu.c
   trunk/gui/dialog/menu.h

Modified: trunk/gui/dialog/dialog.c
==============================================================================
--- trunk/gui/dialog/dialog.c	Mon Apr  1 00:28:22 2013	(r36122)
+++ trunk/gui/dialog/dialog.c	Mon Apr  1 00:36:42 2013	(r36123)
@@ -54,8 +54,6 @@ static GtkWidget *PopUpMenu;
 GtkWidget *WarningPixmap;
 GtkWidget *ErrorPixmap;
 
-int gtkPopupMenu;
-int gtkPopupMenuParam;
 static int gtkInitialized;
 
 #include "skinbrowser.h"

Modified: trunk/gui/dialog/dialog.h
==============================================================================
--- trunk/gui/dialog/dialog.h	Mon Apr  1 00:28:22 2013	(r36122)
+++ trunk/gui/dialog/dialog.h	Mon Apr  1 00:36:42 2013	(r36123)
@@ -34,9 +34,6 @@ extern GtkWidget *ErrorPixmap;
 extern GtkWidget *SkinList;
 extern GtkWidget *gtkMessageBoxText;
 
-extern int gtkPopupMenu;
-extern int gtkPopupMenuParam;
-
 extern char *sbMPlayerDirInHome;
 extern char *sbMPlayerPrefixDir;
 

Modified: trunk/gui/dialog/menu.c
==============================================================================
--- trunk/gui/dialog/menu.c	Mon Apr  1 00:28:22 2013	(r36122)
+++ trunk/gui/dialog/menu.c	Mon Apr  1 00:36:42 2013	(r36123)
@@ -86,6 +86,9 @@
 #endif
 #include "pixmaps/empty1px.xpm"
 
+int gtkPopupMenu;
+int gtkPopupMenuParam;
+
 static void ActivateMenuItem( int Item )
 {
 // fprintf( stderr,"[menu] item: %d.%d\n",Item&0xffff,Item>>16 );

Modified: trunk/gui/dialog/menu.h
==============================================================================
--- trunk/gui/dialog/menu.h	Mon Apr  1 00:28:22 2013	(r36122)
+++ trunk/gui/dialog/menu.h	Mon Apr  1 00:36:42 2013	(r36123)
@@ -21,6 +21,9 @@
 
 #include <gtk/gtk.h>
 
+extern int gtkPopupMenu;
+extern int gtkPopupMenuParam;
+
 GtkWidget * AddMenuItem( GtkWidget *window1, const char * immagine_xpm, GtkWidget * SubMenu, const char * label, int Number );
 GtkWidget * AddSubMenu( GtkWidget *window1, const char * immagine_xpm, GtkWidget * Menu, const char * label );
 GtkWidget * AddSeparator( GtkWidget * Menu );