totem r5954 - in trunk: . src

[hadess svn gnome org]

Author: hadess
Date: Mon Feb  9 14:20:51 2009
New Revision: 5954
URL: http://svn.gnome.org/viewvc/totem?rev=5954&view=rev

Log:
2009-02-09  Bastien Nocera  <hadess hadess net>

	* src/totem-object.c (totem_action_handle_key_press):
	Patch from Robin Stocker <robin nibor org> to make space
	work to play/pause in more situations (Closes: #570834)



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

Modified: trunk/src/totem-object.c
==============================================================================
--- trunk/src/totem-object.c	(original)
+++ trunk/src/totem-object.c	Mon Feb  9 14:20:51 2009
@@ -3448,10 +3448,14 @@
 		}
 		break;
 	case GDK_space:
-		if (totem_is_fullscreen (totem) != FALSE || gtk_widget_is_focus (GTK_WIDGET (totem->bvw)) != FALSE)
-			totem_action_play_pause (totem);
-		else
-			retval = FALSE;
+		{
+			GtkWidget *focus = gtk_window_get_focus (totem->win);
+			if (totem_is_fullscreen (totem) != FALSE ||
+			    focus == NULL || focus == totem->bvw || focus == totem->seek)
+				totem_action_play_pause (totem);
+			else
+				retval = FALSE;
+		}
 		break;
 	case GDK_Up:
 		totem_action_volume_relative (totem, VOLUME_UP_OFFSET);