X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-hildon2-window-mgr.c;h=0e1d8d466fc49a5567f8280687964e74b1bab71d;hp=052d07149255af63f3f649288232eeb7beb23951;hb=aeb22882e19cf647762d2d59be8ae3a15e67c687;hpb=3a69262f88128f4dd3c78bbe62abc90f13491ded diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c index 052d071..0e1d8d4 100644 --- a/src/hildon2/modest-hildon2-window-mgr.c +++ b/src/hildon2/modest-hildon2-window-mgr.c @@ -48,6 +48,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,11 +85,11 @@ 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); static gboolean modest_hildon2_window_mgr_screen_is_on (ModestWindowMgr *self); +static void modest_hildon2_window_mgr_create_caches (ModestWindowMgr *self); static void osso_display_event_cb (osso_display_state_t state, gpointer data); static void on_account_removed (TnyAccountStore *acc_store, @@ -173,6 +174,7 @@ modest_hildon2_window_mgr_class_init (ModestHildon2WindowMgrClass *klass) mgr_class->show_initial_window = modest_hildon2_window_mgr_show_initial_window; mgr_class->get_current_top = modest_hildon2_window_mgr_get_current_top; mgr_class->screen_is_on = modest_hildon2_window_mgr_screen_is_on; + mgr_class->create_caches = modest_hildon2_window_mgr_create_caches; g_type_class_add_private (gobject_class, sizeof(ModestHildon2WindowMgrPrivate)); @@ -443,6 +445,15 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self, while (modal && GTK_IS_DIALOG (modal)) { GtkWidget *parent; + /* If it's a hildon note then don't try to close it as + this is the default behaviour of WM, delete event + is not issued for this kind of notes as we want the + user to always click on a button */ + if (HILDON_IS_NOTE (modal)) { + gtk_window_present (GTK_WINDOW (modal)); + return FALSE; + } + /* Get the parent */ parent = (GtkWidget *) gtk_window_get_transient_for (GTK_WINDOW (modal)); @@ -497,31 +508,39 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self, return FALSE; } g_free (uid); - } else { + } else if (header) { if (g_list_find_custom (priv->window_list, header, (GCompareFunc) compare_headers)) { g_debug ("%s found another view window showing the same header", __FUNCTION__); g_object_unref (header); return FALSE; } } - g_object_unref (header); + if (header) + g_object_unref (header); } /* 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) || 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; } @@ -573,7 +592,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; } @@ -645,24 +664,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)) { @@ -730,7 +739,7 @@ modest_hildon2_window_mgr_unregister_window (ModestWindowMgr *self, win = g_list_find (priv->window_list, window); if (!win) { - g_warning ("Trying to unregister a window that has not being registered yet"); + g_debug ("Trying to unregister a window that has not being registered yet"); return; } @@ -860,7 +869,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; @@ -893,7 +903,10 @@ modest_hildon2_window_mgr_get_modal (ModestWindowMgr *self) break; } - return (GtkWindow *) toplevel; + if (toplevel && GTK_WIDGET_VISIBLE (toplevel) && gtk_window_get_modal ((GtkWindow *) toplevel)) + return (GtkWindow *) toplevel; + else + return NULL; } @@ -910,11 +923,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); @@ -925,16 +942,16 @@ 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) { HildonWindowStack *stack; ModestWindow *current_top; - gboolean has_accounts; /* Ignore transport account removals */ if (TNY_IS_TRANSPORT_ACCOUNT (account)) @@ -942,45 +959,24 @@ on_account_removed (TnyAccountStore *acc_store, stack = hildon_window_stack_get_default (); current_top = (ModestWindow *) hildon_window_stack_peek (stack); - has_accounts = modest_account_mgr_has_accounts (modest_runtime_get_account_mgr (), TRUE); /* 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; - gboolean deleted = FALSE; - - 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); - deleted = TRUE; - } - g_object_unref (my_account); - } - } - - /* Close if viewing outbox and no account left */ - if (tny_folder_get_folder_type (folder) == TNY_FOLDER_TYPE_OUTBOX) { - if (!has_accounts) { - close_all_but_first (stack); - deleted = TRUE; - } - } - g_object_unref (folder); - - if (deleted) - current_top = (ModestWindow *) hildon_window_stack_peek (stack); - } + 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); } } @@ -1055,6 +1051,17 @@ modest_hildon2_window_mgr_screen_is_on (ModestWindowMgr *self) return (priv->display_state == OSSO_DISPLAY_ON) ? TRUE : FALSE; } +static void +modest_hildon2_window_mgr_create_caches (ModestWindowMgr *self) +{ + g_return_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self)); + + modest_accounts_window_pre_create (); + + MODEST_WINDOW_MGR_CLASS(parent_class)->create_caches (self); + +} + static void osso_display_event_cb (osso_display_state_t state, gpointer data)