diff -Nru metacity-2.34.13/debian/changelog metacity-2.34.13/debian/changelog --- metacity-2.34.13/debian/changelog 2013-12-21 11:48:16.000000000 -0700 +++ metacity-2.34.13/debian/changelog 2014-01-22 22:32:33.000000000 -0700 @@ -1,3 +1,11 @@ +metacity (1:2.34.13-0ubuntu4) trusty; urgency=low + + * debian/patches/22_fix_above_tab_switching.patch: + - For Above_Tab, don't compare keysym (fixes group switching). + Closes: #907640 + + -- Jeffrey Knockel Wed, 22 Jan 2014 22:28:15 -0700 + metacity (1:2.34.13-0ubuntu3) trusty; urgency=medium * Build-depend on and use dh-autoreconf to get new libtool macros. diff -Nru metacity-2.34.13/debian/patches/22_fix_above_tab_switching.patch metacity-2.34.13/debian/patches/22_fix_above_tab_switching.patch --- metacity-2.34.13/debian/patches/22_fix_above_tab_switching.patch 1969-12-31 17:00:00.000000000 -0700 +++ metacity-2.34.13/debian/patches/22_fix_above_tab_switching.patch 2014-01-22 22:30:27.000000000 -0700 @@ -0,0 +1,18 @@ +Description: For Above_Tab, don't compare keysym (fixes group switching) +Author: Jeffrey Knockel +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/metacity/+bug/907640 +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=692437 + +--- metacity-2.34.13.orig/src/core/keybindings.c ++++ metacity-2.34.13/src/core/keybindings.c +@@ -503,7 +503,9 @@ display_get_keybinding_action (MetaDispl + i = display->n_key_bindings - 1; + while (i >= 0) + { +- if (display->key_bindings[i].keysym == keysym && ++ if ((display->key_bindings[i].keysym == keysym || ++ /* Don't need to compare keysym if META_KEY_ABOVE_TAB */ ++ display->key_bindings[i].keysym == META_KEY_ABOVE_TAB) && + display->key_bindings[i].keycode == keycode && + display->key_bindings[i].mask == mask) + { diff -Nru metacity-2.34.13/debian/patches/series metacity-2.34.13/debian/patches/series --- metacity-2.34.13/debian/patches/series 2013-05-31 17:30:43.000000000 -0600 +++ metacity-2.34.13/debian/patches/series 2014-01-22 22:27:13.000000000 -0700 @@ -23,3 +23,4 @@ #18-auto-maximize-windows.patch #19_add_unity_hud_configuration.patch #101_override_gconf_settings.patch +22_fix_above_tab_switching.patch