Merge lp:~rodrigo-moya/ubuntuone-client/final-nautilus-refactor into lp:ubuntuone-client

[Rodrigo Moya]

- Cache public files in libsyncdaemon
- Fix issue with emblems disappearing

- Cache public files in libsyncdaemon
- Fix issue with emblems disappearing

[Natalia Bidart (nataliabidart)]

I'm getting the following, but rodrigo says he will fix this on another branch:

** (nautilus:9918): WARNING **: Failed calling get_metadata_and_quick_tree_synced: Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/dbus/service.py", line 702, in _message_cb
    retval = candidate_method(self, *args, **keywords)
  File "/usr/lib/pymodules/python2.6/ubuntuone/syncdaemon/dbus_interface.py", line 1027, in get_metadata_and_quick_tree_synced
    mdobj = self.fs_manager.get_by_path(real_path)
  File "/usr/lib/pymodules/python2.6/ubuntuone/syncdaemon/filesystem_manager.py", line 607, in get_by_path
    mdid = self._idx_path[path]
KeyError: '/home/nessita/.local/share/ubuntuone/shares'

[Natalia Bidart (nataliabidart)]

Also reported bug #663333.

Other than that, emblems does show up for themes ubuntu-* and humanity-* (other themes doesn't show the synchronized emblem).

review: Approve

[Natalia Bidart (nataliabidart)]

Both issues (KeyError and missing emblems) are reported on bug #442504 and bug #645299.

[John Lenton (chipaca)]

review: Approve

[dobey (dobey)]

syncdaemon-publicfiles-interface.c: In function ‘syncdaemon_publicfiles_interface_get_public_files’:
syncdaemon-publicfiles-interface.c:236: error: ‘finfo’ may be used uninitialized in this function
syncdaemon-publicfiles-interface.c:235: error: ‘path’ may be used uninitialized in this function
make: *** [syncdaemon-publicfiles-interface.lo] Error 1

review: Needs Fixing

[lp:~rodrigo-moya/ubuntuone-client/final-nautilus-refactor]

744. By Rodrigo Moya on 2010-11-03

Fix building with --enable-debug

[dobey (dobey)]

review: Approve

=== modified file 'libsyncdaemon/syncdaemon-daemon.c'
--- libsyncdaemon/syncdaemon-daemon.c	2010-10-21 11:41:33 +0000
+++ libsyncdaemon/syncdaemon-daemon.c	2010-11-03 15:01:52 +0000
@@ -74,7 +74,7 @@
 	FOLDER_SUBSCRIBED_SIGNAL,
 	FOLDER_UNSUBSCRIBED_SIGNAL,
 	FILE_PUBLISHED_SIGNAL,
-	GOT_PUBLISHED_FILES_SIGNAL,
+	FILE_UNPUBLISHED_SIGNAL,
 	SHARE_CREATED_SIGNAL,
 	SHARE_DELETED_SIGNAL,
 	DOWNLOAD_STARTED_SIGNAL,
@@ -218,15 +218,15 @@
 							      G_TYPE_NONE, 2,
 							      G_TYPE_BOOLEAN,
 							      G_TYPE_OBJECT);
