← Back to branch summary

~jm-leddy/ubuntu/precise/gnome-settings-daemon/micmute

« back to all changes in this revision

Viewing changes to .pc/10_smaller_syndaemon_timeout.patch/plugins/mouse/gsd-mouse-manager.c

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2012-05-23 21:41:42 UTC
  • mfrom: (1.1.61)
  • Revision ID: package-import@ubuntu.com-20120523214142-ysgz8t26t9036bo8
Tags: 3.4.2-0ubuntu0.1
https://launchpad.net/bugs/946295
https://launchpad.net/bugs/948347
https://launchpad.net/bugs/963704
* New upstream version
* debian/patches/git_keyring_environment.patch:
  - dropped, the fix is in the new version
* debian/patches/xsettings_signal_handling.patch:
  - upstream bugzilla patch, fix segfaults in the xsettings code which
    seem to happen at logout (lp: #946295, #948347, #963704)

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/10_smaller_syndaemon_timeout.patch/plugins/mouse/gsd-mouse-manager.c
317
317
        gint n_buttons;
318
318
        const char *name;
319
319
 
320
 
        buttons = g_new (guchar, buttons_capacity);
321
 
 
322
320
        name = gdk_device_get_name (device);
323
321
        if (name != NULL && g_str_equal ("Virtual core XTEST pointer", name))
324
322
                return;
329
327
        if (xdevice == NULL)
330
328
                return;
331
329
 
 
330
        buttons = g_new (guchar, buttons_capacity);
 
331
 
332
332
        /* If the device is a touchpad, swap tap buttons
333
333
         * around too, otherwise a tap would be a right-click */
334
334
        if (device_is_touchpad (xdevice)) {
515
515
#endif
516
516
}
517
517
 
 
518
static gboolean
 
519
have_program_in_path (const char *name)
 
520
{
 
521
        gchar *path;
 
522
        gboolean result;
 
523
 
 
524
        path = g_find_program_in_path (name);
 
525
        result = (path != NULL);
 
526
        g_free (path);
 
527
        return result;
 
528
}
 
529
 
518
530
static void
519
531
syndaemon_died (GPid pid, gint status, gpointer user_data)
520
532
{
542
554
                args[4] = "-R";
543
555
                args[5] = NULL;
544
556
 
545
 
                if (!g_find_program_in_path (args[0]))
 
557
                if (!have_program_in_path (args[0]))
546
558
                        return 0;
547
559
 
548
560
                /* we must use G_SPAWN_DO_NOT_REAP_CHILD to avoid