← Back to branch summary

~ubuntu-branches/ubuntu/utopic/gnome-settings-daemon/utopic

« back to all changes in this revision

Viewing changes to plugins/mouse/gsd-locate-pointer.c

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Sebastien Bacher, Robert Ancell, Rico Tzschichholz, Iain Lane
  • Date: 2012-11-21 17:16:23 UTC
  • mfrom: (1.1.62)
  • Revision ID: package-import@ubuntu.com-20121121171623-k7iufrs14qoiozeq
Tags: 3.6.3-0ubuntu1
https://launchpad.net/bugs/1008840
[ Sebastien Bacher ]
* New upstream version (lp: #1008840)
* debian/patches/git*,
  debian/patches/power-ignore-bad-dbus-requests.patch,
  debian/patches/power-ignore-bad-dbus-requests.patch,
  debian/patches/10_smaller_syndaemon_timeout.patch: 
  - dropped, those fixes are in the new version
* debian/control.in:
  - restore build-depends on libgnomekbd-dev, libxklavier-dev,
    drop the build-depends on libxkbfile-dev
* debian/patches/20_migrate_background_uri.patch:
  - dropped, it was only needed until the LTS
* debian/patches/40_xres_lcddefault.patch:
  - dropped, that was a workaround for libreoffice that shouldn't be
    needed and we should better fix libreoffice
* debian/patches/61_unity_use_application_indicator.patch:
  - drop the keyboard indicator code, that will need to be turned 
    into a proper indicator refactored to handle the new ibus config
* debian/patches/90_set_gmenus_xsettings.patch:
  - refreshed for the new version
* debian/patches/revert_new_ibus_use.patch:
  - revert keyboard code to our 3.4 version
* debian/patches/sync_keyboard_layout_to_accountsservice.patch:
  - dropped, the changes are included in the previous patch

[ Robert Ancell ]
* New upstream release
* debian/control:
  - Bump build-depends on libgnome-desktop-3-dev, libwacom-dev
  - Drop build-depends on libgnomekbd-dev, libxklavier-dev
  - Add build-depends on libxkbfile-dev

[ Rico Tzschichholz ]
* debian/control.in:
  - Build-depend on gtk-doc-tools

[ Iain Lane ]
* New upstream release
* Refresh patches and remove those applied upstream.
* Remove gstreamer BDs which are now obsolete. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/mouse/gsd-locate-pointer.c
350
350
 
351
351
  GdkScreen *screen = (GdkScreen *)data;
352
352
 
 
353
  if (xev->type == ButtonPress)
 
354
    {
 
355
      XAllowEvents (xev->xbutton.display,
 
356
                    ReplayPointer,
 
357
                    xev->xbutton.time);
 
358
      XUngrabButton (xev->xbutton.display,
 
359
                     AnyButton,
 
360
                     AnyModifier,
 
361
                     xev->xbutton.window);
 
362
      XUngrabKeyboard (xev->xbutton.display,
 
363
                       xev->xbutton.time);
 
364
    }
 
365
 
353
366
  if (xev->type == KeyPress || xev->type == KeyRelease)
354
367
    {
355
368
      /* get the keysym */
367
380
              XAllowEvents (xev->xkey.display,
368
381
                            SyncKeyboard,
369
382
                            xev->xkey.time);
 
383
              XGrabButton (xev->xkey.display,
 
384
                           AnyButton,
 
385
                           AnyModifier,
 
386
                           xev->xkey.window,
 
387
                           False,
 
388
                           ButtonPressMask,
 
389
                           GrabModeSync,
 
390
                           GrabModeAsync,
 
391
                           None,
 
392
                           None);
370
393
            }
371
394
          else
372
395
            {
 
396
              XUngrabButton (xev->xkey.display,
 
397
                             AnyButton,
 
398
                             AnyModifier,
 
399
                             xev->xkey.window);
373
400
              XAllowEvents (xev->xkey.display,
374
401
                            AsyncKeyboard,
375
402
                            xev->xkey.time);
381
408
          XAllowEvents (xev->xkey.display,
382
409
                        ReplayKeyboard,
383
410
                        xev->xkey.time);
384
 
          XUngrabKeyboard (gdk_x11_get_default_xdisplay (),
 
411
          XUngrabButton (xev->xkey.display,
 
412
                         AnyButton,
 
413
                         AnyModifier,
 
414
                         xev->xkey.window);
 
415
          XUngrabKeyboard (xev->xkey.display,
385
416
                           xev->xkey.time);
386
417
        }
387
418
    }