#include "modest-msg-edit-window.h"
#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"
#include "modest-maemo-utils.h"
#include "modest-utils.h"
#include "modest-tny-msg.h"
+#include "modest-tny-account.h"
#include <tny-merge-folder.h>
/* 'private'/'protected' functions */
GType window_type,
gboolean show_toolbars,
gboolean fullscreen);
-static ModestWindow* modest_hildon2_window_mgr_get_main_window (ModestWindowMgr *self, gboolean show);
static GtkWindow *modest_hildon2_window_mgr_get_modal (ModestWindowMgr *self);
static void modest_hildon2_window_mgr_set_modal (ModestWindowMgr *self,
GtkWindow *window,
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 modest_hildon2_window_mgr_close_all_but_initial (ModestWindowMgr *self);
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 void on_account_removed (TnyAccountStore *acc_store,
TnyAccount *account,
gpointer user_data);
+static ModestWindow *modest_hildon2_window_mgr_get_folder_window (ModestWindowMgr *self);
typedef struct _ModestHildon2WindowMgrPrivate ModestHildon2WindowMgrPrivate;
struct _ModestHildon2WindowMgrPrivate {
mgr_class->set_fullscreen_mode = modest_hildon2_window_mgr_set_fullscreen_mode;
mgr_class->get_fullscreen_mode = modest_hildon2_window_mgr_get_fullscreen_mode;
mgr_class->show_toolbars = modest_hildon2_window_mgr_show_toolbars;
- mgr_class->get_main_window = modest_hildon2_window_mgr_get_main_window;
mgr_class->get_modal = modest_hildon2_window_mgr_get_modal;
mgr_class->set_modal = modest_hildon2_window_mgr_set_modal;
mgr_class->find_registered_header = modest_hildon2_window_mgr_find_registered_header;
mgr_class->find_registered_message_uid = modest_hildon2_window_mgr_find_registered_message_uid;
mgr_class->get_window_list = modest_hildon2_window_mgr_get_window_list;
mgr_class->close_all_windows = modest_hildon2_window_mgr_close_all_windows;
+ mgr_class->close_all_but_initial = modest_hildon2_window_mgr_close_all_but_initial;
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;
+ mgr_class->get_folder_window = modest_hildon2_window_mgr_get_folder_window;
g_type_class_add_private (gobject_class, sizeof(ModestHildon2WindowMgrPrivate));
}
g_mutex_free (priv->queue_lock);
- /* Do not unref priv->main_window because it does not hold a
- new reference */
-
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
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);
}
/* 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;
}
/* 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;
}
}
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)) {
return;
}
-static ModestWindow*
-modest_hildon2_window_mgr_get_main_window (ModestWindowMgr *self, gboolean show)
-{
- ModestHildon2WindowMgrPrivate *priv;
- ModestWindow *result;
-
- g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self), NULL);
- priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self);
-
- /* TODO: make this return NULL always */
-
- result = MODEST_WINDOW_MGR_CLASS (parent_class)->get_main_window (self, FALSE);
- /* create the main window, if it hasn't been created yet */
- if (!result && show) {
- /* modest_window_mgr_register_window will set priv->main_window */
- result = modest_main_window_new ();
- /* We have to remove all other windows */
- if (!modest_window_mgr_close_all_windows (self)) {
- gtk_widget_destroy (GTK_WIDGET (result));
- return NULL;
- }
- if (!modest_window_mgr_register_window (self, result, NULL)) {
- gtk_widget_destroy (GTK_WIDGET (result));
- return NULL;
- }
- MODEST_DEBUG_BLOCK(
- g_debug ("%s: created main window: %p\n", __FUNCTION__, result);
- );
- }
- if (show) {
- gtk_widget_show_all (GTK_WIDGET (result));
- gtk_window_present (GTK_WINDOW (result));
- }
-
- return result;
-}
-
static gint
look_for_transient (gconstpointer a,
gconstpointer b)
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;
}
static void
-close_all_but_first (HildonWindowStack *stack)
+close_all_but_first (gpointer data)
{
gint num_windows, i;
gboolean retval;
+ HildonWindowStack *stack;
+
+ stack = hildon_window_stack_get_default ();
+ g_return_if_fail (stack);
num_windows = hildon_window_stack_size (stack);
}
}
+static gboolean
+on_idle_close_all_but_first (gpointer data)
+{
+ gdk_threads_enter ();
+ close_all_but_first (data);
+ gdk_threads_leave ();
+
+ return FALSE;
+}
+
static void
-on_account_removed (TnyAccountStore *acc_store,
+on_account_removed (TnyAccountStore *acc_store,
TnyAccount *account,
gpointer user_data)
{
/* 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);
}
}
return (MODEST_IS_FOLDER_WINDOW (a)) ? 0 : 1;
}
-ModestWindow *
-modest_hildon2_window_mgr_get_folder_window (ModestHildon2WindowMgr *self)
+static ModestWindow *
+modest_hildon2_window_mgr_get_folder_window (ModestWindowMgr *self)
{
ModestHildon2WindowMgrPrivate *priv;
GList *window;
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,
+static void
+osso_display_event_cb (osso_display_state_t state,
gpointer data)
{
ModestHildon2WindowMgrPrivate *priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (data);
modest_platform_remove_new_mail_notifications (TRUE);
}
+static gboolean
+modest_hildon2_window_mgr_close_all_but_initial (ModestWindowMgr *self)
+{
+ ModestWindow *top;
+
+ /* Exit if there are no windows */
+ if (!modest_window_mgr_get_num_windows (self)) {
+ g_warning ("%s: unable to close, there are no windows", __FUNCTION__);
+ return FALSE;
+ }
+
+ /* Close active modals */
+ if (!_modest_window_mgr_close_active_modals (self)) {
+ g_debug ("%s: unable to close some dialogs", __FUNCTION__);
+ return FALSE;
+ }
+
+ /* Close all but first */
+ top = modest_window_mgr_get_current_top (self);
+ if (!MODEST_IS_ACCOUNTS_WINDOW (top))
+ close_all_but_first (NULL);
+
+ /* If some cannot be closed return */
+ top = modest_window_mgr_get_current_top (self);
+ if (!MODEST_IS_ACCOUNTS_WINDOW (top)) {
+ g_debug ("%s: could not close some windows", __FUNCTION__);
+ return FALSE;
+ }
+
+ return TRUE;
+}
projects / modest / blobdiff