#include "modest-protocol-info.h"
#include "modest-tny-platform-factory.h"
#include "modest-platform.h"
+#include "modest-debug.h"
#include <tny-mime-part.h>
#include <tny-camel-folder.h>
#include <tny-camel-imap-folder.h>
#ifdef MODEST_PLATFORM_MAEMO
#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 <modest-utils.h>
#include "widgets/modest-ui-constants.h"
#include <widgets/modest-main-window.h>
static gboolean msgs_already_deleted_from_server ( TnyList *headers,
const TnyFolderStore *src_folder);
+static void do_create_folder (GtkWindow *window,
+ TnyFolderStore *parent_folder,
+ const gchar *suggested_name);
+
+static GtkWidget* get_folder_view_from_move_to_dialog (GtkWidget *move_to_dialog);
+
/*
* This function checks whether a TnyFolderStore is a pop account
modest_ui_actions_run_account_setup_wizard (ModestWindow *win)
{
gboolean result = FALSE;
-#ifdef MODEST_PLATFORM_MAEMO
GtkWindow *dialog, *wizard;
gint dialog_response;
/* Show the easy-setup wizard: */
dialog = modest_window_mgr_get_modal (modest_runtime_get_window_mgr());
- if (dialog && MODEST_IS_EASYSETUP_WIZARD_DIALOG(dialog)) {
+ if (dialog) {
/* old wizard is active already;
*/
gtk_window_present (GTK_WINDOW(dialog));
/* there is no such wizard yet */
- wizard = GTK_WINDOW (modest_easysetup_wizard_dialog_new ());
+ wizard = GTK_WINDOW (modest_platform_get_account_settings_wizard ());
modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), wizard);
/* always present a main window in the background
/* Check whether an account was created: */
result = modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE);
}
-#endif
return result;
}
ModestWindow *win)
{
/* This is currently only implemented for Maemo */
-#ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */
if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE)) {
if (!modest_ui_actions_run_account_setup_wizard (win))
g_debug ("%s: wizard was already running", __FUNCTION__);
/* The accounts dialog must be modal */
modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), account_win);
- modest_maemo_show_dialog_and_forget (GTK_WINDOW (win), GTK_DIALOG (account_win));
+ modest_utils_show_dialog_and_forget (GTK_WINDOW (win), GTK_DIALOG (account_win));
}
-#else
- GtkWidget *dialog, *label;
-
- /* Create the widgets */
-
- dialog = gtk_dialog_new_with_buttons ("Message",
- GTK_WINDOW(win),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK,
- GTK_RESPONSE_NONE,
- NULL);
- label = gtk_label_new ("Hello World!");
-
- /* Ensure that the dialog box is destroyed when the user responds. */
-
- g_signal_connect_swapped (dialog, "response",
- G_CALLBACK (gtk_widget_destroy),
- dialog);
-
- /* Add the label, and show everything we've added to the dialog. */
-
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox),
- label);
- gtk_widget_show_all (dialog);
-#endif /* MODEST_PLATFORM_MAEMO */
}
#ifdef MODEST_PLATFORM_MAEMO
ModestAccountMgr *mgr = modest_runtime_get_account_mgr();
ModestTnyAccountStore *store = modest_runtime_get_account_store();
- if (win) account_name = g_strdup (modest_window_get_active_account (win));
- if (!account_name) account_name = modest_account_mgr_get_default_account(mgr);
+ account_name = modest_account_mgr_get_default_account(mgr);
if (!account_name) {
g_printerr ("modest: no account found\n");
goto cleanup;
/* Show banner */
- modest_platform_information_banner (NULL, NULL, _("mail_ib_opening_draft_message"));
+ 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);
static void
open_msgs_performer(gboolean canceled,
GError *err,
- GtkWindow *parent_window,
- TnyAccount *account,
+ GtkWindow *parent_window,
+ TnyAccount *account,
gpointer user_data)
{
- ModestMailOperation *mail_op;
+ ModestMailOperation *mail_op = NULL;
const gchar *proto_name;
gchar *error_msg;
ModestTransportStoreProtocol proto;
TnyList *not_opened_headers;
+ TnyConnectionStatus status;
not_opened_headers = TNY_LIST (user_data);
+ status = tny_account_get_connection_status (account);
+ if (err || canceled) {
+ goto clean;
+ }
+
/* Get the error message depending on the protocol */
proto_name = tny_account_get_proto (account);
if (proto_name != NULL) {
NULL);
/* Frees */
- g_object_unref (mail_op);
+ clean:
+ if (mail_op)
+ g_object_unref (mail_op);
g_object_unref (not_opened_headers);
g_object_unref (account);
}
gpointer user_data)
{
GObject *source;
+ gboolean show_visual_notifications;
source = modest_mail_operation_get_source (self);
-
- /* Notify new messages have been downloaded. Do not notify if
- the send&receive was invoked by the user, i.e, if the mail
- operation has a source (the main window) */
- if ((new_headers != NULL) && (tny_list_get_length (new_headers) > 0) && !source)
- modest_platform_on_new_headers_received (new_headers);
-
+ show_visual_notifications = (source) ? FALSE : TRUE;
if (source)
g_object_unref (source);
+
+ /* Notify new messages have been downloaded. If the
+ send&receive was invoked by the user then do not show any
+ visual notification, only play a sound and activate the LED
+ (for the Maemo version) */
+ if ((new_headers != NULL) && (tny_list_get_length (new_headers) > 0))
+ modest_platform_on_new_headers_received (new_headers,
+ show_visual_notifications);
+
+}
+
+gboolean
+retrieve_all_messages_cb (GObject *source,
+ guint num_msgs,
+ guint retrieve_limit)
+{
+ GtkWindow *window;
+ gchar *msg;
+ gint response;
+
+ window = GTK_WINDOW (source);
+ msg = g_strdup_printf (_("mail_nc_msg_count_limit_exceeded"),
+ num_msgs, retrieve_limit);
+
+ /* Ask the user if they want to retrieve all the messages */
+ response =
+ modest_platform_run_confirmation_dialog_with_buttons (window, msg,
+ _("mcen_bd_get_all"),
+ _("mcen_bd_newest_only"));
+ /* Free and return */
+ g_free (msg);
+ return (response == GTK_RESPONSE_ACCEPT) ? TRUE : FALSE;
}
typedef struct {
info = (SendReceiveInfo *) user_data;
if (err || canceled) {
-
goto clean;
}
modest_main_window_notify_send_receive_initied (MODEST_MAIN_WINDOW (info->win));
}
- mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (info->win),
+ mail_op = modest_mail_operation_new_with_error_handling ((info->win) ? G_OBJECT (info->win) : NULL,
modest_ui_actions_send_receive_error_handler,
NULL, NULL);
/* 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, (info->win) ? FALSE : TRUE,
+ (info->win) ? retrieve_all_messages_cb : NULL,
new_messages_arrived, info->win);
g_object_unref (G_OBJECT (mail_op));
modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win)
{
/* Check if accounts exist */
- gboolean accounts_exist =
+ gboolean accounts_exist;
+
+ accounts_exist =
modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE);
/* If not, allow the user to create an account before trying to send/receive. */
if (!accounts_exist)
modest_ui_actions_on_accounts (NULL, win);
+ /* Refresh the current folder. The if is always TRUE it's just an extra check */
+ if (MODEST_IS_MAIN_WINDOW (win)) {
+ GtkWidget *folder_view;
+ TnyFolderStore *folder_store;
+
+ folder_view =
+ modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+ MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+ if (!folder_view)
+ return;
+
+ folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+
+ if (folder_store)
+ g_object_unref (folder_store);
+ }
+
/* Refresh the active account */
modest_ui_actions_do_send_receive (NULL, win);
}
TnyList *headers;
g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
-
+
if (!header)
return;
edit_window = MODEST_MSG_EDIT_WINDOW (user_data);
- /* If there was any error do nothing */
- if (modest_mail_operation_get_error (mail_op) != NULL)
+ /* It might not be a good idea to do nothing if there was an error,
+ * so let's at least show a generic error banner. */
+ /* TODO error while saving attachment, show "Saving draft failed" banner */
+ if (modest_mail_operation_get_error (mail_op) != NULL) {
+ g_warning ("%s failed: %s\n", __FUNCTION__, (modest_mail_operation_get_error (mail_op))->message);
+ modest_platform_information_banner (NULL, NULL, _("mail_ib_file_operation_failed"));
return;
+ }
modest_msg_edit_window_set_draft (edit_window, saved_draft);
}
}
/* Get the currently-active transport account for this modest account: */
-/* TnyTransportAccount *transport_account = */
-/* TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_transport_account_for_open_connection */
-/* (modest_runtime_get_account_store(), */
-/* account_name)); */
if (strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) != 0) {
transport_account = TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_server_account
(modest_runtime_get_account_store(),
}
static void
-modest_ui_actions_new_folder_error_handler (ModestMailOperation *mail_op,
- gpointer user_data)
+do_create_folder_cb (ModestMailOperation *mail_op,
+ TnyFolderStore *parent_folder,
+ TnyFolder *new_folder,
+ gpointer user_data)
{
- ModestMainWindow *window = MODEST_MAIN_WINDOW (user_data);
- const GError *error = modest_mail_operation_get_error (mail_op);
-
- if(error) {
- modest_platform_information_banner (GTK_WIDGET (window), NULL,
+ gchar *suggested_name = (gchar *) user_data;
+ GtkWindow *source_win = (GtkWindow *) modest_mail_operation_get_source (mail_op);
+
+ if (modest_mail_operation_get_error (mail_op)) {
+ /* Show an error */
+ modest_platform_information_banner (GTK_WIDGET (source_win), NULL,
_("mail_in_ui_folder_create_error"));
+
+ /* Try again */
+ do_create_folder (source_win, parent_folder, (const gchar *) suggested_name);
+ } else {
+ /* the 'source_win' is either the ModestMainWindow, or the 'Move to folder'-dialog
+ * FIXME: any other? */
+ GtkWidget *folder_view;
+
+ if (MODEST_IS_MAIN_WINDOW(source_win))
+ folder_view =
+ modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (source_win),
+ MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+ else
+ folder_view =
+ get_folder_view_from_move_to_dialog (GTK_WIDGET(source_win));
+
+ /* Select the newly created folder */
+ modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view),
+ new_folder, FALSE);
+ g_object_unref (new_folder);
+ }
+ /* Free. Note that the first time it'll be NULL so noop */
+ g_free (suggested_name);
+ g_object_unref (source_win);
+}
+
+static void
+do_create_folder (GtkWindow *parent_window,
+ TnyFolderStore *parent_folder,
+ const gchar *suggested_name)
+{
+ gint result;
+ gchar *folder_name = NULL;
+
+ result = modest_platform_run_new_folder_dialog (GTK_WINDOW (parent_window),
+ parent_folder,
+ (gchar *) suggested_name,
+ &folder_name);
+
+ if (result == GTK_RESPONSE_ACCEPT) {
+ ModestMailOperation *mail_op;
+
+ mail_op = modest_mail_operation_new (G_OBJECT(parent_window));
+
+ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+ mail_op);
+ modest_mail_operation_create_folder (mail_op,
+ parent_folder,
+ (const gchar *) folder_name,
+ do_create_folder_cb,
+ folder_name);
+ g_object_unref (mail_op);
+ }
+}
+
+static void
+create_folder_performer (gboolean canceled,
+ GError *err,
+ GtkWindow *parent_window,
+ TnyAccount *account,
+ gpointer user_data)
+{
+ TnyFolderStore *parent_folder = TNY_FOLDER_STORE (user_data);
+
+ if (canceled || err) {
+ goto frees;
}
+
+ /* Run the new folder dialog */
+ do_create_folder (GTK_WINDOW (parent_window), parent_folder, NULL);
+
+ frees:
+ g_object_unref (parent_folder);
}
static void
parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
if (parent_folder) {
- gboolean finished = FALSE;
- gint result;
- gchar *folder_name = NULL, *suggested_name = NULL;
- const gchar *proto_str = NULL;
- TnyAccount *account;
-
- if (TNY_IS_ACCOUNT (parent_folder))
- account = g_object_ref (parent_folder);
- else
- account = tny_folder_get_account (TNY_FOLDER (parent_folder));
- proto_str = tny_account_get_proto (TNY_ACCOUNT (account));
-
- if (proto_str && modest_protocol_info_get_transport_store_protocol (proto_str) ==
- MODEST_PROTOCOL_STORE_POP) {
- finished = TRUE;
- modest_platform_information_banner (NULL, NULL, _("mail_in_ui_folder_create_error"));
- }
- g_object_unref (account);
-
- /* Run the new folder dialog */
- while (!finished) {
- result = modest_platform_run_new_folder_dialog (GTK_WINDOW (parent_window),
- parent_folder,
- suggested_name,
- &folder_name);
-
- g_free (suggested_name);
- suggested_name = NULL;
-
- if (result == GTK_RESPONSE_ACCEPT) {
- ModestMailOperation *mail_op;
- TnyFolder *new_folder = NULL;
-
- mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window),
- modest_ui_actions_new_folder_error_handler,
- parent_window, NULL);
-
- modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
- mail_op);
- new_folder = modest_mail_operation_create_folder (mail_op,
- parent_folder,
- (const gchar *) folder_name);
- if (new_folder) {
- modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view),
- new_folder, TRUE);
-
- g_object_unref (new_folder);
- finished = TRUE;
- }
- g_object_unref (mail_op);
- } else {
- finished = TRUE;
- }
-
- suggested_name = folder_name;
- folder_name = NULL;
- }
-
- g_object_unref (parent_folder);
+ /* The parent folder will be freed in the callback */
+ modest_platform_connect_if_remote_and_perform (GTK_WINDOW (parent_window),
+ parent_folder,
+ create_folder_performer,
+ parent_folder);
}
}
GtkWidget *folder_view = NULL;
RenameFolderInfo *data = (RenameFolderInfo*)user_data;
- if (MODEST_IS_MAIN_WINDOW(parent_window)) {
+ if (!canceled && (err == NULL) && MODEST_IS_MAIN_WINDOW(parent_window)) {
folder_view = modest_main_window_get_child_widget (
MODEST_MAIN_WINDOW (parent_window),
g_object_unref (win);
}
-static gboolean
-delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
+typedef struct {
+ TnyFolderStore *folder;
+ gboolean move_to_trash;
+} DeleteFolderInfo;
+
+static void
+on_delete_folder_cb (gboolean canceled,
+ GError *err,
+ GtkWindow *parent_window,
+ TnyAccount *account,
+ gpointer user_data)
+{
+ DeleteFolderInfo *info = (DeleteFolderInfo*) user_data;
+ GtkWidget *folder_view;
+ ModestMailOperation *mail_op;
+ GtkTreeSelection *sel;
+
+ if (!MODEST_IS_MAIN_WINDOW(parent_window) || canceled || (err!=NULL)) {
+ g_object_unref (G_OBJECT (info->folder));
+ g_free (info);
+ }
+
+ folder_view = modest_main_window_get_child_widget (
+ MODEST_MAIN_WINDOW (parent_window),
+ MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+
+ /* Unselect the folder before deleting it to free the headers */
+ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view));
+ gtk_tree_selection_unselect_all (sel);
+
+ /* Create the mail operation */
+ mail_op =
+ modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window),
+ modest_ui_actions_delete_folder_error_handler,
+ NULL, NULL);
+
+ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+ mail_op);
+ modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (info->folder), info->move_to_trash);
+
+ modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view));
+
+ g_object_unref (G_OBJECT (mail_op));
+ g_object_unref (G_OBJECT (info->folder));
+ g_free (info);
+}
+
+static void
+delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
{
TnyFolderStore *folder;
GtkWidget *folder_view;
gint response;
gchar *message;
- gboolean do_delete = TRUE;
-
- g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (main_window), FALSE);
+
+ g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
folder_view = modest_main_window_get_child_widget (main_window,
MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
if (!folder_view)
- return FALSE;
+ return;
folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
modest_platform_run_information_dialog (GTK_WINDOW (main_window),
_("mail_in_ui_folder_delete_error"));
g_object_unref (G_OBJECT (folder));
- return FALSE;
+ return;
}
/* Ask the user */
(const gchar *) message);
g_free (message);
- if (response != GTK_RESPONSE_OK) {
- do_delete = FALSE;
- } 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);
- g_object_unref(account);
- }
-
- if (do_delete) {
- ModestMailOperation *mail_op;
- GtkTreeSelection *sel;
-
- /* Unselect the folder before deleting it to free the headers */
- sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view));
- gtk_tree_selection_unselect_all (sel);
-
- /* Create the mail operation */
- mail_op =
- modest_mail_operation_new_with_error_handling (G_OBJECT(main_window),
- modest_ui_actions_delete_folder_error_handler,
- NULL, NULL);
-
- modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
- mail_op);
- modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (folder), move_to_trash);
- g_object_unref (G_OBJECT (mail_op));
+ if (response == GTK_RESPONSE_OK) {
+ DeleteFolderInfo *info;
+ info = g_new0(DeleteFolderInfo, 1);
+ info->folder = folder;
+ info->move_to_trash = move_to_trash;
+ g_object_ref (G_OBJECT (info->folder));
+ TnyAccount *account = tny_folder_get_account(TNY_FOLDER(folder));
+ modest_platform_connect_and_perform (GTK_WINDOW (main_window),
+ account, on_delete_folder_cb, info);
+ g_object_unref (account);
}
-
g_object_unref (G_OBJECT (folder));
-
- return do_delete;
}
void
ModestMainWindow *main_window)
{
g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
-
- if (delete_folder (main_window, FALSE)) {
- GtkWidget *folder_view;
-
- folder_view = modest_main_window_get_child_widget (main_window,
- MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
- modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view));
- }
+
+ delete_folder (main_window, FALSE);
}
void
NULL);
#endif /* MODEST_PLATFORM_MAEMO */
- gtk_window_set_transient_for (GTK_WINDOW(dialog), GTK_WINDOW(main_window));
+ modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), GTK_WINDOW (dialog));
gchar *server_name = modest_account_mgr_get_server_account_hostname (
modest_runtime_get_account_mgr(), server_account_name);
}
}
-void
+void
modest_ui_actions_msg_edit_on_change_priority (GtkRadioAction *action,
GtkRadioAction *selected,
ModestWindow *window)
modest_msg_edit_window_set_priority_flags (MODEST_MSG_EDIT_WINDOW (window), flags);
}
-void
+void
modest_ui_actions_msg_edit_on_change_file_format (GtkRadioAction *action,
GtkRadioAction *selected,
ModestWindow *window)
}
-void
+void
modest_ui_actions_on_zoom_plus (GtkAction *action,
ModestWindow *window)
{
modest_msg_edit_window_select_font (window);
}
+
void
modest_ui_actions_on_folder_display_name_changed (ModestFolderView *folder_view,
const gchar *display_name,
GtkWindow *window)
{
+ /* don't update the display name if it was already set;
+ * updating the display name apparently is expensive */
+ const gchar* old_name = gtk_window_get_title (window);
+
+ if (old_name && display_name && strcmp (old_name, display_name) == 0)
+ return; /* don't do anything */
+
/* This is usually used to change the title of the main window, which
* is the one that holds the folder view. Note that this change can
* happen even when the widget doesn't have the focus. */
gtk_window_set_title (window, display_name);
else
gtk_window_set_title (window, " ");
+
}
void
gtk_widget_set_sensitive (new_button, new_sensitive);
}
+
+#define MODEST_MOVE_TO_DIALOG_FOLDER_VIEW "move-to-dialog-folder-view"
+
+static GtkWidget*
+get_folder_view_from_move_to_dialog (GtkWidget *move_to_dialog)
+{
+ return GTK_WIDGET(g_object_get_data (G_OBJECT(move_to_dialog),
+ MODEST_MOVE_TO_DIALOG_FOLDER_VIEW));
+}
+
static GtkWidget*
create_move_to_dialog (GtkWindow *win,
GtkWidget *folder_view,
} else {
const gchar *active_account_name = NULL;
ModestAccountMgr *mgr = NULL;
- ModestAccountData *acc_data = NULL;
+ ModestAccountSettings *settings = NULL;
+ ModestServerAccountSettings *store_settings = NULL;
modest_folder_view_set_style (MODEST_FOLDER_VIEW (*tree_view),
MODEST_FOLDER_VIEW_STYLE_SHOW_ALL);
active_account_name = modest_window_get_active_account (MODEST_WINDOW (win));
mgr = modest_runtime_get_account_mgr ();
- acc_data = modest_account_mgr_get_account_data (mgr, active_account_name);
+ settings = modest_account_mgr_load_account_settings (mgr, active_account_name);
+
+ if (settings) {
+ const gchar *store_account_name;
+ store_settings = modest_account_settings_get_store_settings (settings);
+ store_account_name = modest_server_account_settings_get_account_name (store_settings);
- /* Set the new visible & active account */
- if (acc_data && acc_data->store_account) {
modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (*tree_view),
- acc_data->store_account->account_name);
- modest_account_mgr_free_account_data (mgr, acc_data);
+ store_account_name);
+ g_object_unref (store_settings);
+ g_object_unref (settings);
}
}
+ /* we keep a pointer to the embedded folder view, so we can retrieve it with
+ * get_folder_view_from_move_to_dialog
+ * (see above) later (needed for focus handling)
+ */
+ g_object_set_data (G_OBJECT(dialog), MODEST_MOVE_TO_DIALOG_FOLDER_VIEW, *tree_view);
+
+
/* Hide special folders */
modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (*tree_view), FALSE);
-
+
gtk_container_add (GTK_CONTAINER (scroll), *tree_view);
/* Add scroll to dialog */
{
ModestWindow *main_window = NULL;
GObject *win = NULL;
- const GError *error = NULL;
- const gchar *message = NULL;
-
- /* Get error message */
- error = modest_mail_operation_get_error (mail_op);
- if (error != NULL && error->message != NULL) {
- message = error->message;
- } else {
- message = _("mail_in_ui_folder_move_target_error");
- }
/* Disable next automatic folder selection */
main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
/* Show notification dialog */
win = modest_mail_operation_get_source (mail_op);
- modest_platform_run_information_dialog ((GtkWindow *) win, message);
+ modest_platform_run_information_dialog ((GtkWindow *) win, _("mail_in_ui_folder_move_target_error"));
if (win)
g_object_unref (win);
}
* and the msg view window when using the "Move to" dialog
*/
static void
-modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder,
- ModestWindow *win)
+xfer_messages_from_move_to_cb (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);
TnyList *headers = NULL;
TnyAccount *dst_account = NULL;
const gchar *proto_str = NULL;
gboolean dst_is_pop = FALSE;
+ if (canceled || err) {
+ g_object_unref (dst_folder);
+ return;
+ }
+
if (!TNY_IS_FOLDER (dst_folder)) {
modest_platform_information_banner (GTK_WIDGET (win),
NULL,
g_object_unref (G_OBJECT (mail_op));
g_object_unref (headers);
+ g_object_unref (dst_folder);
+}
+
+typedef struct {
+ TnyFolder *src_folder;
+ TnyFolderStore *dst_folder;
+ gboolean delete_original;
+ GtkWidget *folder_view;
+} MoveFolderInfo;
+
+static void
+on_move_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window,
+ TnyAccount *account, gpointer user_data)
+{
+ MoveFolderInfo *info = (MoveFolderInfo*)user_data;
+ GtkTreeSelection *sel;
+ ModestMailOperation *mail_op = NULL;
+
+ if (canceled || err || !MODEST_IS_MAIN_WINDOW (parent_window)) {
+ g_object_unref (G_OBJECT (info->src_folder));
+ g_object_unref (G_OBJECT (info->dst_folder));
+ g_free (info);
+ return;
+ }
+
+ MoveToHelper *helper = g_new0 (MoveToHelper, 1);
+ helper->banner = modest_platform_animation_banner (GTK_WIDGET (parent_window), NULL,
+ _CS("ckct_nw_pasting"));
+ if (helper->banner != NULL) {
+ gtk_window_set_modal (GTK_WINDOW(helper->banner), FALSE);
+ gtk_widget_show (GTK_WIDGET(helper->banner));
+ }
+ /* Clean folder on header view before moving it */
+ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (info->folder_view));
+ gtk_tree_selection_unselect_all (sel);
+
+ /* Let gtk events run. We need that the folder
+ view frees its reference to the source
+ folder *before* issuing the mail operation
+ so we need the signal handler of selection
+ changed to happen before the mail
+ operation
+ while (gtk_events_pending ())
+ gtk_main_iteration (); */
+
+ mail_op =
+ modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window),
+ modest_ui_actions_move_folder_error_handler,
+ info->src_folder, NULL);
+ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+ mail_op);
+
+ /* Select *after* the changes */
+ /* TODO: this function hangs UI after transfer */
+ /* modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), */
+ /* TNY_FOLDER (src_folder), TRUE); */
+
+ modest_mail_operation_xfer_folder (mail_op,
+ TNY_FOLDER (info->src_folder),
+ info->dst_folder,
+ info->delete_original,
+ move_to_cb,
+ helper);
+
+ modest_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view),
+ TNY_FOLDER (info->dst_folder), TRUE);
+
+ /* Unref mail operation */
+ g_object_unref (G_OBJECT (mail_op));
+ g_object_unref (G_OBJECT (info->src_folder));
+ g_object_unref (G_OBJECT (info->dst_folder));
+ g_free (user_data);
}
/*
ModestMainWindow *win)
{
ModestHeaderView *header_view = NULL;
- ModestMailOperation *mail_op = NULL;
TnyFolderStore *src_folder;
- gboolean online = (tny_device_is_online (modest_runtime_get_device()));
+ gboolean online = (tny_device_is_online (modest_runtime_get_device()));
g_return_if_fail (MODEST_IS_MAIN_WINDOW (win));
/* Get folder or messages to transfer */
if (gtk_widget_is_focus (folder_view)) {
- GtkTreeSelection *sel;
- gboolean do_xfer = TRUE;
+ 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)) {
- do_xfer = FALSE;
- } else if (!TNY_IS_FOLDER (src_folder)) {
+ !MODEST_IS_TNY_LOCAL_FOLDERS_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;
- } else if (!online && modest_tny_folder_store_is_remote(src_folder)) {
- guint num_headers = tny_folder_get_all_count(TNY_FOLDER (src_folder));
+ do_xfer = FALSE;
+ } /* 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))
- do_xfer = FALSE;
+ if (!connect_to_get_msg(MODEST_WINDOW (win), num_headers, account))
+ do_xfer = FALSE;
g_object_unref (account);
- }
-
- if (do_xfer) {
- MoveToHelper *helper = g_new0 (MoveToHelper, 1);
- helper->banner = modest_platform_animation_banner (GTK_WIDGET (win), NULL,
- _CS("ckct_nw_pasting"));
- if (helper->banner != NULL) {
- gtk_window_set_modal (GTK_WINDOW(helper->banner), FALSE);
- gtk_widget_show (GTK_WIDGET(helper->banner));
- }
- /* Clean folder on header view before moving it */
- sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view));
- gtk_tree_selection_unselect_all (sel);
-
- /* Let gtk events run. We need that the folder
- view frees its reference to the source
- folder *before* issuing the mail operation
- so we need the signal handler of selection
- changed to happen before the mail
- operation */
- while (gtk_events_pending ())
- gtk_main_iteration ();
-
- mail_op =
- modest_mail_operation_new_with_error_handling (G_OBJECT(win),
- modest_ui_actions_move_folder_error_handler,
- src_folder, NULL);
- modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
- mail_op);
-
- /* Select *after* the changes */
- /* TODO: this function hangs UI after transfer */
-/* modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), */
-/* TNY_FOLDER (src_folder), TRUE); */
-
- modest_mail_operation_xfer_folder (mail_op,
- TNY_FOLDER (src_folder),
- dst_folder,
- TRUE,
- move_to_cb,
- helper);
- /* Unref mail operation */
- g_object_unref (G_OBJECT (mail_op));
- }
+ }*/
+
+ if (do_xfer) {
+ MoveFolderInfo *info = g_new0 (MoveFolderInfo, 1);
+ info->src_folder = TNY_FOLDER (src_folder);
+ info->dst_folder = dst_folder;
+ info->delete_original = TRUE;
+ info->folder_view = folder_view;
+ g_object_ref (G_OBJECT (info->src_folder));
+ g_object_ref (G_OBJECT (info->dst_folder));
+ modest_platform_connect_if_remote_and_perform(GTK_WINDOW (win),
+ TNY_FOLDER_STORE (dst_folder), on_move_folder_cb, info);
+ }
} 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_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);
+ gboolean do_xfer = TRUE;
+ /* 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);
- if (!connect_to_get_msg(MODEST_WINDOW (win), num_headers, account))
- do_xfer = FALSE;
+ if (!connect_to_get_msg(MODEST_WINDOW (win), num_headers, account))
+ do_xfer = FALSE;
g_object_unref (account);
- }
- g_object_unref(headers);
- }
- if (do_xfer) /* Transfer messages */
- modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win));
+ }
+ g_object_unref(headers);
+ }
+ if (do_xfer) /* Transfer messages */ {
+ g_object_ref (dst_folder);
+ modest_platform_connect_if_remote_and_perform(GTK_WINDOW (win),
+ TNY_FOLDER_STORE (dst_folder), xfer_messages_from_move_to_cb, dst_folder);
+ }
}
- if (src_folder)
- g_object_unref (src_folder);
+ if (src_folder)
+ g_object_unref (src_folder);
}
}
if (do_xfer) {
- modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win));
+ g_object_ref (dst_folder);
+ modest_platform_connect_if_remote_and_perform(GTK_WINDOW (win),
+ TNY_FOLDER_STORE (dst_folder), xfer_messages_from_move_to_cb, dst_folder);
}
g_object_unref (account);
g_object_unref (src_folder);
return;
dst_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (tree_view));
- /* Do window specific stuff */
- if (MODEST_IS_MAIN_WINDOW (win)) {
- modest_ui_actions_on_main_window_move_to (action,
- folder_view,
- dst_folder,
- MODEST_MAIN_WINDOW (win));
- } else {
- modest_ui_actions_on_msg_view_window_move_to (action,
- dst_folder,
- MODEST_MSG_VIEW_WINDOW (win));
- }
+ /* Do window specific stuff */
+ if (MODEST_IS_MAIN_WINDOW (win)) {
+ modest_ui_actions_on_main_window_move_to (action,
+ folder_view,
+ dst_folder,
+ MODEST_MAIN_WINDOW (win));
+ } else {
+ modest_ui_actions_on_msg_view_window_move_to (action,
+ dst_folder,
+ MODEST_MSG_VIEW_WINDOW (win));
+ }
if (dst_folder)
g_object_unref (dst_folder);
TnyList *headers = TNY_LIST (user_data);
if (err || canceled) {
- /* Show an error ? */
goto out;
}
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);
because it hasn't changed. We also do not
need to save the widget status. Just force
a refresh */
- modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view),
- TNY_FOLDER (folder_store),
- folder_refreshed_cb,
- main_win);
+ 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)
message = g_strdup (_("emev_ib_ui_smtp_send_error"));
break;
default:
- g_return_if_reached ();
+ g_warning ("%s: unexpected TNY_TRANSPORT_ACCOUNT_ERROR %d",
+ __FUNCTION__, err->code);
+ message = g_strdup (_("emev_ib_ui_smtp_send_error"));
+ break;
}
/* TODO if the username or the password where not defined we
projects / modest / blobdiff