totem r5116 - in trunk: . src

[hadess svn gnome org]

Author: hadess
Date: Wed Feb 13 10:53:51 2008
New Revision: 5116
URL: http://svn.gnome.org/viewvc/totem?rev=5116&view=rev

Log:
2008-02-13  Bastien Nocera  <hadess hadess net>

	* src/totem.c: (totem_action_remote), (on_mouse_click_fullscreen):
	Fix crashers when remote buttons are pressed and we're in
	windowed mode (Closes: #516089)



Modified:
   trunk/ChangeLog
   trunk/src/totem.c

Modified: trunk/src/totem.c
==============================================================================
--- trunk/src/totem.c	(original)
+++ trunk/src/totem.c	Wed Feb 13 10:53:51 2008
@@ -2062,8 +2062,9 @@
 		break;
 	}
 
-	if (handled != FALSE &&
-			gtk_window_is_active (GTK_WINDOW (totem->win))) {
+	if (handled != FALSE
+			&& gtk_window_is_active (GTK_WINDOW (totem->win))
+			&& totem_fullscreen_is_fullscreen (totem->fs) != FALSE) {
 		totem_fullscreen_motion_notify (NULL, NULL, totem->fs);
 	}
 }
@@ -2245,7 +2246,8 @@
 static void
 on_mouse_click_fullscreen (GtkWidget *widget, Totem *totem)
 {
-	totem_fullscreen_motion_notify (NULL, NULL, totem->fs);
+	if (totem_fullscreen_is_fullscreen (totem->fs) != FALSE)
+		totem_fullscreen_motion_notify (NULL, NULL, totem->fs);
 }
 
 static gboolean