summaryrefslogtreecommitdiff
path: root/plugins/clipboard
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-11-20 22:24:08 +0300
committermonsta <[email protected]>2016-11-20 22:24:08 +0300
commitde1227d4355f56017270f3a7541b8be21fd955af (patch)
tree37ad9b1c13c571ed51da2c5649e33cb9a2a9e7fe /plugins/clipboard
parentc0e9048f916f4141292ca3b107735496e698cac5 (diff)
downloadmate-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/clipboard')
-rw-r--r--plugins/clipboard/msd-clipboard-manager.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/plugins/clipboard/msd-clipboard-manager.c b/plugins/clipboard/msd-clipboard-manager.c
index f2d7e62..fc07228 100644
--- a/plugins/clipboard/msd-clipboard-manager.c
+++ b/plugins/clipboard/msd-clipboard-manager.c
@@ -37,7 +37,6 @@
#include <glib/gi18n.h>
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
@@ -151,11 +150,7 @@ send_selection_notify (MsdClipboardManager *manager,
(XEvent *)&notify);
XSync (manager->priv->display, False);
-#if GTK_CHECK_VERSION (3, 0, 0)
gdk_error_trap_pop_ignored ();
-#else
- gdk_error_trap_pop ();
-#endif
}
static void
@@ -182,11 +177,7 @@ finish_selection_request (MsdClipboardManager *manager,
False, NoEventMask, (XEvent *) &notify);
XSync (manager->priv->display, False);
-#if GTK_CHECK_VERSION (3, 0, 0)
gdk_error_trap_pop_ignored ();
-#else
- gdk_error_trap_pop ();
-#endif
}
static int
@@ -562,11 +553,7 @@ convert_clipboard_target (IncrConversion *rdata,
XSync (manager->priv->display, False);
-#if GTK_CHECK_VERSION (3, 0, 0)
gdk_error_trap_pop_ignored ();
-#else
- gdk_error_trap_pop ();
-#endif
}
}
}