X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=b2c6eb25c4f7efa252d488df52941ccefa13045e;hp=77886d76be0bf0939e17000357b273a9ce69b090;hb=96d9a8c787c693406a0f26e3d3a00065c7236fe5;hpb=1225939e2e772ab87d1b134e14805541a7e2d56f

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 77886d7..b2c6eb2 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
+ 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif /*HAVE_CONFIG_H*/
@@ -55,6 +55,7 @@
 #include <widgets/modest-details-dialog.h>
 #include <widgets/modest-attachments-view.h>
 #include "widgets/modest-global-settings-dialog.h"
+#include "modest-connection-specific-smtp-window.h"
 #include "modest-account-mgr-helpers.h"
 #include "modest-mail-operation.h"
 #include "modest-text-utils.h"
@@ -68,6 +69,7 @@
 #include <tny-simple-list.h>
 #include <tny-msg-view.h>
 #include <tny-device.h>
+#include <tny-merge-folder.h>
 
 typedef struct _GetMsgAsyncHelper {	
 	ModestWindow *window;
@@ -85,18 +87,11 @@ typedef enum _ReplyForwardAction {
 } ReplyForwardAction;
 
 typedef struct _ReplyForwardHelper {
-guint reply_forward_type;
+	guint reply_forward_type;
 	ReplyForwardAction action;
 	gchar *account_name;
-	guint pending_ops;
 } ReplyForwardHelper;
 
-typedef struct _HeaderActivatedHelper {
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	TnyFolder *folder;
-} HeaderActivatedHelper;
-
 /*
  * The do_headers_action uses this kind of functions to perform some
  * action to each member of a list of headers
@@ -109,9 +104,15 @@ do_headers_action (ModestWindow *win,
 		   gpointer user_data);
 
 
-static void     open_msg_func          (const GObject *obj, const TnyMsg *msg, gpointer user_data);
+static void     open_msg_cb            (ModestMailOperation *mail_op, 
+					TnyHeader *header, 
+					TnyMsg *msg,
+					gpointer user_data);
 
-static void     reply_forward_func     (const GObject *obj, const TnyMsg *msg, gpointer user_data);
+static void     reply_forward_cb       (ModestMailOperation *mail_op, 
+					TnyHeader *header, 
+					TnyMsg *msg,
+					gpointer user_data);
 
 static void     reply_forward          (ReplyForwardAction action, ModestWindow *win);
 
@@ -143,7 +144,14 @@ modest_ui_actions_on_about (GtkAction *action, ModestWindow *win)
 	gtk_widget_destroy(about);
 }
 
-
+/*
+ * Gets the list of currently selected messages. If the win is the
+ * main window, then it returns a newly allocated list of the headers
+ * selected in the header view. If win is the msg view window, then
+ * the value returned is a list with just a single header.
+ *
+ * The caller of this funcion must free the list.
+ */
 static TnyList *
 get_selected_headers (ModestWindow *win)
 {
@@ -156,17 +164,16 @@ get_selected_headers (ModestWindow *win)
 		
 	} else if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
 		/* for MsgViewWindows, we simply return a list with one element */
-		TnyMsg *msg;
 		TnyHeader *header;
 		TnyList *list = NULL;
 		
-		msg  = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW(win));
-		if (msg) {
-			header = tny_msg_get_header (msg);
+		header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));
+		if (header != NULL) {
 			list = tny_simple_list_new ();
 			tny_list_prepend (list, G_OBJECT(header));
 			g_object_unref (G_OBJECT(header));
 		}
+
 		return list;
 
 	} else
@@ -208,13 +215,12 @@ headers_action_delete (TnyHeader *header,
 		       ModestWindow *win,
 		       gpointer user_data)
 {
-	ModestMailOperation *mail_op;
+	ModestMailOperation *mail_op = NULL;
 
-	/* TODO: add confirmation dialog */
 	mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_DELETE, G_OBJECT(win));
 	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
 					 mail_op);
-
+	
 	/* Always delete. TODO: Move to trash still not supported */
 	modest_mail_operation_remove_msg (mail_op, header, FALSE);
 	g_object_unref (G_OBJECT (mail_op));
@@ -223,20 +229,53 @@ headers_action_delete (TnyHeader *header,
 void
 modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
 {
+	TnyList *header_list = NULL;
+	TnyIterator *iter = NULL;
+	TnyHeader *header = NULL;
+	gchar *message = NULL;
+	gchar *desc = NULL;
+	gint response;
+
 	g_return_if_fail (MODEST_IS_WINDOW(win));
 
-	if (MODEST_IS_MSG_EDIT_WINDOW (win)) {
-		gboolean ret_value;
-		g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value);
-		return;
+	header_list = get_selected_headers (win);
+	if (!header_list) return;
+
+	/* Select message */
+	if (tny_list_get_length(header_list) > 1)
+		message = g_strdup(_("emev_nc_delete_messages"));
+	else {
+		iter = tny_list_create_iterator (header_list);
+		header = TNY_HEADER (tny_iterator_get_current (iter));
+		desc = g_strdup_printf ("%s", tny_header_get_subject (header)); 
+		message = g_strdup_printf(_("emev_nc_delete_message"), desc);
 	}
+
+	/* Confirmation dialog */		
+	response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
+							    message);
+	
+
+	if (response == GTK_RESPONSE_OK) {
+		if (MODEST_IS_MSG_EDIT_WINDOW (win)) {
+			gboolean ret_value;
+			g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value);
+			return;
+		}
 		
-	/* Remove each header */
-	do_headers_action (win, headers_action_delete, NULL);
+		/* Remove each header */
+		do_headers_action (win, headers_action_delete, NULL);
 
-	if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
-		gtk_widget_destroy (GTK_WIDGET(win));
-	} 
+		if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
+			gtk_widget_destroy (GTK_WIDGET(win));
+		} 
+	}
+
+	/* free */
+	g_free(message);
+	g_free(desc);
+	g_object_unref (header_list);
+	g_object_unref (iter);
 }
 
 
