} ReplyForwardHelper;
typedef struct _MoveToHelper {
- ModestMailOperation *mail_op;
- TnyFolder *folder;
+ GtkTreeRowReference *reference;
+ GtkWidget *banner;
} MoveToHelper;
typedef struct _PasteAsAttachmentHelper {
TnyFolder *folder,
gpointer user_data);
-static void _on_send_receive_progress_changed (ModestMailOperation *mail_op,
- ModestMailOperationState *state,
- gpointer user_data);
+static void on_send_receive_finished (ModestMailOperation *mail_op,
+ gpointer user_data);
static gint header_list_count_uncached_msgs (TnyList *header_list);
-static gboolean connect_to_get_msg (
- GtkWindow *win,
- gint num_of_uncached_msgs);
+
+static gboolean connect_to_get_msg (ModestWindow *win,
+ gint num_of_uncached_msgs,
+ TnyAccount *account);
static gboolean remote_folder_is_pop (const TnyFolderStore *folder);
* returns: TRUE if an account was created. FALSE if the user cancelled.
*/
gboolean
-modest_run_account_setup_wizard (ModestWindow *win)
+modest_ui_actions_run_account_setup_wizard (ModestWindow *win)
{
- gboolean result = FALSE;
- GtkDialog *wizard, *dialog;
+ gboolean result = FALSE;
+ GtkWindow *dialog, *wizard;
+ gint dialog_response;
/* Show the easy-setup wizard: */
- dialog = modest_window_mgr_get_modal_dialog (modest_runtime_get_window_mgr());
+ dialog = modest_window_mgr_get_modal (modest_runtime_get_window_mgr());
if (dialog && MODEST_IS_EASYSETUP_WIZARD_DIALOG(dialog)) {
/* old wizard is active already;
*/
}
- /* there is no such wizard yet */
-
- wizard = GTK_DIALOG(modest_easysetup_wizard_dialog_new ());
- if (!wizard) {
- g_printerr ("modest: failed to create easysetup wizard\n");
- return FALSE;
- }
-
- modest_window_mgr_set_modal_dialog
- (modest_runtime_get_window_mgr(), GTK_DIALOG(wizard));
-
-
- /* there is no such wizard yet */
- wizard = GTK_DIALOG(modest_easysetup_wizard_dialog_new ());
- modest_window_mgr_set_modal_dialog (modest_runtime_get_window_mgr(),
- GTK_DIALOG(wizard));
-
- /* make it non-modal; if though we register it as a modal dialog above
- * apparently, making it modal *at all* gives hangs -- FIXME: check this*/
- gtk_window_set_modal (GTK_WINDOW(dialog), FALSE);
+ /* there is no such wizard yet */
+ wizard = GTK_WINDOW (modest_easysetup_wizard_dialog_new ());
+ modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), wizard);
/* always present a main window in the background
* we do it here, so we cannot end up with to wizards (as this
/* make sure the mainwindow is visible */
gtk_widget_show_all (GTK_WIDGET(win));
gtk_window_present (GTK_WINDOW(win));
-
- gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win));
+ dialog_response = gtk_dialog_run (GTK_DIALOG (wizard));
+ gtk_widget_destroy (GTK_WIDGET (wizard));
+ if (gtk_events_pending ())
+ gtk_main_iteration ();
- /* Don't make this a modal window, because secondary windows will then
- * be unusable, freezing the UI: */
- /* gtk_window_set_modal (GTK_WINDOW (wizard), TRUE); */
-
- gint dialog_response = gtk_dialog_run (GTK_DIALOG (wizard));
- if (dialog_response == GTK_RESPONSE_CANCEL)
+ if (dialog_response == GTK_RESPONSE_CANCEL) {
result = FALSE;
- else {
+ } else {
/* Check whether an account was created: */
result = modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE);
}
- gtk_widget_destroy (GTK_WIDGET (wizard));
-
- /* clear it from the window mgr */
- modest_window_mgr_set_modal_dialog
- (modest_runtime_get_window_mgr(), NULL);
-
return result;
}
return NULL;
}
+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;
+}
+
static void
headers_action_mark_as_read (TnyHeader *header,
ModestWindow *win,
void modest_do_message_delete (TnyHeader *header, ModestWindow *win)
{
ModestMailOperation *mail_op = NULL;
- mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_DELETE,
- win ? G_OBJECT(win) : NULL);
+ mail_op = modest_mail_operation_new (win ? G_OBJECT(win) : NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
void modest_do_messages_delete (TnyList *headers, ModestWindow *win)
{
ModestMailOperation *mail_op = NULL;
- mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_DELETE,
- win ? G_OBJECT(win) : NULL);
+ mail_op = modest_mail_operation_new (win ? G_OBJECT(win) : NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
}
void
-modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win)
+modest_ui_actions_on_accounts (GtkAction *action,
+ 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)) {
- modest_run_account_setup_wizard (win);
+ if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE)) {
+ modest_ui_actions_run_account_setup_wizard (win);
return;
- } else {
- /* Show the list of accounts: */
- GtkDialog *account_win = GTK_DIALOG(modest_account_view_window_new ());
- gtk_window_set_transient_for (GTK_WINDOW (account_win), GTK_WINDOW (win));
+ } else {
+ /* Show the list of accounts */
+ GtkWindow *account_win = GTK_WINDOW (modest_account_view_window_new ());
+ gtk_window_set_transient_for (account_win, GTK_WINDOW (win));
- /* The accounts dialog must be modal */
- gtk_window_set_modal (GTK_WINDOW (account_win), TRUE);
- modest_maemo_show_dialog_and_forget (GTK_WINDOW (win), account_win);
+ /* 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));
}
#else
GtkWidget *dialog, *label;
/* if there are no accounts yet, just show the wizard */
if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE)) {
- const gboolean created = modest_run_account_setup_wizard (win);
- if (!created)
- return;
+ if (!modest_ui_actions_run_account_setup_wizard (win))
+ return;
}
account_name = g_strdup (modest_window_get_active_account (win));
/* If the header is in the drafts folder then open the editor,
else the message view window */
- if ((folder_type == TNY_FOLDER_TYPE_DRAFTS) ||
- (folder_type == TNY_FOLDER_TYPE_OUTBOX)) {
+ if (folder_type == TNY_FOLDER_TYPE_DRAFTS) {
/* we cannot edit without a valid account... */
if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) {
- const gboolean created = modest_run_account_setup_wizard(parent_win);
- if (!created)
+ if (!modest_ui_actions_run_account_setup_wizard(parent_win))
goto cleanup;
}
win = modest_msg_edit_window_new (msg, account, TRUE);
g_object_unref (folder);
}
+
+static void
+open_msg_error_handler (ModestMailOperation *mail_op,
+ gpointer user_data)
+{
+ /* Show the message error */
+ GObject *win = modest_mail_operation_get_source (mail_op);
+
+ modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL,
+ (gchar *) user_data);
+ if (win)
+ g_object_unref (win);
+}
+
void
modest_ui_actions_get_msgs_full_error_handler (ModestMailOperation *mail_op,
gpointer user_data)
GObject *win = modest_mail_operation_get_source (mail_op);
error = modest_mail_operation_get_error (mail_op);
-/* printf ("DEBUG: %s: Error: code=%d, text=%s\n", __FUNCTION__, error->code, error->message); */
if (error->code == MODEST_MAIL_OPERATION_ERROR_MESSAGE_SIZE_LIMIT) {
g_object_unref (win);
}
+/**
+ * Returns the account a list of headers belongs to. It returns a
+ * *new* reference so don't forget to unref it
+ */
+static TnyAccount*
+get_account_from_header_list (TnyList *headers)
+{
+ TnyAccount *account = NULL;
+
+ if (tny_list_get_length (headers) > 0) {
+ TnyIterator *iter = tny_list_create_iterator (headers);
+ TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+ TnyFolder *folder = tny_header_get_folder (header);
+ account = tny_folder_get_account (folder);
+ g_object_unref (folder);
+ g_object_unref (header);
+ g_object_unref (iter);
+ }
+ return account;
+}
+
/*
* This function is used by both modest_ui_actions_on_open and
* modest_ui_actions_on_header_activated. This way we always do the
_modest_ui_actions_open (TnyList *headers, ModestWindow *win)
{
ModestWindowMgr *mgr = NULL;
- TnyIterator *iter = NULL;
+ TnyIterator *iter = NULL, *iter_not_opened = NULL;
ModestMailOperation *mail_op = NULL;
TnyList *not_opened_headers = NULL;
TnyHeaderFlags flags = 0;
+ TnyAccount *account;
g_return_if_fail (headers != NULL);
return;
}
+ mgr = modest_runtime_get_window_mgr ();
+ iter = tny_list_create_iterator (headers);
+ /* Get the account */
+ account = get_account_from_header_list (headers);
+
/* Look if we already have a message view for each header. If
true, then remove the header from the list of headers to
open */
- mgr = modest_runtime_get_window_mgr ();
- iter = tny_list_create_iterator (headers);
not_opened_headers = tny_simple_list_new ();
-
while (!tny_iterator_is_done (iter)) {
ModestWindow *window = NULL;
}
g_object_unref (iter);
iter = NULL;
+
+ /* Open each message */
+ if (tny_list_get_length (not_opened_headers) == 0)
+ goto cleanup;
/* If some messages would have to be downloaded, ask the user to
* make a connection. It's generally easier to do this here (in the mainloop)
}
g_object_unref (iter);
- if (found && !modest_platform_connect_and_wait (GTK_WINDOW (win), NULL)) {
- g_object_unref (not_opened_headers);
- return;
- }
+ /* Ask the user if there are any uncached messages */
+ if (found && !connect_to_get_msg (win,
+ header_list_count_uncached_msgs (not_opened_headers),
+ account))
+ goto cleanup;
}
/* Register the headers before actually creating the windows: */
- TnyIterator *iter_not_opened = tny_list_create_iterator (not_opened_headers);
+ iter_not_opened = tny_list_create_iterator (not_opened_headers);
while (!tny_iterator_is_done (iter_not_opened)) {
TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter_not_opened));
if (header) {
modest_window_mgr_register_header (mgr, header);
g_object_unref (header);
- }
-
+ }
tny_iterator_next (iter_not_opened);
}
g_object_unref (iter_not_opened);
iter_not_opened = NULL;
-
- /* Open each message */
- if (tny_list_get_length (not_opened_headers) > 0) {
- mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
- G_OBJECT (win),
+
+ /* Create the mail operation */
+ if (tny_list_get_length (not_opened_headers) > 1) {
+ mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (win),
modest_ui_actions_get_msgs_full_error_handler,
- NULL);
+ NULL, NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
- if (tny_list_get_length (not_opened_headers) > 1) {
- modest_mail_operation_get_msgs_full (mail_op,
- not_opened_headers,
- open_msg_cb,
- NULL,
- NULL);
+
+ modest_mail_operation_get_msgs_full (mail_op,
+ not_opened_headers,
+ open_msg_cb,
+ NULL,
+ NULL);
+ } else {
+ TnyIterator *iter = tny_list_create_iterator (not_opened_headers);
+ TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+ const gchar *proto_name;
+ gchar *error_msg;
+ ModestTransportStoreProtocol proto;
+
+ /* Get the error message depending on the protocol */
+ proto_name = tny_account_get_proto (account);
+ if (proto_name != NULL) {
+ proto = modest_protocol_info_get_transport_store_protocol (proto_name);
} else {
- TnyIterator *iter = tny_list_create_iterator (not_opened_headers);
- TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
- modest_mail_operation_get_msg (mail_op, header, open_msg_cb, NULL);
- g_object_unref (header);
- g_object_unref (iter);
+ proto = MODEST_PROTOCOL_STORE_MAILDIR;
}
- g_object_unref (mail_op);
+
+ if (proto == MODEST_PROTOCOL_STORE_POP) {
+ error_msg = g_strdup (_("emev_ni_ui_pop3_msg_recv_error"));
+ } else if (proto == MODEST_PROTOCOL_STORE_IMAP) {
+ error_msg = g_strdup_printf (_("emev_ni_ui_imap_message_not_available_in_server"),
+ tny_header_get_subject (header));
+ } else {
+ error_msg = g_strdup (_("mail_ni_ui_folder_get_msg_folder_error"));
+ }
+
+ /* Create and call the mail operation */
+ mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (win),
+ open_msg_error_handler,
+ error_msg,
+ g_free);
+ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+
+ modest_mail_operation_get_msg (mail_op, header, open_msg_cb, NULL);
+
+ g_object_unref (header);
+ g_object_unref (iter);
}
+ g_object_unref (mail_op);
+cleanup:
/* Clean */
- if (not_opened_headers != NULL)
+ if (account)
+ g_object_unref (account);
+ if (not_opened_headers)
g_object_unref (not_opened_headers);
}
TnyAccount *account = NULL;
ModestWindowMgr *mgr = NULL;
gchar *signature = NULL;
+ gboolean use_signature;
/* If there was any error. The mail operation could be NULL,
this means that we already have the message downloaded and
from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
rf_helper->account_name);
- if (modest_account_mgr_get_bool (modest_runtime_get_account_mgr(),
- rf_helper->account_name,
- MODEST_ACCOUNT_USE_SIGNATURE, FALSE)) {
- signature = modest_account_mgr_get_string (modest_runtime_get_account_mgr (),
- rf_helper->account_name,
- MODEST_ACCOUNT_SIGNATURE, FALSE);
- }
+ signature = modest_account_mgr_get_signature (modest_runtime_get_account_mgr(),
+ rf_helper->account_name,
+ &use_signature);
/* Create reply mail */
switch (rf_helper->action) {
* messages. Returns TRUE if the user allowed the download.
*/
static gboolean
-connect_to_get_msg (GtkWindow *win,
- gint num_of_uncached_msgs)
+connect_to_get_msg (ModestWindow *win,
+ gint num_of_uncached_msgs,
+ TnyAccount *account)
{
+ GtkResponseType response;
+
/* 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 */
- GtkResponseType response;
response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
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(win, NULL);
+ return modest_platform_connect_and_wait(GTK_WINDOW (win), account);
}
/*
/* we need an account when editing */
if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) {
- const gboolean created = modest_run_account_setup_wizard (win);
- if (!created)
+ if (!modest_ui_actions_run_account_setup_wizard (win))
return;
}
if (do_retrieve){
gint num_of_unc_msgs;
+
/* check that the messages have been previously downloaded */
num_of_unc_msgs = header_list_count_uncached_msgs(header_list);
/* If there are any uncached message ask the user
* whether he/she wants to download them. */
- if (num_of_unc_msgs)
- continue_download = connect_to_get_msg (
- GTK_WINDOW (win),
- num_of_unc_msgs);
+ if (num_of_unc_msgs) {
+ TnyAccount *account = get_account_from_header_list (header_list);
+ continue_download = connect_to_get_msg (win, num_of_unc_msgs, account);
+ g_object_unref (account);
+ }
}
if (!continue_download) {
if (header) {
/* Retrieve messages */
if (do_retrieve) {
- mail_op = modest_mail_operation_new_with_error_handling (
- MODEST_MAIL_OPERATION_TYPE_RECEIVE,
- G_OBJECT(win),
- modest_ui_actions_get_msgs_full_error_handler,
- NULL);
+ mail_op =
+ modest_mail_operation_new_with_error_handling (G_OBJECT(win),
+ modest_ui_actions_get_msgs_full_error_handler,
+ NULL, NULL);
modest_mail_operation_queue_add (
modest_runtime_get_mail_operation_queue (), mail_op);
}
/* Notify new messages have been downloaded */
- if ((new_headers != NULL) && (tny_list_get_length (new_headers) > 0)) {
- TnyIterator *iter = tny_list_create_iterator (new_headers);
- do {
- TnyHeader *header = NULL;
-
- header = TNY_HEADER (tny_iterator_get_current (iter));
- modest_platform_on_new_header_received (header);
- g_object_unref (header);
-
- tny_iterator_next (iter);
- } while (!tny_iterator_is_done (iter));
- g_object_unref (iter);
- }
+ if ((new_headers != NULL) && (tny_list_get_length (new_headers) > 0))
+ modest_platform_on_new_headers_received (new_headers);
}
/*
/* Set send/receive operation in progress */
modest_main_window_notify_send_receive_initied (MODEST_MAIN_WINDOW(win));
- mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
- G_OBJECT (win),
+ mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (win),
modest_ui_actions_send_receive_error_handler,
- NULL);
+ NULL, NULL);
- g_signal_connect (G_OBJECT(mail_op), "progress-changed",
- G_CALLBACK (_on_send_receive_progress_changed),
+ g_signal_connect (G_OBJECT(mail_op), "operation-finished",
+ G_CALLBACK (on_send_receive_finished),
win);
/* Send & receive. */
if (!header)
return;
+ if (modest_header_view_count_selected_headers (header_view) > 1) {
+ hildon_banner_show_information (NULL, NULL, _("mcen_ib_select_one_message"));
+ return;
+ }
+
/* headers = tny_simple_list_new (); */
/* tny_list_prepend (headers, G_OBJECT (header)); */
/* g_message ("%s %s", __FUNCTION__, address); */
}
+static void
+on_save_to_drafts_cb (ModestMailOperation *mail_op,
+ TnyMsg *saved_draft,
+ gpointer user_data)
+{
+ ModestMsgEditWindow *edit_window;
+
+ edit_window = MODEST_MSG_EDIT_WINDOW (user_data);
+
+ /* If there was any error do nothing */
+ if (modest_mail_operation_get_error (mail_op) != NULL)
+ return;
+
+ modest_msg_edit_window_set_draft (edit_window, saved_draft);
+}
+
void
modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edit_window)
{
from = modest_account_mgr_get_from_string (account_mgr, account_name);
/* Create the mail operation */
- mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_INFO, G_OBJECT(edit_window));
+ mail_operation = modest_mail_operation_new (G_OBJECT(edit_window));
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation);
modest_mail_operation_save_to_drafts (mail_operation,
transport_account,
data->draft_msg,
- edit_window,
from,
data->to,
data->cc,
data->plain_body,
data->html_body,
data->attachments,
- data->priority_flags);
+ data->images,
+ data->priority_flags,
+ on_save_to_drafts_cb,
+ edit_window);
/* Frees */
g_free (from);
g_free (account_name);
info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts"));
modest_platform_information_banner (NULL, NULL, info_text);
+ modest_msg_edit_window_reset_modified (edit_window);
g_free (info_text);
}
if (!modest_msg_edit_window_check_names (edit_window, TRUE))
return;
- /* Offer the connection dialog, if necessary: */
- if (!modest_platform_connect_and_wait (GTK_WINDOW (edit_window), NULL))
- return;
-
/* FIXME: Code added just for testing. The final version will
use the send queue provided by tinymail and some
classifier */
if (!account_name) {
/* Run account setup wizard */
- const gboolean created = modest_run_account_setup_wizard(MODEST_WINDOW(edit_window));
- if (!created)
+ if (!modest_ui_actions_run_account_setup_wizard (MODEST_WINDOW(edit_window)))
return;
}
account_name));
if (!transport_account) {
/* Run account setup wizard */
- const gboolean created = modest_run_account_setup_wizard(MODEST_WINDOW(edit_window));
- if (!created)
+ if (!modest_ui_actions_run_account_setup_wizard(MODEST_WINDOW(edit_window)))
return;
}
gchar *from = modest_account_mgr_get_from_string (account_mgr, account_name);
/* Create the mail operation */
- ModestMailOperation *mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_SEND, G_OBJECT(edit_window));
+ ModestMailOperation *mail_operation = modest_mail_operation_new (G_OBJECT(edit_window));
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation);
modest_mail_operation_send_new_mail (mail_operation,
data->plain_body,
data->html_body,
data->attachments,
+ data->images,
data->priority_flags);
/* Free data: */
ModestMainWindow *window = MODEST_MAIN_WINDOW (user_data);
const GError *error = modest_mail_operation_get_error (mail_op);
- if(error)
- {
+ if(error) {
modest_platform_information_banner (GTK_WIDGET (window), NULL,
- modest_mail_operation_get_error (mail_op)->message);
+ _("mail_in_ui_folder_create_error"));
}
}
ModestMailOperation *mail_op;
TnyFolder *new_folder = NULL;
- mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_INFO,
- G_OBJECT(parent_window),
+ mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window),
modest_ui_actions_new_folder_error_handler,
- parent_window);
+ parent_window, NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
GtkTreeSelection *sel = NULL;
mail_op =
- modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_INFO,
- G_OBJECT(main_window),
+ modest_mail_operation_new_with_error_handling (G_OBJECT(main_window),
modest_ui_actions_rename_folder_error_handler,
- main_window);
+ main_window, NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
/* Create the mail operation */
mail_op =
- modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_DELETE,
- G_OBJECT(main_window),
+ modest_mail_operation_new_with_error_handling (G_OBJECT(main_window),
modest_ui_actions_delete_folder_error_handler,
- NULL);
+ NULL, NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
gtk_window_set_transient_for (GTK_WINDOW(dialog), GTK_WINDOW(main_window));
- gchar *server_name = modest_server_account_get_hostname (
+ gchar *server_name = modest_account_mgr_get_server_account_hostname (
modest_runtime_get_account_mgr(), server_account_name);
if (!server_name) {/* This happened once, though I don't know why. murrayc. */
g_warning("%s: Could not get server name for server account '%s'", __FUNCTION__, server_account_name);
server_name = NULL;
/* username: */
- gchar *initial_username = modest_server_account_get_username (
+ gchar *initial_username = modest_account_mgr_get_server_account_username (
modest_runtime_get_account_mgr(), server_account_name);
GtkWidget *entry_username = gtk_entry_new ();
/* Dim this if a connection has ever succeeded with this username,
* as per the UI spec: */
const gboolean username_known =
- modest_server_account_get_username_has_succeeded(
+ modest_account_mgr_get_server_account_username_has_succeeded(
modest_runtime_get_account_mgr(), server_account_name);
gtk_widget_set_sensitive (entry_username, !username_known);
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), entry_password,
TRUE, FALSE, 0);
#endif /* MODEST_PLATFORM_MAEMO */
+
+ if (initial_username != NULL)
+ gtk_widget_grab_focus (GTK_WIDGET (entry_password));
/* This is not in the Maemo UI spec:
remember_pass_check = gtk_check_button_new_with_label (_("Remember password"));
if (username) {
*username = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry_username)));
- modest_server_account_set_username (
+ modest_account_mgr_set_server_account_username (
modest_runtime_get_account_mgr(), server_account_name,
*username);
num_of_unc_msgs = header_list_count_uncached_msgs(header_list);
- if (num_of_unc_msgs)
- continue_download = connect_to_get_msg(
- GTK_WINDOW (window),
- num_of_unc_msgs);
+ if (num_of_unc_msgs) {
+ TnyAccount *account = get_account_from_header_list (header_list);
+ continue_download = connect_to_get_msg (window, num_of_unc_msgs, account);
+ g_object_unref (account);
+ }
if (num_of_unc_msgs == 0 || continue_download) {
/* modest_platform_information_banner (
num_of_unc_msgs = header_list_count_uncached_msgs(header_list);
- if (num_of_unc_msgs)
- continue_download = connect_to_get_msg(
- GTK_WINDOW (window),
- num_of_unc_msgs);
+ if (num_of_unc_msgs) {
+ TnyAccount *account = get_account_from_header_list (header_list);
+ continue_download = connect_to_get_msg (window, num_of_unc_msgs, account);
+ g_object_unref (account);
+ }
if (num_of_unc_msgs == 0 || continue_download) {
modest_platform_information_banner (
helper->banner = modest_platform_animation_banner (GTK_WIDGET (window), NULL,
_CS("ckct_nw_pasting"));
modest_email_clipboard_get_data (e_clipboard, &src_folder, &data, &delete);
- mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
- G_OBJECT (window));
+ mail_op = modest_mail_operation_new (G_OBJECT (window));
if (helper->banner != NULL) {
g_object_ref (G_OBJECT (helper->banner));
gtk_window_set_modal (GTK_WINDOW (helper->banner), FALSE);
modest_email_clipboard_get_data (clipboard, &src_folder, &data, &delete);
/* Create a new mail operation */
- mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(window));
+ mail_op = modest_mail_operation_new (G_OBJECT(window));
/* Get destination folder */
folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (focused_widget));
/* Ask for user confirmation */
response =
- modest_ui_actions_msgs_move_to_confirmation (GTK_WINDOW (window),
+ modest_ui_actions_msgs_move_to_confirmation (window,
TNY_FOLDER (folder_store),
delete,
data);
* drag_and_drop_from_header_view (for d&d in modest_folder_view.c)
*/
gint
-modest_ui_actions_msgs_move_to_confirmation (GtkWindow *win,
+modest_ui_actions_msgs_move_to_confirmation (ModestWindow *win,
TnyFolder *dest_folder,
gboolean delete,
TnyList *headers)
{
gint response = GTK_RESPONSE_OK;
+ TnyAccount *account = NULL;
+ TnyFolder *src_folder = NULL;
+ TnyIterator *iter = NULL;
+ TnyHeader *header = NULL;
/* return with OK if the destination is a remote folder */
if (modest_tny_folder_is_remote_folder (dest_folder))
return GTK_RESPONSE_OK;
- TnyFolder *src_folder = NULL;
- TnyIterator *iter = NULL;
- TnyHeader *header = NULL;
-
/* Get source folder */
iter = tny_list_create_iterator (headers);
header = TNY_HEADER (tny_iterator_get_current (iter));
g_object_unref (src_folder);
return GTK_RESPONSE_OK;
}
- g_object_unref (src_folder);
+
+ /* Get the account */
+ account = tny_folder_get_account (src_folder);
/* now if offline we ask the user */
- if(connect_to_get_msg( GTK_WINDOW (win),
- tny_list_get_length (headers)))
+ if(connect_to_get_msg (win, tny_list_get_length (headers), account))
response = GTK_RESPONSE_OK;
else
response = GTK_RESPONSE_CANCEL;
+ /* Frees */
+ g_object_unref (src_folder);
+ g_object_unref (account);
+
return response;
}
static void
move_to_cb (ModestMailOperation *mail_op, gpointer user_data)
{
+ MoveToHelper *helper = (MoveToHelper *) user_data;
+
/* Note that the operation could have failed, in that case do
nothing */
if (modest_mail_operation_get_status (mail_op) ==
if (!modest_msg_view_window_select_previous_message (self))
/* No more messages to view, so close this window */
modest_ui_actions_on_close_window (NULL, MODEST_WINDOW(self));
+ } else if (MODEST_IS_MAIN_WINDOW (object) && helper->reference != NULL) {
+ 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);
+ gtk_tree_selection_select_path (sel, path);
+ gtk_tree_path_free (path);
}
g_object_unref (object);
}
/* Close the "Pasting" information banner */
- gtk_widget_destroy (GTK_WIDGET(user_data));
+ gtk_widget_destroy (GTK_WIDGET(helper->banner));
+ if (helper->reference != NULL)
+ gtk_tree_row_reference_free (helper->reference);
+ g_free (helper);
}
void
} else {
ModestMailOperation *mail_op = NULL;
modest_window_mgr_register_header (modest_runtime_get_window_mgr (), header);
- mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
- G_OBJECT (win),
+ mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (win),
modest_ui_actions_get_msgs_full_error_handler,
- NULL);
+ NULL, NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
modest_mail_operation_get_msg (mail_op, header, open_msg_for_purge_cb, win);
return;
}
- GtkWidget *inf_note;
- inf_note = modest_platform_animation_banner (GTK_WIDGET (win), NULL,
- _CS("ckct_nw_pasting"));
- if (inf_note != NULL) {
- gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE);
- gtk_widget_show (GTK_WIDGET(inf_note));
+ 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));
+ }
+
+ 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);
+ helper->reference = get_next_after_selected_headers (MODEST_HEADER_VIEW (header_view));
}
ModestMailOperation *mail_op =
- modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
- G_OBJECT(win),
+ modest_mail_operation_new_with_error_handling (G_OBJECT(win),
modest_ui_actions_move_folder_error_handler,
- NULL);
+ NULL, NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
TNY_FOLDER (dst_folder),
TRUE,
move_to_cb,
- inf_note);
+ helper);
g_object_unref (G_OBJECT (mail_op));
g_object_unref (headers);
g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__);
do_xfer = FALSE;
} else if (!online && modest_platform_is_network_folderstore(src_folder)) {
- guint num_headers = tny_folder_get_all_count(TNY_FOLDER(src_folder));
- if (!connect_to_get_msg(GTK_WINDOW(win), num_headers)) {
+ 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;
- }
+ g_object_unref (account);
}
if (do_xfer) {
- GtkWidget *inf_note;
- inf_note = modest_platform_animation_banner (GTK_WIDGET (win), NULL,
- _CS("ckct_nw_pasting"));
- if (inf_note != NULL) {
- gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE);
- gtk_widget_show (GTK_WIDGET(inf_note));
+ 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);
mail_op =
- modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
- G_OBJECT(win),
+ modest_mail_operation_new_with_error_handling (G_OBJECT(win),
modest_ui_actions_move_folder_error_handler,
- src_folder);
+ src_folder, NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
dst_folder,
TRUE,
move_to_cb,
- inf_note);
+ helper);
/* Unref mail operation */
g_object_unref (G_OBJECT (mail_op));
}
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);
- if (!connect_to_get_msg(GTK_WINDOW(win), num_headers)) {
+ TnyAccount *account = get_account_from_header_list (headers);
+ if (!connect_to_get_msg(MODEST_WINDOW (win), num_headers, account))
do_xfer = FALSE;
- }
+ g_object_unref (account);
}
g_object_unref(headers);
}
ModestMsgViewWindow *win)
{
TnyHeader *header = NULL;
- TnyFolderStore *src_folder;
+ TnyFolder *src_folder = NULL;
+ TnyAccount *account = NULL;
/* Create header list */
header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));
- src_folder = TNY_FOLDER_STORE(tny_header_get_folder(header));
+ src_folder = TNY_FOLDER (tny_header_get_folder(header));
g_object_unref (header);
/* Transfer the message if online or confirmed by the user */
- if (tny_device_is_online (modest_runtime_get_device()) || remote_folder_is_pop(src_folder) ||
- (modest_platform_is_network_folderstore(src_folder) && connect_to_get_msg(GTK_WINDOW(win), 1))) {
+ account = tny_folder_get_account (src_folder);
+ if (remote_folder_is_pop(TNY_FOLDER_STORE (src_folder)) ||
+ (modest_platform_is_network_folderstore(TNY_FOLDER_STORE (src_folder)) &&
+ connect_to_get_msg(MODEST_WINDOW (win), 1, account))) {
modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win));
}
-
+ g_object_unref (account);
g_object_unref (src_folder);
}
return;
/* Create mail operation */
- mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
- G_OBJECT (window),
+ mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (window),
modest_ui_actions_get_msgs_full_error_handler,
- NULL);
+ NULL, NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
modest_mail_operation_get_msgs_full (mail_op, headers, NULL, NULL, NULL);
}
static void
-_on_send_receive_progress_changed (ModestMailOperation *mail_op,
- ModestMailOperationState *state,
- gpointer user_data)
+on_send_receive_finished (ModestMailOperation *mail_op,
+ gpointer user_data)
{
- g_return_if_fail (MODEST_IS_MAIN_WINDOW(user_data));
-
/* Set send/receive operation finished */
- if (state->status != MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS)
- modest_main_window_notify_send_receive_completed (MODEST_MAIN_WINDOW(user_data));
-
+ modest_main_window_notify_send_receive_completed (MODEST_MAIN_WINDOW (user_data));
}
projects / modest / blobdiff