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,
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));
if (MODEST_IS_MSG_VIEW_WINDOW (window)) {
gchar *uid;
TnyHeader *header;
+
+ uid = g_strdup (modest_msg_view_window_get_message_uid (MODEST_MSG_VIEW_WINDOW (window)));
+
header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (window));
- if (header) {
+ if (uid == NULL)
uid = modest_tny_folder_get_header_unique_id (header);
-
- /* Embedded messages do not have uid */
- if (uid) {
- if (g_list_find_custom (priv->window_list, uid, (GCompareFunc) compare_msguids)) {
- g_debug ("%s found another view window showing the same header", __FUNCTION__);
- g_free (uid);
- g_object_unref (header);
- return FALSE;
- }
+ /* Embedded messages do not have uid */
+ if (uid) {
+ if (g_list_find_custom (priv->window_list, uid, (GCompareFunc) compare_msguids)) {
+ g_debug ("%s found another view window showing the same header", __FUNCTION__);
g_free (uid);
- } else {
- 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);
+ return FALSE;
+ }
+ g_free (uid);
+ } else {
+ 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);
}
+ 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));
+ return FALSE;
}
if (MODEST_IS_FOLDER_WINDOW (current_top) && MODEST_IS_FOLDER_WINDOW (window)) {
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;
}
break;
}
- return (GtkWindow *) toplevel;
+ if (toplevel && GTK_WIDGET_VISIBLE (toplevel) && gtk_window_get_modal ((GtkWindow *) toplevel))
+ return (GtkWindow *) toplevel;
+ else
+ return NULL;
}
{
HildonWindowStack *stack;
ModestWindow *current_top;
- gboolean has_accounts;
/* Ignore transport account removals */
if (TNY_IS_TRANSPORT_ACCOUNT (account))
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,
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);
my_account = tny_folder_get_account (folder);
if (my_account) {
- if (my_account == 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 (tny_folder_get_folder_type (folder) == TNY_FOLDER_TYPE_OUTBOX)
+ close_all_but_first (stack);
- if (deleted)
- current_top = (ModestWindow *) hildon_window_stack_peek (stack);
+ g_object_unref (folder);
}
}
}
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)