Date: Sat, 11 May 2013 18:15:41 +0000 (UTC) From: Olivier Duchateau <olivierd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317901 - in head/x11/libxfce4menu: . files Message-ID: <201305111815.r4BIFfCZ005545@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivierd Date: Sat May 11 18:15:40 2013 New Revision: 317901 URL: http://svnweb.freebsd.org/changeset/ports/317901 Log: Fix keyboard shortcuts with Shift. Reviewed by: wblock@ Obtained from: Git upstream (master branch) Added: head/x11/libxfce4menu/files/patch-libxfce4kbd-private__xfce-shortcut-dialog.c (contents, props changed) head/x11/libxfce4menu/files/patch-libxfce4kbd-private__xfce-shortcuts-grabber.c (contents, props changed) Modified: head/x11/libxfce4menu/Makefile Modified: head/x11/libxfce4menu/Makefile ============================================================================== --- head/x11/libxfce4menu/Makefile Sat May 11 18:02:00 2013 (r317900) +++ head/x11/libxfce4menu/Makefile Sat May 11 18:15:40 2013 (r317901) @@ -3,7 +3,7 @@ PORTNAME= libxfce4menu PORTVERSION= 4.10.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 xfce MASTER_SITES= ${MASTER_SITE_XFCE} DISTNAME= libxfce4ui-${PORTVERSION} Added: head/x11/libxfce4menu/files/patch-libxfce4kbd-private__xfce-shortcut-dialog.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/libxfce4menu/files/patch-libxfce4kbd-private__xfce-shortcut-dialog.c Sat May 11 18:15:40 2013 (r317901) @@ -0,0 +1,13 @@ +https://bugzilla.xfce.org/show_bug.cgi?id=8744 + +--- ./libxfce4kbd-private/xfce-shortcut-dialog.c.orig 2012-04-28 19:46:52.000000000 +0000 ++++ ./libxfce4kbd-private/xfce-shortcut-dialog.c 2013-05-09 09:19:32.000000000 +0000 +@@ -327,6 +327,8 @@ + &keyval, NULL, NULL, &consumed); + + /* Get the modifiers */ ++ if ((modifiers & GDK_SHIFT_MASK) && (consumed & GDK_SHIFT_MASK)) ++ consumed &= ~GDK_SHIFT_MASK; + modifiers &= ~consumed; + modifiers &= mod_mask; + Added: head/x11/libxfce4menu/files/patch-libxfce4kbd-private__xfce-shortcuts-grabber.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/libxfce4menu/files/patch-libxfce4kbd-private__xfce-shortcuts-grabber.c Sat May 11 18:15:40 2013 (r317901) @@ -0,0 +1,24 @@ +https://bugzilla.xfce.org/show_bug.cgi?id=8744 + +--- ./libxfce4kbd-private/xfce-shortcuts-grabber.c.orig 2012-04-28 19:46:52.000000000 +0000 ++++ ./libxfce4kbd-private/xfce-shortcuts-grabber.c 2013-05-09 09:25:50.000000000 +0000 +@@ -512,8 +512,10 @@ + &keyval, NULL, NULL, &consumed); + + /* Get the modifiers */ +- modifiers &= ~consumed; ++ if ((modifiers & GDK_SHIFT_MASK) && (consumed & GDK_SHIFT_MASK)) ++ consumed &= ~GDK_SHIFT_MASK; + gdk_keymap_add_virtual_modifiers (keymap, &modifiers); ++ modifiers &= ~consumed; + modifiers &= mod_mask; + + context.keyval = keyval; +@@ -521,6 +523,7 @@ + + raw_shortcut_name = gtk_accelerator_name (keyval, modifiers); + TRACE ("Looking for %s", raw_shortcut_name); ++ gtk_accelerator_parse (raw_shortcut_name, &context.keyval, &context.modifiers); + g_free (raw_shortcut_name); + + g_hash_table_foreach (grabber->priv->keys, (GHFunc) find_event_key, &context);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305111815.r4BIFfCZ005545>