diff options
| author | Роман Донченко <dpb@corrigendum.ru> | 2017-11-12 00:25:54 +0300 |
|---|---|---|
| committer | Rui Matos <tiagomatos@gmail.com> | 2017-11-21 19:05:22 +0100 |
| commit | e9a89d6f8ba165ef841d899d739770a76c59e669 (patch) | |
| tree | 6655514c0fb9584c4a9efbba1f5f3b1cd4a1a156 | |
| parent | 3c4dd15fab3a1927431f6536e3058b4c0a5a749c (diff) | |
| download | gnome-settings-daemon-e9a89d6f8ba165ef841d899d739770a76c59e669.tar.gz | |
clipboard: factor out the freeing of priv->contents into a function
https://bugzilla.gnome.org/show_bug.cgi?id=790344
| -rw-r--r-- | plugins/clipboard/gsd-clipboard-manager.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/plugins/clipboard/gsd-clipboard-manager.c b/plugins/clipboard/gsd-clipboard-manager.c index 64a888b9..88be6c99 100644 --- a/plugins/clipboard/gsd-clipboard-manager.c +++ b/plugins/clipboard/gsd-clipboard-manager.c @@ -195,6 +195,14 @@ clipboard_bytes_per_item (int format) } static void +free_contents (GsdClipboardManager *manager) +{ + list_foreach (manager->priv->contents, (Callback)target_data_unref, NULL); + list_free (manager->priv->contents); + manager->priv->contents = NULL; +} + +static void save_targets (GsdClipboardManager *manager, Atom *save_targets, int nitems) @@ -694,9 +702,7 @@ clipboard_manager_process_event (GsdClipboardManager *manager, switch (xev->xany.type) { case DestroyNotify: if (xev->xdestroywindow.window == manager->priv->requestor) { - list_foreach (manager->priv->contents, (Callback)target_data_unref, NULL); - list_free (manager->priv->contents); - manager->priv->contents = NULL; + free_contents (manager); clipboard_manager_watch_cb (manager, manager->priv->requestor, @@ -720,9 +726,7 @@ clipboard_manager_process_event (GsdClipboardManager *manager, if (xev->xselectionclear.selection == XA_CLIPBOARD_MANAGER) { /* We lost the manager selection */ if (manager->priv->contents) { - list_foreach (manager->priv->contents, (Callback)target_data_unref, NULL); - list_free (manager->priv->contents); - manager->priv->contents = NULL; + free_contents (manager); XSetSelectionOwner (manager->priv->display, XA_CLIPBOARD, @@ -733,9 +737,7 @@ clipboard_manager_process_event (GsdClipboardManager *manager, } if (xev->xselectionclear.selection == XA_CLIPBOARD) { /* We lost the clipboard selection */ - list_foreach (manager->priv->contents, (Callback)target_data_unref, NULL); - list_free (manager->priv->contents); - manager->priv->contents = NULL; + free_contents (manager); clipboard_manager_watch_cb (manager, manager->priv->requestor, False, @@ -984,11 +986,7 @@ gsd_clipboard_manager_stop (GsdClipboardManager *manager) manager->priv->conversions = NULL; } - if (manager->priv->contents != NULL) { - list_foreach (manager->priv->contents, (Callback) target_data_unref, NULL); - list_free (manager->priv->contents); - manager->priv->contents = NULL; - } + free_contents (manager); } static void |