-	daemon_signals[GOT_PUBLISHED_FILES_SIGNAL] = g_signal_new ("got_published_files",
-								   G_TYPE_FROM_CLASS (klass),
-								   (GSignalFlags) G_SIGNAL_RUN_LAST,
-								   G_STRUCT_OFFSET (SyncdaemonDaemonClass, got_published_files),
-								   NULL, NULL,
-								   _syncdaemon_marshal_VOID__BOOLEAN_POINTER,
-								   G_TYPE_NONE, 2,
-								   G_TYPE_BOOLEAN,
-								   G_TYPE_POINTER);
+	daemon_signals[FILE_UNPUBLISHED_SIGNAL] = g_signal_new ("file_unpublished",
+								G_TYPE_FROM_CLASS (klass),
+								(GSignalFlags) G_SIGNAL_RUN_LAST,
+								G_STRUCT_OFFSET (SyncdaemonDaemonClass, file_unpublished),
+								NULL, NULL,
+								_syncdaemon_marshal_VOID__BOOLEAN_OBJECT,
+								G_TYPE_NONE, 2,
+								G_TYPE_BOOLEAN,
+								G_TYPE_OBJECT);
 	daemon_signals[SHARE_CREATED_SIGNAL] = g_signal_new ("share_created",
 							     G_TYPE_FROM_CLASS (klass),
 							     (GSignalFlags) G_SIGNAL_RUN_LAST,
 
=== modified file 'libsyncdaemon/syncdaemon-daemon.h'
--- libsyncdaemon/syncdaemon-daemon.h	2010-10-21 11:41:33 +0000
+++ libsyncdaemon/syncdaemon-daemon.h	2010-11-03 15:01:52 +0000
@@ -67,7 +67,7 @@
 	void (* folder_unsubscribed) (SyncdaemonDaemon *daemon, gboolean success, SyncdaemonFolderInfo *folder_info);
 
 	void (* file_published) (SyncdaemonDaemon *daemon, gboolean success, SyncdaemonFileInfo *file_info);
-	void (* got_published_files) (SyncdaemonDaemon *daemon, gboolean success, GSList *files);
+	void (* file_unpublished) (SyncdaemonDaemon *daemon, gboolean success, SyncdaemonFileInfo *file_info);
 
 	void (* share_created) (SyncdaemonDaemon *daemon, gboolean success, SyncdaemonShareInfo *share_info);
 	void (* share_deleted) (SyncdaemonDaemon *daemon, gboolean success, SyncdaemonShareInfo *share_info);
 
=== modified file 'libsyncdaemon/syncdaemon-publicfiles-interface.c'
--- libsyncdaemon/syncdaemon-publicfiles-interface.c	2010-08-25 18:18:56 +0000
+++ libsyncdaemon/syncdaemon-publicfiles-interface.c	2010-11-03 15:01:52 +0000
@@ -27,6 +27,7 @@
 
 struct _SyncdaemonPublicfilesInterfacePrivate {
 	GObject *proxy;
+	GHashTable *public_files;
 };
 
 static void
@@ -35,6 +36,9 @@
 	SyncdaemonPublicfilesInterface *interface = SYNCDAEMON_PUBLICFILES_INTERFACE (object);
 
 	if (interface->priv != NULL) {
+		if (interface->priv->public_files != NULL)
+			g_hash_table_destroy (interface->priv->public_files);
+
 		g_free (interface->priv);
 	}
 
@@ -60,7 +64,10 @@
 		SyncdaemonFileInfo *finfo;
 
 		finfo = syncdaemon_file_info_new_from_hash_table (hash);
-		g_signal_emit_by_name (daemon, "file_published", TRUE, finfo);
+		if (syncdaemon_file_info_get_is_public (finfo))
+			g_signal_emit_by_name (daemon, "file_published", TRUE, finfo);
+		else
+			g_signal_emit_by_name (daemon, "file_unpublished", TRUE, finfo);
 
 		g_object_unref (G_OBJECT (finfo));
 	}
@@ -72,21 +79,24 @@
 	SyncdaemonDaemon *daemon = NULL;
 	SyncdaemonPublicfilesInterface *interface = SYNCDAEMON_PUBLICFILES_INTERFACE (user_data);
 
+	if (interface->priv->public_files == NULL) {
+		interface->priv->public_files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
+	}
+
 	g_object_get (G_OBJECT (interface), "daemon", &daemon, NULL);
 	if (daemon != NULL) {
-		GSList *finfo_list = NULL;
 		guint i;
 
 		for (i = 0; i < files->len; i++) {
 			SyncdaemonFileInfo *finfo = syncdaemon_file_info_new_from_hash_table (g_ptr_array_index (files, i));
 
-			finfo_list = g_slist_append (finfo_list, finfo);
+			if (SYNCDAEMON_IS_FILE_INFO (finfo)) {
+				g_hash_table_insert (interface->priv->public_files,
+						     g_strdup (syncdaemon_file_info_get_path (finfo)),
+						     finfo);
+				g_signal_emit_by_name (daemon, "file_published", TRUE, finfo);
+			}
 		}
-
-		g_signal_emit_by_name (daemon, "got_published_files", TRUE, finfo_list);
-
-		g_slist_foreach (finfo_list, (GFunc) g_object_unref, NULL);
-		g_slist_free (finfo_list);
 	}
 }
 
