X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=e0e4bffe04f4611ddc17b0ac5bb3882cd1aee84a;hb=5ae42e29904ef64c4385d848e49c28841a94ba36;hp=24325fd6ba8d217d2635823e3273a93254220114;hpb=da1af70d58a7dc930648d1d591779fad52f5cb8d;p=modest

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 24325fd..e0e4bff 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -35,6 +35,8 @@
 #include <string.h>
 #include <modest-runtime.h>
 #include <modest-tny-msg.h>
+#include <modest-tny-account.h>
+
 #include "modest-ui-actions.h"
 
 #include "modest-tny-platform-factory.h"
@@ -53,7 +55,7 @@
 
 
 typedef struct _GetMsgAsyncHelper {
-	ModestMainWindow *main_window;
+	ModestWindow *window;
 	TnyIterator *iter;
 	GFunc func;
 	gpointer user_data;
@@ -68,7 +70,7 @@ typedef enum _ReplyForwardAction {
 typedef struct _ReplyForwardHelper {
 guint reply_forward_type;
 	ReplyForwardAction action;
-	gchar *account;
+	gchar *account_name;
 } ReplyForwardHelper;
 
 
@@ -113,31 +115,35 @@ get_selected_headers (ModestWindow *win)
 {
 	if (MODEST_IS_MAIN_WINDOW(win)) {
 		GtkWidget *header_view;		
-
+		
 		header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win),
 								   MODEST_WIDGET_TYPE_HEADER_VIEW);
 		return modest_header_view_get_selected_headers (MODEST_HEADER_VIEW(header_view));
-
+		
 	} else if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
 		/* for MsgViewWindows, we simply return a list with one element */
 		TnyMsg *msg;
-		TnyList *list;
+		TnyHeader *header;
+		TnyList *list = NULL;
 		
 		msg  = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW(win));
-		list = tny_simple_list_new ();
-		tny_list_prepend (list, G_OBJECT(msg));
-
+		if (msg) {
+			header = tny_msg_get_header (msg);
+			list = tny_simple_list_new ();
+			tny_list_prepend (list, G_OBJECT(header));
+			g_object_unref (G_OBJECT(header));
+		}
 		return list;
+
 	} else
 		return NULL;
-
 }
