- fix fuckin' locale (?:)

- fix msg box layer handling


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6899 b3059339-0415-0410-9bf9-f77b7e298cf2

5 files changed, 14 insertions, 13 deletions

diff --git a/Gui/cfg.c b/Gui/cfg.c
index 86cce3d7e5..24f2381dbb 100644
--- a/Gui/cfg.c
+++ b/Gui/cfg.c
@@ -8,10 +8,6 @@
 #include "../mplayer.h"
 #include "../cfgparser.h"
 
-#ifdef USE_I18N
-#include <locale.h>
-#endif
-
 #include "../../libvo/video_out.h"
 
 #include "cfg.h"
@@ -166,10 +162,6 @@ int cfg_write( void )
  FILE * f;
  int    i;
 
-#ifdef USE_I18N
- setlocale( LC_ALL,"" );
-#endif
-
 // -- save configuration 
  if ( (f=fopen( cfg,"wt+" )) )
   {
diff --git a/Gui/interface.c b/Gui/interface.c
index f509a11db0..9d727e47c1 100644
--- a/Gui/interface.c
+++ b/Gui/interface.c
@@ -79,11 +79,18 @@ void gset( char ** str,char * what )
 void guiInit( void )
 {
  memset( &guiIntfStruct,0,sizeof( guiIntfStruct ) );
+ guiIntfStruct.Balance=50.0f;
+ guiIntfStruct.StreamType=-1;
+
  memset( &gtkEquChannels,0,sizeof( gtkEquChannels ) );
  gtkAOOSSMixer=strdup( PATH_DEV_MIXER );
  gtkAOOSSDevice=strdup( PATH_DEV_DSP );
-// cfg_read(); // !!! moved to Gui/mplayer/mplayer.c::mplInit() after gtkInit()
+   
+ gtkInit();
+    
+ cfg_read(); 
  appInit( (void*)mDisplay );
+       
  if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name );
 #if defined( USE_OSD ) || defined( USE_SUB )
  guiLoadFont();
diff --git a/Gui/mplayer/gtk/mb.c b/Gui/mplayer/gtk/mb.c
index cee01cb0b6..569efae6a4 100644
--- a/Gui/mplayer/gtk/mb.c
+++ b/Gui/mplayer/gtk/mb.c
@@ -16,9 +16,8 @@ int gtkVMessageBox = 0;
 
 void ShowMessageBox( char * msg )
 {
- if ( gtkVMessageBox ) gtkActive( MessageBox );
-   else MessageBox=create_MessageBox( 0 );
- gtkSetLayer( MessageBox );
+ if ( gtkVMessageBox ) { gtk_widget_hide( MessageBox ); gtk_widget_destroy( MessageBox ); }
+ MessageBox=create_MessageBox( 0 );
  if ( strlen( msg ) < 20 ) gtk_widget_set_usize( MessageBox,196,-1 );
  gtkIncVisible();
 }
diff --git a/Gui/mplayer/mplayer.c b/Gui/mplayer/mplayer.c
index d604a00e36..7b1fdc8155 100644
--- a/Gui/mplayer/mplayer.c
+++ b/Gui/mplayer/mplayer.c
@@ -45,6 +45,7 @@ void mplInit( void * disp )
 {
  int i;
 
+#if 0
  // init fields of this struct to default values
  guiIntfStruct.Balance=50.0f;
  guiIntfStruct.StreamType=-1;
@@ -53,6 +54,7 @@ void mplInit( void * disp )
 
  // read gui.conf, gui.pl
  cfg_read();
+#endif 
 
  // opens X display, checks for extensions (XShape, DGA etc)
  wsXInit( disp );
@@ -113,7 +115,7 @@ void mplInit( void * disp )
  if ( !appMPlayer.mainDecoration ) wsWindowDecoration( &appMPlayer.mainWindow,0 );
  
  wsVisibleWindow( &appMPlayer.mainWindow,wsShowWindow );
-#if 0
+#if 1
  wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
 
  {
diff --git a/Gui/mplayer/widgets.c b/Gui/mplayer/widgets.c
index 42d619ba95..bad3a27609 100644
--- a/Gui/mplayer/widgets.c
+++ b/Gui/mplayer/widgets.c
@@ -148,6 +148,7 @@ void gtkMessageBox( int type,gchar * str )
   }
  gtk_widget_show( MessageBox );
  gtkSetLayer( MessageBox );
+ gtkActive( MessageBox );
  if ( type == GTK_MB_FATAL )
   while ( gtkVMessageBox ) gtk_main_iteration_do( 0 );
 }