@@ -198,13 +208,33 @@
 
 /**
  * syncdaemon_publicfiles_interface_get_public_files:
+ *
+ * Return value: A #GSList of #SyncdaemonFileInfo objects, each of which describes
+ * a published file for the user. When no longer needed, this list should be
+ * freed by calling g_slist_free, but the data within the list should never
+ * be freed, as it belongs to the library.
  */
-void
+GSList *
 syncdaemon_publicfiles_interface_get_public_files (SyncdaemonPublicfilesInterface *interface)
 {
-	g_return_if_fail (SYNCDAEMON_IS_PUBLICFILES_INTERFACE (interface));
-
-	dbus_g_proxy_begin_call (DBUS_G_PROXY (interface->priv->proxy), "get_public_files",
-				 no_output_dbus_call_ended_cb, interface, NULL,
-				 G_TYPE_INVALID);
+	GSList *files_list = NULL;
+
+	g_return_val_if_fail (SYNCDAEMON_IS_PUBLICFILES_INTERFACE (interface), NULL);
+
+	if (interface->priv->public_files == NULL) {
+		/* Only retrieve list if we haven't yet */
+		dbus_g_proxy_begin_call (DBUS_G_PROXY (interface->priv->proxy), "get_public_files",
+					 no_output_dbus_call_ended_cb, interface, NULL,
+					 G_TYPE_INVALID);
+	} else {
+		GHashTableIter iter;
+		gchar *path;
+		SyncdaemonFileInfo *finfo;
+
+		g_hash_table_iter_init (&iter, interface->priv->public_files);
+		while (g_hash_table_iter_next (&iter, (gpointer *) &path, (gpointer *) &finfo))
+			files_list = g_slist_append (files_list, finfo);
+	}
+
+	return files_list;
 }
 
=== modified file 'libsyncdaemon/syncdaemon-publicfiles-interface.h'
--- libsyncdaemon/syncdaemon-publicfiles-interface.h	2010-06-04 15:36:24 +0000
+++ libsyncdaemon/syncdaemon-publicfiles-interface.h	2010-11-03 15:01:52 +0000
@@ -53,7 +53,7 @@
 										       const gchar *share_id,
 										       const gchar *node_id,
 										       gboolean is_public);
-void                            syncdaemon_publicfiles_interface_get_public_files (SyncdaemonPublicfilesInterface *interface);
+GSList                         *syncdaemon_publicfiles_interface_get_public_files (SyncdaemonPublicfilesInterface *interface);
 
 G_END_DECLS
 
 
=== modified file 'libsyncdaemon/syncdaemon-shares-interface.c'
--- libsyncdaemon/syncdaemon-shares-interface.c	2010-07-21 11:40:57 +0000
+++ libsyncdaemon/syncdaemon-shares-interface.c	2010-11-03 15:01:52 +0000
@@ -273,15 +273,30 @@
  * syncdaemon_shares_interface_delete:
  */
 void