+
 void
 modest_ui_actions_on_delete (GtkWidget *widget, ModestWindow *win)
 {
 	TnyList *header_list;
 	TnyIterator *iter;
-//	GtkTreeModel *model;
 
 	g_return_if_fail (MODEST_IS_WINDOW(win));
 		
@@ -145,9 +151,6 @@ modest_ui_actions_on_delete (GtkWidget *widget, ModestWindow *win)
 	
 	if (header_list) {
 		iter = tny_list_create_iterator (header_list);
-/* 		model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); */
-/* 		if (GTK_IS_TREE_MODEL_SORT (model)) */
-/* 			model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (model)); */
 		do {
 			TnyHeader *header;
 			ModestMailOperation *mail_op;
@@ -159,18 +162,15 @@ modest_ui_actions_on_delete (GtkWidget *widget, ModestWindow *win)
 
 			/* TODO: add confirmation dialog */
 
-			/* Move to trash */
-			modest_mail_operation_remove_msg (mail_op, header, TRUE);
+			/* Move to trash. TODO: Still not supported */
+			modest_mail_operation_remove_msg (mail_op, header, FALSE);
 
-			/* Remove from tree model */
-			if (modest_mail_operation_get_status (mail_op) ==
+			if (modest_mail_operation_get_status (mail_op) !=
 			    MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
-/* 				tny_list_remove (TNY_LIST (model), G_OBJECT (header)); */
-			} else {
-				/* TODO: error handling management */
 				const GError *error;
 				error = modest_mail_operation_get_error (mail_op);
-				g_warning (error->message);
+				if (error)
+					g_warning (error->message);
 			}
 
 			g_object_unref (G_OBJECT (mail_op));
@@ -206,40 +206,73 @@ void
 modest_ui_actions_on_new_msg (GtkWidget *widget, ModestWindow *win)
 {
 	ModestWindow *msg_win;
-	TnyMsg *msg;
-	gchar *account;
-	gchar *from_str;
+	TnyMsg *msg = NULL;
+	TnyFolder *folder = NULL;
+	gchar *account_name = NULL;
+	gchar *from_str = NULL;
+	GError *err = NULL;
+	TnyAccount *account;
+	
+	account_name = g_strdup(modest_window_get_active_account (win));
+	if (!account_name)
+		account_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
+	
+	account = modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
+								       account_name,
+								       TNY_ACCOUNT_TYPE_STORE);
+	if (!account) {
+		g_printerr ("modest: failed to get tnyaccount for '%s'\n", account_name);
+		goto cleanup;
+	}
 
-	account = g_strdup(modest_window_get_active_account (win));
-	if (!account)
-		account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
+	from_str = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), account_name);
+
+	msg    = modest_tny_msg_new ("", from_str, "", "", "", "", NULL);
+	if (!msg) {
+		g_printerr ("modest: failed to create new msg\n");
+		goto cleanup;
+	}
 	
-	from_str = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
-						       account);
+	folder = modest_tny_account_get_special_folder (account, TNY_FOLDER_TYPE_DRAFTS);
+	if (!folder) {
+		g_printerr ("modest: failed to find Drafts folder\n");
+		goto cleanup;
+	}
 	
-	msg = modest_tny_msg_new ("", from_str, "", "", "", "", NULL);
-	msg_win = modest_msg_edit_window_new (msg, account);
+	tny_folder_add_msg (folder, msg, &err);
+	if (err) {
+		g_printerr ("modest: error adding msg to Drafts folder: %s",
+			    err->message);
+		g_error_free (err);
+		goto cleanup;
+	}
+
+	msg_win = modest_msg_edit_window_new (msg, account_name);
 	if (win)
 		gtk_window_set_transient_for (GTK_WINDOW (msg_win),
 					      GTK_WINDOW (win));	
-	g_free (account);
-	g_free (from_str);
-	g_object_unref (G_OBJECT(msg));
-	
 	gtk_widget_show_all (GTK_WIDGET (msg_win));
+
+cleanup:
+	g_free (account_name);
+	g_free (from_str);
+	if (account)
+		g_object_unref (G_OBJECT(account));
+	if (msg)
+		g_object_unref (G_OBJECT(msg));
+	if (folder)
+		g_object_unref (G_OBJECT(folder));
 }
 
 
 void
 modest_ui_actions_on_open (GtkWidget *widget, ModestWindow *win)
 {
-	/* FIXME */
-	
+	modest_runtime_not_implemented (GTK_WINDOW(win)); /* FIXME */
 }
 
 
 
-
 static void
 reply_forward_func (gpointer data, gpointer user_data)
 {
@@ -249,19 +282,21 @@ reply_forward_func (gpointer data, gpointer user_data)
 	ModestWindow *msg_win;
 	ModestEditType edit_type;
 	gchar *from;
+	GError *err = NULL;
+	TnyFolder *folder = NULL;
+	TnyAccount *account = NULL;
 	
 	msg = TNY_MSG (data);
 	helper = (GetMsgAsyncHelper *) user_data;
 	rf_helper = (ReplyForwardHelper *) helper->user_data;
 
 	from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
-						   rf_helper->account);
+						   rf_helper->account_name);
 	/* Create reply mail */
 	switch (rf_helper->action) {
 	case ACTION_REPLY:
 		new_msg = 
-			modest_mail_operation_create_reply_mail (msg, 
-								 from, 
+			modest_mail_operation_create_reply_mail (msg,  from, 
 								 rf_helper->reply_forward_type,
 								 MODEST_MAIL_OPERATION_REPLY_MODE_SENDER);
 		break;
@@ -278,25 +313,51 @@ reply_forward_func (gpointer data, gpointer user_data)
 		break;
 	default:
 		g_return_if_reached ();
+		return;
 	}
 
 	if (!new_msg) {
-		g_warning ("Unable to create a message");
+		g_printerr ("modest: failed to create message\n");
 		goto cleanup;
 	}
-		
+
+	account = modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
+								       rf_helper->account_name,
+								       TNY_ACCOUNT_TYPE_STORE);
+	if (!account) {
+		g_printerr ("modest: failed to get tnyaccount for '%s'\n", rf_helper->account_name);
+		goto cleanup;
+	}
+
+	folder = modest_tny_account_get_special_folder (account, TNY_FOLDER_TYPE_DRAFTS);
+	if (!folder) {
+		g_printerr ("modest: failed to find Drafts folder\n");
+		goto cleanup;
+	}
+	
+	tny_folder_add_msg (folder, msg, &err);
+	if (err) {
+		g_printerr ("modest: error adding msg to Drafts folder: %s",
+			    err->message);
+		g_error_free (err);
+		goto cleanup;
+	}	
+			
 	/* Show edit window */
-	msg_win = modest_msg_edit_window_new (new_msg, rf_helper->account);
+	msg_win = modest_msg_edit_window_new (new_msg, rf_helper->account_name);
 	gtk_widget_show_all (GTK_WIDGET (msg_win));
-	
-	/* Clean */
-	g_object_unref (G_OBJECT (new_msg));
 
- cleanup:
-	g_free (rf_helper->account);
+cleanup:
+	if (new_msg)
+		g_object_unref (G_OBJECT (new_msg));
+	if (folder)
+		g_object_unref (G_OBJECT (folder));
+	if (account)
+		g_object_unref (G_OBJECT (account));
+	
+	g_free (rf_helper->account_name);
 	g_slice_free (ReplyForwardHelper, rf_helper);
 }
-
 /*
  * Common code for the reply and forward actions
  */
@@ -309,17 +370,16 @@ reply_forward (GtkWidget *widget, ReplyForwardAction action, ModestWindow *win)
 	TnyFolder *folder;
 	GetMsgAsyncHelper *helper;
 	ReplyForwardHelper *rf_helper;
-
+	
 	g_return_if_fail (MODEST_IS_WINDOW(win));
 
-	header_list = get_selected_headers (win);	
+	header_list = get_selected_headers (win);
 	if (!header_list)
 		return;
 	
 	reply_forward_type = modest_conf_get_int (modest_runtime_get_conf (),
 						  (action == ACTION_FORWARD) ? MODEST_CONF_FORWARD_TYPE : MODEST_CONF_REPLY_TYPE,
 						  NULL);
-
 	/* We assume that we can only select messages of the
 	   same folder and that we reply all of them from the
 	   same account. In fact the interface currently only
@@ -329,25 +389,42 @@ reply_forward (GtkWidget *widget, ReplyForwardAction action, ModestWindow *win)
 	rf_helper = g_slice_new0 (ReplyForwardHelper);
 	rf_helper->reply_forward_type = reply_forward_type;
 	rf_helper->action = action;
-	rf_helper->account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());;
+
+	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->main_window = NULL;
+	helper->window = win;
 	helper->func = reply_forward_func;
 	helper->iter = tny_list_create_iterator (header_list);
 	helper->user_data = rf_helper;
-	
-	header = TNY_HEADER (tny_iterator_get_current (helper->iter));
-	folder = tny_header_get_folder (header);
-	
-	/* The callback will call it per each header */
-	tny_folder_get_msg_async (folder, header, get_msg_cb, helper);
-	
-	/* Clean */
-	g_object_unref (G_OBJECT (header));
-	g_object_unref (G_OBJECT (folder));
+
+	if (MODEST_IS_MSG_VIEW_WINDOW(win)) {
+		TnyMsg *msg;
+		msg = modest_msg_view_window_get_message(MODEST_MSG_VIEW_WINDOW(win));
+		if (!msg) {
+			g_printerr ("modest: no message found\n");
+			return;
+		} else
+			reply_forward_func (msg, 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, helper);
+			g_object_unref (G_OBJECT (folder));
+		} else 
+			g_printerr ("modest: no folder for header\n");
+		
+		/* Clean */
+		g_object_unref (G_OBJECT (header));
+	}
 }
 
+
 void
 modest_ui_actions_on_reply (GtkWidget *widget, ModestWindow *win)
 {
@@ -406,17 +483,33 @@ modest_ui_actions_on_prev (GtkWidget *widget,
 void
 modest_ui_actions_on_send_receive (GtkWidget *widget,  ModestWindow *win)
 {
-	TnyDevice *device;
-	TnyAccountStore *account_store;
-	
-	/* Get device. Do not ask the platform factory for it, because
-	   it returns always a new one */
-	account_store = TNY_ACCOUNT_STORE (modest_runtime_get_account_store ());
-	device = tny_account_store_get_device (account_store);
+	gchar *account_name;
+	TnyAccount *tny_account;
+	ModestTnySendQueue *send_queue;
 	
-	tny_device_force_online (device);
+	account_name =
+		g_strdup(modest_window_get_active_account(MODEST_WINDOW(win)));
+	if (!account_name)
+		account_name  = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
+	if (!account_name) {
+		g_printerr ("modest: cannot get account\n");
+		return;
+	}
 	
-	/* FIXME: refresh the folders */
+	tny_account = 
+		modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
+								     account_name,
+								     TNY_ACCOUNT_TYPE_TRANSPORT);
+	if (!tny_account) {
+		g_printerr ("modest: cannot get tny transport account\n");
+		return;
+	}
+
+	send_queue = modest_tny_send_queue_new (TNY_CAMEL_TRANSPORT_ACCOUNT(tny_account));
+	modest_tny_send_queue_flush (send_queue);
+
+	g_object_unref (G_OBJECT(send_queue));
+	g_object_unref (G_OBJECT(tny_account));
 }
 
 
@@ -469,7 +562,7 @@ read_msg_func (gpointer data, gpointer user_data)
 	msg = TNY_MSG (data);
 	helper = (GetMsgAsyncHelper *) user_data;
 
-	msg_preview = modest_main_window_get_child_widget (helper->main_window,
+	msg_preview = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (helper->window),
 							   MODEST_WIDGET_TYPE_MSG_PREVIEW);
 	if (!msg_preview)
 		return;
@@ -501,13 +594,9 @@ get_msg_cb (TnyFolder *folder, TnyMsg *msg, GError **err, gpointer user_data)
 	helper = (GetMsgAsyncHelper *) user_data;
 
 	if ((*err && ((*err)->code == TNY_FOLDER_ERROR_GET_MSG)) || !msg) {
-		GtkWidget *header_view =
-			modest_main_window_get_child_widget(helper->main_window,
-							    MODEST_WIDGET_TYPE_HEADER_VIEW);
-		if (header_view)
-			modest_ui_actions_on_item_not_found (MODEST_HEADER_VIEW(header_view),
-							     MODEST_ITEM_TYPE_MESSAGE,
-							     MODEST_WINDOW(helper->main_window));
+		modest_ui_actions_on_item_not_found (NULL,
+						     MODEST_ITEM_TYPE_MESSAGE,
+						     helper->window);
 		return;
 	}
 
@@ -563,7 +652,7 @@ modest_ui_actions_on_header_selected (ModestHeaderView *folder_view,
 
 	/* Fill helper data */
 	helper = g_slice_new0 (GetMsgAsyncHelper);
-	helper->main_window = main_window;
+	helper->window = MODEST_WINDOW (main_window);
 	helper->iter = tny_list_create_iterator (list);
 	helper->func = read_msg_func;
 
@@ -620,13 +709,9 @@ cleanup:
 	if (folder)
 		g_object_unref (G_OBJECT (folder));
 	if (msg)
-		g_object_unref (G_OBJECT (folder));
+		g_object_unref (G_OBJECT (msg));
 }
 
-
-
-
-
 void 
 modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
 					       TnyFolder *folder, 
@@ -729,7 +814,7 @@ statusbar_push (ModestMainWindow *main_window, guint context_id, const gchar *ms
 	if (status_bar) {
 		gtk_widget_show (status_bar);
 		gtk_statusbar_push (GTK_STATUSBAR(status_bar), 0, msg);
-		g_timeout_add (1500, (GSourceFunc)statusbar_clean, status_bar);
+		g_timeout_add (2500, (GSourceFunc)statusbar_clean, status_bar);
 	}
 
 }
@@ -742,19 +827,12 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,ModestItemTyp
 	GtkWidget *dialog;
 	gchar *txt, *item;
 	gboolean online;
-	TnyDevice *device;
-	TnyAccountStore *account_store;
 
 	item = (type == MODEST_ITEM_TYPE_FOLDER) ? "folder" : "message";
 	
-	/* Get device. Do not ask the platform factory for it, because
-	   it returns always a new one */
-	account_store = TNY_ACCOUNT_STORE (modest_runtime_get_account_store ());
-	device = tny_account_store_get_device (account_store);
-
 	if (g_main_depth > 0)	
 		gdk_threads_enter ();
-	online = tny_device_is_online (device);
+	online = tny_device_is_online (modest_runtime_get_device());
 
 	if (online) {
 		/* already online -- the item is simply not there... */
@@ -783,7 +861,7 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,ModestItemTyp
 
 		gtk_window_set_default_size (GTK_WINDOW(dialog), 300, 300);
 		if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
-			tny_device_force_online (device);
+			tny_device_force_online (modest_runtime_get_device());
 		}
 	}
 	gtk_widget_destroy (dialog);
@@ -976,13 +1054,12 @@ modest_ui_actions_on_new_folder (GtkWidget *widget, ModestMainWindow *main_windo
 									  TNY_FOLDER_STORE (parent_folder),
 									  (const gchar *) folder_name);
 			if (new_folder) {
-				/* TODO: tinymail should do this. 
-				   Update view */
-				modest_folder_view_add_subfolder (MODEST_FOLDER_VIEW(folder_view),
-								  new_folder);
-
-				/* Free new folder */
 				g_object_unref (new_folder);
+			} else {
+				const GError *error;
+				error = modest_mail_operation_get_error (mail_op);
+				if (error)
+					g_warning ("Error adding a subfolder: %s\n", error->message);
 			}
 			g_object_unref (mail_op);
 		}
@@ -1021,12 +1098,9 @@ modest_ui_actions_on_rename_folder (GtkWidget *widget,
 							     (const gchar *) folder_name);
 
 			error = modest_mail_operation_get_error (mail_op);
-			if (!error)
-				/* TODO: tinymail should do this. 
-				   Update view */
-				modest_folder_view_rename (MODEST_FOLDER_VIEW(folder_view));
-
-			/* TODO: else ? notify error ? */
+			if (error)
+				/* TODO: notify error ? */
+				g_warning ("Could not rename a folder: %s\n", error->message);
 
 			g_object_unref (mail_op);
 		}
@@ -1040,6 +1114,7 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
 	TnyFolder *folder;
 	ModestMailOperation *mail_op;
 	GtkWidget *folder_view;
+	const GError *error;
 	
 	g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
@@ -1052,6 +1127,11 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
 	
 	mail_op = modest_mail_operation_new ();
 	modest_mail_operation_remove_folder (mail_op, folder, move_to_trash);
+
+	error = modest_mail_operation_get_error (mail_op);
+	if (error)
+		g_warning ("%s\n", error->message);
+
 	g_object_unref (mail_op);
 }
 
@@ -1073,39 +1153,6 @@ modest_ui_actions_on_move_folder_to_trash_folder (GtkWidget *widget, ModestMainW
 }
 
 void
-modest_ui_actions_on_accounts_reloaded (TnyAccountStore *store, gpointer user_data)
-{
-	/* FIXME */
-	/* ModestFolderView *folder_view; */
-	
-/* 	folder_view = modest_widget_factory_get_folder_view (modest_runtime_get_widget_factory()); */
-/* 	modest_folder_view_update_model (folder_view, store); */
-}
-
-void 
-modest_ui_actions_on_folder_moved (ModestFolderView *folder_view,  TnyFolder *folder, 
-				    TnyFolderStore *parent,  gboolean *done,
-				    gpointer user_data)
-{
-	ModestMailOperation *mail_op;
-	const GError *error;
-
-	*done = TRUE;
-
-	/* Try to move the folder */	
-	mail_op = modest_mail_operation_new ();
-	modest_mail_operation_move_folder (mail_op, folder, parent);
-
-	error = modest_mail_operation_get_error (mail_op);
-	if (error)
-		*done = FALSE;
-
-	g_object_unref (G_OBJECT (mail_op));
-}
-
-
-
-void
 modest_ui_actions_on_password_requested (TnyAccountStore *account_store, 
 					 const gchar* account_name,
 					 gchar **password,