X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-hildon2-window-mgr.c;h=4cef7e6afdc6d8d8444b10d6a40d8d7e67956ee9;hp=d42119940620d20dd5469ed72a67bdb49712b5a2;hb=b8143cd888f24df1dd8a77b2bb3206e8fd72314c;hpb=daaa7d9957451aac4efc5239cc623bc0180139f7

diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c
index d421199..4cef7e6 100644
--- a/src/hildon2/modest-hildon2-window-mgr.c
+++ b/src/hildon2/modest-hildon2-window-mgr.c
@@ -28,8 +28,12 @@
  */
 
 #include <string.h>
+#include <hildon/hildon.h>
+#include "modest-hildon2-window.h"
 #include "modest-hildon2-window-mgr.h"
 #include "modest-msg-edit-window.h"
+#include "modest-mailboxes-window.h"
+#include "modest-header-window.h"
 #include "modest-main-window.h"
 #include "modest-conf.h"
 #include "modest-defs.h"
@@ -39,7 +43,12 @@
 #include "modest-ui-actions.h"
 #include "modest-debug.h"
 #include "modest-tny-folder.h"
-#include <hildon/hildon.h>
+#include "modest-folder-window.h"
+#include "modest-accounts-window.h"
+#include "modest-maemo-utils.h"
+#include "modest-utils.h"
+#include "modest-tny-msg.h"
+#include <tny-merge-folder.h>
 
 /* 'private'/'protected' functions */
 static void modest_hildon2_window_mgr_class_init (ModestHildon2WindowMgrClass *klass);
@@ -70,27 +79,43 @@ static void modest_hildon2_window_mgr_set_modal (ModestWindowMgr *self,
 static gboolean modest_hildon2_window_mgr_find_registered_header (ModestWindowMgr *self, 
 								  TnyHeader *header,
 								  ModestWindow **win);
+static gboolean modest_hildon2_window_mgr_find_registered_message_uid (ModestWindowMgr *self, 
+								       const gchar *msg_uid,
+								       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 osso_display_event_cb (osso_display_state_t state, 
+				   gpointer data);
+static void on_account_removed (TnyAccountStore *acc_store, 
+				TnyAccount *account,
+				gpointer user_data);
 
 typedef struct _ModestHildon2WindowMgrPrivate ModestHildon2WindowMgrPrivate;
 struct _ModestHildon2WindowMgrPrivate {
 	GList        *window_list;
 	GMutex       *queue_lock;
 	GQueue       *modal_windows;
-	
+
 	gboolean     fullscreen_mode;
-	
+
 	GHashTable   *destroy_handlers;
 	GHashTable   *viewer_handlers;
 	GSList       *window_state_uids;
-	
+
 	guint        closing_time;
 
 	GSList       *modal_handler_uids;
 	ModestWindow *current_top;
+
+	gulong        accounts_handler;
+
+	/* Display state */
+	osso_display_state_t display_state;
 };
 #define MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
 										   MODEST_TYPE_HILDON2_WINDOW_MGR, \
@@ -142,8 +167,12 @@ modest_hildon2_window_mgr_class_init (ModestHildon2WindowMgrClass *klass)
 	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->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;
 
 	g_type_class_add_private (gobject_class, sizeof(ModestHildon2WindowMgrPrivate));
 
@@ -157,30 +186,45 @@ 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 ();
 	priv->queue_lock = g_mutex_new ();
-	
+
 	/* Could not initialize it from gconf, singletons are not
 	   ready yet */
-	priv->destroy_handlers = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free);	
+	priv->destroy_handlers = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free);
 	priv->viewer_handlers = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free);
 
 	priv->closing_time = 0;
 
 	priv->modal_handler_uids = NULL;
+	priv->display_state = OSSO_DISPLAY_ON;
+
+	/* Listen for changes in the screen, we don't want to show a
+	   led pattern when the display is on for example */
+	osso_hw_set_display_event_cb (modest_maemo_utils_get_osso_context (),
+				      osso_display_event_cb,
+				      obj); 
+
 }
 
 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;
 
+	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 */
@@ -214,11 +258,10 @@ modest_hildon2_window_mgr_finalize (GObject *obj)
 		g_mutex_unlock (priv->queue_lock);
 	}
 	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);
 }
 
