#include "modest-text-utils.h"
#ifdef MODEST_HAVE_EASYSETUP
-#include "easysetup/modest-easysetup-wizard.h"
+#include "easysetup/modest-easysetup-wizard-dialog.h"
#endif /* MODEST_HAVE_EASYSETUP */
#include <modest-widget-memory.h>
const gchar *bcc_str,
const gchar *subject_str,
const gchar *body_str,
- GSList *attachments)
+ GSList *attachments,
+ gboolean set_as_modified)
{
gchar *account_name = NULL;
TnyMsg *msg = NULL;
attachments = g_slist_next(attachments);
}
modest_window_mgr_register_window (modest_runtime_get_window_mgr(), msg_win);
+ modest_msg_edit_window_set_modified (MODEST_MSG_EDIT_WINDOW (msg_win), set_as_modified);
+
gtk_widget_show_all (GTK_WIDGET (msg_win));
cleanup:
if (!modest_ui_actions_run_account_setup_wizard (win))
return;
- modest_ui_actions_compose_msg(win, NULL, NULL, NULL, NULL, NULL, NULL);
+ modest_ui_actions_compose_msg(win, NULL, NULL, NULL, NULL, NULL, NULL, FALSE);
}
return TRUE;
}
+typedef struct {
+ guint idle_handler;
+ gchar *message;
+ GtkWidget *banner;
+} OpenMsgBannerInfo;
+
+gboolean
+open_msg_banner_idle (gpointer userdata)
+{
+ OpenMsgBannerInfo *banner_info = (OpenMsgBannerInfo *) userdata;
+
+ gdk_threads_enter ();
+ banner_info->idle_handler = 0;
+ banner_info->banner = modest_platform_animation_banner (NULL, NULL, banner_info->message);
+ g_object_ref (banner_info->banner);
+
+ gdk_threads_leave ();
+
+ return FALSE;
+
+}
+
static void
open_msg_cb (ModestMailOperation *mail_op,
TnyHeader *header,
gchar *account = NULL;
TnyFolder *folder;
gboolean open_in_editor = FALSE;
+ OpenMsgBannerInfo *banner_info = (OpenMsgBannerInfo *) user_data;
/* Do nothing if there was any problem with the mail
operation. The error will be shown by the error_handler of
the mail operation */
if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg))
- return;
+ goto banner_cleanup;
parent_win = (ModestWindow *) modest_mail_operation_get_source (mail_op);
folder = tny_header_get_folder (header);
win = modest_msg_edit_window_new (msg, account, TRUE);
- /* Show banner */
- modest_platform_information_banner_with_timeout
- (NULL, NULL, _("mail_ib_opening_draft_message"), 1200);
} else {
gchar *uid = modest_tny_folder_get_header_unique_id (header);
g_free(account);
g_object_unref (parent_win);
g_object_unref (folder);
+banner_cleanup:
+ if (banner_info) {
+ g_free (banner_info->message);
+ if (banner_info->idle_handler > 0) {
+ g_source_remove (banner_info->idle_handler);
+ banner_info->idle_handler = 0;
+ }
+ if (banner_info->banner != NULL) {
+ gtk_widget_destroy (banner_info->banner);
+ g_object_unref (banner_info->banner);
+ banner_info->banner = NULL;
+ }
+ g_slice_free (OpenMsgBannerInfo, banner_info);
+ }
}
void
ModestTransportStoreProtocol proto;
TnyList *not_opened_headers;
TnyConnectionStatus status;
+ gboolean show_open_draft = FALSE;
+ OpenMsgBannerInfo *banner_info = NULL;
not_opened_headers = TNY_LIST (user_data);
g_object_unref (header);
g_object_unref (iter);
} else {
+ TnyHeader *header;
+ TnyFolder *folder;
+ TnyIterator *iter;
+ TnyFolderType folder_type;
+
+ iter = tny_list_create_iterator (not_opened_headers);
+ header = TNY_HEADER (tny_iterator_get_current (iter));
+ folder = tny_header_get_folder (header);
+ folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder);
+ show_open_draft = (folder_type == TNY_FOLDER_TYPE_DRAFTS);
+ g_object_unref (folder);
+ g_object_unref (header);
+ g_object_unref (iter);
error_msg = g_strdup (_("mail_ni_ui_folder_get_msg_folder_error"));
}
} else {
error_msg, g_free);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
-
+
+ if (show_open_draft) {
+ banner_info = g_slice_new (OpenMsgBannerInfo);
+ banner_info->message = g_strdup (_("mail_ib_opening_draft_message"));
+ banner_info->banner = NULL;
+ banner_info->idle_handler = g_timeout_add (500, open_msg_banner_idle, banner_info);
+ }
+
modest_mail_operation_get_msgs_full (mail_op,
not_opened_headers,
open_msg_cb,
- NULL,
+ banner_info,
NULL);
/* Frees */
/* Check that only one message is selected for opening */
if (tny_list_get_length (headers) != 1) {
- modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL,
- _("mcen_ib_select_one_message"));
+ modest_platform_information_banner ((win) ? GTK_WIDGET (win) : NULL,
+ NULL, _("mcen_ib_select_one_message"));
return;
}
gtk_widget_grab_focus (GTK_WIDGET(header_view));
/* Update toolbar dimming state */
+ modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (main_window));
modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
}
guint64 available_disk, expected_size;
gint parts_count;
guint64 parts_size;
+ ModestMainWindow *win;
g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window), FALSE);
on_save_to_drafts_cb,
g_object_ref(edit_window));
-/* info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts")); */
- modest_platform_information_banner (NULL, NULL, _CS("sfil_ib_saving"));
- modest_msg_edit_window_reset_modified (edit_window);
+ /* Use the main window as the parent of the banner, if the
+ main window does not exist it won't be shown, if the parent
+ window exists then it's properly shown. We don't use the
+ editor window because it could be closed (save to drafts
+ could happen after closing the window */
+ win = (ModestMainWindow *)
+ modest_window_mgr_get_main_window( modest_runtime_get_window_mgr(), FALSE);
+ if (win) {
+ gchar *text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts"));
+ modest_platform_information_banner (GTK_WIDGET (win), NULL, text);
+ g_free (text);
+ }
+ modest_msg_edit_window_set_modified (edit_window, FALSE);
/* Frees */
g_free (from);
* we find a better solution it should be removed
* See NB#65125 (commend #18) for details.
*/
- ModestMainWindow *win = MODEST_MAIN_WINDOW(modest_window_mgr_get_main_window(
- modest_runtime_get_window_mgr(), FALSE));
if (!had_error && win != NULL) {
ModestFolderView *view = MODEST_FOLDER_VIEW(modest_main_window_get_child_widget(
win, MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW));
if (!modest_msg_edit_window_check_names (edit_window, TRUE))
return TRUE;
- /* FIXME: Code added just for testing. The final version will
- use the send queue provided by tinymail and some
- classifier */
MsgData *data = modest_msg_edit_window_get_msg_data (edit_window);
/* Check size */
ModestMainWindow *main_window)
{
g_return_if_fail(server_account_name);
+ gboolean completed = FALSE;
/* Initalize output parameters: */
if (cancel)
*/
gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
+
+ while (!completed) {
- if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
- if (username) {
- *username = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry_username)));
-
- modest_account_mgr_set_server_account_username (
- modest_runtime_get_account_mgr(), server_account_name,
- *username);
-
- const gboolean username_was_changed =
- (strcmp (*username, initial_username) != 0);
- if (username_was_changed) {
- g_warning ("%s: tinymail does not yet support changing the "
- "username in the get_password() callback.\n", __FUNCTION__);
+ if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
+ if (username) {
+ *username = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry_username)));
+
+ /* Note that an empty field becomes the "" string */
+ if (*username && strlen (*username) > 0) {
+ modest_account_mgr_set_server_account_username (modest_runtime_get_account_mgr(),
+ server_account_name,
+ *username);
+ completed = TRUE;
+
+ const gboolean username_was_changed =
+ (strcmp (*username, initial_username) != 0);
+ if (username_was_changed) {
+ g_warning ("%s: tinymail does not yet support changing the "
+ "username in the get_password() callback.\n", __FUNCTION__);
+ }
+ } else {
+ /* Show error */
+ modest_platform_information_banner (GTK_WIDGET (dialog), NULL,
+ _("mcen_ib_username_pw_incorrect"));
+ completed = FALSE;
+ }
}
- }
- if (password) {
- *password = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry_password)));
+ if (password) {
+ *password = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry_password)));
- /* We do not save the password in the configuration,
- * because this function is only called for passwords that should
- * not be remembered:
- modest_server_account_set_password (
+ /* We do not save the password in the configuration,
+ * because this function is only called for passwords that should
+ * not be remembered:
+ modest_server_account_set_password (
modest_runtime_get_account_mgr(), server_account_name,
*password);
- */
+ */
+ }
+ if (cancel)
+ *cancel = FALSE;
+ } else {
+ modest_platform_information_banner(GTK_WIDGET (dialog),
+ NULL, _("mail_ib_login_cancelled"));
+ completed = TRUE;
+ if (username)
+ *username = NULL;
+ if (password)
+ *password = NULL;
+ if (cancel)
+ *cancel = TRUE;
}
-
- if (cancel)
- *cancel = FALSE;
-
- } else {
- modest_platform_information_banner(GTK_WIDGET (main_window), NULL, _("mail_ib_login_cancelled"));
-
- if (username)
- *username = NULL;
-
- if (password)
- *password = NULL;
-
- if (cancel)
- *cancel = TRUE;
}
/* This is not in the Maemo UI spec:
new_sensitive = (proto != MODEST_PROTOCOL_STORE_POP);
}
g_object_unref (local_account);
+ g_object_unref (mmc_account);
}
/* Check the target folder rules */
case TNY_SERVICE_ERROR_SEND:
message = g_strdup (_("emev_ib_ui_smtp_send_error"));
break;
+ case TNY_SERVICE_ERROR_UNAVAILABLE:
+ message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name);
+ break;
default:
g_warning ("%s: unexpected ERROR %d",
__FUNCTION__, err->code);