-syncdaemon_shares_interface_delete (SyncdaemonSharesInterface *interface, const gchar *share_id)
+syncdaemon_shares_interface_delete (SyncdaemonSharesInterface *interface, const gchar *path)
 {
+	GSList *shares, *l;
+	const gchar *share_id = NULL;
+
 	g_return_if_fail (SYNCDAEMON_IS_SHARES_INTERFACE (interface));
-	g_return_if_fail (share_id != NULL);
-
-	dbus_g_proxy_begin_call (DBUS_G_PROXY (interface->priv->proxy), "delete_share",
-				 no_output_dbus_call_ended_cb, interface, NULL,
-				 G_TYPE_STRING, share_id,
-				 G_TYPE_INVALID);
+	g_return_if_fail (path != NULL);
+
+	shares = syncdaemon_shares_interface_get_shared (interface);
+	for (l = shares; l != NULL; l = l->next) {
+		SyncdaemonShareInfo *sinfo = SYNCDAEMON_SHARE_INFO (l->data);
+
+		if (g_str_equal (path, syncdaemon_share_info_get_path (sinfo)))
+			share_id = syncdaemon_share_info_get_node_id (sinfo);
+	}
+
+	if (share_id != NULL) {
+		dbus_g_proxy_begin_call (DBUS_G_PROXY (interface->priv->proxy), "delete_share",
+					 no_output_dbus_call_ended_cb, interface, NULL,
+					 G_TYPE_STRING, share_id,
+					 G_TYPE_INVALID);
+	}
+
+	g_slist_free (shares);
 }
 
 /**
 
=== modified file 'libsyncdaemon/syncdaemon-shares-interface.h'
--- libsyncdaemon/syncdaemon-shares-interface.h	2010-07-20 14:10:43 +0000
+++ libsyncdaemon/syncdaemon-shares-interface.h	2010-11-03 15:01:52 +0000
@@ -55,7 +55,7 @@
 							       GSList *usernames,
 							       const gchar *name,
 							       gboolean allow_modifications);
-void                       syncdaemon_shares_interface_delete (SyncdaemonSharesInterface *interface, const gchar *share_id);
+void                       syncdaemon_shares_interface_delete (SyncdaemonSharesInterface *interface, const gchar *path);
 GSList                    *syncdaemon_shares_interface_get_shared (SyncdaemonSharesInterface *interface);
 GSList                    *syncdaemon_shares_interface_get_shares (SyncdaemonSharesInterface *interface);
 void                       syncdaemon_shares_interface_refresh (SyncdaemonSharesInterface *interface);
 
=== modified file 'nautilus/context-menu.c'
--- nautilus/context-menu.c	2010-10-05 12:47:32 +0000
+++ nautilus/context-menu.c	2010-11-03 15:01:52 +0000
@@ -138,7 +138,7 @@
 								    (SyncdaemonGotMetadataFunc) got_public_meta, data);
 	}
 
-	g_hash_table_replace (data->uon->public, g_strdup (data->path), UPDATE_PENDING);
+	g_hash_table_replace (data->uon->public, g_strdup (data->path), g_strdup (UPDATE_PENDING));
 	file_watcher_update_path (data->uon->file_watcher, data->path);
 }
 
@@ -156,14 +156,11 @@
 unshare_folder_cb (NautilusMenuItem *item, gpointer user_data)
 {
 	MenuCallbackData * data = (MenuCallbackData *) user_data;
-	gchar * share_id;
 	SyncdaemonSharesInterface *interface;
 
 	interface = (SyncdaemonSharesInterface *) syncdaemon_daemon_get_shares_interface (data->uon->syncdaemon);
-	if (interface != NULL) {
-		share_id = g_hash_table_lookup (data->uon->shares, data->path);
-		syncdaemon_shares_interface_delete (interface, share_id);
-	}
+	if (interface != NULL)
+		syncdaemon_shares_interface_delete (interface, data->path);
 }
 
 static void
@@ -217,7 +214,8 @@
 		if (strcmp (item, UPDATE_PENDING) == 0)
 			is_pending = TRUE;
 	}
-	if (g_hash_table_lookup (uon->shares, path) != NULL)
+
+	if (ubuntuone_is_folder_shared (uon, path))
 		is_shared = TRUE;
 
 	is_dir = nautilus_file_info_is_directory (file);
 
=== modified file 'nautilus/file-watcher.c'
--- nautilus/file-watcher.c	2010-10-08 07:46:41 +0000
+++ nautilus/file-watcher.c	2010-11-03 15:01:52 +0000
@@ -29,13 +29,25 @@
 
 G_DEFINE_TYPE(FileWatcher, file_watcher, G_TYPE_OBJECT)
 
+static void observed_file_unrefed (gpointer user_data, GObject *where_the_object_was);
+
+static void
+foreach_weak_unref (gpointer key, gpointer value, gpointer user_data)
+{
+	g_object_weak_unref (G_OBJECT (value),
+			     (GWeakNotify) observed_file_unrefed,
+			     user_data);
+}
+
 static void
 file_watcher_finalize (GObject *object)
 {
 	FileWatcher *watcher = FILE_WATCHER (object);
 
-	if (watcher->files != NULL)
+	if (watcher->files != NULL) {
+		g_hash_table_foreach (watcher->files, (GHFunc) foreach_weak_unref, watcher);
 		g_hash_table_destroy (watcher->files);
+	}
 
 	G_OBJECT_CLASS (file_watcher_parent_class)->finalize (object);
 }
@@ -52,7 +64,7 @@
 file_watcher_init (FileWatcher *watcher)
 {
 	watcher->uon = NULL;
-	watcher->files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
+	watcher->files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
 }
 
 static void
@@ -87,13 +99,7 @@
 
 	path = syncdaemon_share_info_get_path (share_info);
 	if (success) {
-		const gchar * id;
-
-		id = syncdaemon_share_info_get_volume_id (share_info);
-		if (!g_hash_table_lookup (watcher->uon->shares, path)) {
-			g_hash_table_insert (watcher->uon->shares, g_strdup (path), g_strdup (id));
-			file_watcher_update_path (watcher, path);
-		}
+		file_watcher_update_path (watcher, path);
 	} else {
 		ubuntuone_show_error_dialog (watcher->uon, _("Error creating share."),
 					     _("There was an error sharing the folder '%s'"),
@@ -112,7 +118,6 @@
 
 	path = syncdaemon_share_info_get_path (share_info);
 	if (success) {
-		g_hash_table_remove (watcher->uon->shares, path);
 		file_watcher_update_path (watcher, path);
 	} else {
 		ubuntuone_show_error_dialog (watcher->uon, _("Error deleting share."),
@@ -186,7 +191,6 @@
 			g_hash_table_replace (watcher->uon->public, g_strdup (path), g_strdup (url));
 
 		file_watcher_update_path (watcher, path);
-		watcher->uon->gotpubs = TRUE;
 	} else {
 		ubuntuone_show_error_dialog (watcher->uon, _("Error publishing file."),
 					     _("There was an error publishing file '%s'"),
@@ -194,35 +198,6 @@
 	}
 }
 
-static void
-got_public_files_cb (SyncdaemonDaemon *daemon,
-		     gboolean success,
-		     GSList *files,
-		     gpointer user_data)
-{
-	FileWatcher *watcher = FILE_WATCHER (user_data);
-
-	if (success) {
-		GSList *l;
-
-		g_hash_table_remove_all (watcher->uon->public);
-		for (l = files; l != NULL; l = l->next) {
-			const gchar *path;
-			SyncdaemonFileInfo *finfo = SYNCDAEMON_FILE_INFO (l->data);
-
-			path = syncdaemon_file_info_get_path (finfo);
-			g_hash_table_insert (watcher->uon->public,
-					     g_strdup (path),
-					     g_strdup (syncdaemon_file_info_get_public_url (finfo)));
-
-			file_watcher_update_path (watcher, path);
-		}
-	} else {
-		ubuntuone_show_error_dialog (watcher->uon, _("Error getting public files"),
-					     _("There was an error getting the list of public files"));
-	}
-}
-
 FileWatcher *
 file_watcher_new (UbuntuOneNautilus *uon)
 {
@@ -260,8 +235,8 @@
 	/* Connect to public files-related signals */
 	g_signal_connect (G_OBJECT (uon->syncdaemon), "file_published",
 			  G_CALLBACK (file_published_cb), watcher);
