diff options
author | Carlos Soriano <csoriano@gnome.org> | 2016-03-30 21:45:03 +0200 |
---|---|---|
committer | Carlos Soriano <csoriano@gnome.org> | 2016-04-05 15:13:51 +0200 |
commit | 9a9cff80f7d365f897e5a8d287901b95617454ea (patch) | |
tree | c2f65faad5ca0447cad906db88e16549a765a9aa | |
parent | 684936e558ad0db1f79cb8b884bf4b2c6e5c4afb (diff) | |
download | nautilus-9a9cff80f7d365f897e5a8d287901b95617454ea.tar.gz |
desktop-icon-file: move dnd handling to the subclass
Now that we can use inheritance for dnd handling, use it in the subclass
instead of special casing on the parent.
-rw-r--r-- | libnautilus-private/nautilus-desktop-icon-file.c | 8 | ||||
-rw-r--r-- | libnautilus-private/nautilus-file.c | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libnautilus-private/nautilus-desktop-icon-file.c b/libnautilus-private/nautilus-desktop-icon-file.c index 89003a9e7..100d746f2 100644 --- a/libnautilus-private/nautilus-desktop-icon-file.c +++ b/libnautilus-private/nautilus-desktop-icon-file.c @@ -446,6 +446,13 @@ real_can_rename (NautilusFile *file) return can_rename; } +static gboolean +real_drag_can_accept_files (NautilusFile *drop_target_item) +{ + return TRUE; +} + + static void nautilus_desktop_icon_file_set_metadata (NautilusFile *file, const char *key, @@ -489,6 +496,7 @@ nautilus_desktop_icon_file_class_init (NautilusDesktopIconFileClass *klass) file_class->can_rename = real_can_rename; file_class->rename = real_rename; file_class->get_target_uri = real_get_target_uri; + file_class->drag_can_accept_files = real_drag_can_accept_files; g_type_class_add_private (object_class, sizeof(NautilusDesktopIconFileDetails)); } diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c index 79ddf4882..0c7410cd8 100644 --- a/libnautilus-private/nautilus-file.c +++ b/libnautilus-private/nautilus-file.c @@ -8155,10 +8155,6 @@ real_drag_can_accept_files (NautilusFile *drop_target_item) return res; } - if (NAUTILUS_IS_DESKTOP_ICON_FILE (drop_target_item)) { - return TRUE; - } - /* Launchers are an acceptable drop target */ if (nautilus_file_is_launcher (drop_target_item)) { return TRUE; |