diff options
author | Jasmine Hassan <[email protected]> | 2012-10-18 10:30:31 +0200 |
---|---|---|
committer | Jasmine Hassan <[email protected]> | 2012-11-16 09:49:19 +0200 |
commit | 7a42b9b076d6b831c89bd0b9e996368c1c95aef3 (patch) | |
tree | e878419f312aa059effcd796b11b7f84125e7ad2 /libcaja-private/caja-clipboard.c | |
parent | decb73c787a2709f977305a4a6da052227d7b37d (diff) | |
download | caja-7a42b9b076d6b831c89bd0b9e996368c1c95aef3.tar.bz2 caja-7a42b9b076d6b831c89bd0b9e996368c1c95aef3.tar.xz |
[all] use g_list_free() and g_strcmp0 instead of eel functions
Was: general: use g_list_free_full() instead of eel functions
http://git.gnome.org/browse/nautilus/commit/?id=5e669515fd7f760382e6b7aa1449734a35a2d7f4
.
Instead of g_list_free_full(), we use g_list_foreach and g_list_free() to avoid
unnecessary glib dependency bump to 2.28
Diffstat (limited to 'libcaja-private/caja-clipboard.c')
-rw-r--r-- | libcaja-private/caja-clipboard.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/libcaja-private/caja-clipboard.c b/libcaja-private/caja-clipboard.c index bc06675a..bce5d552 100644 --- a/libcaja-private/caja-clipboard.c +++ b/libcaja-private/caja-clipboard.c @@ -33,7 +33,6 @@ #include <glib/gi18n.h> #include <gtk/gtk.h> -#include <eel/eel-glib-extensions.h> #include <string.h> typedef struct _TargetCallbackData TargetCallbackData; @@ -662,31 +661,27 @@ caja_clipboard_clear_if_colliding_uris (GtkWidget *widget, collision = FALSE; data = gtk_clipboard_wait_for_contents (caja_clipboard_get (widget), copied_files_atom); - if (data == NULL) - { + if (data == NULL) { return; } clipboard_item_uris = caja_clipboard_get_uri_list_from_selection_data (data, NULL, copied_files_atom); - for (l = (GList *) item_uris; l; l = l->next) - { + for (l = (GList *) item_uris; l; l = l->next) { if (g_list_find_custom ((GList *) item_uris, l->data, - (GCompareFunc) g_strcmp0)) - { + (GCompareFunc) g_strcmp0)) { collision = TRUE; break; } } - if (collision) - { + if (collision) { gtk_clipboard_clear (caja_clipboard_get (widget)); } - if (clipboard_item_uris) - { - eel_g_list_free_deep (clipboard_item_uris); + if (clipboard_item_uris) { + g_list_foreach (clipboard_item_uris, (GFunc) g_free, NULL); + g_list_free(clipboard_item_uris); } } |