diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | gui/mplayer/gtk/gtk_menu.c (renamed from gui/mplayer/gtk/menu.c) | 2 | ||||
| -rw-r--r-- | gui/mplayer/gtk/gtk_menu.h (renamed from gui/mplayer/gtk/menu.h) | 0 | ||||
| -rw-r--r-- | gui/mplayer/menu.c | 4 | ||||
| -rw-r--r-- | gui/mplayer/widgets.c | 3 |
5 files changed, 5 insertions, 6 deletions
@@ -572,9 +572,9 @@ SRCS_MPLAYER-$(GUI_GTK) += gui/app.c \ gui/mplayer/gtk/eq.c \ gui/mplayer/gtk/fs.c \ gui/mplayer/gtk/gtk_common.c \ + gui/mplayer/gtk/gtk_menu.c \ gui/mplayer/gtk/gtk_url.c \ gui/mplayer/gtk/mb.c \ - gui/mplayer/gtk/menu.c \ gui/mplayer/gtk/opts.c \ gui/mplayer/gtk/pl.c \ gui/mplayer/gtk/sb.c \ diff --git a/gui/mplayer/gtk/menu.c b/gui/mplayer/gtk/gtk_menu.c index 48736ce81b..14387f84ca 100644 --- a/gui/mplayer/gtk/menu.c +++ b/gui/mplayer/gtk/gtk_menu.c @@ -25,7 +25,7 @@ #include "access_mpcontext.h" #include "mixer.h" -#include "menu.h" +#include "gtk_menu.h" #include "gui/mplayer/widgets.h" #include "gui/mplayer/gmplayer.h" #include "gui/app.h" diff --git a/gui/mplayer/gtk/menu.h b/gui/mplayer/gtk/gtk_menu.h index a5e86d70ee..a5e86d70ee 100644 --- a/gui/mplayer/gtk/menu.h +++ b/gui/mplayer/gtk/gtk_menu.h diff --git a/gui/mplayer/menu.c b/gui/mplayer/menu.c index 2c541cc733..9d63cc2ecc 100644 --- a/gui/mplayer/menu.c +++ b/gui/mplayer/menu.c @@ -151,7 +151,7 @@ void mplMenuInit( void ) if ( ( mplMenuDrawBuffer = calloc( 1,appMPlayer.menuBase.Bitmap.ImageSize ) ) == NULL ) { #ifdef DEBUG - mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[menu.h] %s",MSGTR_NEMFMR ); + mp_msg( MSGT_GPLAYER,MSGL_DBG2,MSGTR_NEMFMR ); #endif gtkMessageBox( GTK_MB_FATAL,MSGTR_NEMFMR ); return; @@ -164,7 +164,7 @@ void mplMenuInit( void ) wsSetShape( &appMPlayer.menuWindow,appMPlayer.menuBase.Mask.Image ); #ifdef DEBUG - mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[menu.h] menu: 0x%x\n",(int)appMPlayer.menuWindow.WindowID ); + mp_msg( MSGT_GPLAYER,MSGL_DBG2,"menu: 0x%x\n",(int)appMPlayer.menuWindow.WindowID ); #endif mplMenuIsInitialized=1; diff --git a/gui/mplayer/widgets.c b/gui/mplayer/widgets.c index d6b0442303..0acc1f325c 100644 --- a/gui/mplayer/widgets.c +++ b/gui/mplayer/widgets.c @@ -41,7 +41,6 @@ #include "gui/wm/ws.h" -#include "gtk/menu.h" #include "play.h" #include "gtk/fs.h" @@ -60,7 +59,7 @@ int gtkInitialized = 0; #include "gtk/mb.h" #include "gtk/about.h" #include "gtk/opts.h" -#include "gtk/menu.h" +#include "gtk/gtk_menu.h" #include "gtk/gtk_url.h" #include "gtk/eq.h" |