summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Camp <dave@ximian.com>2003-03-12 14:41:42 +0000
committerDave Camp <campd@src.gnome.org>2003-03-12 14:41:42 +0000
commit613b690792728f2cf4b72bbaada8807caf2afbe8 (patch)
treeb4f2212712c03d6db331238d3f46692e3b41bbee
parentb15f2dbedb76f38e59b3f65ba45b6a6492f9be6a (diff)
downloadnautilus-613b690792728f2cf4b72bbaada8807caf2afbe8.tar.gz
Always set the original_name object data if it hasn't been set yet.
2003-03-12 Dave Camp <dave@ximian.com> * src/file-manager/fm-properties-window.c (name_field_update_to_match_file): Always set the original_name object data if it hasn't been set yet.
-rw-r--r--ChangeLog6
-rw-r--r--src/file-manager/fm-properties-window.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f749172a1..3354fcb6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-12 Dave Camp <dave@ximian.com>
+
+ * src/file-manager/fm-properties-window.c
+ (name_field_update_to_match_file): Always set the original_name
+ object data if it hasn't been set yet.
+
2003-03-12 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-file-private.h:
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index ace407c1f..8137563ce 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -417,7 +417,8 @@ name_field_update_to_match_file (NautilusEntry *name_field)
* aspect of the file might have), then don't clobber changes.
*/
current_name = nautilus_file_get_display_name (file);
- if (eel_strcmp (original_name, current_name) != 0) {
+ if (original_name == NULL ||
+ eel_strcmp (original_name, current_name) != 0) {
g_object_set_data_full (G_OBJECT (name_field),
"original_name",
current_name,