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

[Rodrigo Moya]

Refactor Nautilus plugin to not store status in hash tables, but rather keep a more clever track of status in signals

Refactor Nautilus plugin to not store status in hash tables, but rather keep a more clever track of status in signals.

This is part I of the refactoring, so there are a few issues still, which will be fixed in upcoming branches. Just didn't want to delay this branch any more and make it bigger than what it already is

[dobey (dobey)]

> Refactor Nautilus plugin to not store status in hash tables, but rather keep a more clever track of status in signals.

I'm a bit confused about what this means exactly. Can you explain? It looks like rather than caching, you're making synchronous calls to syncdaemon over dbus whenever a file is queried?

review: Needs Information

[Rodrigo Moya (rodrigo-moya)]

> > Refactor Nautilus plugin to not store status in hash tables, but rather keep
> a more clever track of status in signals.
>
> I'm a bit confused about what this means exactly. Can you explain? It looks
> like rather than caching, you're making synchronous calls to syncdaemon over
> dbus whenever a file is queried?

the cache is in libsyncdaemon already (except for metadata, which will come in part II)

[Natalia Bidart (nataliabidart)]

There is some conflict when merging trunk:

Text conflict in libsyncdaemon/syncdaemon-daemon.c
Text conflict in nautilus/ubuntuone-nautilus.c
2 conflicts encountered.

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

I ran the test though the Python suite won't cover changes in this branch. I performed some manual testing (start synching a folder, stop synching, publish file). No crashes!
The overview of the code looks fine, though I didn't follow it on detail. I still insist we need an automated test suite for all the C code.

review: Approve

[Alejandro J. Cura (alecu)]

Huge diff! Looks good.

review: Approve

[dobey (dobey)]

review: Abstain

[dobey (dobey)]

Just setting to needs fixing since there seems to be a branch rescan issue on lp.

review: Needs Fixing

[dobey (dobey)]

review: Abstain

[dobey (dobey)]

Test command "./autogen.sh --enable-debug --with-protocol=/var/cache/tarmac/ubuntuone-storage-protocol/trunk --with-sso=/var/cache/tarmac/ubuntu-sso-client/trunk && make dist && make check" failed.

[dobey (dobey)]

cc1: warnings being treated as errors
file-watcher.c: In function ‘udf_created_cb’:
file-watcher.c:142: error: unused variable ‘file’
file-watcher.c:141: error: unused variable ‘key’
file-watcher.c:140: error: unused variable ‘iter’
file-watcher.c: In function ‘got_public_files_cb’:
file-watcher.c:218: error: unused variable ‘i’
make[1]: *** [libnautilus_ubuntuone_la-file-watcher.lo] Error 1
make: *** [check-recursive] Error 1

review: Needs Fixing

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

735. By Rodrigo Moya on 2010-10-08

Remove unused variables

736. By Rodrigo Moya on 2010-10-08

Merge from trunk

737. By Rodrigo Moya on 2010-10-08

Fix after compiling with -Werror

=== modified file 'libsyncdaemon/syncdaemon-daemon.c'
--- libsyncdaemon/syncdaemon-daemon.c	2010-10-04 18:47:52 +0000
+++ libsyncdaemon/syncdaemon-daemon.c	2010-10-08 07:48:50 +0000
@@ -43,11 +43,11 @@
 
 struct _SyncdaemonDaemonPrivate {
 #ifdef HAVE_GDBUS
-    GDBusConnection *bus;
-    GDbusProxy *dbus_proxy;
+	GDBusConnection *bus;
+	GDbusProxy *dbus_proxy;
 #else
-    DBusGConnection *bus;
-    DBusGProxy *dbus_proxy;
+	DBusGConnection *bus;
+	DBusGProxy *dbus_proxy;
 #endif
 
 	/* Interfaces */
@@ -661,6 +661,71 @@
 	return daemon->priv->auth;
 }
 
+/**
+ * syncdaemon_daemon_is_folder_enabled:
+ * @daemon: A #SyncdaemonDaemon object
+ * @path: The folder path to check
+ * @is_root: Placeholder for returning whether the given path is a U1 root folder
+ *
+ * Check whether a given path is a folder enabled for synchronization to U1.
+ *
+ * Return value: TRUE if the folder is enabled, FALSE otherwise.
+ */
+gboolean
+syncdaemon_daemon_is_folder_enabled (SyncdaemonDaemon *daemon, const gchar *path, gboolean *is_root)
+{
+	const gchar *root;
+	gboolean managed = FALSE;
+	gchar *dirpath;
+	SyncdaemonInterface *interface;
+
+	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), FALSE);
+	g_return_val_if_fail (path != NULL, FALSE);
+
+	*is_root = FALSE;
+
+	/* First check the root folder */
+	root = syncdaemon_daemon_get_root_dir (daemon);
+	if (g_strcmp0 (path, root) == 0) {
+		*is_root = TRUE;
+		return TRUE;
+	} else if (g_str_has_prefix (path, root))
+		return TRUE;
+
+	/* Now check the 'Shared With Me' directory */
+	dirpath = g_build_filename (root, "Shared With Me", NULL);
+	if (g_strcmp0 (path, dirpath) == 0) {
+		g_free (dirpath);
+		return FALSE;
+	}
+
+	/* And finally check UDFs */
+	interface = syncdaemon_daemon_get_folders_interface (daemon);
+	if (SYNCDAEMON_IS_FOLDERS_INTERFACE (interface)) {
+		GSList *udfs, *l;
+
+		udfs = syncdaemon_folders_interface_get_folders (SYNCDAEMON_FOLDERS_INTERFACE (interface));
+		for (l = udfs; l != NULL; l = l->next) {
+			const gchar *tmp_path;
+			SyncdaemonFolderInfo *finfo = SYNCDAEMON_FOLDER_INFO (l->data);
+
+			tmp_path = syncdaemon_folder_info_get_path (finfo);
+			if (g_strcmp0 (path, tmp_path) == 0) {
+				managed = TRUE;
+				*is_root = TRUE;
+				break;
+			} else if (g_str_has_prefix (path, tmp_path)) {
+				managed = TRUE;
+				break;
+			}
+		}
+
+		g_slist_free (udfs);
+	}
+
+	return managed;
+}
+
 typedef SyncdaemonInterface * (* SDINewFunc) (SyncdaemonDaemon * daemon);
 
 static SyncdaemonInterface *
@@ -687,7 +752,7 @@
 	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
 
 	return get_interface (daemon, "/config",
-						  (SDINewFunc) syncdaemon_config_interface_new);
+			      (SDINewFunc) syncdaemon_config_interface_new);
 }
 
 /**
@@ -699,7 +764,7 @@
 	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
 
 	return get_interface (daemon, "/events",
-						  (SDINewFunc) syncdaemon_events_interface_new);
+			      (SDINewFunc) syncdaemon_events_interface_new);
 }
 
 /**
@@ -711,7 +776,7 @@
 	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
 
 	return get_interface (daemon, "/filesystem",
-						  (SDINewFunc) syncdaemon_filesystem_interface_new);
+			      (SDINewFunc) syncdaemon_filesystem_interface_new);
 }
 
 /**
@@ -723,7 +788,7 @@
 	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
 
 	return get_interface (daemon, "/folders",
-						  (SDINewFunc) syncdaemon_folders_interface_new);
+			      (SDINewFunc) syncdaemon_folders_interface_new);
 }
 
 /**
@@ -735,7 +800,7 @@
 	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
 
 	return get_interface (daemon, "/publicfiles",
-						  (SDINewFunc) syncdaemon_publicfiles_interface_new);
+			      (SDINewFunc) syncdaemon_publicfiles_interface_new);
 }
 
 /**
@@ -747,7 +812,7 @@
 	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
 
 	return get_interface (daemon, "/shares",
-						  (SDINewFunc) syncdaemon_shares_interface_new);
+			      (SDINewFunc) syncdaemon_shares_interface_new);
 }
 
 /**
@@ -759,5 +824,5 @@
 	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
 
 	return get_interface (daemon, "/status",
-						  (SDINewFunc) syncdaemon_status_interface_new);
+			      (SDINewFunc) syncdaemon_status_interface_new);
 }

=== modified file 'libsyncdaemon/syncdaemon-daemon.h'
--- libsyncdaemon/syncdaemon-daemon.h	2010-08-24 22:27:04 +0000
+++ libsyncdaemon/syncdaemon-daemon.h	2010-10-08 07:48:50 +0000
@@ -95,6 +95,14 @@
 gboolean             syncdaemon_daemon_has_network (SyncdaemonDaemon *daemon);
 SyncdaemonAuthentication *syncdaemon_daemon_get_authentication (SyncdaemonDaemon *daemon);
 
+/* Folders operations */
+gboolean             syncdaemon_daemon_is_folder_enabled (SyncdaemonDaemon *daemon,
+							  const gchar *path,
+							  gboolean *is_root);
+
+/*
+ * Low level DBus interface access
+ */
 SyncdaemonInterface *syncdaemon_daemon_get_config_interface (SyncdaemonDaemon *daemon);
 SyncdaemonInterface *syncdaemon_daemon_get_events_interface (SyncdaemonDaemon *daemon);
 SyncdaemonInterface *syncdaemon_daemon_get_filesystem_interface (SyncdaemonDaemon *daemon);

