[nautilus] desktop: ensure the desktop metadata is up to date when setting as ready

[Cosimo Cecchi <cosimoc src gnome org>]

commit 78be87bc843f71670b41011b645f983bab6ba81d
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Sep 12 21:58:14 2011 -0400

    desktop: ensure the desktop metadata is up to date when setting as ready
    
    As part of the I/O machinery cycle internal to call_when_ready
    nautilus_file_clear_info() can be called and clear the metadata we
    previously set during _init.
    Move the desktop metadata initialization before returning the file as
    ready, so it's always up to date when the view reads the settings.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=655561

 .../nautilus-desktop-directory-file.c              |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/libnautilus-private/nautilus-desktop-directory-file.c b/libnautilus-private/nautilus-desktop-directory-file.c
index f7025b4..24ea0e4 100644
--- a/libnautilus-private/nautilus-desktop-directory-file.c
+++ b/libnautilus-private/nautilus-desktop-directory-file.c
@@ -208,6 +208,9 @@ desktop_callback_check_done (DesktopCallback *desktop_callback)
 		return;
 	}
 
+	/* Ensure our metadata is updated before calling back */
+	nautilus_desktop_update_metadata_from_keyfile (NAUTILUS_FILE (desktop_callback->desktop_file), "directory");
+
 	/* Remove from the hash table before sending it. */
 	g_hash_table_remove (desktop_callback->desktop_file->details->callbacks,
 			     desktop_callback);
@@ -483,9 +486,6 @@ nautilus_desktop_directory_file_init (NautilusDesktopDirectoryFile *desktop_file
 	nautilus_directory_unref (real_dir);
 	
 	desktop_file->details->real_dir_file = real_dir_file;
-
-	nautilus_desktop_update_metadata_from_keyfile (NAUTILUS_FILE (desktop_file), "directory");
-
 	g_signal_connect_object (real_dir_file, "changed",
 				 G_CALLBACK (real_file_changed_callback), desktop_file, 0);
 }