Blame libxfce4ui-4.8.0-fix-control-shortcuts.patch
|
 |
428be85 |
--- libxfce4ui-4.8.0/libxfce4kbd-private/xfce-shortcuts-grabber.c 2011-01-16 10:01:09.000000000 -0500
|
|
|
428be85 |
+++ hacked/libxfce4kbd-private/xfce-shortcuts-grabber.c 2011-12-18 00:29:58.343552611 -0500
|
|
|
428be85 |
@@ -560,6 +560,9 @@
|
|
|
428be85 |
{
|
|
|
428be85 |
gchar *name;
|
|
|
428be85 |
gboolean result = FALSE;
|
|
|
428be85 |
+ guint keycode;
|
|
|
428be85 |
+ guint modifiers;
|
|
|
428be85 |
+ gchar *shortcut2;
|
|
|
428be85 |
|
|
|
428be85 |
g_return_val_if_fail (context != NULL, TRUE);
|
|
|
428be85 |
g_return_val_if_fail (context->xevent != NULL, TRUE);
|
|
|
428be85 |
@@ -569,13 +572,16 @@
|
|
|
428be85 |
name = xfce_shortcuts_grabber_shortcut_name (context->grabber, context->xevent->keycode,
|
|
|
428be85 |
context->xevent->state);
|
|
|
428be85 |
|
|
|
428be85 |
- if (G_UNLIKELY (g_str_equal (shortcut, name)))
|
|
|
428be85 |
+ xfce_shortcuts_grabber_parse_shortcut (context->grabber, shortcut, &keycode, &modifiers);
|
|
|
428be85 |
+ shortcut2 = xfce_shortcuts_grabber_shortcut_name (context->grabber, keycode, modifiers);
|
|
|
428be85 |
+ if (G_UNLIKELY (g_str_equal (shortcut2, name)))
|
|
|
428be85 |
{
|
|
|
428be85 |
context->result = shortcut;
|
|
|
428be85 |
result = TRUE;
|
|
|
428be85 |
}
|
|
|
428be85 |
|
|
|
428be85 |
g_free (name);
|
|
|
428be85 |
+ g_free (shortcut2);
|
|
|
428be85 |
|
|
|
428be85 |
gdk_flush ();
|
|
|
428be85 |
gdk_error_trap_pop ();
|