X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=49336883bf3a7a70cc4f94462f05b4f9652998f6;hb=07b4b24bacfc227ccd63df56a0ee7734ececd4fd;hp=60f38ce7457ffafcc3754c89b6508c641d52efe9;hpb=830c157acdebd1bacc20d2a2a10e3ec40d376591;p=modest diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 60f38ce..4933688 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,7 @@ typedef struct _ReplyForwardHelper { gchar *mailbox; GtkWidget *parent_window; TnyHeader *header; + TnyList *parts; } ReplyForwardHelper; typedef struct _MoveToHelper { @@ -147,15 +150,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 +158,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 +167,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 +229,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 +258,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 +277,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,37 +320,6 @@ 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, @@ -443,7 +411,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 +572,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 +598,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 @@ -727,10 +693,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; } @@ -773,11 +739,29 @@ modest_ui_actions_compose_msg(ModestWindow *win, 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(""); + + gchar *gray_color_markup = NULL, *color_begin = NULL, *color_end = NULL; + GdkColor color; + + if (win && gtk_style_lookup_color (gtk_widget_get_style ((GtkWidget *) win), + "SecondaryTextColor", &color)) + gray_color_markup = modest_text_utils_get_color_string (&color); + if (!gray_color_markup) + gray_color_markup = g_strdup ("#babababababa"); + + color_begin = g_strdup_printf ("", gray_color_markup); + color_end = ""; + + body = use_signature ? g_strconcat("
\n", color_begin, + MODEST_TEXT_UTILS_SIGNATURE_MARKER, "
\n", + signature, color_end, NULL) : g_strdup(""); + + g_free (gray_color_markup); + g_free (color_begin); } - msg = modest_tny_msg_new (to_str, from_str, cc_str, bcc_str, subject_str, NULL, NULL, body, NULL, NULL, NULL); + msg = modest_tny_msg_new_html_plain (to_str, from_str, cc_str, bcc_str, subject_str, + NULL, NULL, body, NULL, NULL, NULL, NULL, NULL); if (!msg) { g_printerr ("modest: failed to create new msg\n"); goto cleanup; @@ -854,8 +838,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); @@ -1152,7 +1139,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 +1248,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 +1299,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 +1317,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 +1406,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 +1423,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 +1452,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 +1521,8 @@ static ReplyForwardHelper* create_reply_forward_helper (ReplyForwardAction action, ModestWindow *win, guint reply_forward_type, - TnyHeader *header) + TnyHeader *header, + TnyList *parts) { ReplyForwardHelper *rf_helper = NULL; const gchar *active_acc = modest_window_get_active_account (win); @@ -1541,6 +1537,10 @@ create_reply_forward_helper (ReplyForwardAction action, 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 +1562,8 @@ free_reply_forward_helper (gpointer data) g_free (helper->mailbox); if (helper->header) g_object_unref (helper->header); + 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); @@ -1720,27 +1722,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 +1764,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->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 */ @@ -1804,13 +1876,57 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) msg = modest_msg_view_window_get_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); 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) { + /* 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; + + /* Create helper */ + pending_parts = forward_pending_parts (msg); + rf_helper = create_reply_forward_helper (action, win, + reply_forward_type, header, pending_parts); + g_object_unref (pending_parts); + + folder = tny_header_get_folder (header); + account = tny_folder_get_account (folder); + modest_platform_connect_and_perform (win, + TRUE, account, + reply_forward_performer, + rf_helper); + g_object_unref (folder); + g_object_unref (account); + } + + } else { + g_warning("%s: no message or header found in viewer\n", __FUNCTION__); + } } if (msg) @@ -1862,9 +1978,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 +1995,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); 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); } } @@ -1965,13 +2082,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 +2220,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 +2336,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 +2506,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 +2525,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 +2539,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 +2652,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; } @@ -2639,7 +2757,7 @@ gboolean modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) { TnyTransportAccount *transport_account = NULL; - gboolean had_error = FALSE; + gboolean had_error = FALSE, add_to_contacts; MsgData *data; ModestAccountMgr *account_mgr; gchar *account_name; @@ -2648,8 +2766,10 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) 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); @@ -2732,7 +2852,7 @@ 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; } } @@ -2863,7 +2983,6 @@ modest_ui_actions_on_select_editor_background_color (GtkAction *action, if (modest_msg_edit_window_get_format (MODEST_MSG_EDIT_WINDOW(window)) == MODEST_MSG_EDIT_FORMAT_TEXT) return; - modest_msg_edit_window_select_background_color (window); } void @@ -2940,11 +3059,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; @@ -2971,10 +3091,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; @@ -3020,15 +3140,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, @@ -3039,7 +3161,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, @@ -3053,7 +3175,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) { @@ -3067,7 +3189,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); } } @@ -3080,9 +3202,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 (); } @@ -3108,14 +3232,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 @@ -3149,10 +3273,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)); } @@ -3160,7 +3280,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) { @@ -3241,7 +3361,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); @@ -3252,7 +3372,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); } } @@ -3265,8 +3385,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); @@ -3279,17 +3400,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; + +#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(parent_window) || canceled || (err!=NULL)) { + 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 */ @@ -3302,8 +3434,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); @@ -3324,10 +3456,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); @@ -3358,7 +3486,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)); @@ -3368,7 +3496,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); @@ -3380,7 +3508,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); @@ -3439,7 +3567,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; @@ -3461,7 +3589,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), @@ -3663,7 +3791,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); @@ -3715,7 +3843,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; @@ -3765,7 +3893,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 @@ -3780,7 +3908,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 @@ -3789,13 +3917,6 @@ modest_ui_actions_on_undo (GtkAction *action, { if (MODEST_IS_MSG_EDIT_WINDOW (window)) { modest_msg_edit_window_undo (MODEST_MSG_EDIT_WINDOW (window)); -#ifndef MODEST_TOOLKIT_HILDON2 - } else if (MODEST_IS_MAIN_WINDOW (window)) { - ModestEmailClipboard *clipboard = NULL; - /* Clear clipboard source */ - clipboard = modest_runtime_get_email_clipboard (); - modest_email_clipboard_clear (clipboard); -#endif } else { g_return_if_reached (); } @@ -3868,7 +3989,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)) { @@ -3889,7 +4010,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) { @@ -3946,7 +4067,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)); @@ -3966,7 +4087,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)); @@ -3998,7 +4119,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)) { @@ -4015,31 +4136,6 @@ modest_ui_actions_on_select_all (GtkAction *action, gtk_text_buffer_select_range (buffer, &start, &end); } else if (GTK_IS_HTML (focused_widget)) { gtk_html_select_all (GTK_HTML (focused_widget)); -#ifndef MODEST_TOOLKIT_HILDON2 - } else if (MODEST_IS_MAIN_WINDOW (window)) { - GtkWidget *header_view = focused_widget; - GtkTreeSelection *selection = NULL; - - if (!(MODEST_IS_HEADER_VIEW (focused_widget))) { - header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window), - MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); - } - - /* Disable window dimming management */ - modest_window_disable_dimming (MODEST_WINDOW(window)); - - /* Select all messages */ - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(header_view)); - gtk_tree_selection_select_all (selection); - - /* Set focuse on header view */ - gtk_widget_grab_focus (header_view); - - /* Enable window dimming management */ - modest_window_enable_dimming (MODEST_WINDOW(window)); - modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window)); - modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); -#endif } } @@ -4137,7 +4233,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 } } @@ -4155,9 +4252,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 } /* @@ -4170,15 +4264,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); } @@ -4204,37 +4301,6 @@ modest_ui_actions_on_details (GtkAction *action, g_object_unref (header); } g_object_unref (msg); -#ifndef MODEST_TOOLKIT_HILDON2 - } else if (MODEST_IS_MAIN_WINDOW (win)) { - GtkWidget *folder_view, *header_view; - - /* Check which widget has the focus */ - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - if (gtk_widget_is_focus (folder_view)) { - TnyFolderStore *folder_store - = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); - if (!folder_store) { - g_warning ("%s: No item was selected.\n", __FUNCTION__); - return; - } - /* Show only when it's a folder */ - /* This function should not be called for account items, - * because we dim the menu item for them. */ - if (TNY_IS_FOLDER (folder_store)) { - modest_platform_run_folder_details_dialog (GTK_WINDOW (win), - TNY_FOLDER (folder_store)); - } - - g_object_unref (folder_store); - - } else { - header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); - /* Show details of each header */ - do_headers_action (win, headers_action_show_details, header_view); - } -#else } else if (MODEST_IS_HEADER_WINDOW (win)) { TnyFolder *folder; GtkWidget *header_view; @@ -4242,11 +4308,11 @@ 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); } -#endif } } @@ -4256,7 +4322,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); } @@ -4278,19 +4344,6 @@ modest_ui_actions_on_toggle_show_bcc (GtkToggleAction *toggle, modest_msg_edit_window_show_bcc (window, gtk_toggle_action_get_active (toggle)); } -#ifndef MODEST_TOOLKIT_HILDON2 -void -modest_ui_actions_toggle_folders_view (GtkAction *action, - ModestMainWindow *main_window) -{ - g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); - - if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) - modest_main_window_set_style (main_window, MODEST_MAIN_WINDOW_STYLE_SPLIT); - else - modest_main_window_set_style (main_window, MODEST_MAIN_WINDOW_STYLE_SIMPLE); -} -#endif void modest_ui_actions_on_toggle_toolbar (GtkToggleAction *toggle, @@ -4357,152 +4410,6 @@ modest_ui_actions_on_check_names (GtkAction *action, ModestMsgEditWindow *window modest_msg_edit_window_check_names (window, FALSE); } -#ifndef MODEST_TOOLKIT_HILDON2 -/* - * This function is used to track changes in the selection of the - * folder view that is inside the "move to" dialog to enable/disable - * the OK button because we do not want the user to select a disallowed - * destination for a folder. - * The user also not desired to be able to use NEW button on items where - * folder creation is not possibel. - */ -static void -on_move_to_dialog_folder_selection_changed (ModestFolderView* self, - TnyFolderStore *folder_store, - gboolean selected, - gpointer user_data) -{ - GtkWidget *dialog = NULL; - gboolean ok_sensitive = TRUE, new_sensitive = TRUE; - gboolean moving_folder = FALSE; - gboolean is_local_account = TRUE; - GtkWidget *folder_view = NULL; - ModestTnyFolderRules rules; - - g_return_if_fail (MODEST_IS_FOLDER_VIEW(self)); - - if (!selected) - return; - - dialog = gtk_widget_get_ancestor (GTK_WIDGET (self), GTK_TYPE_DIALOG); - if (!dialog) - return; - - /* check if folder_store is an remote account */ - if (TNY_IS_ACCOUNT (folder_store)) { - TnyAccount *local_account = NULL; - TnyAccount *mmc_account = NULL; - ModestTnyAccountStore *account_store = NULL; - - account_store = modest_runtime_get_account_store (); - local_account = modest_tny_account_store_get_local_folders_account (account_store); - mmc_account = modest_tny_account_store_get_mmc_folders_account (account_store); - - if ((gpointer) local_account != (gpointer) folder_store && - (gpointer) mmc_account != (gpointer) folder_store) { - ModestProtocolType proto; - proto = modest_tny_account_get_protocol_type (TNY_ACCOUNT (folder_store)); - if (proto == MODEST_PROTOCOL_REGISTRY_TYPE_INVALID) { - proto = MODEST_PROTOCOLS_STORE_MAILDIR; - } - is_local_account = FALSE; - /* New button should be dimmed on remote - POP account root */ - new_sensitive = (modest_protocol_registry_protocol_type_has_tag (modest_runtime_get_protocol_registry (), - proto, - MODEST_PROTOCOL_REGISTRY_STORE_HAS_FOLDERS)); - } - g_object_unref (local_account); - - /* It could not exist */ - if (mmc_account) - g_object_unref (mmc_account); - } - - /* Check the target folder rules */ - if (TNY_IS_FOLDER (folder_store)) { - rules = modest_tny_folder_get_rules (TNY_FOLDER (folder_store)); - if (rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) { - ok_sensitive = FALSE; - new_sensitive = FALSE; - goto end; - } - } - - /* Check if we're moving a folder */ - if (MODEST_IS_MAIN_WINDOW (user_data)) { - /* Get the widgets */ - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (user_data), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - if (gtk_widget_is_focus (folder_view)) - moving_folder = TRUE; - } - - if (moving_folder) { - TnyFolderStore *moved_folder = NULL, *parent = NULL; - - /* Get the folder to move */ - moved_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); - - /* Check that we're not moving to the same folder */ - if (TNY_IS_FOLDER (moved_folder)) { - parent = tny_folder_get_folder_store (TNY_FOLDER (moved_folder)); - if (parent == folder_store) - ok_sensitive = FALSE; - g_object_unref (parent); - } - - if (ok_sensitive && TNY_IS_ACCOUNT (folder_store)) { - /* Do not allow to move to an account unless it's the - local folders account */ - if (!is_local_account) - ok_sensitive = FALSE; - } - - if (ok_sensitive && (moved_folder == folder_store)) { - /* Do not allow to move to itself */ - ok_sensitive = FALSE; - } - g_object_unref (moved_folder); - } else { - TnyFolder *src_folder = NULL; - - /* Moving a message */ - if (MODEST_IS_MSG_VIEW_WINDOW (user_data)) { - - TnyHeader *header = NULL; - header = modest_msg_view_window_get_header - (MODEST_MSG_VIEW_WINDOW (user_data)); - if (!TNY_IS_HEADER(header)) - g_warning ("%s: could not get source header", __FUNCTION__); - else - src_folder = tny_header_get_folder (header); - - if (header) - g_object_unref (header); - } else { - src_folder = - TNY_FOLDER (modest_folder_view_get_selected - (MODEST_FOLDER_VIEW (folder_view))); - } - - if (TNY_IS_FOLDER(src_folder)) { - /* Do not allow to move the msg to the same folder */ - /* Do not allow to move the msg to an account */ - if ((gpointer) src_folder == (gpointer) folder_store || - TNY_IS_ACCOUNT (folder_store)) - ok_sensitive = FALSE; - g_object_unref (src_folder); - } else - g_warning ("%s: could not get source folder", __FUNCTION__); - } - - end: - /* Set sensitivity of the OK and NEW button */ - gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, ok_sensitive); - gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), MODEST_GTK_RESPONSE_NEW_FOLDER, new_sensitive); -} -#endif static void on_move_to_dialog_response (GtkDialog *dialog, @@ -4525,7 +4432,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: @@ -4542,7 +4449,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 */ @@ -4617,8 +4524,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 (); @@ -4643,14 +4548,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)); @@ -4756,24 +4655,6 @@ move_to_cb (ModestMailOperation *mail_op, /* No more messages to view, so close this window */ modest_ui_actions_on_close_window (NULL, MODEST_WINDOW(self)); } -#ifndef MODEST_TOOLKIT_HILDON2 - } else if (MODEST_IS_MAIN_WINDOW (object) && - gtk_tree_row_reference_valid (helper->reference)) { - GtkWidget *header_view; - GtkTreePath *path; - GtkTreeSelection *sel; - - header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(object), - MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); - sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view)); - path = gtk_tree_row_reference_get_path (helper->reference); - /* We need to unselect the previous one - because we could be copying instead of - moving */ - gtk_tree_selection_unselect_all (sel); - gtk_tree_selection_select_path (sel, path); - gtk_tree_path_free (path); -#endif } g_object_unref (object); @@ -4790,20 +4671,7 @@ folder_move_to_cb (ModestMailOperation *mail_op, GObject *object; object = modest_mail_operation_get_source (mail_op); -#ifndef MODEST_TOOLKIT_HILDON2 - if (MODEST_IS_MAIN_WINDOW (object)) { - GtkWidget *folder_view; - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(object), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - g_object_ref (folder_view); - g_object_unref (object); - move_to_cb (mail_op, user_data); - modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), new_folder, FALSE); - g_object_unref (folder_view); - } else { -#else - { -#endif + { move_to_cb (mail_op, user_data); } } @@ -4823,27 +4691,6 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op, const GError *error; TnyAccount *account = NULL; -#ifndef MODEST_TOOLKIT_HILDON2 - ModestWindow *main_window = NULL; - - /* Disable next automatic folder selection */ - main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), - FALSE); /* don't create */ - - /* Show notification dialog only if the main window exists */ - if (main_window) { - GtkWidget *folder_view = NULL; - - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (main_window), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - modest_folder_view_disable_next_folder_selection (MODEST_FOLDER_VIEW(folder_view)); - - if (user_data && TNY_IS_FOLDER (user_data)) { - modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), - TNY_FOLDER (user_data), FALSE); - } - } -#endif win = modest_mail_operation_get_source (mail_op); error = modest_mail_operation_get_error (mail_op); @@ -4865,157 +4712,13 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op, g_object_unref (win); } -#ifndef MODEST_TOOLKIT_HILDON2 -static void -open_msg_for_purge_cb (ModestMailOperation *mail_op, - TnyHeader *header, - gboolean canceled, - TnyMsg *msg, - GError *err, - gpointer user_data) -{ - TnyList *parts; - TnyIterator *iter; - gint pending_purges = 0; - gboolean some_purged = FALSE; - ModestWindow *win = MODEST_WINDOW (user_data); - ModestWindowMgr *mgr = modest_runtime_get_window_mgr (); - - /* If there was any error */ - if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) { - modest_window_mgr_unregister_header (mgr, header); - return; - } - - /* Once the message has been retrieved for purging, we check if - * it's all ok for purging */ - - parts = tny_simple_list_new (); - tny_mime_part_get_parts (TNY_MIME_PART (msg), parts); - iter = tny_list_create_iterator (parts); - - while (!tny_iterator_is_done (iter)) { - TnyMimePart *part; - part = TNY_MIME_PART (tny_iterator_get_current (iter)); - if (part && (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part))) { - if (tny_mime_part_is_purged (part)) - some_purged = TRUE; - else - pending_purges++; - } - - if (part) - g_object_unref (part); - - tny_iterator_next (iter); - } - g_object_unref (iter); - - - if (pending_purges>0) { - gint response; - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),_("mcen_nc_purge_file_text_inbox")); - - if (response == GTK_RESPONSE_OK) { - GtkWidget *info; - info = - modest_platform_animation_banner (GTK_WIDGET (win), NULL, _("mcen_me_inbox_remove_attachments")); - iter = tny_list_create_iterator (parts); - while (!tny_iterator_is_done (iter)) { - TnyMimePart *part; - - part = TNY_MIME_PART (tny_iterator_get_current (iter)); - if (part && (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part))) - tny_mime_part_set_purged (part); - - if (part) - g_object_unref (part); - - tny_iterator_next (iter); - } - g_object_unref (iter); - - tny_msg_rewrite_cache (msg); - - gtk_widget_destroy (info); - } - } - - modest_window_mgr_unregister_header (mgr, header); - - g_object_unref (parts); -} - -static void -modest_ui_actions_on_main_window_remove_attachments (GtkAction *action, - ModestMainWindow *win) -{ - GtkWidget *header_view; - TnyList *header_list; - TnyHeader *header; - TnyHeaderFlags flags; - ModestWindow *msg_view_window = NULL; - gboolean found; - - g_return_if_fail (MODEST_IS_MAIN_WINDOW (win)); - - header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); - - header_list = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (header_view)); - if (!header_list) { - g_warning ("%s: no header selected", __FUNCTION__); - return; - } - - if (tny_list_get_length (header_list) == 1) { - TnyIterator *iter = tny_list_create_iterator (header_list); - header = TNY_HEADER (tny_iterator_get_current (iter)); - g_object_unref (iter); - } else - return; - - if (!header || !TNY_IS_HEADER(header)) { - g_warning ("%s: header is not valid", __FUNCTION__); - return; - } - - found = modest_window_mgr_find_registered_header (modest_runtime_get_window_mgr (), - header, &msg_view_window); - flags = tny_header_get_flags (header); - if (!(flags & TNY_HEADER_FLAG_CACHED)) - return; - if (found) { - if (msg_view_window != NULL) - modest_msg_view_window_remove_attachments (MODEST_MSG_VIEW_WINDOW (msg_view_window), TRUE); - else { - /* do nothing; uid was registered before, so window is probably on it's way */ - g_debug ("header %p has already been registered", header); - } - } else { - ModestMailOperation *mail_op = NULL; - modest_window_mgr_register_header (modest_runtime_get_window_mgr (), header, NULL); - mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (win), - modest_ui_actions_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, header, FALSE, open_msg_for_purge_cb, win); - - g_object_unref (mail_op); - } - if (header) - g_object_unref (header); - if (header_list) - g_object_unref (header_list); -} -#endif /* * Checks if we need a connection to do the transfer and if the user * 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, @@ -5052,12 +4755,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 { @@ -5129,11 +4834,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; @@ -5160,7 +4864,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", @@ -5170,24 +4874,9 @@ xfer_messages_performer (gboolean canceled, movehelper = g_new0 (MoveToHelper, 1); -#ifndef MODEST_TOOLKIT_HILDON2 - movehelper->banner = modest_platform_animation_banner (GTK_WIDGET (win), NULL, - _CS("ckct_nw_pasting")); - if (movehelper->banner != NULL) { - g_object_ref (movehelper->banner); - gtk_widget_show (GTK_WIDGET (movehelper->banner)); - } - - if (MODEST_IS_MAIN_WINDOW (win)) { - GtkWidget *header_view = - modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); - movehelper->reference = get_next_after_selected_headers (MODEST_HEADER_VIEW (header_view)); - } -#endif /* 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); @@ -5220,7 +4909,7 @@ typedef struct { static void on_move_folder_cb (gboolean canceled, GError *err, - GtkWindow *parent_window, + ModestWindow *parent_window, TnyAccount *account, gpointer user_data) { @@ -5246,7 +4935,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)); @@ -5272,12 +4961,6 @@ on_move_folder_cb (gboolean canceled, modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); -#ifndef MODEST_TOOLKIT_HILDON2 - if (MODEST_IS_MAIN_WINDOW (parent_window)) { - modest_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view), - TNY_FOLDER (info->dst_folder), TRUE); - } -#endif modest_mail_operation_xfer_folder (mail_op, TNY_FOLDER (info->src_folder), info->dst_folder, @@ -5304,78 +4987,6 @@ get_account_from_folder_store (TnyFolderStore *folder_store) return tny_folder_get_account (TNY_FOLDER (folder_store)); } -#ifndef MODEST_TOOLKIT_HILDON2 -/* - * UI handler for the "Move to" action when invoked from the - * ModestMainWindow - */ -static void -modest_ui_actions_on_main_window_move_to (GtkAction *action, - GtkWidget *folder_view, - TnyFolderStore *dst_folder, - ModestMainWindow *win) -{ - ModestHeaderView *header_view = NULL; - TnyFolderStore *src_folder = NULL; - - g_return_if_fail (MODEST_IS_MAIN_WINDOW (win)); - - /* Get the source folder */ - src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); - - /* Get header view */ - header_view = (ModestHeaderView *) - modest_main_window_get_child_widget (win, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); - - /* Get folder or messages to transfer */ - if (gtk_widget_is_focus (folder_view)) { - gboolean do_xfer = TRUE; - - /* Allow only to transfer folders to the local root folder */ - 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))) { - do_xfer = FALSE; - } else if (!TNY_IS_FOLDER (src_folder)) { - g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__); - do_xfer = FALSE; - } - - if (do_xfer) { - MoveFolderInfo *info = g_new0 (MoveFolderInfo, 1); - DoubleConnectionInfo *connect_info = g_slice_new (DoubleConnectionInfo); - - info->src_folder = g_object_ref (src_folder); - info->dst_folder = g_object_ref (dst_folder); - info->delete_original = TRUE; - info->folder_view = folder_view; - - connect_info->callback = on_move_folder_cb; - 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, - TNY_FOLDER_STORE (src_folder), - connect_info); - } - } else if (gtk_widget_is_focus (GTK_WIDGET(header_view))) { - TnyList *headers; - - headers = modest_header_view_get_selected_headers(header_view); - - /* Transfer the messages */ - modest_ui_actions_transfer_messages_helper (GTK_WINDOW (win), TNY_FOLDER (src_folder), - headers, TNY_FOLDER (dst_folder)); - - g_object_unref (headers); - } - - /* Frees */ - g_object_unref (src_folder); -} -#endif - -#ifdef MODEST_TOOLKIT_HILDON2 /* * UI handler for the "Move to" action when invoked from the * ModestFolderWindow @@ -5384,7 +4995,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; @@ -5403,9 +5014,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)) { @@ -5426,7 +5039,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); } @@ -5434,11 +5047,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) @@ -5471,12 +5083,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); } @@ -5505,7 +5117,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)); @@ -5527,21 +5139,12 @@ gboolean modest_ui_actions_on_edit_mode_move_to (ModestWindow *win) { GtkWidget *dialog = NULL; + GtkWindow *toplevel = NULL; MoveToInfo *helper = NULL; TnyList *list_to_move; g_return_val_if_fail (MODEST_IS_WINDOW (win), FALSE); -#ifndef MODEST_TOOLKIT_HILDON2 - /* Get the main window if exists */ - ModestMainWindow *main_window; - if (MODEST_IS_MAIN_WINDOW (win)) - main_window = MODEST_MAIN_WINDOW (win); - else - main_window = - MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), - FALSE)); /* don't create */ -#endif list_to_move = modest_platform_get_list_to_move (MODEST_WINDOW (win)); @@ -5554,10 +5157,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); + dialog = create_move_to_dialog (win, NULL, list_to_move); + toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win); modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), - (GtkWindow *) win); + toplevel); /* Create helper */ helper = g_slice_new0 (MoveToInfo); @@ -5652,13 +5256,7 @@ void modest_ui_actions_remove_attachments (GtkAction *action, ModestWindow *window) { -#ifndef MODEST_TOOLKIT_HILDON2 - if (MODEST_IS_MAIN_WINDOW (window)) { - modest_ui_actions_on_main_window_remove_attachments (action, MODEST_MAIN_WINDOW (window)); - } else if (MODEST_IS_MSG_VIEW_WINDOW (window)) { -#else if (MODEST_IS_MSG_VIEW_WINDOW (window)) { -#endif modest_msg_view_window_remove_attachments (MODEST_MSG_VIEW_WINDOW (window), FALSE); } else { /* not supported window for this action */ @@ -5671,9 +5269,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); @@ -5695,7 +5295,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 } @@ -5704,31 +5304,6 @@ modest_ui_actions_on_csm_help (GtkAction *action, GtkWindow *win) { /* Help app is not available at all in fremantle */ -#ifndef MODEST_TOOLKIT_HILDON2 - - const gchar* help_id = NULL; - GtkWidget *folder_view; - TnyFolderStore *folder_store; - - g_return_if_fail (win && MODEST_IS_MAIN_WINDOW (win)); - - /* Get selected folder */ - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); - - /* Switch help_id */ - if (folder_store && TNY_IS_FOLDER (folder_store)) - help_id = modest_tny_folder_get_help_id (TNY_FOLDER (folder_store)); - - if (folder_store) - g_object_unref (folder_store); - - if (help_id) - modest_platform_show_help (GTK_WINDOW (win), help_id); - else - modest_ui_actions_on_help (action, win); -#endif } static void @@ -5749,7 +5324,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) { @@ -5802,7 +5377,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)); @@ -5923,6 +5498,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 @@ -5931,14 +5508,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 @@ -5946,8 +5524,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); } @@ -5967,60 +5544,6 @@ modest_ui_actions_on_toggle_find_in_page (GtkAction *action, active); } -#ifndef MODEST_TOOLKIT_HILDON2 -static void -on_send_receive_finished (ModestMailOperation *mail_op, - gpointer user_data) -{ - GtkWidget *header_view, *folder_view; - TnyFolderStore *folder_store; - ModestMainWindow *main_win = MODEST_MAIN_WINDOW (user_data); - - /* Set send/receive operation finished */ - modest_main_window_notify_send_receive_completed (main_win); - - /* Don't refresh the current folder if there were any errors */ - if (modest_mail_operation_get_status (mail_op) != - MODEST_MAIL_OPERATION_STATUS_SUCCESS) - return; - - /* Refresh the current folder if we're viewing a window. We do - this because the user won't be able to see the new mails in - the selected folder after a Send&Receive because it only - performs a poke_status, i.e, only the number of read/unread - messages is updated, but the new headers are not - downloaded */ - folder_view = modest_main_window_get_child_widget (main_win, - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - if (!folder_view) - return; - - folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); - - /* Do not need to refresh INBOX again because the - update_account does it always automatically */ - if (folder_store && TNY_IS_FOLDER (folder_store) && - tny_folder_get_folder_type (TNY_FOLDER (folder_store)) != TNY_FOLDER_TYPE_INBOX) { - ModestMailOperation *refresh_op; - - header_view = modest_main_window_get_child_widget (main_win, - MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); - - /* We do not need to set the contents style - because it hasn't changed. We also do not - need to save the widget status. Just force - a refresh */ - refresh_op = modest_mail_operation_new (G_OBJECT (main_win)); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), refresh_op); - modest_mail_operation_refresh_folder (refresh_op, TNY_FOLDER (folder_store), - folder_refreshed_cb, main_win); - g_object_unref (refresh_op); - } - - if (folder_store) - g_object_unref (folder_store); -} -#endif void modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, @@ -6083,7 +5606,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, @@ -6093,7 +5616,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; } @@ -6158,7 +5681,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; @@ -6173,7 +5696,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); } } @@ -6285,6 +5809,9 @@ 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 @@ -6300,7 +5827,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) { @@ -6321,9 +5848,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)); } @@ -6398,8 +5925,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 {