nautilus r14355 - in trunk: . libnautilus-private src/file-manager

[cneumair svn gnome org]

Author: cneumair
Date: Sun Jul 13 12:02:09 2008
New Revision: 14355
URL: http://svn.gnome.org/viewvc/nautilus?rev=14355&view=rev

Log:
2008-07-13  Christian Neumair  <cneumair gnome org>

	* libnautilus-private/nautilus-view.c
	(nautilus_view_drop_proxy_received_netscape_url):
	* libnautilus-private/nautilus-view.h:
	* src/file-manager/fm-directory-view.c
	(fm_directory_view_init_view_iface),
	(fm_directory_view_drop_proxy_received_uris),
	(fm_directory_view_drop_proxy_received_netscape_url):
	Add function for receiving netscape URLs, clear colliding clipboard
	contents when receiving dropped URIs.


Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-view.c
   trunk/libnautilus-private/nautilus-view.h
   trunk/src/file-manager/fm-directory-view.c

Modified: trunk/libnautilus-private/nautilus-view.c
==============================================================================
--- trunk/libnautilus-private/nautilus-view.c	(original)
+++ trunk/libnautilus-private/nautilus-view.c	Sun Jul 13 12:02:09 2008
@@ -292,3 +292,17 @@
 	}
 }
 
+void
+nautilus_view_drop_proxy_received_netscape_url (NautilusView         *view,
+						const char           *source_url,
+						const char           *target_location,
+						GdkDragAction         action)
+{
+	g_return_if_fail (NAUTILUS_IS_VIEW (view));
+
+	if (NAUTILUS_VIEW_GET_IFACE (view)->drop_proxy_received_netscape_url != NULL) {
+		(* NAUTILUS_VIEW_GET_IFACE (view)->drop_proxy_received_netscape_url) (view, source_url, target_location, action);
+	}
+}
+
+

Modified: trunk/libnautilus-private/nautilus-view.h
==============================================================================
--- trunk/libnautilus-private/nautilus-view.h	(original)
+++ trunk/libnautilus-private/nautilus-view.h	Sun Jul 13 12:02:09 2008
@@ -127,6 +127,10 @@
 							 GList                *uris,
 							 const char           *target_location,
 							 GdkDragAction         action);
+	void           (* drop_proxy_received_netscape_url) (NautilusView         *view,
+							     const char           *source_url,
+							     const char           *target_location,
+							     GdkDragAction         action);
 
 	/* Padding for future expansion */
 	void (*_reserved1) (void);
@@ -171,6 +175,10 @@
 							    GList                *uris,
 							    const char           *target_location,
 							    GdkDragAction         action);
+void              nautilus_view_drop_proxy_received_netscape_url (NautilusView         *view,
+								  const char           *source_url,
+								  const char           *target_location,
+								  GdkDragAction         action);
 
 G_END_DECLS
 

Modified: trunk/src/file-manager/fm-directory-view.c
==============================================================================
--- trunk/src/file-manager/fm-directory-view.c	(original)
+++ trunk/src/file-manager/fm-directory-view.c	Sun Jul 13 12:02:09 2008
@@ -290,9 +290,13 @@
 								const char           *location);
 static void     fm_directory_view_stop_loading                 (NautilusView         *nautilus_view);
 static void     fm_directory_view_drop_proxy_received_uris     (FMDirectoryView *view,
-								GList *uris,
+								const GList *source_uri_list,
 								const char *target_uri,
 								GdkDragAction action);
+static void     fm_directory_view_drop_proxy_received_netscape_url (FMDirectoryView *view,
+								    const char *netscape_url,
+								    const char *target_uri,
+								    GdkDragAction action);
 static void     clipboard_changed_callback                     (NautilusClipboardMonitor *monitor,
 								FMDirectoryView      *view);
 static void     open_one_in_new_window                         (gpointer              data,
@@ -1815,6 +1819,7 @@
 
 	iface->pop_up_location_context_menu = (gpointer)fm_directory_view_pop_up_location_context_menu;
 	iface->drop_proxy_received_uris = (gpointer)fm_directory_view_drop_proxy_received_uris;
+	iface->drop_proxy_received_netscape_url = (gpointer)fm_directory_view_drop_proxy_received_netscape_url;
 }
 
 static void
@@ -7789,7 +7794,7 @@
 
 static void 
 fm_directory_view_drop_proxy_received_uris (FMDirectoryView *view,
-					    GList *uris,
+					    const GList *source_uri_list,
 					    const char *target_uri,
 					    GdkDragAction action)
 {
@@ -7810,13 +7815,29 @@
 		}
 	}
 
-	fm_directory_view_move_copy_items (uris, NULL,
+	nautilus_clipboard_clear_if_colliding_uris (GTK_WIDGET (view),
+						    source_uri_list,
+						    fm_directory_view_get_copied_files_atom (view));
+
+	fm_directory_view_move_copy_items (source_uri_list, NULL,
 					   target_uri != NULL ? target_uri : container_uri,
 					   action, 0, 0, view);
 
 	g_free (container_uri);
 }
 
+static void 
+fm_directory_view_drop_proxy_received_netscape_url (FMDirectoryView *view,
+						    const char *netscape_url,
+						    const char *target_uri,
+						    GdkDragAction action)
+{
+	fm_directory_view_handle_netscape_url_drop (view,
+						    netscape_url,
+						    target_uri,
+						    action, 0, 0);
+}
+
 static void
 schedule_update_menus (FMDirectoryView *view) 
 {