@@ -231,17 +274,19 @@ modest_hildon2_window_mgr_new (void)
 static gboolean
 modest_hildon2_window_mgr_close_all_windows (ModestWindowMgr *self)
 {
+	ModestHildon2WindowMgrPrivate *priv = NULL;
 	gboolean ret_value = FALSE;
 	GtkWidget *window;
-	gboolean failed = FALSE;
 	HildonWindowStack *stack;
+	gboolean failed = FALSE;
 
 	g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self), FALSE);
+	priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self);
 
 	stack = hildon_window_stack_get_default ();
 
 	while ((window = hildon_window_stack_peek (stack)) != NULL) {
-		g_signal_emit_by_name (window, "delete-event", NULL, &ret_value);
+		g_signal_emit_by_name (G_OBJECT (window), "delete-event", NULL, &ret_value);
 		if (ret_value == TRUE) {
 			failed = TRUE;
 			break;
@@ -268,13 +313,34 @@ compare_msguids (ModestWindow *win,
 	} else {
 		msg_uid = modest_msg_view_window_get_message_uid (MODEST_MSG_VIEW_WINDOW (win));
 	}
-	
+
 	if (msg_uid && uid &&!strcmp (msg_uid, uid))
 		return 0;
 	else
 		return 1;
 }
 
+static gint
+compare_headers (ModestWindow *win,
+		 TnyHeader *header)
+{
+	TnyHeader *my_header;
+	gint result = 1;
+
+	if (!MODEST_IS_MSG_VIEW_WINDOW (win))
+		return 1;
+
+	/* Get message uid from msg window */
+	my_header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));
+	if (my_header) {
+		if (my_header == header)
+			result = 0;
+		g_object_unref (my_header);
+	}
+	return result;
+}
+
+
 static gboolean
 modest_hildon2_window_mgr_find_registered_header (ModestWindowMgr *self, TnyHeader *header,
 						  ModestWindow **win)
@@ -311,6 +377,38 @@ modest_hildon2_window_mgr_find_registered_header (ModestWindowMgr *self, TnyHead
 	return has_header || has_window;
 }
 
+static gboolean
+modest_hildon2_window_mgr_find_registered_message_uid (ModestWindowMgr *self, const gchar *msg_uid,
+						       ModestWindow **win)
+{
+	ModestHildon2WindowMgrPrivate *priv = NULL;
+	gboolean has_header, has_window = FALSE;
+	GList *item = NULL;
+
+	g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self), FALSE);
+	g_return_val_if_fail (msg_uid && msg_uid[0] != '\0', FALSE);
+	
+	priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self);
+
+	has_header = MODEST_WINDOW_MGR_CLASS (parent_class)->find_registered_message_uid (self, msg_uid, win);
+	
+	item = g_list_find_custom (priv->window_list, msg_uid, (GCompareFunc) compare_msguids);
+	if (item) {
+		has_window = TRUE;
+		if (win) {
+			if ((!MODEST_IS_MSG_VIEW_WINDOW(item->data)) && 
+			    (!MODEST_IS_MSG_EDIT_WINDOW (item->data)))
+				g_debug ("not a valid window!");
+			else {
+				g_debug ("found a window");
+				*win = MODEST_WINDOW (item->data);
+			}
+		}
+	}
+	
+	return has_header || has_window;
+}
+
 static GList *
 modest_hildon2_window_mgr_get_window_list (ModestWindowMgr *self)
 {
@@ -330,24 +428,83 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self,
 	GList *win;
 	ModestHildon2WindowMgrPrivate *priv;
 	gint *handler_id;
-	ModestWindow *main_window;
-	HildonProgram *program;
-	GtkWidget *current_top;
 	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);
 
 	priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self);
 
