[xine-cvs] CVS: gnome-xine/src key_events.c,1.85,1.86 noskin_window.c,1.82,1.83

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/gnome-xine/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3156/src

Modified Files:
	key_events.c noskin_window.c 
Log Message:
Unbreak things (integrated wm toolbar).

Index: key_events.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/key_events.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- key_events.c	4 Oct 2005 18:12:24 -0000	1.85
+++ key_events.c	4 Oct 2005 23:53:58 -0000	1.86
@@ -187,13 +187,16 @@
     return TRUE;
 
   /* Windowed-mode separate toolbar (Alt-<key>, F10, Menu) */
-  if (win == app && menubar
-      && GTK_WIDGET_VISIBLE (gtk_widget_get_toplevel (menubar)))
+  if (win == app && menubar)
   {
-    event->window = gtk_widget_get_toplevel (menubar)->window;
-    event->send_event = TRUE;
-    gtk_main_do_event ((GdkEvent *) event);
-    return TRUE;
+    GtkWidget *toplevel = gtk_widget_get_toplevel (menubar);
+    if (toplevel != app && GTK_WIDGET_VISIBLE (toplevel))
+    {
+      event->window = gtk_widget_get_toplevel (menubar)->window;
+      event->send_event = TRUE;
+      gtk_main_do_event ((GdkEvent *) event);
+      return TRUE;
+    }
   }
 
   if (state == 0)

Index: noskin_window.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/noskin_window.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- noskin_window.c	4 Oct 2005 18:10:05 -0000	1.82
+++ noskin_window.c	4 Oct 2005 23:54:19 -0000	1.83
@@ -476,7 +476,8 @@
 	NULL);
   ui_set_status (xine_get_param (stream, XINE_PARAM_AUDIO_MUTE)
 		 ? UI_AUDIO_MUTE : UI_AUDIO_UNMUTE);
-  gdk_window_add_filter (app->window, wm_toolbar_depth_cb, NULL);
+  if (wm_toolbar)
+    gdk_window_add_filter (app->window, wm_toolbar_depth_cb, NULL);
   return FALSE;
 }