Merge lp:~alecu/ubuntuone-client/capt-nemos-share-hand into lp:ubuntuone-client

[Alejandro J. Cura]

Add an emblem when offering a share and disable the context menu option to cancel it. (LP: #646059)

Add an emblem when offering a share and disable the context menu option to cancel it. (LP: #646059)

[dobey (dobey)]

review: Approve

[Alejandro J. Cura (alecu)]

To test this:
 * compile and install the nautilus plugin in this branch, as per the instructions in: https://wiki.canonical.com/UbuntuOne/CodeReviewFaq#ubuntuone-client%20Nautilus%20Plugin
 * restart nautilus: killall nautilus
 * right click on a folder that has been uploaded to Ubuntu One, and select "Ubuntu One" -> "Share..."
 * select an email from the list or add a new email address and use it
 * immediately after you click on the "Share" button a share emblem should show up on the folder (it looks like an orange and a green arrow)
 * now try right clicking on that folder and going to the "Ubuntu One" menu. The "Stop Sharing" option should be grayed out, because there's no webservice call to cancel share offers, only accepted share offers (bug #752986).

[Chad Miller (cmiller)]

review: Approve

=== modified file 'libsyncdaemon/syncdaemon-shares-interface.c'
--- libsyncdaemon/syncdaemon-shares-interface.c	2010-10-18 11:05:29 +0000
+++ libsyncdaemon/syncdaemon-shares-interface.c	2011-04-07 18:58:03 +0000
@@ -31,6 +31,11 @@
 	GHashTable *shares;
 };
 
+typedef struct _AddEmblemData {
+	SyncdaemonSharesInterface *interface;
+	gchar *path;
+} AddEmblemData;
+
 static void
 syncdaemon_shares_interface_finalize (GObject *object)
 {
@@ -226,6 +231,34 @@
 				 G_TYPE_INVALID);
 }
 
+void
+add_emblem_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data) {
+	SyncdaemonShareInfo *share_info;
+	SyncdaemonDaemon *daemon;
+	GHashTable *hash;
+	AddEmblemData *emblem_data = user_data;
+
+	hash = g_hash_table_new (g_str_hash, g_str_equal);
+	g_hash_table_insert (hash, "path", emblem_data->path);
+	share_info = syncdaemon_share_info_new_from_hash_table (hash);
+	g_hash_table_unref (hash);
+
+	g_hash_table_insert (emblem_data->interface->priv->shared,
+			     g_strdup (syncdaemon_share_info_get_path (share_info)),
+			     share_info);
+
+
+	g_object_get (G_OBJECT (emblem_data->interface), "daemon", &daemon, NULL);
+	if (daemon != NULL)
+		g_signal_emit_by_name (daemon, "share_created", TRUE, share_info);
+
+	no_output_dbus_call_ended_cb (proxy, call_id, user_data);
+
+	g_object_unref (emblem_data->interface);
+	g_free (emblem_data->path);
+	g_free (emblem_data);
+}
+
 /**
  * syncdaemon_shares_interface_create:
  */
@@ -236,14 +269,19 @@
 				    const gchar *name,
 				    gboolean allow_modifications)
 {
+	AddEmblemData *emblem_data;
 	g_return_if_fail (SYNCDAEMON_IS_SHARES_INTERFACE (interface));
 	g_return_if_fail (path != NULL);
 	g_return_if_fail (usernames != NULL);
 	g_return_if_fail (name != NULL);
 
+	emblem_data = g_new0 (AddEmblemData, 1);
+	emblem_data->interface = g_object_ref (interface);
+	emblem_data->path = g_strdup (path);
+
 	if (g_slist_length (usernames) == 1) {
 		dbus_g_proxy_begin_call (DBUS_G_PROXY (interface->priv->proxy), "create_share",
-					 no_output_dbus_call_ended_cb, interface, NULL,
+					 add_emblem_cb, emblem_data, NULL,
 					 G_TYPE_STRING, path,
 					 G_TYPE_STRING, (const gchar *) usernames->data,
 					 G_TYPE_STRING, name,
@@ -258,7 +296,7 @@
 			users_array[i] = g_strdup (l->data);
 
 		dbus_g_proxy_begin_call (DBUS_G_PROXY (interface->priv->proxy), "create_shares",
-					 no_output_dbus_call_ended_cb, interface, NULL,
+					 add_emblem_cb, emblem_data, NULL,
 					 G_TYPE_STRING, path,
 					 G_TYPE_STRV, users_array,
 					 G_TYPE_STRING, name,

=== modified file 'nautilus/context-menu.c'
--- nautilus/context-menu.c	2011-04-04 18:00:32 +0000
+++ nautilus/context-menu.c	2011-04-07 18:58:03 +0000
@@ -172,6 +172,34 @@
 	gconf_client_set_bool (conf_client, EXPANDER_SHOWN_KEY, !ubuntuone_is_location_bar_enabled (), NULL);
 }
 
+gboolean
+check_share_offer_pending (UbuntuOneNautilus *uon, const gchar *path)
+{
+	GSList *shares, *l;
+	SyncdaemonInterface *interface;
+	gboolean is_share_offer_pending = FALSE;
+	const gchar *node_id;
+
+	interface = syncdaemon_daemon_get_shares_interface (uon->syncdaemon);
+	if (SYNCDAEMON_IS_SHARES_INTERFACE (interface)) {
+		shares = syncdaemon_shares_interface_get_shared (SYNCDAEMON_SHARES_INTERFACE (interface));
+		for (l = shares; l != NULL; l = l->next) {
+			SyncdaemonShareInfo *share_info = SYNCDAEMON_SHARE_INFO (l->data);
+
+			if (g_strcmp0 (syncdaemon_share_info_get_path (share_info), path) == 0) {
+				node_id = syncdaemon_share_info_get_node_id (share_info);
+				if (node_id == NULL)
+					is_share_offer_pending = TRUE;
+				break;
+			}
+		}
+
+		g_slist_free (shares);
+	}
+
+	return is_share_offer_pending;
+}
+
 NautilusMenuItem *
 context_menu_new (UbuntuOneNautilus *uon,
 		  GtkWidget *window,
@@ -183,10 +211,12 @@
 	gchar *path, *item, *homedir_path, *path_uri;
 	gboolean is_managed, is_root, is_udf, is_public, is_shared, is_pending;
 	gboolean is_shared_to_me, is_inhome, is_dir, is_regular, is_symlink;
+	gboolean is_share_offer_pending;
 	MenuCallbackData *cb_data;
 
 	is_managed = is_root = is_udf = is_public = is_shared = is_pending = FALSE;
 	is_shared_to_me = is_inhome = is_dir = is_regular = is_symlink = FALSE;
+	is_share_offer_pending = FALSE;
 
 	if (g_list_length (files) != 1)
 		return NULL;
@@ -217,8 +247,11 @@
 			is_pending = TRUE;
 	}
 
-	if (ubuntuone_is_folder_shared (uon, path))
+	if (ubuntuone_is_folder_shared (uon, path)) {
 		is_shared = TRUE;
+		if (check_share_offer_pending (uon, path))
+			is_share_offer_pending = TRUE;
+	}
 
 	if (ubuntuone_is_inside_shares (uon, path))
 		is_shared_to_me = TRUE;
@@ -283,7 +316,7 @@
 						    _("Stop _Sharing"),
 						    _("Stop sharing this folder on Ubuntu One"),
 						    "ubuntuone");
-		if (is_pending)
+		if (is_pending || is_share_offer_pending)
 			g_object_set (menu_item, "sensitive", FALSE, NULL);
 
 		g_signal_connect (menu_item, "activate",