rhythmbox r6148 - in trunk: . plugins/mmkeys



Author: hadess
Date: Wed Feb 11 13:54:16 2009
New Revision: 6148
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6148&view=rev

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

	* plugins/mmkeys/rb-mmkeys-plugin.c (filter_mmkeys), (mmkeys_grab):
	Revert changes in the mmkeys plugin for XF86Back and XF86Forward



Modified:
   trunk/ChangeLog
   trunk/plugins/mmkeys/rb-mmkeys-plugin.c

Modified: trunk/plugins/mmkeys/rb-mmkeys-plugin.c
==============================================================================
--- trunk/plugins/mmkeys/rb-mmkeys-plugin.c	(original)
+++ trunk/plugins/mmkeys/rb-mmkeys-plugin.c	Wed Feb 11 13:54:16 2009
@@ -245,12 +245,10 @@
 	} else if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioStop) == key->keycode) {
 		rb_shell_player_stop (player);
 		return GDK_FILTER_REMOVE;
-	} else if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPrev) == key->keycode ||
-		   XKeysymToKeycode (GDK_DISPLAY (), XF86XK_Back) == key->keycode) {
+	} else if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPrev) == key->keycode) {
 		rb_shell_player_do_previous (player, NULL);
 		return GDK_FILTER_REMOVE;
-	} else if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioNext) == key->keycode ||
-		   XKeysymToKeycode (GDK_DISPLAY (), XF86XK_Forward) == key->keycode) {
+	} else if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioNext) == key->keycode) {
 		rb_shell_player_do_next (player, NULL);
 		return GDK_FILTER_REMOVE;
 	} else {
@@ -261,7 +259,7 @@
 static void
 mmkeys_grab (RBMMKeysPlugin *plugin, gboolean grab)
 {
-	gint keycodes[] = {0, 0, 0, 0, 0, 0, 0};
+	gint keycodes[] = {0, 0, 0, 0, 0};
 	GdkDisplay *display;
 	GdkScreen *screen;
 	GdkWindow *root;
@@ -272,8 +270,6 @@
 	keycodes[2] = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPrev);
 	keycodes[3] = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioNext);
 	keycodes[4] = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPause);
-	keycodes[5] = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_Back);
-	keycodes[6] = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_Forward);
 
 	display = gdk_display_get_default ();
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]