# HG changeset patch # User ib # Date 1364769402 0 # Node ID 49be954ad61aa6f8dc0af8844174076387a5acf1 # Parent 8c62c9931075176731d90ef582b9309692730095 Move variable declarations and definitions where they belong. diff -r 8c62c9931075 -r 49be954ad61a gui/dialog/dialog.c --- a/gui/dialog/dialog.c Sun Mar 31 22:28:22 2013 +0000 +++ b/gui/dialog/dialog.c Sun Mar 31 22:36:42 2013 +0000 @@ -54,8 +54,6 @@ GtkWidget *WarningPixmap; GtkWidget *ErrorPixmap; -int gtkPopupMenu; -int gtkPopupMenuParam; static int gtkInitialized; #include "skinbrowser.h" diff -r 8c62c9931075 -r 49be954ad61a gui/dialog/dialog.h --- a/gui/dialog/dialog.h Sun Mar 31 22:28:22 2013 +0000 +++ b/gui/dialog/dialog.h Sun Mar 31 22:36:42 2013 +0000 @@ -34,9 +34,6 @@ extern GtkWidget *SkinList; extern GtkWidget *gtkMessageBoxText; -extern int gtkPopupMenu; -extern int gtkPopupMenuParam; - extern char *sbMPlayerDirInHome; extern char *sbMPlayerPrefixDir; diff -r 8c62c9931075 -r 49be954ad61a gui/dialog/menu.c --- a/gui/dialog/menu.c Sun Mar 31 22:28:22 2013 +0000 +++ b/gui/dialog/menu.c Sun Mar 31 22:36:42 2013 +0000 @@ -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 ); diff -r 8c62c9931075 -r 49be954ad61a gui/dialog/menu.h --- a/gui/dialog/menu.h Sun Mar 31 22:28:22 2013 +0000 +++ b/gui/dialog/menu.h Sun Mar 31 22:36:42 2013 +0000 @@ -21,6 +21,9 @@ #include +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 );