diff options
-rw-r--r-- | Gui/app.c | 9 | ||||
-rw-r--r-- | Gui/mplayer/widgets.c | 1 | ||||
-rw-r--r-- | Gui/skin/skin.c | 2 | ||||
-rw-r--r-- | help_mp-en.h | 2 | ||||
-rw-r--r-- | help_mp-hu.h | 2 |
5 files changed, 13 insertions, 3 deletions
@@ -3,8 +3,11 @@ #include <stdio.h> #include <string.h> -#include "app.h" #include "../config.h" +#include "../mp_msg.h" +#include "../help_mp.h" + +#include "app.h" #include "error.h" #include "wm/wskeys.h" #include "skin/skin.h" @@ -109,8 +112,8 @@ void appInit( int argc,char* argv[], char *envp[], void* disp ) initDebug(NULL); // write messages to stderr switch ( skinRead( skinName ) ) { - case -1: dbprintf( 0,"[app] skin configfile not found.\n" ); exit( 0 ); - case -2: dbprintf( 0,"[app] skin configfile read error.\n" ); exit( 0 ); + case -1: mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_SKIN_SKINCFG_SkinNotFound,skinName ); exit( 0 ); + case -2: mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_SKIN_SKINCFG_SkinCfgReadError,skinName ); exit( 0 ); } mplInit( argc,argv,envp,disp ); // does gtk & ws initialization, create windows } diff --git a/Gui/mplayer/widgets.c b/Gui/mplayer/widgets.c index e945761356..1629265a91 100644 --- a/Gui/mplayer/widgets.c +++ b/Gui/mplayer/widgets.c @@ -110,6 +110,7 @@ void gtkDone( void ){ void gtkMessageBox( int type,gchar * str ) { + if ( !gtkIsOk ) return; gtkShMem->mb.type=type; strcpy( gtkShMem->mb.str,str ); gtkSendMessage( evMessageBox ); diff --git a/Gui/skin/skin.c b/Gui/skin/skin.c index 03604e1843..19cb1e3b68 100644 --- a/Gui/skin/skin.c +++ b/Gui/skin/skin.c @@ -7,7 +7,9 @@ #include "error.h" #include "font.h" #include "../app.h" + #include "../../config.h" +#include "../../mp_msg.h" #include "../../help_mp.h" listItems * skinAppMPlayer = &appMPlayer; diff --git a/help_mp-en.h b/help_mp-en.h index 9234cb8367..c5f83bd357 100644 --- a/help_mp-en.h +++ b/help_mp-en.h @@ -266,5 +266,7 @@ static char help_text[]= #define MSGTR_SKIN_FONT_NonExistentFontID "non-existent font identifier ( %s )\n" #define MSGTR_SKIN_UnknownParameter "unknown parameter ( %s )\n" #define MSGTR_SKINBROWSER_NotEnoughMemory "[skinbrowser] not enough memory.\n" +#define MSGTR_SKIN_SKINCFG_SkinNotFound "Skin not found ( %s ).\n" +#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "Skin configfile read error ( %s ).\n" #endif diff --git a/help_mp-hu.h b/help_mp-hu.h index 0ea731e5f1..9fd6d6b0cc 100644 --- a/help_mp-hu.h +++ b/help_mp-hu.h @@ -261,5 +261,7 @@ static char help_text[]= #define MSGTR_SKIN_FONT_NonExistentFontID "nemlétező betűtipus azonosító ( %s )\n" #define MSGTR_SKIN_UnknownParameter "ismeretlen paraméter ( %s )\n" #define MSGTR_SKINBROWSER_NotEnoughMemory "[skinböngésző] nincs elég memória.\n" +#define MSGTR_SKIN_SKINCFG_SkinNotFound "Skin nem található ( %s ).\n" +#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "Skin configfile olvasási hiba ( %s ).\n" #endif |