X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=ff7fc28a1cee802dc4992825c0adb36501113ffc;hp=ab63d85f680367d1f82ffdb91bed400d26f98a4c;hb=39d728083bfd2a0e31ea7a69f0278c79a755f41e;hpb=4761dca74871057240198d479f3d0230a54da203

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index ab63d85..ff7fc28 100644
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -336,8 +336,8 @@ static void
 icon_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
 		 GtkTreeModel *tree_model,  GtkTreeIter *iter, gpointer data)
 {
-	GObject *rendobj, *instance;
-	GdkPixbuf *pixbuf;
+	GObject *rendobj = NULL, *instance = NULL;
+	GdkPixbuf *pixbuf = NULL;
 	TnyFolderType type;
 	gchar *fname = NULL;
 	const gchar *account_id = NULL;
@@ -467,7 +467,7 @@ modest_folder_view_init (ModestFolderView *obj)
 	setup_drag_and_drop (GTK_TREE_VIEW(obj));
 
 	/* Restore conf */
-	modest_widget_memory_restore (conf, G_OBJECT (obj), "folder-view");
+	modest_widget_memory_restore (conf, G_OBJECT (obj), MODEST_CONF_FOLDER_VIEW_KEY);
 
 	/* Connect signals */
 	g_signal_connect (G_OBJECT (obj), 
@@ -991,7 +991,7 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model,
 			    &folder, -1);
 
 	/* Transfer message */
-	mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE);
+	mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, NULL);
 
 	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
 					 mail_op);
@@ -1051,7 +1051,7 @@ drag_and_drop_from_folder_view (GtkTreeModel     *source_model,
 			    &folder, -1);
 
 	/* Do the mail operation */
-	mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE);
+	mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, NULL);
 	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
 					 mail_op);
 	g_signal_connect (G_OBJECT (mail_op), "progress-changed",
@@ -1439,11 +1439,12 @@ modest_folder_view_set_style (ModestFolderView *self,
 }
 
 void
-modest_folder_view_set_visible_server_account_id (ModestFolderView *self,
-						  const gchar *account_id)
+modest_folder_view_set_account_id_of_visible_server_account (ModestFolderView *self,
+							     const gchar *account_id)
 {
 	ModestFolderViewPrivate *priv;
 	ModestConf *conf;
+	GtkTreeModel *model;
 
 	g_return_if_fail (self);
 	
@@ -1455,11 +1456,16 @@ modest_folder_view_set_visible_server_account_id (ModestFolderView *self,
 
 	/* Save preferences */
 	conf = modest_runtime_get_conf ();
-	modest_widget_memory_save (conf, G_OBJECT (self), "folder-view");
+	modest_widget_memory_save (conf, G_OBJECT (self), MODEST_CONF_FOLDER_VIEW_KEY);
+
+	/* Refilter */
+	model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+	if (GTK_IS_TREE_MODEL_FILTER (model))
+		gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
 }
 
 const gchar *
-modest_folder_view_get_visible_server_account_id (ModestFolderView *self)
+modest_folder_view_get_account_id_of_visible_server_account (ModestFolderView *self)
 {
 	ModestFolderViewPrivate *priv;