From 8ea8868b6e6cfa626905b52b4b94b10b60d43139 Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Mon, 16 Nov 2015 14:02:19 +0100 Subject: GTK3: use gdk_error_trap_pop_ignored() when appropriate taken from: https://git.gnome.org/browse/gnome-settings-daemon/commit/?id=544526d --- plugins/clipboard/msd-clipboard-manager.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'plugins/clipboard/msd-clipboard-manager.c') diff --git a/plugins/clipboard/msd-clipboard-manager.c b/plugins/clipboard/msd-clipboard-manager.c index 93b1858..770cfe7 100644 --- a/plugins/clipboard/msd-clipboard-manager.c +++ b/plugins/clipboard/msd-clipboard-manager.c @@ -151,7 +151,11 @@ send_selection_notify (MsdClipboardManager *manager, (XEvent *)¬ify); 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 @@ -178,7 +182,11 @@ finish_selection_request (MsdClipboardManager *manager, False, NoEventMask, (XEvent *) ¬ify); 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 @@ -554,7 +562,11 @@ 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 } } } -- cgit v1.2.1