summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-icon-dnd.c
diff options
context:
space:
mode:
authorJasmine Hassan <[email protected]>2012-11-26 19:16:22 +0200
committerJasmine Hassan <[email protected]>2012-12-03 21:15:16 +0200
commit4ca41b3e2371f706dd129bd8938a55cf2e421ad8 (patch)
tree9a39e87a9792c473e5e7fdd78b8a4bcda4d526bd /libcaja-private/caja-icon-dnd.c
parent83a8343b64850c98e5e650ee464e12d71fb595b8 (diff)
downloadcaja-4ca41b3e2371f706dd129bd8938a55cf2e421ad8.tar.bz2
caja-4ca41b3e2371f706dd129bd8938a55cf2e421ad8.tar.xz
[eel-background] refactor to untangle directory & desktop bg-setting code
Diffstat (limited to 'libcaja-private/caja-icon-dnd.c')
-rw-r--r--libcaja-private/caja-icon-dnd.c22
1 files changed, 8 insertions, 14 deletions
diff --git a/libcaja-private/caja-icon-dnd.c b/libcaja-private/caja-icon-dnd.c
index bd642684..f114b46a 100644
--- a/libcaja-private/caja-icon-dnd.c
+++ b/libcaja-private/caja-icon-dnd.c
@@ -684,10 +684,9 @@ receive_dropped_color (CajaIconContainer *container,
"dropped color on icon container displaying %s", uri);
g_free (uri);
- eel_background_receive_dropped_color
- (eel_get_widget_background (GTK_WIDGET (container)),
- GTK_WIDGET (container),
- action, x, y, data);
+ eel_background_set_dropped_color (eel_get_widget_background (GTK_WIDGET (container)),
+ GTK_WIDGET (container),
+ action, x, y, data);
}
}
@@ -708,10 +707,8 @@ receive_dropped_tile_image (CajaIconContainer *container, GdkDragAction action,
"dropped tile image on icon container displaying %s", uri);
g_free (uri);
- eel_background_receive_dropped_background_image
- (eel_get_widget_background (GTK_WIDGET (container)),
- action,
- gtk_selection_data_get_data (data));
+ eel_background_set_dropped_image (eel_get_widget_background (GTK_WIDGET (container)),
+ action, gtk_selection_data_get_data (data));
}
}
@@ -1260,17 +1257,14 @@ caja_icon_container_receive_dropped_icons (CajaIconContainer *container,
action |= CAJA_DND_ACTION_SET_AS_BACKGROUND;
}
}
- real_action = caja_drag_drop_action_ask
- (GTK_WIDGET (container), action);
+ real_action = caja_drag_drop_action_ask (GTK_WIDGET (container), action);
}
if (real_action == (GdkDragAction) CAJA_DND_ACTION_SET_AS_BACKGROUND)
{
selected_item = container->details->dnd_info->drag_info.selection_list->data;
- eel_background_receive_dropped_background_image
- (eel_get_widget_background (GTK_WIDGET (container)),
- real_action,
- selected_item->uri);
+ eel_background_set_dropped_image (eel_get_widget_background (GTK_WIDGET (container)),
+ real_action, selected_item->uri);
return;
}