Merge lp:~rodrigo-moya/ubuntuone-client/no-enabling-on-special-udfs into lp:ubuntuone-client

[Rodrigo Moya]

Don't allow enabling/disabling on special UDFs from Nautilus

Don't allow enabling/disabling on special UDFs from Nautilus

[Chad Miller (cmiller)]

51 + tmp = g_build_filename (g_get_home_dir (), special_udfs[i], NULL);
52 + if (g_str_has_prefix (path, tmp))
53 + return TRUE;
54 +
55 + g_free (tmp);
56 + }

This is a memory leak.

ret = FALSE;

...

if
  ret = TRUE;
  break;

free;

return ret;

review: Needs Fixing

[lp:~rodrigo-moya/ubuntuone-client/no-enabling-on-special-udfs]

584. By Rodrigo Moya on 2010-07-20

Fix memory leak

[Chad Miller (cmiller)]

53 + if (g_str_has_prefix (path, tmp))
54 + done = TRUE;

What, no, done = g_str_has_prefix (path, tmp) ?! :)

Ah, alright, approved.

review: Approve

[lp:~rodrigo-moya/ubuntuone-client/no-enabling-on-special-udfs]

585. By Rodrigo Moya on 2010-07-20

Merge from trunk

[Tim Cole (tcole)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2010-07-14 19:51:54 +0000
+++ .bzrignore	2010-07-20 15:21:16 +0000
@@ -53,5 +53,8 @@
 libsyncdaemon/syncdaemon-marshal.[ch]
 libsyncdaemon/test-libsyncdaemon
 libsyncdaemon/libsyncdaemon-1.0.pc
+libsyncdaemon/SyncDaemon-1.0.gir
+libsyncdaemon/SyncDaemon-1.0.typelib
+
 ubuntuone.gnome-settings-plugin
 test-gsd-ubuntuone

=== modified file 'nautilus/location-widget.c'
--- nautilus/location-widget.c	2010-07-15 22:48:32 +0000
+++ nautilus/location-widget.c	2010-07-20 15:21:16 +0000
@@ -48,13 +48,13 @@
 {
 	gtk_widget_hide (location->help_label);
 	gtk_widget_show (location->spinner);
-	gtk_spinner_start (location->spinner);
+	gtk_spinner_start (GTK_SPINNER (location->spinner));
 }
 
 static void
 stop_spinner (LocationWidget *location)
 {
-	gtk_spinner_stop (location->spinner);
+	gtk_spinner_stop (GTK_SPINNER (location->spinner));
 	gtk_widget_hide (location->spinner);
 }
 
@@ -240,6 +240,34 @@
 	gtk_box_pack_start (GTK_BOX (box), location->enable_button, FALSE, FALSE, 0);
 }
 
+static gboolean
+is_special_udf (UbuntuOneNautilus *uon, const gchar *path)
+{
+	gint i;
+	gchar *special_udfs[] = {
+		"Ubuntu One",
+		"Ubuntu One/Shared With Me",
+		".ubuntuone/Purchased from Ubuntu One",
+		".local/share/ubuntuone"
+	};
+
+	for (i = 0; i < G_N_ELEMENTS (special_udfs); i++) {
+		gchar *tmp;
+		gboolean done = FALSE;
+
+		tmp = g_build_filename (g_get_home_dir (), special_udfs[i], NULL);
+		if (g_str_has_prefix (path, tmp))
+			done = TRUE;
+
+		g_free (tmp);
+
+		if (done)
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
 GtkWidget *
 location_widget_new (UbuntuOneNautilus *uon, const gchar *path)
 {
@@ -267,40 +295,45 @@
 	if (ubuntuone_is_storagefs (uon, path, &is_root)) {
 		/* Create label and disable button */
 		set_label_text (location, TRUE);
-		if (is_root && strcmp (path, uon->managed) != 0)
+		if (is_root && !is_special_udf (uon, path))
 			gtk_widget_show (location->disable_button);
 	} else {
-		GSList *udfs, *l;
-		SyncdaemonInterface *interface;
-		gboolean allow_enabling = TRUE;
-
-		/* Check to see if this is the parent of a UDF */
-		interface = syncdaemon_daemon_get_folders_interface (uon->syncdaemon);
-		udfs = syncdaemon_folders_interface_get_folders (SYNCDAEMON_FOLDERS_INTERFACE (interface));
-		for (l = udfs; l != NULL; l = l->next) {
-			SyncdaemonFolderInfo *folder_info = SYNCDAEMON_FOLDER_INFO (l->data);
-
-			if (g_str_has_prefix (syncdaemon_folder_info_get_path (folder_info), path))
-				allow_enabling = FALSE;
-		}
-
-		g_slist_free (udfs);
-
-		if (allow_enabling) {
-			set_label_text (location, FALSE);
-			gtk_widget_show (location->enable_button);
+		/* Check if this is the 'Shared with me' folder */
+		if (is_special_udf (uon, path)) {
+			set_label_text (location, TRUE);
 		} else {
-			gchar *labeltext;
-
-			labeltext = g_strdup_printf ("<b>Ubuntu One</b> - %s",
-						     _("cannot synchronize this folder"));
-			gtk_label_set_markup (GTK_LABEL (location->info_label), labeltext);
-			g_free (labeltext);
-
-			gtk_label_set_text (GTK_LABEL (location->help_label),
-					    _("This folder cannot be synchronized because it contains "
-					      "one or more folders that already synchronized"));
-			gtk_widget_show (location->help_label);
+			GSList *udfs, *l;
+			SyncdaemonInterface *interface;
+			gboolean allow_enabling = TRUE;
+
+			/* Check to see if this is the parent of a UDF */
+			interface = syncdaemon_daemon_get_folders_interface (uon->syncdaemon);
+			udfs = syncdaemon_folders_interface_get_folders (SYNCDAEMON_FOLDERS_INTERFACE (interface));
+			for (l = udfs; l != NULL; l = l->next) {
+				SyncdaemonFolderInfo *folder_info = SYNCDAEMON_FOLDER_INFO (l->data);
+
+				if (g_str_has_prefix (syncdaemon_folder_info_get_path (folder_info), path))
+					allow_enabling = FALSE;
+			}
+
+			g_slist_free (udfs);
+
+			if (allow_enabling) {
+				set_label_text (location, FALSE);
+				gtk_widget_show (location->enable_button);
+			} else {
+				gchar *labeltext;
+
+				labeltext = g_strdup_printf ("<b>Ubuntu One</b> - %s",
+							     _("cannot synchronize this folder"));
+				gtk_label_set_markup (GTK_LABEL (location->info_label), labeltext);
+				g_free (labeltext);
+
+				gtk_label_set_text (GTK_LABEL (location->help_label),
+						    _("This folder cannot be synchronized because it contains "
+						      "one or more folders that already synchronized"));
+				gtk_widget_show (location->help_label);
+			}
 		}
 	}