debian/patches/0001-Fix-media-keys-handling-with-GTK-3.7.8.patch: Fix
media-keys handling with GTK 3.8 and XI 2.3.
(bzr r401.1.3)
William Hua
10 years ago
0 | gnome-settings-daemon (3.6.4-0ubuntu15) UNRELEASED; urgency=low | |
0 | gnome-settings-daemon (3.6.4-0ubuntu16) UNRELEASED; urgency=low | |
1 | 1 | |
2 | 2 | * debian/control.in: |
3 | 3 | - Depend on IBus 1.5.0. |
9 | 9 | - Don't use symbol from gnome-desktop 3.8. |
10 | 10 | |
11 | 11 | -- William Hua <william.hua@canonical.com> Fri, 07 Jun 2013 16:50:35 -0400 |
12 | ||
13 | gnome-settings-daemon (3.6.4-0ubuntu15) saucy; urgency=low | |
14 | ||
15 | * debian/patches/0001-Fix-media-keys-handling-with-GTK-3.7.8.patch: Fix | |
16 | media-keys handling with GTK 3.8 and XI 2.3. | |
17 | ||
18 | -- Iain Lane <iain.lane@canonical.com> Thu, 27 Jun 2013 10:34:06 +0100 | |
12 | 19 | |
13 | 20 | gnome-settings-daemon (3.6.4-0ubuntu14) saucy; urgency=low |
14 | 21 |
59 | 59 | Breaks: rhythmbox (<< 0.11.5), |
60 | 60 | banshee (<< 0.13.2+dfsg-7), |
61 | 61 | totem (<< 2.22.0), |
62 | gnome-control-center (<< 1:3.4.2-0ubuntu9), | |
62 | gnome-control-center (<< 1:3.6.3-0ubuntu18), | |
63 | 63 | gnome-session (<< 2.24), |
64 | 64 | gnome-screensaver (<< 2.28.0), |
65 | 65 | gnome-color-manager (<< 3.0), |
66 | 66 | unity-greeter (<< 0.2.1-0ubuntu1), |
67 | indicator-datetime (<< 12.10.3daily13.03.26), | |
67 | 68 | Suggests: x11-xserver-utils, |
68 | 69 | gnome-screensaver, |
69 | 70 | metacity | x-window-manager |
0 | From 14f92b1479aa065edf3f0aa86b87d4c4ff1fe2ba Mon Sep 17 00:00:00 2001 | |
1 | From: Matthias Clasen <mclasen@redhat.com> | |
2 | Date: Wed, 6 Feb 2013 23:14:22 -0500 | |
3 | Subject: [PATCH] Fix media-keys handling with GTK+ 3.7.8 | |
4 | ||
5 | GDK now requests XI 2.3 and if the X server supports that | |
6 | version, subsequent requests for a lower version yield | |
7 | a BadValue. Therefore, we need to change the code in | |
8 | gsd-input-helper.c to request 2.3 as well. | |
9 | --- | |
10 | plugins/common/gsd-input-helper.c | 9 +-------- | |
11 | 1 file changed, 1 insertion(+), 8 deletions(-) | |
12 | ||
13 | Index: b/plugins/common/gsd-input-helper.c | |
14 | =================================================================== | |
15 | --- a/plugins/common/gsd-input-helper.c | |
16 | +++ b/plugins/common/gsd-input-helper.c | |
17 | @@ -127,18 +127,11 @@ | |
18 | gdk_error_trap_push (); | |
19 | ||
20 | major = 2; | |
21 | - minor = 0; | |
22 | + minor = 3; | |
23 | ||
24 | if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) { | |
25 | gdk_error_trap_pop_ignored (); | |
26 | - /* try for 2.2, maybe gtk has already announced 2.2 support */ | |
27 | - gdk_error_trap_push (); | |
28 | - major = 2; | |
29 | - minor = 2; | |
30 | - if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) { | |
31 | - gdk_error_trap_pop_ignored (); | |
32 | return FALSE; | |
33 | - } | |
34 | } | |
35 | gdk_error_trap_pop_ignored (); | |
36 |