X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=75866d2be1d22284c3a2756f9432e24fd0806d26;hb=0ca412c0351f777d1fb3e3ff12317a3068b01642;hp=710df0beffb3ea2b81191a6ad90105670d00a239;hpb=f928d20058b7e8e74136a52fc88cdf8345ba961f;p=modest

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 710df0b..75866d2 100644
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -2110,31 +2110,31 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
 	/* apply special filters */
 	if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS)) {
 		if (TNY_IS_ACCOUNT (instance))
-			return FALSE;
+			retval = FALSE;
 	}
 
 	if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS)) {
 		if (TNY_IS_FOLDER (instance))
-			return FALSE;
+			retval = FALSE;
 	}
 
 	if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_HIDE_LOCAL_FOLDERS)) {
 		if (TNY_IS_ACCOUNT (instance)) {
 			if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (instance)))
-				return FALSE;
+				retval = FALSE;
 		} else if (TNY_IS_FOLDER (instance)) {
 			if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance)))
-				return FALSE;
+				retval = FALSE;
 		}
 	}
 
 	if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_HIDE_MCC_FOLDERS)) {
 		if (TNY_IS_ACCOUNT (instance)) {
 			if (modest_tny_account_is_memory_card_account (TNY_ACCOUNT (instance)))
-				return FALSE;
+				retval = FALSE;
 		} else if (TNY_IS_FOLDER (instance)) {
 			if (modest_tny_folder_is_memory_card_folder (TNY_FOLDER (instance)))
-				return FALSE;
+				retval = FALSE;
 		}
 	}
 
@@ -2142,12 +2142,12 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
 		/* A mailbox is a fake folder with an @ in the middle of the name */
 		if (!TNY_IS_FOLDER (instance) ||
 		    !(tny_folder_get_caps (TNY_FOLDER (instance)) & TNY_FOLDER_CAPS_NOSELECT)) {
-			return FALSE;
+			retval = FALSE;
 		} else {
 			const gchar *folder_name;
 			folder_name = tny_folder_get_name (TNY_FOLDER (instance));
 			if (!folder_name || strchr (folder_name, '@') == NULL)
-				return FALSE;
+				retval = FALSE;
 		}
 		
 	}
@@ -3225,7 +3225,7 @@ update_style (ModestFolderView *self)
 	attr_list = pango_attr_list_new ();
 
 	if (!gtk_style_lookup_color (gtk_widget_get_style (GTK_WIDGET (self)), "SecondaryTextColor", &style_color)) {
-		gdk_color_parse ("grey", &style_color);
+		gdk_color_parse (MODEST_SECONDARY_COLOR, &style_color);
 	}
 	attr = pango_attr_foreground_new (style_color.red, style_color.green, style_color.blue);
 	pango_attr_list_insert (attr_list, attr);