=== modified file 'nautilus/Makefile.am'
--- nautilus/Makefile.am	2010-09-22 10:58:17 +0000
+++ nautilus/Makefile.am	2010-10-08 07:48:50 +0000
@@ -27,6 +27,8 @@
 	context-menu.c		\
 	context-menu.h		\
 	error-dialog.c		\
+	file-watcher.c		\
+	file-watcher.h		\
 	location-widget.c	\
 	location-widget.h	\
 	highlight.c 		\

=== modified file 'nautilus/context-menu.c'
--- nautilus/context-menu.c	2010-10-04 18:47:52 +0000
+++ nautilus/context-menu.c	2010-10-08 07:48:50 +0000
@@ -87,7 +87,7 @@
 		folder_info = syncdaemon_folders_interface_get_info (SYNCDAEMON_FOLDERS_INTERFACE (interface),
 								     data->path);
 		if (folder_info != NULL) {
-			if (ubuntuone_nautilus_check_shares_and_public_files (data->uon, folder_info, data->parent)) {
+			if (ubuntuone_check_shares_and_public_files (data->uon, folder_info, data->parent)) {
 				syncdaemon_folders_interface_delete (SYNCDAEMON_FOLDERS_INTERFACE (interface),
 								     syncdaemon_folder_info_get_volume_id (folder_info));
 			}
@@ -139,7 +139,7 @@
 	}
 
 	g_hash_table_replace (data->uon->public, g_strdup (data->path), UPDATE_PENDING);
-	ubuntuone_nautilus_reset_emblem (data->uon, data->path);
+	file_watcher_update_path (data->uon->file_watcher, data->path);
 }
 
 static void
@@ -200,7 +200,7 @@
 	if (path == NULL)
 		return NULL;
 
-	if (ubuntuone_is_storagefs (uon, path, &is_root))
+	if (syncdaemon_daemon_is_folder_enabled (uon->syncdaemon, path, &is_root))
 		is_managed = TRUE;
 
 	homedir_path = g_strdup_printf ("%s/", g_get_home_dir());

=== added file 'nautilus/file-watcher.c'
--- nautilus/file-watcher.c	1970-01-01 00:00:00 +0000
+++ nautilus/file-watcher.c	2010-10-08 07:48:50 +0000
@@ -0,0 +1,358 @@
+/*
+ * UbuntuOne Nautilus plugin
+ *
+ * Authors: Rodrigo Moya <[e-mail]>
+ *
+ * Copyright 2009-2010 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
+#include <libsyncdaemon/libsyncdaemon.h>
+#include "ubuntuone-nautilus.h"
+
+G_DEFINE_TYPE(FileWatcher, file_watcher, G_TYPE_OBJECT)
+
+static void
+file_watcher_finalize (GObject *object)
+{
+	FileWatcher *watcher = FILE_WATCHER (object);
+
+	if (watcher->files != NULL)
+		g_hash_table_destroy (watcher->files);
+
+	G_OBJECT_CLASS (file_watcher_parent_class)->finalize (object);
+}
+
+static void
+file_watcher_class_init (FileWatcherClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	object_class->finalize = file_watcher_finalize;
+}
+
+static void
+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);
+}
+
+static void
+transfer_started_cb (SyncdaemonDaemon *daemon,
+		   gchar *path,
+		   gpointer user_data)
+{
+	FileWatcher *watcher = FILE_WATCHER (user_data);
+
+	file_watcher_update_path (watcher, path);
+}
+
+static void
+transfer_finished_cb (SyncdaemonDaemon *daemon,
+		    gchar *path,
+		    SyncdaemonTransferInfo * info,
+		    gpointer user_data)
+{
+	FileWatcher *watcher = FILE_WATCHER (user_data);
+
+	file_watcher_update_path (watcher, path);
+}
+
+static void
+share_created_cb (SyncdaemonDaemon *daemon,
+		  gboolean success,
+		  SyncdaemonShareInfo *share_info,
+		  gpointer user_data)
+{
+	FileWatcher *watcher = FILE_WATCHER (user_data);
+	const gchar * path;
+
+	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);
+		}
+	} else {
+		ubuntuone_show_error_dialog (watcher->uon, _("Error creating share."),
+					     _("There was an error sharing the folder '%s'"),
+					     path);
+	}
+}
+
+static void
+share_deleted_cb (SyncdaemonDaemon *daemon,
+		  gboolean success,
+		  SyncdaemonShareInfo *share_info,
+		  gpointer user_data)
+{
+	FileWatcher *watcher = FILE_WATCHER (user_data);
+	const gchar *path;
+
+	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."),
+					     _("There was an error deleting the share for folder '%s'"),
+					     path);
+	}
+}
+
+static void
+udf_created_cb (SyncdaemonDaemon *daemon,
+		gboolean success,
+		SyncdaemonFolderInfo *folder_info,
+		gpointer user_data)
+{
+	FileWatcher *watcher = FILE_WATCHER (user_data);
+	const gchar *path, *id;
+	gboolean subscribed;
+
+	path = syncdaemon_folder_info_get_path (folder_info);
+	id = syncdaemon_folder_info_get_volume_id (folder_info);
+	subscribed = syncdaemon_folder_info_get_subscribed (folder_info);
+	if (success) {
+		if (!g_hash_table_lookup (watcher->uon->udfs, path)) {
+			if (subscribed) {
+				g_hash_table_insert (watcher->uon->udfs, g_strdup (path), g_strdup (id));
+
+				/* Update the emblems of the files on this new UDF */
+				file_watcher_update_path (watcher, path);
+			}
+		}
+	}
+}
+
+static void
+udf_deleted_cb (SyncdaemonDaemon *daemon,
+		gboolean success,
+		SyncdaemonFolderInfo *folder_info,
+		gpointer user_data)
+{
+	FileWatcher *watcher = FILE_WATCHER (user_data);
+	const gchar * path;
+
+	path = syncdaemon_folder_info_get_path (folder_info);
+	if (path != NULL && success) {
+		/* Remove the files from the status hash table */
+		g_hash_table_remove (watcher->uon->udfs, path);
+
+		file_watcher_update_path (watcher, path);
+	}
+}
+
+static void
+file_published_cb (SyncdaemonDaemon *daemon,
+		   gboolean success,
+		   SyncdaemonFileInfo *finfo,
+		   gpointer user_data)
+{
+	FileWatcher *watcher = FILE_WATCHER (user_data);
+	const gchar * path, * url;
+	gboolean is_public;
+
+	path = syncdaemon_file_info_get_path (finfo);
+	if (success) {
+		url = syncdaemon_file_info_get_public_url (finfo);
+		is_public = syncdaemon_file_info_get_is_public (finfo);
+
+		if (!is_public && g_hash_table_lookup (watcher->uon->public, path))
+			g_hash_table_remove (watcher->uon->public, path);
+
+		if (is_public)
+			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'"),
+					     path);
+	}
+}
+
+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)
+{
+	FileWatcher *watcher;
+
+	watcher = g_object_new (TYPE_FILE_WATCHER, NULL);
+	watcher->uon = uon;
+
+	/* Connect to transfers-related signals */
+	g_signal_connect (G_OBJECT (uon->syncdaemon), "upload_started",
+			  G_CALLBACK (transfer_started_cb), watcher);
+	g_signal_connect (G_OBJECT (uon->syncdaemon), "upload_finished",
+			  G_CALLBACK (transfer_finished_cb), watcher);
+	g_signal_connect (G_OBJECT (uon->syncdaemon), "download_started",
+			  G_CALLBACK (transfer_started_cb), watcher);
+	g_signal_connect (G_OBJECT (uon->syncdaemon), "download_finished",
+			  G_CALLBACK (transfer_finished_cb), watcher);
+
+	/* Connect to shares-related signals */
+	g_signal_connect (G_OBJECT (uon->syncdaemon), "share_created",
+			  G_CALLBACK (share_created_cb), watcher);
+	g_signal_connect (G_OBJECT (uon->syncdaemon), "share_deleted",
+			  G_CALLBACK (share_deleted_cb), watcher);
+
+	/* Connect to folder-related signals */
+	g_signal_connect (G_OBJECT (uon->syncdaemon), "folder_created",
+		    G_CALLBACK (udf_created_cb), watcher);
+	g_signal_connect (G_OBJECT (uon->syncdaemon), "folder_subscribed",
+			  G_CALLBACK (udf_created_cb), watcher);
+	g_signal_connect (G_OBJECT (uon->syncdaemon), "folder_deleted",
+			  G_CALLBACK (udf_deleted_cb), watcher);
+	g_signal_connect (G_OBJECT (uon->syncdaemon), "folder_unsubscribed",
+			  G_CALLBACK (udf_deleted_cb), watcher);
+
+	/* 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);
+
+	return watcher;
+}
+
+static gboolean
+check_for_shared_folder (const gchar *path, GSList *list_of_shares)
+{
+	GSList *l;
+	gboolean is_shared = FALSE;
+
+	for (l = list_of_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 (list_of_shares);
+
+	return is_shared;
+}
+
+void
+file_watcher_add_file (FileWatcher *watcher, NautilusFileInfo *file)
+{
+	gboolean is_root;
+	gchar *path = NULL;
+
+	g_return_if_fail (IS_FILE_WATCHER (watcher));
+
+	path = g_filename_from_uri (nautilus_file_info_get_uri (file), NULL, NULL);
+	if (path == NULL)
+		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));
+
+	/* Retrieve metadata */
+	if (syncdaemon_daemon_is_folder_enabled (watcher->uon->syncdaemon, path, &is_root)) {
+		SyncdaemonInterface *interface;
+
+		interface = syncdaemon_daemon_get_filesystem_interface (watcher->uon->syncdaemon);
+		if (interface != NULL) {
+			SyncdaemonMetadata *metadata;
+			gboolean is_dir = nautilus_file_info_is_directory (file);
+
+			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");
+				}
+			} else {
+				/* If it's a file, check for public files */
+			}
+
+			/* 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"); */
+}
+
+void
+file_watcher_update_path (FileWatcher *watcher, const gchar *path)
+{
+	GHashTableIter iter;
+	gchar *key;
+	NautilusFileInfo *file;
+
+	g_return_if_fail (IS_FILE_WATCHER (watcher));
+
+	/* Remove emblems from all files in the specified path */
+	g_hash_table_iter_init (&iter, watcher->files);
+	while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &file)) {
+		if (g_str_has_prefix (key, path) || g_strcmp0 (key, path) == 0)
+			nautilus_file_info_invalidate_extension_info (file);
+	}
+}

