X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=90a492809a8052d40cc47645e60cc156733bd6a8;hp=3946ef1834e46101e1e554e055c1f0f385161cf8;hb=976c05744180efac28a9dc421acefcff18659d67;hpb=0fe9e223f49814fd1d68f054c496fab5ad7ec183

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 3946ef1..90a4928 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -44,6 +44,11 @@
 #include "modest-tny-platform-factory.h"
 #include "modest-platform.h"
 
+#ifdef MODEST_PLATFORM_MAEMO
+#include "maemo/modest-osso-state-saving.h"
+#endif /* MODEST_PLATFORM_MAEMO */
+
+
 #include <widgets/modest-main-window.h>
 #include <widgets/modest-msg-view-window.h>
 #include <widgets/modest-account-view-window.h>
@@ -55,7 +60,7 @@
 
 #ifdef MODEST_HAVE_EASYSETUP
 #include "easysetup/modest-easysetup-wizard.h"
-#endif /*MODEST_HAVE_EASYSETUP*/
+#endif /* MODEST_HAVE_EASYSETUP */
 
 #include <modest-widget-memory.h>
 #include <tny-error.h>
@@ -82,18 +87,35 @@ typedef struct _ReplyForwardHelper {
 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
+ */
+typedef void (*HeadersFunc) (TnyHeader *header, ModestWindow *win, gpointer user_data);
+
+static void
+do_headers_action (ModestWindow *win, 
+		   HeadersFunc func,
+		   gpointer user_data);
+
+
+static void     open_msg_func          (const GObject *obj, const TnyMsg *msg, gpointer user_data);
+
+static void     reply_forward_func     (const GObject *obj, const TnyMsg *msg, gpointer user_data);
 
-static void     reply_forward_func     (gpointer data, gpointer user_data);
-static void     read_msg_func          (gpointer data, gpointer user_data);
-static void     get_msg_cb             (TnyFolder *folder, TnyMsg *msg,	GError **err,
-					gpointer user_data);
 static void     reply_forward          (ReplyForwardAction action, ModestWindow *win);
 
 static gchar*   ask_for_folder_name    (GtkWindow *parent_window, const gchar *title);
 
-
 void   
 modest_ui_actions_on_about (GtkAction *action, ModestWindow *win)
 {
@@ -150,12 +172,26 @@ get_selected_headers (ModestWindow *win)
 		return NULL;
 }
 
+static void
+headers_action_delete (TnyHeader *header,
+		       ModestWindow *win,
+		       gpointer user_data)
+{
+	ModestMailOperation *mail_op;
+
+	/* 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));
+}
+
 void
 modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
 {
-	TnyList *header_list;
-	TnyIterator *iter;
-
 	g_return_if_fail (MODEST_IS_WINDOW(win));
 
 	if (MODEST_IS_MSG_EDIT_WINDOW (win)) {
@@ -164,36 +200,8 @@ modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
 		return;
 	}
 		
-	header_list = get_selected_headers (win);
-	
-	if (header_list) {
-		iter = tny_list_create_iterator (header_list);
-		do {
-			TnyHeader *header;
-			ModestMailOperation *mail_op;
-
-			header = TNY_HEADER (tny_iterator_get_current (iter));
-			/* TODO: thick grain mail operation involving
-			   a list of objects. Composite pattern ??? */
-			/* TODO: add confirmation dialog */
-			mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_DELETE);
-			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);
-
-			/* Frees */
-			g_object_unref (G_OBJECT (mail_op));
-			g_object_unref (G_OBJECT (header));
-
-			tny_iterator_next (iter);
-
-		} while (!tny_iterator_is_done (iter));
-
-		/* Free iter */
-		g_object_unref (G_OBJECT (iter));
-	}
+	/* Remove each header */
+	do_headers_action (win, headers_action_delete, NULL);
 
 	if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
 		gtk_widget_destroy (GTK_WIDGET(win));
@@ -204,6 +212,10 @@ modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
 void
 modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win)
 {
+	#ifdef MODEST_PLATFORM_MAEMO
+	modest_osso_save_state();
+	#endif /* MODEST_PLATFORM_MAEMO */
+	
 	gtk_main_quit ();
 }
 
@@ -373,20 +385,85 @@ cleanup:
 		g_object_unref (G_OBJECT(folder));
 }
 
+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)
 {
-	modest_runtime_not_implemented (GTK_WINDOW(win)); /* FIXME */
+	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)
+{
+	ModestWindowMgr *mgr = NULL;
+	ModestWindow *parent_win = NULL;
+	ModestWindow *win = NULL;
+	HeaderActivatedHelper *helper = NULL;
+	TnyFolderType folder_type = TNY_FOLDER_TYPE_UNKNOWN;
+	gchar *account = NULL;
+	
+	g_return_if_fail (MODEST_IS_WINDOW(obj));
+	g_return_if_fail (user_data != NULL);
+	parent_win = MODEST_WINDOW(obj);
+	helper = (HeaderActivatedHelper *) user_data;
+
+	/* Get account */
+	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 */
+/* 	folder_type = modest_tny_folder_guess_folder_type (helper->folder); */
+	if (modest_tny_folder_is_local_folder (helper->folder))
+		folder_type = modest_tny_folder_get_local_folder_type (helper->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);
+	}
+		
+	/* Register and show new window */
+	if (win != NULL) {
+		mgr = modest_runtime_get_window_mgr ();
+		modest_window_mgr_register_window (mgr, win);
+		gtk_window_set_transient_for (GTK_WINDOW (win), GTK_WINDOW (parent_win));
+		gtk_widget_show_all (GTK_WIDGET(win));
+	}
+
+	/* Free */
+	g_free(account);
+/* 	g_object_unref (G_OBJECT(msg)); */
+	g_object_unref (G_OBJECT(helper->folder));
+	g_slice_free (HeaderActivatedHelper, helper);
+}
 
 static void
-reply_forward_func (gpointer data, gpointer user_data)
+reply_forward_func (const GObject *obj, const TnyMsg *msg, gpointer user_data)
 {
-	TnyMsg *msg, *new_msg;
-	GetMsgAsyncHelper *helper;
+	TnyMsg *new_msg;
 	ReplyForwardHelper *rf_helper;
 	ModestWindow *msg_win;
 	ModestEditType edit_type;
@@ -396,10 +473,11 @@ reply_forward_func (gpointer data, gpointer user_data)
 	TnyAccount *account = NULL;
 	ModestWindowMgr *mgr;
 	gchar *signature = NULL;
-	
-	msg = TNY_MSG (data);
-	helper = (GetMsgAsyncHelper *) user_data;
-	rf_helper = (ReplyForwardHelper *) helper->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);
@@ -410,23 +488,24 @@ reply_forward_func (gpointer data, gpointer user_data)
 							   rf_helper->account_name,
 							   MODEST_ACCOUNT_SIGNATURE, FALSE);
 	}
+
 	/* Create reply mail */
 	switch (rf_helper->action) {
 	case ACTION_REPLY:
 		new_msg = 
-			modest_tny_msg_create_reply_msg (msg,  from, signature,
+			modest_tny_msg_create_reply_msg ((TnyMsg *) 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 (msg, from, signature, rf_helper->reply_forward_type,
+			modest_tny_msg_create_reply_msg ((TnyMsg *) 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 (msg, from, signature, rf_helper->reply_forward_type);
+			modest_tny_msg_create_forward_msg ((TnyMsg *) msg, from, signature, rf_helper->reply_forward_type);
 		edit_type = MODEST_EDIT_TYPE_FORWARD;
 		break;
 	default:
@@ -455,7 +534,7 @@ reply_forward_func (gpointer data, gpointer user_data)
 		goto cleanup;
 	}
 	
-	tny_folder_add_msg (folder, msg, &err);
+	tny_folder_add_msg (folder, (TnyMsg *) msg, &err);
 	if (err) {
 		g_printerr ("modest: error adding msg to Drafts folder: %s",
 			    err->message);
@@ -479,8 +558,10 @@ cleanup:
 	if (account)
 		g_object_unref (G_OBJECT (account));
 	
-/* 	g_free (rf_helper->account_name); */
-/* 	g_slice_free (ReplyForwardHelper, rf_helper); */
+	if (rf_helper->pending_ops == 0) {
+		g_free (rf_helper->account_name);
+		g_slice_free (ReplyForwardHelper, rf_helper);
+	}
 }
 /*
  * Common code for the reply and forward actions
@@ -488,12 +569,10 @@ cleanup:
 static void
 reply_forward (ReplyForwardAction action, ModestWindow *win)
 {
-	TnyList *header_list;
+	ModestMailOperation *mail_op = NULL;
+	TnyList *header_list = NULL;
+	ReplyForwardHelper *rf_helper = NULL;
 	guint reply_forward_type;
-	TnyHeader *header;
-/* 	TnyFolder *folder; */
-	GetMsgAsyncHelper *helper;
-	ReplyForwardHelper *rf_helper;
 	
 	g_return_if_fail (MODEST_IS_WINDOW(win));
 
@@ -513,19 +592,12 @@ 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 =
 			modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
 
-	helper = g_slice_new0 (GetMsgAsyncHelper);
-	helper->window = win;
-	helper->func = reply_forward_func;
-	helper->iter = tny_list_create_iterator (header_list);
-	helper->user_data = rf_helper;
-	helper->num_ops = tny_list_get_length (header_list);
-
 	if (MODEST_IS_MSG_VIEW_WINDOW(win)) {
 		TnyMsg *msg;
 		msg = modest_msg_view_window_get_message(MODEST_MSG_VIEW_WINDOW(win));
@@ -533,28 +605,18 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
 			g_printerr ("modest: no message found\n");
 			return;
 		} else
-			reply_forward_func (msg, helper);
+			reply_forward_func (G_OBJECT(win), msg, rf_helper);
 	} else {
-		header = TNY_HEADER (tny_iterator_get_current (helper->iter));
-
-/* 		folder = tny_header_get_folder (header); */
-/* 		if (folder) { */
-/* 			/\* The callback will call it per each header *\/ */
-/* 			tny_folder_get_msg_async (folder, header, get_msg_cb, NULL, helper); */
-/* 			g_object_unref (G_OBJECT (folder)); */
-/* 		} else  */
-/* 			g_printerr ("modest: no folder for header\n"); */
-		
-		helper->mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE);
-		modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), helper->mail_op);
-		modest_mail_operation_process_msg (helper->mail_op, header, helper->num_ops, get_msg_cb, helper);
+				
+		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);
 
 		/* Clean */
-		g_object_unref (G_OBJECT (header));
+		g_object_unref(mail_op);
 	}
 }
 
-
 void
 modest_ui_actions_on_reply (GtkAction *action, ModestWindow *win)
 {
@@ -665,7 +727,7 @@ action_send (const gchar* account_name)
 		return FALSE;
 	}
 	
-	//modest_tny_send_queue_flush (send_queue);
+	modest_tny_send_queue_flush (send_queue);
 
 	g_object_unref (G_OBJECT(send_queue));
 	g_object_unref (G_OBJECT(tny_account));
@@ -675,7 +737,8 @@ action_send (const gchar* account_name)
 
 
 static gboolean
-action_receive (const gchar* account_name)
+action_receive (const gchar* account_name, 
+		ModestWindow *win)
 {
 	TnyAccount *tny_account;
 	ModestMailOperation *mail_op;
@@ -693,7 +756,7 @@ action_receive (const gchar* account_name)
 
 	/* 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);
+	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));
 
@@ -752,7 +815,7 @@ do_send_receive_current_or_default (ModestWindow *win)
 		 * for SMTP we should send,
 		 * first receiving, then sending:
 		 */
-		if (!action_receive(account_name))
+		if (!action_receive(account_name, win))
 			g_printerr ("modest: failed to receive\n");
 		if (!action_send(account_name))
 			g_printerr ("modest: failed to send\n");
@@ -783,7 +846,7 @@ do_send_receive_auto (ModestWindow *win)
 			 * for SMTP we should send,
 			 * first receiving, then sending:
 			 */
-			if (!action_receive(account_name))
+			if (!action_receive(account_name, win))
 				g_printerr ("modest: failed to receive for account %s\n", account_name);
 			if (!action_send(account_name))
 				g_printerr ("modest: failed to send for account %s\n", account_name);
@@ -857,116 +920,16 @@ modest_ui_actions_toggle_header_list_view (GtkAction *action, ModestMainWindow *
 }
 
 
-
-/*
- * Marks a message as read and passes it to the msg preview widget
- */
-static void
-read_msg_func (gpointer data, gpointer user_data)
-{
-	TnyMsg *msg;
-	TnyHeader *header;
-	GetMsgAsyncHelper *helper;
-	TnyHeaderFlags header_flags;
-	GtkWidget *msg_preview;
-	
-	msg = TNY_MSG (data);
-	helper = (GetMsgAsyncHelper *) user_data;
-
-	msg_preview = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (helper->window),
-							   MODEST_WIDGET_TYPE_MSG_PREVIEW);
-	if (!msg_preview)
-		return;
-	
-	header = TNY_HEADER (tny_iterator_get_current (helper->iter));
-	header_flags = tny_header_get_flags (header);
-	tny_header_set_flags (header, header_flags | TNY_HEADER_FLAG_SEEN);
-	g_object_unref (G_OBJECT (header));
-
-	/* Set message on msg view */
-	modest_msg_view_set_message (MODEST_MSG_VIEW(msg_preview), msg);
-}
-
-/*
- * This function is a generic handler for the tny_folder_get_msg_async
- * call. It expects as user_data a #GetMsgAsyncHelper. This helper
- * contains a user provided function that is called inside this
- * method. This will allow us to use this callback in many different
- * places. This callback performs the common actions for the
- * get_msg_async call, more specific actions will be done by the user
- * function
- */
-static void
-get_msg_cb (TnyFolder *folder, TnyMsg *msg, GError **err, gpointer user_data)
-{
-	GetMsgAsyncHelper *helper;
-
-	helper = (GetMsgAsyncHelper *) user_data;
-
-	/* Check errors */
-	if ((*err && ((*err)->code == TNY_FOLDER_ERROR_GET_MSG)) || !msg) {
-		modest_ui_actions_on_item_not_found (NULL,
-						     MODEST_ITEM_TYPE_MESSAGE,
-						     helper->window);
-		return;
-	}
-
-	/* Call user function */
-	if (helper->func)
-		helper->func (msg, user_data);
-
-	/* Process next element (if exists) */
-	tny_iterator_next (helper->iter);
-	if (tny_iterator_is_done (helper->iter)) {
-		/* Notify the queue */
-		if (helper->mail_op != NULL)
-			modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), helper->mail_op);
-
-		/* Free resources */
-		TnyList *headers;
-		ReplyForwardHelper *rf_helper = (ReplyForwardHelper *) helper->user_data;
-		headers = tny_iterator_get_list (helper->iter);
-		g_object_unref (G_OBJECT (headers));
-		g_object_unref (G_OBJECT (helper->iter));
-		if (rf_helper != NULL) {
-			g_free (rf_helper->account_name);
-			g_slice_free (ReplyForwardHelper, rf_helper);		
-		}
-		g_slice_free (GetMsgAsyncHelper, helper);
-	} else {
-		TnyHeader *header;
-		header = TNY_HEADER (tny_iterator_get_current (helper->iter));
-/* 		tny_folder_get_msg_async (folder, header, */
-/* 					  get_msg_cb, NULL, helper); */
-		modest_mail_operation_process_msg (helper->mail_op, header, helper->num_ops, get_msg_cb, helper);
-
-		g_object_unref (G_OBJECT(header));
-	}
-}
-
 void 
 modest_ui_actions_on_header_selected (ModestHeaderView *header_view, 
 				      TnyHeader *header,
 				      ModestMainWindow *main_window)
 {
-/* 	TnyFolder *folder; */
-	GetMsgAsyncHelper *helper;
-	TnyList *list;
-
 	g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
-	/* when there's no header, clear the msgview */
-	if (!header) {
-		GtkWidget *msg_preview;
-
-		/* Clear msg preview if exists */
-		msg_preview = modest_main_window_get_child_widget(main_window,
-								  MODEST_WIDGET_TYPE_MSG_PREVIEW);
-	
-		if (msg_preview)
-			modest_msg_view_set_message (MODEST_MSG_VIEW(msg_preview), NULL);
+	/* If no header has been selected then exit */
+	if (!header)
 		return;
-	}
 
 	/* Update Main window title */
 	if (GTK_WIDGET_HAS_FOCUS (header_view)) {
@@ -976,43 +939,98 @@ modest_ui_actions_on_header_selected (ModestHeaderView *header_view,
 		else
 			gtk_window_set_title (GTK_WINDOW (main_window), _("mail_va_no_subject"));
 	}
+}
 
-	/* Create list */
-	list = tny_simple_list_new ();
-	tny_list_prepend (list, G_OBJECT (header));
 
-	/* Fill helper data */
-	helper = g_slice_new0 (GetMsgAsyncHelper);
-	helper->window = MODEST_WINDOW (main_window);
-	helper->iter = tny_list_create_iterator (list);
-	helper->func = read_msg_func;
-	helper->num_ops = tny_list_get_length (list);
 
-/* 	folder = tny_header_get_folder (TNY_HEADER(header)); */
+/* void */
+/* modest_ui_actions_on_header_activated (ModestHeaderView *header_view, TnyHeader *header, */
+/* 				       ModestMainWindow *main_window) */
+/* { */
+/* 	ModestWindow *win = NULL; */
+/* 	TnyFolder *folder = NULL; */
+/* 	TnyMsg    *msg    = NULL; */
+/* 	TnyFolderType folder_type = TNY_FOLDER_TYPE_UNKNOWN; */
+/* 	ModestWindowMgr *mgr; */
+/* 	GtkTreeModel *model; */
+/* 	GtkTreeIter iter; */
+/* 	GtkTreeSelection *sel = NULL; */
+/* 	GList *sel_list = NULL; */
+	
+/* 	g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); */
+	
+/* 	if (!header) */
+/* 		return; */
 
-/* 	tny_folder_get_msg_async (TNY_FOLDER(folder), */
-/* 				  header, get_msg_cb, */
-/* 				  NULL, helper); */
+/* 	folder = tny_header_get_folder (header); */
+/* 	if (!folder) { */
+/* 		g_printerr ("modest: cannot get folder for header\n"); */
+/* 		return; */
+/* 	} */
+/* 	if (modest_tny_folder_is_local_folder (folder)) */
+/* 		folder_type = modest_tny_folder_get_local_folder_type (folder); */
 
-	helper->mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE);
-	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), helper->mail_op);
-	modest_mail_operation_process_msg (helper->mail_op, header, helper->num_ops, get_msg_cb, helper);
+/* 	/\* FIXME: make async?; check error  *\/ */
+/* 	msg = tny_folder_get_msg (folder, header, NULL); */
+/* 	if (!msg) { */
+/* 		g_printerr ("modest: cannot get msg for header\n"); */
+/* 		goto cleanup; */
+/* 	} */
 
-	/* Frees */
-/* 	g_object_unref (G_OBJECT (folder)); */
-}
+/* 	/\* 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 not, create a new window *\/ */
+/* 	if (!win) { */
+/* 		gchar *account; */
 
+/* 		account =  g_strdup(modest_window_get_active_account(MODEST_WINDOW(main_window))); */
+/* 		if (!account) */
+/* 			account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr()); */
 
-void 
-modest_ui_actions_on_header_activated (ModestHeaderView *folder_view, TnyHeader *header,
+/* 		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); */
+			
+/* 			switch (folder_type) { */
+/* 			case TNY_FOLDER_TYPE_DRAFTS: */
+/* 				win = modest_msg_edit_window_new (msg, account); */
+/* 				break; */
+/* 			default: */
+/* 				win = modest_msg_view_window_new_with_header_model (msg, account, model, iter); */
+/* 			} */
+
+/* 			g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL); */
+/* 			g_list_free (sel_list); */
+/* 		} else { */
+/* 			win = modest_msg_view_window_new (msg, account); */
+/* 		} */
+/* 		modest_window_mgr_register_window (mgr, win); */
+
+/* 		gtk_window_set_transient_for (GTK_WINDOW (win), */
+/* 					      GTK_WINDOW (main_window)); */
+/* 	} */
+
+/* 	gtk_widget_show_all (GTK_WIDGET(win)); */
+
+/* 	g_object_unref (G_OBJECT (msg)); */
+	
+/* cleanup: */
+/* 	g_object_unref (G_OBJECT (folder)); */
+/* } */
+
+void
+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;
-	TnyFolder *folder = NULL;
-	TnyMsg    *msg    = NULL;
-	ModestWindowMgr *mgr;
-	GtkTreeModel *model;
+	GtkTreeModel *model = NULL;
 	GtkTreeIter iter;
 	GtkTreeSelection *sel = NULL;
 	GList *sel_list = NULL;
@@ -1022,54 +1040,37 @@ modest_ui_actions_on_header_activated (ModestHeaderView *folder_view, TnyHeader
 	if (!header)
 		return;
 
-	folder = tny_header_get_folder (header);
-	if (!folder) {
-		g_printerr ("modest: cannot get folder for header\n");
-		return;
-	}
-
-	/* FIXME: make async?; check error  */
-	msg = tny_folder_get_msg (folder, header, NULL);
-	if (!msg) {
-		g_printerr ("modest: cannot get msg for header\n");
-		goto cleanup;
-	}
-
-	/* Look if we already have a message view for that header */	
+	/* 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;
 
-	/* If not, create a new window */
-	if (!win) {
-		gchar *account;
-
-		account =  g_strdup(modest_window_get_active_account(MODEST_WINDOW(main_window)));
-		if (!account)
-			account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
-
-		sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_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);
-			
-			win = modest_msg_view_window_new_with_header_model (msg, account, model, iter);
-			g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL);
-			g_list_free (sel_list);
-		} else {
-			win = modest_msg_view_window_new (msg, account);
-		}
-		modest_window_mgr_register_window (mgr, win);
-
-		gtk_window_set_transient_for (GTK_WINDOW (win),
-					      GTK_WINDOW (main_window));
+		g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL);
+		g_list_free (sel_list);
 	}
 
