diff options
| author | Wolfgang Ulbrich <[email protected]> | 2015-11-16 14:02:19 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2015-12-02 12:54:10 +0100 |
| commit | 8ea8868b6e6cfa626905b52b4b94b10b60d43139 (patch) | |
| tree | 8b280cf03d6569a1991f82b3449f8714bd31ebed /plugins/mouse/msd-mouse-manager.c | |
| parent | ef58118cad934b5fa5bf5ca1abe2d7f3d6f56836 (diff) | |
| download | mate-settings-daemon-8ea8868b6e6cfa626905b52b4b94b10b60d43139.tar.bz2 mate-settings-daemon-8ea8868b6e6cfa626905b52b4b94b10b60d43139.tar.xz | |
GTK3: use gdk_error_trap_pop_ignored() when appropriate
taken from:
https://git.gnome.org/browse/gnome-settings-daemon/commit/?id=544526d
Diffstat (limited to 'plugins/mouse/msd-mouse-manager.c')
| -rw-r--r-- | plugins/mouse/msd-mouse-manager.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/plugins/mouse/msd-mouse-manager.c b/plugins/mouse/msd-mouse-manager.c index a198b7c..4bcaabc 100644 --- a/plugins/mouse/msd-mouse-manager.c +++ b/plugins/mouse/msd-mouse-manager.c @@ -302,7 +302,11 @@ touchpad_has_single_button (XDevice *device) if (rc == Success) XFree (data); +#if GTK_CHECK_VERSION (3, 0, 0) + gdk_error_trap_pop_ignored (); +#else gdk_error_trap_pop (); +#endif return is_single_button; } @@ -568,7 +572,11 @@ set_middle_button (MsdMouseManager *manager, XChangeDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device, prop, type, format, PropModeReplace, data, nitems); +#if GTK_CHECK_VERSION (3, 0, 0) + gdk_error_trap_pop_ignored (); +#else gdk_error_trap_pop (); +#endif } XFree (data); |