X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=e0cb74fb209e83ce545b23cb63464201d287cbe8;hp=7d397c537aaece13eebffb94be4f054d7792594a;hb=8376cf7ef539a483f17fc1e4d88a5ac91acaa24a;hpb=bbf2c5798714d38d55e3ad6b1854fed83f471bf6

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 7d397c5..e0cb74f 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -145,7 +145,7 @@ static void
 run_account_setup_wizard (ModestWindow *win)
 {
 	ModestEasysetupWizardDialog *wizard;
-
+	
 	g_return_if_fail (MODEST_IS_WINDOW(win));
 	
 	wizard = modest_easysetup_wizard_dialog_new ();
@@ -288,7 +288,10 @@ void modest_ui_actions_refresh_message_window_after_delete (ModestMsgViewWindow*
 		modest_msg_view_window_first_message_selected (win)) {
 		modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (win));
 	} else {
-		modest_msg_view_window_select_next_message (win);
+		if (!modest_msg_view_window_select_next_message (win)) {
+			gboolean ret_value;
+			g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value);
+		}
 	}
 }
 
@@ -315,6 +318,8 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
 			return;
 	}
 	
+	/* Get the headers, either from the header view (if win is the main window),
+	 * or from the message view window: */
 	header_list = get_selected_headers (win);
 	if (!header_list) return;
 
@@ -1043,13 +1048,13 @@ reply_forward_cb (ModestMailOperation *mail_op,
 	switch (rf_helper->action) {
 	case ACTION_REPLY:
 		new_msg = 
-			modest_tny_msg_create_reply_msg (msg,  from, signature,
+			modest_tny_msg_create_reply_msg (msg, header, 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 (msg, header, from, signature, rf_helper->reply_forward_type,
 							 MODEST_TNY_MSG_REPLY_MODE_ALL);
 		edit_type = MODEST_EDIT_TYPE_REPLY;
 		break;
@@ -1101,7 +1106,6 @@ cleanup:
 	if (account)
 		g_object_unref (G_OBJECT (account));
 /* 	g_object_unref (msg); */
-	g_object_unref (header);
 	free_reply_forward_helper (rf_helper);
 }
 
@@ -1172,7 +1176,8 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
 	TnyList *header_list = NULL;
 	ReplyForwardHelper *rf_helper = NULL;
 	guint reply_forward_type;
-	gboolean continue_download;
+	gboolean continue_download = TRUE;
+	gboolean do_retrieve = TRUE;
 	
 	g_return_if_fail (MODEST_IS_WINDOW(win));
 
@@ -1186,17 +1191,20 @@ reply_forward (ReplyForwardAction action, ModestWindow *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);
+
 	/* Check that the messages have been previously downloaded */
-	continue_download = download_uncached_messages (header_list, GTK_WINDOW (win), TRUE);
+	do_retrieve = (action == ACTION_FORWARD) || (reply_forward_type != MODEST_TNY_MSG_REPLY_TYPE_CITE);
+	if (do_retrieve)
+		continue_download = download_uncached_messages (header_list, GTK_WINDOW (win), TRUE);
 	if (!continue_download) {
 		g_object_unref (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
@@ -1224,46 +1232,49 @@ reply_forward (ReplyForwardAction action, ModestWindow *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_cb (NULL, header, msg, rf_helper);
 		}
+		if (header)
+			g_object_unref (header);
 	} else {
 		TnyHeader *header;
 		TnyIterator *iter;
 
-		/* Retrieve messages */
-		mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
-									 G_OBJECT(win),
-									 modest_ui_actions_get_msgs_full_error_handler, 
-									 NULL);
-		modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-
 		/* Only reply/forward to one message */
 		iter = tny_list_create_iterator (header_list);
 		header = TNY_HEADER (tny_iterator_get_current (iter));
 		g_object_unref (iter);
 
 		if (header) {
-			modest_mail_operation_get_msg (mail_op,
-					       header,
-					       reply_forward_cb,
-					       rf_helper);
+			/* Retrieve messages */
+			if (do_retrieve) {
+				mail_op = modest_mail_operation_new_with_error_handling (
+					MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
+					G_OBJECT(win),
+					modest_ui_actions_get_msgs_full_error_handler, 
+					NULL);
+				modest_mail_operation_queue_add (
+					modest_runtime_get_mail_operation_queue (), mail_op);
+				
+				modest_mail_operation_get_msg (mail_op,
+							       header,
+							       reply_forward_cb,
+							       rf_helper);
+				/* Clean */
+				g_object_unref(mail_op);
+			} else {
+				/* we put a ref here to prevent double unref as the reply
+				 * forward callback unrefs the header at its end */
+				reply_forward_cb (NULL, header, NULL, rf_helper);
+			}
 
-/* 			modest_mail_operation_get_msgs_full (mail_op,  */
-/* 						     header_list,  */
-/* 						     reply_forward_cb,  */
-/* 						     rf_helper,  */
-/* 						     free_reply_forward_helper); */
 
 			g_object_unref (header);
 		}
 
-		/* Clean */
-		g_object_unref(mail_op);
 	}
 
 	/* Free */
@@ -1613,6 +1624,20 @@ modest_ui_actions_on_header_selected (ModestHeaderView *header_view,
 	g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 	g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view));
 	
+	/* in the case the folder is empty, show the empty folder message and focus
+	 * folder view */
+	if (!header && gtk_widget_is_focus (GTK_WIDGET (header_view))) {
+		if (modest_header_view_is_empty (header_view)) {
+			TnyFolder *folder = modest_header_view_get_folder (header_view);
+			GtkWidget *folder_view = 
+				modest_main_window_get_child_widget (main_window,
+								     MODEST_WIDGET_TYPE_FOLDER_VIEW);
+			if (folder != NULL) 
+				modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), folder, FALSE);
+			gtk_widget_grab_focus (GTK_WIDGET (folder_view));
+			return;
+		}
+	}
 	/* If no header has been selected then exit */
 	if (!header)
 		return;
