summaryrefslogtreecommitdiff
path: root/plugins/clipboard
diff options
context:
space:
mode:
authorrbuj <[email protected]>2020-12-20 21:27:33 +0100
committerraveit65 <[email protected]>2021-01-07 18:14:36 +0100
commit25403b779f27d4e84640bb592c6b231ad3869ae3 (patch)
treeacd6df23c16fbc76631d128e266cddbcaac749fb /plugins/clipboard
parent9e9508b5a32b1353dd095eccc376512893e81b7e (diff)
downloadmate-settings-daemon-25403b779f27d4e84640bb592c6b231ad3869ae3.tar.bz2
mate-settings-daemon-25403b779f27d4e84640bb592c6b231ad3869ae3.tar.xz
Remove warning -Wshadow
Diffstat (limited to 'plugins/clipboard')
-rw-r--r--plugins/clipboard/msd-clipboard-manager.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/clipboard/msd-clipboard-manager.c b/plugins/clipboard/msd-clipboard-manager.c
index fb5ddba..d99f04f 100644
--- a/plugins/clipboard/msd-clipboard-manager.c
+++ b/plugins/clipboard/msd-clipboard-manager.c
@@ -404,7 +404,6 @@ convert_clipboard_manager (MsdClipboardManager *manager,
int format;
unsigned long nitems;
unsigned long remaining;
- Atom *targets = NULL;
display = gdk_display_get_default ();
@@ -415,6 +414,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,