summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasmine Hassan <[email protected]>2012-11-03 19:03:17 +0200
committerJasmine Hassan <[email protected]>2012-11-16 09:45:51 +0200
commitae33b1c624c008ca0818ab08735968c8d01fae1c (patch)
treeb1a55eebfabcb9b0a2ba2f892708b9cdbc384360
parent4895118afc287dc511792a5f91f109a2e1f868d0 (diff)
downloadcaja-ae33b1c624c008ca0818ab08735968c8d01fae1c.tar.bz2
caja-ae33b1c624c008ca0818ab08735968c8d01fae1c.tar.xz
[lc-p] use eel_canvas_item_destroy instead of gtk_object_destroy()
http://git.gnome.org/browse/nautilus/commit/?id=f5192b6990cd9240d126974dd587b7b7525ae714
-rw-r--r--libcaja-private/caja-icon-container.c4
-rw-r--r--libcaja-private/caja-icon-dnd.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c
index 0f6898c9..1ae2cb2a 100644
--- a/libcaja-private/caja-icon-container.c
+++ b/libcaja-private/caja-icon-container.c
@@ -300,7 +300,7 @@ static void
icon_free (CajaIcon *icon)
{
/* Destroy this canvas item; the parent will unref it. */
- gtk_object_destroy (GTK_OBJECT (icon->item));
+ eel_canvas_item_destroy (EEL_CANVAS_ITEM (icon->item));
g_free (icon);
}
@@ -2990,7 +2990,7 @@ stop_rubberbanding (CajaIconContainer *container,
/* Destroy this canvas item; the parent will unref it. */
eel_canvas_item_ungrab (band_info->selection_rectangle, time);
- gtk_object_destroy (GTK_OBJECT (band_info->selection_rectangle));
+ eel_canvas_item_destroy (band_info->selection_rectangle);
band_info->selection_rectangle = NULL;
/* if only one item has been selected, use it as range
diff --git a/libcaja-private/caja-icon-dnd.c b/libcaja-private/caja-icon-dnd.c
index 2e7dc32a..449ceab8 100644
--- a/libcaja-private/caja-icon-dnd.c
+++ b/libcaja-private/caja-icon-dnd.c
@@ -375,7 +375,7 @@ caja_icon_container_dropped_icon_feedback (GtkWidget *widget,
{
/* FIXME bugzilla.gnome.org 42484:
* Is a destroy really sufficient here? Who does the unref? */
- gtk_object_destroy (GTK_OBJECT (dnd_info->shadow));
+ eel_canvas_item_destroy (dnd_info->shadow);
}
/* Build the selection list and the shadow. */
@@ -1514,7 +1514,7 @@ caja_icon_container_free_drag_data (CajaIconContainer *container)
if (dnd_info->shadow != NULL)
{
- gtk_object_destroy (GTK_OBJECT (dnd_info->shadow));
+ eel_canvas_item_destroy (dnd_info->shadow);
dnd_info->shadow = NULL;
}