From de1227d4355f56017270f3a7541b8be21fd955af Mon Sep 17 00:00:00 2001
From: monsta <monsta@inbox.ru>
Date: Sun, 20 Nov 2016 22:24:08 +0300
Subject: move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option

and require libmatekbd and libmate-desktop >= 1.17
---
 plugins/common/msd-input-helper.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'plugins/common/msd-input-helper.c')

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;
-- 
cgit v1.2.1