diff options
Diffstat (limited to 'plugins/clipboard/msd-clipboard-manager.c')
| -rw-r--r-- | plugins/clipboard/msd-clipboard-manager.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/clipboard/msd-clipboard-manager.c b/plugins/clipboard/msd-clipboard-manager.c index fb5ddba..ef4007a 100644 --- a/plugins/clipboard/msd-clipboard-manager.c +++ b/plugins/clipboard/msd-clipboard-manager.c @@ -4,6 +4,7 @@ * Copyright (C) 2007 Anders Carlsson * Copyright (C) 2007 Rodrigo Moya * Copyright (C) 2007 William Jon McCann <[email protected]> + * Copyright (C) 2012-2021 MATE Developers * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -404,7 +405,6 @@ convert_clipboard_manager (MsdClipboardManager *manager, int format; unsigned long nitems; unsigned long remaining; - Atom *targets = NULL; display = gdk_display_get_default (); @@ -415,6 +415,8 @@ convert_clipboard_manager (MsdClipboardManager *manager, */ finish_selection_request (manager, xev, False); } else { + Atom *targets = NULL; + gdk_x11_display_error_trap_push (display); clipboard_manager_watch_cb (manager, @@ -858,7 +860,6 @@ start_clipboard_idle_cb (MsdClipboardManager *manager) { XClientMessageEvent xev; - mate_settings_profile_start (NULL); init_atoms (manager->priv->display); |