X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-hildon2-window-mgr.c;h=6daeef149f7bfbf11cb107b7caafd80c75aa7034;hp=879a300ec9a40afd19a40390b8c886671ed5aa90;hb=91535a54196b522388685364db460d9970c82ea2;hpb=15653b82b80a0905f45315e241e525b1b6524a4a diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c index 879a300..6daeef1 100644 --- a/src/hildon2/modest-hildon2-window-mgr.c +++ b/src/hildon2/modest-hildon2-window-mgr.c @@ -35,6 +35,7 @@ #include "modest-mailboxes-window.h" #include "modest-header-window.h" #include "modest-main-window.h" +#include "modest-window-mgr-priv.h" #include "modest-conf.h" #include "modest-defs.h" #include "modest-signal-mgr.h" @@ -48,6 +49,7 @@ #include "modest-maemo-utils.h" #include "modest-utils.h" #include "modest-tny-msg.h" +#include "modest-tny-account.h" #include /* 'private'/'protected' functions */ @@ -84,7 +86,6 @@ static gboolean modest_hildon2_window_mgr_find_registered_message_uid (ModestWin ModestWindow **win); static GList *modest_hildon2_window_mgr_get_window_list (ModestWindowMgr *self); static gboolean modest_hildon2_window_mgr_close_all_windows (ModestWindowMgr *self); -static gboolean window_can_close (ModestWindow *window); static gboolean window_has_modals (ModestWindow *window); static ModestWindow *modest_hildon2_window_mgr_show_initial_window (ModestWindowMgr *self); static ModestWindow *modest_hildon2_window_mgr_get_current_top (ModestWindowMgr *self); @@ -433,35 +434,16 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self, HildonWindowStack *stack; gboolean nested_msg = FALSE; ModestWindow *current_top; - GtkWidget *modal; g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self), FALSE); g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE); priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self); - /* Check that there is no active modal dialog */ - modal = (GtkWidget *) modest_window_mgr_get_modal (self); - while (modal && GTK_IS_DIALOG (modal)) { - GtkWidget *parent; - - /* Get the parent */ - parent = (GtkWidget *) gtk_window_get_transient_for (GTK_WINDOW (modal)); - - /* Try to close it */ - gtk_dialog_response (GTK_DIALOG (modal), GTK_RESPONSE_DELETE_EVENT); - - /* Maybe the dialog was not closed, because a close - confirmation dialog for example. Then ignore the - register process */ - if (GTK_IS_WINDOW (modal)) { - gtk_window_present (GTK_WINDOW (modal)); - return FALSE; - } - - /* Get next modal */ - modal = parent; - } + /* Try to close active modal dialogs */ + if (modest_window_mgr_get_num_windows (self) && + !_modest_window_mgr_close_active_modals (self)) + return FALSE; stack = hildon_window_stack_get_default (); current_top = (ModestWindow *) hildon_window_stack_peek (stack); @@ -511,20 +493,30 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self, } /* Do not go backwards */ - if ((MODEST_IS_MSG_VIEW_WINDOW (current_top) || MODEST_IS_MSG_EDIT_WINDOW (current_top)) && - (MODEST_IS_FOLDER_WINDOW (window) || MODEST_IS_ACCOUNTS_WINDOW (window) || + if ((MODEST_IS_MSG_VIEW_WINDOW (current_top) || + MODEST_IS_MSG_EDIT_WINDOW (current_top) || + MODEST_IS_HEADER_WINDOW (current_top)) && + (MODEST_IS_FOLDER_WINDOW (window) || + MODEST_IS_ACCOUNTS_WINDOW (window) || MODEST_IS_MAILBOXES_WINDOW (window))) { - gtk_window_present (GTK_WINDOW (window)); + gtk_window_present (GTK_WINDOW (current_top)); return FALSE; } if (MODEST_IS_FOLDER_WINDOW (current_top) && MODEST_IS_FOLDER_WINDOW (window)) { - gtk_window_present (GTK_WINDOW (window)); - return FALSE; + gboolean retval; + + g_signal_emit_by_name (G_OBJECT (current_top), "delete-event", NULL, &retval); + + if (retval) { + gtk_window_present (GTK_WINDOW (current_top)); + return FALSE; + } + current_top = (ModestWindow *) hildon_window_stack_peek (stack); } if (MODEST_IS_MAILBOXES_WINDOW (current_top) && MODEST_IS_MAILBOXES_WINDOW (window)) { - gtk_window_present (GTK_WINDOW (window)); + gtk_window_present (GTK_WINDOW (current_top)); return FALSE; } @@ -576,7 +568,7 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self, /* Close the current view */ g_signal_emit_by_name (G_OBJECT (current_top), "delete-event", NULL, &retval); - if (retval == TRUE) { + if (retval) { /* Cancelled closing top window, then we fail to register */ goto fail; } @@ -648,24 +640,14 @@ window_has_modals (ModestWindow *window) } static gboolean -window_can_close (ModestWindow *window) -{ - /* An editor can be always closed no matter the dialogs it has - * on top. */ - if (MODEST_IS_MSG_EDIT_WINDOW (window)) - return TRUE; - - return !window_has_modals (window); -} - -static gboolean on_window_destroy (ModestWindow *window, GdkEvent *event, ModestHildon2WindowMgr *self) { gboolean no_propagate = FALSE; - if (!window_can_close (window)) + /* Do not close the window if it has modals on top */ + if (!MODEST_IS_MSG_EDIT_WINDOW (window) && window_has_modals (window)) return TRUE; if (MODEST_IS_MSG_EDIT_WINDOW (window)) { @@ -863,7 +845,8 @@ look_for_transient (gconstpointer a, child = (GtkWindow *) b; win = (GtkWindow *) a; - if (gtk_window_get_transient_for (win) == child) + if ((gtk_window_get_transient_for (win) == child) && + GTK_WIDGET_VISIBLE (win)) return 0; else return 1; @@ -916,11 +899,15 @@ modest_hildon2_window_mgr_set_modal (ModestWindowMgr *self, gtk_window_set_destroy_with_parent (window, TRUE); } -static void -close_all_but_first (HildonWindowStack *stack) +static gboolean +on_idle_close_all_but_first (gpointer data) { gint num_windows, i; gboolean retval; + HildonWindowStack *stack; + + stack = hildon_window_stack_get_default (); + g_return_val_if_fail (stack, FALSE); num_windows = hildon_window_stack_size (stack); @@ -931,10 +918,11 @@ close_all_but_first (HildonWindowStack *stack) current_top = hildon_window_stack_peek (stack); g_signal_emit_by_name (G_OBJECT (current_top), "delete-event", NULL, &retval); } + return FALSE; } static void -on_account_removed (TnyAccountStore *acc_store, +on_account_removed (TnyAccountStore *acc_store, TnyAccount *account, gpointer user_data) { @@ -951,32 +939,20 @@ on_account_removed (TnyAccountStore *acc_store, /* if we're showing the header view of the currently deleted account, or the outbox and we deleted the last account, then close the window */ - if (current_top && MODEST_IS_HEADER_WINDOW (current_top)) { - ModestHeaderView *header_view; - TnyFolder *folder; - - header_view = modest_header_window_get_header_view (MODEST_HEADER_WINDOW (current_top)); - folder = modest_header_view_get_folder (header_view); - if (folder) { - /* Close if it's my account */ - if (!TNY_IS_MERGE_FOLDER (folder)) { - TnyAccount *my_account; - - my_account = tny_folder_get_account (folder); - if (my_account) { - if (my_account == account) - close_all_but_first (stack); - - g_object_unref (my_account); - } - } - - /* Close if viewing outbox and no account left */ - if (tny_folder_get_folder_type (folder) == TNY_FOLDER_TYPE_OUTBOX) - close_all_but_first (stack); - - g_object_unref (folder); - } + if (current_top && + (MODEST_IS_HEADER_WINDOW (current_top) || + MODEST_IS_FOLDER_WINDOW (current_top))) { + const gchar *acc_name; + + acc_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); + + /* We emit it in an idle, because sometimes this + function could called when the account settings + dialog is about to close but still there. That + modal dialog would otherwise, prevent the + windows from being closed */ + if (!strcmp (acc_name, modest_window_get_active_account (current_top))) + g_idle_add (on_idle_close_all_but_first, NULL); } } @@ -1074,4 +1050,3 @@ osso_display_event_cb (osso_display_state_t state, if (priv->display_state == OSSO_DISPLAY_ON) modest_platform_remove_new_mail_notifications (TRUE); } -