Merge lp:~rodrigo-moya/ubuntuone-client/fix-661292 into lp:ubuntuone-client/stable-1-4

[Rodrigo Moya]

Only mark public files list as retrieved when really retrieved

Only mark public files list as retrieved when really retrieved

[Matt Griffin (mattgriffin)]

Tested and it works. The correct right-click options are appearing for published files. Approved. Thanks!

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c	2010-09-28 13:11:31 +0000
+++ nautilus/ubuntuone-nautilus.c	2010-10-18 10:17:43 +0000
@@ -1065,7 +1065,6 @@
     public = syncdaemon_daemon_get_publicfiles_interface (uon->syncdaemon);
     if (public != NULL) {
       syncdaemon_publicfiles_interface_get_public_files (SYNCDAEMON_PUBLICFILES_INTERFACE (public));
-      uon->gotpubs = TRUE;
     }
   }
 }
@@ -1209,7 +1208,6 @@
     g_hash_table_replace (uon->public, g_strdup (path), g_strdup (url));
 
   ubuntuone_nautilus_reset_emblem (uon, path);
-  uon->gotpubs = TRUE;
 }
 
 static void ubuntuone_nautilus_got_public_files (SyncdaemonDaemon *daemon,
@@ -1222,6 +1220,7 @@
   if (success) {
     GSList *l;
 
+    uon->gotpubs = TRUE;
     g_hash_table_remove_all (uon->public);
     for (l = files; l != NULL; l = l->next) {
       SyncdaemonFileInfo *finfo = SYNCDAEMON_FILE_INFO (l->data);
@@ -1229,6 +1228,7 @@
       g_hash_table_insert (uon->public,
 			   g_strdup (syncdaemon_file_info_get_path (finfo)),
 			   g_strdup (syncdaemon_file_info_get_public_url (finfo)));
+      ubuntuone_nautilus_reset_emblem (uon, syncdaemon_file_info_get_path (finfo));
     }
   }
 }