X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=770fb2a2e7bc87661fa1a3907e3787d31a2241d1;hp=e20acb5e1c96c9f96e793c66ea63a446bef53610;hb=f42dcfb53f942ace9efab748723d358498e78344;hpb=a3b26a8ec27a717e6a4c94824531b51e526281ba

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index e20acb5..770fb2a 100644
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -97,6 +97,7 @@ const GtkTargetEntry folder_view_drag_types[] =
 static void modest_folder_view_class_init  (ModestFolderViewClass *klass);
 static void modest_folder_view_init        (ModestFolderView *obj);
 static void modest_folder_view_finalize    (GObject *obj);
+static void modest_folder_view_dispose     (GObject *obj);
 
 static void         tny_account_store_view_init (gpointer g,
 						 gpointer iface_data);
@@ -198,10 +199,9 @@ static gboolean     get_inner_models        (ModestFolderView *self,
 					     GtkTreeModel **sort_model,
 					     GtkTreeModel **tny_model);
 #ifdef MODEST_TOOLKIT_HILDON2
-static void
-on_activity_changed (TnyGtkFolderListStore *store,
-		     gboolean activity,
-		     ModestFolderView *folder_view);
+static void on_activity_changed (TnyGtkFolderListStore *store,
+				 gboolean activity,
+				 ModestFolderView *folder_view);
 #endif
 
 enum {
@@ -255,7 +255,8 @@ struct _ModestFolderViewPrivate {
 
 	gulong                outbox_deleted_handler;
 
-	guint    activity_changed_handler;
+	GSList   *signal_handlers;
+	GdkColor active_color;
 };
 #define MODEST_FOLDER_VIEW_GET_PRIVATE(o)			\
 	(G_TYPE_INSTANCE_GET_PRIVATE((o),			\
@@ -312,6 +313,7 @@ modest_folder_view_class_init (ModestFolderViewClass *klass)
 
 	parent_class            = g_type_class_peek_parent (klass);
 	gobject_class->finalize = modest_folder_view_finalize;
+	gobject_class->dispose  = modest_folder_view_dispose;
 
 	g_type_class_add_private (gobject_class,
 				  sizeof(ModestFolderViewPrivate));
@@ -509,15 +511,28 @@ static void
 convert_parent_folders_to_dots (gchar **item_name)
 {
 	gint n_parents = 0;
+	gint n_inbox_parents = 0;
 	gchar *c;
+	gchar *path_start;
 	gchar *last_separator;
 
 	if (item_name == NULL)
 		return;
 
+	path_start = *item_name;
 	for (c = *item_name; *c != '\0'; c++) {
 		if (g_str_has_prefix (c, MODEST_FOLDER_PATH_SEPARATOR)) {
+			gchar *compare;
+			if (c != path_start) {
+				compare = g_strndup (path_start, c - path_start);
+				compare = g_strstrip (compare);
+				if (g_ascii_strcasecmp (compare, "inbox") == 0) {
+					n_inbox_parents++;
+				}
+				g_free (compare);
+			}
 			n_parents++;
+			path_start = c + 1;
 		}
 	}
 
@@ -531,7 +546,7 @@ convert_parent_folders_to_dots (gchar **item_name)
 		gint i;
 
 		buffer = g_string_new ("");
-		for (i = 0; i < n_parents; i++) {
+		for (i = 0; i < n_parents - n_inbox_parents; i++) {
 			buffer = g_string_append (buffer, MODEST_FOLDER_DOT);
 		}
 		buffer = g_string_append (buffer, last_separator);
@@ -565,20 +580,10 @@ format_compact_style (gchar **item_name,
 		/* Remove mailbox prefix if any */
 		gchar *prefix = g_strconcat (mailbox, MODEST_FOLDER_PATH_SEPARATOR, NULL);
 		if (g_str_has_prefix (*item_name, prefix)) {
-			gchar *new_item_name;
-
-			new_item_name = g_strdup (*item_name + strlen (prefix));
-			if (!g_ascii_strcasecmp (new_item_name, "Inbox")) {
-				g_free (new_item_name);
-				new_item_name = g_strdup (_("mcen_me_folder_inbox"));
-			}
+			gchar *new_item_name = g_strdup (*item_name + strlen (prefix));
 			g_free (*item_name);
 			*item_name = new_item_name;
 		}
-	} else if (!g_ascii_strcasecmp (*item_name, "Inbox")) {
-
-		g_free (*item_name);
-		*item_name = g_strdup (_("mcen_me_folder_inbox"));
 	}
 
 	if (!is_special || multiaccount) {
@@ -605,15 +610,20 @@ format_compact_style (gchar **item_name,
 
 		buffer = g_string_append (buffer, *item_name);
 		if (concat_folder_name) {
-			if (bold) buffer = g_string_append (buffer, "<span weight='bold'>");
-			buffer = g_string_append (buffer, folder_name);
-			if (bold) buffer = g_string_append (buffer, "</span>");
+			if (!is_special && folder_type == TNY_FOLDER_TYPE_DRAFTS) {
+				buffer = g_string_append (buffer, folder_name);
+				/* TODO: append a sensitive string to the remote drafts to
+				 * be able to know it's the remote one */
+/* 				buffer = g_string_append (buffer, " (TODO:remote)"); */
+			} else {
+				buffer = g_string_append (buffer, folder_name);
+			}
 		}
 		g_free (*item_name);
 		g_object_unref (account);
 
 		*item_name = g_string_free (buffer, FALSE);
-		*use_markup = bold;
+		*use_markup = FALSE;
 	} else {
 		*use_markup = FALSE;
 	}
@@ -725,6 +735,13 @@ text_cell_data  (GtkTreeViewColumn *column,
 		}
 	}
 
+	/* Convert INBOX */
+	if (type == TNY_FOLDER_TYPE_INBOX &&
+	    g_str_has_suffix (fname, "Inbox")) {
+		g_free (item_name);
+		item_name = g_strdup (_("mcen_me_folder_inbox"));
+	}
+
 	if (!item_name)
 		item_name = g_strdup ("unknown");
 
@@ -740,10 +757,22 @@ text_cell_data  (GtkTreeViewColumn *column,
 
 	if (item_name && item_weight) {
 		/* Set the name in the treeview cell: */
-		if (use_markup)
-			g_object_set (rendobj, "markup", item_name, "weight-set", FALSE, NULL);
-		else
-			g_object_set (rendobj, "text", item_name, "weight-set", TRUE, "weight", item_weight, NULL);
+		if (priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT && item_weight == 800 && 
+		    (priv->active_color.red != 0 || priv->active_color.blue != 0 || priv->active_color.green != 0)) {
+			g_object_set (rendobj, 
+				      "text", item_name, 
+				      "weight-set", FALSE,
+				      "foreground-set", TRUE,
+				      "foreground-gdk", &(priv->active_color),
+				      NULL);
+		} else {
+			g_object_set (rendobj, 
+				      "text", item_name,
+				      "foreground-set", FALSE,
+				      "weight-set", TRUE, 
+				      "weight", item_weight,
+				      NULL);
+		}
 
 		/* Notify display name observers */
 		/* TODO: What listens for this signal, and how can it use only the new name? */
@@ -838,17 +867,13 @@ messages_cell_data  (GtkTreeViewColumn *column,
 			drafts = FALSE;
 		}
 
-		if (priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT) {
-			if (number > 1) {
-				item_name = g_strdup_printf (drafts?_("mcen_ti_messages"):_("mcen_ti_new_messages"), 
-							     number);
-			} else if (number == 1) {
-				item_name = g_strdup_printf (drafts?_("mcen_ti_message"):_("mcen_ti_new_message"), 
-							     number);
-			}
-		} 
-
-	} 
+		if ((priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT) && (number > 0)) {
+			item_name =
+				g_strdup_printf (ngettext ((drafts) ? "mcen_ti_message" : "mcen_va_new_message",
+							   (drafts) ? "mcen_ti_messages" : "mcen_va_new_messages",
+							   number), number);
+		}
+	}
 
 	if (!item_name)
 		item_name = g_strdup ("");
@@ -903,26 +928,39 @@ get_composite_icons (const gchar *icon_code,
 {
 	ThreePixbufs *retval;
 
-	if (!*pixbuf)
-		*pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (icon_code, FOLDER_ICON_SIZE));
+	if (pixbuf && !*pixbuf) {
+		GdkPixbuf *icon;
+		icon = modest_platform_get_icon (icon_code, FOLDER_ICON_SIZE);
+		if (icon) {
+			*pixbuf = gdk_pixbuf_copy (icon);
+		} else {
+			*pixbuf = NULL;
+		}
+	}
 
-	if (!*pixbuf_open)
+	if (pixbuf_open && !*pixbuf_open && pixbuf && *pixbuf)
 		*pixbuf_open = get_composite_pixbuf ("qgn_list_gene_fldr_exp",
 						     FOLDER_ICON_SIZE,
 						     *pixbuf);
 
-	if (!*pixbuf_close)
+	if (pixbuf_close && !*pixbuf_close && pixbuf && *pixbuf)
 		*pixbuf_close = get_composite_pixbuf ("qgn_list_gene_fldr_clp",
 						      FOLDER_ICON_SIZE,
 						      *pixbuf);
 
 	retval = g_slice_new0 (ThreePixbufs);
-	if (*pixbuf)
+	if (pixbuf && *pixbuf)
 		retval->pixbuf = g_object_ref (*pixbuf);
-	if (*pixbuf_open)
+	else
+		retval->pixbuf = NULL;
+	if (pixbuf_open && *pixbuf_open)
 		retval->pixbuf_open = g_object_ref (*pixbuf_open);
-	if (*pixbuf_close)
+	else
+		retval->pixbuf_open = NULL;
+	if (pixbuf_close && *pixbuf_close)
 		retval->pixbuf_close = g_object_ref (*pixbuf_close);
+	else
+		retval->pixbuf_close = NULL;
 
 	return retval;
 }
@@ -1022,7 +1060,7 @@ get_folder_icons (ModestFolderView *folder_view, TnyFolderType type, GObject *in
 	    type != TNY_FOLDER_TYPE_INBOX &&
 	    modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (instance))) {
 #ifdef MODEST_TOOLKIT_HILDON2
-		return get_composite_icons (MODEST_FOLDER_ICON_ACCOUNT,
+		return get_composite_icons (MODEST_FOLDER_ICON_REMOTE_FOLDER,
 					    &anorm_pixbuf,
 					    &anorm_pixbuf_open,
 					    &anorm_pixbuf_close);
@@ -1219,7 +1257,7 @@ add_columns (GtkWidget *treeview)
 	priv->messages_renderer = gtk_cell_renderer_text_new ();
 	g_object_set (priv->messages_renderer, 
 #ifdef MODEST_TOOLKIT_HILDON2
-		      "yalign", 0.0,
+		      "yalign", 0.5,
 		      "ypad", MODEST_MARGIN_DEFAULT,
 		      "xpad", MODEST_MARGIN_DOUBLE,
 #else
@@ -1268,7 +1306,7 @@ modest_folder_view_init (ModestFolderView *obj)
 	priv->folder_to_select = NULL;
 	priv->outbox_deleted_handler = 0;
 	priv->reexpand = TRUE;
-	priv->activity_changed_handler = 0;
+	priv->signal_handlers = 0;
 
 	/* Initialize the local account name */
 	conf = modest_runtime_get_conf();
@@ -1291,29 +1329,30 @@ modest_folder_view_init (ModestFolderView *obj)
 	setup_drag_and_drop (GTK_TREE_VIEW(obj));
 
 	/* Connect signals */
-	g_signal_connect (G_OBJECT (obj),
-			  "key-press-event",
-			  G_CALLBACK (on_key_pressed), NULL);
+ 	g_signal_connect (G_OBJECT (obj),
+ 			  "key-press-event",
+ 			  G_CALLBACK (on_key_pressed), NULL);
 
-	priv->display_name_changed_signal =
-		g_signal_connect (modest_runtime_get_account_mgr (),
-				  "display_name_changed",
-				  G_CALLBACK (on_display_name_changed),
-				  obj);
+ 	priv->display_name_changed_signal =
+ 		g_signal_connect (modest_runtime_get_account_mgr (),
+ 				  "display_name_changed",
+ 				  G_CALLBACK (on_display_name_changed),
+ 				  obj);
 
 	/*
 	 * Track changes in the local account name (in the device it
 	 * will be the device name)
 	 */
-	priv->conf_key_signal = g_signal_connect (G_OBJECT(conf),
-						  "key_changed",
-						  G_CALLBACK(on_configuration_key_changed),
-						  obj);
-
-	update_style (obj);
-	g_signal_connect (G_OBJECT (obj), "notify::style", G_CALLBACK (on_notify_style), (gpointer) obj);
+ 	priv->conf_key_signal = g_signal_connect (G_OBJECT(conf),
+ 						  "key_changed",
+ 						  G_CALLBACK(on_configuration_key_changed),
+ 						  obj);
 
+	gdk_color_parse ("000", &priv->active_color);
 
+	update_style (obj);
+ 	g_signal_connect (G_OBJECT (obj), "notify::style", 
+			  G_CALLBACK (on_notify_style), (gpointer) obj);
 }
 
 static void
@@ -1325,6 +1364,55 @@ tny_account_store_view_init (gpointer g, gpointer iface_data)
 }
 
 static void
+modest_folder_view_dispose (GObject *obj)
+{
+	ModestFolderViewPrivate *priv;
+
+	priv =	MODEST_FOLDER_VIEW_GET_PRIVATE (obj);
+
+#ifdef MODEST_TOOLKIT_HILDON2
+	if (priv->signal_handlers) {
+		modest_signal_mgr_disconnect_all_and_destroy (priv->signal_handlers);
+		priv->signal_handlers = NULL;
+	}
+#endif
+
+	/* Free external references */
+	if (priv->account_store) {
+		g_signal_handler_disconnect (G_OBJECT(priv->account_store),
+					     priv->account_inserted_signal);
+		g_signal_handler_disconnect (G_OBJECT(priv->account_store),
+					     priv->account_removed_signal);
+		g_signal_handler_disconnect (G_OBJECT(priv->account_store),
+					     priv->account_changed_signal);
+		g_object_unref (G_OBJECT(priv->account_store));
+		priv->account_store = NULL;
+	}
+
+	if (priv->query) {
+		g_object_unref (G_OBJECT (priv->query));
+		priv->query = NULL;
+	}
+
+	if (priv->folder_to_select) {
+		g_object_unref (G_OBJECT(priv->folder_to_select));
+	    	priv->folder_to_select = NULL;
+	}
+
+	if (priv->cur_folder_store) {
+		g_object_unref (priv->cur_folder_store);
+		priv->cur_folder_store = NULL;
+	}
+
+	if (priv->list_to_move) {
+		g_object_unref (priv->list_to_move);
+		priv->list_to_move = NULL;
+	}
+
+	G_OBJECT_CLASS(parent_class)->dispose (obj);
+}
+
+static void
 modest_folder_view_finalize (GObject *obj)
 {
 	ModestFolderViewPrivate *priv;
@@ -1350,17 +1438,6 @@ modest_folder_view_finalize (GObject *obj)
 		g_object_unref (local_account);
 	}
 
-	if (priv->account_store) {
-		g_signal_handler_disconnect (G_OBJECT(priv->account_store),
-					     priv->account_inserted_signal);
-		g_signal_handler_disconnect (G_OBJECT(priv->account_store),
-					     priv->account_removed_signal);
-		g_signal_handler_disconnect (G_OBJECT(priv->account_store),
-					     priv->account_changed_signal);
-		g_object_unref (G_OBJECT(priv->account_store));
-		priv->account_store = NULL;
-	}
-
 	if (g_signal_handler_is_connected (modest_runtime_get_account_mgr (), 
 					   priv->display_name_changed_signal)) {
 		g_signal_handler_disconnect (modest_runtime_get_account_mgr (),
@@ -1368,16 +1445,6 @@ modest_folder_view_finalize (GObject *obj)
 		priv->display_name_changed_signal = 0;
 	}
 
-	if (priv->query) {
-		g_object_unref (G_OBJECT (priv->query));
-		priv->query = NULL;
-	}
-
-	if (priv->folder_to_select) {
-		g_object_unref (G_OBJECT(priv->folder_to_select));
-	    	priv->folder_to_select = NULL;
-	}
-
 	sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(obj));
 	if (sel)
 		g_signal_handler_disconnect (G_OBJECT(sel), priv->changed_signal);
@@ -1392,19 +1459,11 @@ modest_folder_view_finalize (GObject *obj)
 		priv->conf_key_signal = 0;
 	}
 
-	if (priv->cur_folder_store) {
-		g_object_unref (priv->cur_folder_store);
-		priv->cur_folder_store = NULL;
-	}
-
-	if (priv->list_to_move) {
-		g_object_unref (priv->list_to_move);
-		priv->list_to_move = NULL;
-	}
-
 	/* Clear hidding array created by cut operation */
 	_clear_hidding_filter (MODEST_FOLDER_VIEW (obj));
 
+	gdk_color_parse ("000", &priv->active_color);
+
 	G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -2096,10 +2155,10 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
 			ModestProtocolType protocol_type;
 
 			protocol_type = modest_tny_account_get_protocol_type (TNY_ACCOUNT (instance));
-			retval  = !modest_protocol_registry_protocol_type_has_tag 
+			retval  = !modest_protocol_registry_protocol_type_has_tag
 				(modest_runtime_get_protocol_registry (),
 				 protocol_type,
-				 MODEST_PROTOCOL_REGISTRY_STORE_FORBID_MESSAGE_ADD);
+				 MODEST_PROTOCOL_REGISTRY_STORE_FORBID_INCOMING_XFERS);
 		}
 	}
 
@@ -2258,8 +2317,10 @@ modest_folder_view_update_model (ModestFolderView *self,
 #ifdef MODEST_TOOLKIT_HILDON2
 	TnyGtkFolderListStoreFlags flags;
 	flags = TNY_GTK_FOLDER_LIST_STORE_FLAG_SHOW_PATH;
-	if (!priv->do_refresh)
-		flags &= TNY_GTK_FOLDER_LIST_STORE_FLAG_NO_REFRESH;
+	if (priv->do_refresh)
+		flags |= TNY_GTK_FOLDER_LIST_STORE_FLAG_DELAYED_REFRESH;
+	else
+		flags |= TNY_GTK_FOLDER_LIST_STORE_FLAG_NO_REFRESH;
 	model = tny_gtk_folder_list_store_new_with_flags (NULL, 
 							  flags);
 	tny_gtk_folder_list_store_set_path_separator (TNY_GTK_FOLDER_LIST_STORE (model),
@@ -2313,13 +2374,13 @@ modest_folder_view_update_model (ModestFolderView *self,
 						self,
 						NULL);
 
-	if (priv->activity_changed_handler > 0) {
-		GtkTreeModel *old_tny_model;
-
-		if (get_inner_models (self, NULL, NULL, &old_tny_model)) {
-			g_signal_handler_disconnect (G_OBJECT (old_tny_model), priv->activity_changed_handler);
+	GtkTreeModel *old_tny_model = NULL;
+	if (get_inner_models (self, NULL, NULL, &old_tny_model)) {
+		if (priv->signal_handlers > 0) {
+			priv->signal_handlers = modest_signal_mgr_disconnect (priv->signal_handlers,
+									      G_OBJECT (old_tny_model), 
+									      "activity-changed");
 		}
-		priv->activity_changed_handler = 0;
 	}
 
 	/* Set new model */
@@ -2330,8 +2391,11 @@ modest_folder_view_update_model (ModestFolderView *self,
 #endif
 
 #ifdef MODEST_TOOLKIT_HILDON2
-	priv->activity_changed_handler = 
-		g_signal_connect (G_OBJECT (model), "activity-changed", G_CALLBACK (on_activity_changed), self);
+	priv->signal_handlers = modest_signal_mgr_connect (priv->signal_handlers,
+							   G_OBJECT (model),
+							   "activity-changed",
+							   G_CALLBACK (on_activity_changed),
+							   self);
 #endif
 
 	g_object_unref (model);
@@ -2384,9 +2448,11 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
 		   cause (and it actually does it) a free of the
 		   summary of the folder (because the main window will
 		   clear the headers view */
+#ifndef MODEST_TOOLKIT_HILDON2
 		if (TNY_IS_FOLDER(priv->cur_folder_store))
 			tny_folder_sync_async (TNY_FOLDER(priv->cur_folder_store),
 					       FALSE, NULL, NULL, NULL);
+#endif
 
 		g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
 		       priv->cur_folder_store, FALSE);
@@ -2634,6 +2700,51 @@ compare_accounts_first (TnyFolderStore *s1, TnyFolderStore *s2)
 	return is_account2 - is_account1;
 }
 
+static gint
+compare_folders (const gchar *name1, const gchar *name2)
+{
+	const gchar *separator1, *separator2;
+	const gchar *next1, *next2;
+	gchar *top1, *top2;
+	gint cmp;
+
+	if (name1 == NULL || name1[0] == '\0')
+		return -1;
+	if (name2 == NULL || name2[0] == '\0')
+		return 1;
+
+	separator1 = strstr (name1, MODEST_FOLDER_PATH_SEPARATOR);
+	if (separator1) {
+		top1 = g_strndup (name1, separator1 - name1);
+	} else {
+		top1 = g_strdup (name1);
+	}
+
+	separator2 = strstr (name2, MODEST_FOLDER_PATH_SEPARATOR);
+	if (separator2) {
+		top2 = g_strndup (name2, separator2 - name2);
+	} else {
+		top2 = g_strdup (name2);
+	}
+
+
+	cmp = modest_text_utils_utf8_strcmp (top1, top2, TRUE);
+	g_free (top1);
+	g_free (top2);
+
+	if (cmp != 0)
+		return cmp;
+
+	if (separator1 == NULL && separator2 == NULL)
+		return 0;
+
+	next1 = (separator1 != NULL)?separator1 + strlen (MODEST_FOLDER_PATH_SEPARATOR):NULL;
+	next2 = (separator2 != NULL)?separator2 + strlen (MODEST_FOLDER_PATH_SEPARATOR):NULL;
+
+	return compare_folders (next1, next2);
+}
+
+
 /*
  * This function orders the mail accounts according to these rules:
  * 1st - remote accounts
@@ -2689,7 +2800,7 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
 	}
 
 	/* Pure sort by name */
-	cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
+	cmp = compare_folders (name1, name2);
  finish:
 	if (folder1)
 		g_object_unref(G_OBJECT(folder1));
@@ -3809,8 +3920,9 @@ modest_folder_view_copy_model (ModestFolderView *folder_view_src,
 
 	/* Get src model*/
 	if (get_inner_models (folder_view_dst, NULL, NULL, &old_tny_model)) {
-		g_signal_handler_disconnect (G_OBJECT (old_tny_model), dst_priv->activity_changed_handler);
-		dst_priv->activity_changed_handler = 0;
+		modest_signal_mgr_disconnect (dst_priv->signal_handlers,
+					      G_OBJECT (old_tny_model),
+					      "activity-changed");
 	}
 	filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view_src));
 	model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(filter_model));
@@ -3827,13 +3939,19 @@ modest_folder_view_copy_model (ModestFolderView *folder_view_src,
 	/* Set copied model */
 	gtk_tree_view_set_model (GTK_TREE_VIEW (folder_view_dst), new_filter_model);
 #ifndef MODEST_TOOLKIT_HILDON2
-	g_signal_connect (G_OBJECT(new_filter_model), "row-inserted",
-			  (GCallback) on_row_inserted_maybe_select_folder, folder_view_dst);
+	dst_priv->signal_handlers = modest_signal_mgr_connect (dst_priv->signal_handlers,
+							       G_OBJECT(new_filter_model), "row-inserted",
+							       (GCallback) on_row_inserted_maybe_select_folder,
+							       folder_view_dst);
 #endif
 #ifdef MODEST_TOOLKIT_HILDON2
-	if (new_tny_model)
-		dst_priv->activity_changed_handler = g_signal_connect (G_OBJECT (new_tny_model), "activity-changed",
-								       G_CALLBACK (on_activity_changed), folder_view_dst);
+	if (new_tny_model) {
+		dst_priv->signal_handlers = modest_signal_mgr_connect (dst_priv->signal_handlers,
+								       G_OBJECT (new_tny_model),
+								       "activity-changed",
+								       G_CALLBACK (on_activity_changed),
+								       folder_view_dst);
+	}
 #endif
 
 	/* Free */
@@ -3965,7 +4083,7 @@ static void
 update_style (ModestFolderView *self)
 {
 	ModestFolderViewPrivate *priv;
-	GdkColor style_color;
+	GdkColor style_color, style_active_color;
 	PangoAttrList *attr_list;
 	GtkStyle *style;
 	PangoAttribute *attr;
@@ -3999,6 +4117,12 @@ update_style (ModestFolderView *self)
 			      NULL);
 		pango_attr_list_unref (attr_list);
 	}
+
+	if (gtk_style_lookup_color (GTK_WIDGET (self)->style, "ActiveTextColor", &style_active_color)) {
+		priv->active_color = style_active_color;
+	} else {
+		gdk_color_parse ("000", &(priv->active_color));
+	}
 }
 
 static void