X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=97f07ac03dfa5eb06f7729a1f46b5963b1d3f96a;hb=2b58f5abfb171a82424c14cd9777ea5ee460db61;hp=8ba9fe95f7ff2cc1def4c7da55cd94d4c7506a54;hpb=c4adce3e18a59f68e79bd970b79a64b2069de574;p=modest diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 8ba9fe9..97f07ac 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -53,6 +53,7 @@ #include "maemo/modest-osso-state-saving.h" #include "maemo/modest-maemo-utils.h" #include "maemo/modest-hildon-includes.h" +#include "maemo/modest-connection-specific-smtp-window.h" #endif /* MODEST_PLATFORM_MAEMO */ #include "widgets/modest-ui-constants.h" @@ -63,7 +64,6 @@ #include #include "widgets/modest-folder-view.h" #include "widgets/modest-global-settings-dialog.h" -#include "modest-connection-specific-smtp-window.h" #include "modest-account-mgr-helpers.h" #include "modest-mail-operation.h" #include "modest-text-utils.h" @@ -215,6 +215,7 @@ gboolean modest_ui_actions_run_account_setup_wizard (ModestWindow *win) { gboolean result = FALSE; +#ifdef MODEST_PLATFORM_MAEMO GtkWindow *dialog, *wizard; gint dialog_response; @@ -255,7 +256,7 @@ modest_ui_actions_run_account_setup_wizard (ModestWindow *win) /* Check whether an account was created: */ result = modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE); } - +#endif return result; } @@ -709,6 +710,7 @@ modest_ui_actions_on_accounts (GtkAction *action, #endif /* MODEST_PLATFORM_MAEMO */ } +#ifdef MODEST_PLATFORM_MAEMO static void on_smtp_servers_window_hide (GtkWindow* window, gpointer user_data) { @@ -717,7 +719,7 @@ on_smtp_servers_window_hide (GtkWindow* window, gpointer user_data) MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (window)); gtk_widget_destroy (GTK_WIDGET (window)); } - +#endif void @@ -1704,7 +1706,8 @@ do_send_receive_performer (gboolean canceled, /* Send & receive. */ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - modest_mail_operation_update_account (mail_op, info->account_name, new_messages_arrived, info->win); + modest_mail_operation_update_account (mail_op, info->account_name, (info->win) ? FALSE : TRUE, + new_messages_arrived, info->win); g_object_unref (G_OBJECT (mail_op)); clean: @@ -1952,7 +1955,7 @@ modest_ui_actions_on_header_activated (ModestHeaderView *header_view, return; if (modest_header_view_count_selected_headers (header_view) > 1) { - hildon_banner_show_information (NULL, NULL, _("mcen_ib_select_one_message")); + modest_platform_information_banner (NULL, NULL, _("mcen_ib_select_one_message")); return; } @@ -2197,7 +2200,6 @@ on_save_to_drafts_cb (ModestMailOperation *mail_op, gpointer user_data) { ModestMsgEditWindow *edit_window; - char *info_text; ModestMainWindow *win; /* FIXME. Make the header view sensitive again. This is a @@ -2218,9 +2220,6 @@ on_save_to_drafts_cb (ModestMailOperation *mail_op, return; modest_msg_edit_window_set_draft (edit_window, saved_draft); - info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts")); - modest_platform_information_banner (NULL, NULL, info_text); - g_free (info_text); } void @@ -2231,6 +2230,7 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi MsgData *data; gchar *account_name, *from; ModestAccountMgr *account_mgr; + char *info_text; g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window)); @@ -2284,7 +2284,11 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi data->priority_flags, on_save_to_drafts_cb, edit_window); + info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts")); + modest_platform_information_banner (NULL, NULL, info_text); + /* Frees */ + g_free (info_text); g_free (from); g_free (account_name); g_object_unref (G_OBJECT (transport_account)); @@ -2398,6 +2402,10 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) data->attachments, data->images, data->priority_flags); + + 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")); + /* Free data: */ g_free (from); @@ -2594,7 +2602,7 @@ modest_ui_actions_create_folder(GtkWidget *parent_window, if (proto_str && modest_protocol_info_get_transport_store_protocol (proto_str) == MODEST_PROTOCOL_STORE_POP) { finished = TRUE; - hildon_banner_show_information (NULL, NULL, _("mail_in_ui_folder_create_error")); + modest_platform_information_banner (NULL, NULL, _("mail_in_ui_folder_create_error")); } g_object_unref (account); @@ -2724,7 +2732,7 @@ modest_ui_actions_on_rename_folder (GtkAction *action, if (response != GTK_RESPONSE_ACCEPT || strlen (folder_name) == 0) { do_rename = FALSE; - } else if (modest_platform_is_network_folderstore(folder) && + } else if (modest_tny_folder_store_is_remote(folder) && !tny_device_is_online (modest_runtime_get_device())) { TnyAccount *account = tny_folder_get_account(TNY_FOLDER(folder)); do_rename = modest_platform_connect_and_wait(GTK_WINDOW(main_window), account); @@ -2809,7 +2817,7 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) if (response != GTK_RESPONSE_OK) { do_delete = FALSE; - } else if (modest_platform_is_network_folderstore(folder) && + } else if (modest_tny_folder_store_is_remote(folder) && !tny_device_is_online (modest_runtime_get_device())) { TnyAccount *account = tny_folder_get_account(TNY_FOLDER(folder)); do_delete = modest_platform_connect_and_wait(GTK_WINDOW(main_window), account); @@ -2868,7 +2876,7 @@ modest_ui_actions_on_move_folder_to_trash_folder (GtkAction *action, ModestMainW static void show_error (GtkWidget *parent_widget, const gchar* text) { - hildon_banner_show_information(parent_widget, NULL, text); + modest_platform_information_banner(parent_widget, NULL, text); #if 0 GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_window, text)); */ @@ -4422,7 +4430,7 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, } else if (!TNY_IS_FOLDER (src_folder)) { g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__); do_xfer = FALSE; - } else if (!online && modest_platform_is_network_folderstore(src_folder)) { + } else if (!online && modest_tny_folder_store_is_remote(src_folder)) { guint num_headers = tny_folder_get_all_count(TNY_FOLDER (src_folder)); TnyAccount *account = tny_folder_get_account (TNY_FOLDER (src_folder)); if (!connect_to_get_msg(MODEST_WINDOW (win), num_headers, account)) @@ -4475,7 +4483,7 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, } else if (gtk_widget_is_focus (GTK_WIDGET(header_view))) { gboolean do_xfer = TRUE; /* Ask for confirmation if the source folder is remote and we're not connected */ - if (!online && modest_platform_is_network_folderstore(src_folder)) { + if (!online && modest_tny_folder_store_is_remote(src_folder)) { TnyList *headers = modest_header_view_get_selected_headers(header_view); if (!msgs_already_deleted_from_server(headers, src_folder)) { guint num_headers = tny_list_get_length(headers); @@ -4515,7 +4523,7 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action, g_object_unref (header); account = tny_folder_get_account (src_folder); - if (!modest_platform_is_network_folderstore(TNY_FOLDER_STORE(src_folder))) { + if (!modest_tny_folder_store_is_remote(TNY_FOLDER_STORE(src_folder))) { /* Transfer if the source folder is local */ do_xfer = TRUE; } else if (remote_folder_is_pop(TNY_FOLDER_STORE(src_folder))) {