=== added file 'nautilus/file-watcher.h'
--- nautilus/file-watcher.h	1970-01-01 00:00:00 +0000
+++ nautilus/file-watcher.h	2010-10-08 07:48:50 +0000
@@ -0,0 +1,54 @@
+/*
+ * UbuntuOne Nautilus plugin
+ *
+ * Authors: Rodrigo Moya <[e-mail]>
+ *
+ * Copyright 2009-2010 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef __FILE_WATCHER_H__
+#define __FILE_WATCHER_H__
+
+#include <libnautilus-extension/nautilus-file-info.h>
+
+#define TYPE_FILE_WATCHER                (file_watcher_get_type ())
+#define FILE_WATCHER(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FILE_WATCHER, FileWatcher))
+#define IS_FILE_WATCHER(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_FILE_WATCHER))
+#define FILE_WATCHER_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_FILE_WATCHER, FileWatcherClass))
+#define IS_FILE_WATCHER_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_FILE_WATCHER))
+#define FILE_WATCHER_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_FILE_WATCHER, FileWatcherClass))
+
+typedef struct _UbuntuOneNautilus UbuntuOneNautilus;
+
+typedef struct {
+	GObject parent;
+
+	/* Private data */
+	UbuntuOneNautilus *uon;
+	GHashTable *files;
+} FileWatcher;
+
+typedef struct {
+	GObjectClass parent_class;
+} FileWatcherClass;
+
+GType        file_watcher_get_type (void);
+
+FileWatcher *file_watcher_new (UbuntuOneNautilus *uon);
+void         file_watcher_add_file (FileWatcher *watcher, NautilusFileInfo *file);
+void         file_watcher_update_path (FileWatcher *watcher, const gchar *path);
+
+#endif

