| 1 |
remi 08/12/04 12:46:27 |
| 2 |
|
| 3 |
Modified: |
| 4 |
gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch |
| 5 |
Log: |
| 6 |
gnome-base/gnome-settings-daemon: upstream proposed a different patch, let's use that instead |
| 7 |
(Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo-r2 x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch 2 Dec 2008 15:02:18 -0000 1.1 |
| 23 |
+++ gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch 4 Dec 2008 12:46:27 -0000 1.2 |
| 24 |
@@ -1,22 +1,20 @@ |
| 25 |
Index: plugins/mouse/gsd-mouse-manager.c |
| 26 |
=================================================================== |
| 27 |
---- plugins/mouse/gsd-mouse-manager.c (révision 621) |
| 28 |
-+++ plugins/mouse/gsd-mouse-manager.c (copie de travail) |
| 29 |
-@@ -328,6 +328,17 @@ |
| 30 |
+--- plugins/mouse/gsd-mouse-manager.c (revision 621) |
| 31 |
++++ plugins/mouse/gsd-mouse-manager.c (working copy) |
| 32 |
+@@ -329,9 +329,14 @@ devicepresence_filter (GdkXEvent *xevent |
| 33 |
+ static void |
| 34 |
set_devicepresence_handler (GsdMouseManager *manager) |
| 35 |
{ |
| 36 |
- Display *display = gdk_x11_get_default_xdisplay (); |
| 37 |
-+ |
| 38 |
-+ XExtensionVersion *version = XGetExtensionVersion (display, INAME); |
| 39 |
-+ if (!version || version == (XExtensionVersion*) NoSuchExtension) |
| 40 |
-+ return; |
| 41 |
-+ |
| 42 |
-+ if (!version->present) |
| 43 |
-+ { |
| 44 |
-+ XFree (version); |
| 45 |
-+ return; |
| 46 |
-+ } |
| 47 |
-+ |
| 48 |
+- Display *display = gdk_x11_get_default_xdisplay (); |
| 49 |
++ Display *display; |
| 50 |
XEventClass class_presence; |
| 51 |
int xi_presence; |
| 52 |
++ |
| 53 |
++ if (!supports_xinput_devices ()) |
| 54 |
++ return; |
| 55 |
++ |
| 56 |
++ display = gdk_x11_get_default_xdisplay (); |
| 57 |
|
| 58 |
+ gdk_error_trap_push (); |
| 59 |
+ DevicePresence (display, xi_presence, class_presence); |
Archives