Merge lp:~rodrigo-moya/ubuntuone-client/check-before-disabling into lp:ubuntuone-client

[Rodrigo Moya]

Check for shared subfolders in UDFs when disabling them and ask user for confirmation

Check for shared subfolders in UDFs when disabling them and ask user for confirmation.

This cannot be tested due to a bug in syncdaemon (bug #608779), so please review it with that in mind

[Natalia Bidart (nataliabidart)]

Tests are failing for me with this trace:

nessita@miro:~/canonical/ubuntuone-client/review_check-before-disabling$ ./libsyncdaemon/test-libsyncdaemon
/testlibsyncdaemon/TestDaemon:
** CRITICAL **: syncdaemon_interface_get_proxy_object: assertion `SYNCDAEMON_IS_INTERFACE (interface)' failed
aborting...
Trace/breakpoint trap (core dumped)

Not sure if this is a Needs Fixing or Information, I may be missing something?

review: Needs Information

[Rodrigo Moya (rodrigo-moya)]

Is your syncdaemon running?

[Rodrigo Moya (rodrigo-moya)]

wait, I'm getting it also, looking

[lp:~rodrigo-moya/ubuntuone-client/check-before-disabling]

591. By Rodrigo Moya on 2010-07-23

Run the test suite only when the syncdaemon is ready

[Rodrigo Moya (rodrigo-moya)]

The tests got broken with the last merge from trunk, fixed now, so please review again

[Natalia Bidart (nataliabidart)]

review: Approve

[Manuel de la Peña (mandel)]

Tests work as expected

review: Approve

=== modified file 'libsyncdaemon/Makefile.am'
--- libsyncdaemon/Makefile.am	2010-07-07 23:03:09 +0000
+++ libsyncdaemon/Makefile.am	2010-07-23 10:31:40 +0000
@@ -29,6 +29,7 @@
 	syncdaemon-folders-interface.h		\
 	syncdaemon-metadata.h			\
 	syncdaemon-publicfiles-interface.h	\
+	syncdaemon-share-info.h			\
 	syncdaemon-shares-interface.h		\
 	syncdaemon-status-info.h		\
 	syncdaemon-status-interface.h		\
@@ -46,6 +47,7 @@
 	syncdaemon-folders-interface.c		\
 	syncdaemon-metadata.c			\
 	syncdaemon-publicfiles-interface.c	\
+	syncdaemon-share-info.c			\
 	syncdaemon-shares-interface.c		\
 	syncdaemon-status-info.c		\
 	syncdaemon-status-interface.c		\

=== modified file 'libsyncdaemon/libsyncdaemon.h'
--- libsyncdaemon/libsyncdaemon.h	2010-06-24 10:25:12 +0000
+++ libsyncdaemon/libsyncdaemon.h	2010-07-23 10:31:40 +0000
@@ -27,6 +27,7 @@
 #include <libsyncdaemon/syncdaemon-folders-interface.h>
 #include <libsyncdaemon/syncdaemon-interface.h>
 #include <libsyncdaemon/syncdaemon-publicfiles-interface.h>
+#include <libsyncdaemon/syncdaemon-share-info.h>
 #include <libsyncdaemon/syncdaemon-shares-interface.h>
 #include <libsyncdaemon/syncdaemon-status-info.h>
 #include <libsyncdaemon/syncdaemon-status-interface.h>

=== modified file 'libsyncdaemon/syncdaemon-daemon.c'
--- libsyncdaemon/syncdaemon-daemon.c	2010-07-20 10:30:05 +0000
+++ libsyncdaemon/syncdaemon-daemon.c	2010-07-23 10:31:40 +0000
@@ -222,19 +222,19 @@
 							     (GSignalFlags) G_SIGNAL_RUN_LAST,
 							     G_STRUCT_OFFSET (SyncdaemonDaemonClass, share_created),
 							     NULL, NULL,
-							     _syncdaemon_marshal_VOID__BOOLEAN_POINTER,
+							     _syncdaemon_marshal_VOID__BOOLEAN_OBJECT,
 							     G_TYPE_NONE, 2,
 							     G_TYPE_BOOLEAN,
-							     G_TYPE_POINTER);
+							     G_TYPE_OBJECT);
 	daemon_signals[SHARE_DELETED_SIGNAL] = g_signal_new ("share_deleted",
 							     G_TYPE_FROM_CLASS (klass),
 							     (GSignalFlags) G_SIGNAL_RUN_LAST,
 							     G_STRUCT_OFFSET (SyncdaemonDaemonClass, share_deleted),
 							     NULL, NULL,
-							     _syncdaemon_marshal_VOID__BOOLEAN_POINTER,
+							     _syncdaemon_marshal_VOID__BOOLEAN_OBJECT,
 							     G_TYPE_NONE, 2,
 							     G_TYPE_BOOLEAN,
-							     G_TYPE_POINTER);
+							     G_TYPE_OBJECT);
 	daemon_signals[DOWNLOAD_STARTED_SIGNAL] = g_signal_new ("download_started",
 								G_TYPE_FROM_CLASS (klass),
 								(GSignalFlags) G_SIGNAL_RUN_LAST,

=== modified file 'libsyncdaemon/syncdaemon-daemon.h'
--- libsyncdaemon/syncdaemon-daemon.h	2010-07-20 08:37:30 +0000
+++ libsyncdaemon/syncdaemon-daemon.h	2010-07-23 10:31:40 +0000
@@ -25,6 +25,7 @@
 #include <glib-object.h>
 #include "syncdaemon-folder-info.h"
 #include "syncdaemon-interface.h"
+#include "syncdaemon-share-info.h"
 #include "syncdaemon-status-info.h"
 #include "syncdaemon-transfer-info.h"
 
@@ -65,8 +66,8 @@
 	void (* file_published) (SyncdaemonDaemon *daemon, GHashTable *file_info);
 	void (* got_published_files) (SyncdaemonDaemon *daemon, GPtrArray *files);
 
-	void (* share_created) (SyncdaemonDaemon *daemon, gboolean success, GHashTable *share_info);
-	void (* share_deleted) (SyncdaemonDaemon *daemon, gboolean success, GHashTable *share_info);
+	void (* share_created) (SyncdaemonDaemon *daemon, gboolean success, SyncdaemonShareInfo *share_info);
+	void (* share_deleted) (SyncdaemonDaemon *daemon, gboolean success, SyncdaemonShareInfo *share_info);
 
 	void (* download_started) (SyncdaemonDaemon *daemon, const gchar *path);
 	void (* download_file_progress) (SyncdaemonDaemon *daemon, const gchar *path, SyncdaemonTransferInfo *tinfo);

=== added file 'libsyncdaemon/syncdaemon-share-info.c'
--- libsyncdaemon/syncdaemon-share-info.c	1970-01-01 00:00:00 +0000
+++ libsyncdaemon/syncdaemon-share-info.c	2010-07-23 10:31:40 +0000
@@ -0,0 +1,344 @@
+/*
+ * Syncdaemon API
+ *
+ * Authors: Rodrigo Moya <[e-mail]>
+ *
+ * Copyright 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/>.
+ *
+ */
+
+#include "syncdaemon-share-info.h"
+
+G_DEFINE_TYPE(SyncdaemonShareInfo, syncdaemon_share_info, G_TYPE_OBJECT)
+
+struct _SyncdaemonShareInfoPrivate {
+	gchar *name;
+	SyncdaemonShareInfoType type;
+	gchar *path;
+	gchar *username;
+	gchar *user_visible_name;
+	gchar *node_id;
+	gchar *volume_id;
+	gboolean accepted;
+	gboolean allow_modifications;
+};
+
+static void
+syncdaemon_share_info_finalize (GObject *object)
+{
+	SyncdaemonShareInfo *sinfo = SYNCDAEMON_SHARE_INFO (object);
+
+	if (sinfo->priv != NULL) {
+		if (sinfo->priv->name != NULL)
+			g_free (sinfo->priv->name);
+
+		if (sinfo->priv->path != NULL)
+			g_free (sinfo->priv->path);
+
+		if (sinfo->priv->username != NULL)
+			g_free (sinfo->priv->username);
+
+		if (sinfo->priv->user_visible_name != NULL)
+			g_free (sinfo->priv->user_visible_name);
+
+		if (sinfo->priv->node_id != NULL)
+			g_free (sinfo->priv->node_id);
+
+		if (sinfo->priv->volume_id != NULL)
+			g_free (sinfo->priv->volume_id);
+
+		g_free (sinfo->priv);
+	}
+
+	G_OBJECT_CLASS (syncdaemon_share_info_parent_class)->finalize (object);
+}
+
+static void
+syncdaemon_share_info_class_init (SyncdaemonShareInfoClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	object_class->finalize = syncdaemon_share_info_finalize;
+}
+
+static void
+syncdaemon_share_info_init (SyncdaemonShareInfo *sinfo)
+{
+	sinfo->priv = g_new0 (SyncdaemonShareInfoPrivate, 1);
+}
+
+/**
+ * syncdaemon_share_info_new:
+ */
+SyncdaemonShareInfo *
+syncdaemon_share_info_new (void)
+{
+	return g_object_new (SYNCDAEMON_TYPE_SHARE_INFO, NULL);
+}
+
+/**
+ * syncdaemon_share_info_new_from_hash_table:
+ */
+SyncdaemonShareInfo *
+syncdaemon_share_info_new_from_hash_table (GHashTable *hash)
+{
+	SyncdaemonShareInfo *sinfo;
+
+	sinfo = g_object_new (SYNCDAEMON_TYPE_SHARE_INFO, NULL);
+	if (hash != NULL) {
+		gchar *str;
+
+		syncdaemon_share_info_set_name (sinfo, g_hash_table_lookup (hash, "name"));
+		syncdaemon_share_info_set_path (sinfo, g_hash_table_lookup (hash, "path"));
+		syncdaemon_share_info_set_username (sinfo, g_hash_table_lookup (hash, "other_username"));
+		syncdaemon_share_info_set_user_visible_name (
+			sinfo,
+			g_hash_table_lookup (hash, "other_visible_name"));
+		syncdaemon_share_info_set_node_id (sinfo, g_hash_table_lookup (hash, "node_id"));
+		syncdaemon_share_info_set_volume_id (sinfo, g_hash_table_lookup (hash, "volume_id"));
+		syncdaemon_share_info_set_accepted (
+			sinfo,
+			g_strcmp0 (g_hash_table_lookup (hash, "accepted"), "True") == 0);
+		syncdaemon_share_info_set_allow_modifications (
+			sinfo,
+			g_strcmp0 (g_hash_table_lookup (hash, "access_level"), "Modify") == 0);
+
+		str = g_hash_table_lookup (hash, "type");
+		if (g_strcmp0 (str, "Shared") == 0)
+			syncdaemon_share_info_set_share_type (sinfo, SYNCDAEMON_SHARE_INFO_TYPE_SHARED);
+		else if (g_strcmp0 (str, "Share") == 0)
+			syncdaemon_share_info_set_share_type (sinfo, SYNCDAEMON_SHARE_INFO_TYPE_SHARE);
+		else
+			syncdaemon_share_info_set_share_type (sinfo, SYNCDAEMON_SHARE_INFO_TYPE_UNKNOWN);
+	}
+
+	return sinfo;
+}
+
+/**
+ * syncdameon_share_info_get_name:
+ */
+const gchar *
+syncdaemon_share_info_get_name (SyncdaemonShareInfo *sinfo)
+{
+	g_return_val_if_fail (SYNCDAEMON_IS_SHARE_INFO (sinfo), NULL);
+
+	return (const gchar *) sinfo->priv->name;
+}
+
+/**
+ * syncdameon_share_info_set_name:
+ */
+void
+syncdaemon_share_info_set_name (SyncdaemonShareInfo *sinfo, const gchar *name)
+{
+	g_return_if_fail (SYNCDAEMON_IS_SHARE_INFO (sinfo));
+
+	if (sinfo->priv->name != NULL)
+		g_free (sinfo->priv->name);
+
+	sinfo->priv->name = g_strdup (name);
+}
+
+/**
+ * syncdameon_share_info_get_share_type:
+ */
+SyncdaemonShareInfoType
+syncdaemon_share_info_get_share_type (SyncdaemonShareInfo *sinfo)
+{
+	g_return_val_if_fail (SYNCDAEMON_IS_SHARE_INFO (sinfo), SYNCDAEMON_SHARE_INFO_TYPE_UNKNOWN);
+
+	return sinfo->priv->type;
+}
+
+/**
+ * syncdameon_share_info_set_share_type:
+ */
+void
+syncdaemon_share_info_set_share_type (SyncdaemonShareInfo *sinfo, SyncdaemonShareInfoType type)
+{
+	g_return_if_fail (SYNCDAEMON_IS_SHARE_INFO (sinfo));
+
+	sinfo->priv->type = type;
+}
+
+/**
+ * syncdameon_share_info_get_path:
+ */
+const gchar *
+syncdaemon_share_info_get_path (SyncdaemonShareInfo *sinfo)
+{
+	g_return_val_if_fail (SYNCDAEMON_IS_SHARE_INFO (sinfo), NULL);
+
+	return (const gchar *) sinfo->priv->path;
+}
+
+/**
+ * syncdameon_share_info_set_path:
+ */
+void
+syncdaemon_share_info_set_path (SyncdaemonShareInfo *sinfo, const gchar *path)
+{
+	g_return_if_fail (SYNCDAEMON_IS_SHARE_INFO (sinfo));
+
+	if (sinfo->priv->path != NULL)
+		g_free (sinfo->priv->path);
+
+	sinfo->priv->path = g_strdup (path);
+}
+
+/**
+ * syncdameon_share_info_get_username:
+ */
+const gchar *
+syncdaemon_share_info_get_username (SyncdaemonShareInfo *sinfo)
+{
+	g_return_val_if_fail (SYNCDAEMON_IS_SHARE_INFO (sinfo), NULL);
+
+	return (const gchar *) sinfo->priv->username;
+}
+
+/**
+ * syncdameon_share_info_set_username:
+ */
+void
+syncdaemon_share_info_set_username (SyncdaemonShareInfo *sinfo, const gchar *username)
+{
+	g_return_if_fail (SYNCDAEMON_IS_SHARE_INFO (sinfo));
+
+	if (sinfo->priv->username != NULL)
+		g_free (sinfo->priv->username);
+
+	sinfo->priv->username = g_strdup (username);
+}
+
+/**
+ * syncdameon_share_info_get_user_visible_name:
+ */
+const gchar *
+syncdaemon_share_info_get_user_visible_name (SyncdaemonShareInfo *sinfo)
+{
+	g_return_val_if_fail (SYNCDAEMON_IS_SHARE_INFO (sinfo), NULL);
+
+	return (const gchar *) sinfo->priv->user_visible_name;
+}
+
+/**
+ * syncdameon_share_info_set_user_visible_name:
+ */
+void
+syncdaemon_share_info_set_user_visible_name (SyncdaemonShareInfo *sinfo, const gchar *user_visible_name)
+{
+	g_return_if_fail (SYNCDAEMON_IS_SHARE_INFO (sinfo));
+
+	if (sinfo->priv->user_visible_name != NULL)
+		g_free (sinfo->priv->user_visible_name);
+
+	sinfo->priv->user_visible_name = g_strdup (user_visible_name);
+}
+
+/**
+ * syncdameon_share_info_get_node_id:
+ */
+const gchar *
+syncdaemon_share_info_get_node_id (SyncdaemonShareInfo *sinfo)
+{
+	g_return_val_if_fail (SYNCDAEMON_IS_SHARE_INFO (sinfo), NULL);
+
+	return (const gchar *) sinfo->priv->node_id;
+}
+
+/**
+ * syncdameon_share_info_set_node_id:
+ */
+void
+syncdaemon_share_info_set_node_id (SyncdaemonShareInfo *sinfo, const gchar *node_id)
+{
+	g_return_if_fail (SYNCDAEMON_IS_SHARE_INFO (sinfo));
+
+	if (sinfo->priv->node_id != NULL)
+		g_free (sinfo->priv->node_id);
+
+	sinfo->priv->node_id = g_strdup (node_id);
+}
+
+/**
+ * syncdameon_share_info_get_volume_id:
+ */
+const gchar *
+syncdaemon_share_info_get_volume_id (SyncdaemonShareInfo *sinfo)
+{
+	g_return_val_if_fail (SYNCDAEMON_IS_SHARE_INFO (sinfo), NULL);
+
+	return (const gchar *) sinfo->priv->volume_id;
+}
+
+/**
+ * syncdameon_share_info_set_volume_id:
+ */
+void
+syncdaemon_share_info_set_volume_id (SyncdaemonShareInfo *sinfo, const gchar *volume_id)
+{
+	g_return_if_fail (SYNCDAEMON_IS_SHARE_INFO (sinfo));
+
+	if (sinfo->priv->volume_id != NULL)
+		g_free (sinfo->priv->volume_id);
+
+	sinfo->priv->volume_id = g_strdup (volume_id);
+}
+
+/**
+ * syncdameon_share_info_get_accepted:
+ */
+gboolean
+syncdaemon_share_info_get_accepted (SyncdaemonShareInfo *sinfo)
+{
+	g_return_val_if_fail (SYNCDAEMON_IS_SHARE_INFO (sinfo), FALSE);
+
+	return sinfo->priv->accepted;
+}
+
+/**
+ * syncdameon_share_info_set_accepted:
+ */
+void
+syncdaemon_share_info_set_accepted (SyncdaemonShareInfo *sinfo, gboolean accepted)
+{
+	g_return_if_fail (SYNCDAEMON_IS_SHARE_INFO (sinfo));
+
+	sinfo->priv->accepted = accepted;
+}
+
+/**
+ * syncdameon_share_info_get_allow_modifications:
+ */
+gboolean
+syncdaemon_share_info_get_allow_modifications (SyncdaemonShareInfo *sinfo)
+{
+	g_return_val_if_fail (SYNCDAEMON_IS_SHARE_INFO (sinfo), FALSE);
+
+	return sinfo->priv->allow_modifications;
+}
+
+/**
+ * syncdameon_share_info_set_allow_modifications:
+ */
+void
+syncdaemon_share_info_set_allow_modifications (SyncdaemonShareInfo *sinfo, gboolean allow_modifications)
+{
+	g_return_if_fail (SYNCDAEMON_IS_SHARE_INFO (sinfo));
+
+	sinfo->priv->allow_modifications = allow_modifications;
+}

=== added file 'libsyncdaemon/syncdaemon-share-info.h'
--- libsyncdaemon/syncdaemon-share-info.h	1970-01-01 00:00:00 +0000
+++ libsyncdaemon/syncdaemon-share-info.h	2010-07-23 10:31:40 +0000
@@ -0,0 +1,78 @@
+/*
+ * Syncdaemon API
+ *
+ * Authors: Rodrigo Moya <[e-mail]>
+ *
+ * Copyright 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 __SYNCDAEMON_SHARE_INFO_H__
+#define __SYNCDAEMON_SHARE_INFO_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define SYNCDAEMON_TYPE_SHARE_INFO                (syncdaemon_share_info_get_type ())
+#define SYNCDAEMON_SHARE_INFO(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), SYNCDAEMON_TYPE_SHARE_INFO, SyncdaemonShareInfo))
+#define SYNCDAEMON_IS_SHARE_INFO(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SYNCDAEMON_TYPE_SHARE_INFO))
+#define SYNCDAEMON_SHARE_INFO_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), SYNCDAEMON_TYPE_SHARE_INFO, SyncdaemonShareInfoClass))
+#define SYNCDAEMON_IS_SHARE_INFO_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), SYNCDAEMON_TYPE_SHARE_INFO))
+#define SYNCDAEMON_SHARE_INFO_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), SYNCDAEMON_TYPE_SHARE_INFO, SyncdaemonShareInfoClass))
+
+typedef struct _SyncdaemonShareInfoPrivate SyncdaemonShareInfoPrivate;
+
+typedef struct {
+	GObject parent;
+	SyncdaemonShareInfoPrivate *priv;
+} SyncdaemonShareInfo;
+
+typedef struct {
+	GObjectClass parent_class;
+} SyncdaemonShareInfoClass;
+
+typedef enum {
+	SYNCDAEMON_SHARE_INFO_TYPE_UNKNOWN,
+	SYNCDAEMON_SHARE_INFO_TYPE_SHARED,
+	SYNCDAEMON_SHARE_INFO_TYPE_SHARE
+} SyncdaemonShareInfoType;
+
+GType                syncdaemon_share_info_get_type (void);
+SyncdaemonShareInfo *syncdaemon_share_info_new (void);
+SyncdaemonShareInfo *syncdaemon_share_info_new_from_hash_table (GHashTable *hash);
+
+const gchar         *syncdaemon_share_info_get_name (SyncdaemonShareInfo *sinfo);
+void                 syncdaemon_share_info_set_name (SyncdaemonShareInfo *sinfo, const gchar *name);
+SyncdaemonShareInfoType syncdaemon_share_info_get_share_type (SyncdaemonShareInfo *sinfo);
+void                 syncdaemon_share_info_set_share_type (SyncdaemonShareInfo *sinfo, SyncdaemonShareInfoType type);
+const gchar         *syncdaemon_share_info_get_path (SyncdaemonShareInfo *sinfo);
+void                 syncdaemon_share_info_set_path (SyncdaemonShareInfo *sinfo, const gchar *path);
+const gchar         *syncdaemon_share_info_get_username (SyncdaemonShareInfo *sinfo);
+void                 syncdaemon_share_info_set_username (SyncdaemonShareInfo *sinfo, const gchar *username);
+const gchar         *syncdaemon_share_info_get_user_visible_name (SyncdaemonShareInfo *sinfo);
+void                 syncdaemon_share_info_set_user_visible_name (SyncdaemonShareInfo *sinfo, const gchar *user_visible_name);
+const gchar         *syncdaemon_share_info_get_node_id (SyncdaemonShareInfo *sinfo);
+void                 syncdaemon_share_info_set_node_id (SyncdaemonShareInfo *sinfo, const gchar *node_id);
+const gchar         *syncdaemon_share_info_get_volume_id (SyncdaemonShareInfo *sinfo);
+void                 syncdaemon_share_info_set_volume_id (SyncdaemonShareInfo *sinfo, const gchar *volume_id);
+gboolean             syncdaemon_share_info_get_accepted (SyncdaemonShareInfo *sinfo);
+void                 syncdaemon_share_info_set_accepted (SyncdaemonShareInfo *sinfo, gboolean accepted);
+gboolean             syncdaemon_share_info_get_allow_modifications (SyncdaemonShareInfo *sinfo);
+void                 syncdaemon_share_info_set_allow_modifications (SyncdaemonShareInfo *sinfo, gboolean allow_modifications);
+
+G_END_DECLS
+
+#endif

=== modified file 'libsyncdaemon/syncdaemon-shares-interface.c'
--- libsyncdaemon/syncdaemon-shares-interface.c	2010-07-12 17:06:17 +0000
+++ libsyncdaemon/syncdaemon-shares-interface.c	2010-07-23 10:31:40 +0000
@@ -27,6 +27,8 @@
 
 struct _SyncdaemonSharesInterfacePrivate {
 	GObject *proxy;
+	GHashTable *shared;
+	GHashTable *shares;
 };
 
 static void
@@ -50,47 +52,105 @@
 }
 
 static void
-share_created_cb (DBusGProxy *proxy, GHashTable *share_info, gpointer user_data)
+share_created_cb (DBusGProxy *proxy, GHashTable *hash, gpointer user_data)
 {
 	SyncdaemonDaemon *daemon = NULL;
+	SyncdaemonShareInfo *share_info;
 	SyncdaemonSharesInterface *interface = SYNCDAEMON_SHARES_INTERFACE (user_data);
 
+	share_info = syncdaemon_share_info_new_from_hash_table (hash);
+	switch (syncdaemon_share_info_get_share_type (share_info)) {
+	case SYNCDAEMON_SHARE_INFO_TYPE_SHARED:
+		if (interface->priv->shared == NULL) {
+			GSList *shared;
+
+			shared = syncdaemon_shares_interface_get_shared (interface);
+			g_slist_free (shared);
+		}
+
+		g_hash_table_insert (interface->priv->shared,
+				     g_strdup (syncdaemon_share_info_get_path (share_info)),
+				     share_info);
+		break;
+	case SYNCDAEMON_SHARE_INFO_TYPE_SHARE:
+		if (interface->priv->shares == NULL) {
+			GSList *shares;
+
+			shares = syncdaemon_shares_interface_get_shares (interface);
+			g_slist_free (shares);
+		}
+
+		g_hash_table_insert (interface->priv->shares,
+				     g_strdup (syncdaemon_share_info_get_path (share_info)),
+				     share_info);
+		break;
+	default:
+		return;
+	}
+
 	g_object_get (G_OBJECT (interface), "daemon", &daemon, NULL);
 	if (daemon != NULL)
 		g_signal_emit_by_name (daemon, "share_created", TRUE, share_info);
 }
 
 static void
-share_create_error_cb (DBusGProxy *proxy, GHashTable *share_info, const gchar *error, gpointer user_data)
+share_create_error_cb (DBusGProxy *proxy, GHashTable *hash, const gchar *error, gpointer user_data)
 {
 	SyncdaemonDaemon *daemon = NULL;
 	SyncdaemonSharesInterface *interface = SYNCDAEMON_SHARES_INTERFACE (user_data);
 
 	g_object_get (G_OBJECT (interface), "daemon", &daemon, NULL);
-	if (daemon != NULL)
+	if (daemon != NULL) {
+		SyncdaemonShareInfo *share_info;
+
+		share_info = syncdaemon_share_info_new_from_hash_table (hash);
 		g_signal_emit_by_name (daemon, "share_created", FALSE, share_info);
+		g_object_unref (G_OBJECT (share_info));
+	}
 }
 
 static void
-share_deleted_cb (DBusGProxy *proxy, GHashTable *share_info, gpointer user_data)
+share_deleted_cb (DBusGProxy *proxy, GHashTable *hash, gpointer user_data)
 {
 	SyncdaemonDaemon *daemon = NULL;
+	SyncdaemonShareInfo *share_info;
 	SyncdaemonSharesInterface *interface = SYNCDAEMON_SHARES_INTERFACE (user_data);
 
+	share_info = syncdaemon_share_info_new_from_hash_table (hash);
+	switch (syncdaemon_share_info_get_share_type (share_info)) {
+	case SYNCDAEMON_SHARE_INFO_TYPE_SHARED:
+		if (interface->priv->shared != NULL)
+			g_hash_table_remove (interface->priv->shared, syncdaemon_share_info_get_path (share_info));
+		break;
+	case SYNCDAEMON_SHARE_INFO_TYPE_SHARE:
+		if (interface->priv->shares != NULL)
+			g_hash_table_remove (interface->priv->shares, syncdaemon_share_info_get_path (share_info));
+		break;
+	default:
+		return;
+	}
+
 	g_object_get (G_OBJECT (interface), "daemon", &daemon, NULL);
 	if (daemon != NULL)
 		g_signal_emit_by_name (daemon, "share_deleted", TRUE, share_info);
+
+	g_object_unref (G_OBJECT (share_info));
 }
 
 static void
-share_delete_error_cb (DBusGProxy *proxy, GHashTable *share_info, const gchar *error, gpointer user_data)
+share_delete_error_cb (DBusGProxy *proxy, GHashTable *hash, const gchar *error, gpointer user_data)
 {
 	SyncdaemonDaemon *daemon = NULL;
 	SyncdaemonSharesInterface *interface = SYNCDAEMON_SHARES_INTERFACE (user_data);
 
 	g_object_get (G_OBJECT (interface), "daemon", &daemon, NULL);
-	if (daemon != NULL)
+	if (daemon != NULL) {
+		SyncdaemonShareInfo *share_info;
+
+		share_info = syncdaemon_share_info_new_from_hash_table (hash);
 		g_signal_emit_by_name (daemon, "share_deleted", FALSE, share_info);
+		g_object_unref (G_OBJECT (share_info));
+	}
 }
 
 static void
@@ -224,53 +284,122 @@
 				 G_TYPE_INVALID);
 }
 
-static void
-got_shared_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
-{
-	GSList *shared_list;
-	SyncdaemonSharesInterface *interface = SYNCDAEMON_SHARES_INTERFACE (user_data);
-	SyncdaemonDaemon *daemon = NULL;
-	GError *error = NULL;
-
-	g_object_get (G_OBJECT (interface), "daemon", &daemon, NULL);
-
-	if (!dbus_g_proxy_end_call (proxy, call_id, &error,
-				    dbus_g_type_get_collection ("GSList",
-								dbus_g_type_get_map (
-									"GHashTable",
-									G_TYPE_STRING,
-									G_TYPE_STRING)),
-				    &shared_list,
-				    G_TYPE_INVALID)) {
-		if (daemon != NULL) {
-			g_signal_emit_by_name (daemon, "error", error->message, NULL);
-			g_error_free (error);
-
-			return;
-		}
-	}
-
-	while (shared_list != NULL) {
-		GHashTable *share_info = shared_list->data;
-
-		share_created_cb (proxy, share_info, interface);
-
-		shared_list = g_slist_remove (shared_list, share_info);
-		g_hash_table_unref (share_info);
-	}
-}
-
 /**
  * syncdaemon_shares_interface_get_shared:
  */
-void
+GSList *
 syncdaemon_shares_interface_get_shared (SyncdaemonSharesInterface *interface)
 {
-	g_return_if_fail (SYNCDAEMON_IS_SHARES_INTERFACE (interface));
-
-	dbus_g_proxy_begin_call (DBUS_G_PROXY (interface->priv->proxy), "get_shared",
-				 got_shared_cb, interface, NULL,
-				 G_TYPE_INVALID);
+	GHashTableIter iter;
+	gchar *path;
+	SyncdaemonShareInfo *share_info;
+	GSList *shared_list, *returned_list = NULL;;
+	GError *error = NULL;
+
+	g_return_val_if_fail (SYNCDAEMON_IS_SHARES_INTERFACE (interface), NULL);
+
+	if (interface->priv->shared == NULL) {
+		interface->priv->shared = g_hash_table_new_full (g_str_hash, g_str_equal,
+								 g_free, g_object_unref);
+
+		if (dbus_g_proxy_call (DBUS_G_PROXY (interface->priv->proxy), "get_shared", &error,
+				       G_TYPE_INVALID,
+				       dbus_g_type_get_collection ("GSList",
+								   dbus_g_type_get_map (
+									   "GHashTable",
+									   G_TYPE_STRING,
+									   G_TYPE_STRING)), &shared_list,
+				       G_TYPE_INVALID)) {
+			while (shared_list != NULL) {
+				GHashTable *hash = (GHashTable *) shared_list->data;
+
+				share_info = syncdaemon_share_info_new_from_hash_table (hash);
+
+				shared_list = g_slist_remove (shared_list, hash);
+				g_hash_table_unref (hash);
+
+				g_hash_table_insert (interface->priv->shared,
+						     g_strdup (syncdaemon_share_info_get_path (share_info)),
+						     share_info);
+			}
+		} else {
+			SyncdaemonDaemon *daemon = NULL;
+
+			g_object_get (G_OBJECT (interface), "daemon", &daemon, NULL);
+			if (daemon != NULL)
+				g_signal_emit_by_name (daemon, "error", error->message, NULL);
+
+			g_error_free (error);
+
+			return NULL;
+		}
+	}
+
+	/* Create the list to be returned */
+	g_hash_table_iter_init (&iter, interface->priv->shared);
+	while (g_hash_table_iter_next (&iter, (gpointer *) &path, (gpointer *) &share_info))
+		returned_list = g_slist_append (returned_list, share_info);
+
+	return returned_list;
+}
+
+/**
+ * syncdaemon_shares_interface_get_shares:
+ */
+GSList *
+syncdaemon_shares_interface_get_shares (SyncdaemonSharesInterface *interface)
+{
+	GHashTableIter iter;
+	gchar *path;
+	SyncdaemonShareInfo *share_info;
+	GSList *shares_list, *returned_list = NULL;;
+	GError *error = NULL;
+
+	g_return_val_if_fail (SYNCDAEMON_IS_SHARES_INTERFACE (interface), NULL);
+
+	if (interface->priv->shares == NULL) {
+		interface->priv->shares = g_hash_table_new_full (g_str_hash, g_str_equal,
+								 g_free, g_object_unref);
+
+		if (dbus_g_proxy_call (DBUS_G_PROXY (interface->priv->proxy), "get_shares", &error,
+				       G_TYPE_INVALID,
+				       dbus_g_type_get_collection ("GSList",
+								   dbus_g_type_get_map (
+									   "GHashTable",
+									   G_TYPE_STRING,
+									   G_TYPE_STRING)), &shares_list,
+				       G_TYPE_INVALID)) {
+			while (shares_list != NULL) {
+				GHashTable *hash = (GHashTable *) shares_list->data;
+
+				share_info = syncdaemon_share_info_new_from_hash_table (hash);
+
+				shares_list = g_slist_remove (shares_list, hash);
+				g_hash_table_unref (hash);
+
+				g_hash_table_insert (interface->priv->shares,
+						     g_strdup (syncdaemon_share_info_get_path (share_info)),
+						     share_info);
+			}
+		} else {
+			SyncdaemonDaemon *daemon = NULL;
+
+			g_object_get (G_OBJECT (interface), "daemon", &daemon, NULL);
+			if (daemon != NULL)
+				g_signal_emit_by_name (daemon, "error", error->message, NULL);
+
+			g_error_free (error);
+
+			return NULL;
+		}
+	}
+
+	/* Create the list to be returned */
+	g_hash_table_iter_init (&iter, interface->priv->shares);
+	while (g_hash_table_iter_next (&iter, (gpointer) &path, (gpointer) &share_info))
+		returned_list = g_slist_append (returned_list, share_info);
+
+	return returned_list;
 }
 
 /**

=== modified file 'libsyncdaemon/syncdaemon-shares-interface.h'
--- libsyncdaemon/syncdaemon-shares-interface.h	2010-07-12 17:06:17 +0000
+++ libsyncdaemon/syncdaemon-shares-interface.h	2010-07-23 10:31:40 +0000
@@ -56,8 +56,8 @@
 							       const gchar *name,
 							       gboolean allow_modifications);
 void                       syncdaemon_shares_interface_delete (SyncdaemonSharesInterface *interface, const gchar *share_id);
-void                       syncdaemon_shares_interface_get_shared (SyncdaemonSharesInterface *interface);
-void                       syncdaemon_shares_interface_get_shares (SyncdaemonSharesInterface *interface);
+GSList                    *syncdaemon_shares_interface_get_shared (SyncdaemonSharesInterface *interface);
+GSList                    *syncdaemon_shares_interface_get_shares (SyncdaemonSharesInterface *interface);
 void                       syncdaemon_shares_interface_refresh (SyncdaemonSharesInterface *interface);
 void                       syncdaemon_shares_interface_reject (SyncdaemonSharesInterface *interface, const gchar *share_id);
 

=== modified file 'libsyncdaemon/test-libsyncdaemon.c'
--- libsyncdaemon/test-libsyncdaemon.c	2010-06-24 11:06:24 +0000
+++ libsyncdaemon/test-libsyncdaemon.c	2010-07-23 10:31:40 +0000
@@ -28,6 +28,7 @@
 #define TEST_ID   "abcdefeghijk"
 #define TEST_HASH "1234567890abcdef"
 
+static GMainLoop *main_loop = NULL;
 static SyncdaemonDaemon *the_daemon = NULL;
 
 static void
@@ -199,6 +200,103 @@
 }
 
 static void
+test_share_info (void)
+{
+	SyncdaemonShareInfo *sinfo;
+	GHashTable *hash;
+
+	/* Test creating an empty SyncdaemonShareInfo */
+	sinfo = syncdaemon_share_info_new ();
+	g_assert (SYNCDAEMON_IS_SHARE_INFO (sinfo));
+
+	syncdaemon_share_info_set_name (sinfo, TEST_NAME);
+	g_assert (g_strcmp0 (syncdaemon_share_info_get_name (sinfo), TEST_NAME) == 0);
+
+	syncdaemon_share_info_set_share_type (sinfo, SYNCDAEMON_SHARE_INFO_TYPE_SHARED);
+	g_assert (syncdaemon_share_info_get_share_type (sinfo) == SYNCDAEMON_SHARE_INFO_TYPE_SHARED);
+
+	syncdaemon_share_info_set_path (sinfo, TEST_PATH);
+	g_assert (g_strcmp0 (syncdaemon_share_info_get_path (sinfo), TEST_PATH) == 0);
+
+	syncdaemon_share_info_set_username (sinfo, TEST_NAME);
+	g_assert (g_strcmp0 (syncdaemon_share_info_get_username (sinfo), TEST_NAME) == 0);
+
+	syncdaemon_share_info_set_user_visible_name (sinfo, TEST_NAME);
+	g_assert (g_strcmp0 (syncdaemon_share_info_get_user_visible_name (sinfo), TEST_NAME) == 0);
+
+	syncdaemon_share_info_set_node_id (sinfo, TEST_ID);
+	g_assert (g_strcmp0 (syncdaemon_share_info_get_node_id (sinfo), TEST_ID) == 0);
+
+	syncdaemon_share_info_set_volume_id (sinfo, TEST_ID);
+	g_assert (g_strcmp0 (syncdaemon_share_info_get_volume_id (sinfo), TEST_ID) == 0);
+
+	syncdaemon_share_info_set_accepted (sinfo, TRUE);
+	g_assert (syncdaemon_share_info_get_accepted (sinfo) == TRUE);
+
+	syncdaemon_share_info_set_allow_modifications (sinfo, FALSE);
+	g_assert (syncdaemon_share_info_get_allow_modifications (sinfo) == FALSE);
+
+	g_object_unref (G_OBJECT (sinfo));
+
+	/* Test creating a SyncdaemonShareInfo from a hash table */
+	hash = g_hash_table_new (g_str_hash, g_str_equal);
+	g_hash_table_insert (hash, "name", TEST_NAME);
+	g_hash_table_insert (hash, "type", "Shared");
+	g_hash_table_insert (hash, "path", TEST_PATH);
+	g_hash_table_insert (hash, "other_username", TEST_NAME);
+	g_hash_table_insert (hash, "other_visible_name", TEST_NAME);
+	g_hash_table_insert (hash, "node_id", TEST_ID);
+	g_hash_table_insert (hash, "volume_id", TEST_ID);
+	g_hash_table_insert (hash, "accepted", "True");
+	g_hash_table_insert (hash, "access_level", "View");
+
+	sinfo = syncdaemon_share_info_new_from_hash_table (hash);
+	g_assert (g_strcmp0 (syncdaemon_share_info_get_name (sinfo), TEST_NAME) == 0);
+	g_assert (syncdaemon_share_info_get_share_type (sinfo) == SYNCDAEMON_SHARE_INFO_TYPE_SHARED);
+	g_assert (g_strcmp0 (syncdaemon_share_info_get_path (sinfo), TEST_PATH) == 0);
+	g_assert (g_strcmp0 (syncdaemon_share_info_get_username (sinfo), TEST_NAME) == 0);
+	g_assert (g_strcmp0 (syncdaemon_share_info_get_user_visible_name (sinfo), TEST_NAME) == 0);
+	g_assert (g_strcmp0 (syncdaemon_share_info_get_node_id (sinfo), TEST_ID) == 0);
+	g_assert (g_strcmp0 (syncdaemon_share_info_get_volume_id (sinfo), TEST_ID) == 0);
+	g_assert (syncdaemon_share_info_get_accepted (sinfo) == TRUE);
+	g_assert (syncdaemon_share_info_get_allow_modifications (sinfo) == FALSE);
+
+	g_object_unref (G_OBJECT (sinfo));
+}
+
+static void
+test_shares (void)
+{
+	GSList *list;
+	SyncdaemonSharesInterface *shares;
+
+	shares = (SyncdaemonSharesInterface *) syncdaemon_daemon_get_shares_interface (the_daemon);
+	g_assert (SYNCDAEMON_IS_SHARES_INTERFACE (shares));
+
+	/* Get shared folders */
+	list = syncdaemon_shares_interface_get_shared (shares);
+	while (list != NULL) {
+		SyncdaemonShareInfo *share_info = list->data;
+
+		g_assert (SYNCDAEMON_IS_SHARE_INFO (share_info));
+		g_assert (syncdaemon_share_info_get_share_type (share_info) == SYNCDAEMON_SHARE_INFO_TYPE_SHARED);
+
+		list = g_slist_remove (list, share_info);
+	}
+
+	/* Get shares */
+	list = syncdaemon_shares_interface_get_shares (shares);
+	while (list != NULL) {
+		SyncdaemonShareInfo *share_info = list->data;
+
+		g_assert (SYNCDAEMON_IS_SHARE_INFO (share_info));
+		g_assert (syncdaemon_share_info_get_share_type (share_info) == SYNCDAEMON_SHARE_INFO_TYPE_SHARE);
+
+		list = g_slist_remove (list, share_info);
+	}
+}
+
+static void
 test_status (void)
 {
 	GSList *list;
@@ -325,16 +423,23 @@
 	show_hash_table (event_dict);
 }
 
+static void
+daemon_ready_cb (SyncdaemonDaemon daemon, gpointer user_data)
+{
+	g_test_run ();
+
+	g_main_loop_quit (main_loop);
+}
+
 int
 main (int argc, gchar *argv[])
 {
-	GMainLoop *main_loop;
-
 	g_type_init ();
 	g_test_init (&argc, &argv, NULL);
 
 	/* Initialize main object */
 	the_daemon = syncdaemon_daemon_new ();
+	g_signal_connect (G_OBJECT (the_daemon), "ready", G_CALLBACK (daemon_ready_cb), NULL);
 	g_signal_connect (G_OBJECT (the_daemon), "connected", G_CALLBACK (daemon_connected_cb), NULL);
 	g_signal_connect (G_OBJECT (the_daemon), "disconnected", G_CALLBACK (daemon_disconnected_cb), NULL);
 	g_signal_connect (G_OBJECT (the_daemon), "event", G_CALLBACK (daemon_event_cb), NULL);
@@ -347,11 +452,15 @@
 	g_test_add_func ("/testlibsyncdaemon/TestFolders", test_folders);
 	g_test_add_func ("/testlibsyncdaemon/TestMetadata", test_metadata);
 	g_test_add_func ("/testlibsyncdaemon/TestPublicFiles", test_public_files);
+	g_test_add_func ("/testlibsyncdaemon/TestShareInfo", test_share_info);
+	g_test_add_func ("/testlibsyncdaemon/TestShares", test_shares);
 	g_test_add_func ("/testlibsyncdaemon/TestStatus", test_status);
 	g_test_add_func ("/testlibsyncdaemon/TestStatusInfo", test_status_info);
 	g_test_add_func ("/testlibsyncdaemon/TestTransferInfo", test_transfer_info);
 
 	/* Run main loop and tests suite */
-	//main_loop = g_main_loop_new (NULL, TRUE);
-	return g_test_run ();
+	main_loop = g_main_loop_new (NULL, TRUE);
+	g_main_loop_run (main_loop);
+
+	return 0;
 }

=== modified file 'nautilus/location-widget.c'
--- nautilus/location-widget.c	2010-07-20 14:52:23 +0000
+++ nautilus/location-widget.c	2010-07-23 10:31:40 +0000
@@ -136,6 +136,105 @@
 	object_class->finalize = location_widget_finalize;
 }
 
+static gboolean
+check_shared_for_folder (LocationWidget *location, SyncdaemonFolderInfo *folder_info)
+{
+	SyncdaemonInterface *interface;
+	GHashTable *shares = NULL;
+	gboolean result = TRUE;
+
+	interface = syncdaemon_daemon_get_shares_interface (location->uon->syncdaemon);
+	if (SYNCDAEMON_IS_SHARES_INTERFACE (interface)) {
+		GSList *shared_list, *l;
+
+		shared_list = syncdaemon_shares_interface_get_shared (SYNCDAEMON_SHARES_INTERFACE (interface));
+		for (l = shared_list; l != NULL; l = l->next) {
+			SyncdaemonShareInfo *share_info = SYNCDAEMON_SHARE_INFO (shared_list->data);
+
+			if (g_str_has_prefix (syncdaemon_share_info_get_path (share_info),
+					      syncdaemon_folder_info_get_path (folder_info))
+			    && syncdaemon_share_info_get_accepted (share_info)) {
+				gchar *path;
+				const gchar *username;
+				GSList *users = NULL;
+
+				if (shares == NULL)
+					shares = g_hash_table_new (g_str_hash, g_str_equal);
+
+				g_hash_table_lookup_extended (shares,
+							      syncdaemon_share_info_get_path (share_info),
+							      (gpointer *) &path,
+							      (gpointer *) &users);
+
+				/* Add the share and the user it's shared with to the hash table */
+				if (syncdaemon_share_info_get_user_visible_name (share_info) != NULL)
+					username = syncdaemon_share_info_get_user_visible_name (share_info);
+				else
+					username = syncdaemon_share_info_get_username (share_info);
+
+				users = g_slist_append (users, (gpointer) username);
+				g_hash_table_insert (shares,
+						     (gpointer) syncdaemon_share_info_get_path (share_info),
+						     (gpointer) users);
+			}
+		}
+
+		g_slist_free (shared_list);
+
+		/* If there are shares, ask the user what to do */
+		if (shares != NULL) {
+			GtkWidget *dialog;
+			GHashTableIter iter;
+			GString *question;
+			gchar *path;
+			GSList *users;
+
+			question = g_string_new (_("This folder contains folders that have been shared:\n"));
+
+			g_hash_table_iter_init (&iter, shares);
+			while (g_hash_table_iter_next (&iter, (gpointer) &path, (gpointer) &users)) {
+				gint count = 0;
+
+				question = g_string_append (question, "\t- ");
+				question = g_string_append (question, path);
+				question = g_string_append (question, " (");
+
+				while (users != NULL) {
+					gchar *username = (gchar *) users->data;
+
+					if (count > 0)
+						question = g_string_append (question, ", ");
+					question = g_string_append (question, username);
+
+					users = g_slist_remove (users, username);
+					count += 1;
+				}
+
+				question = g_string_append (question, ")\n");
+			}
+
+			question = g_string_append (question, _("This action will un-share these items. Other users"
+								" will no longer be able to access these files."
+								" Would you like to proceed?"));
+
+			dialog = gtk_message_dialog_new (
+				GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (location))),
+				0, GTK_MESSAGE_QUESTION,
+				GTK_BUTTONS_YES_NO,
+				question->str);
+			if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES)
+				result = FALSE;
+
+			gtk_widget_destroy (dialog);
+			g_string_free (question, TRUE);
+			g_hash_table_destroy (shares);
+		}
+
+	}
+
+	return result;
+}
+
 static void
 disable_u1_cb (GtkButton *button, gpointer user_data)
 {
@@ -150,7 +249,7 @@
 		folder_info = syncdaemon_folders_interface_get_info (
 			SYNCDAEMON_FOLDERS_INTERFACE (interface),
 			location->path);
-		if (folder_info != NULL) {
+		if (folder_info != NULL && check_shared_for_folder (location, folder_info)) {
 			set_label_text (location, FALSE);
 			gtk_widget_hide (location->disable_button);
 			gtk_widget_show (location->enable_button);