[nautilus] Remove useless code for handling color drops
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] Remove useless code for handling color drops
- Date: Tue, 3 Aug 2010 20:24:36 +0000 (UTC)
commit 6c71e95a995db6fa15fd97fb314152481676b23a
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Tue Aug 3 22:27:21 2010 +0200
Remove useless code for handling color drops
libnautilus-private/nautilus-dnd.h | 2 -
libnautilus-private/nautilus-file-dnd.c | 1 -
libnautilus-private/nautilus-icon-dnd.c | 33 -------------------------------
3 files changed, 0 insertions(+), 36 deletions(-)
---
diff --git a/libnautilus-private/nautilus-dnd.h b/libnautilus-private/nautilus-dnd.h
index abb5e32..0f5d5c4 100644
--- a/libnautilus-private/nautilus-dnd.h
+++ b/libnautilus-private/nautilus-dnd.h
@@ -34,7 +34,6 @@
#define NAUTILUS_ICON_DND_GNOME_ICON_LIST_TYPE "x-special/gnome-icon-list"
#define NAUTILUS_ICON_DND_URI_LIST_TYPE "text/uri-list"
#define NAUTILUS_ICON_DND_NETSCAPE_URL_TYPE "_NETSCAPE_URL"
-#define NAUTILUS_ICON_DND_COLOR_TYPE "application/x-color"
#define NAUTILUS_ICON_DND_BGIMAGE_TYPE "property/bgimage"
#define NAUTILUS_ICON_DND_ROOTWINDOW_DROP_TYPE "application/x-rootwindow-drop"
#define NAUTILUS_ICON_DND_XDNDDIRECTSAVE_TYPE "XdndDirectSave0" /* XDS Protocol Type */
@@ -53,7 +52,6 @@ typedef enum {
NAUTILUS_ICON_DND_GNOME_ICON_LIST,
NAUTILUS_ICON_DND_URI_LIST,
NAUTILUS_ICON_DND_NETSCAPE_URL,
- NAUTILUS_ICON_DND_COLOR,
NAUTILUS_ICON_DND_BGIMAGE,
NAUTILUS_ICON_DND_TEXT,
NAUTILUS_ICON_DND_XDNDDIRECTSAVE,
diff --git a/libnautilus-private/nautilus-file-dnd.c b/libnautilus-private/nautilus-file-dnd.c
index 2f2ce88..e42dadc 100644
--- a/libnautilus-private/nautilus-file-dnd.c
+++ b/libnautilus-private/nautilus-file-dnd.c
@@ -129,7 +129,6 @@ nautilus_drag_can_accept_info (NautilusFile *drop_target_item,
return FALSE;
/* TODO return TRUE for folders as soon as drop handling is implemented */
- case NAUTILUS_ICON_DND_COLOR:
case NAUTILUS_ICON_DND_BGIMAGE:
return FALSE;
diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c
index b0cc626..7695c86 100644
--- a/libnautilus-private/nautilus-icon-dnd.c
+++ b/libnautilus-private/nautilus-icon-dnd.c
@@ -70,7 +70,6 @@ static const GtkTargetEntry drop_types [] = {
/* prefer "_NETSCAPE_URL" over "text/uri-list" to satisfy web browsers. */
{ NAUTILUS_ICON_DND_NETSCAPE_URL_TYPE, 0, NAUTILUS_ICON_DND_NETSCAPE_URL },
{ NAUTILUS_ICON_DND_URI_LIST_TYPE, 0, NAUTILUS_ICON_DND_URI_LIST },
- { NAUTILUS_ICON_DND_COLOR_TYPE, 0, NAUTILUS_ICON_DND_COLOR },
{ NAUTILUS_ICON_DND_BGIMAGE_TYPE, 0, NAUTILUS_ICON_DND_BGIMAGE },
{ NAUTILUS_ICON_DND_XDNDDIRECTSAVE_TYPE, 0, NAUTILUS_ICON_DND_XDNDDIRECTSAVE }, /* XDS Protocol Type */
{ NAUTILUS_ICON_DND_RAW_TYPE, 0, NAUTILUS_ICON_DND_RAW },
@@ -624,29 +623,6 @@ get_background_drag_action (NautilusIconContainer *container,
return action;
}
-static void
-receive_dropped_color (NautilusIconContainer *container,
- int x, int y,
- GdkDragAction action,
- GtkSelectionData *data)
-{
- action = get_background_drag_action (container, action);
-
- if (action > 0) {
- char *uri;
-
- uri = get_container_uri (container);
- nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DOMAIN_USER,
- "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);
- }
-}
-
/* handle dropped tile images */
static void
receive_dropped_tile_image (NautilusIconContainer *container, GdkDragAction action, GtkSelectionData *data)
@@ -1277,7 +1253,6 @@ nautilus_icon_container_get_drop_action (NautilusIconContainer *container,
*action = nautilus_drag_default_drop_action_for_netscape_url (context);
break;
- case NAUTILUS_ICON_DND_COLOR:
case NAUTILUS_ICON_DND_BGIMAGE:
case NAUTILUS_ICON_DND_ROOTWINDOW_DROP:
*action = gdk_drag_context_get_suggested_action (context);
@@ -1695,7 +1670,6 @@ drag_data_received_callback (GtkWidget *widget,
case NAUTILUS_ICON_DND_GNOME_ICON_LIST:
nautilus_icon_container_dropped_icon_feedback (widget, data, x, y);
break;
- case NAUTILUS_ICON_DND_COLOR:
case NAUTILUS_ICON_DND_BGIMAGE:
case NAUTILUS_ICON_DND_URI_LIST:
case NAUTILUS_ICON_DND_TEXT:
@@ -1732,13 +1706,6 @@ drag_data_received_callback (GtkWidget *widget,
(NAUTILUS_ICON_CONTAINER (widget),
context, x, y);
break;
- case NAUTILUS_ICON_DND_COLOR:
- receive_dropped_color (NAUTILUS_ICON_CONTAINER (widget),
- x, y,
- gdk_drag_context_get_selected_action (context),
- data);
- success = TRUE;
- break;
case NAUTILUS_ICON_DND_BGIMAGE:
receive_dropped_tile_image
(NAUTILUS_ICON_CONTAINER (widget),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]