Merge lp:~rodrigo-moya/ubuntuone-client/fix-625525 into lp:ubuntuone-client

[Rodrigo Moya]

- Fix crash when disabling UDFs
- Only show one question dialog when disabling UDFs

- Fix crash when disabling UDFs
- Only show one question dialog when disabling UDFs

[John Lenton (chipaca)]

review: Approve

[Natalia Bidart (nataliabidart)]

Seem correct but I can't test it IRL since my syncdaemon won't authenticate due to bug #627960.

review: Abstain

[Roman Yepishev (rye)]

Bug: pressing Escape when confirmation dialog is shown causes the share to be deleted.
Expected: The same behavior as clicking No

review: Needs Fixing (fieldtest)

[lp:~rodrigo-moya/ubuntuone-client/fix-625525]

669. By Rodrigo Moya on 2010-09-01

Only return FALSE if the user presses NO or cancels the dialog

[Roman Yepishev (rye)]

<rye> rodrigo, so if I create a folder, the other party accepts that share, and then I remove the folder then nautilus will not warn me about that since it won't have the most up-to-date view
 hm
 in my case it had not updated
 hm
<rodrigo> if syncdaemon doesn't return the share in a signal, not
 although the share should show inmediately, isn't it for you (u1sdtool --list-shares)
 --list-shared, sorry
<rye> rodrigo, it is
 rodrigo, it is but the confirmation window does not show me that the folder is shared
<rodrigo> and what path does it show for the shared folder? in --list-shared
<rye> rodrigo, even after nautilus restart and triggering state change
<rodrigo> what value does it have in path= ?
<muffinresearch> Night all
<rye> rodrigo, id=c708a966-3f2c-443a-9cbb-799c55b4264c subscribed=True path=/home/rtg/tmp/search_files ; id=efe44633-3989-47cf-afd7-9484097616de name=folder accepted=True access_level=Modify to=https://login.ubuntu.com/+id/BKQsnfL path=/home/rtg/tmp/search_files/folder
 rodrigo, first is the UDF id, second id is the Share Id or whatever it is called
 rodrigo, let me add some debug and I will tell you why it's so
<rodrigo> rye, this means nautilus didn't get the signal from syncdaemon, it seems
<rye> rodrigo, checking...
 rodrigo, (nautilus:29216): UbuntuOne-Nautilus-WARNING **: checking /home/rtg/Documents against /home/rtg/tmp/search_files
 (nautilus:29216): UbuntuOne-Nautilus-WARNING **: checking /home/rtg/Documents against /home/rtg/tmp/search_files
 (nautilus:29216): UbuntuOne-Nautilus-WARNING **: checking /home/rtg/Documents against /home/rtg/tmp/search_files
 rodrigo, it looks like it does not advance through the list
 rodrigo, 44 SyncdaemonShareInfo *share_info = SYNCDAEMON_SHARE_INFO (shared_list->data);
 rodrigo, should be l->data

review: Needs Fixing

[lp:~rodrigo-moya/ubuntuone-client/fix-625525]

670. By Rodrigo Moya on 2010-09-01

Use the correct list item

[Roman Yepishev (rye)]

review: Approve (fieldtest)

=== modified file 'nautilus/utils.c'
--- nautilus/utils.c	2010-08-25 19:04:01 +0000
+++ nautilus/utils.c	2010-09-01 17:53:38 +0000
@@ -25,11 +25,15 @@
 
 /* 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_nautilus_check_shares_and_public_files (UbuntuOneNautilus *uon,
+						  SyncdaemonFolderInfo *folder_info,
+						  GtkWidget *widget)
 {
 	SyncdaemonInterface *interface;
-	GHashTable *shares = NULL;
-	gboolean result = TRUE;
+	gboolean result = TRUE, has_shares = FALSE, has_published = FALSE;
+	GString *question = NULL;
+
+	question = g_string_new (_("This folder contains shared folders and/or published files:\n\n"));
 
 	interface = syncdaemon_daemon_get_shares_interface (uon->syncdaemon);
 	if (SYNCDAEMON_IS_SHARES_INTERFACE (interface)) {
@@ -37,100 +41,26 @@
 
 		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);
+			SyncdaemonShareInfo *share_info = SYNCDAEMON_SHARE_INFO (l->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);
+				has_shares = TRUE;
+
+				question = g_string_append (question, "\t- ");
+				question = g_string_append (question, syncdaemon_share_info_get_path (share_info));
+				question = g_string_append (question, _(" (Shared folder)\n"));
 			}
 		}
 
 		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\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, _("\nThis 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 (widget)),
-				0, GTK_MESSAGE_QUESTION,
-				GTK_BUTTONS_YES_NO,
-				"%s", 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);
-
-			if (!result)
-				return FALSE;
-		}
-
 	}
 
 	/* Now check for published files */
 	if (uon->gotpubs) {
 		GHashTableIter iter;
 		gchar *key, *value;
-		GString *question;
-		gboolean has_published = FALSE;
-
-		question = g_string_new (_("This folder contains files that have been published:\n\n"));
 
 		g_hash_table_iter_init (&iter, uon->public);
 		while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &value)) {
@@ -139,32 +69,32 @@
 
 				question = g_string_append (question, "\t- ");
 				question = g_string_append (question, key);
-				question = g_string_append (question, " (");
+				question = g_string_append (question, _(" (Published at "));
 				question = g_string_append (question, value);
 				question = g_string_append (question, ")\n");
 			}
 		}
-
-		question = g_string_append (question, _("\nThis action will un-publish these items. Other users"
-							" will no longer be able to access these files."
-							" Would you like to proceeed?"));
-
-		if (has_published) {
-			GtkWidget *dialog;
-
-			dialog = gtk_message_dialog_new (
-				GTK_WINDOW (gtk_widget_get_toplevel (widget)),
-				0, GTK_MESSAGE_QUESTION,
-				GTK_BUTTONS_YES_NO,
-				"%s", question->str);
-			if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES)
-				result = FALSE;
-
-			gtk_widget_destroy (dialog);
-		}
-
-		g_string_free (question, TRUE);
-	}
+	}
+
+	if (has_shares || has_published) {
+		GtkWidget *dialog;
+
+		question = g_string_append (question, _("\nThis action will make these files and folders no "
+							"longer available to other users. Would you like to "
+							"proceed?"));
+		dialog = gtk_message_dialog_new (
+			GTK_WINDOW (gtk_widget_get_toplevel (widget)),
+			0, GTK_MESSAGE_QUESTION,
+			GTK_BUTTONS_YES_NO,
+			"%s", question->str);
+		if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_YES)
+			result = FALSE;
+
+		gtk_widget_destroy (dialog);
+	}
+
+	/* Free memory */
+	g_string_free (question, TRUE);
 
 	return result;
 }