summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-clipboard.c
diff options
context:
space:
mode:
Diffstat (limited to 'libcaja-private/caja-clipboard.c')
-rw-r--r--libcaja-private/caja-clipboard.c19
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);
}
}