nautilus r14442 - in trunk: . libnautilus-private

[cneumair svn gnome org]

Author: cneumair
Date: Mon Aug  4 10:45:10 2008
New Revision: 14442
URL: http://svn.gnome.org/viewvc/nautilus?rev=14442&view=rev

Log:
2008-08-04  Christian Neumair  <cneumair gnome org>

	* libnautilus-private/nautilus-file.c (update_info_internal):
	When changing the file name, only clear the display name if the new
	file info has a NULL display name, i.e. it hasn't been set before with
	nautilus_file_set_display_name(). Fixes icon names of computer:/// items.


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

Modified: trunk/libnautilus-private/nautilus-file.c
==============================================================================
--- trunk/libnautilus-private/nautilus-file.c	(original)
+++ trunk/libnautilus-private/nautilus-file.c	Mon Aug  4 10:45:10 2008
@@ -1865,7 +1865,12 @@
 				file->details->name = eel_ref_str_new (name);
 			}
 
-			if (!file->details->got_custom_display_name) {
+			if (!file->details->got_custom_display_name &&
+			    g_file_info_get_display_name (info) == NULL) {
+				/* If the file info's display name is NULL,
+				 * nautilus_file_set_display_name() did
+				 * not unset the display name.
+				 */
 				nautilus_file_clear_display_name (file);
 			}