[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#710894: pu: package gnome-settings-daemon/3.4.2+git20121218.7c1322-3



I would like to include the attached fix in this p-u upload. I haven't uploaded
the fix to sid because g-s-d just started to ftbfs there because of the new
cups. I will include a fix in sid as well if I can fix the ftbfs soon.

Basically debian/patches/10_smaller_syndaemon_timeout.patch is broken. It adds
an element to fixed-sized array without increasing its size. This makes g-s-d
crash when the "disable touchpad when typing" option is enabled. See #684998 and
duplicates.

I'm attaching the old version and the new version of the patch.

Regards,
Emilio
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -567,7 +567,7 @@
 {
         if (state && touchpad_is_present ()) {
                 GError *error = NULL;
-                char *args[6];
+                char *args[7];
 
                 if (manager->priv->syndaemon_spawned)
                         return 0;
@@ -577,7 +577,8 @@
                 args[2] = "1.0";
                 args[3] = "-K";
                 args[4] = "-R";
-                args[5] = NULL;
+                args[5] = "-t";
+                args[6] = NULL;
 
                 if (!have_program_in_path (args[0]))
                         return 0;

Attachment: 10_smaller_syndaemon_timeout.patch.old
Description: application/trash


Reply to: