}
}
-
-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 */
+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_message (GtkAction *action, ModestWindow *win)
{
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);
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);
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 ();
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)) {
- printf ("DEBUG: %s: modest_ui_actions_msg_retrieval_check() failed.\n",
- __FUNCTION__);
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)
gpointer user_data)
{
ModestMainWindow *window = MODEST_MAIN_WINDOW (user_data);
+ const GError *error = modest_mail_operation_get_error (mail_op);
- /* 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);*/
+ if(error)
+ {
+ modest_platform_information_banner (GTK_WIDGET (window), NULL,
+ modest_mail_operation_get_error (mail_op)->message);
+ }
}
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;
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 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 */
g_object_unref (part);
tny_iterator_next (iter);
}
+ modest_window_mgr_unregister_header (mgr, header);
g_object_unref (iter);
g_object_unref (parts);
/* 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);
/* 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 = "applications_email_mainview";
+ help_id = "applications_email_managefolders";
}
} else {
help_id = "applications_email_mainview";
projects / modest / blobdiff