summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-clipboard.c
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-11-16 05:08:48 -0800
committerStefano Karapetsas <[email protected]>2012-11-16 05:08:48 -0800
commitdc66bc40724191f0068869773576dc4edf042c6f (patch)
tree74b9684feea188736b21f2c829f29befaaf2e9da /libcaja-private/caja-clipboard.c
parent935e1fed604f48e68d125d205c890a59f46f8f21 (diff)
parent1466df20591105550738a1d0784a623af9909abf (diff)
downloadcaja-dc66bc40724191f0068869773576dc4edf042c6f.tar.bz2
caja-dc66bc40724191f0068869773576dc4edf042c6f.tar.xz
Merge pull request #42 from jasmineaura/develop
Bring Caja up to speed, stage1
Diffstat (limited to 'libcaja-private/caja-clipboard.c')
-rw-r--r--libcaja-private/caja-clipboard.c23
1 files changed, 9 insertions, 14 deletions
diff --git a/libcaja-private/caja-clipboard.c b/libcaja-private/caja-clipboard.c
index b1614509..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;
@@ -432,7 +431,7 @@ owner_change_callback (GtkClipboard *clipboard,
}
static void
-target_destroy_callback (GtkObject *object,
+target_destroy_callback (GtkWidget *object,
gpointer callback_data)
{
TargetCallbackData *target_data;
@@ -440,7 +439,7 @@ target_destroy_callback (GtkObject *object,
g_assert (callback_data != NULL);
target_data = callback_data;
- if (clipboard_items_are_merged_in (GTK_WIDGET(object)))
+ if (clipboard_items_are_merged_in (object))
{
merge_out_clipboard_menu_items (G_OBJECT (object), callback_data);
}
@@ -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);
}
}