X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=62fce99b3a77f38d7f5c3e38cfbbbff16077cc25;hb=7c4e1d91c85274250affb5446c5abfe21acaac6d;hp=1d611dba8d71259a3bdcb2f0227c3a8aaf777e0c;hpb=f95f12969d3e803772c6c10defed2aaf169bc4a3;p=modest diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 1d611db..62fce99 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -60,7 +60,6 @@ #include "modest-utils.h" #include "widgets/modest-connection-specific-smtp-window.h" #include "widgets/modest-ui-constants.h" -#include #include #include #include @@ -77,7 +76,10 @@ #include #include #include +#include +#include +#include #include #define MODEST_MOVE_TO_DIALOG_FOLDER_VIEW "move-to-dialog-folder-view" @@ -104,6 +106,9 @@ typedef struct _ReplyForwardHelper { gchar *mailbox; GtkWidget *parent_window; TnyHeader *header; + TnyHeader *top_header; + TnyMsg *msg_part; + TnyList *parts; } ReplyForwardHelper; typedef struct _MoveToHelper { @@ -147,15 +152,6 @@ static void reply_forward_cb (ModestMailOperation *mail_op, static void reply_forward (ReplyForwardAction action, ModestWindow *win); -#ifndef MODEST_TOOLKIT_HILDON2 -static void folder_refreshed_cb (ModestMailOperation *mail_op, - TnyFolder *folder, - gpointer user_data); - -static void on_send_receive_finished (ModestMailOperation *mail_op, - gpointer user_data); -#endif - static gint header_list_count_uncached_msgs (TnyList *header_list); static gboolean connect_to_get_msg (ModestWindow *win, @@ -164,7 +160,7 @@ static gboolean connect_to_get_msg (ModestWindow *win, static gboolean remote_folder_has_leave_on_server (TnyFolderStore *folder); -static void do_create_folder (GtkWindow *window, +static void do_create_folder (ModestWindow *window, TnyFolderStore *parent_folder, const gchar *suggested_name); @@ -173,7 +169,7 @@ static TnyAccount *get_account_from_folder_store (TnyFolderStore *folder_store); static void modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view, TnyFolderStore *dst_folder, TnyList *selection, - GtkWindow *win); + ModestWindow *win); static void modest_ui_actions_on_window_move_to (GtkAction *action, TnyList *list_to_move, @@ -235,8 +231,10 @@ modest_ui_actions_run_account_setup_wizard (ModestWindow *win) } } - if (win) - gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win)); + if (win) { + GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win); + gtk_window_set_transient_for (GTK_WINDOW (wizard), toplevel); + } /* make sure the mainwindow is visible. We need to present the wizard again to give it the focus back. show_all are needed @@ -262,13 +260,14 @@ modest_ui_actions_run_account_setup_wizard (ModestWindow *win) void modest_ui_actions_on_about (GtkAction *action, ModestWindow *win) { + GtkWindow *toplevel; GtkWidget *about; const gchar *authors[] = { "Dirk-Jan C. Binnema ", NULL }; about = gtk_about_dialog_new (); - gtk_about_dialog_set_name (GTK_ABOUT_DIALOG(about), PACKAGE_NAME); + gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG(about), PACKAGE_NAME); gtk_about_dialog_set_version (GTK_ABOUT_DIALOG(about),PACKAGE_VERSION); gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG(about), _("Copyright (c) 2006, Nokia Corporation\n" @@ -280,7 +279,9 @@ modest_ui_actions_on_about (GtkAction *action, ModestWindow *win) "uses the tinymail email framework written by Philip van Hoof")); gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG(about), authors); gtk_about_dialog_set_website (GTK_ABOUT_DIALOG(about), "http://modest.garage.maemo.org"); - gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (win)); + + toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win); + gtk_window_set_transient_for (GTK_WINDOW (about), toplevel); gtk_window_set_modal (GTK_WINDOW (about), TRUE); gtk_dialog_run (GTK_DIALOG (about)); @@ -321,49 +322,22 @@ get_selected_headers (ModestWindow *win) } } -#ifndef MODEST_TOOLKIT_HILDON2 -static GtkTreeRowReference * -get_next_after_selected_headers (ModestHeaderView *header_view) -{ - GtkTreeSelection *sel; - GList *selected_rows, *node; - GtkTreePath *path; - GtkTreeRowReference *result; - GtkTreeModel *model; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); - sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view)); - selected_rows = gtk_tree_selection_get_selected_rows (sel, NULL); - - if (selected_rows == NULL) - return NULL; - - node = g_list_last (selected_rows); - path = gtk_tree_path_copy ((GtkTreePath *) node->data); - gtk_tree_path_next (path); - - result = gtk_tree_row_reference_new (model, path); - - gtk_tree_path_free (path); - g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL); - g_list_free (selected_rows); - - return result; -} -#endif - static void headers_action_mark_as_read (TnyHeader *header, ModestWindow *win, 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 @@ -377,7 +351,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); } } @@ -443,7 +420,7 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win) tny_list_get_length(header_list)), desc); /* Confirmation dialog */ - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), + response = modest_platform_run_confirmation_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (win))), message); if (response == GTK_RESPONSE_OK) { @@ -604,23 +581,22 @@ modest_ui_actions_on_accounts (GtkAction *action, return; } else { /* Show the list of accounts */ - GtkWindow *account_win = GTK_WINDOW (modest_account_view_window_new ()); + GtkWindow *win_toplevel, *acc_toplevel; + GtkWidget *account_win; + + account_win = modest_account_view_window_new (); + acc_toplevel = (GtkWindow *) gtk_widget_get_toplevel (account_win); /* The accounts dialog must be modal */ - modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (account_win), (GtkWindow *) win); - modest_utils_show_dialog_and_forget (GTK_WINDOW (win), GTK_DIALOG (account_win)); + win_toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), acc_toplevel, win_toplevel); + modest_utils_show_dialog_and_forget (win_toplevel, GTK_DIALOG (account_win)); } } void modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win) { - /* This is currently only implemented for Maemo, - * because it requires an API (libconic) to detect different connection - * possiblities. - */ -#ifndef MODEST_TOOLKIT_GTK /* Defined in config.h */ - /* Create the window if necessary: */ GtkWidget *specific_window = GTK_WIDGET (modest_connection_specific_smtp_window_new ()); modest_connection_specific_smtp_window_fill_with_connections ( @@ -631,7 +607,6 @@ modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win) modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (specific_window), (GtkWindow *) win); gtk_widget_show (specific_window); -#endif /* !MODEST_TOOLKIT_GTK */ } static guint64 @@ -697,8 +672,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(); @@ -706,6 +680,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)) @@ -727,10 +702,10 @@ modest_ui_actions_compose_msg(ModestWindow *win, } if (expected_size > MODEST_MAX_ATTACHMENT_SIZE) { - modest_platform_run_information_dialog ( - GTK_WINDOW(win), - _("mail_ib_error_attachment_size"), - TRUE); + GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win); + modest_platform_run_information_dialog (toplevel, + _("mail_ib_error_attachment_size"), + TRUE); return; } @@ -765,19 +740,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; @@ -854,8 +833,11 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op, error = modest_mail_operation_get_error (mail_op); if (error && error->domain == MODEST_MAIL_OPERATION_ERROR && error->code == MODEST_MAIL_OPERATION_ERROR_LOW_MEMORY) { + GtkWindow *toplevel = NULL; GObject *source = modest_mail_operation_get_source (mail_op); - modest_platform_run_information_dialog (GTK_IS_WINDOW (source) ? GTK_WINDOW (source) : NULL, + + toplevel = (GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (source)); + modest_platform_run_information_dialog (toplevel, _KR("memr_ib_operation_disabled"), TRUE); g_object_unref (source); @@ -1103,7 +1085,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); } @@ -1152,7 +1134,7 @@ modest_ui_actions_disk_operations_error_handler (ModestMailOperation *mail_op, } else if (error->domain == MODEST_MAIL_OPERATION_ERROR && error->code == MODEST_MAIL_OPERATION_ERROR_FILE_IO) { modest_platform_information_banner ((GtkWidget *) win, - NULL, _CS ("sfil_ni_unable_to_open_file_not_found")); + NULL, _CS_UNABLE_TO_OPEN_FILE_NOT_FOUND); } else if (user_data) { modest_platform_information_banner ((GtkWidget *) win, NULL, user_data); @@ -1261,7 +1243,7 @@ open_msg_helper_destroyer (gpointer user_data) static void open_msg_performer(gboolean canceled, GError *err, - GtkWindow *parent_window, + ModestWindow *parent_window, TnyAccount *account, gpointer user_data) { @@ -1312,6 +1294,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); @@ -1324,11 +1312,11 @@ open_msg_performer(gboolean canceled, GtkWidget *header_view; gchar *uid; - header_view = get_header_view_from_window (MODEST_WINDOW (parent_window)); + header_view = get_header_view_from_window (parent_window); uid = modest_tny_folder_get_header_unique_id (helper->header); if (header_view) { const gchar *mailbox = NULL; - mailbox = modest_window_get_active_mailbox (MODEST_WINDOW (parent_window)); + mailbox = modest_window_get_active_mailbox (parent_window); window = modest_msg_view_window_new_from_header_view (MODEST_HEADER_VIEW (header_view), account_name, mailbox, uid, helper->rowref); if (window != NULL) { @@ -1413,7 +1401,8 @@ open_msg_from_header (TnyHeader *header, GtkTreeRowReference *rowref, ModestWind if (found) { if (window) { #ifndef MODEST_TOOLKIT_HILDON2 - gtk_window_present (GTK_WINDOW (window)); + GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) window); + gtk_window_present (toplevel); #endif } else { /* the header has been registered already, we don't do @@ -1429,9 +1418,10 @@ open_msg_from_header (TnyHeader *header, GtkTreeRowReference *rowref, ModestWind /* Allways download if we are online. */ if (!tny_device_is_online (modest_runtime_get_device ())) { gint response; + GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win); /* If ask for user permission to download the messages */ - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), + response = modest_platform_run_confirmation_dialog (toplevel, _("mcen_nc_get_msg")); /* End if the user does not want to continue */ @@ -1457,11 +1447,11 @@ open_msg_from_header (TnyHeader *header, GtkTreeRowReference *rowref, ModestWind /* Connect to the account and perform */ if (!cached) { - modest_platform_connect_and_perform ((GtkWindow *) win, TRUE, g_object_ref (account), + modest_platform_connect_and_perform (win, TRUE, g_object_ref (account), open_msg_performer, helper); } else { /* Call directly the performer, do not need to connect */ - open_msg_performer (FALSE, NULL, (GtkWindow *) win, + open_msg_performer (FALSE, NULL, win, g_object_ref (account), helper); } cleanup: @@ -1526,7 +1516,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); @@ -1537,10 +1530,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 @@ -1562,6 +1561,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); @@ -1583,9 +1588,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 @@ -1596,9 +1600,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); @@ -1608,18 +1613,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); @@ -1628,7 +1633,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; @@ -1720,27 +1726,29 @@ connect_to_get_msg (ModestWindow *win, TnyAccount *account) { GtkResponseType response; + GtkWindow *toplevel; /* 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 */ - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), - ngettext("mcen_nc_get_msg", - "mcen_nc_get_msgs", - num_of_uncached_msgs)); + toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win); + response = modest_platform_run_confirmation_dialog (toplevel, + 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((GtkWindow *) win, account); + return modest_platform_connect_and_wait(toplevel, account); } static void reply_forward_performer (gboolean canceled, GError *err, - GtkWindow *parent_window, + ModestWindow *parent_window, TnyAccount *account, gpointer user_data) { @@ -1760,12 +1768,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 */ @@ -1798,23 +1874,76 @@ 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; + GtkWindow *toplevel; + + /* If ask for user permission to download the messages */ + toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win); + response = modest_platform_run_confirmation_dialog (toplevel, + 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 (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 { @@ -1862,9 +1991,10 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) /* Allways download if we are online. */ if (!tny_device_is_online (modest_runtime_get_device ())) { gint response; + GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win); /* If ask for user permission to download the messages */ - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), + response = modest_platform_run_confirmation_dialog (toplevel, ngettext("mcen_nc_get_msg", "mcen_nc_get_msgs", uncached_msgs)); @@ -1878,14 +2008,14 @@ 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), + modest_platform_connect_and_perform (win, TRUE, account, reply_forward_performer, rf_helper); } else { - reply_forward_performer (FALSE, NULL, GTK_WINDOW (win), + reply_forward_performer (FALSE, NULL, win, account, rf_helper); } } @@ -1904,6 +2034,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)); @@ -1965,13 +2171,13 @@ modest_ui_actions_on_sort (GtkAction *action, } if (!header_view) { - modest_platform_information_banner (NULL, NULL, _CS("ckdg_ib_nothing_to_sort")); + modest_platform_information_banner (NULL, NULL, _CS_NOTHING_TO_SORT); return; } /* Show sorting dialog */ - modest_utils_run_sort_dialog (GTK_WINDOW (window), MODEST_SORT_HEADERS); + modest_utils_run_sort_dialog (MODEST_WINDOW (window), MODEST_SORT_HEADERS); } static void @@ -2103,7 +2309,7 @@ typedef struct { static void do_send_receive_performer (gboolean canceled, GError *err, - GtkWindow *parent_window, + ModestWindow *parent_window, TnyAccount *account, gpointer user_data) { @@ -2219,8 +2425,7 @@ modest_ui_actions_do_send_receive (const gchar *account_name, modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), info->mail_op); /* Invoke the connect and perform */ - modest_platform_connect_and_perform ((win) ? GTK_WINDOW (win) : NULL, - force_connection, info->account, + modest_platform_connect_and_perform (win, force_connection, info->account, do_send_receive_performer, info); } @@ -2390,14 +2595,16 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,ModestItemTyp GtkWidget *dialog; gchar *txt, *item; gboolean online; + GtkWindow *toplevel; + toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win); item = (type == MODEST_ITEM_TYPE_FOLDER) ? "folder" : "message"; online = tny_device_is_online (modest_runtime_get_device()); if (online) { /* already online -- the item is simply not there... */ - dialog = gtk_message_dialog_new (GTK_WINDOW (win), + dialog = gtk_message_dialog_new (toplevel, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, @@ -2407,7 +2614,7 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,ModestItemTyp gtk_dialog_run (GTK_DIALOG(dialog)); } else { dialog = gtk_dialog_new_with_buttons (_("Connection requested"), - GTK_WINDOW (win), + toplevel, GTK_DIALOG_MODAL, _("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT, @@ -2421,7 +2628,7 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,ModestItemTyp gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox)); g_free (txt); - gtk_window_set_default_size (GTK_WINDOW(dialog), 300, 300); + gtk_window_set_default_size ((GtkWindow *) dialog, 300, 300); if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { /* TODO: Comment about why is this commented out: */ /* modest_platform_connect_and_wait (); */ @@ -2534,10 +2741,10 @@ enough_space_for_message (ModestMsgEditWindow *edit_window, * somehow got past our checks when attaching. */ if (expected_size > MODEST_MAX_ATTACHMENT_SIZE) { - modest_platform_run_information_dialog ( - GTK_WINDOW(edit_window), - _("mail_ib_error_attachment_size"), - TRUE); + GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) edit_window); + modest_platform_run_information_dialog (toplevel, + _("mail_ib_error_attachment_size"), + TRUE); return FALSE; } @@ -2612,6 +2819,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)); @@ -2639,17 +2847,18 @@ 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); - /* Check names but do not automatically add them to addressbook */ - if (!modest_msg_edit_window_check_names (edit_window, FALSE)) + /* 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); @@ -2703,6 +2912,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); @@ -2710,19 +3003,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")); @@ -2732,25 +3026,67 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) 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")); + modest_platform_information_banner (NULL, NULL, _CS_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)); - 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; } @@ -2939,11 +3275,12 @@ do_create_folder_cb (ModestMailOperation *mail_op, full memory condition */ modest_platform_information_banner ((GtkWidget *) source_win, NULL, _("mail_in_ui_folder_create_error")); - do_create_folder (source_win, parent_folder, (const gchar *) suggested_name); + do_create_folder ((ModestWindow *) source_win, + parent_folder, (const gchar *) suggested_name); } } else { - /* the 'source_win' is either the ModestMainWindow, or the 'Move to folder'-dialog + /* the 'source_win' is either the ModestWindow, or the 'Move to folder'-dialog * FIXME: any other? */ GtkWidget *folder_view; @@ -2970,10 +3307,10 @@ typedef struct { static void do_create_folder_performer (gboolean canceled, - GError *err, - GtkWindow *parent_window, - TnyAccount *account, - gpointer user_data) + GError *err, + ModestWindow *parent_window, + TnyAccount *account, + gpointer user_data) { CreateFolderConnect *helper = (CreateFolderConnect *) user_data; ModestMailOperation *mail_op; @@ -3019,15 +3356,17 @@ do_create_folder_performer (gboolean canceled, static void -do_create_folder (GtkWindow *parent_window, +do_create_folder (ModestWindow *parent_window, TnyFolderStore *suggested_parent, const gchar *suggested_name) { gint result; gchar *folder_name = NULL; TnyFolderStore *parent_folder = NULL; + GtkWindow *toplevel; - result = modest_platform_run_new_folder_dialog (GTK_WINDOW (parent_window), + toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) parent_window); + result = modest_platform_run_new_folder_dialog (toplevel, suggested_parent, (gchar *) suggested_name, &folder_name, @@ -3038,7 +3377,7 @@ do_create_folder (GtkWindow *parent_window, helper->folder_name = g_strdup (folder_name); helper->parent = g_object_ref (parent_folder); - modest_platform_connect_if_remote_and_perform (GTK_WINDOW (parent_window), + modest_platform_connect_if_remote_and_perform (parent_window, TRUE, parent_folder, do_create_folder_performer, @@ -3052,7 +3391,7 @@ do_create_folder (GtkWindow *parent_window, } static void -modest_ui_actions_create_folder(GtkWidget *parent_window, +modest_ui_actions_create_folder(GtkWindow *parent_window, GtkWidget *folder_view, TnyFolderStore *parent_folder) { @@ -3066,7 +3405,7 @@ modest_ui_actions_create_folder(GtkWidget *parent_window, } if (parent_folder) { - do_create_folder (GTK_WINDOW (parent_window), parent_folder, NULL); + do_create_folder (MODEST_WINDOW (parent_window), parent_folder, NULL); g_object_unref (parent_folder); } } @@ -3079,9 +3418,11 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestWindow *window) if (MODEST_IS_FOLDER_WINDOW (window)) { GtkWidget *folder_view; + GtkWindow *toplevel; folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window))); - modest_ui_actions_create_folder (GTK_WIDGET (window), folder_view, NULL); + toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) window); + modest_ui_actions_create_folder (toplevel, folder_view, NULL); } else { g_assert_not_reached (); } @@ -3107,14 +3448,14 @@ modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op, message = g_strdup_printf (_KR("cerm_device_memory_full"), ""); } else if (error->domain == MODEST_MAIL_OPERATION_ERROR && error->code == MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS) { - message = _CS("ckdg_ib_folder_already_exists"); + message = _CS_FOLDER_ALREADY_EXISTS; } else if (error->domain == TNY_ERROR_DOMAIN && error->code == TNY_SERVICE_ERROR_STATE) { /* This means that the folder is already in use (a message is opened for example */ message = _("emev_ni_internal_error"); } else { - message = _CS("ckdg_ib_unable_to_rename"); + message = _CS_UNABLE_TO_RENAME; } /* We don't set a parent for the dialog because the dialog @@ -3148,10 +3489,6 @@ on_rename_folder_cb (ModestMailOperation *mail_op, /* Note that if the rename fails new_folder will be NULL */ if (new_folder) { modest_folder_view_select_folder (folder_view, new_folder, FALSE); -#ifndef MODEST_TOOLKIT_HILDON2 - } else { - modest_folder_view_select_first_inbox_or_local (folder_view); -#endif } gtk_widget_grab_focus (GTK_WIDGET (folder_view)); } @@ -3159,7 +3496,7 @@ on_rename_folder_cb (ModestMailOperation *mail_op, static void on_rename_folder_performer (gboolean canceled, GError *err, - GtkWindow *parent_window, + ModestWindow *parent_window, TnyAccount *account, gpointer user_data) { @@ -3240,7 +3577,7 @@ modest_ui_actions_on_edit_mode_rename_folder (ModestWindow *window) current_name = tny_folder_get_name (TNY_FOLDER (folder)); parent = tny_folder_get_folder_store (TNY_FOLDER (folder)); - response = modest_platform_run_rename_folder_dialog (GTK_WINDOW (window), + response = modest_platform_run_rename_folder_dialog (MODEST_WINDOW (window), parent, current_name, &folder_name); g_object_unref (parent); @@ -3251,7 +3588,7 @@ modest_ui_actions_on_edit_mode_rename_folder (ModestWindow *window) RenameFolderInfo *rename_folder_data = g_new0 (RenameFolderInfo, 1); rename_folder_data->folder = g_object_ref (folder); rename_folder_data->new_name = folder_name; - modest_platform_connect_if_remote_and_perform (GTK_WINDOW(window), TRUE, + modest_platform_connect_if_remote_and_perform (window, TRUE, folder, on_rename_folder_performer, rename_folder_data); } } @@ -3264,8 +3601,9 @@ modest_ui_actions_delete_folder_error_handler (ModestMailOperation *mail_op, gpointer user_data) { GObject *win = modest_mail_operation_get_source (mail_op); + GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (win)); - modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, + modest_platform_run_information_dialog (toplevel, _("mail_in_ui_folder_delete_error"), FALSE); g_object_unref (win); @@ -3278,17 +3616,28 @@ typedef struct { static void on_delete_folder_cb (gboolean canceled, - GError *err, - GtkWindow *parent_window, - TnyAccount *account, - gpointer user_data) + GError *err, + ModestWindow *parent_window, + TnyAccount *account, + gpointer user_data) { DeleteFolderInfo *info = (DeleteFolderInfo*) user_data; GtkWidget *folder_view; ModestMailOperation *mail_op; GtkTreeSelection *sel; + ModestWindow *modest_window; - if (!MODEST_IS_WINDOW(parent_window) || canceled || (err!=NULL)) { +#ifdef MODEST_TOOLKIT_HILDON2 + modest_window = (ModestWindow*) parent_window; +#else + if (MODEST_IS_SHELL (parent_window)) { + modest_window = modest_shell_peek_window (MODEST_SHELL (parent_window)); + } else { + modest_window = NULL; + } +#endif + + if (!MODEST_IS_WINDOW(modest_window) || canceled || (err!=NULL)) { /* Note that the connection process can fail due to memory low conditions as it can not successfully store the summary */ @@ -3301,8 +3650,8 @@ on_delete_folder_cb (gboolean canceled, return; } - if (MODEST_IS_FOLDER_WINDOW (parent_window)) { - folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (parent_window))); + if (MODEST_IS_FOLDER_WINDOW (modest_window)) { + folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (modest_window))); } else { g_object_unref (G_OBJECT (info->folder)); g_free (info); @@ -3323,10 +3672,6 @@ on_delete_folder_cb (gboolean canceled, mail_op); modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (info->folder), info->move_to_trash); -#ifndef MODEST_TOOLKIT_HILDON2 - modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view)); -#endif - g_object_unref (mail_op); g_object_unref (info->folder); g_free (info); @@ -3357,7 +3702,7 @@ delete_folder (ModestWindow *window, gboolean move_to_trash) /* Show an error if it's an account */ if (!TNY_IS_FOLDER (folder)) { - modest_platform_run_information_dialog (GTK_WINDOW (window), + modest_platform_run_information_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (window))), _("mail_in_ui_folder_delete_error"), FALSE); g_object_unref (G_OBJECT (folder)); @@ -3367,7 +3712,7 @@ delete_folder (ModestWindow *window, gboolean move_to_trash) /* Ask the user */ message = g_strdup_printf (_("mcen_nc_delete_folder_text"), tny_folder_get_name (TNY_FOLDER (folder))); - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window), + response = modest_platform_run_confirmation_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (window))), (const gchar *) message); g_free (message); @@ -3379,7 +3724,7 @@ delete_folder (ModestWindow *window, gboolean move_to_trash) info->move_to_trash = move_to_trash; account = tny_folder_get_account (TNY_FOLDER (folder)); - modest_platform_connect_if_remote_and_perform (GTK_WINDOW (window), + modest_platform_connect_if_remote_and_perform (window, TRUE, TNY_FOLDER_STORE (account), on_delete_folder_cb, info); @@ -3438,7 +3783,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, gchar **password, gboolean *cancel, gboolean *remember, - ModestMainWindow *main_window) + ModestWindow *window) { g_return_if_fail(server_account_name); gboolean completed = FALSE; @@ -3460,7 +3805,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, gtk_dialog_new_with_buttons (_("mail_ti_password_protected"), NULL, GTK_DIALOG_MODAL, - _HL("wdgt_bd_done"), + _HL_DONE, GTK_RESPONSE_ACCEPT, NULL); gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), @@ -3662,7 +4007,7 @@ modest_ui_actions_on_cut (GtkAction *action, GtkClipboard *clipboard; clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); - focused_widget = gtk_window_get_focus (GTK_WINDOW (window)); + focused_widget = gtk_container_get_focus_child ((GtkContainer *) window); if (GTK_IS_EDITABLE (focused_widget)) { gtk_editable_cut_clipboard (GTK_EDITABLE(focused_widget)); gtk_clipboard_set_can_store (clipboard, NULL, 0); @@ -3714,7 +4059,7 @@ modest_ui_actions_on_copy (GtkAction *action, gboolean copied = TRUE; clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); - focused_widget = gtk_window_get_focus (GTK_WINDOW (window)); + focused_widget = gtk_container_get_focus_child ((GtkContainer *) window); if (GTK_IS_LABEL (focused_widget)) { gchar *selection; @@ -3764,7 +4109,7 @@ modest_ui_actions_on_copy (GtkAction *action, if (num_of_unc_msgs == 0 || continue_download) { modest_platform_information_banner ( - NULL, NULL, _CS("mcen_ib_getting_items")); + NULL, NULL, _CS_GETTING_ITEMS); modest_header_view_copy_selection ( MODEST_HEADER_VIEW (focused_widget)); } else @@ -3779,7 +4124,7 @@ modest_ui_actions_on_copy (GtkAction *action, /* Show information banner if there was a copy to clipboard */ if(copied) modest_platform_information_banner ( - NULL, NULL, _CS("ecoc_ib_edwin_copied")); + NULL, NULL, _CS_COPIED); } void @@ -3860,7 +4205,7 @@ modest_ui_actions_on_paste (GtkAction *action, GtkWidget *inf_note = NULL; ModestMailOperation *mail_op = NULL; - focused_widget = gtk_window_get_focus (GTK_WINDOW (window)); + focused_widget = gtk_container_get_focus_child ((GtkContainer *) window); if (GTK_IS_EDITABLE (focused_widget)) { gtk_editable_paste_clipboard (GTK_EDITABLE(focused_widget)); } else if (GTK_IS_TEXT_VIEW (focused_widget)) { @@ -3881,7 +4226,7 @@ modest_ui_actions_on_paste (GtkAction *action, PasteAsAttachmentHelper *helper = g_new0 (PasteAsAttachmentHelper, 1); helper->window = MODEST_MSG_EDIT_WINDOW (window); helper->banner = modest_platform_animation_banner (GTK_WIDGET (window), NULL, - _CS("ckct_nw_pasting")); + _CS_PASTING); modest_email_clipboard_get_data (e_clipboard, &src_folder, &data, &delete); mail_op = modest_mail_operation_new (G_OBJECT (window)); if (helper->banner != NULL) { @@ -3938,7 +4283,7 @@ modest_ui_actions_on_paste (GtkAction *action, if (response == GTK_RESPONSE_OK) { /* Launch notification */ inf_note = modest_platform_animation_banner (GTK_WIDGET (window), NULL, - _CS("ckct_nw_pasting")); + _CS_PASTING); if (inf_note != NULL) { gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE); gtk_widget_show (GTK_WIDGET(inf_note)); @@ -3958,7 +4303,7 @@ modest_ui_actions_on_paste (GtkAction *action, } else if (src_folder != NULL) { /* Launch notification */ inf_note = modest_platform_animation_banner (GTK_WIDGET (window), NULL, - _CS("ckct_nw_pasting")); + _CS_PASTING); if (inf_note != NULL) { gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE); gtk_widget_show (GTK_WIDGET(inf_note)); @@ -3990,7 +4335,7 @@ modest_ui_actions_on_select_all (GtkAction *action, { GtkWidget *focused_widget; - focused_widget = gtk_window_get_focus (GTK_WINDOW (window)); + focused_widget = gtk_container_get_focus_child ((GtkContainer *) window); if (MODEST_IS_ATTACHMENTS_VIEW (focused_widget)) { modest_attachments_view_select_all (MODEST_ATTACHMENTS_VIEW (focused_widget)); } else if (GTK_IS_LABEL (focused_widget)) { @@ -4104,7 +4449,8 @@ modest_ui_actions_on_toggle_fullscreen (GtkToggleAction *toggle, if (active != fullscreen) { modest_window_mgr_set_fullscreen_mode (mgr, active); #ifndef MODEST_TOOLKIT_HILDON2 - gtk_window_present (GTK_WINDOW (window)); + GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) window); + gtk_window_present (toplevel); #endif } } @@ -4122,9 +4468,6 @@ modest_ui_actions_on_change_fullscreen (GtkAction *action, fullscreen = modest_window_mgr_get_fullscreen_mode (mgr); modest_window_mgr_set_fullscreen_mode (mgr, !fullscreen); -#ifndef MODEST_TOOLKIT_HILDON2 - gtk_window_present (GTK_WINDOW (window)); -#endif } /* @@ -4137,15 +4480,18 @@ headers_action_show_details (TnyHeader *header, { gboolean async_retrieval; + GtkWindow *toplevel; TnyMsg *msg = NULL; 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; } - modest_platform_run_header_details_dialog (GTK_WINDOW (window), header, async_retrieval, msg); + toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) window); + modest_platform_run_header_details_dialog (toplevel, header, async_retrieval, msg); if (msg) g_object_unref (msg); } @@ -4178,8 +4524,9 @@ modest_ui_actions_on_details (GtkAction *action, header_view = GTK_WIDGET (modest_header_window_get_header_view (MODEST_HEADER_WINDOW (win))); folder = modest_header_view_get_folder (MODEST_HEADER_VIEW (header_view)); if (folder) { - modest_platform_run_folder_details_dialog (GTK_WINDOW (win), - folder); + GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win); + + modest_platform_run_folder_details_dialog (toplevel, folder); g_object_unref (folder); } } @@ -4191,7 +4538,7 @@ modest_ui_actions_on_limit_error (GtkAction *action, { g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (win)); - modest_platform_information_banner ((GtkWidget *) win, NULL, _CS("ckdg_ib_maximum_characters_reached")); + modest_platform_information_banner ((GtkWidget *) win, NULL, _CS_MAXIMUM_CHARACTERS_REACHED); } @@ -4301,7 +4648,7 @@ on_move_to_dialog_response (GtkDialog *dialog, case MODEST_GTK_RESPONSE_NEW_FOLDER: selected = modest_folder_view_get_selected (folder_view); - modest_ui_actions_create_folder (GTK_WIDGET (dialog), GTK_WIDGET (folder_view), selected); + modest_ui_actions_create_folder ((GtkWindow *) dialog, GTK_WIDGET (folder_view), selected); g_object_unref (selected); return; case GTK_RESPONSE_NONE: @@ -4318,7 +4665,7 @@ on_move_to_dialog_response (GtkDialog *dialog, modest_ui_actions_on_folder_window_move_to (GTK_WIDGET (folder_view), dst_folder, helper->list, - GTK_WINDOW (parent_win)); + MODEST_WINDOW (parent_win)); } else { /* if the user selected a root folder (account) then do not perform any action */ @@ -4390,13 +4737,13 @@ create_move_to_dialog (GtkWindow *win, ModestAccountMgr *mgr = NULL; ModestAccountSettings *settings = NULL; ModestServerAccountSettings *store_settings = NULL; + ModestWindow *modest_window; 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)); + modest_window = modest_shell_peek_window (MODEST_SHELL (win)); + active_account_name = modest_window_get_active_account (modest_window); mgr = modest_runtime_get_account_mgr (); settings = modest_account_mgr_load_account_settings (mgr, active_account_name); @@ -4419,14 +4766,8 @@ create_move_to_dialog (GtkWindow *win, g_object_set_data (G_OBJECT(dialog), MODEST_MOVE_TO_DIALOG_FOLDER_VIEW, tree_view); /* Hide special folders */ -#ifndef MODEST_TOOLKIT_HILDON2 - modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (tree_view), FALSE); -#endif if (list_to_move) modest_folder_view_set_list_to_move (MODEST_FOLDER_VIEW (tree_view), list_to_move); -#ifndef MODEST_TOOLKIT_HILDON2 - modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (tree_view)); -#endif gtk_widget_show (GTK_WIDGET (tree_view)); @@ -4595,7 +4936,7 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op, * wants to connect to complete it */ static void -modest_ui_actions_xfer_messages_check (GtkWindow *parent_window, +modest_ui_actions_xfer_messages_check (ModestWindow *parent_window, TnyFolderStore *src_folder, TnyList *headers, TnyFolder *dst_folder, @@ -4632,12 +4973,14 @@ modest_ui_actions_xfer_messages_check (GtkWindow *parent_window, if (uncached_msgs > 0) { guint num_headers; const gchar *msg; + GtkWindow *toplevel; *need_connection = TRUE; num_headers = tny_list_get_length (headers); msg = ngettext ("mcen_nc_get_msg", "mcen_nc_get_msgs", num_headers); + toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) parent_window); - if (modest_platform_run_confirmation_dialog (parent_window, msg) == + if (modest_platform_run_confirmation_dialog (toplevel, msg) == GTK_RESPONSE_CANCEL) { *do_xfer = FALSE; } else { @@ -4709,11 +5052,10 @@ typedef struct { static void xfer_messages_performer (gboolean canceled, GError *err, - GtkWindow *parent_window, + ModestWindow *parent_window, TnyAccount *account, gpointer user_data) { - ModestWindow *win = MODEST_WINDOW (parent_window); TnyAccount *dst_account = NULL; gboolean dst_forbids_message_add = FALSE; XferMsgsHelper *helper; @@ -4740,7 +5082,7 @@ xfer_messages_performer (gboolean canceled, MODEST_PROTOCOL_REGISTRY_STORE_FORBID_INCOMING_XFERS); if (dst_forbids_message_add) { - modest_platform_information_banner (GTK_WIDGET (win), + modest_platform_information_banner (GTK_WIDGET (parent_window), NULL, ngettext("mail_in_ui_folder_move_target_error", "mail_in_ui_folder_move_targets_error", @@ -4752,7 +5094,7 @@ xfer_messages_performer (gboolean canceled, /* Perform the mail operation */ - mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(win), + mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window), xfer_messages_error_handler, g_object_ref (dst_account), g_object_unref); @@ -4785,7 +5127,7 @@ typedef struct { static void on_move_folder_cb (gboolean canceled, GError *err, - GtkWindow *parent_window, + ModestWindow *parent_window, TnyAccount *account, gpointer user_data) { @@ -4811,7 +5153,7 @@ on_move_folder_cb (gboolean canceled, MoveToHelper *helper = g_new0 (MoveToHelper, 1); #ifndef MODEST_TOOLKIT_HILDON2 helper->banner = modest_platform_animation_banner (GTK_WIDGET (parent_window), NULL, - _CS("ckct_nw_pasting")); + _CS_PASTING); if (helper->banner != NULL) { g_object_ref (helper->banner); gtk_widget_show (GTK_WIDGET(helper->banner)); @@ -4863,7 +5205,6 @@ get_account_from_folder_store (TnyFolderStore *folder_store) return tny_folder_get_account (TNY_FOLDER (folder_store)); } -#ifdef MODEST_TOOLKIT_HILDON2 /* * UI handler for the "Move to" action when invoked from the * ModestFolderWindow @@ -4872,7 +5213,7 @@ static void modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view, TnyFolderStore *dst_folder, TnyList *selection, - GtkWindow *win) + ModestWindow *win) { TnyFolderStore *src_folder = NULL; TnyIterator *iterator; @@ -4891,9 +5232,11 @@ modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view, if (TNY_IS_ACCOUNT (dst_folder) && !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder) && !modest_tny_account_is_memory_card_account (TNY_ACCOUNT (dst_folder))) { + GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win); + do_xfer = FALSE; /* Show an error */ - modest_platform_run_information_dialog (win, + modest_platform_run_information_dialog (toplevel, _("mail_in_ui_folder_move_target_error"), FALSE); } else if (!TNY_IS_FOLDER (src_folder)) { @@ -4914,7 +5257,7 @@ modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view, connect_info->dst_account = get_account_from_folder_store (TNY_FOLDER_STORE (dst_folder)); connect_info->data = info; - modest_platform_double_connect_and_perform(GTK_WINDOW (win), TRUE, + modest_platform_double_connect_and_perform(win, TRUE, TNY_FOLDER_STORE (src_folder), connect_info); } @@ -4922,11 +5265,10 @@ modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view, /* Frees */ g_object_unref (src_folder); } -#endif void -modest_ui_actions_transfer_messages_helper (GtkWindow *win, +modest_ui_actions_transfer_messages_helper (ModestWindow *win, TnyFolder *src_folder, TnyList *headers, TnyFolder *dst_folder) @@ -4959,12 +5301,12 @@ modest_ui_actions_transfer_messages_helper (GtkWindow *win, connect_info->dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder)); connect_info->data = helper; - modest_platform_double_connect_and_perform(GTK_WINDOW (win), TRUE, + modest_platform_double_connect_and_perform(win, TRUE, TNY_FOLDER_STORE (src_folder), connect_info); } else { TnyAccount *src_account = get_account_from_folder_store (TNY_FOLDER_STORE (src_folder)); - xfer_messages_performer (FALSE, NULL, GTK_WINDOW (win), + xfer_messages_performer (FALSE, NULL, win, src_account, helper); g_object_unref (src_account); } @@ -4993,7 +5335,7 @@ modest_ui_actions_on_window_move_to (GtkAction *action, src_folder = tny_header_get_folder (header); /* Transfer the messages */ - modest_ui_actions_transfer_messages_helper (GTK_WINDOW (win), src_folder, + modest_ui_actions_transfer_messages_helper (win, src_folder, headers, TNY_FOLDER (dst_folder)); @@ -5015,6 +5357,7 @@ gboolean modest_ui_actions_on_edit_mode_move_to (ModestWindow *win) { GtkWidget *dialog = NULL; + GtkWindow *toplevel = NULL; MoveToInfo *helper = NULL; TnyList *list_to_move; @@ -5032,10 +5375,11 @@ modest_ui_actions_on_edit_mode_move_to (ModestWindow *win) } /* Create and run the dialog */ - dialog = create_move_to_dialog (GTK_WINDOW (win), NULL, list_to_move); + toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win); + dialog = create_move_to_dialog (toplevel, NULL, list_to_move); modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), - (GtkWindow *) win); + toplevel); /* Create helper */ helper = g_slice_new0 (MoveToInfo); @@ -5143,9 +5487,11 @@ modest_ui_actions_on_settings (GtkAction *action, ModestWindow *win) { GtkWidget *dialog; + GtkWindow *toplevel; dialog = modest_platform_get_global_settings_dialog (); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (win)); + toplevel = (GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (win)); + gtk_window_set_transient_for (GTK_WINDOW (dialog), toplevel); gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); gtk_widget_show_all (dialog); @@ -5167,7 +5513,7 @@ modest_ui_actions_on_help (GtkAction *action, help_id = modest_window_mgr_get_help_id (modest_runtime_get_window_mgr(), win); if (help_id) - modest_platform_show_help (GTK_WINDOW (win), help_id); + modest_platform_show_help (win, help_id); #endif } @@ -5196,7 +5542,7 @@ retrieve_contents_cb (ModestMailOperation *mail_op, static void retrieve_msg_contents_performer (gboolean canceled, GError *err, - GtkWindow *parent_window, + ModestWindow *parent_window, TnyAccount *account, gpointer user_data) { @@ -5249,7 +5595,7 @@ modest_ui_actions_on_retrieve_msg_contents (GtkAction *action, g_object_unref (iter); /* Connect and perform the message retrieval */ - modest_platform_connect_and_perform ((GtkWindow *) window, TRUE, + modest_platform_connect_and_perform (window, TRUE, g_object_ref (account), retrieve_msg_contents_performer, g_object_ref (headers)); @@ -5370,6 +5716,8 @@ modest_ui_actions_on_header_view_csm_menu_activated (GtkAction *action, void modest_ui_actions_on_search_messages (GtkAction *action, ModestWindow *window) { + GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) window); + g_return_if_fail (MODEST_IS_WINDOW (window)); /* we check for low-mem; in that case, show a warning, and don't allow @@ -5378,14 +5726,15 @@ modest_ui_actions_on_search_messages (GtkAction *action, ModestWindow *window) if (modest_platform_check_memory_low (window, TRUE)) return; - modest_platform_show_search_messages (GTK_WINDOW (window)); + modest_platform_show_search_messages (toplevel); } void modest_ui_actions_on_open_addressbook (GtkAction *action, ModestWindow *win) { - g_return_if_fail (MODEST_IS_WINDOW (win)); + GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win); + g_return_if_fail (MODEST_IS_WINDOW (win)); /* we check for low-mem; in that case, show a warning, and don't allow * for the addressbook @@ -5393,8 +5742,7 @@ modest_ui_actions_on_open_addressbook (GtkAction *action, ModestWindow *win) if (modest_platform_check_memory_low (win, TRUE)) return; - - modest_platform_show_addressbook (GTK_WINDOW (win)); + modest_platform_show_addressbook (toplevel); } @@ -5476,7 +5824,7 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, server_name); break; case TNY_SERVICE_ERROR_SEND: - message = g_strdup (_CS("sfil_ib_unable_to_send")); + message = g_strdup (_CS_UNABLE_TO_SEND); break; case TNY_SERVICE_ERROR_UNAVAILABLE: message = modest_protocol_get_translation (protocol, @@ -5486,7 +5834,7 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, default: g_warning ("%s: unexpected ERROR %d", __FUNCTION__, err->code); - message = g_strdup (_CS("sfil_ib_unable_to_send")); + message = g_strdup (_CS_UNABLE_TO_SEND); break; } @@ -5551,7 +5899,7 @@ modest_ui_actions_on_send_queue_status_changed (ModestTnySendQueue *send_queue, } void -modest_ui_actions_on_account_connection_error (GtkWindow *parent_window, +modest_ui_actions_on_account_connection_error (ModestWindow *parent_window, TnyAccount *account) { ModestProtocolType protocol_type; @@ -5566,7 +5914,8 @@ modest_ui_actions_on_account_connection_error (GtkWindow *parent_window, if (error_note == NULL) { g_warning ("%s: This should not be reached", __FUNCTION__); } else { - modest_platform_run_information_dialog (parent_window, error_note, FALSE); + GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) parent_window); + modest_platform_run_information_dialog (toplevel, error_note, FALSE); g_free (error_note); } } @@ -5678,11 +6027,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__); } @@ -5693,7 +6045,7 @@ modest_ui_actions_on_delete_account (GtkWindow *parent_window, static void on_fetch_images_performer (gboolean canceled, GError *err, - GtkWindow *parent_window, + ModestWindow *parent_window, TnyAccount *account, gpointer user_data) { @@ -5714,9 +6066,9 @@ modest_ui_actions_on_fetch_images (GtkAction *action, { g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window)); - modest_platform_connect_and_perform ((GtkWindow *) window, TRUE, + modest_platform_connect_and_perform (window, TRUE, NULL, - on_fetch_images_performer, + on_fetch_images_performer, g_object_ref (window)); } @@ -5791,8 +6143,8 @@ modest_ui_actions_check_for_active_account (ModestWindow *self, if (store_conn_status == TNY_CONNECTION_STATUS_CONNECTED || sending) { gint response; - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self), - _("emev_nc_disconnect_account")); + response = modest_platform_run_confirmation_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (self))), + _("emev_nc_disconnect_account")); if (response == GTK_RESPONSE_OK) { retval = TRUE; } else {