-	g_signal_connect (G_OBJECT (uon->syncdaemon), "got_published_files",
-			  G_CALLBACK (got_public_files_cb), watcher);
+	g_signal_connect (G_OBJECT (uon->syncdaemon), "file_unpublished",
+			  G_CALLBACK (file_published_cb), watcher);
 
 	return watcher;
 }
@@ -286,11 +261,25 @@
 	return is_shared;
 }
 
+static void
+observed_file_unrefed (gpointer user_data, GObject *where_the_object_was)
+{
+	gchar *path;
+	FileWatcher *watcher = FILE_WATCHER (user_data);
+
+	path = g_filename_from_uri (nautilus_file_info_get_uri (NAUTILUS_FILE_INFO (where_the_object_was)), NULL, NULL);
+	if (g_hash_table_lookup (watcher->files, path))
+		g_hash_table_remove (watcher->files, path);
+
+	g_free (path);
+}
+
 void
 file_watcher_add_file (FileWatcher *watcher, NautilusFileInfo *file)
 {
 	gboolean is_root;
 	gchar *path = NULL;
+	NautilusFileInfo *old_file;
 
 	g_return_if_fail (IS_FILE_WATCHER (watcher));
 
@@ -299,7 +288,14 @@
 		return;
 
 	/* Always add it to the observed hash table, so that we can update emblems */
-	g_hash_table_insert (watcher->files, path, g_object_ref (file));
+	if ((old_file = g_hash_table_lookup (watcher->files, path))) {
+		g_object_weak_unref (G_OBJECT (old_file),
+				     (GWeakNotify) observed_file_unrefed, watcher);
+	}
+
+	g_object_weak_ref (G_OBJECT (file),
+			   (GWeakNotify) observed_file_unrefed, watcher);
+	g_hash_table_insert (watcher->files, g_strdup (path), file);
 
 	/* Retrieve metadata */
 	if (syncdaemon_daemon_is_folder_enabled (watcher->uon->syncdaemon, path, &is_root)) {
@@ -312,32 +308,49 @@
 
 			metadata = syncdaemon_filesystem_interface_get_metadata (
 				SYNCDAEMON_FILESYSTEM_INTERFACE (interface), path, is_dir);
-
-			if (syncdaemon_metadata_get_is_synced (metadata))
-				nautilus_file_info_add_emblem (file, "ubuntuone-synchronized");
-			else
-				nautilus_file_info_add_emblem (file, "ubuntuone-updating");
-
-			if (is_dir) {
-				/* If it's a directory, check shares */
-				interface = syncdaemon_daemon_get_shares_interface (watcher->uon->syncdaemon);
-				if (check_for_shared_folder ((const gchar *) path,
-							     syncdaemon_shares_interface_get_shared (SYNCDAEMON_SHARES_INTERFACE (interface))) ||
-				    check_for_shared_folder ((const gchar *) path,
-							     syncdaemon_shares_interface_get_shares (SYNCDAEMON_SHARES_INTERFACE (interface)))) {
-					nautilus_file_info_add_emblem (file, "shared");
+			if (SYNCDAEMON_IS_METADATA (metadata)) {
+				if (syncdaemon_metadata_get_is_synced (metadata))
+					nautilus_file_info_add_emblem (file, "ubuntuone-synchronized");
+				else
+					nautilus_file_info_add_emblem (file, "ubuntuone-updating");
+
+				if (is_dir) {
+					/* If it's a directory, check shares */
+					interface = syncdaemon_daemon_get_shares_interface (watcher->uon->syncdaemon);
+					if (check_for_shared_folder ((const gchar *) path,
+								     syncdaemon_shares_interface_get_shared (SYNCDAEMON_SHARES_INTERFACE (interface))) ||
+					    check_for_shared_folder ((const gchar *) path,
+								     syncdaemon_shares_interface_get_shares (SYNCDAEMON_SHARES_INTERFACE (interface)))) {
+						nautilus_file_info_add_emblem (file, "shared");
+					}
+				} else {
+					GSList *public_files, *l;
+
+					/* If it's a file, check for public files */
+					interface = syncdaemon_daemon_get_publicfiles_interface (watcher->uon->syncdaemon);
+					public_files = syncdaemon_publicfiles_interface_get_public_files (SYNCDAEMON_PUBLICFILES_INTERFACE (interface));
+					for (l = public_files; l != NULL; l = l->next) {
+						SyncdaemonFileInfo *file_info = SYNCDAEMON_FILE_INFO (l->data);
+
+						if (!SYNCDAEMON_IS_FILE_INFO (file_info))
+							continue;
+
+						if (g_strcmp0 (path, syncdaemon_file_info_get_path (file_info)) == 0) {
+							nautilus_file_info_add_emblem (file, "ubuntuone-public");
+							break;
+						}
+					}
+
+					g_slist_free (public_files);
 				}
-			} else {
-				/* If it's a file, check for public files */
+
+				/* Free memory */
+				g_object_unref (G_OBJECT (metadata));
 			}
-
-			/* Free memory */
-			g_object_unref (G_OBJECT (metadata));
 		}
 	}
 
-	/* if (g_hash_table_lookup (watcher->uon->public, path)) */
-	/* 	nautilus_file_info_add_emblem (file, "ubuntuone-public"); */
+	g_free (path);
 }
 
 void
 
=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c	2010-10-08 07:46:41 +0000
+++ nautilus/ubuntuone-nautilus.c	2010-11-03 15:01:52 +0000
@@ -172,9 +172,8 @@
 ubuntuone_nautilus_instance_init (UbuntuOneNautilus * uon)
 {
 	uon->connected = FALSE;
-	uon->shares = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
 	uon->udfs = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-	uon->public = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+	uon->public = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 
 	uon->syncdaemon = syncdaemon_daemon_new ();
 	g_signal_connect (G_OBJECT (uon->syncdaemon), "ready",
@@ -187,7 +186,6 @@
 	uon->managed = g_build_filename (g_get_home_dir (), "Ubuntu One", NULL);
 	uon->gotroot = FALSE;
 	uon->gotudfs = FALSE;
-	uon->gotpubs = FALSE;
 }
 
 static void
@@ -209,9 +207,6 @@
 	if (uon->syncdaemon)
 		g_object_unref (uon->syncdaemon);
 
-	g_hash_table_destroy (uon->shares);
-	uon->shares = NULL;
-
 	g_hash_table_destroy (uon->udfs);
 	uon->udfs = NULL;
 
@@ -333,36 +328,18 @@
 		}
 	}
 