@@ -1958,7 +1983,8 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 		account_name = modest_account_mgr_get_default_account (account_mgr);
 		
 	if (!account_name) {
-		g_printerr ("modest: no account found\n");
+		/* Run account setup wizard */
+		run_account_setup_wizard(MODEST_WINDOW(edit_window));
 		return;
 	}
 	
@@ -1974,9 +2000,8 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 				      (modest_runtime_get_account_store(),
 				       account_name));
 	if (!transport_account) {
-		g_printerr ("modest: no transport account found for '%s'\n", account_name);
-		g_free (account_name);
-		modest_msg_edit_window_free_msg_data (edit_window, data);
+		/* Run account setup wizard */
+		run_account_setup_wizard(MODEST_WINDOW(edit_window));
 		return;
 	}
 	
@@ -2435,9 +2460,15 @@ void
 modest_ui_actions_on_delete_folder (GtkAction *action,
 				     ModestMainWindow *main_window)
 {
+	GtkWidget *folder_view;
 	g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
 	delete_folder (main_window, FALSE);
+	folder_view = modest_main_window_get_child_widget (main_window,
+							   MODEST_WIDGET_TYPE_FOLDER_VIEW);
+	if (!folder_view)
+		return;
+	modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view));
 }
 
 void 
@@ -3628,6 +3659,9 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder,
 {
 	TnyList *headers = NULL;
 	gint response = 0;
+	TnyAccount *dst_account = NULL;
+	const gchar *proto_str = NULL;
+	gboolean dst_is_pop = FALSE;
 
 	if (!TNY_IS_FOLDER (dst_folder)) {
 		modest_platform_information_banner (GTK_WIDGET (win),
@@ -3636,9 +3670,25 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder,
 		return;
 	}
 
+	dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder));
+	proto_str = tny_account_get_proto (dst_account);
+	dst_is_pop = (modest_protocol_info_get_transport_store_protocol (proto_str) == 
+		      MODEST_PROTOCOL_STORE_POP);
+	g_object_unref (dst_account);
+
 	/* Get selected headers */
 	headers = get_selected_headers (MODEST_WINDOW (win));
 
+	if (dst_is_pop) {
+		modest_platform_information_banner (GTK_WIDGET (win),
+						    NULL,
+						    ngettext("mail_in_ui_folder_move_target_error",
+							     "mail_in_ui_folder_move_targets_error",
+							     tny_list_get_length (headers)));
+		g_object_unref (headers);
+		return;
+	}
+
 	/* Ask for user confirmation */
 	response = msgs_move_to_confirmation (GTK_WINDOW (win), 
 					      TNY_FOLDER (dst_folder),