Merge lp:~dobey/ubuntuone-client/get-published-race into lp:ubuntuone-client/stable-1-4

[dobey]

Add a timeout if we haven't loaded the published files list to avoid a race
condition where this callback gets called before sd is online, and never again

[John O'Brien (jdobrien)]

Looks good.

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c	2011-02-14 14:35:26 +0000
+++ nautilus/ubuntuone-nautilus.c	2011-03-03 22:43:57 +0000
@@ -1037,6 +1037,15 @@
   }
 }
 
+static gboolean
+_ubuntuone_ready_timeout_cb (gpointer data)
+{
+    UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (data);
+    ubuntuone_nautilus_daemon_ready (uon->syncdaemon, uon);
+
+    return FALSE;
+}
+
 static void
 ubuntuone_nautilus_daemon_ready (SyncdaemonDaemon *daemon, gpointer user_data)
 {
@@ -1076,6 +1085,12 @@
       }
 
       g_slist_free (folders);
+    } else {
+        if (uon->public_id != 0) {
+            g_source_remove (uon->public_id);
+            uon->public_id = 0;
+        }
+        uon->public_id = g_timeout_add_seconds (5, (GSourceFunc) _ubuntuone_ready_timeout_cb, uon);
     }
   }
 

=== modified file 'nautilus/ubuntuone-nautilus.h'
--- nautilus/ubuntuone-nautilus.h	2010-08-25 14:00:10 +0000
+++ nautilus/ubuntuone-nautilus.h	2011-03-03 22:43:57 +0000
@@ -56,6 +56,7 @@
 	GHashTable * shares;
 
 	/* Lists of public files and user defined folders */
+    guint public_id;
 	GHashTable * public;
 	GHashTable * udfs;