Merge lp:~dobey/ubuntuone-client-gnome/fix-983144-2-0 into lp:ubuntuone-client-gnome/stable-2-0

[dobey]

Ensure a trailing / on the folder path for use in comparisons

[Eric Casteleijn (thisfred)]

review: Approve

[Zachery Bir (urbanape)]

review: Approve

=== modified file 'nautilus/utils.c'
--- nautilus/utils.c	2011-10-07 20:39:02 +0000
+++ nautilus/utils.c	2012-04-17 17:31:25 +0000
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * UbuntuOne Nautilus plugin
  *
@@ -41,6 +42,10 @@
 	SyncdaemonInterface *interface;
 	gboolean result = TRUE, has_shares = FALSE, has_published = FALSE;
 	GString *question = NULL;
+	gchar *folder_path = NULL;
+
+	folder_path = g_build_filename (syncdaemon_folder_info_get_path (folder_info),
+					G_DIR_SEPARATOR_S, NULL);
 
 	question = g_string_new (_("This folder contains shared folders and/or published files:\n\n"));
 
@@ -53,7 +58,7 @@
 			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))
+                                  folder_path)
 			    && syncdaemon_share_info_get_accepted (share_info)) {
 				has_shares = TRUE;
 
@@ -76,7 +81,7 @@
 			const gchar *path;
 
 			path = syncdaemon_file_info_get_path (SYNCDAEMON_FILE_INFO (l->data));
-			if (g_str_has_prefix (path, syncdaemon_folder_info_get_path (folder_info))) {
+			if (g_str_has_prefix (path, folder_path)) {
 				has_published = TRUE;
 
 				question = g_string_append (question, "\t- ");
@@ -109,6 +114,7 @@
 
 	/* Free memory */
 	g_string_free (question, TRUE);
+	g_free (folder_path);
 
 	return result;
 }