summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-10-28 16:51:13 +0300
committermonsta <[email protected]>2016-10-28 16:51:13 +0300
commitb8e1b5ba90aee1ca73909230744270c261099ff4 (patch)
treec9271495eabb3c59bce4b477c034595624f4b6f7 /plugins
parent3ce6c99a937b1fcfef000b38de58204b33c48870 (diff)
downloadmate-settings-daemon-b8e1b5ba90aee1ca73909230744270c261099ff4.tar.bz2
mate-settings-daemon-b8e1b5ba90aee1ca73909230744270c261099ff4.tar.xz
mouse: a bit more of refactoring, less push/pop calls
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mouse/msd-mouse-manager.c33
1 files changed, 11 insertions, 22 deletions
diff --git a/plugins/mouse/msd-mouse-manager.c b/plugins/mouse/msd-mouse-manager.c
index 3f52556..43b0267 100644
--- a/plugins/mouse/msd-mouse-manager.c
+++ b/plugins/mouse/msd-mouse-manager.c
@@ -411,7 +411,7 @@ set_middle_button (MsdMouseManager *manager,
XDevice *device;
Atom prop;
Atom type;
- int format;
+ int format, rc;
unsigned long nitems, bytes_after;
unsigned char *data;
@@ -424,39 +424,28 @@ set_middle_button (MsdMouseManager *manager,
gdk_error_trap_push ();
device = XOpenDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device_info->id);
-
if ((gdk_error_trap_pop () != 0) ||
(device == NULL))
return;
gdk_error_trap_push ();
+ rc = XGetDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+ device, prop, 0, 1, False, XA_INTEGER, &type, &format,
+ &nitems, &bytes_after, &data);
- XGetDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- device, prop, 0, 1, False, XA_INTEGER, &type, &format,
- &nitems, &bytes_after, &data);
-
- if ((gdk_error_trap_pop () != 0)) {
- XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device);
- return;
- }
-
- if (format == 8 && type == XA_INTEGER && nitems == 1) {
+ if (rc == Success && format == 8 && type == XA_INTEGER && nitems == 1) {
data[0] = middle_button ? 1 : 0;
-
- gdk_error_trap_push ();
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);
- XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device);
+ if (rc == Success)
+ XFree (data);
+ XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device);
+ if (gdk_error_trap_pop ()) {
+ g_warning ("Error in setting middle button emulation on \"%s\"", device_info->name);
+ }
}
static void