diff options
| author | Wolfgang Ulbrich <[email protected]> | 2015-11-16 14:02:19 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2015-12-02 12:54:10 +0100 |
| commit | 8ea8868b6e6cfa626905b52b4b94b10b60d43139 (patch) | |
| tree | 8b280cf03d6569a1991f82b3449f8714bd31ebed /plugins/clipboard | |
| parent | ef58118cad934b5fa5bf5ca1abe2d7f3d6f56836 (diff) | |
| download | mate-settings-daemon-8ea8868b6e6cfa626905b52b4b94b10b60d43139.tar.bz2 mate-settings-daemon-8ea8868b6e6cfa626905b52b4b94b10b60d43139.tar.xz | |
GTK3: use gdk_error_trap_pop_ignored() when appropriate
taken from:
https://git.gnome.org/browse/gnome-settings-daemon/commit/?id=544526d
Diffstat (limited to 'plugins/clipboard')
| -rw-r--r-- | plugins/clipboard/msd-clipboard-manager.c | 12 |
1 files changed, 12 insertions, 0 deletions
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 } } } |