-	/* Get the list of shared folders */
-	interface = syncdaemon_daemon_get_shares_interface (uon->syncdaemon);
-	if (SYNCDAEMON_IS_SHARES_INTERFACE (interface)) {
-		GSList *shares;
-
-		shares = syncdaemon_shares_interface_get_shared (SYNCDAEMON_SHARES_INTERFACE (interface));
-		while (shares != NULL) {
-			const gchar *id, *path;
-			SyncdaemonShareInfo *share_info = SYNCDAEMON_SHARE_INFO (shares->data);
-
-			/* This code is duplicated in file-watcher.c */
-			path = syncdaemon_share_info_get_path (share_info);
-			id = syncdaemon_share_info_get_volume_id (share_info);
-			if (!g_hash_table_lookup (uon->shares, path)) {
-				g_hash_table_insert (uon->shares, g_strdup (path), g_strdup (id));
-				file_watcher_update_path (uon->file_watcher, path);
-			}
-
-			shares = g_slist_remove (shares, shares->data);
-		}
-	}
-
 	/* Get the list of public files if we haven't already */
-	if (is_online && !uon->gotpubs) {
+	if (is_online) {
 		SyncdaemonInterface *public;
 
 		public = syncdaemon_daemon_get_publicfiles_interface (uon->syncdaemon);
 		if (public != NULL) {
-			syncdaemon_publicfiles_interface_get_public_files (SYNCDAEMON_PUBLICFILES_INTERFACE (public));
-			uon->gotpubs = TRUE;
+			GSList *files_list;
+
+			/* We just call it here so that libsyncdaemon caches it, but we discard
+			   the list, as we don't need it yet */
+			files_list = syncdaemon_publicfiles_interface_get_public_files (SYNCDAEMON_PUBLICFILES_INTERFACE (public));
+			g_slist_free (files_list);
 		}
 	}
 }
 