@@ -281,7 +320,6 @@ modest_ui_actions_on_add_to_contacts (GtkAction *action, ModestWindow *win)
 void
 modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win)
 {
-	
 	/* This is currently only implemented for Maemo,
 	 * because it requires a providers preset file which is not publically available.
 	 */
@@ -331,6 +369,45 @@ modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win)
 #endif /* MODEST_PLATFORM_MAEMO */
 }
 
+static void
+on_smtp_servers_window_hide (GtkWindow* window, gpointer user_data)
+{
+	ModestWindow *main_window = MODEST_WINDOW (user_data);
+	
+	/* Save any changes. */
+	modest_connection_specific_smtp_window_save_server_accounts (
+			MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (window), 
+			modest_window_get_active_account (main_window));
+	gtk_widget_destroy (GTK_WIDGET (window));
+}
+
+void
+modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win)
+{
+	/* This is currently only implemented for Maemo,
+	 * because it requires an API (libconic) to detect different connection 
+	 * possiblities.
+	 */
+#ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */
+	
+	/* Create the window if necessary: */
+	GtkWidget *specific_window = GTK_WIDGET (modest_connection_specific_smtp_window_new ());
+	modest_connection_specific_smtp_window_fill_with_connections (
+		MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (specific_window), 
+		modest_runtime_get_account_mgr(), 
+		modest_window_get_active_account (win));
+
+	/* Show the window: */	
+	gtk_window_set_transient_for (GTK_WINDOW (specific_window), GTK_WINDOW (win));
+	gtk_window_set_modal (GTK_WINDOW (specific_window), TRUE);
+    gtk_widget_show (specific_window);
+    
+    /* Save changes when the window is hidden: */
+	g_signal_connect (specific_window, "hide", 
+		G_CALLBACK (on_smtp_servers_window_hide), win);
+#endif /* MODEST_PLATFORM_MAEMO */
+}
+
 void
 modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
 {
@@ -395,6 +472,7 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
 /* 	} */
 
 	/* Create and register edit window */
+	/* This is destroyed by TOOD. */
 	msg_win = modest_msg_edit_window_new (msg, account_name);
 	mgr = modest_runtime_get_window_mgr ();
 	modest_window_mgr_register_window (mgr, msg_win);
@@ -417,62 +495,72 @@ cleanup:
 }
 
 static void
-headers_action_open (TnyHeader *header, 
-		     ModestWindow *win, 
-		     gpointer user_data)
-{
-	modest_ui_actions_on_header_activated (MODEST_HEADER_VIEW (user_data), 
-					       header,
-					       MODEST_MAIN_WINDOW (win));
-}
-
-void
-modest_ui_actions_on_open (GtkAction *action, ModestWindow *win)
-{
-	GtkWidget *header_view;
-
-	/* Get header view */
-	header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-							   MODEST_WIDGET_TYPE_HEADER_VIEW);
-
-	/* Open each message */
-	do_headers_action (win, headers_action_open, header_view);
-}
-
-
-static void
-open_msg_func (const GObject *obj, const TnyMsg *msg, gpointer user_data)
+open_msg_cb (ModestMailOperation *mail_op, 
+	     TnyHeader *header, 
+	     TnyMsg *msg, 
+	     gpointer user_data)
 {
 	ModestWindowMgr *mgr = NULL;
 	ModestWindow *parent_win = NULL;
 	ModestWindow *win = NULL;
-	HeaderActivatedHelper *helper = NULL;
 	TnyFolderType folder_type = TNY_FOLDER_TYPE_UNKNOWN;
 	gchar *account = NULL;
+	TnyFolder *folder;
 	
-	g_return_if_fail (MODEST_IS_WINDOW(obj));
-	g_return_if_fail (user_data != NULL);
-	parent_win = MODEST_WINDOW(obj);
-	helper = (HeaderActivatedHelper *) user_data;
+	/* TODO: Show an error? (review the specs) */
+	if (!msg)
+		return;
+
+	parent_win = (ModestWindow *) modest_mail_operation_get_source (mail_op);
+	folder = tny_header_get_folder (header);
+
+	/* Mark header as read */
+	headers_action_mark_as_read (header, MODEST_WINDOW(parent_win), NULL);
 
 	/* Get account */
-	account =  g_strdup(modest_window_get_active_account(MODEST_WINDOW(parent_win)));
+	account =  g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_win)));
 	if (!account)
 		account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
 	
