1 |
dev-zero 11/02/24 09:30:11 |
2 |
|
3 |
Added: gpointing-device-settings-1.5.1-gsd-crash.patch |
4 |
Log: |
5 |
Added patch to fix crash on VT switch (bug #345343, thanks to Alexandre Rostovtsev for the patch and Robert Swain for the analysis), removed our own desktop entry (bug #345959). |
6 |
|
7 |
(Portage version: 2.1.9.39/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-crash.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-crash.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-crash.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: gpointing-device-settings-1.5.1-gsd-crash.patch |
16 |
=================================================================== |
17 |
diff -ru gpointing-device-settings-1.5.1-orig/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c gpointing-device-settings-1.5.1/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c |
18 |
--- gpointing-device-settings-1.5.1-orig/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c 2010-12-20 01:29:09.204274003 -0500 |
19 |
+++ gpointing-device-settings-1.5.1/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c 2010-12-20 02:15:21.652274002 -0500 |
20 |
@@ -96,19 +96,21 @@ |
21 |
XDevicePresenceNotifyEvent *notify_event = (XDevicePresenceNotifyEvent *)xev; |
22 |
|
23 |
device_info = gpds_xinput_utils_get_device_info_from_id(notify_event->deviceid, NULL); |
24 |
- if (notify_event->devchange == DeviceEnabled) { |
25 |
- GsdPointingDeviceManager *manager; |
26 |
+ if (device_info) { |
27 |
+ if (notify_event->devchange == DeviceEnabled) { |
28 |
+ GsdPointingDeviceManager *manager; |
29 |
|
30 |
- if (has_manager(plugin, device_info->name)) |
31 |
- return GDK_FILTER_CONTINUE; |
32 |
+ if (has_manager(plugin, device_info->name)) |
33 |
+ return GDK_FILTER_CONTINUE; |
34 |
|
35 |
- manager = gsd_pointing_device_manager_new(gdk_x11_get_xatom_name(device_info->type), |
36 |
- device_info->name); |
37 |
- if (manager) { |
38 |
- gsd_pointing_device_manager_start(manager, NULL); |
39 |
- plugin->managers = g_list_prepend(plugin->managers, manager); |
40 |
+ manager = gsd_pointing_device_manager_new(gdk_x11_get_xatom_name(device_info->type), |
41 |
+ device_info->name); |
42 |
+ if (manager) { |
43 |
+ gsd_pointing_device_manager_start(manager, NULL); |
44 |
+ plugin->managers = g_list_prepend(plugin->managers, manager); |
45 |
+ } |
46 |
+ } else if (notify_event->devchange == DeviceRemoved) { |
47 |
} |
48 |
- } else if (notify_event->devchange == DeviceRemoved) { |
49 |
} |
50 |
} |