Merge lp:~ralsina/ubuntuone-client/fix_714976 into lp:ubuntuone-client

[Roberto Alsina]

Fixes wrong path comparisons, so you can sync a folder named "~/Ubuntu One Music"

Fixes wrong path comparisons, so you can sync a folder named "~/Ubuntu One Music"

To fieldtest it, build it using these commands:

WARNING, this overwrites part of ubuntuone-client-gnome, you may need to reinstall it later

./autogen.sh --prefix=/usr
make
cd nautilus && sudo make install
cd ../libsyncdaemon && sudo make install
pkill nautilus
nautilus nautilus ~/Ubuntu\ One/Shared\ With\ Me/

Create a folder called "~/Ubuntu One Test"

Then check the context menus, the "Ubuntu One Test->Share" option should be disabled, and the "Synchronize" option, enabled.

[dobey (dobey)]

18 + } else {
19 + root_with_slash = g_build_filename (root, G_DIR_SEPARATOR_S, NULL);
20
21 + if (g_str_has_prefix (path, root_with_slash)) {
22 + g_free(root_with_slash);
23 + return TRUE;
24 + }
25 + g_free(root_with_slash);
26 + }

The style is a bit messed up here. Tabs vs. spaces issues maybe?

review: Needs Fixing

[lp:~ralsina/ubuntuone-client/fix_714976]

870. By Roberto Alsina on 2011-02-14

Fixed indenting problem

[dobey (dobey)]

review: Approve

[John O'Brien (jdobrien)]

Looks good.

review: Approve

=== modified file 'libsyncdaemon/syncdaemon-daemon.c'
--- libsyncdaemon/syncdaemon-daemon.c	2010-11-19 09:19:15 +0000
+++ libsyncdaemon/syncdaemon-daemon.c	2011-02-14 17:03:12 +0000
@@ -920,6 +920,7 @@
 syncdaemon_daemon_is_folder_enabled (SyncdaemonDaemon *daemon, const gchar *path, gboolean *is_root)
 {
 	const gchar *root;
+        gchar *root_with_slash;
 	gboolean managed = FALSE;
 	gchar *dirpath;
 	SyncdaemonInterface *interface;
@@ -934,9 +935,15 @@
 	if (g_strcmp0 (path, root) == 0) {
 		*is_root = TRUE;
 		return TRUE;
-	} else if (g_str_has_prefix (path, root))
-		return TRUE;
+	} else {
+		root_with_slash = g_build_filename (root,  G_DIR_SEPARATOR_S, NULL);
 
+		if (g_str_has_prefix (path, root_with_slash)) {
+			g_free(root_with_slash); 
+			return TRUE;
+		}
+		g_free(root_with_slash); 
+	}
 	/* Now check the 'Shared With Me' directory */
 	dirpath = g_build_filename (root, "Shared With Me", NULL);
 	if (g_strcmp0 (path, dirpath) == 0) {

=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c	2010-10-18 11:05:29 +0000
+++ nautilus/ubuntuone-nautilus.c	2011-02-14 17:03:12 +0000
@@ -183,7 +183,7 @@
 	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->managed = g_build_filename (g_get_home_dir (), "Ubuntu One", G_DIR_SEPARATOR_S, NULL);
 	uon->gotroot = FALSE;
 	uon->gotudfs = FALSE;
 }
@@ -294,7 +294,7 @@
 
 	/* 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));
+		uon->managed = g_build_filename (syncdaemon_daemon_get_root_dir (uon->syncdaemon), G_DIR_SEPARATOR_S, NULL);
 		if (uon->managed != NULL)
 			uon->gotroot = TRUE;
 	}