--- totem-2.24.2.old/data/totem.schemas.in	2008-09-01 12:32:56.000000000 +0200
+++ totem-2.24.2/data/totem.schemas.in	2009-02-21 22:27:18.000000000 +0100
@@ -276,6 +276,18 @@
       </schema>
 
       <schema>
+        <key>/schemas/apps/disable_keyboard_shortcut</key>
+	<applyto>/apps/totem/disable_keyboard_shortcut</applyto>
+	<owner>totem</owner>
+	<type>bool</type>
+	<default>false</default>
+	<locale name="C">
+	  <short>Whether to disable the keyboard shortcut of totem</short>
+	  <long>Whether to disable the keyboard shortcut of totem</long>
+	</locale>
+      </schema>
+
+      <schema>
         <key>/schemas/apps/totem/autoload_subtitles</key>
 	<applyto>/apps/totem/autoload_subtitles</applyto>
 	<owner>totem</owner>
--- totem-2.24.2.old/src/totem.c	2008-09-29 11:37:38.000000000 +0200
+++ totem-2.24.2/src/totem.c	2009-02-25 15:28:02.000000000 +0100
@@ -2891,7 +2891,11 @@
 window_key_press_event_cb (GtkWidget *win, GdkEventKey *event, Totem *totem)
 {
 	GtkWidget *focused;
+	GConfClient *client;
 
+	client = gconf_client_get_default ();
+
+	if (gconf_client_get_bool (client, GCONF_PREFIX"/disable_keyboard", NULL) == FALSE) {
 	focused = gtk_window_get_focus (GTK_WINDOW (totem->win));
 	if (focused != NULL && gtk_widget_is_ancestor
 			(focused, GTK_WIDGET (totem->sidebar)) != FALSE) {
@@ -2956,6 +2960,8 @@
 	} else {
 		return totem_action_handle_key_release (totem, event);
 	}
+	}
+	g_object_unref (G_OBJECT (client));
 }
 
 int
