- fix fuckin' locale (?:)

- fix msg box layer handling


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

3 files changed, 6 insertions, 4 deletions

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 );
 }