-	/* Gets foldert type (OUTBOX headers will be opened in edit window */
-	if (modest_tny_folder_is_local_folder (helper->folder))
-		folder_type = modest_tny_folder_get_local_folder_type (helper->folder);
+	/* Gets folder type (OUTBOX headers will be opened in edit window */
+	if (modest_tny_folder_is_local_folder (folder))
+		folder_type = modest_tny_folder_get_local_folder_type (folder);
 
-	switch (folder_type) {
-	case TNY_FOLDER_TYPE_DRAFTS:
-		win = modest_msg_edit_window_new ((TnyMsg *) msg, account);
-		break;
-	default:
-		if (helper->model != NULL)
-			win = modest_msg_view_window_new_with_header_model ((TnyMsg *) msg, account, helper->model, helper->iter);
-		else
-			win = modest_msg_view_window_new ((TnyMsg *) msg, account);
+	/* If the header is in the drafts folder then open the editor,
+	   else the message view window */
+	if (folder_type == TNY_FOLDER_TYPE_DRAFTS) {
+		win = modest_msg_edit_window_new (msg, account);
+	} else {
+		if (MODEST_IS_MAIN_WINDOW (parent_win)) {
+			GtkWidget *header_view;
+			GtkTreeSelection *sel;
+			GList *sel_list = NULL;
+			GtkTreeModel *model;
+		
+			header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(parent_win),
+									   MODEST_WIDGET_TYPE_HEADER_VIEW);
+
+			sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view));
+			sel_list = gtk_tree_selection_get_selected_rows (sel, &model);
+
+			if (sel_list != NULL) {
+				GtkTreeRowReference *row_reference;
+
+				row_reference = gtk_tree_row_reference_new (model, (GtkTreePath *) sel_list->data);
+				g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL);
+				g_list_free (sel_list);
+				
+				win = modest_msg_view_window_new_with_header_model (msg, 
+										    account, 
+										    model, 
+										    row_reference);
+				gtk_tree_row_reference_free (row_reference);
+			} else {
+				win = modest_msg_view_window_new (msg, account);
+			}
+		} else {
+			win = modest_msg_view_window_new (msg, account);
+		}
 	}
 	
 	/* Register and show new window */
@@ -485,13 +573,86 @@ open_msg_func (const GObject *obj, const TnyMsg *msg, gpointer user_data)
 
 	/* Free */
 	g_free(account);
-/* 	g_object_unref (G_OBJECT(msg)); */
-	g_object_unref (G_OBJECT(helper->folder));
-	g_slice_free (HeaderActivatedHelper, helper);
+	g_object_unref (msg);
+	g_object_unref (folder);
+	g_object_unref (header);
 }
 
+/*
+ * This function is used by both modest_ui_actions_on_open and
+ * modest_ui_actions_on_header_activated. This way we always do the
+ * same when trying to open messages.
+ */
 static void