=== modified file 'nautilus/ubuntuone-nautilus.h'
--- nautilus/ubuntuone-nautilus.h	2010-09-30 13:04:47 +0000
+++ nautilus/ubuntuone-nautilus.h	2010-11-03 15:01:52 +0000
@@ -50,10 +50,6 @@
 	/* Avoid calling get_rootdir and get_folders lots of times */
 	gboolean gotroot;
 	gboolean gotudfs;
-	gboolean gotpubs;
-
-	/* Lists of ul/dl/shares for setting emblems */
-	GHashTable * shares;
 
 	/* Lists of public files and user defined folders */
 	GHashTable * public;
@@ -67,6 +63,7 @@
 GType ubuntuone_nautilus_get_type (void);
 
 /* Utility functions */
+gboolean ubuntuone_is_folder_shared (UbuntuOneNautilus *uon, const gchar *path);
 gboolean ubuntuone_is_location_bar_enabled (void);
 
 gboolean ubuntuone_check_shares_and_public_files (UbuntuOneNautilus *uon,
 
=== modified file 'nautilus/utils.c'
--- nautilus/utils.c	2010-09-29 11:12:35 +0000
+++ nautilus/utils.c	2010-11-03 15:01:52 +0000
@@ -59,22 +59,27 @@
 	}
 
 	/* Now check for published files */
