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.
*/
modest_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
+ GtkDialog *wizard, *dialog;
+
+ /* Show the easy-setup wizard: */
+ dialog = modest_window_mgr_get_modal_dialog (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_DIALOG(modest_easysetup_wizard_dialog_new ());
+ if (!wizard) {
+ g_printerr ("modest: failed to create easysetup wizard\n");
+ return FALSE;
+ }
+ modest_window_mgr_set_modal_dialog
+ (modest_runtime_get_window_mgr(), GTK_DIALOG(wizard));
+
+
+ /* there is no such wizard yet */
+ wizard = GTK_DIALOG(modest_easysetup_wizard_dialog_new ());
+ modest_window_mgr_set_modal_dialog (modest_runtime_get_window_mgr(),
+ GTK_DIALOG(wizard));
+
+ /* make it non-modal; if though we register it as a modal dialog above
+ * apparently, making it modal *at all* gives hangs -- FIXME: check this*/
+ gtk_window_set_modal (GTK_WINDOW(dialog), FALSE);
+
/* 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 */
gtk_widget_destroy (GTK_WIDGET (wizard));
/* clear it from the window mgr */
- modest_window_mgr_set_easysetup_dialog
+ modest_window_mgr_set_modal_dialog
(modest_runtime_get_window_mgr(), NULL);
return result;
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));
+ /* 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));
+ }
+ g_object_unref (object);
}
+
+ /* Close the "Pasting" information banner */
gtk_widget_destroy (GTK_WIDGET(user_data));
}
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);
}
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,
+ inf_note);
/* Unref mail operation */
g_object_unref (G_OBJECT (mail_op));
}
projects / modest / blobdiff