-reply_forward_func (const GObject *obj, const TnyMsg *msg, gpointer user_data)
+_modest_ui_actions_open (TnyList *headers, ModestWindow *win)
+{
+	ModestWindowMgr *mgr;
+	TnyIterator *iter;
+	ModestMailOperation *mail_op;
+
+	/* Look if we already have a message view for each header. If
+	   true, then remove the header from the list of headers to
+	   open */
+	mgr = modest_runtime_get_window_mgr ();
+	iter = tny_list_create_iterator (headers);
+	while (!tny_iterator_is_done (iter)) {
+		ModestWindow *window;
+		TnyHeader *header;
+
+		header = TNY_HEADER (tny_iterator_get_current (iter));
+		window = modest_window_mgr_find_window_by_msguid (mgr, tny_header_get_uid (header));
+		if (window)
+			tny_list_remove (headers, G_OBJECT (header));
+
+		g_object_unref (header);
+		tny_iterator_next (iter);
+	}
+
+	/* Open each message */
+	mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, G_OBJECT (win));
+	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+	modest_mail_operation_get_msgs_full (mail_op, 
+					     headers, 
+					     open_msg_cb, 
+					     NULL, 
+					     NULL);
+
+	/* Clean */
+	g_object_unref(mail_op);
+}
+
+void
+modest_ui_actions_on_open (GtkAction *action, ModestWindow *win)
+{
+	TnyList *headers;
+
+	/* Get headers */
+	headers = get_selected_headers (win);
+	if (!headers)
+		return;
+
+	/* Open them */
+	_modest_ui_actions_open (headers, win);
+
+	g_object_unref(headers);
+}
+
+
+static void
+free_reply_forward_helper (gpointer data)
+{
+	ReplyForwardHelper *helper;
+
+	helper = (ReplyForwardHelper *) data;
+	g_free (helper->account_name);
+	g_slice_free (ReplyForwardHelper, helper);
+}
+
+static void
+reply_forward_cb (ModestMailOperation *mail_op, 
+		  TnyHeader *header, 
+		  TnyMsg *msg,
+		  gpointer user_data)
 {
 	TnyMsg *new_msg;
 	ReplyForwardHelper *rf_helper;
@@ -507,8 +668,6 @@ reply_forward_func (const GObject *obj, const TnyMsg *msg, gpointer user_data)
 	g_return_if_fail (user_data != NULL);
 	rf_helper = (ReplyForwardHelper *) user_data;
 
-	rf_helper->pending_ops--;
-
 	from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
 						   rf_helper->account_name);
 	if (modest_account_mgr_get_bool (modest_runtime_get_account_mgr(),
@@ -523,19 +682,19 @@ reply_forward_func (const GObject *obj, const TnyMsg *msg, gpointer user_data)
 	switch (rf_helper->action) {
 	case ACTION_REPLY:
 		new_msg = 
-			modest_tny_msg_create_reply_msg ((TnyMsg *) msg,  from, signature,
+			modest_tny_msg_create_reply_msg (msg,  from, signature,
 							 rf_helper->reply_forward_type,
 							 MODEST_TNY_MSG_REPLY_MODE_SENDER);
 		break;
 	case ACTION_REPLY_TO_ALL:
 		new_msg = 
-			modest_tny_msg_create_reply_msg ((TnyMsg *) msg, from, signature, rf_helper->reply_forward_type,
+			modest_tny_msg_create_reply_msg (msg, from, signature, rf_helper->reply_forward_type,
 							 MODEST_TNY_MSG_REPLY_MODE_ALL);
 		edit_type = MODEST_EDIT_TYPE_REPLY;
 		break;
 	case ACTION_FORWARD:
 		new_msg = 
-			modest_tny_msg_create_forward_msg ((TnyMsg *) msg, from, signature, rf_helper->reply_forward_type);
+			modest_tny_msg_create_forward_msg (msg, from, signature, rf_helper->reply_forward_type);
 		edit_type = MODEST_EDIT_TYPE_FORWARD;
 		break;
 	default:
@@ -564,7 +723,7 @@ reply_forward_func (const GObject *obj, const TnyMsg *msg, gpointer user_data)
 		goto cleanup;
 	}
 	
-	tny_folder_add_msg (folder, (TnyMsg *) msg, &err);
+	tny_folder_add_msg (folder, msg, &err);
 	if (err) {
 		g_printerr ("modest: error adding msg to Drafts folder: %s",
 			    err->message);
@@ -587,12 +746,10 @@ cleanup:
 		g_object_unref (G_OBJECT (folder));
 	if (account)
 		g_object_unref (G_OBJECT (account));
-	
-	if (rf_helper->pending_ops == 0) {
-		g_free (rf_helper->account_name);
-		g_slice_free (ReplyForwardHelper, rf_helper);
-	}
+	g_object_unref (msg);
+	g_object_unref (header);
 }
+
 /*
  * Common code for the reply and forward actions
  */
@@ -622,7 +779,6 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
 	rf_helper = g_slice_new0 (ReplyForwardHelper);
 	rf_helper->reply_forward_type = reply_forward_type;
 	rf_helper->action = action;
-	rf_helper->pending_ops = tny_list_get_length (header_list);
 	rf_helper->account_name = g_strdup (modest_window_get_active_account (win));
 	if (!rf_helper->account_name)
 		rf_helper->account_name =
@@ -630,21 +786,36 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
 
 	if (MODEST_IS_MSG_VIEW_WINDOW(win)) {
 		TnyMsg *msg;
-		msg = modest_msg_view_window_get_message(MODEST_MSG_VIEW_WINDOW(win));
-		if (!msg) {
+		TnyHeader *header;
+		/* Get header and message. Do not free them here, the
+		   reply_forward_cb must do it */
+		msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW(win));
+		header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW(win));
+		if (!msg || !header) {
+			if (msg)
+				g_object_unref (msg);
+			if (header)
+				g_object_unref (header);
 			g_printerr ("modest: no message found\n");
 			return;
 		} else
-			reply_forward_func (G_OBJECT(win), msg, rf_helper);
+			reply_forward_cb (NULL, header, msg, rf_helper);
 	} else {
-				
+		/* Retrieve messages */
 		mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, G_OBJECT(win));
 		modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-		modest_mail_operation_process_msg (mail_op, header_list, reply_forward_func, rf_helper);
+		modest_mail_operation_get_msgs_full (mail_op, 
+						     header_list, 
+						     reply_forward_cb, 
+						     rf_helper, 
+						     free_reply_forward_helper);
 
 		/* Clean */
 		g_object_unref(mail_op);
 	}
+
+	/* Free */
+	g_object_unref (header_list);
 }
 
 void
@@ -730,72 +901,6 @@ modest_ui_actions_on_sort (GtkAction *action,
 	}
 }
 
