# HG changeset patch
# User pontscho
# Date 1028481840 0
# Node ID 138a7ff52a26fe293fb18f57b8d0fea6db9bf53c
# Parent  cd630017eb83c64dc93699b3ca99f4ae6a6e0a75
- fix fuckin' locale (?:)
- fix msg box layer handling

diff -r cd630017eb83 -r 138a7ff52a26 Gui/cfg.c
--- a/Gui/cfg.c	Sun Aug 04 16:27:52 2002 +0000
+++ b/Gui/cfg.c	Sun Aug 04 17:24:00 2002 +0000
@@ -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 @@
  FILE * f;
  int    i;
 
-#ifdef USE_I18N
- setlocale( LC_ALL,"" );
-#endif
-
 // -- save configuration 
  if ( (f=fopen( cfg,"wt+" )) )
   {
diff -r cd630017eb83 -r 138a7ff52a26 Gui/interface.c
--- a/Gui/interface.c	Sun Aug 04 16:27:52 2002 +0000
+++ b/Gui/interface.c	Sun Aug 04 17:24:00 2002 +0000
@@ -79,11 +79,18 @@
 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 -r cd630017eb83 -r 138a7ff52a26 Gui/mplayer/gtk/mb.c
--- a/Gui/mplayer/gtk/mb.c	Sun Aug 04 16:27:52 2002 +0000
+++ b/Gui/mplayer/gtk/mb.c	Sun Aug 04 17:24:00 2002 +0000
@@ -16,9 +16,8 @@
 
 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 -r cd630017eb83 -r 138a7ff52a26 Gui/mplayer/mplayer.c
--- a/Gui/mplayer/mplayer.c	Sun Aug 04 16:27:52 2002 +0000
+++ b/Gui/mplayer/mplayer.c	Sun Aug 04 17:24:00 2002 +0000
@@ -45,6 +45,7 @@
 {
  int i;
 
+#if 0
  // init fields of this struct to default values
  guiIntfStruct.Balance=50.0f;
  guiIntfStruct.StreamType=-1;
@@ -53,6 +54,7 @@
 
  // read gui.conf, gui.pl
  cfg_read();
+#endif 
 
  // opens X display, checks for extensions (XShape, DGA etc)
  wsXInit( disp );
@@ -113,7 +115,7 @@
  if ( !appMPlayer.mainDecoration ) wsWindowDecoration( &appMPlayer.mainWindow,0 );
  
  wsVisibleWindow( &appMPlayer.mainWindow,wsShowWindow );
-#if 0
+#if 1
  wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
 
  {
diff -r cd630017eb83 -r 138a7ff52a26 Gui/mplayer/widgets.c
--- a/Gui/mplayer/widgets.c	Sun Aug 04 16:27:52 2002 +0000
+++ b/Gui/mplayer/widgets.c	Sun Aug 04 17:24:00 2002 +0000
@@ -148,6 +148,7 @@
   }
  gtk_widget_show( MessageBox );
  gtkSetLayer( MessageBox );
+ gtkActive( MessageBox );
  if ( type == GTK_MB_FATAL )
   while ( gtkVMessageBox ) gtk_main_iteration_do( 0 );
 }