From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qh1lA-0006WK-Uj for garchives@archives.gentoo.org; Wed, 13 Jul 2011 15:54:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE9EF21C0BF; Wed, 13 Jul 2011 15:53:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9387B21C0BF for ; Wed, 13 Jul 2011 15:53:52 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E17962AC258 for ; Wed, 13 Jul 2011 15:53:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 010EF8003D for ; Wed, 13 Jul 2011 15:53:51 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <3546f7e080b2d2b4383c3728472f283453535d67.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r1.ebuild gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r2.ebuild X-VCS-Directories: gnome-base/gnome-settings-daemon/ gnome-base/gnome-settings-daemon/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 3546f7e080b2d2b4383c3728472f283453535d67 Date: Wed, 13 Jul 2011 15:53:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: b0733d21e40fecc1dce37ebff2365ba0 commit: 3546f7e080b2d2b4383c3728472f283453535d67 Author: Alexandre Rostovtsev gmail com> AuthorDate: Wed Jul 13 15:41:27 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Wed Jul 13 15:51:14 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D3546f7e0 gnome-base/gnome-settings-daemon: 3.0.2-r1 =E2=86=92 3.0.2-r2, fixes mult= imedia keys Brown-paper-bag patch to reverse the logic in multimedia key grabbing. Fixes bug #375087. Thanks to Albert W. Hopkins python.net> f= or reporting the issue. --- ...ettings-daemon-3.0.2-keygrab-broken-logic.patch | 29 ++++++++++++++= ++++++ ...build =3D> gnome-settings-daemon-3.0.2-r2.ebuild} | 2 + 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon= -3.0.2-keygrab-broken-logic.patch b/gnome-base/gnome-settings-daemon/file= s/gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch new file mode 100644 index 0000000..23146b6 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-= keygrab-broken-logic.patch @@ -0,0 +1,29 @@ +From 33efc3649aa75fc77e4f1521031992376131d507 Mon Sep 17 00:00:00 2001 +From: Chris Coulson +Date: Wed, 13 Jul 2011 11:58:29 +0200 +Subject: [PATCH 01/11] common: Fix grabbing of multimedia keys + +--- + plugins/common/gsd-keygrab.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c +index 70fde7a..1d50a22 100644 +--- a/plugins/common/gsd-keygrab.c ++++ b/plugins/common/gsd-keygrab.c +@@ -146,9 +146,9 @@ grab_key_unsafe (Key *key, + * (which are useful to grab without a modifier). + */ + if ((modifiers & gsd_used_mods) =3D=3D 0 && +- (IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_M= AX) || +- IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX) || +- key->keysym =3D=3D GDK_KEY_Pause)) { ++ !IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_M= AX) && ++ !IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX) && ++ key->keysym !=3D GDK_KEY_Pause) { + GString *keycodes; +=20 + keycodes =3D g_string_new (""); +--=20 +1.7.6 + diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2= -r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2= -r2.ebuild similarity index 97% rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-= r1.ebuild rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r2= .ebuild index cfa827a..c1e266a 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r1.ebu= ild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r2.ebu= ild @@ -91,6 +91,8 @@ src_prepare() { epatch "${FILESDIR}/${P}-wacom-touch.patch" # Patches for various keyboard shortcut bugs, will be in next release epatch "${FILESDIR}/${P}-keygrab-"{defines,function-keys,range,pause}.p= atch + # bug #375087 + epatch "${FILESDIR}/${P}-keygrab-broken-logic.patch" =20 # https://bugzilla.gnome.org/show_bug.cgi?id=3D621836 # Apparently this change severely affects touchpad usability for some