From 4ca41b3e2371f706dd129bd8938a55cf2e421ad8 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 26 Nov 2012 19:16:22 +0200 Subject: [eel-background] refactor to untangle directory & desktop bg-setting code --- libcaja-private/caja-icon-dnd.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'libcaja-private') 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; } -- cgit v1.2.1