-	gtk_widget_show_all (GTK_WIDGET(win));
+	/* 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);
 
-	g_object_unref (G_OBJECT (msg));
-	
-cleanup:
-	g_object_unref (G_OBJECT (folder));
+	/* Free */
+	g_object_unref (mail_op);
 }
 
 void 
@@ -1232,7 +1233,7 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
 	from = modest_account_mgr_get_from_string (account_mgr, account_name);
 
 	/* Create the mail operation */		
-	mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_INFO);
+	mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_INFO, G_OBJECT(edit_window));
 	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation);
 
 	modest_mail_operation_save_to_drafts (mail_operation,
@@ -1298,7 +1299,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 	from = modest_account_mgr_get_from_string (account_mgr, account_name);
 
 	/* Create the mail operation */		
-	mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_SEND);
+	mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_SEND, G_OBJECT(edit_window));
 	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation);
 
 	modest_mail_operation_send_new_mail (mail_operation,
@@ -1519,7 +1520,7 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_windo
 			if (result == GTK_RESPONSE_REJECT) {
 				finished = TRUE;
 			} else {
-				ModestMailOperation *mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_INFO);
+				ModestMailOperation *mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_INFO, G_OBJECT(main_window));
 				TnyFolder *new_folder = NULL;
 
 				modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
@@ -1573,7 +1574,7 @@ modest_ui_actions_on_rename_folder (GtkAction *action,
 		if (folder_name != NULL && strlen (folder_name) > 0) {
 			ModestMailOperation *mail_op;
 
-			mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_INFO);
+			mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_INFO, G_OBJECT(main_window));
 			modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
 							 mail_op);
 
@@ -1613,7 +1614,7 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
 	g_free (message);
 
 	if (response == GTK_RESPONSE_OK) {
-		ModestMailOperation *mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_DELETE);
+		ModestMailOperation *mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_DELETE, G_OBJECT(main_window));
 
 		modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
 						 mail_op);
