new gui interface, and gtk moved into mplayer process. fork ... bleh :)

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

1 files changed, 7 insertions, 9 deletions

diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c
index adda2b963e..90981f28c9 100644
--- a/Gui/mplayer/gtk/opts.c
+++ b/Gui/mplayer/gtk/opts.c
@@ -1,7 +1,8 @@
 
+#include <stdlib.h>
+#include <stdio.h>
+
 #include "./mplayer.h"
-#include "psignal.h"
-#include "../error.h"
 
 #include "../../events.h"
 #include "../../../config.h"
@@ -27,14 +28,11 @@ GtkWidget * opAutoFullscreenCheckBox;
 GtkWidget * opOk;
 GtkWidget * opCancel;
 
-int opShift = False;
+int opShift = 0;
 
 void HideOptions( void )
 {
  gtk_widget_hide( Options );
- gtkVisibleOptions=0;
- gtkShMem->vs.window=evPreferences;
- gtkSendMessage( evHideWindow );
 }
 
 gboolean on_window2_key_press_event( GtkWidget * widget,GdkEventKey * event,gpointer user_data )
@@ -43,10 +41,10 @@ gboolean on_window2_key_press_event( GtkWidget * widget,GdkEventKey * event,gpoi
   {
    case GDK_Shift_L:
    case GDK_Shift_R:
-        opShift=True;
+        opShift=1;
         break;
   }
- return FALSE;
+ return 0;
 }
 
 gboolean on_window2_key_release_event( GtkWidget * widget,GdkEventKey * event,gpointer user_data )
@@ -66,7 +64,7 @@ gboolean on_window2_key_release_event( GtkWidget * widget,GdkEventKey * event,gp
         break;
    case GDK_Shift_L:
    case GDK_Shift_R:
-        opShift=False;
+        opShift=0;
         break;
   }
  return FALSE;