-	program = hildon_program_get_instance ();
+	stack = hildon_window_stack_get_default ();
+	current_top = (ModestWindow *) hildon_window_stack_peek (stack);
+
 	win = g_list_find (priv->window_list, window);
 	if (win) {
-		/* this is for the case we want to register the window and it was already
-		 * registered. We leave silently, telling the operation was succesful.
-		 */
-		gtk_window_present (GTK_WINDOW (win));
-		return TRUE;
+		/* this is for the case we want to register the window
+		   and it was already registered */
+		gtk_window_present (GTK_WINDOW (window));
+		return FALSE;
+	}
+
+	if (MODEST_IS_MSG_VIEW_WINDOW (window)) {
+		gchar *uid;
+		TnyHeader *header;
+		header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (window));
+
+		if (header) {
+			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;
+				}
+				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);
+		}
+	}
+
+	if (MODEST_IS_FOLDER_WINDOW (current_top) && MODEST_IS_FOLDER_WINDOW (window)) {
+		gtk_window_present (GTK_WINDOW (window));
+		return FALSE;
+	}
+
+	if (MODEST_IS_MAILBOXES_WINDOW (current_top) && MODEST_IS_MAILBOXES_WINDOW (window)) {
+		gtk_window_present (GTK_WINDOW (window));
+		return FALSE;
+	}
+
+	/* Mailboxes window can not replace folder windows */
+	if (MODEST_IS_FOLDER_WINDOW (current_top) && MODEST_IS_MAILBOXES_WINDOW (window)) {
+		gtk_window_present (GTK_WINDOW (current_top));
+		return FALSE;
+	}
+
+	/* Trying to open a folders window and a mailboxes window at
+	   the same time from the accounts window is not allowed */
+	if (MODEST_IS_MAILBOXES_WINDOW (current_top) &&
+	    MODEST_IS_FOLDER_WINDOW (window) &&
+	    MODEST_IS_ACCOUNTS_WINDOW (parent)) {
+		gtk_window_present (GTK_WINDOW (window));
+		return FALSE;
+	}
+
+	if (MODEST_IS_HEADER_WINDOW (current_top) && MODEST_IS_HEADER_WINDOW (window)) {
+		g_debug ("Trying to register a second header window is not allowed");
+		gtk_window_present (GTK_WINDOW (current_top));
+		return FALSE;
 	}
 
 	if (!MODEST_WINDOW_MGR_CLASS (parent_class)->register_window (self, window, parent))
@@ -357,45 +514,30 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self,
 	g_object_ref (window);
 	priv->window_list = g_list_prepend (priv->window_list, window);
 
