nautilus r14758 - in branches/gnome-2-24: . libnautilus-private

[alexl svn gnome org]

Author: alexl
Date: Wed Oct 22 08:55:28 2008
New Revision: 14758
URL: http://svn.gnome.org/viewvc/nautilus?rev=14758&view=rev

Log:
2008-10-22  Alexander Larsson  <alexl redhat com>

	Merged from trunk:

	* libnautilus-private/nautilus-file.c
	(nautilus_file_get_symbolic_link_target_uri/path):
	Don't assert on symbolic links always marked as symlinks.
	Some broken backends will give this (like the archive backend).
	Fixes crash in #547468




Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/libnautilus-private/nautilus-file.c

Modified: branches/gnome-2-24/libnautilus-private/nautilus-file.c
==============================================================================
--- branches/gnome-2-24/libnautilus-private/nautilus-file.c	(original)
+++ branches/gnome-2-24/libnautilus-private/nautilus-file.c	Wed Oct 22 08:55:28 2008
@@ -6010,7 +6010,9 @@
 char *
 nautilus_file_get_symbolic_link_target_path (NautilusFile *file)
 {
-        g_return_val_if_fail (nautilus_file_is_symbolic_link (file), NULL);
+	if (!nautilus_file_is_symbolic_link (file)) {
+		g_warning ("File has symlink target, but  is not marked as symlink");
+	}
 
 	return g_strdup (file->details->symlink_name);
 }
@@ -6029,8 +6031,10 @@
 {
 	GFile *location, *parent, *target;
 	char *target_uri;
-	
-        g_return_val_if_fail (nautilus_file_is_symbolic_link (file), NULL);
+
+	if (!nautilus_file_is_symbolic_link (file)) {
+		g_warning ("File has symlink target, but  is not marked as symlink");
+	}
 
 	if (file->details->symlink_name == NULL) {
 		return NULL;