-	if (uon->gotpubs) {
-		GHashTableIter iter;
-		gchar *key, *value;
-
-		g_hash_table_iter_init (&iter, uon->public);
-		while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &value)) {
-			if (g_str_has_prefix (key, syncdaemon_folder_info_get_path (folder_info))) {
+	interface = syncdaemon_daemon_get_publicfiles_interface (uon->syncdaemon);
+	if (SYNCDAEMON_IS_PUBLICFILES_INTERFACE (interface)) {
+		GSList *public_files, *l;
+		public_files = syncdaemon_publicfiles_interface_get_public_files (SYNCDAEMON_PUBLICFILES_INTERFACE (interface));
+
+		for (l = public_files; l != NULL; l = l->next) {
+			const gchar *path;
+
+			path = syncdaemon_file_info_get_path (SYNCDAEMON_FILE_INFO (l->data));
+			if (g_str_has_prefix (path, syncdaemon_folder_info_get_path (folder_info))) {
 				has_published = TRUE;
 
 				question = g_string_append (question, "\t- ");
-				question = g_string_append (question, key);
+				question = g_string_append (question, path);
 				question = g_string_append (question, _(" (Published at "));
-				question = g_string_append (question, value);
+				question = g_string_append (question, syncdaemon_file_info_get_public_url (SYNCDAEMON_FILE_INFO (l->data)));
 				question = g_string_append (question, ")\n");
 			}
 		}
+
+		g_slist_free (public_files);
 	}
 
 	if (has_shares || has_published) {
@@ -101,6 +106,31 @@
 }
 
 gboolean
+ubuntuone_is_folder_shared (UbuntuOneNautilus *uon, const gchar *path)
+{
+	GSList *shares, *l;
+	SyncdaemonInterface *interface;
+	gboolean is_shared = FALSE;
+
+	interface = syncdaemon_daemon_get_shares_interface (uon->syncdaemon);
+	if (SYNCDAEMON_IS_SHARES_INTERFACE (interface)) {
+		shares = syncdaemon_shares_interface_get_shared (SYNCDAEMON_SHARES_INTERFACE (interface));
+		for (l = shares; l != NULL; l = l->next) {
+			SyncdaemonShareInfo *share_info = SYNCDAEMON_SHARE_INFO (l->data);
+
+			if (g_strcmp0 (syncdaemon_share_info_get_path (share_info), path) == 0) {
+				is_shared = TRUE;
+				break;
+			}
+		}
+
+		g_slist_free (shares);
+	}
+
+	return is_shared;
+}
+
+gboolean
 ubuntuone_is_location_bar_enabled (void)
 {
 	GConfClient *conf_client;