-
-static gboolean
-action_send (const gchar* account_name)
-{
-	TnyAccount *tny_account;
-	ModestTnySendQueue *send_queue;
-
-	g_return_val_if_fail (account_name, FALSE);
-
-	/* Get the transport account according to the open connection, 
-	 * because the account might specify connection-specific SMTP servers.
-	 */
-	tny_account = 
-		modest_tny_account_store_get_transport_account_for_open_connection (modest_runtime_get_account_store(),
-								     account_name);
-	if (!tny_account) {
-		g_printerr ("modest: cannot get tny transport account for %s\n", account_name);
-		return FALSE;
-	}
-	
-	send_queue = modest_tny_send_queue_new (TNY_CAMEL_TRANSPORT_ACCOUNT(tny_account));
-	if (!send_queue) {
-		g_object_unref (G_OBJECT(tny_account));
-		g_printerr ("modest: cannot get send queue for %s\n", account_name);
-		return FALSE;
-	}
-	
-	modest_tny_send_queue_flush (send_queue);
-
-	g_object_unref (G_OBJECT(send_queue));
-	g_object_unref (G_OBJECT(tny_account));
-
-	return TRUE;
-}
-
-
-static gboolean
-action_receive (const gchar* account_name, 
-		ModestWindow *win)
-{
-	TnyAccount *tny_account;
-	ModestMailOperation *mail_op;
-
-	g_return_val_if_fail (account_name, FALSE);
-
-	tny_account = 
-		modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
-								     account_name,
-								     TNY_ACCOUNT_TYPE_STORE);
-	if (!tny_account) {
-		g_printerr ("modest: cannot get tny store account for %s\n", account_name);
-		return FALSE;
-	}
-
-	/* Create the mail operation */
-	/* TODO: The spec wants us to first do any pending deletions, before receiving. */
-	mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, G_OBJECT(win));
-	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-	modest_mail_operation_update_account (mail_op, TNY_STORE_ACCOUNT(tny_account));
-
-	g_object_unref (G_OBJECT(tny_account));
-	g_object_unref (G_OBJECT (mail_op));
-		
-	return TRUE;
-}
-
 /** Check that an appropriate connection is open.
  */
 gboolean check_for_connection (const gchar *account_name)
@@ -843,20 +948,36 @@ modest_ui_actions_do_send_receive (const gchar *account_name, ModestWindow *win)
 		acc_name = g_strdup (account_name);
 	}
 
-	/* Send & receive. Do not continue if no suitable connection
+	/* Send & receive. */
+	
+	/* Do not continue if no suitable connection
 	   is open */
-	if (check_for_connection (acc_name)) {
-		/* As per the UI spec,
-		 * for POP accounts, we should receive,
-		 * for IMAP we should synchronize everything, including receiving,
-		 * for SMTP we should send,
-		 * first receiving, then sending:
-		 */
-		if (!action_receive(acc_name, win))
-			g_printerr ("modest: failed to receive\n");
-		if (!action_send(acc_name))
-			g_printerr ("modest: failed to send\n");
+	if (!check_for_connection (acc_name)) {
+		g_free (acc_name);
+		return;
 	}
+	
+	/* TODO: Do not continue if an operation is already in progress:
+	 * Maybe there are some operations that tinymail allows to 
+	 * happen simulatenously.
+	 * TODO: Maybe a simple global gboolean is_updating is enough?
+	 * murrayc.
+	 */
+	
+	/* As per the UI spec,
+	 * for POP accounts, we should receive,
+	 * for IMAP we should synchronize everything, including receiving,
+	 * for SMTP we should send,
+	 * first receiving, then sending:
+	 */
+	/* Create the mail operation */
+	/* TODO: The spec wants us to first do any pending deletions, before receiving. */
+	ModestMailOperation *mail_op;
+	mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, G_OBJECT(win));
+	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+	modest_mail_operation_update_account (mail_op, acc_name);
+	g_object_unref (G_OBJECT (mail_op));
+	
 	/* Free */
 	g_free (acc_name);
 }
@@ -963,63 +1084,41 @@ modest_ui_actions_on_header_activated (ModestHeaderView *header_view,
 				       TnyHeader *header,
 				       ModestMainWindow *main_window)
 {
-	ModestMailOperation *mail_op = NULL;
-	HeaderActivatedHelper *helper = NULL;
-	ModestWindowMgr *mgr = NULL;
-	ModestWindow *win = NULL;
-	GtkTreeModel *model = NULL;
-	GtkTreeIter iter;
-	GtkTreeSelection *sel = NULL;
-	GList *sel_list = NULL;
-	GList *tmp = NULL;
-	
+	TnyList *headers;
+
 	g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 	
 	if (!header)
 		return;
 
-	/* Look if we already have a message view for that header */
-	mgr = modest_runtime_get_window_mgr ();
-	win = modest_window_mgr_find_window_by_msguid (mgr, tny_header_get_uid (header));
-	if (win) return;
-
-	/* Build helper */
-	helper = g_slice_new0 (HeaderActivatedHelper);
-	helper->folder = tny_header_get_folder (header);
-	helper->model = NULL;
-
-	/* Get headers tree model and selected iter to build message view */
-	sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view));
-	sel_list = gtk_tree_selection_get_selected_rows (sel, &model);
-	if (sel_list != NULL) {
-		gtk_tree_model_get_iter (model, &iter, (GtkTreePath *) sel_list->data);
-		
-		/* Fill helpers */
- 		helper->model = model;
-		helper->iter = iter;
+	headers = tny_simple_list_new ();
+	tny_list_prepend (headers, G_OBJECT (header));
 
-		/* Mark as read */
-		for (tmp=sel_list; tmp; tmp=g_list_next(tmp)) {
-			gtk_tree_model_get_iter (model, &iter, (GtkTreePath *) tmp->data);
-			gtk_tree_model_get (model, &iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
-					    &header, -1);
+	_modest_ui_actions_open (headers, MODEST_WINDOW (main_window));
 
-			headers_action_mark_as_read (header, MODEST_WINDOW(main_window), NULL);
+	g_object_unref (headers);
+}
 
-			g_object_unref(header);
-		}
-			
-		g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL);
-		g_list_free (sel_list);
-	}
+static void
+set_active_account_from_tny_account (TnyAccount *account,
+				     ModestWindow *window)
+{
+	const gchar *server_acc_name = tny_account_get_id (account);
+	
+	printf("%s: server_acc_name=%s\n", __FUNCTION__, server_acc_name);
+	/* We need the TnyAccount provided by the
+	   account store because that is the one that
+	   knows the name of the Modest account */
+	TnyAccount *modest_server_account = modest_server_account = 
+		modest_tny_account_store_get_tny_account_by_id  (modest_runtime_get_account_store (), 
+								 server_acc_name);
+	printf("%s: modest_server_account name=%s\n", __FUNCTION__, tny_account_get_id (modest_server_account));
 
-	/* New mail operation */
-	mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, G_OBJECT(main_window));
-	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-	modest_mail_operation_get_msg (mail_op, header, open_msg_func, helper);
+	const gchar *modest_acc_name = modest_tny_account_get_parent_modest_account_name_for_server_account (modest_server_account);
+	printf("%s: modest_acc_name=%s\n", __FUNCTION__, modest_acc_name);
 
