gint num_of_uncached_msgs,
TnyAccount *account);
-static gboolean remote_folder_is_pop (const TnyFolderStore *folder);
-
-static gboolean msgs_already_deleted_from_server ( TnyList *headers,
- const TnyFolderStore *src_folder);
+static gboolean remote_folder_is_pop (TnyFolderStore *folder);
static void do_create_folder (GtkWindow *window,
TnyFolderStore *parent_folder,
static GtkWidget* get_folder_view_from_move_to_dialog (GtkWidget *move_to_dialog);
+static TnyAccount *get_account_from_folder_store (TnyFolderStore *folder_store);
+
+static void transfer_messages_helper (GtkWindow *win,
+ TnyFolder *src_folder,
+ TnyList *headers,
+ TnyFolder *dst_folder);
/*
* This function checks whether a TnyFolderStore is a pop account
*/
static gboolean
-remote_folder_is_pop (const TnyFolderStore *folder)
+remote_folder_is_pop (TnyFolderStore *folder)
{
const gchar *proto = NULL;
TnyAccount *account = NULL;
- g_return_val_if_fail (TNY_IS_FOLDER_STORE(folder), FALSE);
-
- if (TNY_IS_ACCOUNT (folder)) {
- account = TNY_ACCOUNT(folder);
- g_object_ref(account);
- } else if (TNY_IS_FOLDER (folder)) {
- account = tny_folder_get_account(TNY_FOLDER(folder));
- }
-
- if (!TNY_IS_ACCOUNT(account)) {
- g_warning ("%s: could not get account", __FUNCTION__);
- return FALSE;
- }
+ g_return_val_if_fail (TNY_IS_FOLDER_STORE (folder), FALSE);
- proto = tny_account_get_proto(account);
+ account = get_account_from_folder_store (folder);
+ proto = tny_account_get_proto (account);
g_object_unref (account);
- return proto &&
- (modest_protocol_info_get_transport_store_protocol (proto) == MODEST_PROTOCOL_STORE_POP);
+ return (modest_protocol_info_get_transport_store_protocol (proto) == MODEST_PROTOCOL_STORE_POP);
}
-/*
- * This functions checks whether if a list of messages are already
- * deleted from the server: that is, if the server is a POP account
- * and all messages are already cached.
- */
-static gboolean
-msgs_already_deleted_from_server (TnyList *headers, const TnyFolderStore *src_folder)
-{
- g_return_val_if_fail (TNY_IS_FOLDER_STORE(src_folder), FALSE);
- g_return_val_if_fail (TNY_IS_LIST(headers), FALSE);
-
- gboolean src_is_pop = remote_folder_is_pop (src_folder);
- gint uncached_msgs = header_list_count_uncached_msgs (headers);
-
- return (src_is_pop && !uncached_msgs);
-}
-
-
/* FIXME: this should be merged with the similar code in modest-account-view-window */
/* Show the account creation wizard dialog.
* returns: TRUE if an account was created. FALSE if the user cancelled.
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
if (error->code == TNY_SYSTEM_ERROR_MEMORY ||
error->code == TNY_IO_ERROR_WRITE ||
error->code == TNY_IO_ERROR_READ) {
- modest_platform_information_banner ((GtkWidget *) win,
- NULL, dgettext("ke-recv",
- "cerm_device_memory_full"));
+ ModestMailOperationStatus st = modest_mail_operation_get_status (mail_op);
+ /* If the mail op has been cancelled then it's not an error: don't show any message */
+ if (st != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+ modest_platform_information_banner ((GtkWidget *) win,
+ NULL, dgettext("ke-recv",
+ "cerm_device_memory_full"));
+ }
} else if (user_data) {
modest_platform_information_banner ((GtkWidget *) win,
NULL, user_data);
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 */
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 */
if (!MODEST_IS_MAIN_WINDOW(parent_window) || canceled || (err!=NULL)) {
g_object_unref (G_OBJECT (info->folder));
g_free (info);
+ return;
}
folder_view = modest_main_window_get_child_widget (
}
-static void
-show_error (GtkWidget *parent_widget, const gchar* text)
-{
- modest_platform_information_banner(parent_widget, NULL, text);
-
-#if 0
- GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_window, text)); */
- /*
- GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new (parent_window,
- (GtkDialogFlags)0,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- text ));
- */
-
- gtk_dialog_run (dialog);
- gtk_widget_destroy (GTK_WIDGET (dialog));
-#endif
-}
-
void
modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
const gchar* server_account_name,
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 {
- show_error(GTK_WIDGET (main_window), _("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 */
g_object_unref (header_list);
}
+/*
+ * Checks if we need a connection to do the transfer and if the user
+ * wants to connect to complete it
+ */
+void
+modest_ui_actions_xfer_messages_check (GtkWindow *parent_window,
+ TnyFolderStore *src_folder,
+ TnyList *headers,
+ TnyFolder *dst_folder,
+ gboolean delete_originals,
+ gboolean *need_connection,
+ gboolean *do_xfer)
+{
+ TnyAccount *src_account;
+ gint uncached_msgs = 0;
+
+ uncached_msgs = header_list_count_uncached_msgs (headers);
+
+ /* We don't need any further check if
+ *
+ * 1- the source folder is local OR
+ * 2- the device is already online
+ */
+ if (!modest_tny_folder_store_is_remote (src_folder) ||
+ tny_device_is_online (modest_runtime_get_device())) {
+ *need_connection = FALSE;
+ *do_xfer = TRUE;
+ return;
+ }
+
+ /* We must ask for a connection when
+ *
+ * - the message(s) is not already cached OR
+ * - the message(s) is cached but the leave_on_server setting
+ * is FALSE (because we need to sync the source folder to
+ * delete the message from the server (for IMAP we could do it
+ * offline, it'll take place the next time we get a
+ * connection)
+ */
+ src_account = get_account_from_folder_store (src_folder);
+ if (uncached_msgs > 0) {
+ guint num_headers;
+ const gchar *msg;
+
+ *need_connection = TRUE;
+ num_headers = tny_list_get_length (headers);
+ msg = ngettext ("mcen_nc_get_msg", "mcen_nc_get_msgs", num_headers);
+
+ if (modest_platform_run_confirmation_dialog (parent_window, msg) ==
+ GTK_RESPONSE_CANCEL) {
+ *do_xfer = FALSE;
+ } else {
+ *do_xfer = TRUE;
+ }
+ } else {
+ /* The transfer is possible and the user wants to */
+ *do_xfer = TRUE;
+
+ if (remote_folder_is_pop (src_folder) && delete_originals) {
+ const gchar *account_name;
+ gboolean leave_on_server;
+
+ account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (src_account);
+ leave_on_server = modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (),
+ account_name);
+
+ if (leave_on_server == TRUE) {
+ *need_connection = FALSE;
+ } else {
+ *need_connection = TRUE;
+ }
+ } else {
+ *need_connection = FALSE;
+ }
+ }
+
+ /* Frees */
+ g_object_unref (src_account);
+}
+
+
/**
* Utility function that transfer messages from both the main window
* and the msg view window when using the "Move to" dialog
*/
static void
-xfer_messages_from_move_to_cb (gboolean canceled, GError *err,
- GtkWindow *parent_window,
- TnyAccount *account, gpointer user_data)
+xfer_messages_performer (gboolean canceled,
+ GError *err,
+ GtkWindow *parent_window,
+ TnyAccount *account,
+ gpointer user_data)
{
TnyFolderStore *dst_folder = TNY_FOLDER_STORE (user_data);
ModestWindow *win = MODEST_WINDOW (parent_window);
gboolean dst_is_pop = FALSE;
if (canceled || err) {
+ /* Show the proper error message */
+ modest_ui_actions_on_account_connection_error (parent_window, account);
g_object_unref (dst_folder);
return;
}
ModestMainWindow *win)
{
ModestHeaderView *header_view = NULL;
- TnyFolderStore *src_folder;
- gboolean online = (tny_device_is_online (modest_runtime_get_device()));
+ TnyFolderStore *src_folder = NULL;
g_return_if_fail (MODEST_IS_MAIN_WINDOW (win));
connect_info);
}
} else if (gtk_widget_is_focus (GTK_WIDGET(header_view))) {
- gboolean do_xfer = TRUE;
+ TnyList *headers;
- /* Show an error when trying to move msgs to an account */
- if (!TNY_IS_FOLDER (dst_folder)) {
- modest_platform_information_banner (GTK_WIDGET (win),
- NULL,
- _CS("ckdg_ib_unable_to_move_to_current_location"));
- goto free;
- }
+ headers = modest_header_view_get_selected_headers(header_view);
- /* Ask for confirmation if the source folder is remote and we're not connected */
- 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);
- TnyAccount *account = get_account_from_header_list (headers);
- GtkResponseType response;
+ /* Transfer the messages */
+ transfer_messages_helper (GTK_WINDOW (win), TNY_FOLDER (src_folder),
+ headers, TNY_FOLDER (dst_folder));
- response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
- ngettext("mcen_nc_get_msg",
- "mcen_nc_get_msgs",
- num_headers));
- if (response == GTK_RESPONSE_CANCEL)
- do_xfer = FALSE;
-
- g_object_unref (account);
- }
- g_object_unref(headers);
- }
- if (do_xfer) /* Transfer messages */ {
- DoubleConnectionInfo *connect_info = g_slice_new (DoubleConnectionInfo);
- connect_info->callback = xfer_messages_from_move_to_cb;
- connect_info->dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder));
- connect_info->data = g_object_ref (dst_folder);
-
- modest_platform_double_connect_and_perform(GTK_WINDOW (win), TRUE,
- TNY_FOLDER_STORE (src_folder),
- connect_info);
- }
+ g_object_unref (headers);
}
- free:
- if (src_folder)
- g_object_unref (src_folder);
+ /* Frees */
+ g_object_unref (src_folder);
}
+static void
+transfer_messages_helper (GtkWindow *win,
+ TnyFolder *src_folder,
+ TnyList *headers,
+ TnyFolder *dst_folder)
+{
+ gboolean need_connection = TRUE;
+ gboolean do_xfer = TRUE;
+
+ modest_ui_actions_xfer_messages_check (win, TNY_FOLDER_STORE (src_folder),
+ headers, TNY_FOLDER (dst_folder),
+ TRUE, &need_connection,
+ &do_xfer);
+
+ /* If we don't want to transfer just return */
+ if (!do_xfer)
+ return;
+
+ if (need_connection) {
+ DoubleConnectionInfo *connect_info = g_slice_new (DoubleConnectionInfo);
+ connect_info->callback = xfer_messages_performer;
+ connect_info->dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder));
+ connect_info->data = g_object_ref (dst_folder);
+
+ modest_platform_double_connect_and_perform(GTK_WINDOW (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),
+ src_account,
+ g_object_ref (dst_folder));
+ g_object_unref (src_account);
+ }
+}
+
/*
* UI handler for the "Move to" action when invoked from the
* ModestMsgViewWindow
TnyFolderStore *dst_folder,
ModestMsgViewWindow *win)
{
+ TnyList *headers = NULL;
TnyHeader *header = NULL;
TnyFolder *src_folder = NULL;
- TnyAccount *account = NULL;
- gboolean do_xfer = FALSE;
+
+ g_return_if_fail (TNY_IS_FOLDER (dst_folder));
/* Create header list */
- header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));
+ header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));
src_folder = TNY_FOLDER (tny_header_get_folder(header));
- g_object_unref (header);
+ headers = tny_simple_list_new ();
+ tny_list_append (headers, G_OBJECT (header));
- account = tny_folder_get_account (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))) {
- /* Transfer if the source folder is POP (as it means
- * that the message is already downloaded) */
- do_xfer = TRUE;
- } else if (connect_to_get_msg(MODEST_WINDOW(win), 1, account)) {
- /* Transfer after asking confirmation */
- do_xfer = TRUE;
- }
-
- if (do_xfer) {
- g_object_ref (dst_folder);
- modest_platform_connect_if_remote_and_perform(GTK_WINDOW (win), TRUE,
- TNY_FOLDER_STORE (dst_folder), xfer_messages_from_move_to_cb, dst_folder);
- }
- g_object_unref (account);
- g_object_unref (src_folder);
+ /* Transfer the messages */
+ transfer_messages_helper (GTK_WINDOW (win), src_folder, headers,
+ TNY_FOLDER (dst_folder));
+
+ /* Frees */
+ g_object_unref (header);
+ g_object_unref (headers);
}
void
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);
projects / modest / blobdiff