=== modified file 'nautilus/location-widget.c'
--- nautilus/location-widget.c	2010-10-04 18:47:52 +0000
+++ nautilus/location-widget.c	2010-10-08 07:48:50 +0000
@@ -137,7 +137,7 @@
                         SYNCDAEMON_FOLDERS_INTERFACE (interface),
                         location->path);
                 if (folder_info != NULL) {
-                        if (ubuntuone_nautilus_check_shares_and_public_files (location->uon, folder_info, GTK_WIDGET (location))) {
+                        if (ubuntuone_check_shares_and_public_files (location->uon, folder_info, GTK_WIDGET (location))) {
 				start_spinner (location);
 
                                 syncdaemon_folders_interface_delete (
@@ -365,7 +365,7 @@
 	}
 	if (!is_xdg) {
 		/* last chance */
-		ubuntuone_is_storagefs (uon, path, &is_root);
+		syncdaemon_daemon_is_folder_enabled (uon->syncdaemon, path, &is_root);
 		if (!is_root || is_special_udf (uon, path))
 			return NULL;
 	}
@@ -380,7 +380,7 @@
 	g_signal_connect (G_OBJECT (uon->syncdaemon), "folder_deleted",
 			  G_CALLBACK (folder_deleted_cb), location);
 
-	if (ubuntuone_is_storagefs (uon, path, &is_root)) {
+	if (syncdaemon_daemon_is_folder_enabled (uon->syncdaemon, path, &is_root)) {
 		/* Create label and disable button */
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (location->toggle_button), TRUE);
 		if (!is_root || is_special_udf (uon, path))

=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c	2010-10-04 18:47:52 +0000
+++ nautilus/ubuntuone-nautilus.c	2010-10-08 07:48:50 +0000
@@ -49,283 +49,74 @@
 /* The header is generated from ubuntuone-marshallers.list */
 #include "ubuntuone-marshallers.h"
 
-static void ubuntuone_nautilus_finalize(GObject * object);
-
-static void ubuntuone_nautilus_register_type (GTypeModule * module);
-
-/* Utility functions */
-static void ubuntuone_nautilus_observed_file_unref (gpointer user_data,
-                                                    GObject *where_the_object_was);
-
-static void ubuntuone_nautilus_observed_file_foreach_unref (gpointer key,
-							    gpointer value,
-							    gpointer user_data);
+static void ubuntuone_nautilus_finalize (GObject *object);
+
+static void ubuntuone_nautilus_register_type (GTypeModule *module);
 
 /* DBus signal and async method call handlers */
-static void ubuntuone_nautilus_update_meta (SyncdaemonFilesystemInterface *interface,
-					    gboolean success,
-					    SyncdaemonMetadata *metadata,
-					    gpointer user_data);
 static void ubuntuone_nautilus_daemon_ready (SyncdaemonDaemon *daemon, gpointer user_data);
-static void ubuntuone_nautilus_upload_started (SyncdaemonDaemon *daemon,
-					       gchar * path,
-					       gpointer user_data);
-static void ubuntuone_nautilus_upload_finished (SyncdaemonDaemon *daemon,
-						 gchar * path,
-						SyncdaemonTransferInfo * info,
-						 gpointer user_data);
-static void ubuntuone_nautilus_download_started (SyncdaemonDaemon *daemon,
-						 gchar * path,
-						 gpointer user_data);
-static void ubuntuone_nautilus_download_finished (SyncdaemonDaemon *daemon,
-						  gchar * path,
-						  SyncdaemonTransferInfo * info,
-						  gpointer user_data);
-static void ubuntuone_nautilus_udf_created (SyncdaemonDaemon *daemon,
-					    gboolean success,
-					    SyncdaemonFolderInfo *folder_info,
-					    gpointer user_data);
-static void ubuntuone_nautilus_udf_deleted (SyncdaemonDaemon *daemon,
-					    gboolean success,
-					    SyncdaemonFolderInfo *folder_info,
-					    gpointer user_data);
-static void ubuntuone_nautilus_file_published (SyncdaemonDaemon *daemon,
-					       gboolean success,
-					       SyncdaemonFileInfo *finfo,
-					       gpointer user_data);
-static void ubuntuone_nautilus_got_public_files (SyncdaemonDaemon *daemon,
-                                                 gboolean success,
-						 GSList *files,
-                                                 gpointer user_data);
-static void ubuntuone_nautilus_share_created (SyncdaemonDaemon *daemon,
-					      gboolean success,
-					      SyncdaemonShareInfo *share_info,
-					      gpointer user_data);
-static void ubuntuone_nautilus_share_deleted (SyncdaemonDaemon *daemon,
-					      gboolean success,
-					      SyncdaemonShareInfo *share_info,
-					      gpointer user_data);
-
-
-static GObjectClass * parent_class = NULL;
-
-/* Called when NautilusFileInfo is unreferenced */
-static void ubuntuone_nautilus_observed_file_unref (gpointer user_data,
-                                                    GObject *where_the_object_was) {
-  UbuntuOneNautilus * uon;
-  NautilusFileInfo * file;
-  gchar * path = NULL;
-
-  uon  = UBUNTUONE_NAUTILUS(user_data);
-  file = NAUTILUS_FILE_INFO(where_the_object_was);
-  path = g_filename_from_uri (nautilus_file_info_get_uri (file), NULL, NULL);
-
-  if (g_hash_table_lookup (uon->observed, path ))
-    g_hash_table_remove (uon->observed, path);
-
-}
-
-/* Cleanup routine for weak reference callbacks */
-static void ubuntuone_nautilus_observed_file_foreach_unref (gpointer key,
-							    gpointer value,
-							    gpointer user_data) {
-  UbuntuOneNautilus * uon;
-  NautilusFileInfo * file;
-
-  uon = UBUNTUONE_NAUTILUS(user_data);
-  file = NAUTILUS_FILE_INFO(value);
-
-  g_object_weak_unref (G_OBJECT (file),
-		       (GWeakNotify) ubuntuone_nautilus_observed_file_unref,
-		       uon);
-
-}
-
-/* Are we in an Ubuntu One managed (root or udf) directory */
-gboolean ubuntuone_is_storagefs (UbuntuOneNautilus * uon,
-				 const char * path,
-				 gboolean * is_root) {
-  gboolean managed = FALSE;
-  gchar * dirpath;
-  gchar * shared;
-  GSList * udfs, * l;
-  SyncdaemonFoldersInterface *interface;
-
-  *is_root = FALSE;
-
-  if (!uon->managed)
-    return FALSE;
-
-  if (!path)
-    return FALSE;
-
-  /* Check the Ubuntu One directory */
-  if (strcmp (path, uon->managed) == 0) {
-    *is_root = TRUE;
-    return TRUE;
-  }
-
-  shared = g_build_filename (uon->managed, "Shared With Me", NULL);
-  if (strncmp (path, shared, strlen (shared)) == 0) {
-    managed = FALSE;
-    goto fsdone;
-  }
-
-  dirpath = g_strdup_printf ("%s/", uon->managed);
-  if (strncmp (path, dirpath, strlen (dirpath)) == 0) {
-    managed = TRUE;
-    goto fsdone;
-  }
-
-  g_free (dirpath);
-
-  /* Check for UDFs */
-  interface = SYNCDAEMON_FOLDERS_INTERFACE (syncdaemon_daemon_get_folders_interface (uon->syncdaemon));
-  if (interface != NULL) {
-    udfs = syncdaemon_folders_interface_get_folders (SYNCDAEMON_FOLDERS_INTERFACE (interface));
-    for (l = udfs; l != NULL && l->data != NULL; l = l->next) {
-      const char *tmp_path;
-
-      tmp_path = syncdaemon_folder_info_get_path (SYNCDAEMON_FOLDER_INFO (l->data));
-      if (!tmp_path)
-        continue;
-
-      if (strcmp (path, tmp_path) == 0) {
-	 managed = TRUE;
-	 *is_root = TRUE;
-	 break;
-       }
-
-       dirpath = g_strdup_printf ("%s/", (char *) tmp_path);
-       if (strncmp (path, dirpath, strlen (dirpath)) == 0) {
-	 managed = TRUE;
-	 g_free (dirpath);
-	 break;
-       }
-
-       g_free (dirpath);
-    }
-    g_slist_free (udfs);
-  }
-
- fsdone:
-  g_free (shared);
-  return managed;
-}
-
-static void
-ubuntuone_nautilus_add_observed (UbuntuOneNautilus * uon,
-				 gchar * path,
-				 NautilusFileInfo * file)
-{
-  g_object_weak_ref (G_OBJECT(file),
-		     (GWeakNotify) ubuntuone_nautilus_observed_file_unref,
-		     uon);
-  g_hash_table_insert (uon->observed, g_strdup (path), file);
-}
+
+static GObjectClass *parent_class = NULL;
 
 /* Update file info provider */
 static NautilusOperationResult
-ubuntuone_nautilus_update_file_info (NautilusInfoProvider * provider,
-				     NautilusFileInfo * file,
-				     GClosure * update_complete,
-				     NautilusOperationHandle ** handle)
+ubuntuone_nautilus_update_file_info (NautilusInfoProvider *provider,
+				     NautilusFileInfo *file,
+				     GClosure *update_complete,
+				     NautilusOperationHandle **handle)
 {
-  UbuntuOneNautilus * uon;
-  gboolean is_root;
-  char * path = NULL;
-
-  uon = UBUNTUONE_NAUTILUS(provider);
-
-  /* If syncdaemon is not ready, do nothing */
-  if (!syncdaemon_daemon_is_ready (uon->syncdaemon))
-    return NAUTILUS_OPERATION_COMPLETE;
-
-  path = g_filename_from_uri (nautilus_file_info_get_uri (file), NULL, NULL);
-  if (path == NULL)
-    return NAUTILUS_OPERATION_COMPLETE;
-
-  /* Always add it to the observed hash table, so that we can update emblems */
-  ubuntuone_nautilus_add_observed (uon, path, file);
-
-  if (!g_hash_table_lookup (uon->updated, path) &&
-      !g_hash_table_lookup (uon->needsupdating, path) &&
-      ubuntuone_is_storagefs (uon, path, &is_root)) {
-    SyncdaemonFilesystemInterface *interface;
-
-    /* Add the unsynchronized emblem anyway, and update later */
-    nautilus_file_info_add_emblem (file, "ubuntuone-updating");
-
-    interface = (SyncdaemonFilesystemInterface *) syncdaemon_daemon_get_filesystem_interface (uon->syncdaemon);
-    if (interface != NULL) {
-      syncdaemon_filesystem_interface_get_metadata_async (interface,
-							  path,
-							  nautilus_file_info_is_directory (file),
-							  (SyncdaemonGotMetadataFunc) ubuntuone_nautilus_update_meta,
-							  uon);
-      goto updating_meta;
-    }
-  }
-
-  if (g_hash_table_lookup (uon->uploads, path) ||
-      g_hash_table_lookup (uon->downloads, path))
-    nautilus_file_info_add_emblem (file, "ubuntuone-updating");
-  else if (g_hash_table_lookup (uon->updated, path))
-    nautilus_file_info_add_emblem (file, "ubuntuone-synchronized");
-  else if (g_hash_table_lookup (uon->needsupdating, path))
-    nautilus_file_info_add_emblem (file, "ubuntuone-updating");
-
-  if (g_hash_table_lookup (uon->udfs, path))
-    nautilus_file_info_add_emblem (file, "ubuntuone-enabled");
-
-  if (g_hash_table_lookup (uon->public, path))
-    nautilus_file_info_add_emblem (file, "ubuntuone-public");
-
-  if (g_hash_table_lookup (uon->shares, path))
-    nautilus_file_info_add_emblem (file, "shared");
-
- updating_meta:
-  g_free (path);
-
-  return NAUTILUS_OPERATION_COMPLETE;
+	UbuntuOneNautilus *uon = UBUNTUONE_NAUTILUS (provider);
+
+	/* If syncdaemon is not ready, do nothing */
+	if (!syncdaemon_daemon_is_ready (uon->syncdaemon))
+		return NAUTILUS_OPERATION_COMPLETE;
+
+	file_watcher_add_file (uon->file_watcher, file);
+
+	return NAUTILUS_OPERATION_COMPLETE;
 }
 
-static void ubuntuone_nautilus_info_provider_iface_init (NautilusInfoProviderIface * iface) {
-  iface->update_file_info = ubuntuone_nautilus_update_file_info;
+static void
+ubuntuone_nautilus_info_provider_iface_init (NautilusInfoProviderIface * iface)
+{
+	iface->update_file_info = ubuntuone_nautilus_update_file_info;
 }
 
 /* LocationWidget provider */
-static GtkWidget * ubuntuone_nautilus_get_location_widget (NautilusLocationWidgetProvider * provider,
-							   const char * uri,
-							   GtkWidget * parent) {
-  UbuntuOneNautilus * uon;
-  gchar *path;
-  GtkWidget *location;
-
-  /* if the bar is disabled, do nothing */
-  if (!ubuntuone_is_location_bar_enabled ())
-    return NULL;
-
-  uon = UBUNTUONE_NAUTILUS (provider);
-
-  /* If syncdaemon is not ready, do nothing */
-  if (!syncdaemon_daemon_is_ready (uon->syncdaemon))
-    return NULL;
-
-  path = g_filename_from_uri (uri, NULL, NULL);
-
-  if (!path)
-    return NULL;
-
-  location = location_widget_new (uon, path);
-
-  g_free (path);
-
-  return location;
+static GtkWidget *
+ubuntuone_nautilus_get_location_widget (NautilusLocationWidgetProvider * provider,
+					const char * uri,
+					GtkWidget * parent)
+{
+	UbuntuOneNautilus * uon;
+	gchar *path;
+	GtkWidget *location;
+
+	/* if the bar is disabled, do nothing */
+	if (!ubuntuone_is_location_bar_enabled ())
+		return NULL;
+
+	uon = UBUNTUONE_NAUTILUS (provider);
+
+	/* If syncdaemon is not ready, do nothing */
+	if (!syncdaemon_daemon_is_ready (uon->syncdaemon))
+		return NULL;
+
+	path = g_filename_from_uri (uri, NULL, NULL);
+	if (!path)
+		return NULL;
+
+	location = location_widget_new (uon, path);
+
+	g_free (path);
+
+	return location;
 }
 
-static void ubuntuone_nautilus_bar_provider_iface_init (NautilusLocationWidgetProviderIface * iface) {
-  iface->get_widget = ubuntuone_nautilus_get_location_widget;
+static void
+ubuntuone_nautilus_bar_provider_iface_init (NautilusLocationWidgetProviderIface * iface)
+{
+	iface->get_widget = ubuntuone_nautilus_get_location_widget;
 }
 
 /* Menu provider */
@@ -334,522 +125,274 @@
 				   GtkWidget * window,
 				   GList * files)
 {
-  UbuntuOneNautilus * uon;
-  GList *items = NULL;
-  NautilusMenuItem *root_item;
-
-  uon = UBUNTUONE_NAUTILUS (provider);
-
-  /* If syncdaemon is not ready, do nothing */
-  if (!syncdaemon_daemon_is_ready (uon->syncdaemon))
-    return NULL;
-
-  root_item = context_menu_new (uon, window, files);
-  if (root_item != NULL)
-	  items = g_list_append (items, root_item);
-
-  return items;
-}
-
-static GList * ubuntuone_nautilus_get_bg_menu_items (NautilusMenuProvider * provider,
-						     GtkWidget * window,
-						     NautilusFileInfo * folder) {
-  GList * files = NULL;
-  GList * items = NULL;
-
-  files = g_list_prepend (files, folder);
-  items = ubuntuone_nautilus_get_menu_items (provider, window, files);
-  files = g_list_remove (files, folder);
-  g_list_free (files);
-
-  return items;
-}
-
-static void ubuntuone_nautilus_menu_provider_iface_init (NautilusMenuProviderIface * iface) {
-  iface->get_file_items = ubuntuone_nautilus_get_menu_items;
-  iface->get_background_items = ubuntuone_nautilus_get_bg_menu_items;
+	UbuntuOneNautilus * uon;
+	GList *items = NULL;
+	NautilusMenuItem *root_item;
+
+	uon = UBUNTUONE_NAUTILUS (provider);
+
+	/* If syncdaemon is not ready, do nothing */
+	if (!syncdaemon_daemon_is_ready (uon->syncdaemon))
+		return NULL;
+
+	root_item = context_menu_new (uon, window, files);
+	if (root_item != NULL)
+		items = g_list_append (items, root_item);
+
+	return items;
+}
+
+static GList *
+ubuntuone_nautilus_get_bg_menu_items (NautilusMenuProvider * provider,
+				      GtkWidget * window,
+				      NautilusFileInfo * folder)
+{
+	GList * files = NULL;
+	GList * items = NULL;
+
+	files = g_list_prepend (files, folder);
+	items = ubuntuone_nautilus_get_menu_items (provider, window, files);
+	files = g_list_remove (files, folder);
+	g_list_free (files);
+
+	return items;
+}
+
+static void
+ubuntuone_nautilus_menu_provider_iface_init (NautilusMenuProviderIface * iface)
+{
+	iface->get_file_items = ubuntuone_nautilus_get_menu_items;
+	iface->get_background_items = ubuntuone_nautilus_get_bg_menu_items;
 }
 
 /* GType and nautilus module stuff */
 static GType un_type = 0;
 
-static void ubuntuone_nautilus_instance_init (UbuntuOneNautilus * uon) {
-  uon->connected = FALSE;
-  uon->uploads = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-  uon->downloads = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-  uon->shares = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-  uon->updated = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-  uon->needsupdating = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-  uon->observed = 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->syncdaemon = syncdaemon_daemon_new ();
-  g_signal_connect (G_OBJECT (uon->syncdaemon), "ready",
-		    G_CALLBACK (ubuntuone_nautilus_daemon_ready), uon);
-
-  /* Default to ~/Ubuntu One for now, as it's all we really support */
-  uon->managed = g_build_filename (g_get_home_dir (), "Ubuntu One", NULL);
-  uon->gotroot = FALSE;
-  uon->gotudfs = FALSE;
-  uon->gotpubs = FALSE;
-
-  /* Connec to status-related signals */
-  g_signal_connect (G_OBJECT (uon->syncdaemon), "upload_started",
-		    G_CALLBACK (ubuntuone_nautilus_upload_started), uon);
-  g_signal_connect (G_OBJECT (uon->syncdaemon), "upload_finished",
-		    G_CALLBACK (ubuntuone_nautilus_upload_finished), uon);
-  g_signal_connect (G_OBJECT (uon->syncdaemon), "download_started",
-		    G_CALLBACK (ubuntuone_nautilus_download_started), uon);
-  g_signal_connect (G_OBJECT (uon->syncdaemon), "download_finished",
-		    G_CALLBACK (ubuntuone_nautilus_download_finished), uon);
-
-  /* Connect to shares-related signals */
-  g_signal_connect (G_OBJECT (uon->syncdaemon), "share_created",
-		    G_CALLBACK (ubuntuone_nautilus_share_created), uon);
-  g_signal_connect (G_OBJECT (uon->syncdaemon), "share_deleted",
-		    G_CALLBACK (ubuntuone_nautilus_share_deleted), uon);
-
-  /* Connect to folder-related signals */
-  g_signal_connect (G_OBJECT (uon->syncdaemon), "folder_created",
-		    G_CALLBACK (ubuntuone_nautilus_udf_created), uon);
-  g_signal_connect (G_OBJECT (uon->syncdaemon), "folder_subscribed",
-		    G_CALLBACK (ubuntuone_nautilus_udf_created), uon);
-  g_signal_connect (G_OBJECT (uon->syncdaemon), "folder_deleted",
-		    G_CALLBACK (ubuntuone_nautilus_udf_deleted), uon);
-  g_signal_connect (G_OBJECT (uon->syncdaemon), "folder_unsubscribed",
-		    G_CALLBACK (ubuntuone_nautilus_udf_deleted), uon);
-
-  /* Connect to public files-related signals */
-  g_signal_connect (G_OBJECT (uon->syncdaemon), "file_published",
-		    G_CALLBACK (ubuntuone_nautilus_file_published), uon);
-  g_signal_connect (G_OBJECT (uon->syncdaemon), "got_published_files",
-		    G_CALLBACK (ubuntuone_nautilus_got_public_files), uon);
-
-}
-
-static void ubuntuone_nautilus_class_init (UbuntuOneNautilusClass * klass) {
-  parent_class = g_type_class_peek_parent (klass);
-
-  G_OBJECT_CLASS(klass)->finalize = ubuntuone_nautilus_finalize;
-}
-
-static void ubuntuone_nautilus_finalize(GObject * object) {
-  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS(object);
-
-  if (uon->syncdaemon)
-    g_object_unref (uon->syncdaemon);
-
-  g_hash_table_destroy (uon->uploads);
-  uon->uploads = NULL;
-
-  g_hash_table_destroy (uon->downloads);
-  uon->downloads = NULL;
-
-  g_hash_table_destroy (uon->shares);
-  uon->shares = NULL;
-
-  g_hash_table_destroy (uon->udfs);
-  uon->udfs = NULL;
-
-  g_hash_table_destroy (uon->public);
-  uon->public = NULL;
-
-  g_hash_table_destroy (uon->updated);
-  uon->updated = NULL;
-
-  g_hash_table_destroy (uon->needsupdating);
-  uon->needsupdating = NULL;
-
-  /* We need to remove all weak reference callbacks */
-  g_hash_table_foreach (uon->observed, 
-			(GHFunc)ubuntuone_nautilus_observed_file_foreach_unref,
-			uon);
-
-  g_hash_table_destroy (uon->observed);
-  uon->observed = NULL;
-}
-
-GType ubuntuone_nautilus_get_type (void) {
-  return un_type;
-}
-
-static void ubuntuone_nautilus_register_type (GTypeModule * module) {
-  static const GTypeInfo info = {
-    sizeof (UbuntuOneNautilusClass),
-    (GBaseInitFunc) NULL,
-    (GBaseFinalizeFunc) NULL,
-    (GClassInitFunc) ubuntuone_nautilus_class_init,
-    NULL,
-    NULL,
-    sizeof (UbuntuOneNautilus),
-    0,
-    (GInstanceInitFunc) ubuntuone_nautilus_instance_init,
-  };
-
-  static const GInterfaceInfo info_provider_iface_info = {
-    (GInterfaceInitFunc) ubuntuone_nautilus_info_provider_iface_init,
-    NULL,
-    NULL
-  };
-
-  static const GInterfaceInfo bar_provider_iface_info = {
-    (GInterfaceInitFunc) ubuntuone_nautilus_bar_provider_iface_init,
-    NULL,
-    NULL
-  };
-
-  static const GInterfaceInfo menu_provider_iface_info = {
-    (GInterfaceInitFunc) ubuntuone_nautilus_menu_provider_iface_init,
-    NULL,
-    NULL
-  };
-
-  un_type = g_type_module_register_type (module, 
-					 G_TYPE_OBJECT,
-					 "UbuntuOneNautilus",
-					 &info, 0);
+static void
+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->syncdaemon = syncdaemon_daemon_new ();
+	g_signal_connect (G_OBJECT (uon->syncdaemon), "ready",
+			  G_CALLBACK (ubuntuone_nautilus_daemon_ready), uon);
+
+	/* Create a FileWatcher object to watch files we know about from Nautilus */
+	uon->file_watcher = file_watcher_new (uon);
+
+	/* Default to ~/Ubuntu One for now, as it's all we really support */
+	uon->managed = g_build_filename (g_get_home_dir (), "Ubuntu One", NULL);
+	uon->gotroot = FALSE;
+	uon->gotudfs = FALSE;
+	uon->gotpubs = FALSE;
+}
+
+static void
+ubuntuone_nautilus_class_init (UbuntuOneNautilusClass * klass)
+{
+	parent_class = g_type_class_peek_parent (klass);
+
+	G_OBJECT_CLASS(klass)->finalize = ubuntuone_nautilus_finalize;
+}
+
+static void
+ubuntuone_nautilus_finalize (GObject *object)
+{
+	UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS(object);
+
+	if (uon->file_watcher != NULL)
+		g_object_unref (G_OBJECT (uon->file_watcher));
+
+	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;
+
+	g_hash_table_destroy (uon->public);
+	uon->public = NULL;
+}
+
+GType
+ubuntuone_nautilus_get_type (void)
+{
+	return un_type;
+}
+
+static void
+ubuntuone_nautilus_register_type (GTypeModule * module)
+{
+	static const GTypeInfo info = {
+		sizeof (UbuntuOneNautilusClass),
+		(GBaseInitFunc) NULL,
+		(GBaseFinalizeFunc) NULL,
+		(GClassInitFunc) ubuntuone_nautilus_class_init,
+		NULL,
+		NULL,
+		sizeof (UbuntuOneNautilus),
+		0,
+		(GInstanceInitFunc) ubuntuone_nautilus_instance_init,
+	};
+
+	static const GInterfaceInfo info_provider_iface_info = {
+		(GInterfaceInitFunc) ubuntuone_nautilus_info_provider_iface_init,
+		NULL,
+		NULL
+	};
+
+	static const GInterfaceInfo bar_provider_iface_info = {
+		(GInterfaceInitFunc) ubuntuone_nautilus_bar_provider_iface_init,
+		NULL,
+		NULL
+	};
+
+	static const GInterfaceInfo menu_provider_iface_info = {
+		(GInterfaceInitFunc) ubuntuone_nautilus_menu_provider_iface_init,
+		NULL,
+		NULL
+	};
+
+	un_type = g_type_module_register_type (module, 
+					       G_TYPE_OBJECT,
+					       "UbuntuOneNautilus",
+					       &info, 0);
   
-  g_type_module_add_interface (module,
-			       un_type,
-			       NAUTILUS_TYPE_INFO_PROVIDER,
-			       &info_provider_iface_info);
-
-  g_type_module_add_interface (module,
-			       un_type,
-			       NAUTILUS_TYPE_LOCATION_WIDGET_PROVIDER,
-			       &bar_provider_iface_info);
-
-  /* XXX Need to sign a request via DBus */
-  g_type_module_add_interface (module,
-			       un_type,
-			       NAUTILUS_TYPE_MENU_PROVIDER,
-			       &menu_provider_iface_info);
+	g_type_module_add_interface (module,
+				     un_type,
+				     NAUTILUS_TYPE_INFO_PROVIDER,
+				     &info_provider_iface_info);
+
+	g_type_module_add_interface (module,
+				     un_type,
+				     NAUTILUS_TYPE_LOCATION_WIDGET_PROVIDER,
+				     &bar_provider_iface_info);
+
+	/* XXX Need to sign a request via DBus */
+	g_type_module_add_interface (module,
+				     un_type,
+				     NAUTILUS_TYPE_MENU_PROVIDER,
+				     &menu_provider_iface_info);
 }
 
 
 /* DBus signal handlers and async method call handlers */
-static void ubuntuone_nautilus_update_meta (SyncdaemonFilesystemInterface *interface,
-					    gboolean success,
-					    SyncdaemonMetadata *metadata,
-					    gpointer user_data) {
-  UbuntuOneNautilus * uon;
-  gchar * path;
-  gboolean is_root;
-
-  if (!success) {
-    g_warning ("ERROR: Could not retrieve metadata");
-    return;
-  }
-
-  uon = UBUNTUONE_NAUTILUS (user_data);
-  path = g_strdup (syncdaemon_metadata_get_path (metadata));
-
-  if (ubuntuone_is_storagefs (uon, path, &is_root)) {
-    if (syncdaemon_metadata_get_is_synced (metadata)) {
-      g_hash_table_replace (uon->updated, path, path);
-      ubuntuone_nautilus_reset_emblem (uon, path);
-    } else
-      g_hash_table_replace (uon->needsupdating, path, path);
-  } else {
-    g_hash_table_remove (uon->updated, path);
-    g_hash_table_remove (uon->needsupdating, path);
-    ubuntuone_nautilus_reset_emblem (uon, path);
-
-    g_free (path);
-  }
-}
-
 static void
 ubuntuone_nautilus_daemon_ready (SyncdaemonDaemon *daemon, gpointer user_data)
 {
-  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
-  gboolean is_online = FALSE;
-  SyncdaemonInterface *interface;
-
-  interface = syncdaemon_daemon_get_status_interface (daemon);
-  if (interface != NULL) {
-    SyncdaemonStatusInfo *status_info;
-
-    status_info = syncdaemon_status_interface_get_current_status (SYNCDAEMON_STATUS_INTERFACE (interface));
-    is_online = syncdaemon_status_info_get_online (status_info);
-  }
-
-  /* Get the root when we get a status change signal, if we haven't yet */
-  if (!uon->gotroot) {
-    uon->managed = g_strdup (syncdaemon_daemon_get_root_dir (uon->syncdaemon));
-    if (uon->managed != NULL)
-      uon->gotroot = TRUE;
-  }
-
-  /* Get the list of UDFs if we haven't already */
-  if (!uon->gotudfs) {
-    SyncdaemonInterface *interface;
-
-    interface = syncdaemon_daemon_get_folders_interface (uon->syncdaemon);
-    if (interface != NULL) {
-	    GSList *folders, *l;
-
-      folders = syncdaemon_folders_interface_get_folders (SYNCDAEMON_FOLDERS_INTERFACE (interface));
-      for (l = folders; l != NULL; l = l->next) {
-        SyncdaemonFolderInfo *folder_info = SYNCDAEMON_FOLDER_INFO (l->data);
-
-	ubuntuone_nautilus_udf_created (uon->syncdaemon, TRUE, folder_info, uon);
-	uon->gotudfs = TRUE;
-      }
-
-      g_slist_free (folders);
-    }
-  }
-
-  /* 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) {
-      ubuntuone_nautilus_share_created (uon->syncdaemon, TRUE, SYNCDAEMON_SHARE_INFO (shares->data), uon);
-      shares = g_slist_remove (shares, shares->data);
-    }
-  }
-
-  /* Get the list of public files if we haven't already */
-  if (is_online && !uon->gotpubs) {
-    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;
-    }
-  }
-}
-
-static void ubuntuone_nautilus_upload_started (SyncdaemonDaemon *daemon,
-					       gchar * path,
-					       gpointer user_data) {
-  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
-
-  if (!g_hash_table_lookup (uon->uploads, path)) {
-    gchar *new_path = g_strdup (path);
-    g_hash_table_insert (uon->uploads, new_path, new_path);
-    ubuntuone_nautilus_reset_emblem (uon, path);
-  }
-}
-
-static void ubuntuone_nautilus_upload_finished (SyncdaemonDaemon *daemon,
-						gchar * path,
-						SyncdaemonTransferInfo * info,
-						gpointer user_data) {
-  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
-  gchar * new_path;
-
-  g_hash_table_remove (uon->uploads, path);
-  g_hash_table_remove (uon->needsupdating, path);
-
-  new_path = g_strdup (path);
-  g_hash_table_replace (uon->updated, new_path, new_path);
-
-  ubuntuone_nautilus_reset_emblem (uon, path);
-}
-
-static void ubuntuone_nautilus_download_started (SyncdaemonDaemon *daemon,
-						 gchar * path,
-						 gpointer user_data) {
-  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
-
-  if (!g_hash_table_lookup (uon->downloads, path)) {
-    gchar *new_path = g_strdup (path);
-    g_hash_table_insert (uon->downloads, new_path, new_path);
-    ubuntuone_nautilus_reset_emblem (uon, path);
-  }
-}
-
-static void ubuntuone_nautilus_download_finished (SyncdaemonDaemon *daemon,
-						  gchar * path,
-						  SyncdaemonTransferInfo * info,
-						  gpointer user_data) {
-  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
-  gchar * new_path;
-
-  g_hash_table_remove (uon->downloads, path);
-  g_hash_table_remove (uon->needsupdating, path);
-
-  new_path = g_strdup (path);
-  g_hash_table_replace (uon->updated, new_path, new_path);
-
-  ubuntuone_nautilus_reset_emblem (uon, path);
-}
-
-static void ubuntuone_nautilus_udf_created (SyncdaemonDaemon *daemon,
-					    gboolean success,
-					    SyncdaemonFolderInfo *folder_info,
-					    gpointer user_data) {
-  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
-  const gchar * path, * id;
-  gboolean subscribed;
-
-  path = syncdaemon_folder_info_get_path (folder_info);
-  id = syncdaemon_folder_info_get_volume_id (folder_info);
-  subscribed = syncdaemon_folder_info_get_subscribed (folder_info);
-  if (success) {
-    if (!g_hash_table_lookup (uon->udfs, path)) {
-      if (subscribed) {
-        GHashTableIter iter;
-	gchar *key;
-	NautilusFileInfo *file;
-
-	g_hash_table_insert (uon->udfs, g_strdup (path), g_strdup (id));
-
-	/* Update the emblems of the files on this new UDF */
-	g_hash_table_iter_init (&iter, uon->observed);
-	while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &file)) {
-  	  if (g_str_has_prefix (key, path))
-	    nautilus_file_info_add_emblem (file, "ubuntuone-updating");
-	}
-      }
-    }
-  }
-}
-
-static gboolean
-remove_by_path_in_hash (gpointer key, gpointer value, gpointer user_data)
-{
-  if (g_str_has_prefix ((const gchar *) key, (const gchar *) user_data) ||
-      g_strcmp0 ((const gchar *) key, (const gchar *) user_data) == 0)
-    return TRUE;
-
-  return FALSE;
-}
-
-static void
-ubuntuone_nautilus_udf_deleted (SyncdaemonDaemon *daemon,
-				gboolean success,
-				SyncdaemonFolderInfo *folder_info,
-				gpointer user_data)
-{
-  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
-  const gchar * path;
-
-  path = syncdaemon_folder_info_get_path (folder_info);
-  if (path != NULL && success) {
-    g_hash_table_remove (uon->udfs, path);
-    ubuntuone_nautilus_reset_emblem (uon, path);
-
-    /* Now remove the files from the status hash tables */
-    g_hash_table_foreach_remove (uon->updated, (GHRFunc) remove_by_path_in_hash, (gpointer) path);
-    g_hash_table_foreach_remove (uon->needsupdating, (GHRFunc) remove_by_path_in_hash, (gpointer) path);
-  }
-}
-
-static void ubuntuone_nautilus_file_published (SyncdaemonDaemon *daemon,
-					       gboolean success,
-					       SyncdaemonFileInfo *finfo,
-					       gpointer user_data) {
-  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
-  const gchar * path, * url;
-  gboolean is_public;
-
-  if (!success)
-    return;
-
-  path = syncdaemon_file_info_get_path (finfo);
-  url = syncdaemon_file_info_get_public_url (finfo);
-  is_public = syncdaemon_file_info_get_is_public (finfo);
-
-  if (!is_public && g_hash_table_lookup (uon->public, path))
-    g_hash_table_remove (uon->public, path);
-
-  if (is_public)
-    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,
-                                                 gboolean success,
-                                                 GSList *files,
-                                                 gpointer user_data) {
-  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
-
-  if (success) {
-    GSList *l;
-
-    g_hash_table_remove_all (uon->public);
-    for (l = files; l != NULL; l = l->next) {
-      SyncdaemonFileInfo *finfo = SYNCDAEMON_FILE_INFO (l->data);
-
-      g_hash_table_insert (uon->public,
-			   g_strdup (syncdaemon_file_info_get_path (finfo)),
-			   g_strdup (syncdaemon_file_info_get_public_url (finfo)));
-    }
-  }
-}
-
-static void
-ubuntuone_nautilus_share_created (SyncdaemonDaemon *daemon,
-				  gboolean success,
-				  SyncdaemonShareInfo *share_info,
-				  gpointer user_data)
-{
-  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
-  const gchar * path;
-
-  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 (uon->shares, path)) {
-      g_hash_table_insert (uon->shares, g_strdup (path), g_strdup (id));
-      ubuntuone_nautilus_reset_emblem (uon, path);
-    }
-  } else {
-    ubuntuone_show_error_dialog (uon, _("Error creating share."),
-				 _("There was an error sharing the folder '%s'"),
-				 path);
-  }
-}
-
-static void
-ubuntuone_nautilus_share_deleted (SyncdaemonDaemon *daemon,
-				  gboolean success,
-				  SyncdaemonShareInfo *share_info,
-				  gpointer user_data)
-{
-  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
-  const gchar * path;
-
-  path = syncdaemon_share_info_get_path (share_info);
-  if (success) {
-    g_hash_table_remove (uon->shares, path);
-    ubuntuone_nautilus_reset_emblem (uon, path);
-  }
+	UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
+	gboolean is_online = FALSE;
+	SyncdaemonInterface *interface;
+
+	interface = syncdaemon_daemon_get_status_interface (daemon);
+	if (interface != NULL) {
+		SyncdaemonStatusInfo *status_info;
+
+		status_info = syncdaemon_status_interface_get_current_status (SYNCDAEMON_STATUS_INTERFACE (interface));
+		is_online = syncdaemon_status_info_get_online (status_info);
+	}
+
+	/* Get the root when we get a status change signal, if we haven't yet */
+	if (!uon->gotroot) {
+		uon->managed = g_strdup (syncdaemon_daemon_get_root_dir (uon->syncdaemon));
+		if (uon->managed != NULL)
+			uon->gotroot = TRUE;
+	}
+
+	/* Get the list of UDFs if we haven't already */
+	if (!uon->gotudfs) {
+		SyncdaemonInterface *interface;
+
+		interface = syncdaemon_daemon_get_folders_interface (uon->syncdaemon);
+		if (interface != NULL) {
+			GSList *folders, *l;
+
+			folders = syncdaemon_folders_interface_get_folders (SYNCDAEMON_FOLDERS_INTERFACE (interface));
+			for (l = folders; l != NULL; l = l->next) {
+				const gchar *path, *id;
+				gboolean subscribed;
+				SyncdaemonFolderInfo *folder_info = SYNCDAEMON_FOLDER_INFO (l->data);
+
+				path = syncdaemon_folder_info_get_path (folder_info);
+				id = syncdaemon_folder_info_get_volume_id (folder_info);
+				subscribed = syncdaemon_folder_info_get_subscribed (folder_info);
+				if (subscribed) {
+					g_hash_table_insert (uon->udfs, g_strdup (path), g_strdup (id));
+					uon->gotudfs = TRUE;
+
+					file_watcher_update_path (uon->file_watcher, path);
+				}
+			}
+
+			g_slist_free (folders);
+		}
+	}
+
+	/* 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) {
+		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;
+		}
+	}
 }
 
 /* Required Nautilus module handling methods */
-void nautilus_module_initialize (GTypeModule * module) {
+void
+nautilus_module_initialize (GTypeModule *module)
+{
 #ifdef ENABLE_NLS
-  bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-  textdomain (GETTEXT_PACKAGE);
+	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
 #endif
 
-  ubuntuone_nautilus_register_type (module);
-}
-
-void nautilus_module_shutdown (void) {
-}
-
-
-void nautilus_module_list_types (const GType ** types,
-				 int * num_types) {
-  static GType type_list[1];
+	ubuntuone_nautilus_register_type (module);
+}
+
+void
+nautilus_module_shutdown (void)
+{
+}
+
+void
+nautilus_module_list_types (const GType **types,
+			    int *num_types)
+{
+	static GType type_list[1];
   
-  type_list[0] = UBUNTUONE_TYPE_NAUTILUS;
+	type_list[0] = UBUNTUONE_TYPE_NAUTILUS;
 
-  *types = type_list;
-  *num_types = 1;
+	*types = type_list;
+	*num_types = 1;
 }

=== modified file 'nautilus/ubuntuone-nautilus.h'
--- nautilus/ubuntuone-nautilus.h	2010-09-22 11:12:43 +0000
+++ nautilus/ubuntuone-nautilus.h	2010-10-08 07:48:50 +0000
@@ -27,6 +27,7 @@
 #include <dbus/dbus-glib.h>
 #include <libsyncdaemon/syncdaemon-daemon.h>
 #include <gtk/gtk.h>
+#include "file-watcher.h"
 
 #define UBUNTUONE_TYPE_NAUTILUS  (ubuntuone_nautilus_get_type ())
 #define UBUNTUONE_NAUTILUS(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), UBUNTUONE_TYPE_NAUTILUS, UbuntuOneNautilus))
@@ -34,10 +35,11 @@
 /* This is used when a change is pending */
 #define UPDATE_PENDING "pending"
 
-typedef struct {
+struct _UbuntuOneNautilus {
 	GObject parent_slot;
 
-	SyncdaemonDaemon * syncdaemon;
+	SyncdaemonDaemon *syncdaemon;
+	FileWatcher *file_watcher;
 
 	/* Are we connected? */
 	gboolean connected;
@@ -51,21 +53,12 @@
 	gboolean gotpubs;
 
 	/* Lists of ul/dl/shares for setting emblems */
-	GHashTable * uploads;
-	GHashTable * downloads;
 	GHashTable * shares;
 
 	/* Lists of public files and user defined folders */
 	GHashTable * public;
 	GHashTable * udfs;
-  
-	/* Lists of sync/unsync'd files */
-	GHashTable * updated;
-	GHashTable * needsupdating;
-
-	/* List of files that are observed for changes */
-	GHashTable * observed;
-} UbuntuOneNautilus;
+};
 
 typedef struct {
 	GObjectClass parent_slot;
@@ -74,16 +67,11 @@
 GType ubuntuone_nautilus_get_type (void);
 
 /* Utility functions */
-gboolean ubuntuone_is_storagefs (UbuntuOneNautilus * uon,
-				 const char * path,
-				 gboolean * is_root);
 gboolean ubuntuone_is_location_bar_enabled (void);
 
-gboolean ubuntuone_nautilus_check_shares_and_public_files (UbuntuOneNautilus *uon,
+gboolean ubuntuone_check_shares_and_public_files (UbuntuOneNautilus *uon,
 							   SyncdaemonFolderInfo *folder_info,
 							   GtkWidget *widget);
-void     ubuntuone_nautilus_reset_emblem (UbuntuOneNautilus * uon, const char * path);
-
 void     ubuntuone_show_error_dialog (UbuntuOneNautilus *uon, const gchar *title, const gchar *error_message, ...);
 
 #endif

=== modified file 'nautilus/utils.c'
--- nautilus/utils.c	2010-09-22 11:12:43 +0000
+++ nautilus/utils.c	2010-10-08 07:48:50 +0000
@@ -21,15 +21,14 @@
 
 #include <glib/gi18n.h>
 #include <libnautilus-extension/nautilus-file-info.h>
-#include <libsyncdaemon/syncdaemon-shares-interface.h>
+#include <libsyncdaemon/libsyncdaemon.h>
 #include "ubuntuone-nautilus.h"
 #include "location-widget.h"
 
-/* this is the wrong place for this, but it'll have to do for now */
 gboolean
-ubuntuone_nautilus_check_shares_and_public_files (UbuntuOneNautilus *uon,
-						  SyncdaemonFolderInfo *folder_info,
-						  GtkWidget *widget)
+ubuntuone_check_shares_and_public_files (UbuntuOneNautilus *uon,
+					 SyncdaemonFolderInfo *folder_info,
+					 GtkWidget *widget)
 {
 	SyncdaemonInterface *interface;
 	gboolean result = TRUE, has_shares = FALSE, has_published = FALSE;
@@ -122,18 +121,3 @@
 	return show_location;
 }
 
-void
-ubuntuone_nautilus_reset_emblem (UbuntuOneNautilus *uon, const char *path)
-{
-	GHashTableIter iter;
-	gchar *key;
-	NautilusFileInfo *file;
-
-	/* Remove emblems from all files in the specified path */
-	g_hash_table_iter_init (&iter, uon->observed);
-	while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &file)) {
-		if (g_str_has_prefix (key, path) || g_strcmp0 (key, path) == 0) {
-			nautilus_file_info_invalidate_extension_info (file);
-		}
-	}
-}

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2010-10-05 14:06:15 +0000
+++ po/POTFILES.in	2010-10-08 07:48:50 +0000
@@ -9,6 +9,7 @@
 nautilus/ubuntuone-nautilus.c
 nautilus/contacts-view.c
 nautilus/context-menu.c
+nautilus/file-watcher.c
 nautilus/u1-contacts-picker.c
 nautilus/location-widget.c
 nautilus/share-dialog.c