nautilus r14464 - in trunk: . libnautilus-private

[awalton svn gnome org]

Author: awalton
Date: Mon Aug 11 16:23:05 2008
New Revision: 14464
URL: http://svn.gnome.org/viewvc/nautilus?rev=14464&view=rev

Log:
2008-08-11  A. Walton  <awalton gnome org>

	* libnautilus-private/nautilus-file-operations.c
	(nautilus_file_operations_copy_move):
	Use g_file_has_uri_scheme() instead of rolling our own.
	Fixes bug #539780.



Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-file-operations.c

Modified: trunk/libnautilus-private/nautilus-file-operations.c
==============================================================================
--- trunk/libnautilus-private/nautilus-file-operations.c	(original)
+++ trunk/libnautilus-private/nautilus-file-operations.c	Mon Aug 11 16:23:05 2008
@@ -5235,7 +5235,6 @@
 	GtkWindow *parent_window;
 	gboolean target_is_mapping;
 	gboolean have_nonmapping_source;
-	char *file_scheme;
 	                        	
 	dest = NULL;
 	target_is_mapping = FALSE;
@@ -5243,22 +5242,17 @@
                 
 	if (target_dir) {
 		dest = g_file_new_for_uri (target_dir);
-		file_scheme = g_file_get_uri_scheme (dest);
-		if (strcmp (file_scheme, "burn") == 0) {
+		if (g_file_has_uri_scheme (dest, "burn")) {
 			target_is_mapping = TRUE;
                 }
-		g_free (file_scheme);
 	}
+
 	locations = location_list_from_uri_list (item_uris);
 	
 	for (p = location_list_from_uri_list (item_uris); p != NULL; p = p->next) {
-		file_scheme = g_file_get_uri_scheme ((GFile *)p->data);
-                
-		if (strcmp (file_scheme, "burn") != 0) {
+		if (!g_file_has_uri_scheme ((GFile* )p->data, "burn")) {                
 			have_nonmapping_source = TRUE;
 		}
-                
-		g_free (file_scheme);
 	}
 	
 	if (target_is_mapping && have_nonmapping_source && copy_action == GDK_ACTION_MOVE) {