-	/* Free */
-	g_object_unref (mail_op);
+	modest_window_set_active_account (window, modest_acc_name);
+	g_object_unref (modest_server_account);
 }
 
 void 
@@ -1040,9 +1139,26 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
 	
 	conf = modest_runtime_get_conf ();
 
-	if (TNY_IS_FOLDER (folder_store)) {
-
-		if (selected) {
+	if (TNY_IS_ACCOUNT (folder_store)) {
+		/* Update active account */
+		set_active_account_from_tny_account (TNY_ACCOUNT (folder_store), MODEST_WINDOW (main_window));
+		/* Show account details */
+		modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS);
+	} else if (modest_tny_folder_store_is_virtual_local_folders  (folder_store )) {
+		printf ("DEBUG: %s: folder store.\n", __FUNCTION__);
+		//TODO: Set the virtual folder store as the "active account" somehow:
+		modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS);
+	} else {
+		if (TNY_IS_FOLDER (folder_store) && selected) {
+			
+			if (!TNY_IS_MERGE_FOLDER (folder_store)) { /* TnyMergeFolder can have no get_account() implementation. */
+				/* Update the active account */
+				TnyAccount *account = tny_folder_get_account (TNY_FOLDER (folder_store));
+				set_active_account_from_tny_account (account, MODEST_WINDOW (main_window));
+				g_object_unref (account);
+			}
+			
+			/* Set folder on header view */
 			modest_main_window_set_contents_style (main_window, 
 							       MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS);
 			modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view),
@@ -1050,12 +1166,12 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
 			modest_widget_memory_restore (conf, G_OBJECT(header_view),
 						      MODEST_CONF_HEADER_VIEW_KEY);
 		} else {
+			/* Update the active account */
+			modest_window_set_active_account (MODEST_WINDOW (main_window), NULL);
+			/* Do not show folder */
 			modest_widget_memory_save (conf, G_OBJECT (header_view), MODEST_CONF_HEADER_VIEW_KEY);
 			modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), NULL);
 		}
-	} else if (TNY_IS_ACCOUNT (folder_store)) {
-
-		modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS);
 	}
 }
 
@@ -1206,6 +1322,8 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
 	/* Save settings and close the window */
 	gtk_widget_destroy (GTK_WIDGET (edit_window));
 }
+
+/* For instance, when clicking the Send toolbar button when editing a message: */
 void
 modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 {
@@ -1506,7 +1624,7 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_windo
 /* /\* 					suggested_name = X; *\/ */
 /* 					/\* Show error to the user *\/ */
 /* 					modest_platform_run_information_dialog (GTK_WINDOW (main_window), */
-/* 										MODEST_INFORMATION_CREATE_FOLDER); */
+/* 										_("mail_in_ui_folder_create_error")); */
 /* 				} */
 				g_object_unref (mail_op);
 			}
