? foo
? foo.txt
? key7.txt
? makefile-changes
? totem-1.5.2.tar.bz2
? data/foo
? help/de/Makefile
? help/de/Makefile.in
? help/es/Makefile
? help/es/Makefile.in
? help/fr/.xml2po.mo
? help/fr/totem.xml
? help/sv/.xml2po.mo
? help/sv/totem.xml
? src/apple1984.mov
? src/cg_sample.avi
? src/core.6005
? src/foo
? src/seeking-play-scrubbing-1.diff
? src/test.pls
? src/backend/bacon-video-widget-xine.c?r1=1.223&r2=1.224&makepatch=1&diff_format=u
? src/plparse/live.pls?service=vrbb
? src/plparse/test.mov
Index: src/totem.c
===================================================================
RCS file: /cvs/gnome/totem/src/totem.c,v
retrieving revision 1.531
diff -u -p -r1.531 totem.c
--- src/totem.c	27 Oct 2006 15:37:48 -0000	1.531
+++ src/totem.c	27 Oct 2006 16:06:04 -0000
@@ -2362,13 +2362,15 @@ totem_action_handle_key_release (Totem *
 static gboolean
 totem_action_handle_key_press (Totem *totem, GdkEventKey *event)
 {
-	gboolean retval = TRUE, playlist_focused = FALSE;
+	gboolean retval = TRUE;
 	GtkWidget *focused;
 
 	focused = gtk_window_get_focus (GTK_WINDOW (totem->win));
 	if (focused != NULL && gtk_widget_is_ancestor
 			(focused, GTK_WIDGET (totem->playlist)) != FALSE) {
-		playlist_focused = TRUE;
+		if (event->keyval == GDK_Escape)
+			gtk_widget_grab_focus (GTK_WIDGET (totem->bvw));
+		return FALSE;
 	}
 
 	switch (event->keyval) {
@@ -2478,9 +2480,6 @@ totem_action_handle_key_press (Totem *to
 			totem_action_fullscreen (totem, FALSE);
 		break;
 	case GDK_Left:
-		if (playlist_focused != FALSE)
-			return FALSE;
-
 		totem_statusbar_set_seeking (TOTEM_STATUSBAR (totem->statusbar), TRUE);
 		if (event->state & GDK_SHIFT_MASK) {
 			totem_action_seek_relative (totem,
@@ -2494,9 +2493,6 @@ totem_action_handle_key_press (Totem *to
 		}
 		break;
 	case GDK_Right:
-		if (playlist_focused != FALSE)
-			return FALSE;
-
 		totem_statusbar_set_seeking (TOTEM_STATUSBAR (totem->statusbar), TRUE);
 		if (event->state & GDK_SHIFT_MASK) {
 			totem_action_seek_relative (totem,
@@ -2516,13 +2512,9 @@ totem_action_handle_key_press (Totem *to
 			retval = FALSE;
 		break;
 	case GDK_Up:
-		if (playlist_focused != FALSE)
-			return FALSE;
 		totem_action_volume_relative (totem, VOLUME_UP_OFFSET);
 		break;
 	case GDK_Down:
-		if (playlist_focused != FALSE)
-			return FALSE;
 		totem_action_volume_relative (totem, VOLUME_DOWN_OFFSET);
 		break;
 	case GDK_0:
@@ -2542,13 +2534,9 @@ totem_action_handle_key_press (Totem *to
 		totem_action_set_scale_ratio (totem, 2);
 		break;
 	case GDK_Menu:
-		if (playlist_focused != FALSE)
-			return FALSE;
 		totem_action_menu_popup (totem, 0);
 		break;
 	case GDK_F10:
-		if (playlist_focused != FALSE)
-			return FALSE;
 		if (!(event->state & GDK_SHIFT_MASK))
 			return FALSE;
 
