ModestMailOperationState *state,
gpointer user_data);
-static gboolean download_uncached_messages (TnyList *header_list,
- GtkWindow *win);
+static gint header_list_count_uncached_msgs (
+ TnyList *header_list,
+ GtkWindow *win);
+static gboolean connect_to_get_msg (
+ GtkWindow *win,
+ gint num_of_uncached_msgs);
-/* static gint msgs_move_to_confirmation (GtkWindow *win, */
-/* TnyFolder *dest_folder, */
-/* gboolean delete, */
-/* TnyList *headers); */
-
/* Show the account creation wizard dialog.
* returns: TRUE if an account was created. FALSE if the user cancelled.
g_object_unref (G_OBJECT (mail_op));
}
-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_messages_delete (TnyList *headers, ModestWindow *win)
{
- modest_do_message_delete (header, win);
+ ModestMailOperation *mail_op = NULL;
+ 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_msgs (mail_op, headers, FALSE);
+ g_object_unref (G_OBJECT (mail_op));
}
+/* static void */
+/* headers_action_delete (TnyHeader *header, */
+/* ModestWindow *win, */
+/* gpointer user_data) */
+/* { */
+/* modest_do_message_delete (header, win); */
+
+/* } */
+
/** 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.
**/
GList *sel_list = NULL, *tmp = NULL;
GtkTreeRowReference *row_reference = NULL;
GtkTreePath *next_path = NULL;
- TnyFolder *folder = NULL;
GError *err = NULL;
/* Find last selected row */
}
}
+ /* Disable window dimming management */
+ modest_window_disable_dimming (MODEST_WINDOW(win));
+
/* Remove each header. If it's a view window header_view == NULL */
- do_headers_action (win, headers_action_delete, header_view);
+/* do_headers_action (win, headers_action_delete, header_view); */
+ modest_do_messages_delete (header_list, win);
+
- /* refresh the header view (removing marked-as-deleted)*/
- modest_header_view_refilter (MODEST_HEADER_VIEW(header_view));
+ /* Enable window dimming management */
+ gtk_tree_selection_unselect_all (sel);
+ modest_window_enable_dimming (MODEST_WINDOW(win));
+
+ /* FIXME: May be folder_monitor will also refilter treemode on EXPUNGE changes ? */
+ /* refresh the header view (removing marked-as-deleted) */
+/* modest_header_view_refilter (MODEST_HEADER_VIEW(header_view)); */
if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (win));
gtk_tree_row_reference_free (row_reference);
}
- /* Get folder from first header and sync it */
- iter = tny_list_create_iterator (header_list);
- header = TNY_HEADER (tny_iterator_get_current (iter));
- folder = tny_header_get_folder (header);
- if (TNY_IS_CAMEL_IMAP_FOLDER (folder))
-/* tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /\* FALSE --> don't expunge *\/ */
- tny_folder_sync (folder, FALSE, &err); /* FALSE --> don't expunge */
- else if (TNY_IS_CAMEL_POP_FOLDER (folder))
-/* tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /\* TRUE --> dont expunge *\/ */
- tny_folder_sync (folder, TRUE, &err); /* TRUE --> expunge */
- else
- /* local folders */
-/* tny_folder_sync_async(folder, TRUE, NULL, NULL, NULL); /\* TRUE --> expunge *\/ */
- tny_folder_sync (folder, TRUE, &err); /* TRUE --> expunge */
-
if (err != NULL) {
printf ("DEBUG: %s: Error: code=%d, text=%s\n", __FUNCTION__, err->code, err->message);
g_error_free(err);
}
-
- g_object_unref (header);
- g_object_unref (iter);
- g_object_unref (folder);
/* Update toolbar dimming state */
modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
free_reply_forward_helper (rf_helper);
}
-/*
- * Checks a list of headers. If any of them are not currently
- * downloaded (CACHED) then it asks the user for permission to
- * download them.
- *
- * Returns FALSE if the user does not want to download the
- * messages. Returns TRUE if the user allowed the download or if all
- * of them are currently downloaded
+/* Checks a list of headers. If any of them are not currently
+ * downloaded (CACHED) then returns TRUE else returns FALSE.
*/
-static gboolean
-download_uncached_messages (TnyList *header_list,
- GtkWindow *win)
+static gint
+header_list_count_uncached_msgs (
+ TnyList *header_list,
+ GtkWindow *win)
{
TnyIterator *iter;
- gboolean retval;
gint uncached_messages = 0;
iter = tny_list_create_iterator (header_list);
}
g_object_unref (iter);
- /* Ask for user permission to download the messages */
- retval = TRUE;
- if (uncached_messages > 0) {
- gboolean download = TRUE;
- if (!tny_device_is_online (modest_runtime_get_device())) {
- GtkResponseType 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) download = FALSE;
- }
- if (download) {
- /* If a download will be necessary, make sure that we have a connection: */
- retval = modest_platform_connect_and_wait(win, NULL);
- } else {
- retval = FALSE;
- }
- }
- return retval;
+ return uncached_messages;
}
+/* Returns FALSE if the user does not want to download the
+ * messages. Returns TRUE if the user allowed the download.
+ */
+static gboolean
+connect_to_get_msg (GtkWindow *win,
+ gint num_of_uncached_msgs)
+{
+ /* 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);
+}
/*
* Common code for the reply and forward actions
(action == ACTION_FORWARD) ? MODEST_CONF_FORWARD_TYPE : MODEST_CONF_REPLY_TYPE,
NULL);
- /* Check that the messages have been previously downloaded */
- do_retrieve = (action == ACTION_FORWARD) || (reply_forward_type != MODEST_TNY_MSG_REPLY_TYPE_CITE);
- if (do_retrieve)
- continue_download = download_uncached_messages (header_list, GTK_WINDOW (win));
+ /* check if we need to download msg before asking about it */
+ do_retrieve = (action == ACTION_FORWARD) ||
+ (reply_forward_type != MODEST_TNY_MSG_REPLY_TYPE_CITE);
+
+ 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,
+ GTK_WINDOW (win));
+ /* 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 (!continue_download) {
g_object_unref (header_list);
return;
folder_empty = folder_empty || all_marked_as_deleted ;
if (folder_empty) {
- printf ("DEBUG: %s: tny_folder_get_all_count() returned 0.\n", __FUNCTION__);
+ printf ("DEBUG: %s: tny_folder_get_all_count() returned 0.\n", __FUNCTION__);
modest_main_window_set_contents_style (win,
MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY);
} else {
gchar *from = modest_account_mgr_get_from_string (account_mgr, account_name);
-/* modest_platform_information_banner (NULL, NULL, _("mcen_ib_outbox_waiting_to_be_sent")); */
-
/* Create the mail operation */
ModestMailOperation *mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_SEND, G_OBJECT(edit_window));
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation);
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)) {
- g_object_unref (G_OBJECT (folder));
+ if (!folder)
return;
- }
-
if (TNY_IS_FOLDER (folder)) {
gchar *folder_name;
gint response;
const gchar *current_name;
TnyFolderStore *parent;
+ gboolean do_rename = TRUE;
current_name = tny_folder_get_name (TNY_FOLDER (folder));
parent = tny_folder_get_folder_store (TNY_FOLDER (folder));
&folder_name);
g_object_unref (parent);
- if (response == GTK_RESPONSE_ACCEPT && strlen (folder_name) > 0) {
+ if (response != GTK_RESPONSE_ACCEPT || strlen (folder_name) == 0) {
+ do_rename = FALSE;
+ } else if (modest_platform_is_network_folderstore(folder) &&
+ !tny_device_is_online (modest_runtime_get_device())) {
+ TnyAccount *account = tny_folder_get_account(TNY_FOLDER(folder));
+ do_rename = modest_platform_connect_and_wait(GTK_WINDOW(main_window), account);
+ g_object_unref(account);
+ }
+
+ if (do_rename) {
ModestMailOperation *mail_op;
GtkTreeSelection *sel = NULL;
G_OBJECT(main_window),
modest_ui_actions_rename_folder_error_handler,
main_window);
-
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
GtkWidget *folder_view;
gint response;
gchar *message;
-
+ gboolean do_delete = TRUE;
+
g_return_if_fail (MODEST_IS_MAIN_WINDOW (main_window));
folder_view = modest_main_window_get_child_widget (main_window,
return ;
}
- /* Offer the connection dialog if necessary: */
- if (!modest_platform_connect_and_wait_if_network_folderstore (NULL, folder)) {
- g_object_unref (G_OBJECT (folder));
- return;
- }
-
/* Ask the user */
message = g_strdup_printf (_("mcen_nc_delete_folder_text"),
tny_folder_get_name (TNY_FOLDER (folder)));
(const gchar *) message);
g_free (message);
- if (response == GTK_RESPONSE_OK) {
+ if (response != GTK_RESPONSE_OK) {
+ do_delete = FALSE;
+ } else if (modest_platform_is_network_folderstore(folder) &&
+ !tny_device_is_online (modest_runtime_get_device())) {
+ TnyAccount *account = tny_folder_get_account(TNY_FOLDER(folder));
+ do_delete = modest_platform_connect_and_wait(GTK_WINDOW(main_window), account);
+ g_object_unref(account);
+ }
+
+ if (do_delete) {
ModestMailOperation *mail_op;
GtkTreeSelection *sel;
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));
+ TnyList *header_list = modest_header_view_get_selected_headers (
+ MODEST_HEADER_VIEW (focused_widget));
+ gboolean continue_download = FALSE;
+ gint num_of_unc_msgs;
+
+ num_of_unc_msgs = header_list_count_uncached_msgs(
+ header_list, GTK_WINDOW (window));
+
+ if (num_of_unc_msgs)
+ continue_download = connect_to_get_msg(
+ GTK_WINDOW (window),
+ num_of_unc_msgs);
+
+ if (num_of_unc_msgs == 0 || continue_download) {
+/* modest_platform_information_banner (
+ NULL, NULL, _CS("mcen_ib_getting_items"));*/
+ modest_header_view_cut_selection (
+ MODEST_HEADER_VIEW (focused_widget));
+ }
+
+ g_object_unref (header_list);
} else if (MODEST_IS_FOLDER_VIEW (focused_widget)) {
modest_folder_view_cut_selection (MODEST_FOLDER_VIEW (focused_widget));
}
{
GtkClipboard *clipboard;
GtkWidget *focused_widget;
+ gboolean copied = TRUE;
clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
focused_widget = gtk_window_get_focus (GTK_WINDOW (window));
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));
-
- 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);
- }
+ TnyList *header_list = modest_header_view_get_selected_headers (
+ MODEST_HEADER_VIEW (focused_widget));
+ gboolean continue_download = FALSE;
+ gint num_of_unc_msgs;
+
+ num_of_unc_msgs = header_list_count_uncached_msgs(
+ header_list,
+ GTK_WINDOW (window));
+
+ if (num_of_unc_msgs)
+ continue_download = connect_to_get_msg(
+ GTK_WINDOW (window),
+ num_of_unc_msgs);
+
+ if (num_of_unc_msgs == 0 || continue_download) {
+ modest_platform_information_banner (
+ NULL, NULL, _CS("mcen_ib_getting_items"));
+ modest_header_view_copy_selection (
+ MODEST_HEADER_VIEW (focused_widget));
+ } else
+ copied = FALSE;
- 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));
- if (continue_download)
- modest_header_view_copy_selection (MODEST_HEADER_VIEW (focused_widget));
g_object_unref (header_list);
+
} else if (MODEST_IS_FOLDER_VIEW (focused_widget)) {
modest_folder_view_copy_selection (MODEST_FOLDER_VIEW (focused_widget));
- }
+ }
- /* Show information banner */
- modest_platform_information_banner (NULL, NULL, _CS("ecoc_ib_edwin_copied"));
-
+ /* Show information banner if there was a copy to clipboard */
+ if(copied)
+ modest_platform_information_banner (
+ NULL, NULL, _CS("ecoc_ib_edwin_copied"));
}
void
GtkWidget *header_view = focused_widget;
GtkTreeSelection *selection = NULL;
- if (!(MODEST_IS_HEADER_VIEW (focused_widget)))
+ if (!(MODEST_IS_HEADER_VIEW (focused_widget))) {
header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window),
MODEST_WIDGET_TYPE_HEADER_VIEW);
+ }
+ /* Disable window dimming management */
+ modest_window_disable_dimming (MODEST_WINDOW(window));
+
/* Select all messages */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(header_view));
gtk_tree_selection_select_all (selection);
/* Set focuse on header view */
gtk_widget_grab_focus (header_view);
+
+
+ /* Enable window dimming management */
+ modest_window_enable_dimming (MODEST_WINDOW(window));
+ modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
}
}
GTK_WIDGET (user_data));
}
+/*
+ * This function is used to track changes in the selection of the
+ * folder view that is inside the "move to" dialog to enable/disable
+ * the OK button because we do not want the user to select a disallowed
+ * destination for a folder.
+ * The user also not desired to be able to use NEW button on items where
+ * folder creation is not possibel.
+ */
+static void
+on_move_to_dialog_folder_selection_changed (ModestFolderView* self,
+ TnyFolderStore *folder_store,
+ gboolean selected,
+ gpointer user_data)
+{
+ GtkWidget *dialog = NULL;
+ GtkWidget *ok_button = NULL, *new_button = NULL;
+ GList *children = NULL;
+ gboolean ok_sensitive = TRUE, new_sensitive = TRUE;
+ gboolean moving_folder = FALSE;
+ gboolean is_remote_account = FALSE;
+ GtkWidget *folder_view = NULL;
+
+ if (!selected)
+ return;
+
+ /* Get the OK button */
+ dialog = gtk_widget_get_ancestor (GTK_WIDGET (self), GTK_TYPE_DIALOG);
+ if (!dialog)
+ return;
+
+ children = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area));
+ ok_button = GTK_WIDGET (children->next->next->data);
+ new_button = GTK_WIDGET (children->next->data);
+ g_list_free (children);
+
+ /* check if folder_store is an remote account */
+ if (TNY_IS_ACCOUNT (folder_store)) {
+ TnyAccount *local_account = NULL;
+ ModestTnyAccountStore *account_store = NULL;
+
+ account_store = modest_runtime_get_account_store ();
+ local_account = modest_tny_account_store_get_local_folders_account (account_store);
+
+ if ((gpointer) local_account != (gpointer) folder_store)
+ is_remote_account = TRUE;
+ g_object_unref (local_account);
+ }
+
+ /* New button should be dimmed on remote account root folder
+ * and on inbox folder. */
+ if (is_remote_account)
+ new_sensitive = FALSE;
+
+ /* check if folder_store is an rmeote inbox folder */
+ if (TNY_IS_FOLDER (folder_store))
+ if (tny_folder_get_folder_type(TNY_FOLDER(folder_store))
+ == TNY_FOLDER_TYPE_INBOX)
+ new_sensitive = FALSE;
+
+ /* If it */
+ if (MODEST_IS_MAIN_WINDOW (user_data)) {
+ /* Get the widgets */
+ folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (user_data),
+ MODEST_WIDGET_TYPE_FOLDER_VIEW);
+ if (gtk_widget_is_focus (folder_view))
+ moving_folder = TRUE;
+ }
+
+ if (moving_folder) {
+ TnyFolderStore *moved_folder = NULL, *parent = NULL;
+
+ /* Get the folder to move */
+ moved_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+
+ /* Check that we're not moving to the same folder */
+ if (TNY_IS_FOLDER (moved_folder)) {
+ parent = tny_folder_get_folder_store (TNY_FOLDER (moved_folder));
+ if (parent == folder_store)
+ ok_sensitive = FALSE;
+ g_object_unref (parent);
+ }
+
+ if (ok_sensitive && TNY_IS_ACCOUNT (folder_store)) {
+ /* Do not allow to move to an account unless it's the
+ local folders account */
+ if (is_remote_account)
+ ok_sensitive = FALSE;
+ }
+
+ if (ok_sensitive && (moved_folder == folder_store)) {
+ /* Do not allow to move to itself */
+ ok_sensitive = FALSE;
+ }
+ g_object_unref (moved_folder);
+ } else {
+ TnyHeader *header = NULL;
+ TnyFolder *src_folder = NULL;
+
+ /* Moving a message */
+ if (MODEST_IS_MSG_VIEW_WINDOW (user_data)) {
+ header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (user_data));
+ src_folder = tny_header_get_folder (header);
+ g_object_unref (header);
+ } else {
+ src_folder =
+ TNY_FOLDER (modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)));
+ }
+
+ /* Do not allow to move the msg to the same folder */
+ /* Do not allow to move the msg to an account */
+ if ((gpointer) src_folder == (gpointer) folder_store ||
+ TNY_IS_ACCOUNT (folder_store))
+ ok_sensitive = FALSE;
+ g_object_unref (src_folder);
+ }
+
+ /* Set sensitivity of the OK button */
+ gtk_widget_set_sensitive (ok_button, ok_sensitive);
+ /* Set sensitivity of the NEW button */
+ gtk_widget_set_sensitive (new_button, new_sensitive);
+}
+
static GtkWidget*
create_move_to_dialog (GtkWindow *win,
GtkWidget *folder_view,
/* Create folder view */
*tree_view = modest_platform_create_folder_view (NULL);
+ /* Track changes in the selection to
+ * disable the OK button whenever "Move to" is not possible
+ * disbale NEW button whenever New is not possible */
+ g_signal_connect (*tree_view,
+ "folder_selection_changed",
+ G_CALLBACK (on_move_to_dialog_folder_selection_changed),
+ win);
+
+ /* Listen to clicks on New button */
g_signal_connect (G_OBJECT (new_button),
"clicked",
G_CALLBACK(create_move_to_dialog_on_new_folder),
/*
* Shows a confirmation dialog to the user when we're moving messages
* from a remote server to the local storage. Returns the dialog
- * response. If it's other kind of movement the it always returns
+ * response. If it's other kind of movement then it always returns
* GTK_RESPONSE_OK
+ *
+ * This one is used by the next functions:
+ * modest_ui_actions_xfer_messages_from_move_to
+ * modest_ui_actions_on_paste - commented out
+ * drag_and_drop_from_header_view (for d&d in modest_folder_view.c)
*/
gint
msgs_move_to_confirmation (GtkWindow *win,
{
gint response = GTK_RESPONSE_OK;
- /* If the destination is a local folder (or MMC folder )*/
- if (!modest_tny_folder_is_remote_folder (dest_folder)) {
+ /* return with OK if the destination is a remote folder */
+ if (modest_tny_folder_is_remote_folder (dest_folder))
+ return GTK_RESPONSE_OK;
- gboolean is_online;
- TnyDevice *device;
-
- TnyFolder *src_folder = NULL;
- TnyIterator *iter = NULL;
- TnyHeader *header = NULL;
-
- /* get the device */
-
- device = modest_runtime_get_device ();
- if (device)
- is_online = tny_device_is_online (device);
- else {
- g_warning ("failed to get tny device"); /* should not happend */
- is_online = FALSE;
- }
-
- /* Get source folder */
- iter = tny_list_create_iterator (headers);
- header = TNY_HEADER (tny_iterator_get_current (iter));
- if (header) {
- src_folder = tny_header_get_folder (header);
- g_object_unref (header);
- }
-
- g_object_unref (iter);
+ TnyFolder *src_folder = NULL;
+ TnyIterator *iter = NULL;
+ TnyHeader *header = NULL;
- /* if no src_folder, message may be an attahcment */
- if (src_folder == NULL)
- return GTK_RESPONSE_CANCEL;
+ /* Get source folder */
+ iter = tny_list_create_iterator (headers);
+ header = TNY_HEADER (tny_iterator_get_current (iter));
+ if (header) {
+ src_folder = tny_header_get_folder (header);
+ g_object_unref (header);
+ }
+ g_object_unref (iter);
- /* If the source is a remote folder */
- if (!is_online && modest_tny_folder_is_remote_folder (src_folder)) {
+ /* if no src_folder, message may be an attahcment */
+ if (src_folder == NULL)
+ return GTK_RESPONSE_CANCEL;
- const gchar *message = NULL;
- message = ngettext ("mcen_nc_get_msg", "mcen_nc_get_msgs",
- tny_list_get_length (headers));
- response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
- (const gchar *) message);
- } else
- response = GTK_RESPONSE_OK;
-
+ /* If the source is a local or MMC folder */
+ if (!modest_tny_folder_is_remote_folder (src_folder)) {
g_object_unref (src_folder);
+ return GTK_RESPONSE_OK;
}
-
+ g_object_unref (src_folder);
+
+ /* now if offline we ask the user */
+ if(connect_to_get_msg( GTK_WINDOW (win),
+ tny_list_get_length (headers)))
+ response = GTK_RESPONSE_OK;
+ else
+ response = GTK_RESPONSE_CANCEL;
+
return response;
}
TnyFolderStore *dst_folder,
ModestMainWindow *win)
{
- GtkWidget *header_view = NULL;
+ ModestHeaderView *header_view = NULL;
ModestMailOperation *mail_op = NULL;
TnyFolderStore *src_folder;
+ gboolean online = (tny_device_is_online (modest_runtime_get_device()));
g_return_if_fail (MODEST_IS_MAIN_WINDOW (win));
/* 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;
/* Get header view */
- header_view =
- modest_main_window_get_child_widget (win, MODEST_WIDGET_TYPE_HEADER_VIEW);
+ header_view = MODEST_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)) {
GtkTreeSelection *sel;
+ gboolean do_xfer = TRUE;
/* Allow only to transfer folders to the local root folder */
if (TNY_IS_ACCOUNT (dst_folder) &&
- !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder))
- goto end;
-
- /* 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);
-
- 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_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder)) {
+ do_xfer = FALSE;
+ } else if (!TNY_IS_FOLDER (src_folder)) {
+ g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__);
+ do_xfer = FALSE;
+ } else if (!online && modest_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)) {
+ do_xfer = FALSE;
+ }
+ }
- 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));
+ if (do_xfer) {
+ /* 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_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),
+ dst_folder,
+ TRUE, NULL, NULL);
+ /* Unref mail operation */
+ g_object_unref (G_OBJECT (mail_op));
+ }
+ } else if (gtk_widget_is_focus (GTK_WIDGET(header_view))) {
+ gboolean do_xfer = TRUE;
+ /* Ask for confirmation if the source folder is remote and we're not connected */
+ if (!online && modest_platform_is_network_folderstore(src_folder)) {
+ guint num_headers = modest_header_view_count_selected_headers(header_view);
+ if (!connect_to_get_msg(GTK_WINDOW(win), num_headers)) {
+ do_xfer = FALSE;
+ }
+ }
+ if (do_xfer) /* Transfer messages */
+ modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win));
}
-
- end:
+
if (src_folder)
g_object_unref (src_folder);
}
ModestMsgViewWindow *win)
{
TnyHeader *header = NULL;
- TnyFolder *src_folder;
+ TnyFolderStore *src_folder;
/* Create header list */
header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));
- src_folder = tny_header_get_folder(header);
+ src_folder = TNY_FOLDER_STORE(tny_header_get_folder(header));
g_object_unref (header);
- /* Transfer the message */
- if (modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (src_folder)))
+ /* Transfer the message if online or confirmed by the user */
+ if (tny_device_is_online (modest_runtime_get_device()) ||
+ (modest_platform_is_network_folderstore(src_folder) && connect_to_get_msg(GTK_WINDOW(win), 1))) {
modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win));
+ }
g_object_unref (src_folder);
}
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));
- }
+ /* 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);
}
projects / modest / blobdiff