#ifdef MODEST_PLATFORM_MAEMO
#include "maemo/modest-osso-state-saving.h"
+#include "maemo/modest-maemo-utils.h"
#endif /* MODEST_PLATFORM_MAEMO */
#include "widgets/modest-ui-constants.h"
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,
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));
+/* if (MODEST_IS_HEADER_VIEW (user_data)) */
+/* modest_header_view_refilter (MODEST_HEADER_VIEW (user_data)); */
}
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;
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);
} else {
modest_msg_view_window_select_next_message (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)
{
} 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;
/* Free */
g_free(account);
g_object_unref (parent_win);
-/* g_object_unref (msg); */
g_object_unref (folder);
}
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;
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 {
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;
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
/* 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 currently selected folder. Note that if we only
+ want to retrive 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);
+ }
/* 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)
{
modest_mail_operation_save_to_drafts (mail_operation,
transport_account,
data->draft_msg,
+ edit_window,
from,
data->to,
data->cc,
if (!modest_msg_edit_window_check_names (edit_window))
return;
+ /* Offer the connection dialog, if necessary: */
+ if (!modest_platform_connect_and_wait (GTK_WINDOW (edit_window)))
+ return;
+
/* FIXME: Code added just for testing. The final version will
use the send queue provided by tinymail and some
classifier */
modest_msg_edit_window_remove_attachments (window, NULL);
}
+static void
+modest_ui_actions_new_folder_error_handler (ModestMailOperation *mail_op,
+ gpointer user_data)
+{
+ ModestMainWindow *window = MODEST_MAIN_WINDOW (user_data);
+
+ /* TODO: Note that folder creation might go wrong due to other
+ * failures such as when the parent folder is non-writable. We can
+ * query a GError* with modest_mail_operation_get_error(), but the
+ * the error code (from tinymail) does not give us a clue about what
+ * has gone wrong. We might use the error->message but it might come
+ * from camel and not be suitable to show to the user directly. */
+ modest_platform_information_banner (GTK_WIDGET (window), NULL,
+ _CS("ckdg_ib_folder_already_exists"));
+
+/* modest_platform_information_banner (GTK_WIDGET (window), NULL,
+ modest_mail_operation_get_error (mail_op)->message);*/
+}
+
+
void
modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_window)
{
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(main_window),
+ modest_ui_actions_new_folder_error_handler,
+ main_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) {
+ if (main_window) {
+ folder_view = modest_main_window_get_child_widget (main_window,
+ MODEST_WIDGET_TYPE_FOLDER_VIEW);
+ if (folder_view)
+ 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;
}
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_mail_operation_rename_folder (mail_op,
TNY_FOLDER (folder),
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);
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);
} 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)) {
gtk_clipboard_set_text (clipboard, gtk_label_get_text (GTK_LABEL (focused_widget)), -1);
} else if (GTK_IS_EDITABLE (focused_widget)) {
gtk_editable_copy_clipboard (GTK_EDITABLE(focused_widget));
+ } else if (GTK_IS_HTML (focused_widget)) {
+ gtk_html_copy (GTK_HTML (focused_widget));
} 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);
} 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);
/* 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);
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
static GtkWidget*
-create_move_to_dialog (ModestWindow *win,
+create_move_to_dialog (GtkWindow *win,
GtkWidget *folder_view,
GtkWidget **tree_view)
{
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_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));
-
return dialog;
}
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
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;
+ TnyFolder *src_folder;
- /* Create and run the dialog */
- dialog = create_move_to_dialog (MODEST_WINDOW (win), folder_view, &tree_view);
- result = gtk_dialog_run (GTK_DIALOG(dialog));
-
- 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);
+ /* 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);
- /* Transfer current msg */
- if (response == GTK_RESPONSE_OK) {
- ModestMailOperation *mail_op;
+ /* 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));
- /* 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);
-
- 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_show_non_move_folders (MODEST_FOLDER_VIEW (tree_view), TRUE);
+ 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);
}
/*
/* 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