@@ -1884,17 +1885,19 @@ modest_ui_actions_on_change_fullscreen (GtkAction *action,
 	gtk_window_present (GTK_WINDOW (window));
 }
 
-/*
- * Show the header details in a ModestDetailsDialog widget
+/* 
+ * Used by modest_ui_actions_on_details to call do_headers_action 
  */
 static void
-show_header_details (TnyHeader *header, 
-		     GtkWindow *window)
+headers_action_show_details (TnyHeader *header, 
+			     ModestWindow *window,
+			     gpointer user_data)
+
 {
 	GtkWidget *dialog;
 	
 	/* Create dialog */
-	dialog = modest_details_dialog_new_with_header (window, header);
+	dialog = modest_details_dialog_new_with_header (GTK_WINDOW (window), header);
 
 	/* Run dialog */
 	gtk_widget_show_all (dialog);
@@ -1922,7 +1925,9 @@ show_folder_details (TnyFolder *folder,
 	gtk_widget_destroy (dialog);
 }
 
-
+/*
+ * Show the header details in a ModestDetailsDialog widget
+ */
 void     
 modest_ui_actions_on_details (GtkAction *action, 
 			      ModestWindow *win)
@@ -1945,7 +1950,7 @@ modest_ui_actions_on_details (GtkAction *action,
 			iter = tny_list_create_iterator (headers_list);
 
 			header = TNY_HEADER (tny_iterator_get_current (iter));
-			show_header_details (header, GTK_WINDOW (win));
+			headers_action_show_details (header, win, NULL);
 			g_object_unref (header);
 
 			g_object_unref (iter);
@@ -1970,23 +1975,8 @@ modest_ui_actions_on_details (GtkAction *action,
 		} else {
 			header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
 									   MODEST_WIDGET_TYPE_HEADER_VIEW);
-			if (!gtk_widget_is_focus (header_view))
-				return;
-
-			headers_list = get_selected_headers (win);
-			if (!headers_list)
-				return;
-
-			iter = tny_list_create_iterator (headers_list);
-			while (!tny_iterator_is_done (iter)) {
-
-				header = TNY_HEADER (tny_iterator_get_current (iter));
-				show_header_details (header, GTK_WINDOW (win));
-				g_object_unref (header);
-
-				tny_iterator_next (iter);
-			}
-			g_object_unref (iter);
+			/* Show details of each header */
+			do_headers_action (win, headers_action_show_details, header_view);
 		}
 	}
 }
@@ -2236,7 +2226,7 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
 		src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 
 		if (TNY_IS_FOLDER (src_folder)) {
-			mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE);
+			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);
 
@@ -2266,7 +2256,7 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
 
 			/* Transfer messages */
 			if (response == GTK_RESPONSE_OK) {
-				mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE);
+				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);
 
@@ -2333,7 +2323,7 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action,
 			ModestMailOperation *mail_op;
 
 			/* Create mail op */
-			mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE);
+			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);
 			
@@ -2366,3 +2356,32 @@ modest_ui_actions_on_move_to (GtkAction *action,
 							      MODEST_MSG_VIEW_WINDOW (win));
 }
 
+/*
+ * Calls #HeadersFunc for each header already selected in the main
+ * window or the message currently being shown in the msg view window
+ */
+static void
+do_headers_action (ModestWindow *win, 
+		   HeadersFunc func,
+		   gpointer user_data)
+{
+	TnyList *headers_list;
+	TnyIterator *iter;
+
+	/* Get headers */
+	headers_list = get_selected_headers (win);
+	if (!headers_list)
+		return;
+
+	/* Call the function for each header */
+	iter = tny_list_create_iterator (headers_list);
+	while (!tny_iterator_is_done (iter)) {
+		TnyHeader *header;
+
+		header = TNY_HEADER (tny_iterator_get_current (iter));
+		func (header, win, user_data);
+		g_object_unref (header);
+		tny_iterator_next (iter);
+	}
+	g_object_unref (iter);
+}