-	stack = hildon_window_stack_get_default ();
-	current_top = hildon_window_stack_peek (stack);
-
-	/* TODO: rethink this method it will be different depending on
-	   the type of the window that we're registering */
-	if (!parent || ((GtkWidget *) parent != current_top)) {
-		guint num_windows = hildon_window_stack_size (stack);
-
-		/* We have to close all windows with the exception of the root window */
-		if (num_windows > 1)
-			hildon_window_stack_pop (stack, num_windows - 1, NULL);
-
-		/* We remove 1 because we added it before */
-		if (modest_window_mgr_num_windows (MODEST_WINDOW_MGR (self)) - 1> 1) {
-			/* Then we couldn't close one of the preceding windows, so we have to stop the 
-			 * window register process and fail.
-			 */
-			goto fail;
-		}
+	nested_msg = MODEST_IS_MSG_VIEW_WINDOW (window) &&
+		MODEST_IS_MSG_VIEW_WINDOW (parent);
 
-		if ((current_top != NULL) && !MODEST_IS_MAIN_WINDOW (current_top)) {
-			gboolean 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;
-			}
-			current_top = hildon_window_stack_peek (stack);
-		}
-		if ((current_top != NULL) && !MODEST_IS_MAIN_WINDOW (current_top)) {
-			/* Closing the stacked windows failed, then we shouldn't show the
-			   new window */
-			goto fail;
-		}
-		if ((current_top != NULL) && 
+	/* Close views if they're being shown. Nevertheless we must
+	   allow nested messages */
+	if (!nested_msg &&
+	    (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 ((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 (current_top), "delete-event", NULL, &retval);
+		if (retval == TRUE) {
+			/* Cancelled closing top window, then we fail to register */
+			goto fail;
+		}
 	}
 
 	/* Listen to object destruction */
@@ -403,17 +545,6 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self,
 	*handler_id = g_signal_connect (window, "delete-event", G_CALLBACK (on_window_destroy), self);
 	g_hash_table_insert (priv->destroy_handlers, window, handler_id);
 
-	main_window = modest_window_mgr_get_main_window (self, FALSE);
-	/* If there is a msg view window, let the main window listen the msg-changed signal */
-	if (MODEST_IS_MSG_VIEW_WINDOW(window) && main_window) {
-		gulong *handler;
-		handler = g_malloc0 (sizeof (gulong));
-		*handler = g_signal_connect (window, "msg-changed",
-					     G_CALLBACK (modest_main_window_on_msg_view_window_msg_changed),
-					     main_window);
-		g_hash_table_insert (priv->viewer_handlers, window, handler);
-	}
-
 	/* Show toolbar always */
 	modest_window_show_toolbar (window, TRUE);
 
@@ -422,8 +553,7 @@ fail:
 	/* Add to list. Keep a reference to the window */
 	priv->window_list = g_list_remove (priv->window_list, window);
 	g_object_unref (window);
-
-	current_top = hildon_window_stack_peek (stack);
+	current_top = (ModestWindow *) hildon_window_stack_peek (stack);
 	if (current_top)
 		gtk_window_present (GTK_WINDOW (current_top));
 	return FALSE;
@@ -435,7 +565,7 @@ cancel_window_operations (ModestWindow *window)
 	GSList* pending_ops = NULL;
 
 	/* cancel open and receive operations */
-	pending_ops = modest_mail_operation_queue_get_by_source (modest_runtime_get_mail_operation_queue (),
+	pending_ops = modest_mail_operation_queue_get_by_source (modest_runtime_get_mail_operation_queue (), 
 								 G_OBJECT (window));
 	while (pending_ops != NULL) {
 		ModestMailOperationTypeOperation type;
@@ -463,7 +593,8 @@ window_has_modals (ModestWindow *window)
 	toplevels = gtk_window_list_toplevels ();
 	for (node = toplevels; node != NULL; node = g_list_next (node)) {
 		if (GTK_IS_WINDOW (node->data) &&
-		    gtk_window_get_transient_for (GTK_WINDOW (node->data)) == GTK_WINDOW (window)) {
+		    gtk_window_get_transient_for (GTK_WINDOW (node->data)) == GTK_WINDOW (window) &&
+		    GTK_WIDGET_VISIBLE (node->data)) {
 			retvalue = TRUE;
 			break;
 		}
@@ -490,73 +621,66 @@ on_window_destroy (ModestWindow *window,
 {
 	gboolean no_propagate = FALSE;
 
-	if (!window_can_close (window)) {
+	if (!window_can_close (window))
 		return TRUE;
-	}
-	/* Specific stuff first */
-	if (MODEST_IS_MAIN_WINDOW (window)) {
-		ModestHildon2WindowMgrPrivate *priv;
-		ModestMainWindowContentsStyle style;
-		priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self);
-
-		/* If we're on header view, then just go to folder view and don't close */
-		style = modest_main_window_get_contents_style (MODEST_MAIN_WINDOW (window));
-		if (style == MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS) {
-			modest_main_window_set_contents_style (MODEST_MAIN_WINDOW (window),
-							       MODEST_MAIN_WINDOW_CONTENTS_STYLE_FOLDERS);
-			return TRUE;
-		}
-
-		/* Do not unregister it, just hide */
-		gtk_widget_hide_all (GTK_WIDGET (window));
-
-		/* Cancel pending operations */
-		cancel_window_operations (window);
 
-		/* Fake the window system, make it think that there is no window */
-		if (modest_window_mgr_num_windows (MODEST_WINDOW_MGR (self)) == 0)
-			g_signal_emit_by_name (self, "window-list-empty");
-
-		no_propagate = TRUE;
-	}
-	else {
-		if (MODEST_IS_MSG_EDIT_WINDOW (window)) {
-			gboolean sent = FALSE;
-			sent = modest_msg_edit_window_get_sent (MODEST_MSG_EDIT_WINDOW (window));
-			/* Save currently edited message to Drafts if it was not sent */
-			if (!sent && modest_msg_edit_window_is_modified (MODEST_MSG_EDIT_WINDOW (window))) {
-
-			  if (!modest_ui_actions_on_save_to_drafts (NULL, MODEST_MSG_EDIT_WINDOW (window)))
-				  return TRUE;
+	if (MODEST_IS_MSG_EDIT_WINDOW (window)) {
+		gboolean sent = FALSE;
+		sent = modest_msg_edit_window_get_sent (MODEST_MSG_EDIT_WINDOW (window));
+		/* Save currently edited message to Drafts if it was not sent */
+		if (!sent && modest_msg_edit_window_is_modified (MODEST_MSG_EDIT_WINDOW (window))) {
+			ModestMsgEditWindow *edit_window;
+			MsgData *data;
+
+			edit_window = MODEST_MSG_EDIT_WINDOW (window);
+			data = modest_msg_edit_window_get_msg_data (edit_window);
+
+			if (data) {
+				gint parts_count;
+				guint64 parts_size, available_size, expected_size;
+
+				available_size = modest_utils_get_available_space (NULL);
+				modest_msg_edit_window_get_parts_size (edit_window, &parts_count, &parts_size);
+				expected_size = modest_tny_msg_estimate_size (data->plain_body,
+									      data->html_body,
+									      parts_count,
+									      parts_size);
+				modest_msg_edit_window_free_msg_data (edit_window, data);
+				data = NULL;
+
+				/* If there is not enough space
+				   available for saving the message
+				   then show an error and close the
+				   window without saving */
+				if (expected_size >= available_size) {
+					modest_platform_run_information_dialog (GTK_WINDOW (edit_window),
+										_("mail_in_ui_save_error"),
+										FALSE);
+				} else {
+					if (!modest_ui_actions_on_save_to_drafts (NULL, MODEST_MSG_EDIT_WINDOW (window)))
+						return TRUE;
+				}
+			} else {
+				g_warning ("Edit window without message data. This is probably a bug");
 			}
 		}
-		/* Unregister window */
-		modest_window_mgr_unregister_window (MODEST_WINDOW_MGR (self), window);
-		no_propagate = FALSE;
 	}
 
+	/* Unregister window */
+	modest_window_mgr_unregister_window (MODEST_WINDOW_MGR (self), window);
+	no_propagate = FALSE;
+
 	return no_propagate;
 }
 
 static void
-disconnect_msg_changed (gpointer key, 
-			gpointer value, 
-			gpointer user_data)
-{
-	guint handler_id;
-	handler_id = GPOINTER_TO_UINT(value);
-	
-	if (key && G_IS_OBJECT(key))
-		g_signal_handler_disconnect (G_OBJECT (key), handler_id);
-}
-
-static void 
 modest_hildon2_window_mgr_unregister_window (ModestWindowMgr *self, 
 					     ModestWindow *window)
 {
 	GList *win;
 	ModestHildon2WindowMgrPrivate *priv;
 	gulong *tmp, handler_id;
+	guint num_windows;
 
 	g_return_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self));
 	g_return_if_fail (MODEST_IS_WINDOW (window));
@@ -569,20 +693,6 @@ modest_hildon2_window_mgr_unregister_window (ModestWindowMgr *self,
 		return;
 	}
 
-	/* If it's the main window unset it */
-	if (MODEST_IS_MAIN_WINDOW (window)) {
-		modest_window_mgr_set_main_window (self, NULL);
-
-		/* Disconnect all emissions of msg-changed */
-		if (priv->viewer_handlers) {
-			g_hash_table_foreach (priv->viewer_handlers, 
-					      disconnect_msg_changed, 
-					      NULL);
-			g_hash_table_destroy (priv->viewer_handlers);
-			priv->viewer_handlers = NULL;
-		}
-	}
-
 	/* Remove the viewer window handler from the hash table. The
 	   HashTable could not exist if the main window was closed
 	   when there were other windows remaining */
@@ -607,44 +717,33 @@ 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) {
-#ifndef MODEST_TOOLKIT_GTK
 		priv->window_state_uids = 
 			modest_signal_mgr_disconnect (priv->window_state_uids, 
 						      G_OBJECT (window), 
 						      "notify::is-topmost");
-#else
-		priv->window_state_uids = 
-			modest_signal_mgr_disconnect (priv->window_state_uids, 
-						      G_OBJECT (window), 
-						      "window-state-event");
-#endif
 	}
-	
+
 	/* Disconnect the "delete-event" handler, we won't need it anymore */
 	g_signal_handler_disconnect (window, handler_id);
 
 	/* Destroy the window */
 	g_object_unref (win->data);
 	g_list_free (win);
-	
+
 	MODEST_WINDOW_MGR_CLASS (parent_class)->unregister_window (self, window);
 
+	/* We have to get the number of windows here in order not to
+	   emit the signal too many times */
+	num_windows = modest_window_mgr_get_num_windows (self);
+
 	/* If there are no more windows registered emit the signal */
-	if (modest_window_mgr_num_windows (self) == 0)
+	if (num_windows == 0)
 		g_signal_emit_by_name (self, "window-list-empty");
 }
 
 
-
 static void
 modest_hildon2_window_mgr_set_fullscreen_mode (ModestWindowMgr *self,
 					       gboolean on)
@@ -676,10 +775,12 @@ 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) {
@@ -744,3 +845,151 @@ modest_hildon2_window_mgr_set_modal (ModestWindowMgr *self,
 	gtk_window_set_destroy_with_parent (window, TRUE);
 }
 
+static void
+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))
+		return;
+
+	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) {
+			gboolean retval;
+
+			/* 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) {
+						g_signal_emit_by_name (G_OBJECT (current_top),
+								       "delete-event",
+								       NULL, &retval);
+						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) {
+					g_signal_emit_by_name (G_OBJECT (current_top),
+							       "delete-event",
+							       NULL, &retval);
+					deleted = TRUE;
+				}
+			}
+			g_object_unref (folder);
+
+			if (deleted) {
+				current_top = (ModestWindow *) hildon_window_stack_peek (stack);
+			}
+		}
+	}
+}
+
+static ModestWindow *
+modest_hildon2_window_mgr_show_initial_window (ModestWindowMgr *self)
+{
+	ModestWindow *initial_window = NULL;
+	ModestHildon2WindowMgrPrivate *priv;
+
+	priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self);
+
+	/* Connect to the account store "account-removed" signal". We
+	   do this here because in the init the singletons are still
+	   not initialized properly */
+	if (!g_signal_handler_is_connected (modest_runtime_get_account_store (),
+					    priv->accounts_handler)) {
+		priv->accounts_handler = g_signal_connect (modest_runtime_get_account_store (),
+							   "account-removed",
+							   G_CALLBACK (on_account_removed),
+							   self);
+	}
+
+	/* Return accounts window */
+	initial_window = MODEST_WINDOW (modest_accounts_window_new ());
+	modest_window_mgr_register_window (self, initial_window, NULL);
+
+	return initial_window;
+}
+
+
+static ModestWindow *
+modest_hildon2_window_mgr_get_current_top (ModestWindowMgr *self)
+{
+	HildonWindowStack *stack;
+	stack = hildon_window_stack_get_default ();
+	return (ModestWindow *) hildon_window_stack_peek (stack);
+}
+
+static gint 
+find_folder_window (gconstpointer a,
+		    gconstpointer b)
+{
+	return (MODEST_IS_FOLDER_WINDOW (a)) ? 0 : 1;
+}
+
+ModestWindow *
+modest_hildon2_window_mgr_get_folder_window (ModestHildon2WindowMgr *self)
+{
+	ModestHildon2WindowMgrPrivate *priv;
+	GList *window;
+
+	g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self), NULL);
+
+	priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self);
+
+	window = g_list_find_custom (priv->window_list,
+				     NULL,
+				     find_folder_window);
+
+	return (window != NULL) ? MODEST_WINDOW (window->data) : NULL;
+}
+
+static gboolean
+modest_hildon2_window_mgr_screen_is_on (ModestWindowMgr *self)
+{
+	ModestHildon2WindowMgrPrivate *priv = NULL;
+
+	g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self), FALSE);
+
+	priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self);
+	
+	return (priv->display_state == OSSO_DISPLAY_ON) ? TRUE : FALSE;
+}
+
+static void 
+osso_display_event_cb (osso_display_state_t state, 
+		       gpointer data)
+{
+	ModestHildon2WindowMgrPrivate *priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (data);
+
+	priv->display_state = state;
+
+	/* Stop blinking if the screen becomes on */
+	if (priv->display_state == OSSO_DISPLAY_ON)
+		modest_platform_remove_new_mail_notifications (TRUE);
+}
+