} ReplyForwardHelper;
typedef struct _MoveToHelper {
- ModestMailOperation *mail_op;
- TnyFolder *folder;
+ GtkTreeRowReference *reference;
+ GtkWidget *banner;
} MoveToHelper;
typedef struct _PasteAsAttachmentHelper {
return (src_is_pop && !uncached_msgs);
}
+
+/* FIXME: this should be merged with the similar code in modest-account-view-window */
/* Show the account creation wizard dialog.
* returns: TRUE if an account was created. FALSE if the user cancelled.
*/
gboolean
-modest_run_account_setup_wizard (ModestWindow *win)
+modest_ui_actions_run_account_setup_wizard (ModestWindow *win)
{
- gboolean result = FALSE;
- GtkDialog *wizard;
-
- wizard = modest_window_mgr_get_easysetup_dialog
- (modest_runtime_get_window_mgr());
- if (wizard) {
- /* old wizard is active already; present it and
- * act as if the user cancelled the non-existing
- * new one
+ gboolean result = FALSE;
+ GtkWindow *dialog, *wizard;
+ gint dialog_response;
+
+ /* Show the easy-setup wizard: */
+ dialog = modest_window_mgr_get_modal (modest_runtime_get_window_mgr());
+ if (dialog && MODEST_IS_EASYSETUP_WIZARD_DIALOG(dialog)) {
+ /* old wizard is active already;
*/
- printf ("wizard already active\n");
+ gtk_window_present (GTK_WINDOW(dialog));
return FALSE;
- } else {
- /* there is no such wizard yet */
- wizard = GTK_DIALOG(modest_easysetup_wizard_dialog_new ());
- modest_window_mgr_set_easysetup_dialog
- (modest_runtime_get_window_mgr(), GTK_DIALOG(wizard));
- }
-
+ }
+
+ /* there is no such wizard yet */
+ wizard = GTK_WINDOW (modest_easysetup_wizard_dialog_new ());
+ modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), wizard);
+
/* always present a main window in the background
* we do it here, so we cannot end up with to wizards (as this
* function might be called in modest_window_mgr_get_main_window as well */
/* make sure the mainwindow is visible */
gtk_widget_show_all (GTK_WIDGET(win));
gtk_window_present (GTK_WINDOW(win));
-
- gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win));
+ dialog_response = gtk_dialog_run (GTK_DIALOG (wizard));
+ gtk_widget_destroy (GTK_WIDGET (wizard));
+ if (gtk_events_pending ())
+ gtk_main_iteration ();
- /* Don't make this a modal window, because secondary windows will then
- * be unusable, freezing the UI: */
- /* gtk_window_set_modal (GTK_WINDOW (wizard), TRUE); */
-
- gint dialog_response = gtk_dialog_run (GTK_DIALOG (wizard));
- if (dialog_response == GTK_RESPONSE_CANCEL)
+ if (dialog_response == GTK_RESPONSE_CANCEL) {
result = FALSE;
- else {
+ } else {
/* Check whether an account was created: */
result = modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE);
}
- gtk_widget_destroy (GTK_WIDGET (wizard));
-
- /* clear it from the window mgr */
- modest_window_mgr_set_easysetup_dialog
- (modest_runtime_get_window_mgr(), NULL);
-
return result;
}
return NULL;
}
+static GtkTreeRowReference *
+get_next_after_selected_headers (ModestHeaderView *header_view)
+{
+ GtkTreeSelection *sel;
+ GList *selected_rows, *node;
+ GtkTreePath *path;
+ GtkTreeRowReference *result;
+ GtkTreeModel *model;
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view));
+ selected_rows = gtk_tree_selection_get_selected_rows (sel, NULL);
+
+ if (selected_rows == NULL)
+ return NULL;
+
+ node = g_list_last (selected_rows);
+ path = gtk_tree_path_copy ((GtkTreePath *) node->data);
+ gtk_tree_path_next (path);
+
+ result = gtk_tree_row_reference_new (model, path);
+
+ gtk_tree_path_free (path);
+ g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL);
+ g_list_free (selected_rows);
+
+ return result;
+}
+
static void
headers_action_mark_as_read (TnyHeader *header,
ModestWindow *win,
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.
**/
-void modest_ui_actions_refresh_message_window_after_delete (ModestMsgViewWindow* win)
+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 {
- if (!modest_msg_view_window_select_next_message (win)) {
- gboolean ret_value;
- g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value);
- }
+ } else if (!modest_msg_view_window_select_next_message (win)) {
+ gboolean ret_value;
+ g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value);
}
}
/* Check if any of the headers are already opened, or in the process of being opened */
if (MODEST_IS_MAIN_WINDOW (win)) {
- gboolean found;
+ gint opened_headers = 0;
+
iter = tny_list_create_iterator (header_list);
- found = FALSE;
mgr = modest_runtime_get_window_mgr ();
- while (!tny_iterator_is_done (iter) && !found) {
+ while (!tny_iterator_is_done (iter)) {
header = TNY_HEADER (tny_iterator_get_current (iter));
if (header) {
- found = modest_window_mgr_find_registered_header (mgr, header, NULL);
+ if (modest_window_mgr_find_registered_header (mgr, header, NULL))
+ opened_headers++;
g_object_unref (header);
}
-
tny_iterator_next (iter);
}
g_object_unref (iter);
- if (found) {
- gchar *num, *msg;
+ if (opened_headers > 0) {
+ gchar *msg;
- num = g_strdup_printf ("%d", tny_list_get_length (header_list));
- msg = g_strdup_printf (_("mcen_nc_unable_to_delete_n_messages"), num);
+ msg = g_strdup_printf (_("mcen_nc_unable_to_delete_n_messages"),
+ opened_headers);
modest_platform_run_information_dialog (GTK_WINDOW (win), (const gchar *) msg);
g_free (msg);
- g_free (num);
g_object_unref (header_list);
return;
}
modest_do_messages_delete (header_list, win);
/* Enable window dimming management */
- gtk_tree_selection_unselect_all (sel);
+ if (sel != NULL) {
+ gtk_tree_selection_unselect_all (sel);
+ }
modest_window_enable_dimming (MODEST_WINDOW(win));
if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
}
void
-modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win)
+modest_ui_actions_on_accounts (GtkAction *action,
+ ModestWindow *win)
{
/* This is currently only implemented for Maemo */
#ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */
- if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) {
- modest_run_account_setup_wizard (win);
+ if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE)) {
+ modest_ui_actions_run_account_setup_wizard (win);
return;
- } else {
- /* Show the list of accounts: */
- GtkDialog *account_win = GTK_DIALOG(modest_account_view_window_new ());
- gtk_window_set_transient_for (GTK_WINDOW (account_win), GTK_WINDOW (win));
+ } else {
+ /* Show the list of accounts */
+ GtkWindow *account_win = GTK_WINDOW (modest_account_view_window_new ());
+ gtk_window_set_transient_for (account_win, GTK_WINDOW (win));
- /* The accounts dialog must be modal */
- gtk_window_set_modal (GTK_WINDOW (account_win), TRUE);
- modest_maemo_show_dialog_and_forget (GTK_WINDOW (win), account_win);
+ /* The accounts dialog must be modal */
+ modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), account_win);
+ modest_maemo_show_dialog_and_forget (GTK_WINDOW (win), GTK_DIALOG (account_win));
}
#else
GtkWidget *dialog, *label;
/* if there are no accounts yet, just show the wizard */
if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE)) {
- const gboolean created = modest_run_account_setup_wizard (win);
- if (!created)
- return;
+ if (!modest_ui_actions_run_account_setup_wizard (win))
+ return;
}
account_name = g_strdup (modest_window_get_active_account (win));
(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)) {
- const gboolean created = modest_run_account_setup_wizard(parent_win);
- if (!created)
+ if (!modest_ui_actions_run_account_setup_wizard(parent_win))
goto cleanup;
}
win = modest_msg_edit_window_new (msg, account, TRUE);
TnyAccount *account = NULL;
ModestWindowMgr *mgr = NULL;
gchar *signature = NULL;
+ gboolean use_signature;
/* If there was any error. The mail operation could be NULL,
this means that we already have the message downloaded and
from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
rf_helper->account_name);
- if (modest_account_mgr_get_bool (modest_runtime_get_account_mgr(),
- rf_helper->account_name,
- MODEST_ACCOUNT_USE_SIGNATURE, FALSE)) {
- signature = modest_account_mgr_get_string (modest_runtime_get_account_mgr (),
- rf_helper->account_name,
- MODEST_ACCOUNT_SIGNATURE, FALSE);
- }
+ signature = modest_account_mgr_get_signature (modest_runtime_get_account_mgr(),
+ rf_helper->account_name,
+ &use_signature);
/* Create reply mail */
switch (rf_helper->action) {
/* we need an account when editing */
if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) {
- const gboolean created = modest_run_account_setup_wizard (win);
- if (!created)
+ if (!modest_ui_actions_run_account_setup_wizard (win))
return;
}
g_return_if_fail (MODEST_IS_MAIN_WINDOW (user_data));
win = MODEST_MAIN_WINDOW (user_data);
+ /* Don't do anything if there are not new headers, this could
+ happen if there was any problem with the mail operation */
+ if (!new_headers)
+ return;
+
/* Set contents style of headers view */
if (modest_main_window_get_contents_style (win) == MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY) {
folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
}
/* Notify new messages have been downloaded */
- if (tny_list_get_length (new_headers) > 0) {
+ if ((new_headers != NULL) && (tny_list_get_length (new_headers) > 0)) {
TnyIterator *iter = tny_list_create_iterator (new_headers);
do {
TnyHeader *header = NULL;
if (!header)
return;
+ if (modest_header_view_count_selected_headers (header_view) > 1) {
+ hildon_banner_show_information (NULL, NULL, _("mcen_ib_select_one_message"));
+ return;
+ }
+
/* headers = tny_simple_list_new (); */
/* tny_list_prepend (headers, G_OBJECT (header)); */
data->plain_body,
data->html_body,
data->attachments,
+ data->images,
data->priority_flags);
/* Frees */
g_free (from);
info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts"));
modest_platform_information_banner (NULL, NULL, info_text);
+ modest_msg_edit_window_reset_modified (edit_window);
g_free (info_text);
}
if (!account_name) {
/* Run account setup wizard */
- const gboolean created = modest_run_account_setup_wizard(MODEST_WINDOW(edit_window));
- if (!created)
+ if (!modest_ui_actions_run_account_setup_wizard (MODEST_WINDOW(edit_window)))
return;
}
account_name));
if (!transport_account) {
/* Run account setup wizard */
- const gboolean created = modest_run_account_setup_wizard(MODEST_WINDOW(edit_window));
- if (!created)
+ if (!modest_ui_actions_run_account_setup_wizard(MODEST_WINDOW(edit_window)))
return;
}
data->plain_body,
data->html_body,
data->attachments,
+ data->images,
data->priority_flags);
/* Free data: */
ModestMainWindow *window = MODEST_MAIN_WINDOW (user_data);
const GError *error = modest_mail_operation_get_error (mail_op);
- if(error)
- {
+ if(error) {
modest_platform_information_banner (GTK_WIDGET (window), NULL,
- modest_mail_operation_get_error (mail_op)->message);
+ _("mail_in_ui_folder_create_error"));
}
}
g_object_unref (win);
}
-static void
+static gboolean
delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
{
TnyFolderStore *folder;
gchar *message;
gboolean do_delete = TRUE;
- g_return_if_fail (MODEST_IS_MAIN_WINDOW (main_window));
+ g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (main_window), FALSE);
folder_view = modest_main_window_get_child_widget (main_window,
MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
if (!folder_view)
- return;
+ return FALSE;
folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
modest_platform_run_information_dialog (GTK_WINDOW (main_window),
_("mail_in_ui_folder_delete_error"));
g_object_unref (G_OBJECT (folder));
- return ;
+ return FALSE;
}
/* Ask the user */
}
g_object_unref (G_OBJECT (folder));
+
+ return do_delete;
}
void
modest_ui_actions_on_delete_folder (GtkAction *action,
ModestMainWindow *main_window)
{
- GtkWidget *folder_view;
g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
- delete_folder (main_window, FALSE);
- folder_view = modest_main_window_get_child_widget (main_window,
- MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
- if (!folder_view)
- return;
- modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view));
+ if (delete_folder (main_window, FALSE)) {
+ GtkWidget *folder_view;
+
+ folder_view = modest_main_window_get_child_widget (main_window,
+ MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+ modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view));
+ }
}
void
gtk_window_set_transient_for (GTK_WINDOW(dialog), GTK_WINDOW(main_window));
- gchar *server_name = modest_server_account_get_hostname (
+ gchar *server_name = modest_account_mgr_get_server_account_hostname (
modest_runtime_get_account_mgr(), server_account_name);
if (!server_name) {/* This happened once, though I don't know why. murrayc. */
g_warning("%s: Could not get server name for server account '%s'", __FUNCTION__, server_account_name);
server_name = NULL;
/* username: */
- gchar *initial_username = modest_server_account_get_username (
+ gchar *initial_username = modest_account_mgr_get_server_account_username (
modest_runtime_get_account_mgr(), server_account_name);
GtkWidget *entry_username = gtk_entry_new ();
/* Dim this if a connection has ever succeeded with this username,
* as per the UI spec: */
const gboolean username_known =
- modest_server_account_get_username_has_succeeded(
+ modest_account_mgr_get_server_account_username_has_succeeded(
modest_runtime_get_account_mgr(), server_account_name);
gtk_widget_set_sensitive (entry_username, !username_known);
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), entry_password,
TRUE, FALSE, 0);
#endif /* MODEST_PLATFORM_MAEMO */
+
+ if (initial_username != NULL)
+ gtk_widget_grab_focus (GTK_WIDGET (entry_password));
/* This is not in the Maemo UI spec:
remember_pass_check = gtk_check_button_new_with_label (_("Remember password"));
if (username) {
*username = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry_username)));
- modest_server_account_set_username (
+ modest_account_mgr_set_server_account_username (
modest_runtime_get_account_mgr(), server_account_name,
*username);
static void
-paste_msgs_cb (const GObject *object, gpointer user_data)
+destroy_information_note (ModestMailOperation *mail_op, gpointer user_data)
{
- g_return_if_fail (MODEST_IS_MAIN_WINDOW (object));
- g_return_if_fail (GTK_IS_WIDGET (user_data));
-
/* destroy information note */
gtk_widget_destroy (GTK_WIDGET(user_data));
}
gint response = 0;
/* Ask for user confirmation */
- response = msgs_move_to_confirmation (GTK_WINDOW (window),
- TNY_FOLDER (folder_store),
- delete,
- data);
+ response =
+ modest_ui_actions_msgs_move_to_confirmation (GTK_WINDOW (window),
+ TNY_FOLDER (folder_store),
+ delete,
+ data);
if (response == GTK_RESPONSE_OK) {
/* Launch notification */
data,
TNY_FOLDER (folder_store),
delete,
- paste_msgs_cb,
+ destroy_information_note,
inf_note);
} else {
g_object_unref (mail_op);
src_folder,
folder_store,
delete,
- paste_msgs_cb,
+ destroy_information_note,
inf_note);
}
* drag_and_drop_from_header_view (for d&d in modest_folder_view.c)
*/
gint
-msgs_move_to_confirmation (GtkWindow *win,
- TnyFolder *dest_folder,
- gboolean delete,
- TnyList *headers)
+modest_ui_actions_msgs_move_to_confirmation (GtkWindow *win,
+ TnyFolder *dest_folder,
+ gboolean delete,
+ TnyList *headers)
{
gint response = GTK_RESPONSE_OK;
static void
-move_to_cb (const GObject *object, gpointer user_data)
+move_to_cb (ModestMailOperation *mail_op, gpointer user_data)
{
- ModestMsgViewWindow *self = NULL;
- g_return_if_fail (GTK_IS_WIDGET (user_data));
- g_return_if_fail (MODEST_IS_WINDOW (object));
+ MoveToHelper *helper = (MoveToHelper *) user_data;
+
+ /* Note that the operation could have failed, in that case do
+ nothing */
+ if (modest_mail_operation_get_status (mail_op) ==
+ MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
- if (MODEST_IS_MSG_VIEW_WINDOW (object)) {
- self = MODEST_MSG_VIEW_WINDOW (object);
+ GObject *object = modest_mail_operation_get_source (mail_op);
+ if (MODEST_IS_MSG_VIEW_WINDOW (object)) {
+ ModestMsgViewWindow *self = MODEST_MSG_VIEW_WINDOW (object);
- 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));
+ 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));
+ } else if (MODEST_IS_MAIN_WINDOW (object) && helper->reference != NULL) {
+ GtkWidget *header_view;
+ GtkTreePath *path;
+ GtkTreeSelection *sel;
+
+ header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(object),
+ MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view));
+ path = gtk_tree_row_reference_get_path (helper->reference);
+ gtk_tree_selection_select_path (sel, path);
+ gtk_tree_path_free (path);
+ }
+ g_object_unref (object);
}
- gtk_widget_destroy (GTK_WIDGET(user_data));
+
+ /* Close the "Pasting" information banner */
+ gtk_widget_destroy (GTK_WIDGET(helper->banner));
+ if (helper->reference != NULL)
+ gtk_tree_row_reference_free (helper->reference);
+ g_free (helper);
}
void
modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op,
gpointer user_data)
{
- ModestMainWindow *main_window = NULL;
+ ModestWindow *main_window = NULL;
GtkWidget *folder_view = NULL;
GObject *win = modest_mail_operation_get_source (mail_op);
const GError *error = NULL;
}
/* Disable next automatic folder selection */
- if (MODEST_IS_MAIN_WINDOW (user_data)) {
- main_window = MODEST_MAIN_WINDOW(user_data);
- folder_view = modest_main_window_get_child_widget (main_window,
+ main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
+ folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (main_window),
MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
- modest_folder_view_disable_next_folder_selection (MODEST_FOLDER_VIEW(folder_view));
+ modest_folder_view_disable_next_folder_selection (MODEST_FOLDER_VIEW(folder_view));
+
+ if (user_data && TNY_IS_FOLDER (user_data)) {
+ modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view),
+ TNY_FOLDER (user_data), FALSE);
}
/* Show notification dialog */
tny_iterator_next (iter);
}
+ g_object_unref (iter);
+
if (pending_purges>0) {
gint response;
if (response == GTK_RESPONSE_OK) {
modest_platform_information_banner (NULL, NULL, _("mcen_ib_removing_attachment"));
- tny_iterator_first (iter);
+ iter = tny_list_create_iterator (parts);
while (!tny_iterator_is_done (iter)) {
TnyMimePart *part;
} else {
modest_platform_information_banner (NULL, NULL, _("mail_ib_attachment_already_purged"));
}
+ g_object_unref (iter);
- /* remove attachments */
- tny_iterator_first (iter);
- while (!tny_iterator_is_done (iter)) {
- TnyMimePart *part;
-
- part = TNY_MIME_PART (tny_iterator_get_current (iter));
- 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);
}
return;
}
- GtkWidget *inf_note;
- inf_note = modest_platform_animation_banner (GTK_WIDGET (win), NULL,
- _CS("ckct_nw_pasting"));
- if (inf_note != NULL) {
- gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE);
- gtk_widget_show (GTK_WIDGET(inf_note));
+ MoveToHelper *helper = g_new0 (MoveToHelper, 1);
+ helper->banner = modest_platform_animation_banner (GTK_WIDGET (win), NULL,
+ _CS("ckct_nw_pasting"));
+ if (helper->banner != NULL) {
+ gtk_window_set_modal (GTK_WINDOW(helper->banner), FALSE);
+ gtk_widget_show (GTK_WIDGET(helper->banner));
+ }
+
+ if (MODEST_IS_MAIN_WINDOW (win)) {
+ GtkWidget *header_view =
+ modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win),
+ MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+ helper->reference = get_next_after_selected_headers (MODEST_HEADER_VIEW (header_view));
}
ModestMailOperation *mail_op =
TNY_FOLDER (dst_folder),
TRUE,
move_to_cb,
- inf_note);
+ helper);
g_object_unref (G_OBJECT (mail_op));
g_object_unref (headers);
}
if (do_xfer) {
- GtkWidget *inf_note;
- inf_note = modest_platform_animation_banner (GTK_WIDGET (win), NULL,
- _CS("ckct_nw_pasting"));
- if (inf_note != NULL) {
- gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE);
- gtk_widget_show (GTK_WIDGET(inf_note));
+ MoveToHelper *helper = g_new0 (MoveToHelper, 1);
+ helper->banner = modest_platform_animation_banner (GTK_WIDGET (win), NULL,
+ _CS("ckct_nw_pasting"));
+ if (helper->banner != NULL) {
+ gtk_window_set_modal (GTK_WINDOW(helper->banner), FALSE);
+ gtk_widget_show (GTK_WIDGET(helper->banner));
}
/* Clean folder on header view before moving it */
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view));
modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
G_OBJECT(win),
modest_ui_actions_move_folder_error_handler,
- win);
+ src_folder);
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, move_to_cb, inf_note);
+ TRUE,
+ move_to_cb,
+ helper);
/* Unref mail operation */
g_object_unref (G_OBJECT (mail_op));
}
projects / modest / blobdiff