#ifdef MODEST_PLATFORM_MAEMO
#include "maemo/modest-osso-state-saving.h"
+#include "maemo/modest-maemo-utils.h"
+#include "maemo/modest-hildon-includes.h"
#endif /* MODEST_PLATFORM_MAEMO */
#include "widgets/modest-ui-constants.h"
GtkWidget *parent_window;
} ReplyForwardHelper;
+typedef struct _PasteAsAttachmentHelper {
+ ModestMsgEditWindow *window;
+ GtkWidget *banner;
+} PasteAsAttachmentHelper;
+
/*
* The do_headers_action uses this kind of functions to perform some
static void reply_forward (ReplyForwardAction action, ModestWindow *win);
+static void folder_refreshed_cb (ModestMailOperation *mail_op,
+ TnyFolder *folder,
+ gpointer user_data);
static void _on_send_receive_progress_changed (ModestMailOperation *mail_op,
ModestMailOperationState *state,
gpointer user_data);
+static gboolean
+download_uncached_messages (TnyList *header_list, GtkWindow *win,
+ gboolean reply_fwd);
static void
}
}
-
-static void
-headers_action_delete (TnyHeader *header,
- ModestWindow *win,
- gpointer user_data)
+/** A convenience method, because deleting a message is
+ * otherwise complicated, and it's best to change it in one place
+ * when we change it.
+ */
+void modest_do_message_delete (TnyHeader *header, ModestWindow *win)
{
ModestMailOperation *mail_op = NULL;
-
- mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_DELETE, G_OBJECT(win));
+ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_DELETE,
+ win ? G_OBJECT(win) : NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
/* Always delete. TODO: Move to trash still not supported */
modest_mail_operation_remove_msg (mail_op, header, FALSE);
g_object_unref (G_OBJECT (mail_op));
+}
- /* refilter treemodel to hide marked-as-deleted rows */
- if (MODEST_IS_HEADER_VIEW (user_data))
- modest_header_view_refilter (MODEST_HEADER_VIEW (user_data));
+static void
+headers_action_delete (TnyHeader *header,
+ ModestWindow *win,
+ gpointer user_data)
+{
+ modest_do_message_delete (header, win);
+
+/* refilter treemodel to hide marked-as-deleted rows */
+/* if (MODEST_IS_HEADER_VIEW (user_data)) */
+/* modest_header_view_refilter (MODEST_HEADER_VIEW (user_data)); */
+}
+
+/** After deleing a message that is currently visible in a window,
+ * show the next message from the list, or close the window if there are no more messages.
+ **/
+void modest_ui_actions_refresh_message_window_after_delete (ModestMsgViewWindow* win)
+{
+ /* Close msg view window or select next */
+ if (modest_msg_view_window_last_message_selected (win) &&
+ modest_msg_view_window_first_message_selected (win)) {
+ modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (win));
+ } else {
+ modest_msg_view_window_select_next_message (win);
+ }
}
void
-modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
+modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
{
TnyList *header_list = NULL;
TnyIterator *iter = NULL;
header_list = get_selected_headers (win);
if (!header_list) return;
- /* Check if any of the headers is already opened, or in the process of being opened */
+ /* Check if any of the headers are already opened, or in the process of being opened */
if (MODEST_IS_MAIN_WINDOW (win)) {
gboolean found;
iter = tny_list_create_iterator (header_list);
mgr = modest_runtime_get_window_mgr ();
while (!tny_iterator_is_done (iter) && !found) {
header = TNY_HEADER (tny_iterator_get_current (iter));
- found = modest_window_mgr_find_registered_header (mgr, header, NULL);
- g_object_unref (header);
+ if (header) {
+ found = modest_window_mgr_find_registered_header (mgr, header, NULL);
+ g_object_unref (header);
+ }
+
tny_iterator_next (iter);
}
g_object_unref (iter);
if (tny_list_get_length(header_list) == 1) {
iter = tny_list_create_iterator (header_list);
header = TNY_HEADER (tny_iterator_get_current (iter));
- desc = g_strdup_printf ("%s", tny_header_get_subject (header));
- g_object_unref (header);
+ if (header) {
+ desc = g_strdup_printf ("%s", tny_header_get_subject (header));
+ g_object_unref (header);
+ }
+
g_object_unref (iter);
}
message = g_strdup_printf(ngettext("emev_nc_delete_message", "emev_nc_delete_messages",
tny_list_get_length(header_list)), desc);
- /* Confirmation dialog */
+ /* Confirmation dialog */
+ printf("DEBUG: %s\n", __FUNCTION__);
response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
message);
if (response == GTK_RESPONSE_OK) {
- ModestMainWindow *main_window;
- ModestWindowMgr *mgr;
-
+ ModestWindow *main_window = NULL;
+ ModestWindowMgr *mgr = NULL;
+ GtkTreeModel *model = NULL;
+ GtkTreeSelection *sel = NULL;
+ GList *sel_list = NULL, *tmp = NULL;
+ GtkTreeRowReference *row_reference = NULL;
+ GtkTreePath *next_path = NULL;
+
+ /* Find last selected row */
+ if (MODEST_IS_MAIN_WINDOW (win)) {
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view));
+ sel_list = gtk_tree_selection_get_selected_rows (sel, &model);
+ for (tmp=sel_list; tmp; tmp=tmp->next) {
+ if (tmp->next == NULL) {
+ next_path = gtk_tree_path_copy((GtkTreePath *) tmp->data);
+ gtk_tree_path_next (next_path);
+ row_reference = gtk_tree_row_reference_new (model, next_path);
+ gtk_tree_path_free (next_path);
+ }
+ }
+ }
+
/* Remove each header. If it's a view window header_view == NULL */
do_headers_action (win, headers_action_delete, header_view);
if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
- /* Close msg view window or select next */
- if (modest_msg_view_window_last_message_selected (MODEST_MSG_VIEW_WINDOW (win)) &&
- modest_msg_view_window_first_message_selected (MODEST_MSG_VIEW_WINDOW (win))) {
- modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (win));
- } else {
- modest_msg_view_window_select_next_message (MODEST_MSG_VIEW_WINDOW (win));
- }
+ modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (win));
+
+ /* Get main window */
+ mgr = modest_runtime_get_window_mgr ();
+ main_window = modest_window_mgr_get_main_window (mgr);
}
-
- /* Refilter header view model, if main window still exists */
- mgr = modest_runtime_get_window_mgr ();
- main_window = MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (mgr));
- if (main_window) {
- GtkWidget *widget;
-
- widget = modest_main_window_get_child_widget (main_window,
- MODEST_WIDGET_TYPE_HEADER_VIEW);
- modest_header_view_refilter (MODEST_HEADER_VIEW (widget));
+ else {
+ /* Move cursor to next row */
+ main_window = win;
+
+ /* Select next row */
+ if (gtk_tree_row_reference_valid (row_reference)) {
+ next_path = gtk_tree_row_reference_get_path (row_reference);
+ gtk_tree_selection_select_path (sel, next_path);
+ gtk_tree_path_free (next_path);
+ }
+ if (row_reference != NULL)
+ gtk_tree_row_reference_free (row_reference);
}
/* Update toolbar dimming state */
- modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (win));
+ modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
+
+ /* Free */
+ g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL);
+ g_list_free (sel_list);
}
- /* free */
+ /* Free*/
g_free(message);
g_free(desc);
g_object_unref (header_list);
}
+
+
+/* delete either message or folder, based on where we are */
+void
+modest_ui_actions_on_delete_message_or_folder (GtkAction *action, ModestWindow *win)
+{
+ g_return_if_fail (MODEST_IS_WINDOW(win));
+
+ /* Check first if the header view has the focus */
+ if (MODEST_IS_MAIN_WINDOW (win)) {
+ GtkWidget *w;
+ w = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+ MODEST_WIDGET_TYPE_FOLDER_VIEW);
+ if (gtk_widget_is_focus (w)) {
+ modest_ui_actions_on_delete_folder (action, MODEST_MAIN_WINDOW(win));
+ return;
+ }
+ }
+ modest_ui_actions_on_delete_message (action, win);
+}
+
+
+
void
modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win)
{
modest_ui_actions_on_close_window (GtkAction *action, ModestWindow *win)
{
gboolean ret_value;
+
g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value);
/* if (MODEST_IS_MSG_VIEW_WINDOW (win)) { */
} 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));
- gtk_dialog_run (account_win);
- gtk_widget_destroy (GTK_WIDGET(account_win));
+ modest_maemo_show_dialog_and_forget (GTK_WINDOW (win), account_win);
}
#else
GtkWidget *dialog, *label;
/* 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))
+ if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) {
return;
+ }
parent_win = (ModestWindow *) modest_mail_operation_get_source (mail_op);
folder = tny_header_get_folder (header);
headers_action_mark_as_read (header, MODEST_WINDOW(parent_win), NULL);
/* Get account */
- account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
+ account = g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_win)));
if (!account)
- account = g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_win)));
+ account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
/* Gets folder type (OUTBOX headers will be opened in edit window */
if (modest_tny_folder_is_local_folder (folder))
- folder_type = modest_tny_folder_get_local_folder_type (folder);
+ folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder);
/* If the header is in the drafts folder then open the editor,
else the message view window */
- if (folder_type == TNY_FOLDER_TYPE_DRAFTS) {
+ if ((folder_type == TNY_FOLDER_TYPE_DRAFTS) ||
+ (folder_type == TNY_FOLDER_TYPE_OUTBOX)) {
/* we cannot edit without a valid account... */
if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) {
run_account_setup_wizard(parent_win);
/* Free */
g_free(account);
g_object_unref (parent_win);
-/* g_object_unref (msg); */
g_object_unref (folder);
}
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) {
modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL,
{
ModestWindowMgr *mgr = NULL;
TnyIterator *iter = NULL;
- ModestMailOperation *mail_op1 = NULL;
- ModestMailOperation *mail_op2 = NULL;
+ ModestMailOperation *mail_op = NULL;
TnyList *not_opened_headers = NULL;
- TnyList *not_opened_cached_headers = NULL;
- TnyHeaderFlags flags;
+ TnyHeaderFlags flags = 0;
/* Look if we already have a message view for each header. If
true, then remove the header from the list of headers to
mgr = modest_runtime_get_window_mgr ();
iter = tny_list_create_iterator (headers);
not_opened_headers = tny_simple_list_new ();
- not_opened_cached_headers = tny_simple_list_new ();
+
while (!tny_iterator_is_done (iter)) {
- ModestWindow *window;
- TnyHeader *header;
- gboolean found;
+ ModestWindow *window = NULL;
+ TnyHeader *header = NULL;
+ gboolean found = FALSE;
header = TNY_HEADER (tny_iterator_get_current (iter));
- flags = tny_header_get_flags (header);
+ if (header)
+ flags = tny_header_get_flags (header);
window = NULL;
found = modest_window_mgr_find_registered_header (mgr, header, &window);
else
/* the header has been registered already, we don't do
* anything but wait for the window to come up*/
- g_warning ("debug: header %p already registered, waiting for window",
- header);
+ g_debug ("header %p already registered, waiting for window", header);
} else {
- /* register the header before actually creating the window */
- modest_window_mgr_register_header (mgr, header);
-
- if (!(flags & TNY_HEADER_FLAG_CACHED))
- tny_list_append (not_opened_headers, G_OBJECT (header));
- /* Check if msg has already been retreived */
- else
- tny_list_append (not_opened_cached_headers, G_OBJECT (header));
+ tny_list_append (not_opened_headers, G_OBJECT (header));
}
- g_object_unref (header);
+
+ if (header)
+ g_object_unref (header);
+
tny_iterator_next (iter);
}
+ g_object_unref (iter);
+ iter = NULL;
- /* Open each uncached message */
+ /* 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)
+ * than later in a thread:
+ */
if (tny_list_get_length (not_opened_headers) > 0) {
- mail_op1 = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
- G_OBJECT (win),
- modest_ui_actions_get_msgs_full_error_handler,
- NULL);
- modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op1);
- if (tny_list_get_length (not_opened_headers) > 1) {
- modest_mail_operation_get_msgs_full (mail_op1,
- not_opened_headers,
- open_msg_cb,
- NULL,
- NULL);
- } else {
- TnyIterator *iter = tny_list_create_iterator (not_opened_headers);
+ TnyIterator *iter;
+ gboolean found = FALSE;
+
+ iter = tny_list_create_iterator (not_opened_headers);
+ while (!tny_iterator_is_done (iter) && !found) {
TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
- modest_mail_operation_get_msg (mail_op1, header, open_msg_cb, NULL);
+ if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED))
+ found = TRUE;
+ else
+ tny_iterator_next (iter);
+
g_object_unref (header);
- g_object_unref (iter);
}
- }
+ g_object_unref (iter);
- /* Open each cached message */
- if (tny_list_get_length (not_opened_cached_headers) > 0) {
- mail_op2 = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
+ if (found && !modest_platform_connect_and_wait (GTK_WINDOW (win), NULL)) {
+ g_object_unref (not_opened_headers);
+ return;
+ }
+ }
+
+ /* Register the headers before actually creating the windows: */
+ TnyIterator *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),
modest_ui_actions_get_msgs_full_error_handler,
NULL);
- modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op2);
- if (tny_list_get_length (not_opened_cached_headers) > 1) {
- modest_mail_operation_get_msgs_full (mail_op2,
+ 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);
} else {
- TnyIterator *iter = tny_list_create_iterator (not_opened_cached_headers);
+ TnyIterator *iter = tny_list_create_iterator (not_opened_headers);
TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
- modest_mail_operation_get_msg (mail_op2, header, open_msg_cb, NULL);
+ 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);
}
/* Clean */
if (not_opened_headers != NULL)
g_object_unref (not_opened_headers);
- if (not_opened_cached_headers != NULL)
- g_object_unref (not_opened_cached_headers);
- if (iter != NULL)
- g_object_unref (iter);
- if (mail_op1 != NULL)
- g_object_unref (mail_op1);
- if (mail_op2 != NULL)
- g_object_unref (mail_op2);
}
void
ModestWindowMgr *mgr = NULL;
gchar *signature = NULL;
- /* If there was any error */
- if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg))
+ /* If there was any error. The mail operation could be NULL,
+ this means that we already have the message downloaded and
+ that we didn't do a mail operation to retrieve it */
+ if (mail_op && !modest_ui_actions_msg_retrieval_check (mail_op, header, msg))
return;
g_return_if_fail (user_data != NULL);
* of them are currently downloaded
*/
static gboolean
-download_uncached_messages (TnyList *header_list, GtkWindow *win)
+download_uncached_messages (TnyList *header_list,
+ GtkWindow *win,
+ gboolean reply_fwd)
{
TnyIterator *iter;
gboolean retval;
iter = tny_list_create_iterator (header_list);
while (!tny_iterator_is_done (iter)) {
TnyHeader *header;
- TnyHeaderFlags flags;
header = TNY_HEADER (tny_iterator_get_current (iter));
- flags = tny_header_get_flags (header);
- /* TODO: is this the right flag?, it seems that some
- headers that have been previously downloaded do not
- come with it */
- if (! (flags & TNY_HEADER_FLAG_CACHED))
- uncached_messages ++;
- g_object_unref (header);
+ if (header) {
+ if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED))
+ uncached_messages ++;
+ g_object_unref (header);
+ }
+
tny_iterator_next (iter);
}
g_object_unref (iter);
retval = TRUE;
if (uncached_messages > 0) {
GtkResponseType response;
- response =
- modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
- ngettext("mcen_nc_get_msg",
- "mcen_nc_get_msgs",
- uncached_messages));
+ if (reply_fwd)
+ response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
+ _("emev_nc_include_original"));
+ else
+ response =
+ modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
+ ngettext("mcen_nc_get_msg",
+ "mcen_nc_get_msgs",
+ uncached_messages));
if (response == GTK_RESPONSE_CANCEL)
retval = FALSE;
else {
/* If a download will be necessary, make sure that we have a connection: */
- retval = modest_platform_connect_and_wait(win);
+ retval = modest_platform_connect_and_wait(win, NULL);
}
}
return retval;
return;
/* Check that the messages have been previously downloaded */
- continue_download = download_uncached_messages (header_list, GTK_WINDOW (win));
+ continue_download = download_uncached_messages (header_list, GTK_WINDOW (win), TRUE);
if (!continue_download) {
g_object_unref (header_list);
return;
rf_helper->reply_forward_type = reply_forward_type;
rf_helper->action = action;
rf_helper->account_name = g_strdup (modest_window_get_active_account (win));
+
if ((win != NULL) && (MODEST_IS_WINDOW (win)))
rf_helper->parent_window = GTK_WIDGET (win);
if (!rf_helper->account_name)
header = TNY_HEADER (tny_iterator_get_current (iter));
g_object_unref (iter);
- modest_mail_operation_get_msg (mail_op,
+ if (header) {
+ modest_mail_operation_get_msg (mail_op,
header,
reply_forward_cb,
rf_helper);
-/* modest_mail_operation_get_msgs_full (mail_op, */
+/* modest_mail_operation_get_msgs_full (mail_op, */
/* header_list, */
/* reply_forward_cb, */
/* rf_helper, */
/* free_reply_forward_helper); */
+ g_object_unref (header);
+ }
+
/* Clean */
g_object_unref(mail_op);
}
GtkWidget *header_view;
header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(window),
MODEST_WIDGET_TYPE_HEADER_VIEW);
- if (!header_view)
+ if (!header_view) {
+ modest_platform_information_banner (NULL, NULL, _CS("ckdg_ib_nothing_to_sort"));
+
return;
+ }
/* Show sorting dialog */
modest_platform_run_sort_dialog (GTK_WINDOW (window), MODEST_SORT_HEADERS);
g_free (acc_name);
}
+
+static void
+modest_ui_actions_do_cancel_send (const gchar *account_name,
+ ModestWindow *win)
+{
+ TnyTransportAccount *transport_account;
+ TnySendQueue *send_queue = NULL;
+ GError *error = NULL;
+
+ /* Get transport account */
+ transport_account =
+ TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_server_account
+ (modest_runtime_get_account_store(),
+ account_name,
+ TNY_ACCOUNT_TYPE_TRANSPORT));
+ if (!transport_account) {
+ g_printerr ("modest: no transport account found for '%s'\n", account_name);
+ goto frees;
+ }
+
+ /* Get send queue*/
+ send_queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (transport_account));
+ if (!TNY_IS_SEND_QUEUE(send_queue)) {
+ g_set_error (&error, MODEST_MAIL_OPERATION_ERROR,
+ MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
+ "modest: could not find send queue for account\n");
+ } else {
+ /* Keeep messages in outbox folder */
+ tny_send_queue_cancel (send_queue, FALSE, &error);
+ }
+
+ frees:
+ if (transport_account != NULL)
+ g_object_unref (G_OBJECT (transport_account));
+}
+
+static void
+modest_ui_actions_cancel_send_all (ModestWindow *win)
+{
+ GSList *account_names, *iter;
+
+ account_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr(),
+ TRUE);
+
+ iter = account_names;
+ while (iter) {
+ modest_ui_actions_do_cancel_send ((const char*) iter->data, win);
+ iter = g_slist_next (iter);
+ }
+
+ modest_account_mgr_free_account_names (account_names);
+ account_names = NULL;
+}
+
+void
+modest_ui_actions_cancel_send (GtkAction *action, ModestWindow *win)
+
+{
+ /* Check if accounts exist */
+ gboolean 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);
+
+ /* Cancel all sending operaitons */
+ modest_ui_actions_cancel_send_all (win);
+}
+
/*
* Refreshes all accounts. This function will be used by automatic
* updates
account_names = NULL;
}
+void
+modest_do_refresh_current_folder(ModestWindow *win)
+{
+ /* Refresh currently selected folder. Note that if we only
+ want to retreive the headers, then the refresh only will
+ invoke a poke_status over all folders, i.e., only the
+ total/unread count will be updated */
+ if (MODEST_IS_MAIN_WINDOW (win)) {
+ GtkWidget *header_view, *folder_view;
+ TnyFolderStore *folder_store;
+
+ /* Get folder and header view */
+ folder_view =
+ modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+ MODEST_WIDGET_TYPE_FOLDER_VIEW);
+
+ folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+
+ if (folder_store && TNY_IS_FOLDER (folder_store)) {
+ header_view =
+ modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+ MODEST_WIDGET_TYPE_HEADER_VIEW);
+
+ /* We do not need to set the contents style
+ 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,
+ MODEST_MAIN_WINDOW (win));
+ }
+
+ if (folder_store)
+ g_object_unref (folder_store);
+ }
+}
+
+
/*
* Handler of the click on Send&Receive button in the main toolbar
*/
void
-modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win)
+modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win)
{
/* Check if accounts exist */
gboolean accounts_exist =
/* If not, allow the user to create an account before trying to send/receive. */
if (!accounts_exist)
modest_ui_actions_on_accounts (NULL, win);
+
+ modest_do_refresh_current_folder (win);
/* Refresh the active account */
modest_ui_actions_do_send_receive (NULL, win);
static void
-folder_refreshed_cb (const GObject *obj,
+folder_refreshed_cb (ModestMailOperation *mail_op,
TnyFolder *folder,
gpointer user_data)
{
ModestMainWindow *win = NULL;
GtkWidget *header_view;
+ TnyFolder *current_folder;
g_return_if_fail (TNY_IS_FOLDER (folder));
header_view =
modest_main_window_get_child_widget(win, MODEST_WIDGET_TYPE_HEADER_VIEW);
+ if (header_view) {
+ current_folder = modest_header_view_get_folder (MODEST_HEADER_VIEW (header_view));
+ if (current_folder != NULL && folder != current_folder) {
+ return;
+ }
+ }
+
/* Check if folder is empty and set headers view contents style */
if (tny_folder_get_all_count (folder) == 0) {
printf ("DEBUG: %s: tny_folder_get_all_count() returned 0.\n", __FUNCTION__);
gtk_window_set_default_size (GTK_WINDOW(dialog), 300, 300);
if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
-// modest_platform_connect_and_wait ();
+ /* TODO: Comment about why is this commented out: */
+ /* modest_platform_connect_and_wait (); */
}
}
gtk_widget_destroy (dialog);
modest_mail_operation_save_to_drafts (mail_operation,
transport_account,
data->draft_msg,
+ edit_window,
from,
data->to,
data->cc,
{
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window));
- if (!modest_msg_edit_window_check_names (edit_window))
+ 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
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
g_return_if_fail (GTK_IS_ACTION (action));
- modest_msg_edit_window_attach_file (window);
+ modest_msg_edit_window_offer_attach_file (window);
}
void
modest_msg_edit_window_remove_attachments (window, NULL);
}
-void
-modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_window)
+static void
+modest_ui_actions_new_folder_error_handler (ModestMailOperation *mail_op,
+ gpointer user_data)
{
- TnyFolderStore *parent_folder;
- GtkWidget *folder_view;
-
- g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
+ ModestMainWindow *window = MODEST_MAIN_WINDOW (user_data);
+ const GError *error = modest_mail_operation_get_error (mail_op);
- folder_view = modest_main_window_get_child_widget (main_window,
- MODEST_WIDGET_TYPE_FOLDER_VIEW);
- if (!folder_view)
- return;
+ if(error)
+ {
+ modest_platform_information_banner (GTK_WIDGET (window), NULL,
+ modest_mail_operation_get_error (mail_op)->message);
+ }
+}
+
+static void
+modest_ui_actions_create_folder(GtkWidget *parent_window,
+ GtkWidget *folder_view)
+{
+ TnyFolderStore *parent_folder;
parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
/* Run the new folder dialog */
while (!finished) {
- result = modest_platform_run_new_folder_dialog (GTK_WINDOW (main_window),
+ 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_REJECT) {
finished = TRUE;
} else {
ModestMailOperation *mail_op;
TnyFolder *new_folder = NULL;
- mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_INFO,
- G_OBJECT(main_window));
+ mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_INFO,
+ G_OBJECT(parent_window),
+ modest_ui_actions_new_folder_error_handler,
+ parent_window);
+
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);
}
- g_free (folder_name);
+
+ suggested_name = folder_name;
folder_name = NULL;
}
}
}
+void
+modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_window)
+{
+ GtkWidget *folder_view;
+
+ g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
+
+ folder_view = modest_main_window_get_child_widget (main_window,
+ MODEST_WIDGET_TYPE_FOLDER_VIEW);
+ if (!folder_view)
+ return;
+
+ modest_ui_actions_create_folder (GTK_WIDGET (main_window), folder_view);
+}
+
static void
modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op,
gpointer user_data)
return;
folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
+ if (!folder)
+ return;
/* Offer the connection dialog if necessary: */
if (!modest_platform_connect_and_wait_if_network_folderstore (NULL, folder)) {
}
- if (folder && TNY_IS_FOLDER (folder)) {
+ if (TNY_IS_FOLDER (folder)) {
gchar *folder_name;
gint response;
const gchar *current_name;
mail_op);
modest_header_view_clear (MODEST_HEADER_VIEW (header_view));
+
+ modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view),
+ TNY_FOLDER(folder), TRUE);
+
+ modest_header_view_clear ((ModestHeaderView *) header_view);
+
modest_mail_operation_rename_folder (mail_op,
TNY_FOLDER (folder),
(const gchar *) folder_name);
g_object_unref (mail_op);
g_free (folder_name);
}
- g_object_unref (folder);
}
+ g_object_unref (folder);
}
static void
gint response;
gchar *message;
- g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
+ g_return_if_fail (MODEST_IS_MAIN_WINDOW (main_window));
folder_view = modest_main_window_get_child_widget (main_window,
MODEST_WIDGET_TYPE_FOLDER_VIEW);
delete_folder (main_window, TRUE);
}
+
+static void
+show_error (GtkWidget *parent_widget, const gchar* text)
+{
+ hildon_banner_show_information(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,
*cancel = FALSE;
} else {
+ show_error(GTK_WIDGET (main_window), _("mail_ib_login_cancelled"));
+
if (username)
*username = NULL;
ModestWindow *window)
{
GtkWidget *focused_widget;
+ GtkClipboard *clipboard;
+ clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
focused_widget = gtk_window_get_focus (GTK_WINDOW (window));
if (GTK_IS_EDITABLE (focused_widget)) {
gtk_editable_cut_clipboard (GTK_EDITABLE(focused_widget));
+ gtk_clipboard_set_can_store (clipboard, NULL, 0);
+ gtk_clipboard_store (clipboard);
} else if (GTK_IS_TEXT_VIEW (focused_widget)) {
GtkTextBuffer *buffer;
- GtkClipboard *clipboard;
- clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
gtk_text_buffer_cut_clipboard (buffer, clipboard, TRUE);
+ gtk_clipboard_set_can_store (clipboard, NULL, 0);
+ gtk_clipboard_store (clipboard);
} else if (MODEST_IS_HEADER_VIEW (focused_widget)) {
modest_header_view_cut_selection (MODEST_HEADER_VIEW (focused_widget));
} else if (MODEST_IS_FOLDER_VIEW (focused_widget)) {
if (GTK_IS_LABEL (focused_widget)) {
gtk_clipboard_set_text (clipboard, gtk_label_get_text (GTK_LABEL (focused_widget)), -1);
+ gtk_clipboard_set_can_store (clipboard, NULL, 0);
+ gtk_clipboard_store (clipboard);
} else if (GTK_IS_EDITABLE (focused_widget)) {
gtk_editable_copy_clipboard (GTK_EDITABLE(focused_widget));
+ gtk_clipboard_set_can_store (clipboard, NULL, 0);
+ gtk_clipboard_store (clipboard);
+ } else if (GTK_IS_HTML (focused_widget)) {
+ gtk_html_copy (GTK_HTML (focused_widget));
+ gtk_clipboard_set_can_store (clipboard, NULL, 0);
+ gtk_clipboard_store (clipboard);
} else if (GTK_IS_TEXT_VIEW (focused_widget)) {
GtkTextBuffer *buffer;
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
gtk_text_buffer_copy_clipboard (buffer, clipboard);
- modest_header_view_copy_selection (MODEST_HEADER_VIEW (focused_widget));
+ gtk_clipboard_set_can_store (clipboard, NULL, 0);
+ gtk_clipboard_store (clipboard);
} else if (MODEST_IS_HEADER_VIEW (focused_widget)) {
TnyList *header_list = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (focused_widget));
TnyIterator *iter = tny_list_create_iterator (header_list);
TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
- TnyFolder *folder = tny_header_get_folder (header);
- TnyAccount *account = tny_folder_get_account (folder);
- const gchar *proto_str = tny_account_get_proto (TNY_ACCOUNT (account));
- /* If it's POP then ask */
- gboolean ask = (modest_protocol_info_get_transport_store_protocol (proto_str) ==
- MODEST_PROTOCOL_STORE_POP) ? TRUE : FALSE;
- g_object_unref (account);
- g_object_unref (folder);
- g_object_unref (header);
+
+ gboolean ask = FALSE;
+ if (header) {
+ TnyFolder *folder = tny_header_get_folder (header);
+ TnyAccount *account = tny_folder_get_account (folder);
+ const gchar *proto_str = tny_account_get_proto (TNY_ACCOUNT (account));
+ /* If it's POP then ask */
+ ask = (modest_protocol_info_get_transport_store_protocol (proto_str) ==
+ MODEST_PROTOCOL_STORE_POP) ? TRUE : FALSE;
+ g_object_unref (account);
+ g_object_unref (folder);
+ g_object_unref (header);
+ }
+
g_object_unref (iter);
/* Check that the messages have been previously downloaded */
gboolean continue_download = TRUE;
if (ask)
- continue_download = download_uncached_messages (header_list, GTK_WINDOW (window));
+ continue_download = download_uncached_messages (header_list, GTK_WINDOW (window), FALSE);
if (continue_download)
modest_header_view_copy_selection (MODEST_HEADER_VIEW (focused_widget));
g_object_unref (header_list);
gtk_widget_destroy (GTK_WIDGET(user_data));
}
+static void
+paste_as_attachment_free (gpointer data)
+{
+ PasteAsAttachmentHelper *helper = (PasteAsAttachmentHelper *) data;
+
+ gtk_widget_destroy (helper->banner);
+ g_object_unref (helper->banner);
+ g_free (helper);
+}
+
+static void
+paste_msg_as_attachment_cb (ModestMailOperation *mail_op,
+ TnyHeader *header,
+ TnyMsg *msg,
+ gpointer userdata)
+{
+ PasteAsAttachmentHelper *helper = (PasteAsAttachmentHelper *) userdata;
+ g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (helper->window));
+
+ if (msg == NULL)
+ return;
+
+ modest_msg_edit_window_add_part (MODEST_MSG_EDIT_WINDOW (helper->window), TNY_MIME_PART (msg));
+
+}
+
void
modest_ui_actions_on_paste (GtkAction *action,
ModestWindow *window)
if (GTK_IS_EDITABLE (focused_widget)) {
gtk_editable_paste_clipboard (GTK_EDITABLE(focused_widget));
} else if (GTK_IS_TEXT_VIEW (focused_widget)) {
- GtkTextBuffer *buffer;
- GtkClipboard *clipboard;
+ ModestEmailClipboard *e_clipboard = NULL;
+ e_clipboard = modest_runtime_get_email_clipboard ();
+ if (modest_email_clipboard_cleared (e_clipboard)) {
+ GtkTextBuffer *buffer;
+ GtkClipboard *clipboard;
+
+ clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+ buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
+ gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, TRUE);
+ } else if (MODEST_IS_MSG_EDIT_WINDOW (window)) {
+ ModestMailOperation *mail_op;
+ TnyFolder *src_folder;
+ TnyList *data;
+ gboolean delete;
+ PasteAsAttachmentHelper *helper = g_new0 (PasteAsAttachmentHelper, 1);
+ helper->window = MODEST_MSG_EDIT_WINDOW (window);
+ 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));
+ if (helper->banner != NULL) {
+ g_object_ref (G_OBJECT (helper->banner));
+ gtk_window_set_modal (GTK_WINDOW (helper->banner), FALSE);
+ gtk_widget_show (GTK_WIDGET (helper->banner));
+ }
- clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
- buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
- gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, TRUE);
+ if (data != NULL) {
+ modest_mail_operation_get_msgs_full (mail_op,
+ data,
+ (GetMsgAsyncUserCallback) paste_msg_as_attachment_cb,
+ helper,
+ paste_as_attachment_free);
+ }
+ }
} else if (MODEST_IS_FOLDER_VIEW (focused_widget)) {
ModestEmailClipboard *clipboard = NULL;
TnyFolder *src_folder = NULL;
iter = tny_list_create_iterator (headers_list);
header = TNY_HEADER (tny_iterator_get_current (iter));
- headers_action_show_details (header, win, NULL);
- g_object_unref (header);
+ if (header) {
+ headers_action_show_details (header, win, NULL);
+ g_object_unref (header);
+ }
g_object_unref (iter);
g_object_unref (headers_list);
modest_ui_actions_toggle_folders_view (GtkAction *action,
ModestMainWindow *main_window)
{
- ModestConf *conf;
-
g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
- conf = modest_runtime_get_conf ();
-
- if (modest_main_window_get_style (main_window) == MODEST_MAIN_WINDOW_STYLE_SPLIT)
- modest_main_window_set_style (main_window, MODEST_MAIN_WINDOW_STYLE_SIMPLE);
- else
+ if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
modest_main_window_set_style (main_window, MODEST_MAIN_WINDOW_STYLE_SPLIT);
+ else
+ modest_main_window_set_style (main_window, MODEST_MAIN_WINDOW_STYLE_SIMPLE);
}
void
modest_ui_actions_on_check_names (GtkAction *action, ModestMsgEditWindow *window)
{
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
- modest_msg_edit_window_check_names (window);
+ modest_msg_edit_window_check_names (window, FALSE);
}
+static void
+create_move_to_dialog_on_new_folder(GtkWidget *button, gpointer user_data)
+{
+ modest_ui_actions_create_folder (gtk_widget_get_toplevel (button),
+ GTK_WIDGET (user_data));
+}
static GtkWidget*
-create_move_to_dialog (ModestWindow *win,
+create_move_to_dialog (GtkWindow *win,
GtkWidget *folder_view,
GtkWidget **tree_view)
{
GtkWidget *dialog, *scroll;
+ GtkWidget *new_button;
dialog = gtk_dialog_new_with_buttons (_("mcen_ti_moveto_folders_title"),
GTK_WINDOW (win),
GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK,
- GTK_RESPONSE_ACCEPT,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT,
- NULL);
+ NULL);
+
+ gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT);
+ /* We do this manually so GTK+ does not associate a response ID for
+ * the button. */
+ new_button = gtk_button_new_from_stock (GTK_STOCK_NEW);
+ gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), new_button, FALSE, FALSE, 0);
+ gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT);
/* Create scrolled window */
scroll = gtk_scrolled_window_new (NULL, NULL);
/* Create folder view */
*tree_view = modest_platform_create_folder_view (NULL);
+ g_signal_connect (G_OBJECT (new_button), "clicked", G_CALLBACK(create_move_to_dialog_on_new_folder), *tree_view);
+
/* It could happen that we're trying to move a message from a
window (msg window for example) after the main window was
closed, so we can not just get the model of the folder
modest_folder_view_update_model (MODEST_FOLDER_VIEW (*tree_view),
TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()));
+ 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 */
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
- scroll, FALSE, FALSE, 0);
+ scroll, TRUE, TRUE, 0);
gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
-
- /* Select INBOX or local account */
- modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (*tree_view));
+ gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 300);
return dialog;
}
iter = tny_list_create_iterator (list);
while (tny_iterator_is_done (iter) && !found) {
TnyHeader *header;
- TnyHeaderFlags flags;
+ TnyHeaderFlags flags = 0;
header = TNY_HEADER (tny_iterator_get_current (iter));
- flags = tny_header_get_flags (header);
- if (!(flags & TNY_HEADER_FLAG_PARTIAL))
- found = TRUE;
+ if (header) {
+ flags = tny_header_get_flags (header);
+ if (!(flags & TNY_HEADER_FLAG_PARTIAL))
+ found = TRUE;
+
+ g_object_unref (header);
+ }
if (!found)
tny_iterator_next (iter);
/* If the destination is a local folder */
if (modest_tny_folder_is_local_folder (dest_folder)) {
- TnyFolder *src_folder;
- TnyIterator *iter;
- TnyHeader *header;
+ 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));
- src_folder = tny_header_get_folder (header);
- g_object_unref (header);
+ if (header) {
+ src_folder = tny_header_get_folder (header);
+ g_object_unref (header);
+ }
+
g_object_unref (iter);
/* if no src_folder, message may be an attahcment */
response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
(const gchar *) message);
}
+
g_object_unref (src_folder);
}
+
return response;
}
transfer_msgs_from_viewer_cb (const GObject *object, gpointer user_data)
{
ModestMsgViewWindow *self = NULL;
- gboolean last, first;
g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (object));
self = MODEST_MSG_VIEW_WINDOW (object);
- last = modest_msg_view_window_last_message_selected (self);
- first = modest_msg_view_window_first_message_selected (self);
- if (last & first) {
- /* No more messages to view, so close this window */
-/* gboolean ret_value; */
-/* g_signal_emit_by_name (G_OBJECT (self), "delete-event", NULL, &ret_value); */
- modest_ui_actions_on_close_window (NULL, MODEST_WINDOW(self));
- } else if (last)
- modest_msg_view_window_select_previous_message (self);
- else
- modest_msg_view_window_select_next_message (self);
+ if (!modest_msg_view_window_select_next_message (self))
+ 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));
}
void
gint pending_purges = 0;
gboolean some_purged = FALSE;
ModestWindow *win = MODEST_WINDOW (user_data);
+ ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
/* If there was any error */
- if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg))
+ if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) {
+ modest_window_mgr_unregister_header (mgr, header);
return;
+ }
/* Once the message has been retrieved for purging, we check if
* it's all ok for purging */
while (!tny_iterator_is_done (iter)) {
TnyMimePart *part;
part = TNY_MIME_PART (tny_iterator_get_current (iter));
- if (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part)) {
+ if (part && (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part))) {
if (tny_mime_part_is_purged (part))
some_purged = TRUE;
else
pending_purges++;
}
+
+ if (part)
+ g_object_unref (part);
+
tny_iterator_next (iter);
}
TnyMimePart *part;
part = TNY_MIME_PART (tny_iterator_get_current (iter));
- if (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part))
+ if (part && (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part)))
tny_mime_part_set_purged (part);
+
+ if (part)
+ g_object_unref (part);
+
tny_iterator_next (iter);
}
TnyMimePart *part;
part = TNY_MIME_PART (tny_iterator_get_current (iter));
- g_object_unref (part);
+ if (part) {
+ /* One for the reference given by tny_iterator_get_current(): */
+ g_object_unref (part);
+
+ /* TODO: Is this meant to remove the attachment by doing another unref()?
+ * Otherwise, this seems useless. */
+ }
+
tny_iterator_next (iter);
}
+ modest_window_mgr_unregister_header (mgr, header);
g_object_unref (iter);
g_object_unref (parts);
g_object_unref (header_list);
}
+/**
+ * Utility function that transfer messages from both the main window
+ * 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)
+{
+ TnyList *headers = NULL;
+ gint response = 0;
+
+ if (!TNY_IS_FOLDER (dst_folder)) {
+ modest_platform_information_banner (GTK_WIDGET (win),
+ NULL,
+ _CS("ckdg_ib_unable_to_move_to_current_location"));
+ return;
+ }
+
+ /* Get selected headers */
+ headers = get_selected_headers (MODEST_WINDOW (win));
+
+ /* Ask for user confirmation */
+ response = msgs_move_to_confirmation (GTK_WINDOW (win),
+ TNY_FOLDER (dst_folder),
+ headers);
+
+ /* Transfer messages */
+ if (response == GTK_RESPONSE_OK) {
+ ModestMailOperation *mail_op =
+ modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
+ G_OBJECT(win),
+ modest_ui_actions_move_folder_error_handler,
+ NULL);
+ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+ mail_op);
+
+ modest_mail_operation_xfer_msgs (mail_op,
+ headers,
+ TNY_FOLDER (dst_folder),
+ TRUE,
+ (MODEST_IS_MSG_VIEW_WINDOW (win)) ? transfer_msgs_from_viewer_cb : NULL,
+ NULL);
+
+ g_object_unref (G_OBJECT (mail_op));
+ }
+ g_object_unref (headers);
+}
+
+
/*
* UI handler for the "Move to" action when invoked from the
* ModestMainWindow
*/
static void
modest_ui_actions_on_main_window_move_to (GtkAction *action,
+ GtkWidget *folder_view,
+ TnyFolderStore *dst_folder,
ModestMainWindow *win)
{
- GtkWidget *dialog = NULL, *folder_view = NULL, *tree_view = NULL;
GtkWidget *header_view = NULL;
- gint result = 0;
- TnyFolderStore *folder_store = NULL;
ModestMailOperation *mail_op = NULL;
+ TnyFolderStore *src_folder;
g_return_if_fail (MODEST_IS_MAIN_WINDOW (win));
- /* Get the folder view */
- folder_view = modest_main_window_get_child_widget (win,
- MODEST_WIDGET_TYPE_FOLDER_VIEW);
-
- /* Get header view */
- header_view = modest_main_window_get_child_widget (win,
- MODEST_WIDGET_TYPE_HEADER_VIEW);
-
- /* Create and run the dialog */
- dialog = create_move_to_dialog (MODEST_WINDOW (win), folder_view, &tree_view);
- modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (tree_view));
- result = gtk_dialog_run (GTK_DIALOG(dialog));
- g_object_ref (tree_view);
-
- /* We do this to save an indentation level ;-) */
- if (result != GTK_RESPONSE_ACCEPT)
- goto end;
-
- folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (tree_view));
-
- if (TNY_IS_ACCOUNT (folder_store) &&
- !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (folder_store))
+ /* Get the source folder */
+ src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+
+ /* Offer the connection dialog if necessary, if the source folder is in a networked account: */
+ if (!modest_platform_connect_and_wait_if_network_folderstore (GTK_WINDOW (win),
+ src_folder))
goto end;
- /* Offer the connection dialog if necessary: */
- if (modest_platform_connect_and_wait_if_network_folderstore (GTK_WINDOW (win), folder_store)) {
- goto end;
- }
+ /* Get header view */
+ header_view =
+ modest_main_window_get_child_widget (win, MODEST_WIDGET_TYPE_HEADER_VIEW);
/* Get folder or messages to transfer */
if (gtk_widget_is_focus (folder_view)) {
- TnyFolderStore *src_folder;
- src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
-
- /* Offer the connection dialog if necessary: */
- if (modest_platform_connect_and_wait_if_network_folderstore (GTK_WINDOW (win), src_folder)) {
- /* Clean folder on header view before moving it */
- modest_header_view_clear (MODEST_HEADER_VIEW (header_view));
+ /* Allow only to transfer folders to the local root folder */
+ if (TNY_IS_ACCOUNT (dst_folder) &&
+ !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder))
+ goto end;
+
+ /* Clean folder on header view before moving it */
+ modest_header_view_clear (MODEST_HEADER_VIEW (header_view));
- if (TNY_IS_FOLDER (src_folder)) {
- mail_op =
- modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
+ if (TNY_IS_FOLDER (src_folder)) {
+ mail_op =
+ modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
G_OBJECT(win),
modest_ui_actions_move_folder_error_handler,
NULL);
- modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-
- modest_mail_operation_xfer_folder (mail_op,
- TNY_FOLDER (src_folder),
- folder_store,
- TRUE, NULL, NULL);
- /* Unref mail operation */
- g_object_unref (G_OBJECT (mail_op));
- }
-
- /* Frees */
- g_object_unref (G_OBJECT (src_folder));
- }
- } else {
- if (gtk_widget_is_focus (header_view)) {
- TnyList *headers = NULL;
- gint response = 0;
-
- /* TODO: Check for connection if the headers are on a network account. */
- headers = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (header_view));
-
- /* Ask for user confirmation */
- response = msgs_move_to_confirmation (GTK_WINDOW (win),
- TNY_FOLDER (folder_store),
- headers);
-
- /* Transfer messages */
- if (response == GTK_RESPONSE_OK) {
- mail_op =
- modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
- G_OBJECT(win),
- modest_ui_actions_move_folder_error_handler,
- NULL);
- modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
- mail_op);
-
- modest_mail_operation_xfer_msgs (mail_op,
- headers,
- TNY_FOLDER (folder_store),
- TRUE,
- NULL,
- NULL);
+ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+ mail_op);
- g_object_unref (G_OBJECT (mail_op));
- }
- g_object_unref (headers);
+ modest_mail_operation_xfer_folder (mail_op,
+ TNY_FOLDER (src_folder),
+ dst_folder,
+ TRUE, NULL, NULL);
+ /* Unref mail operation */
+ g_object_unref (G_OBJECT (mail_op));
+ } else {
+ g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__);
}
+ } else if (gtk_widget_is_focus (header_view)) {
+ /* Transfer messages */
+ modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win));
}
end:
- if (folder_store != NULL)
- g_object_unref (folder_store);
-
- gtk_widget_destroy (dialog);
+ if (src_folder)
+ g_object_unref (src_folder);
}
*/
static void
modest_ui_actions_on_msg_view_window_move_to (GtkAction *action,
+ TnyFolderStore *dst_folder,
ModestMsgViewWindow *win)
{
- GtkWidget *dialog, *folder_view, *tree_view = NULL;
- gint result = 0;
- ModestMainWindow *main_window = NULL;
TnyHeader *header = NULL;
- TnyList *headers = NULL;
-
- /* Get the folder view */
- main_window = MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()));
- if (main_window)
- folder_view = modest_main_window_get_child_widget (main_window,
- MODEST_WIDGET_TYPE_FOLDER_VIEW);
- else
- folder_view = NULL;
-
- /* Create and run the dialog */
- dialog = create_move_to_dialog (MODEST_WINDOW (win), folder_view, &tree_view);
- result = gtk_dialog_run (GTK_DIALOG(dialog));
+ TnyFolder *src_folder;
- if (result == GTK_RESPONSE_ACCEPT) {
- TnyFolderStore *folder_store;
- gint response;
-
- /* Create header list */
- header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));
- g_return_if_fail (header != NULL);
-
- /* Offer the connection dialog if necessary: */
- /* TODO: What's the extra g_object_ref() for? Isn't this leaking a ref? */
- folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (g_object_ref (tree_view)));
- TnyFolder *header_folder = tny_header_get_folder(header);
- if (modest_platform_connect_and_wait_if_network_folderstore (NULL, folder_store) &&
- modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (header_folder))) {
-
- headers = tny_simple_list_new ();
- tny_list_prepend (headers, G_OBJECT (header));
- g_object_unref (header);
-
- /* Ask user for confirmation. MSG-NOT404 */
- response = msgs_move_to_confirmation (GTK_WINDOW (win),
- TNY_FOLDER (folder_store),
- headers);
-
- /* Transfer current msg */
- if (response == GTK_RESPONSE_OK) {
- ModestMailOperation *mail_op;
+ /* Create header list */
+ header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));
+ src_folder = tny_header_get_folder(header);
+ g_object_unref (header);
- /* Create mail op */
- mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(win));
- modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
- mail_op);
-
- /* Transfer messages */
- modest_mail_operation_xfer_msgs (mail_op,
- headers,
- TNY_FOLDER (folder_store),
- TRUE,
- transfer_msgs_from_viewer_cb,
- NULL);
- g_object_unref (G_OBJECT (mail_op));
- }
- }
-
- if (header_folder)
- g_object_unref (header_folder);
+ /* Transfer the message */
+ if (modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (src_folder)))
+ modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win));
- if (headers)
- g_object_unref (headers);
-
- if (folder_store)
- g_object_unref (folder_store);
- }
-
- gtk_widget_destroy (dialog);
+ g_object_unref (src_folder);
}
void
modest_ui_actions_on_move_to (GtkAction *action,
ModestWindow *win)
{
+ GtkWidget *dialog = NULL, *folder_view = NULL, *tree_view = NULL;
+ gint result = 0;
+ TnyFolderStore *dst_folder = NULL;
+ ModestMainWindow *main_window;
+
g_return_if_fail (MODEST_IS_MAIN_WINDOW (win) ||
MODEST_IS_MSG_VIEW_WINDOW (win));
- if (MODEST_IS_MAIN_WINDOW (win))
- modest_ui_actions_on_main_window_move_to (action,
- MODEST_MAIN_WINDOW (win));
+ /* Get the main window if exists */
+ if (MODEST_IS_MAIN_WINDOW (win))
+ main_window = MODEST_MAIN_WINDOW (win);
+ else
+ main_window =
+ MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()));
+
+ /* Get the folder view widget if exists */
+ if (main_window)
+ folder_view = modest_main_window_get_child_widget (main_window,
+ MODEST_WIDGET_TYPE_FOLDER_VIEW);
else
- modest_ui_actions_on_msg_view_window_move_to (action,
- MODEST_MSG_VIEW_WINDOW (win));
+ folder_view = NULL;
+
+ /* Create and run the dialog */
+ dialog = create_move_to_dialog (GTK_WINDOW (win), folder_view, &tree_view);
+ modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (tree_view));
+ result = gtk_dialog_run (GTK_DIALOG(dialog));
+ g_object_ref (tree_view);
+ gtk_widget_destroy (dialog);
+
+ if (result != GTK_RESPONSE_ACCEPT)
+ return;
+
+ dst_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (tree_view));
+ /* Offer the connection dialog if necessary: */
+ if (modest_platform_connect_and_wait_if_network_folderstore (GTK_WINDOW (win),
+ dst_folder)) {
+
+ /* 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);
}
/*
HeadersFunc func,
gpointer user_data)
{
- TnyList *headers_list;
- TnyIterator *iter;
- TnyHeader *header;
- TnyFolder *folder;
+ TnyList *headers_list = NULL;
+ TnyIterator *iter = NULL;
+ TnyHeader *header = NULL;
+ TnyFolder *folder = NULL;
/* Get headers */
headers_list = get_selected_headers (win);
/* Get the folder */
iter = tny_list_create_iterator (headers_list);
header = TNY_HEADER (tny_iterator_get_current (iter));
- folder = tny_header_get_folder (header);
- g_object_unref (header);
+ if (header) {
+ folder = tny_header_get_folder (header);
+ g_object_unref (header);
+ }
/* Call the function for each header */
while (!tny_iterator_is_done (iter)) {
/* Switch help_id */
if (TNY_IS_FOLDER (folder_store)) {
- switch (tny_folder_get_folder_type (TNY_FOLDER (folder_store))) {
+ switch (modest_tny_folder_guess_folder_type (TNY_FOLDER (folder_store))) {
case TNY_FOLDER_TYPE_NORMAL:
- help_id = "applications_email_userfolder";
+ help_id = "applications_email_managefolders";
break;
case TNY_FOLDER_TYPE_INBOX:
help_id = "applications_email_inbox";
help_id = "applications_email_drafts";
break;
case TNY_FOLDER_TYPE_ARCHIVE:
- help_id = "applications_email_archive";
+ help_id = "applications_email_managefolders";
break;
default:
- help_id = NULL;
+ help_id = "applications_email_managefolders";
}
+ } else {
+ help_id = "applications_email_mainview";
}
g_object_unref (folder_store);
} else {
projects / modest / blobdiff