@@ -1524,14 +1642,21 @@ modest_ui_actions_on_rename_folder (GtkAction *action,
 {
 	TnyFolderStore *folder;
 	GtkWidget *folder_view;
-	
+	GtkWidget *header_view;	
+
 	g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
 	folder_view = modest_main_window_get_child_widget (main_window,
 							   MODEST_WIDGET_TYPE_FOLDER_VIEW);
 	if (!folder_view)
 		return;
+
+	header_view = modest_main_window_get_child_widget (main_window,
+							   MODEST_WIDGET_TYPE_HEADER_VIEW);
 	
+	if (!header_view)
+		return;
+
 	folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
 	
 	if (folder && TNY_IS_FOLDER (folder)) {
@@ -1546,6 +1671,8 @@ modest_ui_actions_on_rename_folder (GtkAction *action,
 			modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
 							 mail_op);
 
+			modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), NULL);
+
 			modest_mail_operation_rename_folder (mail_op,
 							     TNY_FOLDER (folder),
 							     (const gchar *) folder_name);
@@ -1574,6 +1701,13 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
 
 	folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 
+	/* Show an error if it's an account */
+	if (!TNY_IS_FOLDER (folder)) {
+		modest_platform_run_information_dialog (GTK_WINDOW (main_window),
+							_("mail_in_ui_folder_delete_error"));
+		return ;
+	}
+
 	/* Ask the user */	
 	message =  g_strdup_printf (_("mcen_nc_delete_folder_text"), 
 				    tny_folder_get_name (TNY_FOLDER (folder)));
@@ -1591,7 +1725,7 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
 		/* Show error if happened */
 		if (modest_mail_operation_get_error (mail_op))
 			modest_platform_run_information_dialog (GTK_WINDOW (main_window),
-								MODEST_INFORMATION_DELETE_FOLDER);
+								_("mail_in_ui_folder_delete_error"));
 
 		g_object_unref (G_OBJECT (mail_op));
 	}
@@ -1628,6 +1762,13 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
 	g_return_if_fail(server_account_name);
 	/* printf("DEBUG: %s: server_account_name=%s\n", __FUNCTION__, server_account_name); */
 	
+	/* Initalize output parameters: */
+	if (cancel)
+		*cancel = FALSE;
+		
+	if (remember)
+		*remember = TRUE;
+		
 #ifdef MODEST_PLATFORM_MAEMO
 	/* Maemo uses a different (awkward) button order,
 	 * It should probably just use gtk_alternative_dialog_button_order ().
@@ -1783,6 +1924,8 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
 */
 
 	gtk_widget_destroy (dialog);
+	
+	printf ("DEBUG: %s: cancel=%d\n", __FUNCTION__, *cancel);
 }
 
 void
@@ -2044,21 +2187,23 @@ modest_ui_actions_on_details (GtkAction *action,
 		TnyMsg *msg;
 
 		msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (win));
-		if (!msg) {
+		if (!msg)
 			return;
-		} else {
-			headers_list = get_selected_headers (win);
-			if (!headers_list)
-				return;
+		g_object_unref (msg);		
 
-			iter = tny_list_create_iterator (headers_list);
+		headers_list = get_selected_headers (win);
+		if (!headers_list)
+			return;
 
-			header = TNY_HEADER (tny_iterator_get_current (iter));
-			headers_action_show_details (header, win, NULL);
-			g_object_unref (header);
+		iter = tny_list_create_iterator (headers_list);
+
+		header = TNY_HEADER (tny_iterator_get_current (iter));
+		headers_action_show_details (header, win, NULL);
+		g_object_unref (header);
+
+		g_object_unref (iter);
+		g_object_unref (headers_list);
 
-			g_object_unref (iter);
-		}
 	} else if (MODEST_IS_MAIN_WINDOW (win)) {
 		GtkWidget *folder_view, *header_view;
 
@@ -2288,10 +2433,38 @@ msgs_move_to_confirmation (GtkWindow *win,
 			response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
 									    (const gchar *) message);
 		}
+		g_object_unref (src_folder);
 	}
 	return response;
 }
 
+
+static void
+tranasfer_msgs_from_viewer_cb (const GObject *object, gpointer user_data)
+{
+	ModestMsgViewWindow *self = NULL;
+	gboolean found = FALSE;
+
+	g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (object));
+	self = MODEST_MSG_VIEW_WINDOW (object);
+
+	found = modest_msg_view_window_select_first_message (self);
+	g_return_if_fail (found);
+}
+
+static void
+move_to_error_checking (const GObject *obj, gpointer user_data)
+{
+	ModestWindow *win = NULL;
+	
+	g_return_if_fail (MODEST_IS_WINDOW (obj));
+	win = MODEST_WINDOW (obj);
+
+	/* TODO: show error message */
+/* 	modest_platform_run_information_dialog (GTK_WINDOW (win), */
+/* 						_("mail_in_ui_folder_move_target_error")); */
+}
+
 /*
  * UI handler for the "Move to" action when invoked from the
  * ModestMainWindow
@@ -2300,9 +2473,10 @@ static void
 modest_ui_actions_on_main_window_move_to (GtkAction *action, 
 					  ModestMainWindow *win)
 {
-	GtkWidget *dialog, *folder_view, *tree_view = NULL;
+	GtkWidget *dialog = NULL, *folder_view = NULL, *tree_view = NULL;
+	GtkWidget *header_view = NULL;
 	gint result;
-	TnyFolderStore *folder_store;
+	TnyFolderStore *folder_store = NULL;
 	ModestMailOperation *mail_op = NULL;
 
 	g_return_if_fail (MODEST_IS_MAIN_WINDOW (win));
@@ -2311,9 +2485,14 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
 	folder_view = modest_main_window_get_child_widget (win,
 							   MODEST_WIDGET_TYPE_FOLDER_VIEW);
 
+	/* Get header view */
+	header_view = modest_main_window_get_child_widget (win,
+							   MODEST_WIDGET_TYPE_HEADER_VIEW);
+
 	/* Create and run the dialog */
 	dialog = create_move_to_dialog (MODEST_WINDOW (win), folder_view, &tree_view);
 	result = gtk_dialog_run (GTK_DIALOG(dialog));
