X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-hildon2-window-mgr.c;h=3dd75045945949ae4980bdfca8845567be3e81cc;hb=0fbbf474b218d00f517fae83561a05f6919679e7;hp=738c2c5f010df7dc884475efe67746cb435134a2;hpb=fa16f68f7ff9ab1547b663a001c6ef3ff2d24527;p=modest diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c index 738c2c5..3dd7504 100644 --- a/src/hildon2/modest-hildon2-window-mgr.c +++ b/src/hildon2/modest-hildon2-window-mgr.c @@ -100,6 +100,8 @@ struct _ModestHildon2WindowMgrPrivate { GSList *modal_handler_uids; ModestWindow *current_top; + gulong accounts_handler; + /* Display state */ osso_display_state_t display_state; }; @@ -171,7 +173,6 @@ modest_hildon2_window_mgr_instance_init (ModestHildon2WindowMgr *obj) priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE(obj); priv->window_list = NULL; priv->fullscreen_mode = FALSE; - priv->current_top = NULL; priv->window_state_uids = NULL; priv->modal_windows = g_queue_new (); @@ -199,6 +200,7 @@ static void modest_hildon2_window_mgr_finalize (GObject *obj) { ModestHildon2WindowMgrPrivate *priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE(obj); + ModestTnyAccountStore *acc_store; modest_signal_mgr_disconnect_all_and_destroy (priv->window_state_uids); priv->window_state_uids = NULL; @@ -206,6 +208,11 @@ modest_hildon2_window_mgr_finalize (GObject *obj) osso_hw_set_display_event_cb (modest_maemo_utils_get_osso_context (), NULL, NULL); + + acc_store = modest_runtime_get_account_store (); + if (acc_store && g_signal_handler_is_connected (acc_store, priv->accounts_handler)) + g_signal_handler_disconnect (acc_store, priv->accounts_handler); + if (priv->window_list) { GList *iter = priv->window_list; /* unregister pending windows */ @@ -359,6 +366,7 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self, HildonProgram *program; HildonWindowStack *stack; gboolean nested_msg = FALSE; + ModestWindow *current_top; g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self), FALSE); g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE); @@ -384,28 +392,27 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self, g_object_ref (window); priv->window_list = g_list_prepend (priv->window_list, window); - if (priv->current_top == NULL) - priv->current_top = (ModestWindow *) hildon_window_stack_peek (stack); + current_top = (ModestWindow *) hildon_window_stack_peek (stack); nested_msg = MODEST_IS_MSG_VIEW_WINDOW (window) && MODEST_IS_MSG_VIEW_WINDOW (parent); /* Close views if they're being shown. Nevertheless we must allow nested messages */ if (!nested_msg && - (MODEST_IS_MSG_EDIT_WINDOW (priv->current_top) || - MODEST_IS_MSG_VIEW_WINDOW (priv->current_top))) { + (MODEST_IS_MSG_EDIT_WINDOW (current_top) || + MODEST_IS_MSG_VIEW_WINDOW (current_top))) { gboolean retval; /* If the current view has modal dialogs then we fail to register the new view */ - if ((priv->current_top != NULL) && - window_has_modals (MODEST_WINDOW (priv->current_top))) { + if ((current_top != NULL) && + window_has_modals (MODEST_WINDOW (current_top))) { /* Window on top but it has opened dialogs */ goto fail; } /* Close the current view */ - g_signal_emit_by_name (G_OBJECT (priv->current_top), "delete-event", NULL, &retval); + g_signal_emit_by_name (G_OBJECT (current_top), "delete-event", NULL, &retval); if (retval == TRUE) { /* Cancelled closing top window, then we fail to register */ goto fail; @@ -425,9 +432,9 @@ fail: /* Add to list. Keep a reference to the window */ priv->window_list = g_list_remove (priv->window_list, window); g_object_unref (window); - priv->current_top = (ModestWindow *) hildon_window_stack_peek (stack); - if (priv->current_top) - gtk_window_present (GTK_WINDOW (priv->current_top)); + current_top = (ModestWindow *) hildon_window_stack_peek (stack); + if (current_top) + gtk_window_present (GTK_WINDOW (current_top)); return FALSE; } @@ -558,13 +565,6 @@ modest_hildon2_window_mgr_unregister_window (ModestWindowMgr *self, /* cancel open and receive operations */ cancel_window_operations (window); - /* Check if it's the topmost window, and remove the window from the stack. - * This is needed for the cases there's no other topmost window that will - * replace it in topmost handler. - */ - if (window == priv->current_top) - priv->current_top = NULL; - /* Disconnect the "window-state-event" handler, we won't need it anymore */ if (priv->window_state_uids) { priv->window_state_uids = @@ -693,15 +693,80 @@ modest_hildon2_window_mgr_set_modal (ModestWindowMgr *self, gtk_window_set_destroy_with_parent (window, TRUE); } +static void +create_folders_view (ModestWindowMgr *self) +{ + ModestWindow *folders_window; + ModestAccountMgr *mgr; + const gchar *acc_name; + + folders_window = MODEST_WINDOW (modest_folder_window_new (NULL)); + mgr = modest_runtime_get_account_mgr (); + acc_name = modest_account_mgr_get_default_account (mgr); + if (!acc_name) + acc_name = MODEST_LOCAL_FOLDERS_ACCOUNT_NAME; + modest_folder_window_set_account (MODEST_FOLDER_WINDOW (folders_window), + acc_name); + modest_window_mgr_register_window (self, folders_window, NULL); + gtk_widget_show (GTK_WIDGET (folders_window)); +} + +static void +on_account_removed (TnyAccountStore *acc_store, + TnyAccount *account, + gpointer user_data) +{ + HildonWindowStack *stack; + ModestWindow *current_top; + + /* Ignore transport account removals */ + if (TNY_IS_TRANSPORT_ACCOUNT (account)) + return; + + stack = hildon_window_stack_get_default (); + current_top = (ModestWindow *) hildon_window_stack_peek (stack); + + if (current_top && + MODEST_IS_ACCOUNTS_WINDOW (current_top) && + !modest_account_mgr_has_accounts (modest_runtime_get_account_mgr (), TRUE)) + create_folders_view (MODEST_WINDOW_MGR (user_data)); +} + static ModestWindow * modest_hildon2_window_mgr_show_initial_window (ModestWindowMgr *self) { ModestWindow *initial_window = NULL; + ModestTnyAccountStore *acc_store; + ModestHildon2WindowMgrPrivate *priv; /* Return accounts window */ initial_window = MODEST_WINDOW (modest_accounts_window_new ()); modest_window_mgr_register_window (self, initial_window, NULL); + /* Check if we have at least one remote account to create also + the folders window */ + acc_store = modest_runtime_get_account_store (); + if (modest_tny_account_store_get_num_remote_accounts (acc_store) < 1) { + /* Show first the accounts window to add it to the + stack. This has to be changed when the new + stackable API is available. There will be a method + to show all the windows that will only show the + last one to the user. The current code shows both + windows, one after the other */ + gtk_widget_show (GTK_WIDGET (initial_window)); + + create_folders_view (MODEST_WINDOW_MGR (self)); + } + + /* Connect to the account store "account-removed" signal". If + we're showing the accounts window and all the accounts are + deleted we need to move to folders window automatically */ + priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self); + priv->accounts_handler = g_signal_connect (acc_store, + "account-removed", + G_CALLBACK (on_account_removed), + self); + return initial_window; } @@ -709,10 +774,9 @@ modest_hildon2_window_mgr_show_initial_window (ModestWindowMgr *self) static ModestWindow * modest_hildon2_window_mgr_get_current_top (ModestWindowMgr *self) { - ModestHildon2WindowMgrPrivate *priv; - - priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self); - return priv->current_top; + HildonWindowStack *stack; + stack = hildon_window_stack_get_default (); + return (ModestWindow *) hildon_window_stack_peek (stack); } static gint