Merge lp:~alecu/ubuntuone-client/hide-emblems-on-non-syncd-folders into lp:ubuntuone-client

[Alejandro J. Cura]

Don't show an emblem on non-syncd folders (LP: #741835)

Don't show an emblem on non-syncd folders (LP: #741835)

[Roberto Alsina (ralsina)]

+1

review: Approve

[lp:~alecu/ubuntuone-client/hide-emblems-on-non-syncd-folders]

949. By Alejandro J. Cura on 2011-04-08

initialize is_subscribed

[dobey (dobey)]

review: Approve

=== modified file 'libsyncdaemon/syncdaemon-daemon.c'
--- libsyncdaemon/syncdaemon-daemon.c	2011-02-14 16:58:56 +0000
+++ libsyncdaemon/syncdaemon-daemon.c	2011-04-08 20:31:45 +0000
@@ -921,7 +921,7 @@
 {
 	const gchar *root;
         gchar *root_with_slash;
-	gboolean managed = FALSE;
+	gboolean managed = FALSE, is_subscribed = FALSE;
 	gchar *dirpath;
 	SyncdaemonInterface *interface;
 
@@ -962,12 +962,13 @@
 			SyncdaemonFolderInfo *finfo = SYNCDAEMON_FOLDER_INFO (l->data);
 
 			tmp_path = syncdaemon_folder_info_get_path (finfo);
+			is_subscribed = syncdaemon_folder_info_get_subscribed (finfo);
 			if (g_strcmp0 (path, tmp_path) == 0) {
-				managed = TRUE;
+				managed = is_subscribed;
 				*is_root = TRUE;
 				break;
 			} else if (g_str_has_prefix (path, tmp_path)) {
-				managed = TRUE;
+				managed = is_subscribed;
 				break;
 			}
 		}