X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=971820e756d7999ab63100c85bba672e41abc2e5;hb=9c2f8007e10d401d50ce21d4ee8e49b116c5006b;hp=c87dd34bacfe915e9abb33d709dae97170c3fb14;hpb=5851a5a0f9519cbd8b264a27b1c13962b90d33eb;p=modest diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index c87dd34..971820e 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -66,8 +66,8 @@ #include "maemo/modest-hildon-includes.h" #include "maemo/modest-connection-specific-smtp-window.h" #endif /* !MODEST_TOOLKIT_GTK */ -#include +#include #include "widgets/modest-ui-constants.h" #include #include @@ -85,7 +85,10 @@ #include #include #include +#include +#include +#include #include #define MODEST_MOVE_TO_DIALOG_FOLDER_VIEW "move-to-dialog-folder-view" @@ -112,6 +115,9 @@ typedef struct _ReplyForwardHelper { gchar *mailbox; GtkWidget *parent_window; TnyHeader *header; + TnyHeader *top_header; + TnyMsg *msg_part; + TnyList *parts; } ReplyForwardHelper; typedef struct _MoveToHelper { @@ -392,12 +398,16 @@ headers_action_mark_as_read (TnyHeader *header, gpointer user_data) { TnyHeaderFlags flags; + gchar *uid; g_return_if_fail (TNY_IS_HEADER(header)); flags = tny_header_get_flags (header); if (flags & TNY_HEADER_FLAG_SEEN) return; tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN); + uid = modest_tny_folder_get_header_unique_id (header); + modest_platform_emit_msg_read_changed_signal (uid, TRUE); + g_free (uid); } static void @@ -411,7 +421,10 @@ headers_action_mark_as_unread (TnyHeader *header, flags = tny_header_get_flags (header); if (flags & TNY_HEADER_FLAG_SEEN) { + gchar *uid; + uid = modest_tny_folder_get_header_unique_id (header); tny_header_unset_flag (header, TNY_HEADER_FLAG_SEEN); + modest_platform_emit_msg_read_changed_signal (uid, FALSE); } } @@ -639,7 +652,7 @@ modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win) ModestWindowMgr *mgr = NULL; #ifdef MODEST_PLATFORM_MAEMO - modest_osso_save_state(); + modest_window_mgr_save_state_for_all_windows (modest_runtime_get_window_mgr ()); #endif /* MODEST_PLATFORM_MAEMO */ g_debug ("closing down, clearing %d item(s) from operation queue", @@ -686,9 +699,10 @@ modest_ui_actions_on_close_window (GtkAction *action, ModestWindow *win) void modest_ui_actions_add_to_contacts (GtkAction *action, ModestWindow *win) { - g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (win)); - - modest_msg_view_window_add_to_contacts (MODEST_MSG_VIEW_WINDOW (win)); + if (MODEST_IS_MSG_VIEW_WINDOW (win)) + modest_msg_view_window_add_to_contacts (MODEST_MSG_VIEW_WINDOW (win)); + else if (MODEST_IS_MSG_EDIT_WINDOW (win)) + modest_msg_edit_window_add_to_contacts (MODEST_MSG_EDIT_WINDOW (win)); } void @@ -700,12 +714,8 @@ modest_ui_actions_on_add_to_contacts (GtkAction *action, ModestWindow *win) clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); selection = gtk_clipboard_wait_for_text (clipboard); - /* Question: why is the clipboard being used here? - * It doesn't really make a lot of sense. */ - - if (selection) - { - modest_address_book_add_address (selection); + if (selection) { + modest_address_book_add_address (selection, (GtkWindow *) win); g_free (selection); } } @@ -824,8 +834,7 @@ modest_ui_actions_compose_msg(ModestWindow *win, TnyMsg *msg = NULL; TnyAccount *account = NULL; TnyFolder *folder = NULL; - gchar *from_str = NULL, *signature = NULL, *body = NULL; - gchar *recipient = NULL; + gchar *from_str = NULL, *signature = NULL, *body = NULL, *recipient = NULL, *tmp = NULL; gboolean use_signature = FALSE; ModestWindow *msg_win = NULL; ModestAccountMgr *mgr = modest_runtime_get_account_mgr(); @@ -833,6 +842,7 @@ modest_ui_actions_compose_msg(ModestWindow *win, GnomeVFSFileSize total_size, allowed_size; guint64 available_disk, expected_size, parts_size; guint parts_count; + TnyList *header_pairs; /* we check for low-mem */ if (modest_platform_check_memory_low (win, TRUE)) @@ -894,19 +904,23 @@ modest_ui_actions_compose_msg(ModestWindow *win, goto cleanup; } + recipient = modest_text_utils_get_email_address (from_str); - signature = modest_account_mgr_get_signature_from_recipient (mgr, recipient, &use_signature); + tmp = modest_account_mgr_get_signature_from_recipient (modest_runtime_get_account_mgr (), + recipient, + &use_signature); + signature = modest_text_utils_create_colored_signature (tmp); + g_free (tmp); g_free (recipient); - if (body_str != NULL) { - body = use_signature ? g_strconcat(body_str, "\n", - MODEST_TEXT_UTILS_SIGNATURE_MARKER, - "\n", signature, NULL) : g_strdup(body_str); - } else { - body = use_signature ? g_strconcat("\n", MODEST_TEXT_UTILS_SIGNATURE_MARKER, - "\n", signature, NULL) : g_strdup(""); - } - msg = modest_tny_msg_new (to_str, from_str, cc_str, bcc_str, subject_str, NULL, NULL, body, NULL, NULL, NULL); + body = use_signature ? g_strconcat ((body_str) ? body_str : "", signature, NULL) : + g_strdup(body_str); + + header_pairs = TNY_LIST (tny_simple_list_new ()); + msg = modest_tny_msg_new_html_plain (to_str, from_str, cc_str, bcc_str, subject_str, + NULL, NULL, body, NULL, NULL, NULL, NULL, header_pairs, NULL); + g_object_unref (header_pairs); + if (!msg) { g_printerr ("modest: failed to create new msg\n"); goto cleanup; @@ -1007,9 +1021,14 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op, if (protocol) { if (tny_account_get_connection_status (account) == TNY_CONNECTION_STATUS_CONNECTED) { - format = modest_protocol_get_translation (protocol, - MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE, - subject); + if (header) { + format = modest_protocol_get_translation (protocol, + MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE, + subject); + } else { + format = modest_protocol_get_translation (protocol, + MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE_LOST_HEADER); + } } else { format = g_strdup_printf (_("mail_ib_backend_server_invalid"), tny_account_get_hostname (account)); @@ -1018,8 +1037,13 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op, g_object_unref (account); } - if (!format) - format = g_strdup (_("emev_ni_ui_imap_message_not_available_in_server")); + if (!format) { + if (header) { + format = g_strdup (_("emev_ni_ui_imap_message_not_available_in_server")); + } else { + format = g_strdup (_("emev_ni_ui_pop3_msg_recv_error")); + } + } msg = g_strdup_printf (format, subject); modest_platform_run_information_dialog (NULL, msg, FALSE); @@ -1229,7 +1253,7 @@ open_msg_cb (ModestMailOperation *mail_op, win = modest_msg_view_window_new_with_header_model (msg, account, mailbox, (const gchar*) uid, helper->model, helper->rowref); } else { - win = modest_msg_view_window_new_for_attachment (msg, account, mailbox, (const gchar*) uid); + win = modest_msg_view_window_new_for_attachment (msg, NULL, account, mailbox, (const gchar*) uid); } g_free (uid); } @@ -1458,6 +1482,12 @@ open_msg_performer(gboolean canceled, gboolean can_open; gchar *account_name = get_info_from_header (helper->header, &is_draft, &can_open); + if (!g_strcmp0 (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) || + !g_strcmp0 (account_name, MODEST_MMC_ACCOUNT_ID)) { + g_free (account_name); + account_name = g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_window))); + } + if (!can_open) { modest_window_mgr_unregister_header (modest_runtime_get_window_mgr (), helper->header); g_free (account_name); @@ -1548,7 +1578,7 @@ open_msg_from_header (TnyHeader *header, GtkTreeRowReference *rowref, ModestWind OpenMsgHelper *helper; ModestWindow *window; - g_return_if_fail (header != NULL && rowref != NULL); + g_return_if_fail (header != NULL && rowref != NULL && gtk_tree_row_reference_valid (rowref)); mgr = modest_runtime_get_window_mgr (); @@ -1683,7 +1713,10 @@ static ReplyForwardHelper* create_reply_forward_helper (ReplyForwardAction action, ModestWindow *win, guint reply_forward_type, - TnyHeader *header) + TnyHeader *header, + TnyMsg *msg_part, + TnyHeader *top_header, + TnyList *parts) { ReplyForwardHelper *rf_helper = NULL; const gchar *active_acc = modest_window_get_active_account (win); @@ -1694,10 +1727,16 @@ create_reply_forward_helper (ReplyForwardAction action, rf_helper->action = action; rf_helper->parent_window = (MODEST_IS_WINDOW (win)) ? GTK_WIDGET (win) : NULL; rf_helper->header = (header) ? g_object_ref (header) : NULL; + rf_helper->top_header = (top_header) ? g_object_ref (top_header) : NULL; + rf_helper->msg_part = (msg_part) ? g_object_ref (msg_part) : NULL; rf_helper->account_name = (active_acc) ? g_strdup (active_acc) : modest_account_mgr_get_default_account (modest_runtime_get_account_mgr()); rf_helper->mailbox = g_strdup (active_mailbox); + if (parts) + rf_helper->parts = g_object_ref (parts); + else + rf_helper->parts = NULL; /* Note that window could be destroyed just AFTER calling register_window so we must ensure that this pointer does @@ -1719,6 +1758,12 @@ free_reply_forward_helper (gpointer data) g_free (helper->mailbox); if (helper->header) g_object_unref (helper->header); + if (helper->top_header) + g_object_unref (helper->top_header); + if (helper->msg_part) + g_object_unref (helper->msg_part); + if (helper->parts) + g_object_unref (helper->parts); if (helper->parent_window) g_object_weak_unref (G_OBJECT (helper->parent_window), rf_helper_window_closed, helper); @@ -1740,9 +1785,8 @@ reply_forward_cb (ModestMailOperation *mail_op, gchar *from = NULL; TnyAccount *account = NULL; ModestWindowMgr *mgr = NULL; - gchar *signature = NULL; + gchar *signature = NULL, *recipient = NULL; gboolean use_signature; - gchar *recipient; /* If there was any error. The mail operation could be NULL, this means that we already have the message downloaded and @@ -1753,9 +1797,10 @@ reply_forward_cb (ModestMailOperation *mail_op, from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), rf_helper->account_name, rf_helper->mailbox); + recipient = modest_text_utils_get_email_address (from); - signature = modest_account_mgr_get_signature_from_recipient (modest_runtime_get_account_mgr(), - recipient, + signature = modest_account_mgr_get_signature_from_recipient (modest_runtime_get_account_mgr (), + recipient, &use_signature); g_free (recipient); @@ -1765,18 +1810,18 @@ reply_forward_cb (ModestMailOperation *mail_op, information. The summary can lack some data */ TnyHeader *msg_header; case ACTION_REPLY: - msg_header = tny_msg_get_header (msg); + msg_header = tny_msg_get_header (rf_helper->msg_part?rf_helper->msg_part:msg); new_msg = - modest_tny_msg_create_reply_msg (msg, msg_header, from, + modest_tny_msg_create_reply_msg (rf_helper->msg_part?rf_helper->msg_part:msg, msg_header, from, (use_signature) ? signature : NULL, rf_helper->reply_forward_type, MODEST_TNY_MSG_REPLY_MODE_SENDER); g_object_unref (msg_header); break; case ACTION_REPLY_TO_ALL: - msg_header = tny_msg_get_header (msg); + msg_header = tny_msg_get_header (rf_helper->msg_part?rf_helper->msg_part:msg); new_msg = - modest_tny_msg_create_reply_msg (msg, msg_header, from, + modest_tny_msg_create_reply_msg (rf_helper->msg_part?rf_helper->msg_part:msg, msg_header, from, (use_signature) ? signature : NULL, rf_helper->reply_forward_type, MODEST_TNY_MSG_REPLY_MODE_ALL); @@ -1785,7 +1830,8 @@ reply_forward_cb (ModestMailOperation *mail_op, break; case ACTION_FORWARD: new_msg = - modest_tny_msg_create_forward_msg (msg, from, (use_signature) ? signature : NULL, + modest_tny_msg_create_forward_msg (rf_helper->msg_part?rf_helper->msg_part:msg, from, + (use_signature) ? signature : NULL, rf_helper->reply_forward_type); edit_type = MODEST_EDIT_TYPE_FORWARD; break; @@ -1917,12 +1963,80 @@ reply_forward_performer (gboolean canceled, modest_ui_actions_disk_operations_error_handler, NULL, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - modest_mail_operation_get_msg (mail_op, rf_helper->header, TRUE, reply_forward_cb, rf_helper); + modest_mail_operation_get_msg_and_parts (mail_op, rf_helper->top_header, rf_helper->parts, TRUE, reply_forward_cb, rf_helper); /* Frees */ g_object_unref(mail_op); } +static gboolean +all_parts_retrieved (TnyMimePart *part) +{ + if (!TNY_IS_CAMEL_BS_MIME_PART (part)) { + return TRUE; + } else { + TnyList *pending_parts; + TnyIterator *iterator; + gboolean all_retrieved = TRUE; + + pending_parts = TNY_LIST (tny_simple_list_new ()); + tny_mime_part_get_parts (part, pending_parts); + iterator = tny_list_create_iterator (pending_parts); + while (all_retrieved && !tny_iterator_is_done (iterator)) { + TnyMimePart *child; + + child = TNY_MIME_PART (tny_iterator_get_current (iterator)); + + if (tny_camel_bs_mime_part_is_fetched (TNY_CAMEL_BS_MIME_PART (child))) { + all_retrieved = all_parts_retrieved (TNY_MIME_PART (child)); + } else { + all_retrieved = FALSE; + } + + g_object_unref (child); + tny_iterator_next (iterator); + } + g_object_unref (iterator); + g_object_unref (pending_parts); + return all_retrieved; + } +} + +static void +forward_pending_parts_helper (TnyMimePart *part, TnyList *list) +{ + TnyList *parts; + TnyIterator *iterator; + + if (!tny_camel_bs_mime_part_is_fetched (TNY_CAMEL_BS_MIME_PART (part))) { + tny_list_append (list, G_OBJECT (part)); + } + parts = TNY_LIST (tny_simple_list_new ()); + tny_mime_part_get_parts (part, parts); + for (iterator = tny_list_create_iterator (parts); + !tny_iterator_is_done (iterator); + tny_iterator_next (iterator)) { + TnyMimePart *child; + + child = TNY_MIME_PART (tny_iterator_get_current (iterator)); + forward_pending_parts_helper (child, list); + g_object_unref (child); + } + g_object_unref (iterator); + g_object_unref (parts); +} + +static TnyList * +forward_pending_parts (TnyMsg *msg) +{ + TnyList *result = TNY_LIST (tny_simple_list_new ()); + if (TNY_IS_CAMEL_BS_MIME_PART (msg)) { + forward_pending_parts_helper (TNY_MIME_PART (msg), result); + } + + return result; +} + /* * Common code for the reply and forward actions */ @@ -1932,7 +2046,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) ReplyForwardHelper *rf_helper = NULL; guint reply_forward_type; - g_return_if_fail (MODEST_IS_WINDOW(win)); + g_return_if_fail (win && MODEST_IS_WINDOW(win)); /* we check for low-mem; in that case, show a warning, and don't allow * reply/forward (because it could potentially require a lot of memory */ @@ -1955,23 +2069,74 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) if (MODEST_IS_MSG_VIEW_WINDOW (win)) { TnyMsg *msg = NULL; + TnyMsg *top_msg = NULL; TnyHeader *header = NULL; /* 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)); + top_msg = modest_msg_view_window_get_top_message (MODEST_MSG_VIEW_WINDOW(win)); header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win)); - if (msg && header) { + if (msg && header && (action != ACTION_FORWARD || all_parts_retrieved (TNY_MIME_PART (msg)))) { /* Create helper */ rf_helper = create_reply_forward_helper (action, win, - reply_forward_type, header); + reply_forward_type, header, NULL, NULL, NULL); reply_forward_cb (NULL, header, FALSE, msg, NULL, rf_helper); } else { - g_warning("%s: no message or header found in viewer\n", __FUNCTION__); + gboolean do_download = TRUE; + + if (msg && header && action == ACTION_FORWARD) { + if (top_msg == NULL) + top_msg = g_object_ref (msg); + /* Not all parts retrieved. Then we have to retrieve them all before + * creating the forward message */ + if (!tny_device_is_online (modest_runtime_get_device ())) { + gint response; + + /* If ask for user permission to download the messages */ + response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), + ngettext("mcen_nc_get_msg", + "mcen_nc_get_msgs", + 1)); + + /* End if the user does not want to continue */ + if (response == GTK_RESPONSE_CANCEL) + do_download = FALSE; + } + + if (do_download) { + TnyList *pending_parts; + TnyFolder *folder; + TnyAccount *account; + TnyHeader *top_header; + + /* Create helper */ + top_header = tny_msg_get_header (top_msg); + pending_parts = forward_pending_parts (top_msg); + rf_helper = create_reply_forward_helper (action, win, + reply_forward_type, header, msg, top_header, pending_parts); + g_object_unref (pending_parts); + + folder = tny_header_get_folder (top_header); + account = tny_folder_get_account (folder); + modest_platform_connect_and_perform (GTK_WINDOW (win), + TRUE, account, + reply_forward_performer, + rf_helper); + if (folder) g_object_unref (folder); + g_object_unref (account); + if (top_header) g_object_unref (top_header); + } + + } else { + g_warning("%s: no message or header found in viewer\n", __FUNCTION__); + } } if (msg) g_object_unref (msg); + if (top_msg) + g_object_unref (top_msg); if (header) g_object_unref (header); } else { @@ -2035,7 +2200,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) if (download) { /* Create helper */ rf_helper = create_reply_forward_helper (action, win, - reply_forward_type, header); + reply_forward_type, header, NULL, NULL, NULL); if (uncached_msgs > 0) { modest_platform_connect_and_perform (GTK_WINDOW (win), TRUE, account, @@ -2052,7 +2217,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) if (folder) g_object_unref (folder); } else { - reply_forward_cb (NULL, header, FALSE, NULL, NULL, rf_helper); + reply_forward_cb (NULL, header, FALSE, NULL, NULL, NULL); } /* Frees */ g_object_unref (header_list); @@ -2061,6 +2226,82 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) } void +modest_ui_actions_reply_calendar (ModestWindow *win, TnyList *header_pairs) +{ + modest_ui_actions_reply_calendar_with_subject (win, NULL, header_pairs); +} + +void +modest_ui_actions_reply_calendar_with_subject (ModestWindow *win, const gchar *custom_subject, TnyList *header_pairs) +{ + gchar *from; + gchar *recipient; + gchar *signature; + gboolean use_signature; + TnyMsg *new_msg; + GtkWidget *msg_win; + const gchar *account_name; + const gchar *mailbox; + TnyHeader *msg_header; + ModestWindowMgr *mgr; + TnyMsg *msg; + + g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW(win)); + + /* we check for low-mem; in that case, show a warning, and don't allow + * reply/forward (because it could potentially require a lot of memory */ + if (modest_platform_check_memory_low (MODEST_WINDOW(win), TRUE)) + return; + + account_name = modest_window_get_active_account (MODEST_WINDOW (win)); + mailbox = modest_window_get_active_mailbox (MODEST_WINDOW (win)); + from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), + account_name, mailbox); + recipient = modest_text_utils_get_email_address (from); + signature = modest_account_mgr_get_signature_from_recipient (modest_runtime_get_account_mgr(), + recipient, + &use_signature); + g_free (recipient); + + msg = modest_msg_view_window_get_message(MODEST_MSG_VIEW_WINDOW(win)); + g_return_if_fail(msg); + + msg_header = tny_msg_get_header (msg); + new_msg = + modest_tny_msg_create_reply_calendar_msg (msg, msg_header, from, + (use_signature) ? signature : NULL, + header_pairs); + g_object_unref (msg_header); + + g_free (from); + g_free (signature); + + if (!new_msg) { + g_warning ("%s: failed to create message\n", __FUNCTION__); + goto cleanup; + } + + if (custom_subject) { + TnyHeader *new_msg_header; + + new_msg_header = tny_msg_get_header (new_msg); + tny_header_set_subject (new_msg_header, custom_subject); + g_object_unref (new_msg_header); + } + + msg_win = (GtkWidget *) modest_msg_edit_window_new (new_msg, account_name, mailbox, FALSE); + mgr = modest_runtime_get_window_mgr (); + modest_window_mgr_register_window (mgr, MODEST_WINDOW (msg_win), (ModestWindow *) win); + + /* Show edit window */ + gtk_widget_show_all (GTK_WIDGET (msg_win)); + +cleanup: + if (new_msg) + g_object_unref (G_OBJECT (new_msg)); +} + +void modest_ui_actions_on_reply (GtkAction *action, ModestWindow *win) { g_return_if_fail (MODEST_IS_WINDOW(win)); @@ -2156,17 +2397,70 @@ modest_ui_actions_on_sort (GtkAction *action, } static void -new_messages_arrived (ModestMailOperation *self, - TnyList *new_headers, - gpointer user_data) +sync_folder_cb (ModestMailOperation *mail_op, + TnyFolder *folder, + gpointer user_data) +{ + ModestHeaderView *header_view = (ModestHeaderView *) user_data; + + if (modest_mail_operation_get_status (mail_op) == MODEST_MAIL_OPERATION_STATUS_SUCCESS) { + ModestWindow *parent = (ModestWindow *) modest_mail_operation_get_source (mail_op); + + /* We must clear first, because otherwise set_folder will ignore */ + /* the change as the folders are the same */ + modest_header_view_clear (header_view); + modest_header_view_set_folder (header_view, folder, TRUE, parent, NULL, NULL); + + g_object_unref (parent); + } + + g_object_unref (header_view); +} + +static gboolean +idle_refresh_folder (gpointer source) +{ + ModestHeaderView *header_view = NULL; + + /* If the window still exists */ + if (!GTK_IS_WIDGET (source) || + !GTK_WIDGET_VISIBLE (source)) + return FALSE; + + /* Refresh the current view */ +#ifdef MODEST_TOOLKIT_HILDON2 + if (MODEST_IS_HEADER_WINDOW (source)) + header_view = modest_header_window_get_header_view ((ModestHeaderWindow *) source); +#else + if (MODEST_IS_MAIN_WINDOW (source)) + header_view = MODEST_HEADER_VIEW (modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (source), + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW)); +#endif + if (header_view) { + TnyFolder *folder = modest_header_view_get_folder (header_view); + if (folder) { + /* Sync the folder status */ + ModestMailOperation *mail_op = modest_mail_operation_new (source); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); + modest_mail_operation_sync_folder (mail_op, folder, FALSE, sync_folder_cb, g_object_ref (header_view)); + g_object_unref (folder); + g_object_unref (mail_op); + } + } + + return FALSE; +} + +static void +update_account_cb (ModestMailOperation *self, + TnyList *new_headers, + gpointer user_data) { - GObject *source; + ModestWindow *top; gboolean show_visual_notifications; - source = modest_mail_operation_get_source (self); - show_visual_notifications = (source) ? FALSE : TRUE; - if (source) - g_object_unref (source); + top = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr ()); + show_visual_notifications = (top) ? FALSE : TRUE; /* Notify new messages have been downloaded. If the send&receive was invoked by the user then do not show any @@ -2214,29 +2508,15 @@ new_messages_arrived (ModestMailOperation *self, g_object_unref (actually_new_list); } -} - -gboolean -retrieve_all_messages_cb (GObject *source, - guint num_msgs, - guint retrieve_limit) -{ - GtkWindow *window; - gchar *msg; - gint response; - - window = GTK_WINDOW (source); - msg = g_strdup_printf (_("mail_nc_msg_count_limit_exceeded"), - num_msgs, retrieve_limit); - - /* Ask the user if they want to retrieve all the messages */ - response = - modest_platform_run_confirmation_dialog_with_buttons (window, msg, - _("mcen_bd_get_all"), - _("mcen_bd_newest_only")); - /* Free and return */ - g_free (msg); - return (response == GTK_RESPONSE_ACCEPT) ? TRUE : FALSE; + if (top) { + /* Refresh the current folder in an idle. We do this + in order to avoid refresh cancelations if the + currently viewed folder is the inbox */ + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, + idle_refresh_folder, + g_object_ref (top), + g_object_unref); + } } typedef struct { @@ -2284,8 +2564,7 @@ do_send_receive_performer (gboolean canceled, /* Send & receive. */ modest_mail_operation_update_account (info->mail_op, info->account_name, info->poke_status, info->interactive, - (info->win) ? retrieve_all_messages_cb : NULL, - new_messages_arrived, info->win); + update_account_cb, info->win); clean: /* Frees */ @@ -3041,6 +3320,7 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi data->priority_flags, data->references, data->in_reply_to, + data->custom_header_pairs, on_save_to_drafts_cb, g_object_ref(edit_window)); @@ -3117,26 +3397,22 @@ gboolean modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) { TnyTransportAccount *transport_account = NULL; - gboolean had_error = FALSE; + gboolean result = TRUE, add_to_contacts; MsgData *data; ModestAccountMgr *account_mgr; gchar *account_name; - ModestMailOperation *mail_operation; gchar *recipients; g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window), TRUE); - if (!modest_msg_edit_window_check_names (edit_window, TRUE)) + /* Check whether to automatically add new contacts to addressbook or not */ + add_to_contacts = modest_conf_get_bool (modest_runtime_get_conf (), + MODEST_CONF_AUTO_ADD_TO_CONTACTS, NULL); + if (!modest_msg_edit_window_check_names (edit_window, add_to_contacts)) return TRUE; data = modest_msg_edit_window_get_msg_data (edit_window); - if (data->subject == NULL || data->subject[0] == '\0') { - /* Empty subject -> no send */ - modest_msg_edit_window_free_msg_data (edit_window, data); - return FALSE; - } - recipients = g_strconcat (data->to?data->to:"", data->cc?data->cc:"", data->bcc?data->bcc:"", @@ -3172,7 +3448,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) } /* Get the currently-active transport account for this modest account: */ - if (strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) != 0) { + if (account_name && strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) != 0) { transport_account = TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_server_account (modest_runtime_get_account_store (), @@ -3186,6 +3462,90 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) return TRUE; } + result = modest_ui_actions_send_msg_with_transport (transport_account, + data->draft_msg, + data->from, + data->to, + data->cc, + data->bcc, + data->subject, + data->plain_body, + data->html_body, + data->attachments, + data->images, + data->references, + data->in_reply_to, + data->priority_flags, + data->custom_header_pairs); + + + /* Free data: */ + g_free (account_name); + g_object_unref (G_OBJECT (transport_account)); + + modest_msg_edit_window_free_msg_data (edit_window, data); + + if (result) { + modest_msg_edit_window_set_sent (edit_window, TRUE); + + /* Save settings and close the window: */ + modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (edit_window)); + } + + return result; +} + +/* For instance, when clicking the Send toolbar button when editing a message: */ +gboolean +modest_ui_actions_on_send_custom_msg (const gchar *account_name, + const gchar *from, const gchar *to, const gchar *cc, const gchar *bcc, + const gchar *subject, + const gchar *plain_body, const gchar *html_body, + const GList *attachments_list, const GList *images_list, + const gchar *references, const gchar *in_reply_to, + TnyHeaderFlags priority_flags, TnyList *header_pairs) +{ + TnyTransportAccount *transport_account = NULL; + gboolean result = FALSE; + + g_return_val_if_fail (account_name, FALSE); + + transport_account = + TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_server_account + (modest_runtime_get_account_store (), + account_name, TNY_ACCOUNT_TYPE_TRANSPORT)); + + g_return_val_if_fail (transport_account, FALSE); + + result = modest_ui_actions_send_msg_with_transport (transport_account, + NULL /*draft msg*/, + from, to, cc, bcc, + subject, + plain_body, html_body, + attachments_list, images_list, + references, in_reply_to, + priority_flags, header_pairs); + + /* Free data: */ + g_object_unref (G_OBJECT (transport_account)); + + return result; +} + +gboolean +modest_ui_actions_send_msg_with_transport (TnyTransportAccount *transport_account, + TnyMsg *draft_msg, + const gchar *from, const gchar *to, const gchar *cc, const gchar *bcc, + const gchar *subject, + const gchar *plain_body, const gchar *html_body, + const GList *attachments_list, const GList *images_list, + const gchar *references, const gchar *in_reply_to, + TnyHeaderFlags priority_flags, TnyList *header_pairs) +{ + gboolean had_error = FALSE; + ModestMailOperation *mail_operation; + + g_return_val_if_fail (transport_account, FALSE); /* Create the mail operation */ mail_operation = modest_mail_operation_new_with_error_handling (NULL, modest_ui_actions_disk_operations_error_handler, NULL, NULL); @@ -3193,19 +3553,20 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) modest_mail_operation_send_new_mail (mail_operation, transport_account, - data->draft_msg, - data->from, - data->to, - data->cc, - data->bcc, - data->subject, - data->plain_body, - data->html_body, - data->attachments, - data->images, - data->references, - data->in_reply_to, - data->priority_flags); + draft_msg, + from, + to, + cc, + bcc, + subject, + plain_body, + html_body, + attachments_list, + images_list, + references, + in_reply_to, + priority_flags, + header_pairs); if (modest_mail_operation_get_status (mail_operation) == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS) modest_platform_information_banner (NULL, NULL, _("mcen_ib_outbox_waiting_to_be_sent")); @@ -3221,19 +3582,61 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) } /* Free data: */ - g_free (account_name); - g_object_unref (G_OBJECT (transport_account)); g_object_unref (G_OBJECT (mail_operation)); - modest_msg_edit_window_free_msg_data (edit_window, data); + return !had_error; +} - if (!had_error) { - modest_msg_edit_window_set_sent (edit_window, TRUE); +gboolean +modest_ui_actions_on_send_msg (ModestWindow *window, + TnyMsg *msg) +{ + TnyTransportAccount *transport_account = NULL; + gboolean had_error = FALSE; + ModestAccountMgr *account_mgr; + gchar *account_name; + ModestMailOperation *mail_operation; - /* Save settings and close the window: */ - modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (edit_window)); + account_mgr = modest_runtime_get_account_mgr(); + account_name = g_strdup(modest_window_get_active_account (MODEST_WINDOW(window))); + + if (!account_name) + account_name = modest_account_mgr_get_default_account (account_mgr); + + /* Get the currently-active transport account for this modest account: */ + if (account_name && strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) != 0) { + transport_account = + TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_server_account + (modest_runtime_get_account_store (), + account_name, TNY_ACCOUNT_TYPE_TRANSPORT)); } + /* Create the mail operation */ + mail_operation = modest_mail_operation_new_with_error_handling (NULL, modest_ui_actions_disk_operations_error_handler, NULL, NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation); + + modest_mail_operation_send_mail (mail_operation, + transport_account, + msg); + + if (modest_mail_operation_get_status (mail_operation) == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS) + modest_platform_information_banner (NULL, NULL, _("mcen_ib_outbox_waiting_to_be_sent")); + + if (modest_mail_operation_get_error (mail_operation) != NULL) { + const GError *error = modest_mail_operation_get_error (mail_operation); + if (error->domain == MODEST_MAIL_OPERATION_ERROR && + error->code == MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED) { + g_warning ("%s failed: %s\n", __FUNCTION__, (modest_mail_operation_get_error (mail_operation))->message); + modest_platform_information_banner (NULL, NULL, _CS("sfil_ni_not_enough_memory")); + had_error = TRUE; + } + } + + /* Free data: */ + g_free (account_name); + g_object_unref (G_OBJECT (transport_account)); + g_object_unref (G_OBJECT (mail_operation)); + return !had_error; } @@ -3475,7 +3878,7 @@ do_create_folder_performer (gboolean canceled, /* This happens if we have selected the outbox folder as the parent */ - if (err->code == TNY_SERVICE_ERROR_UNKNOWN && + if (err && err->code == TNY_SERVICE_ERROR_UNKNOWN && TNY_IS_MERGE_FOLDER (helper->parent)) { /* Show an error and retry */ modest_platform_information_banner ((GtkWidget *) parent_window, @@ -3850,8 +4253,8 @@ on_delete_folder_cb (gboolean canceled, modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view)); - g_object_unref (G_OBJECT (mail_op)); - g_object_unref (G_OBJECT (info->folder)); + g_object_unref (mail_op); + g_object_unref (info->folder); g_free (info); } @@ -3901,22 +4304,23 @@ delete_folder (ModestWindow *window, gboolean move_to_trash) g_free (message); if (response == GTK_RESPONSE_OK) { - DeleteFolderInfo *info; + TnyAccount *account = NULL; + DeleteFolderInfo *info = NULL; info = g_new0(DeleteFolderInfo, 1); - info->folder = folder; + info->folder = g_object_ref (folder); info->move_to_trash = move_to_trash; - g_object_ref (G_OBJECT (info->folder)); - TnyAccount *account = tny_folder_get_account (TNY_FOLDER (folder)); + + account = tny_folder_get_account (TNY_FOLDER (folder)); modest_platform_connect_if_remote_and_perform (GTK_WINDOW (window), TRUE, TNY_FOLDER_STORE (account), on_delete_folder_cb, info); g_object_unref (account); + g_object_unref (folder); return TRUE; } else { return FALSE; } - g_object_unref (G_OBJECT (folder)); } void @@ -4753,6 +5157,7 @@ headers_action_show_details (TnyHeader *header, if (MODEST_IS_MSG_VIEW_WINDOW (window)) { async_retrieval = TRUE; msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (window)); + async_retrieval = !TNY_IS_CAMEL_BS_MSG (msg); } else { async_retrieval = FALSE; } @@ -5095,7 +5500,6 @@ on_move_to_dialog_response (GtkDialog *dialog, parent_win = (GtkWidget *) helper->win; folder_view = MODEST_FOLDER_VIEW (g_object_get_data (G_OBJECT (dialog), MODEST_MOVE_TO_DIALOG_FOLDER_VIEW)); - switch (response) { TnyFolderStore *dst_folder; TnyFolderStore *selected; @@ -5213,8 +5617,6 @@ create_move_to_dialog (GtkWindow *win, modest_folder_view_set_style (MODEST_FOLDER_VIEW (tree_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ALL); - modest_folder_view_update_model (MODEST_FOLDER_VIEW (tree_view), - TNY_ACCOUNT_STORE (modest_runtime_get_account_store ())); active_account_name = modest_window_get_active_account (MODEST_WINDOW (win)); mgr = modest_runtime_get_account_mgr (); @@ -6890,11 +7292,14 @@ modest_ui_actions_on_delete_account (GtkWindow *parent_window, removed = modest_account_mgr_remove_account (account_mgr, account_name); if (removed) { +#ifdef MODEST_TOOLKIT_HILDON2 + hildon_gtk_window_take_screenshot (parent_window, FALSE); +#endif /* Close all email notifications, we cannot distinguish if the notification belongs to this account or not, so for safety reasons we remove them all */ - modest_platform_remove_new_mail_notifications (FALSE); + modest_platform_remove_new_mail_notifications (FALSE, account_name); } else { g_warning ("%s: modest_account_mgr_remove_account() failed.\n", __FUNCTION__); }