diff options
| author | Christian Neumair <cneumair@gnome.org> | 2008-08-04 10:45:10 +0000 |
|---|---|---|
| committer | Christian Neumair <cneumair@src.gnome.org> | 2008-08-04 10:45:10 +0000 |
| commit | 59dd17b1648862f6c9e9307802169ab7e25b22ff (patch) | |
| tree | a15b58f03252d26c27b4677e01a076f607a0020d | |
| parent | 3f485cb3aee28a82373229d3ac10e970ecdea4be (diff) | |
| download | nautilus-59dd17b1648862f6c9e9307802169ab7e25b22ff.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file.c | 7 |
2 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,10 @@ +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: diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c index 9fff30dc6..b9d41883f 100644 --- a/libnautilus-private/nautilus-file.c +++ b/libnautilus-private/nautilus-file.c @@ -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); } |