diff options
| author | monsta <[email protected]> | 2016-11-20 22:24:08 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-11-20 22:24:08 +0300 |
| commit | de1227d4355f56017270f3a7541b8be21fd955af (patch) | |
| tree | 37ad9b1c13c571ed51da2c5649e33cb9a2a9e7fe /plugins/common/msd-input-helper.c | |
| parent | c0e9048f916f4141292ca3b107735496e698cac5 (diff) | |
| download | mate-settings-daemon-de1227d4355f56017270f3a7541b8be21fd955af.tar.bz2 mate-settings-daemon-de1227d4355f56017270f3a7541b8be21fd955af.tar.xz | |
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
and require libmatekbd and libmate-desktop >= 1.17
Diffstat (limited to 'plugins/common/msd-input-helper.c')
| -rw-r--r-- | plugins/common/msd-input-helper.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/plugins/common/msd-input-helper.c b/plugins/common/msd-input-helper.c index 35cc060..7101e43 100644 --- a/plugins/common/msd-input-helper.c +++ b/plugins/common/msd-input-helper.c @@ -22,7 +22,6 @@ #include <gdk/gdk.h> #include <gdk/gdkx.h> -#include <gtk/gtk.h> #include <sys/types.h> #include <X11/Xatom.h> @@ -66,19 +65,12 @@ device_is_touchpad (XDeviceInfo *deviceinfo) if ((XGetDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device, prop, 0, 1, False, XA_INTEGER, &realtype, &realformat, &nitems, &bytes_after, &data) == Success) && (realtype != None)) { -#if GTK_CHECK_VERSION (3, 0, 0) gdk_error_trap_pop_ignored (); -#else - gdk_error_trap_pop (); -#endif XFree (data); return device; } -#if GTK_CHECK_VERSION (3, 0, 0) + gdk_error_trap_pop_ignored (); -#else - gdk_error_trap_pop (); -#endif XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device); return NULL; |