gpointer user_data);
static gint header_list_count_uncached_msgs (TnyList *header_list);
-static gboolean connect_to_get_msg (
- GtkWindow *win,
- gint num_of_uncached_msgs);
+
+static gboolean connect_to_get_msg (ModestWindow *win,
+ gint num_of_uncached_msgs,
+ TnyAccount *account);
static gboolean remote_folder_is_pop (const TnyFolderStore *folder);
#endif /* MODEST_PLATFORM_MAEMO */
}
-void
-modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
+TnyMsg *
+modest_ui_actions_create_msg(const gchar *account_name,
+ const gchar *to_str,
+ const gchar *cc_str,
+ const gchar *bcc_str,
+ const gchar *subject_str,
+ const gchar *body_str)
{
- ModestWindow *msg_win = NULL;
TnyMsg *msg = NULL;
- TnyFolder *folder = NULL;
- gchar *account_name = NULL;
- gchar *from_str = NULL;
-/* GError *err = NULL; */
TnyAccount *account = NULL;
- ModestWindowMgr *mgr;
- gchar *signature = NULL, *blank_and_signature = NULL;
+ TnyFolder *folder = NULL;
+ gchar *from_str = NULL, *signature = NULL, *body = NULL;
+ gboolean use_signature = FALSE;
+ ModestAccountMgr *mgr = modest_runtime_get_account_mgr();
+ ModestTnyAccountStore *store = modest_runtime_get_account_store();
- /* if there are no accounts yet, just show the wizard */
- if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE)) {
- if (!modest_ui_actions_run_account_setup_wizard (win))
- return;
- }
-
- 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 ());
- if (!account_name) {
- g_printerr ("modest: no account found\n");
- goto cleanup;
- }
-
- account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store(),
- account_name,
- TNY_ACCOUNT_TYPE_STORE);
+ account = modest_tny_account_store_get_server_account (store, account_name, TNY_ACCOUNT_TYPE_STORE);
if (!account) {
g_printerr ("modest: failed to get tnyaccount for '%s'\n", account_name);
goto cleanup;
}
-
- from_str = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), account_name);
+ 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;
+ }
+ from_str = modest_account_mgr_get_from_string (mgr, account_name);
if (!from_str) {
g_printerr ("modest: failed get from string for '%s'\n", account_name);
goto cleanup;
}
- gboolean use_signature = FALSE;
- signature = modest_account_mgr_get_signature (modest_runtime_get_account_mgr (), account_name, &use_signature);
-
- if (use_signature) {
- blank_and_signature = g_strconcat ("\n", signature, NULL);
+ signature = modest_account_mgr_get_signature (mgr, account_name, &use_signature);
+ if (body_str != NULL) {
+ body = use_signature ? g_strconcat(body_str, "\n", signature, NULL) : g_strdup(body_str);
} else {
- blank_and_signature = g_strdup ("");
+ body = use_signature ? g_strconcat("\n", signature, NULL) : g_strdup("");
}
- g_free (signature);
-
- msg = modest_tny_msg_new ("", from_str, "", "", "", blank_and_signature, NULL);
+ msg = modest_tny_msg_new (to_str, from_str, cc_str, bcc_str, subject_str, body, NULL);
if (!msg) {
g_printerr ("modest: failed to create new msg\n");
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");
+
+cleanup:
+ g_free (from_str);
+ g_free (signature);
+ g_free (body);
+ if (account) g_object_unref (G_OBJECT(account));
+ if (folder) g_object_unref (G_OBJECT(folder));
+
+ return msg;
+}
+
+void
+modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
+{
+ ModestWindow *msg_win = NULL;
+ TnyMsg *msg = NULL;
+ gchar *account_name = NULL;
+ ModestWindowMgr *win_mgr;
+ ModestAccountMgr *acc_mgr = modest_runtime_get_account_mgr();
+
+ /* if there are no accounts yet, just show the wizard */
+ if (!modest_account_mgr_has_accounts (acc_mgr, TRUE)) {
+ if (!modest_ui_actions_run_account_setup_wizard (win)) return;
+ }
+
+ account_name = g_strdup (modest_window_get_active_account (win));
+ if (!account_name) account_name = modest_account_mgr_get_default_account(acc_mgr);
+ if (!account_name) {
+ g_printerr ("modest: no account found\n");
goto cleanup;
}
-
-
+ msg = modest_ui_actions_create_msg(account_name, NULL, NULL, NULL, NULL, NULL);
+ if (msg == NULL) goto cleanup;
+
/* Create and register edit window */
/* This is destroyed by TODO. */
msg_win = modest_msg_edit_window_new (msg, account_name, FALSE);
- mgr = modest_runtime_get_window_mgr ();
- modest_window_mgr_register_window (mgr, msg_win);
+ win_mgr = modest_runtime_get_window_mgr ();
+ modest_window_mgr_register_window (win_mgr, msg_win);
- if (win)
+ if (win) {
gtk_window_set_transient_for (GTK_WINDOW (msg_win),
GTK_WINDOW (win));
+ }
gtk_widget_show_all (GTK_WIDGET (msg_win));
cleanup:
g_free (account_name);
- g_free (from_str);
- g_free (blank_and_signature);
- if (msg_win)
- g_object_unref (msg_win);
- if (account)
- g_object_unref (G_OBJECT(account));
- if (msg)
- g_object_unref (G_OBJECT(msg));
- if (folder)
- g_object_unref (G_OBJECT(folder));
+ if (msg_win) g_object_unref (msg_win);
+ if (msg) g_object_unref (G_OBJECT(msg));
}
gboolean
/* Mark header as read */
headers_action_mark_as_read (header, MODEST_WINDOW(parent_win), NULL);
+ /* 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_or_mmc_folder_type (folder);
+ }
+
/* Get account */
- account = g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_win)));
+ if (!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 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_or_mmc_folder_type (folder);
-
/* If the header is in the drafts folder then open the editor,
else the message view window */
- if ((folder_type == TNY_FOLDER_TYPE_DRAFTS) ||
- (folder_type == TNY_FOLDER_TYPE_OUTBOX)) {
+ if (folder_type == TNY_FOLDER_TYPE_DRAFTS) {
+ ModestAccountMgr *mgr = modest_runtime_get_account_mgr ();
+ const gchar *from_header = NULL;
+
+ from_header = tny_header_get_from (header);
+
/* we cannot edit without a valid account... */
- if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) {
+ if (!modest_account_mgr_has_accounts(mgr, TRUE)) {
if (!modest_ui_actions_run_account_setup_wizard(parent_win))
goto cleanup;
}
+
+ if (from_header) {
+ GSList *accounts = modest_account_mgr_account_names (mgr, TRUE);
+ GSList *node = NULL;
+ for (node = accounts; node != NULL; node = g_slist_next (node)) {
+ gchar *from = modest_account_mgr_get_from_string (mgr, node->data);
+
+ if (from && (strcmp (from_header, from) == 0)) {
+ g_free (account);
+ account = g_strdup (node->data);
+ g_free (from);
+ break;
+ }
+ g_free (from);
+ }
+ g_slist_foreach (accounts, (GFunc) g_free, NULL);
+ g_slist_free (accounts);
+ }
+
win = modest_msg_edit_window_new (msg, account, TRUE);
g_object_unref (folder);
}
+
+static void
+open_msg_error_handler (ModestMailOperation *mail_op,
+ gpointer user_data)
+{
+ /* Show the message error */
+ GObject *win = modest_mail_operation_get_source (mail_op);
+
+ modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL,
+ (gchar *) user_data);
+ if (win)
+ g_object_unref (win);
+}
+
void
modest_ui_actions_get_msgs_full_error_handler (ModestMailOperation *mail_op,
gpointer user_data)
GObject *win = modest_mail_operation_get_source (mail_op);
error = modest_mail_operation_get_error (mail_op);
-/* printf ("DEBUG: %s: Error: code=%d, text=%s\n", __FUNCTION__, error->code, error->message); */
if (error->code == MODEST_MAIL_OPERATION_ERROR_MESSAGE_SIZE_LIMIT) {
g_object_unref (win);
}
+/**
+ * Returns the account a list of headers belongs to. It returns a
+ * *new* reference so don't forget to unref it
+ */
+static TnyAccount*
+get_account_from_header_list (TnyList *headers)
+{
+ TnyAccount *account = NULL;
+
+ if (tny_list_get_length (headers) > 0) {
+ TnyIterator *iter = tny_list_create_iterator (headers);
+ TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+ TnyFolder *folder = tny_header_get_folder (header);
+ account = tny_folder_get_account (folder);
+ g_object_unref (folder);
+ g_object_unref (header);
+ g_object_unref (iter);
+ }
+ return account;
+}
+
/*
* This function is used by both modest_ui_actions_on_open and
* modest_ui_actions_on_header_activated. This way we always do the
_modest_ui_actions_open (TnyList *headers, ModestWindow *win)
{
ModestWindowMgr *mgr = NULL;
- TnyIterator *iter = NULL;
+ TnyIterator *iter = NULL, *iter_not_opened = NULL;
ModestMailOperation *mail_op = NULL;
TnyList *not_opened_headers = NULL;
TnyHeaderFlags flags = 0;
+ TnyAccount *account;
g_return_if_fail (headers != NULL);
return;
}
+ mgr = modest_runtime_get_window_mgr ();
+ iter = tny_list_create_iterator (headers);
+ /* Get the account */
+ account = get_account_from_header_list (headers);
+
/* 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);
not_opened_headers = tny_simple_list_new ();
-
while (!tny_iterator_is_done (iter)) {
ModestWindow *window = NULL;
}
g_object_unref (iter);
iter = NULL;
+
+ /* Open each message */
+ if (tny_list_get_length (not_opened_headers) == 0)
+ goto cleanup;
/* If some messages would have to be downloaded, ask the user to
* make a connection. It's generally easier to do this here (in the mainloop)
}
g_object_unref (iter);
- if (found && !modest_platform_connect_and_wait (GTK_WINDOW (win), NULL)) {
- g_object_unref (not_opened_headers);
- return;
- }
+ /* Ask the user if there are any uncached messages */
+ if (found && !connect_to_get_msg (win,
+ header_list_count_uncached_msgs (not_opened_headers),
+ account))
+ goto cleanup;
}
/* Register the headers before actually creating the windows: */
- TnyIterator *iter_not_opened = tny_list_create_iterator (not_opened_headers);
+ iter_not_opened = tny_list_create_iterator (not_opened_headers);
while (!tny_iterator_is_done (iter_not_opened)) {
TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter_not_opened));
if (header) {
- modest_window_mgr_register_header (mgr, header);
+ modest_window_mgr_register_header (mgr, header, NULL);
g_object_unref (header);
- }
-
+ }
tny_iterator_next (iter_not_opened);
}
g_object_unref (iter_not_opened);
iter_not_opened = NULL;
-
- /* Open each message */
- if (tny_list_get_length (not_opened_headers) > 0) {
+
+ /* Create the mail operation */
+ if (tny_list_get_length (not_opened_headers) > 1) {
mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (win),
modest_ui_actions_get_msgs_full_error_handler,
- NULL);
+ NULL, NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
- if (tny_list_get_length (not_opened_headers) > 1) {
- modest_mail_operation_get_msgs_full (mail_op,
- not_opened_headers,
- open_msg_cb,
- NULL,
- NULL);
+
+ modest_mail_operation_get_msgs_full (mail_op,
+ not_opened_headers,
+ open_msg_cb,
+ NULL,
+ NULL);
+ } else {
+ TnyIterator *iter = tny_list_create_iterator (not_opened_headers);
+ TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+ const gchar *proto_name;
+ gchar *error_msg;
+ ModestTransportStoreProtocol proto;
+
+ /* Get the error message depending on the protocol */
+ proto_name = tny_account_get_proto (account);
+ if (proto_name != NULL) {
+ proto = modest_protocol_info_get_transport_store_protocol (proto_name);
} else {
- TnyIterator *iter = tny_list_create_iterator (not_opened_headers);
- TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
- modest_mail_operation_get_msg (mail_op, header, open_msg_cb, NULL);
- g_object_unref (header);
- g_object_unref (iter);
+ proto = MODEST_PROTOCOL_STORE_MAILDIR;
}
- g_object_unref (mail_op);
+
+ if (proto == MODEST_PROTOCOL_STORE_POP) {
+ error_msg = g_strdup (_("emev_ni_ui_pop3_msg_recv_error"));
+ } else if (proto == MODEST_PROTOCOL_STORE_IMAP) {
+ error_msg = g_strdup_printf (_("emev_ni_ui_imap_message_not_available_in_server"),
+ tny_header_get_subject (header));
+ } else {
+ error_msg = g_strdup (_("mail_ni_ui_folder_get_msg_folder_error"));
+ }
+
+ /* Create and call the mail operation */
+ mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (win),
+ open_msg_error_handler,
+ error_msg,
+ g_free);
+ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+
+ modest_mail_operation_get_msg (mail_op, header, open_msg_cb, NULL);
+
+ g_object_unref (header);
+ g_object_unref (iter);
}
+ g_object_unref (mail_op);
+cleanup:
/* Clean */
- if (not_opened_headers != NULL)
+ if (account)
+ g_object_unref (account);
+ if (not_opened_headers)
g_object_unref (not_opened_headers);
}
* messages. Returns TRUE if the user allowed the download.
*/
static gboolean
-connect_to_get_msg (GtkWindow *win,
- gint num_of_uncached_msgs)
+connect_to_get_msg (ModestWindow *win,
+ gint num_of_uncached_msgs,
+ TnyAccount *account)
{
+ GtkResponseType response;
+
/* Allways download if we are online. */
if (tny_device_is_online (modest_runtime_get_device ()))
return TRUE;
/* If offline, then ask for user permission to download the messages */
- GtkResponseType response;
response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
ngettext("mcen_nc_get_msg",
"mcen_nc_get_msgs",
num_of_uncached_msgs));
+
if (response == GTK_RESPONSE_CANCEL)
return FALSE;
- return modest_platform_connect_and_wait(win, NULL);
+ return modest_platform_connect_and_wait(GTK_WINDOW (win), account);
}
/*
if (do_retrieve){
gint num_of_unc_msgs;
+
/* check that the messages have been previously downloaded */
num_of_unc_msgs = header_list_count_uncached_msgs(header_list);
/* If there are any uncached message ask the user
* whether he/she wants to download them. */
- if (num_of_unc_msgs)
- continue_download = connect_to_get_msg (
- GTK_WINDOW (win),
- num_of_unc_msgs);
+ if (num_of_unc_msgs) {
+ TnyAccount *account = get_account_from_header_list (header_list);
+ continue_download = connect_to_get_msg (win, num_of_unc_msgs, account);
+ g_object_unref (account);
+ }
}
if (!continue_download) {
if (header) {
/* Retrieve messages */
if (do_retrieve) {
- mail_op = modest_mail_operation_new_with_error_handling (
- G_OBJECT(win),
- modest_ui_actions_get_msgs_full_error_handler,
- NULL);
+ mail_op =
+ modest_mail_operation_new_with_error_handling (G_OBJECT(win),
+ modest_ui_actions_get_msgs_full_error_handler,
+ NULL, NULL);
modest_mail_operation_queue_add (
modest_runtime_get_mail_operation_queue (), mail_op);
TnyList *new_headers,
gpointer user_data)
{
- ModestMainWindow *win = NULL;
- GtkWidget *folder_view = NULL;
- TnyFolderStore *folder = NULL;
- gboolean folder_empty = FALSE;
-
- g_return_if_fail (MODEST_IS_MAIN_WINDOW (user_data));
- win = MODEST_MAIN_WINDOW (user_data);
-
- /* Don't do anything if there are not new headers, this could
- happen if there was any problem with the mail operation */
- if (!new_headers)
- return;
-
- /* Set contents style of headers view */
- if (modest_main_window_get_contents_style (win) == MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY) {
- folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
- MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
- folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
-
-
- folder_empty = (tny_folder_get_all_count (TNY_FOLDER (folder)) == 0);
-
- if (!folder_empty)
- modest_main_window_set_contents_style (win,
- MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS);
- }
-
/* Notify new messages have been downloaded */
- if ((new_headers != NULL) && (tny_list_get_length (new_headers) > 0)) {
- TnyIterator *iter = tny_list_create_iterator (new_headers);
- do {
- TnyHeader *header = NULL;
-
- header = TNY_HEADER (tny_iterator_get_current (iter));
- modest_platform_on_new_header_received (header);
- g_object_unref (header);
-
- tny_iterator_next (iter);
- } while (!tny_iterator_is_done (iter));
- g_object_unref (iter);
- }
+ if ((new_headers != NULL) && (tny_list_get_length (new_headers) > 0))
+ modest_platform_on_new_headers_received (new_headers);
}
/*
mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (win),
modest_ui_actions_send_receive_error_handler,
- NULL);
+ NULL, NULL);
g_signal_connect (G_OBJECT(mail_op), "operation-finished",
G_CALLBACK (on_send_receive_finished),
account_names = NULL;
}
-void
-modest_do_refresh_current_folder(ModestWindow *win)
+static void
+refresh_current_folder(ModestWindow *win)
{
/* Refresh currently selected folder. Note that if we only
want to retreive the headers, then the refresh only will
if (!accounts_exist)
modest_ui_actions_on_accounts (NULL, win);
- modest_do_refresh_current_folder (win);
+ /* Refresh the current folder if we're viewing a window */
+ if (win)
+ refresh_current_folder (win);
/* Refresh the active account */
modest_ui_actions_do_send_receive (NULL, win);
/* g_message ("%s %s", __FUNCTION__, address); */
}
+static void
+on_save_to_drafts_cb (ModestMailOperation *mail_op,
+ TnyMsg *saved_draft,
+ gpointer user_data)
+{
+ ModestMsgEditWindow *edit_window;
+
+ edit_window = MODEST_MSG_EDIT_WINDOW (user_data);
+
+ /* If there was any error do nothing */
+ if (modest_mail_operation_get_error (mail_op) != NULL)
+ return;
+
+ modest_msg_edit_window_set_draft (edit_window, saved_draft);
+}
+
void
modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edit_window)
{
data = modest_msg_edit_window_get_msg_data (edit_window);
+ account_name = g_strdup (data->account_name);
account_mgr = modest_runtime_get_account_mgr();
- account_name = g_strdup(modest_window_get_active_account (MODEST_WINDOW(edit_window)));
+ if (!account_name)
+ account_name = g_strdup(modest_window_get_active_account (MODEST_WINDOW(edit_window)));
if (!account_name)
account_name = modest_account_mgr_get_default_account (account_mgr);
if (!account_name) {
modest_mail_operation_save_to_drafts (mail_operation,
transport_account,
data->draft_msg,
- edit_window,
from,
data->to,
data->cc,
data->html_body,
data->attachments,
data->images,
- data->priority_flags);
+ data->priority_flags,
+ on_save_to_drafts_cb,
+ edit_window);
/* Frees */
g_free (from);
g_free (account_name);
if (!modest_msg_edit_window_check_names (edit_window, TRUE))
return;
- /* Offer the connection dialog, if necessary: */
- if (!modest_platform_connect_and_wait (GTK_WINDOW (edit_window), NULL))
- return;
-
/* FIXME: Code added just for testing. The final version will
use the send queue provided by tinymail and some
classifier */
+ MsgData *data = modest_msg_edit_window_get_msg_data (edit_window);
+
ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr();
- gchar *account_name = g_strdup(modest_window_get_active_account (MODEST_WINDOW(edit_window)));
+ gchar *account_name = g_strdup (data->account_name);
+ if (!account_name)
+ g_strdup(modest_window_get_active_account (MODEST_WINDOW(edit_window)));
+
if (!account_name)
account_name = modest_account_mgr_get_default_account (account_mgr);
if (!account_name) {
+ modest_msg_edit_window_free_msg_data (edit_window, data);
/* Run account setup wizard */
if (!modest_ui_actions_run_account_setup_wizard (MODEST_WINDOW(edit_window)))
return;
}
- MsgData *data = modest_msg_edit_window_get_msg_data (edit_window);
-
- if (!strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
- account_name = g_strdup (data->account_name);
- }
-
/* Get the currently-active transport account for this modest account: */
TnyTransportAccount *transport_account =
TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_transport_account_for_open_connection
mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window),
modest_ui_actions_new_folder_error_handler,
- parent_window);
+ parent_window, NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
mail_op =
modest_mail_operation_new_with_error_handling (G_OBJECT(main_window),
modest_ui_actions_rename_folder_error_handler,
- main_window);
+ main_window, NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
mail_op =
modest_mail_operation_new_with_error_handling (G_OBJECT(main_window),
modest_ui_actions_delete_folder_error_handler,
- NULL);
+ NULL, NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
num_of_unc_msgs = header_list_count_uncached_msgs(header_list);
- if (num_of_unc_msgs)
- continue_download = connect_to_get_msg(
- GTK_WINDOW (window),
- num_of_unc_msgs);
+ if (num_of_unc_msgs) {
+ TnyAccount *account = get_account_from_header_list (header_list);
+ continue_download = connect_to_get_msg (window, num_of_unc_msgs, account);
+ g_object_unref (account);
+ }
if (num_of_unc_msgs == 0 || continue_download) {
/* modest_platform_information_banner (
num_of_unc_msgs = header_list_count_uncached_msgs(header_list);
- if (num_of_unc_msgs)
- continue_download = connect_to_get_msg(
- GTK_WINDOW (window),
- num_of_unc_msgs);
+ if (num_of_unc_msgs) {
+ TnyAccount *account = get_account_from_header_list (header_list);
+ continue_download = connect_to_get_msg (window, num_of_unc_msgs, account);
+ g_object_unref (account);
+ }
if (num_of_unc_msgs == 0 || continue_download) {
modest_platform_information_banner (
/* Ask for user confirmation */
response =
- modest_ui_actions_msgs_move_to_confirmation (GTK_WINDOW (window),
+ modest_ui_actions_msgs_move_to_confirmation (window,
TNY_FOLDER (folder_store),
delete,
data);
* drag_and_drop_from_header_view (for d&d in modest_folder_view.c)
*/
gint
-modest_ui_actions_msgs_move_to_confirmation (GtkWindow *win,
+modest_ui_actions_msgs_move_to_confirmation (ModestWindow *win,
TnyFolder *dest_folder,
gboolean delete,
TnyList *headers)
{
gint response = GTK_RESPONSE_OK;
+ TnyAccount *account = NULL;
+ TnyFolder *src_folder = NULL;
+ TnyIterator *iter = NULL;
+ TnyHeader *header = NULL;
/* return with OK if the destination is a remote folder */
if (modest_tny_folder_is_remote_folder (dest_folder))
return GTK_RESPONSE_OK;
- TnyFolder *src_folder = NULL;
- TnyIterator *iter = NULL;
- TnyHeader *header = NULL;
-
/* Get source folder */
iter = tny_list_create_iterator (headers);
header = TNY_HEADER (tny_iterator_get_current (iter));
g_object_unref (src_folder);
return GTK_RESPONSE_OK;
}
- g_object_unref (src_folder);
+
+ /* Get the account */
+ account = tny_folder_get_account (src_folder);
/* now if offline we ask the user */
- if(connect_to_get_msg( GTK_WINDOW (win),
- tny_list_get_length (headers)))
+ if(connect_to_get_msg (win, tny_list_get_length (headers), account))
response = GTK_RESPONSE_OK;
else
response = GTK_RESPONSE_CANCEL;
+ /* Frees */
+ g_object_unref (src_folder);
+ g_object_unref (account);
+
return response;
}
}
} else {
ModestMailOperation *mail_op = NULL;
- modest_window_mgr_register_header (modest_runtime_get_window_mgr (), header);
+ modest_window_mgr_register_header (modest_runtime_get_window_mgr (), header, NULL);
mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (win),
modest_ui_actions_get_msgs_full_error_handler,
- NULL);
+ NULL, NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
modest_mail_operation_get_msg (mail_op, header, open_msg_for_purge_cb, win);
ModestMailOperation *mail_op =
modest_mail_operation_new_with_error_handling (G_OBJECT(win),
modest_ui_actions_move_folder_error_handler,
- NULL);
+ NULL, NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__);
do_xfer = FALSE;
} else if (!online && modest_platform_is_network_folderstore(src_folder)) {
- guint num_headers = tny_folder_get_all_count(TNY_FOLDER(src_folder));
- if (!connect_to_get_msg(GTK_WINDOW(win), num_headers)) {
+ guint num_headers = tny_folder_get_all_count(TNY_FOLDER (src_folder));
+ TnyAccount *account = tny_folder_get_account (TNY_FOLDER (src_folder));
+ if (!connect_to_get_msg(MODEST_WINDOW (win), num_headers, account))
do_xfer = FALSE;
- }
+ g_object_unref (account);
}
if (do_xfer) {
mail_op =
modest_mail_operation_new_with_error_handling (G_OBJECT(win),
modest_ui_actions_move_folder_error_handler,
- src_folder);
+ src_folder, NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
TnyList *headers = modest_header_view_get_selected_headers(header_view);
if (!msgs_already_deleted_from_server(headers, src_folder)) {
guint num_headers = tny_list_get_length(headers);
- if (!connect_to_get_msg(GTK_WINDOW(win), num_headers)) {
+ TnyAccount *account = get_account_from_header_list (headers);
+ if (!connect_to_get_msg(MODEST_WINDOW (win), num_headers, account))
do_xfer = FALSE;
- }
+ g_object_unref (account);
}
g_object_unref(headers);
}
ModestMsgViewWindow *win)
{
TnyHeader *header = NULL;
- TnyFolderStore *src_folder;
+ TnyFolder *src_folder = NULL;
+ TnyAccount *account = NULL;
/* Create header list */
header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));
- src_folder = TNY_FOLDER_STORE(tny_header_get_folder(header));
+ src_folder = TNY_FOLDER (tny_header_get_folder(header));
g_object_unref (header);
/* Transfer the message if online or confirmed by the user */
- if (tny_device_is_online (modest_runtime_get_device()) || remote_folder_is_pop(src_folder) ||
- (modest_platform_is_network_folderstore(src_folder) && connect_to_get_msg(GTK_WINDOW(win), 1))) {
+ account = tny_folder_get_account (src_folder);
+ if (remote_folder_is_pop(TNY_FOLDER_STORE (src_folder)) ||
+ (modest_platform_is_network_folderstore(TNY_FOLDER_STORE (src_folder)) &&
+ connect_to_get_msg(MODEST_WINDOW (win), 1, account))) {
modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win));
}
-
+ g_object_unref (account);
g_object_unref (src_folder);
}
/* Create mail operation */
mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (window),
modest_ui_actions_get_msgs_full_error_handler,
- NULL);
+ NULL, NULL);
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);
projects / modest / blobdiff