diff options
Diffstat (limited to 'plugins/clipboard')
-rw-r--r-- | plugins/clipboard/list.c | 4 | ||||
-rw-r--r-- | plugins/clipboard/list.h | 5 | ||||
-rw-r--r-- | plugins/clipboard/msd-clipboard-manager.c | 5 | ||||
-rw-r--r-- | plugins/clipboard/msd-clipboard-manager.h | 1 | ||||
-rw-r--r-- | plugins/clipboard/msd-clipboard-plugin.c | 1 | ||||
-rw-r--r-- | plugins/clipboard/msd-clipboard-plugin.h | 1 | ||||
-rw-r--r-- | plugins/clipboard/xutils.c | 2 | ||||
-rw-r--r-- | plugins/clipboard/xutils.h | 2 |
8 files changed, 12 insertions, 9 deletions
diff --git a/plugins/clipboard/list.c b/plugins/clipboard/list.c index 7f60bb1..eaadcf8 100644 --- a/plugins/clipboard/list.c +++ b/plugins/clipboard/list.c @@ -1,5 +1,6 @@ /* * Copyright © 2004 Red Hat, Inc. + * Copyright (C) 2012-2021 MATE Developers * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -24,7 +25,6 @@ #include <stdlib.h> #include <list.h> - void list_foreach (List *list, Callback func, @@ -82,7 +82,7 @@ list_find (List *list, List * list_remove (List *list, - void *data) + const void *data) { List *tmp, *prev; diff --git a/plugins/clipboard/list.h b/plugins/clipboard/list.h index 04cf1e1..fcbbf02 100644 --- a/plugins/clipboard/list.h +++ b/plugins/clipboard/list.h @@ -1,5 +1,6 @@ /* * Copyright © 2004 Red Hat, Inc. + * Copyright (C) 2012-2021 MATE Developers * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -23,12 +24,10 @@ #ifndef LIST_H #define LIST_H - typedef struct _List List; typedef void (*Callback) (void *data, void *user_data); - struct _List { void *data; @@ -49,7 +48,7 @@ List *list_find (List *list, ListFindFunc func, void *user_data); List *list_remove (List *list, - void *data); + const void *data); int list_length (List *list); List *list_copy (List *list); 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); diff --git a/plugins/clipboard/msd-clipboard-manager.h b/plugins/clipboard/msd-clipboard-manager.h index 5e4465a..04ca380 100644 --- a/plugins/clipboard/msd-clipboard-manager.h +++ b/plugins/clipboard/msd-clipboard-manager.h @@ -1,6 +1,7 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- * * 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 diff --git a/plugins/clipboard/msd-clipboard-plugin.c b/plugins/clipboard/msd-clipboard-plugin.c index 7951c60..5c6fa76 100644 --- a/plugins/clipboard/msd-clipboard-plugin.c +++ b/plugins/clipboard/msd-clipboard-plugin.c @@ -1,6 +1,7 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- * * 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 diff --git a/plugins/clipboard/msd-clipboard-plugin.h b/plugins/clipboard/msd-clipboard-plugin.h index 171282d..6953f17 100644 --- a/plugins/clipboard/msd-clipboard-plugin.h +++ b/plugins/clipboard/msd-clipboard-plugin.h @@ -1,6 +1,7 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- * * 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 diff --git a/plugins/clipboard/xutils.c b/plugins/clipboard/xutils.c index ef57a85..4aba854 100644 --- a/plugins/clipboard/xutils.c +++ b/plugins/clipboard/xutils.c @@ -1,5 +1,6 @@ /* * Copyright © 2004 Red Hat, Inc. + * Copyright (C) 2012-2021 MATE Developers * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -41,7 +42,6 @@ Atom XA_TIMESTAMP; unsigned long SELECTION_MAX_SIZE = 0; - void init_atoms (Display *display) { diff --git a/plugins/clipboard/xutils.h b/plugins/clipboard/xutils.h index 12a00e4..01aab6f 100644 --- a/plugins/clipboard/xutils.h +++ b/plugins/clipboard/xutils.h @@ -1,5 +1,6 @@ /* * Copyright © 2004 Red Hat, Inc. + * Copyright (C) 2012-2021 MATE Developers * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,7 +26,6 @@ #include <X11/Xlib.h> - extern Atom XA_ATOM_PAIR; extern Atom XA_CLIPBOARD_MANAGER; extern Atom XA_CLIPBOARD; |