Commit 6e67bd3d authored by Andrew Walton's avatar Andrew Walton Committed by Andrew Walton

Use g_file_has_uri_scheme() instead of rolling our own. Fixes bug #539780.

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.


svn path=/trunk/; revision=14464
parent fc020492
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.
2008-08-07 Christian Neumair <cneumair@gnome.org>
* libnautilus-private/nautilus-file.c (nautilus_file_is_archive):
......
......@@ -5235,7 +5235,6 @@ nautilus_file_operations_copy_move (const GList *item_uris,
GtkWindow *parent_window;
gboolean target_is_mapping;
gboolean have_nonmapping_source;
char *file_scheme;
dest = NULL;
target_is_mapping = FALSE;
......@@ -5243,22 +5242,17 @@ nautilus_file_operations_copy_move (const GList *item_uris,
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) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment