Commit 59dd17b1 authored by Christian Neumair's avatar Christian Neumair Committed by Christian Neumair

When changing the file name, only clear the display name if the new file

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.

svn path=/trunk/; revision=14442
parent 3f485cb3
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.
2008-08-03 Christian Neumair <cneumair@gnome.org>
* configure.in:
......
......@@ -1865,7 +1865,12 @@ update_info_internal (NautilusFile *file,
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);
}
......
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