+	g_object_ref (tree_view);
 
 	/* We do this to save an indentation level ;-) */
 	if (result != GTK_RESPONSE_ACCEPT)
@@ -2329,8 +2508,13 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
 		TnyFolderStore *src_folder;
 		src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 
+		/* Clean folder on header view before moving it */
+		modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), NULL); 
+
 		if (TNY_IS_FOLDER (src_folder)) {
-			mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, G_OBJECT(win));
+			mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_ID_RECEIVE, 
+										 G_OBJECT(win),
+										 move_to_error_checking);
 			modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
 							 mail_op);
 
@@ -2339,14 +2523,12 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
 							   folder_store,
 							   TRUE);
 			g_object_unref (G_OBJECT (mail_op));
+			
 		}
 
 		/* Frees */
 		g_object_unref (G_OBJECT (src_folder));
 	} else {
-		GtkWidget *header_view;
-		header_view = modest_main_window_get_child_widget (win,
-								   MODEST_WIDGET_TYPE_HEADER_VIEW);
 		if (gtk_widget_is_focus (header_view)) {
 			TnyList *headers;
 			gint response;
@@ -2367,13 +2549,16 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
 				modest_mail_operation_xfer_msgs (mail_op, 
 								 headers,
 								 TNY_FOLDER (folder_store),
-								 TRUE);
+								 TRUE,
+								 NULL,
+								 NULL);
 				g_object_unref (G_OBJECT (mail_op));
 			}
+			g_object_unref (headers);
 		}
 	}
 	g_object_unref (folder_store);
-
+	
  end:
 	gtk_widget_destroy (dialog);
 }
@@ -2390,7 +2575,6 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action,
 	GtkWidget *dialog, *folder_view, *tree_view = NULL;
 	gint result;
 	ModestMainWindow *main_window;
-	TnyMsg *msg;
 	TnyHeader *header;
 	TnyList *headers;
 
@@ -2402,6 +2586,7 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action,
 	/* Create and run the dialog */
 	dialog = create_move_to_dialog (MODEST_WINDOW (win), folder_view, &tree_view);	
 	result = gtk_dialog_run (GTK_DIALOG(dialog));
+	g_object_ref (tree_view);
 
 	if (result == GTK_RESPONSE_ACCEPT) {
 		TnyFolderStore *folder_store;
@@ -2410,12 +2595,10 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action,
 		folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (tree_view));
 
 		/* Create header list */
-		msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (win));
-		header = tny_msg_get_header (msg);
+		header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));		
 		headers = tny_simple_list_new ();
 		tny_list_prepend (headers, G_OBJECT (header));
 		g_object_unref (header);
-		g_object_unref (msg);
 
 		/* Ask user for confirmation. MSG-NOT404 */
 		response = msgs_move_to_confirmation (GTK_WINDOW (win), 
@@ -2435,11 +2618,12 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action,
 			modest_mail_operation_xfer_msgs (mail_op, 
 							 headers,
 							 TNY_FOLDER (folder_store),
-							 TRUE);
+							 TRUE,
+							 tranasfer_msgs_from_viewer_cb,
+							 NULL);
 			g_object_unref (G_OBJECT (mail_op));
-		} else {
-			g_object_unref (headers);
-		}
+		} 
+		g_object_unref (headers);
 		g_object_unref (folder_store);
 	}
 	gtk_widget_destroy (dialog);
@@ -2488,6 +2672,7 @@ do_headers_action (ModestWindow *win,
 		tny_iterator_next (iter);
 	}
 	g_object_unref (iter);
+	g_object_unref (headers_list);
 }
 
 void 
@@ -2531,17 +2716,34 @@ modest_ui_actions_on_settings (GtkAction *action,
 			       ModestWindow *win)
 {
 	GtkWidget *dialog;
-	gint response;
 
 	dialog = modest_platform_get_global_settings_dialog ();
 	gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (win));
 	gtk_widget_show (dialog);
 
-	response = gtk_dialog_run (GTK_DIALOG (dialog));
-
-	if (response == GTK_RESPONSE_ACCEPT) {
-		g_message ("YES");
-	}
+	gtk_dialog_run (GTK_DIALOG (dialog));
 
 	gtk_widget_destroy (dialog);
 }
+
+void 
+modest_ui_actions_on_retrieve_msg_contents (GtkAction *action,
+					    ModestWindow *window)
+{
+	ModestMailOperation *mail_op;
+	TnyList *headers;
+
+	/* Get headers */
+	headers = get_selected_headers (window);
+	if (!headers)
+		return;
+
+	/* Create mail operation */
+	mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, G_OBJECT (window));
+	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+	modest_mail_operation_get_msgs_full (mail_op, headers, NULL, NULL, NULL);
+
+	/* Frees */
+	g_object_unref (headers);
+	g_object_unref (mail_op);
+}