X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-window-mgr.c;h=6da29ad48c2cbd9373080bc69aa9899a2e7a9b3c;hp=33ec152a97ba56099b69eadeb5e8a8cdb7f3a4e1;hb=f027aeec354ec9c5ea3432ccd6ae544cce43f696;hpb=94a4612a68cf9129d80418e40d177911297b76e7

diff --git a/src/widgets/modest-window-mgr.c b/src/widgets/modest-window-mgr.c
index 33ec152..6da29ad 100644
--- a/src/widgets/modest-window-mgr.c
+++ b/src/widgets/modest-window-mgr.c
@@ -36,6 +36,7 @@
 #include "widgets/modest-main-window.h"
 #include "widgets/modest-msg-edit-window.h"
 #include "widgets/modest-msg-view-window.h"
+#include "modest-debug.h"
 
 
 /* 'private'/'protected' functions */
@@ -43,48 +44,52 @@ static void modest_window_mgr_class_init (ModestWindowMgrClass *klass);
 static void modest_window_mgr_init       (ModestWindowMgr *obj);
 static void modest_window_mgr_finalize   (GObject *obj);
 
-static gboolean on_window_destroy        (ModestWindow *window,
-					  GdkEvent *event,
-					  ModestWindowMgr *self);
-
-static gboolean on_modal_window_close    (GtkWidget *widget,
-					  GdkEvent *event,
-					  gpointer user_data);
-
-static void     on_modal_dialog_close    (GtkDialog *dialog,
-					  gint arg1,
-					  gpointer user_data);
-
-static const gchar* get_show_toolbar_key (GType window_type,
-					  gboolean fullscreen);
+static gboolean modest_window_mgr_register_window_default (ModestWindowMgr *self, 
+							   ModestWindow *window,
+							   ModestWindow *parent);
+static void modest_window_mgr_unregister_window_default (ModestWindowMgr *self, 
+							 ModestWindow *window);
+static void modest_window_mgr_set_fullscreen_mode_default (ModestWindowMgr *self,
+							   gboolean on);
+static gboolean modest_window_mgr_get_fullscreen_mode_default (ModestWindowMgr *self);
+static void modest_window_mgr_show_toolbars_default (ModestWindowMgr *self,
+						     GType window_type,
+						     gboolean show_toolbars,
+						     gboolean fullscreen);
+static ModestWindow* modest_window_mgr_get_main_window_default (ModestWindowMgr *self, gboolean show);
+static GtkWindow *modest_window_mgr_get_modal_default (ModestWindowMgr *self);
+static void modest_window_mgr_set_modal_default (ModestWindowMgr *self, 
+						 GtkWindow *window,
+						 GtkWindow *parent);
+static gboolean modest_window_mgr_close_all_windows_default (ModestWindowMgr *self);
+static gboolean modest_window_mgr_find_registered_header_default (ModestWindowMgr *self, 
+								  TnyHeader *header,
+								  ModestWindow **win);
+static GList *modest_window_mgr_get_window_list_default (ModestWindowMgr *self);
 
 /* list my signals  */
 enum {
-	/* MY_SIGNAL_1, */
-	/* MY_SIGNAL_2, */
-	LAST_SIGNAL
+	WINDOW_LIST_EMPTY_SIGNAL,
+	NUM_SIGNALS
 };
 
 typedef struct _ModestWindowMgrPrivate ModestWindowMgrPrivate;
 struct _ModestWindowMgrPrivate {
-	GList        *window_list;
+	guint         banner_counter;
 
 	ModestWindow *main_window;
 
-	GMutex       *queue_lock;
-	GQueue       *modal_windows;
-	
-	gboolean     fullscreen_mode;
-	
 	GSList       *windows_that_prevent_hibernation;
 	GSList       *preregistered_uids;
-	GHashTable   *destroy_handlers;
-	GHashTable   *viewer_handlers;
 	
 	guint        closing_time;
 
-	GSList       *modal_handler_uids;
+	GtkWidget    *cached_view;
+	GtkWidget    *cached_editor;
+	guint        idle_load_view_id;
+	guint        idle_load_editor_id;
 };
+
 #define MODEST_WINDOW_MGR_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                MODEST_TYPE_WINDOW_MGR, \
                                                ModestWindowMgrPrivate))
@@ -92,7 +97,7 @@ struct _ModestWindowMgrPrivate {
 static GObjectClass *parent_class = NULL;
 
 /* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
+static guint signals[NUM_SIGNALS] = {0};
 
 GType
 modest_window_mgr_get_type (void)
@@ -122,12 +127,79 @@ static void
 modest_window_mgr_class_init (ModestWindowMgrClass *klass)
 {
 	GObjectClass *gobject_class;
+	ModestWindowMgrClass *mgr_class;
+
 	gobject_class = (GObjectClass*) klass;
+	mgr_class = (ModestWindowMgrClass *) klass;
 
 	parent_class            = g_type_class_peek_parent (klass);
 	gobject_class->finalize = modest_window_mgr_finalize;
+	mgr_class->register_window = modest_window_mgr_register_window_default;
+	mgr_class->unregister_window = modest_window_mgr_unregister_window_default;
+	mgr_class->set_fullscreen_mode = modest_window_mgr_set_fullscreen_mode_default;
+	mgr_class->get_fullscreen_mode = modest_window_mgr_get_fullscreen_mode_default;
+	mgr_class->show_toolbars = modest_window_mgr_show_toolbars_default;
+	mgr_class->get_main_window = modest_window_mgr_get_main_window_default;
+	mgr_class->get_modal = modest_window_mgr_get_modal_default;
+	mgr_class->set_modal = modest_window_mgr_set_modal_default;
+	mgr_class->close_all_windows = modest_window_mgr_close_all_windows_default;
+	mgr_class->find_registered_header = modest_window_mgr_find_registered_header_default;
+	mgr_class->get_window_list = modest_window_mgr_get_window_list_default;
 
 	g_type_class_add_private (gobject_class, sizeof(ModestWindowMgrPrivate));
+
+
+	/**
+	 * ModestWindowMgr::window-list-empty
+	 * @self: the #ModestWindowMgr that emits the signal
+	 * @user_data: user data set when the signal handler was connected
+	 *
+	 * Issued whenever the window list becomes empty
+	 */
+	signals[WINDOW_LIST_EMPTY_SIGNAL] =
+		g_signal_new ("window-list-empty",
+			      G_TYPE_FROM_CLASS (gobject_class),
+			      G_SIGNAL_RUN_FIRST,
+			      G_STRUCT_OFFSET (ModestWindowMgrClass, window_list_empty),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__VOID,
+			      G_TYPE_NONE, 0);
+}
+
+static gboolean
+idle_load_view (ModestWindowMgr *mgr)
+{
+	ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE (mgr);
+	
+	priv->cached_view = g_object_new (MODEST_TYPE_MSG_VIEW_WINDOW, NULL);
+	priv->idle_load_view_id = 0;
+	return FALSE;
+}
+
+static gboolean
+idle_load_editor (ModestWindowMgr *mgr)
+{
+	ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE (mgr);
+	
+	priv->cached_editor = g_object_new (MODEST_TYPE_MSG_EDIT_WINDOW, NULL);
+	priv->idle_load_editor_id = 0;
+	return FALSE;
+}
+
+static void
+load_new_view (ModestWindowMgr *self)
+{
+	ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+	if ((priv->cached_view == NULL) && (priv->idle_load_view_id == 0))
+		priv->idle_load_view_id = g_idle_add ((GSourceFunc) idle_load_view, self);
+}
+
+static void
+load_new_editor (ModestWindowMgr *self)
+{
+	ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+	if ((priv->cached_editor == NULL) && (priv->idle_load_editor_id == 0))
+		priv->idle_load_editor_id = g_idle_add ((GSourceFunc) idle_load_editor, self);
 }
 
 static void
@@ -136,23 +208,17 @@ modest_window_mgr_init (ModestWindowMgr *obj)
 	ModestWindowMgrPrivate *priv;
 
 	priv = MODEST_WINDOW_MGR_GET_PRIVATE(obj);
-	priv->window_list = NULL;
+	priv->banner_counter = 0;
 	priv->main_window = NULL;
-	priv->fullscreen_mode = FALSE;
 
-	priv->modal_windows = g_queue_new ();
-	priv->queue_lock = g_mutex_new ();
-	
 	priv->preregistered_uids = NULL;
 
-	/* 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->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->cached_view = NULL;
+	priv->cached_editor = NULL;
+
+	priv->windows_that_prevent_hibernation = NULL;
 }
 
 static void
@@ -160,47 +226,33 @@ modest_window_mgr_finalize (GObject *obj)
 {
 	ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE(obj);
 
-	if (priv->window_list) {
-		GList *iter = priv->window_list;
-		/* unregister pending windows */
-		while (iter) {
-			modest_window_mgr_unregister_window (MODEST_WINDOW_MGR (obj), 
-							     MODEST_WINDOW (iter->data));
-			iter = g_list_next (iter);
-		}
-		g_list_free (priv->window_list);
-		priv->window_list = NULL;
+	if (priv->idle_load_view_id > 0) {
+		g_source_remove (priv->idle_load_view_id);
+		priv->idle_load_view_id = 0;
 	}
-
-	g_slist_foreach (priv->preregistered_uids, (GFunc)g_free, NULL);
-	g_slist_free (priv->preregistered_uids);
-
 	
-	/* Free the hash table with the handlers */
-	if (priv->destroy_handlers) {
-		g_hash_table_destroy (priv->destroy_handlers);
-		priv->destroy_handlers = NULL;
+	if (priv->idle_load_editor_id > 0) {
+		g_source_remove (priv->idle_load_editor_id);
+		priv->idle_load_editor_id = 0;
 	}
-
-	if (priv->viewer_handlers) {
-		g_hash_table_destroy (priv->viewer_handlers);
-		priv->viewer_handlers = NULL;
+	
+	if (priv->cached_view) {
+		gtk_widget_destroy (priv->cached_view);
+		priv->cached_view = NULL;
+	}
+	if (priv->cached_editor) {
+		gtk_widget_destroy (priv->cached_editor);
+		priv->cached_editor = NULL;
 	}
 
-	modest_signal_mgr_disconnect_all_and_destroy (priv->modal_handler_uids);
-
-	if (priv->modal_windows) {
-		g_mutex_lock (priv->queue_lock);
-		g_queue_free (priv->modal_windows);
-		priv->modal_windows = NULL;
-		g_mutex_unlock (priv->queue_lock);
+	if (priv->windows_that_prevent_hibernation) {
+		g_slist_free (priv->windows_that_prevent_hibernation);
+		priv->cached_editor = NULL;
 	}
-	g_mutex_free (priv->queue_lock);
-	
-	/* Do not unref priv->main_window because it does not hold a
-	   new reference */
 
-	
+	g_slist_foreach (priv->preregistered_uids, (GFunc)g_free, NULL);
+	g_slist_free (priv->preregistered_uids);
+
 	G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -238,7 +290,7 @@ remove_uid (GSList *list, const gchar *uid)
 	GSList *cursor = list, *start = list;
 	
 	if (!uid)
-		return FALSE;
+		return list;
 	
 	while (cursor) {
 		GSList *next = g_slist_next (cursor);
@@ -261,7 +313,7 @@ append_uid (GSList *list, const gchar *uid)
 
 
 void 
-modest_window_mgr_register_header (ModestWindowMgr *self,  TnyHeader *header)
+modest_window_mgr_register_header (ModestWindowMgr *self,  TnyHeader *header, const gchar *alt_uid)
 {
 	ModestWindowMgrPrivate *priv;
 	gchar* uid;
@@ -272,13 +324,15 @@ modest_window_mgr_register_header (ModestWindowMgr *self,  TnyHeader *header)
 	priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
 	uid = modest_tny_folder_get_header_unique_id (header);
 
-
+	if (uid == NULL)
+		uid = g_strdup (alt_uid);
+	
 	if (!has_uid (priv->preregistered_uids, uid)) {
-		g_debug ("registering new uid %s", uid);
+		MODEST_DEBUG_BLOCK(g_debug ("registering new uid %s", uid););
 		priv->preregistered_uids = append_uid (priv->preregistered_uids, uid);
 	} else
-		g_debug ("already had uid %s", uid);
-
+		MODEST_DEBUG_BLOCK(g_debug ("already had uid %s", uid););
+	
 	g_free (uid);
 }
 
@@ -293,78 +347,78 @@ modest_window_mgr_unregister_header (ModestWindowMgr *self,  TnyHeader *header)
 		
 	priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
 	uid = modest_tny_folder_get_header_unique_id (header);
-	
+
 	if (!has_uid (priv->preregistered_uids, uid)) {
-		g_debug ("trying to unregister non-existing uid %s", uid);
+		MODEST_DEBUG_BLOCK(g_debug ("trying to unregister non-existing uid %s", uid););
 		priv->preregistered_uids = append_uid (priv->preregistered_uids, uid);
 	} else
-		g_debug ("unregistering uid %s", uid);
-
+		MODEST_DEBUG_BLOCK(g_debug ("unregistering uid %s", uid););
+	
 	if (has_uid (priv->preregistered_uids, uid)) {
 		priv->preregistered_uids = remove_uid (priv->preregistered_uids, uid);
 		if (has_uid (priv->preregistered_uids, uid))
 			g_debug ("BUG: uid %s NOT removed", uid);
 		else
-			g_debug ("uid %s removed", uid);
+			MODEST_DEBUG_BLOCK(g_debug ("uid %s removed", uid););
 	}
-
+		
 	g_free (uid);
 }
 
-static gint
-compare_msguids (ModestWindow *win,
-		 const gchar *uid)
-{
-	const gchar *msg_uid;
 
-	if ((!MODEST_IS_MSG_EDIT_WINDOW (win)) && (!MODEST_IS_MSG_VIEW_WINDOW (win)))
-		return 1;
+#define MODEST_WINDOW_HELP_ID_PARAM "help-id"
 
-	/* Get message uid from msg window */
-	if (MODEST_IS_MSG_EDIT_WINDOW (win)) {
-		msg_uid = modest_msg_edit_window_get_message_uid (MODEST_MSG_EDIT_WINDOW (win));
-		if (msg_uid && uid &&!strcmp (msg_uid, uid))
-			return 0;
-	} else {
-		msg_uid = modest_msg_view_window_get_message_uid (MODEST_MSG_VIEW_WINDOW (win));
-	}
+void
+modest_window_mgr_register_help_id (ModestWindowMgr *self, GtkWindow *win, const gchar* help_id)
+{
+	/* we don't need 'self', but for API consistency... */
+	g_return_if_fail (self && MODEST_IS_WINDOW_MGR(self));
+
+	g_return_if_fail (win && GTK_IS_WINDOW(win));
+	g_return_if_fail (help_id);
 	
-	if (msg_uid && uid &&!strcmp (msg_uid, uid))
-		return 0;
-	else
-		return 1;
+	g_object_set_data_full (G_OBJECT(win), MODEST_WINDOW_HELP_ID_PARAM,
+				g_strdup(help_id), g_free);
 }
 
 
-void
-modest_window_mgr_close_all_windows (ModestWindowMgr *self)
+const gchar*
+modest_window_mgr_get_help_id (ModestWindowMgr *self, GtkWindow *win)
 {
-	ModestWindowMgrPrivate *priv = NULL;
-	GList *wins = NULL;
-	gboolean ret_value = FALSE;
+	/* we don't need 'self', but for API consistency... */
+	g_return_val_if_fail (self && MODEST_IS_WINDOW_MGR (self), NULL);
+	g_return_val_if_fail (win, NULL);
 
-	g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
-	priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
-	
-	/* delete-event handler already removes window_list item, */
-	/* so no next its required on this loop  */
-	wins = priv->window_list;
-	while (wins) {		
-		g_signal_emit_by_name (G_OBJECT (wins->data), "delete-event", NULL, &ret_value);
+	return g_object_get_data (G_OBJECT(win), MODEST_WINDOW_HELP_ID_PARAM);
+}
 
-		wins = priv->window_list;
-	}
+gboolean
+modest_window_mgr_close_all_windows (ModestWindowMgr *self)
+{
+	return MODEST_WINDOW_MGR_GET_CLASS (self)->close_all_windows (self);
+}
+
+static gboolean
+modest_window_mgr_close_all_windows_default (ModestWindowMgr *self)
+{
+	return TRUE;
 }
 
 
 gboolean
 modest_window_mgr_find_registered_header (ModestWindowMgr *self, TnyHeader *header,
-					  ModestWindow **win)
+						  ModestWindow **win)
+{
+	return MODEST_WINDOW_MGR_GET_CLASS (self)->find_registered_header (self, header, win);
+}
+
+static gboolean
+modest_window_mgr_find_registered_header_default (ModestWindowMgr *self, TnyHeader *header,
+						  ModestWindow **win)
 {
 	ModestWindowMgrPrivate *priv = NULL;
 	gchar* uid = NULL;
-	gboolean has_header, has_window = FALSE;
-	GList *item = NULL;
+	gboolean has_header = FALSE;
 
 	g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), FALSE);
 	g_return_val_if_fail (TNY_IS_HEADER(header), FALSE);
@@ -375,80 +429,54 @@ modest_window_mgr_find_registered_header (ModestWindowMgr *self, TnyHeader *head
 	
 	if (win)
 		*win = NULL;
-	
+
 	has_header = has_uid (priv->preregistered_uids, uid);
-		
-	item = g_list_find_custom (priv->window_list, 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);
-			}
-		}
-	}
 
-	g_free (uid);
-	return has_header || has_window;
+	return has_header;
 }
 
-static const gchar *
-get_show_toolbar_key (GType window_type,
-		      gboolean fullscreen)
+GList *
+modest_window_mgr_get_window_list (ModestWindowMgr *self)
 {
-	const gchar *key = NULL;
-
-	if (window_type == MODEST_TYPE_MAIN_WINDOW)
-		key = (fullscreen) ? 
-			MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR_FULLSCREEN :
-			MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR;
-	else if (window_type == MODEST_TYPE_MSG_VIEW_WINDOW)
-		key = (fullscreen) ? 
-			MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR_FULLSCREEN :
-			MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR;
-	else if (window_type ==  MODEST_TYPE_MSG_EDIT_WINDOW)
-		key = (fullscreen) ? 
-			MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR_FULLSCREEN :
-			MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR;
-	else
-		g_return_val_if_reached (NULL);
-
-	return key;
+	return MODEST_WINDOW_MGR_GET_CLASS (self)->get_window_list (self);
 }
 
-void 
+static GList *
+modest_window_mgr_get_window_list_default (ModestWindowMgr *self)
+{
+	return NULL;
+}
+
+gboolean
 modest_window_mgr_register_window (ModestWindowMgr *self, 
-				   ModestWindow *window)
+				   ModestWindow *window,
+				   ModestWindow *parent)
+{
+	return MODEST_WINDOW_MGR_GET_CLASS (self)->register_window (self, window, parent);
+}
+
+static gboolean
+modest_window_mgr_register_window_default (ModestWindowMgr *self, 
+					   ModestWindow *window,
+					   ModestWindow *parent)
 {
-	GList *win;
 	ModestWindowMgrPrivate *priv;
-	gint *handler_id;
-	const gchar *key;
 
-	g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
-	g_return_if_fail (GTK_IS_WINDOW (window));
+	g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), FALSE);
+	g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
 
 	priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
 
-	win = g_list_find (priv->window_list, window);
-	if (win) {
-		g_warning ("%s: trying to re-register a window",
-			   __FUNCTION__);
-		return;
-	}
-	
 	/* Check that it's not a second main window */
 	if (MODEST_IS_MAIN_WINDOW (window)) {
 		if (priv->main_window) {
 			g_warning ("%s: trying to register a second main window",
 				   __FUNCTION__);
-			return;
+			return FALSE;
 		} else {
 			priv->main_window = window;
+			load_new_view (self);
+			load_new_editor (self);
 		}
 	}
 
@@ -456,247 +484,57 @@ modest_window_mgr_register_window (ModestWindowMgr *self,
 	if (MODEST_IS_MSG_VIEW_WINDOW(window)) {
 		const gchar *uid = modest_msg_view_window_get_message_uid
 			(MODEST_MSG_VIEW_WINDOW (window));
-		
+
 		if (!has_uid (priv->preregistered_uids, uid)) 
 			g_debug ("weird: no uid for window (%s)", uid);
 		
-		g_debug ("registering window for %s", uid ? uid : "<none>");
-
+		MODEST_DEBUG_BLOCK(g_debug ("registering window for %s", uid ? uid : "<none>"););
+		
 		priv->preregistered_uids = 
 			remove_uid (priv->preregistered_uids,
 				    modest_msg_view_window_get_message_uid
 				    (MODEST_MSG_VIEW_WINDOW (window)));
-
 	} else if (MODEST_IS_MSG_EDIT_WINDOW(window)) {
 		const gchar *uid = modest_msg_edit_window_get_message_uid
 			(MODEST_MSG_EDIT_WINDOW (window));
 		
-		g_debug ("registering window for %s", uid);
+		MODEST_DEBUG_BLOCK(g_debug ("registering window for %s", uid););
 
 		priv->preregistered_uids = 
 			remove_uid (priv->preregistered_uids,
 				    modest_msg_edit_window_get_message_uid
 				    (MODEST_MSG_EDIT_WINDOW (window)));
 	}
-	
-	/* Add to list. Keep a reference to the window */
-	g_object_ref (window);
-	priv->window_list = g_list_prepend (priv->window_list, window);
-
-	/* Listen to object destruction */
-	handler_id = g_malloc0 (sizeof (gint));
-	*handler_id = g_signal_connect (window, "delete-event", G_CALLBACK (on_window_destroy), self);
-	g_hash_table_insert (priv->destroy_handlers, window, handler_id);
-
-	/* If there is a msg view window, let the main window listen the msg-changed signal */
-	if (MODEST_IS_MSG_VIEW_WINDOW(window) && priv->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), 
-					     priv->main_window);
-		g_hash_table_insert (priv->viewer_handlers, window, handler);
-	}
-
-	/* Put into fullscreen if needed */
-	if (priv->fullscreen_mode)
-		gtk_window_fullscreen (GTK_WINDOW (window));
-
-	/* Show/hide toolbar & fullscreen */	
-	key = get_show_toolbar_key (G_TYPE_FROM_INSTANCE (window), priv->fullscreen_mode);
-	modest_window_show_toolbar (window, modest_conf_get_bool (modest_runtime_get_conf (), key, NULL));
-}
-
-static gboolean
-on_window_destroy (ModestWindow *window, 
-		   GdkEvent *event,
-		   ModestWindowMgr *self)
-{
-	/* Specific stuff first */
-	if (MODEST_IS_MAIN_WINDOW (window)) {
-		ModestWindowMgrPrivate *priv;
-		priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
-
-		/* If more than one window already opened */
-		if (g_list_length (priv->window_list) > 1) {
-
-			/* If the user wants to close all the windows */
-			if (modest_main_window_close_all (MODEST_MAIN_WINDOW (window))) {
-				GList *iter = priv->window_list;
-				do {
-					if (iter->data != window) {
-						GList *tmp = iter->next;
-						on_window_destroy (MODEST_WINDOW (iter->data),
-								   event,
-								   self);
-						iter = tmp;
-					} else {
-						iter = g_list_next (iter);
-					}
-				} while (iter);
-			}
-		}
-	}
-	else {
-		if (MODEST_IS_MSG_EDIT_WINDOW (window)) {
-			gboolean sent = FALSE;
-			gint response = GTK_RESPONSE_ACCEPT;
-			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))) {
-
-				/* Raise the window if it's minimized */
-				if (!gtk_window_has_toplevel_focus (GTK_WINDOW (window)))
-					gtk_window_present (GTK_WINDOW (window));
-				
-				response =
-					modest_platform_run_confirmation_dialog (GTK_WINDOW (window),
-										 _("mcen_nc_no_email_message_modified_save_changes"));
-				/* Save to drafts */
-				if (response != GTK_RESPONSE_CANCEL) 				
-					modest_ui_actions_on_save_to_drafts (NULL, MODEST_MSG_EDIT_WINDOW (window));				
-			}
-		}
-	}
-
-	/* Unregister window */
-	modest_window_mgr_unregister_window (self, window);
-	
-	return FALSE;
-}
-
-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);
-}
-
-
-
-/* interval before retrying to close the application */
-#define CLOSING_RETRY_INTERVAL 3000 
-/* interval before cancel whatever is left in the queue, and closing anyway */
-#define MAX_WAIT_FOR_CLOSING 30 * 1000 
-
-static gboolean
-on_quit_maybe (ModestWindowMgr *self)
-{
-	ModestWindowMgrPrivate *priv;
-	guint queue_num;
-	
-	priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
-
-	/* it seems, in the meantime some windows were
-	 * created. in that case, stop  'on_quit_maybe' */
-	if (priv->window_list) {
-		priv->closing_time = 0;
-		return FALSE;
-	}
 
-	if (priv->closing_time >= MAX_WAIT_FOR_CLOSING) {
-		/* we waited long enough: cancel all remaining operations */
-		g_debug ("%s: we waited long enough (%ds), cancelling queue and quiting",
-			 __FUNCTION__, priv->closing_time/1000);
-		/* FIXME: below gives me a lot of:
-		 * GLIB CRITICAL ** default - modest_mail_operation_cancel:
-		 *                     assertion `priv->account' failed
-		 * which means there is no account for the given operation
-		 * so, we're not trying to be nice, we're just quiting.
-		 */
-		//modest_mail_operation_queue_cancel_all
-		//	(modest_runtime_get_mail_operation_queue());
-	} else {
-	
-		/* if there is anything left in our operation queue,
-		 * wait another round
-		 */
-		queue_num = modest_mail_operation_queue_num_elements
-			(modest_runtime_get_mail_operation_queue()); 
-		if  (queue_num > 0) {
-			g_debug ("%s: waiting, there are still %d operation(s) queued",
-				 __FUNCTION__, queue_num);
-			priv->closing_time += CLOSING_RETRY_INTERVAL;
-			return TRUE;
-		}
-	}
-	
-	/* so: no windows left, nothing in the queue: quit */
-	priv->closing_time = 0;
-	gtk_main_quit ();
-	return FALSE;
+	return TRUE;
 }
 
-
 void 
 modest_window_mgr_unregister_window (ModestWindowMgr *self, 
 				     ModestWindow *window)
 {
-	GList *win;
+	MODEST_WINDOW_MGR_GET_CLASS (self)->unregister_window (self, window);
+}
+
+static void 
+modest_window_mgr_unregister_window_default (ModestWindowMgr *self, 
+					     ModestWindow *window)
+{
 	ModestWindowMgrPrivate *priv;
-	gulong *tmp, handler_id;
 
 	g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
 	g_return_if_fail (MODEST_IS_WINDOW (window));
 
 	priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
 
-	win = g_list_find (priv->window_list, window);
-	if (!win) {
-		g_warning ("Trying to unregister a window that has not being registered yet");
-		return;
-	}
-
-	/* If it's the main window unset it */
-	if (priv->main_window == window) {
-		priv->main_window = 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 closeed
-	   when there were other windows remaining */
-	if (MODEST_IS_MSG_VIEW_WINDOW (window) && priv->viewer_handlers) {
-		tmp = (gulong *) g_hash_table_lookup (priv->viewer_handlers, window);
-		g_signal_handler_disconnect (window, *tmp);
-		g_hash_table_remove (priv->viewer_handlers, window);
-	}
-
 	/* Save state */
 	modest_window_save_state (window);
 
-	/* Remove from list & hash table */
-	priv->window_list = g_list_remove_link (priv->window_list, win);
-	tmp = g_hash_table_lookup (priv->destroy_handlers, window);
-	handler_id = *tmp;
-	g_hash_table_remove (priv->destroy_handlers, window);
-
-	/* Disconnect the "delete-event" handler, we won't need it anymore */
-	g_signal_handler_disconnect (window, handler_id);
-
 	/* Disconnect all the window signals */
 	modest_window_disconnect_signals (window);
 	
 	/* Destroy the window */
-	gtk_widget_destroy (win->data);
-	
-	/* If there are no more windows registered then exit program */
-	if (priv->window_list == NULL)
-		g_timeout_add (CLOSING_RETRY_INTERVAL,
-			       (GSourceFunc)on_quit_maybe, self);
+	gtk_widget_destroy (GTK_WIDGET (window));
 }
 
 
@@ -705,56 +543,26 @@ void
 modest_window_mgr_set_fullscreen_mode (ModestWindowMgr *self,
 				       gboolean on)
 {
-	ModestWindowMgrPrivate *priv;
-	GList *win = NULL;
-	ModestConf *conf;
-
-	g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
-
-	priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
-
-	/* If there is no change do nothing */
-	if (priv->fullscreen_mode == on)
-		return;
-
-	priv->fullscreen_mode = on;
-
-	conf = modest_runtime_get_conf ();
-
-	/* Update windows */
-	win = priv->window_list;
-	while (win) {
-		gboolean show;
-		const gchar *key = NULL;
-
-		/* Getting this from gconf everytime is not that
-		   expensive, we'll do it just a few times */
-		key = get_show_toolbar_key (G_TYPE_FROM_INSTANCE (win->data), on);
-		show = modest_conf_get_bool (conf, key, NULL);
-
-		/* Set fullscreen/unfullscreen */
-		if (on)
-			gtk_window_fullscreen (GTK_WINDOW (win->data));
-		else
-			gtk_window_unfullscreen (GTK_WINDOW (win->data));
-
-		/* Show/Hide toolbar */
-		modest_window_show_toolbar (MODEST_WINDOW (win->data), show);
+	MODEST_WINDOW_MGR_GET_CLASS (self)->set_fullscreen_mode (self, on);
+}
 
-		win = g_list_next (win);
-	}
+static void
+modest_window_mgr_set_fullscreen_mode_default (ModestWindowMgr *self,
+					       gboolean on)
+{
+	return;
 }
 
 gboolean
 modest_window_mgr_get_fullscreen_mode (ModestWindowMgr *self)
 {
-	ModestWindowMgrPrivate *priv;
-
-	g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), FALSE);
-
-	priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+	return MODEST_WINDOW_MGR_GET_CLASS (self)->get_fullscreen_mode (self);
+}
 
-	return priv->fullscreen_mode;
+static gboolean
+modest_window_mgr_get_fullscreen_mode_default (ModestWindowMgr *self)
+{
+	return FALSE;
 }
 
 void 
@@ -763,116 +571,91 @@ modest_window_mgr_show_toolbars (ModestWindowMgr *self,
 				 gboolean show_toolbars,
 				 gboolean fullscreen)
 {
-	ModestWindowMgrPrivate *priv;
-	ModestConf *conf;
-	const gchar *key = NULL;
+	return MODEST_WINDOW_MGR_GET_CLASS (self)->show_toolbars (self, window_type, show_toolbars, fullscreen);
+}
 
+static void 
+modest_window_mgr_show_toolbars_default (ModestWindowMgr *self,
+					 GType window_type,
+					 gboolean show_toolbars,
+					 gboolean fullscreen)
+{
+	return;
+}
+
+void
+modest_window_mgr_set_main_window (ModestWindowMgr *self, ModestWindow *win)
+{
+	ModestWindowMgrPrivate *priv;
+	
 	g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
 
 	priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
-	conf = modest_runtime_get_conf ();
-
-	/* If nothing changes then return */
-	key = get_show_toolbar_key (window_type, fullscreen);
-	conf = modest_runtime_get_conf ();
-	if (modest_conf_get_bool (conf, key, NULL) == show_toolbars)
-		return;
-
-	/* Save in conf */
-	modest_conf_set_bool (conf, key, show_toolbars, NULL);
-
-	/* Apply now if the view mode is the right one */
-	if ((fullscreen && priv->fullscreen_mode) ||
-	    (!fullscreen && !priv->fullscreen_mode)) {
-
-		GList *win = priv->window_list;
-
-		while (win) {
-			if (G_TYPE_FROM_INSTANCE (win->data) == window_type)
-				modest_window_show_toolbar (MODEST_WINDOW (win->data),
-							    show_toolbars);
-			win = g_list_next (win);
-		}
-	}
+	priv->main_window = win;
 }
 
 ModestWindow*  
-modest_window_mgr_get_main_window (ModestWindowMgr *self)
+modest_window_mgr_get_main_window (ModestWindowMgr *self, gboolean show)
+{
+	return MODEST_WINDOW_MGR_GET_CLASS (self)->get_main_window (self, show);
+}
+
+static ModestWindow*  
+modest_window_mgr_get_main_window_default (ModestWindowMgr *self, gboolean show)
 {
 	ModestWindowMgrPrivate *priv;
 	
 	g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), NULL);
+
 	priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
-	
-	/* create the main window, if it hasn't been created yet */
-	if (!priv->main_window) {
-		/* modest_window_mgr_register_window will set priv->main_window */
-		modest_window_mgr_register_window (self, modest_main_window_new ());
-		g_debug ("%s: created main window: %p\n", __FUNCTION__, priv->main_window);
-	}
-	
-	return priv->main_window;
+	if (priv->main_window)
+		return priv->main_window;
+
+	if (show) 
+		return modest_main_window_new ();
+	else return NULL;
 }
 
 
-GtkWindow *
-modest_window_mgr_get_modal (ModestWindowMgr *self)
+gboolean
+modest_window_mgr_main_window_exists  (ModestWindowMgr *self)
 {
 	ModestWindowMgrPrivate *priv;
 	
-	g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), NULL);
+	g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), FALSE);
 	priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
 
-	return g_queue_peek_head (priv->modal_windows);
+	return priv->main_window != NULL;
 }
 
 
-void
-modest_window_mgr_set_modal (ModestWindowMgr *self, 
-			     GtkWindow *window)
+GtkWindow *
+modest_window_mgr_get_modal (ModestWindowMgr *self)
 {
-	GtkWindow *old_modal;
-	ModestWindowMgrPrivate *priv;
+	return MODEST_WINDOW_MGR_GET_CLASS (self)->get_modal (self);
+}
 
-	g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
-	g_return_if_fail (GTK_IS_WINDOW (window));
+static GtkWindow *
+modest_window_mgr_get_modal_default (ModestWindowMgr *self)
+{
+	return NULL;
+}
 
-	priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
-	g_mutex_lock (priv->queue_lock);
-	old_modal = g_queue_peek_head (priv->modal_windows);
-	g_mutex_unlock (priv->queue_lock);
 
-	if (!old_modal) {	
-		gtk_window_set_modal (window, TRUE);
-	} else {
-		/* un-modalize the old one; the one on top should be the
-		 * modal one */
-		gtk_window_set_transient_for (window, GTK_WINDOW(old_modal));	
-		gtk_window_set_modal (window, TRUE);
-	}
+void
+modest_window_mgr_set_modal (ModestWindowMgr *self, 
+			     GtkWindow *window,
+			     GtkWindow *parent)
+{
+	MODEST_WINDOW_MGR_GET_CLASS (self)->set_modal (self, window, parent);
+}
 
-	/* this will be the new modal window */
-	g_mutex_lock (priv->queue_lock);
-	g_queue_push_head (priv->modal_windows, window);
-	g_mutex_unlock (priv->queue_lock);
-
-	if (GTK_IS_DIALOG (window))
-		/* Note that response is not always enough because it
-		   could be captured and removed easily by dialogs but
-		   works for most of situations */
-		priv->modal_handler_uids = 
-			modest_signal_mgr_connect (priv->modal_handler_uids, 
-						   G_OBJECT (window), 
-						   "response",
-						   G_CALLBACK (on_modal_dialog_close), 
-						   self);
-	else
-		priv->modal_handler_uids = 
-			modest_signal_mgr_connect (priv->modal_handler_uids, 
-						   G_OBJECT (window), 
-						   "delete-event",
-						   G_CALLBACK (on_modal_window_close), 
-						   self);
+static void
+modest_window_mgr_set_modal_default (ModestWindowMgr *self, 
+				     GtkWindow *window,
+				     GtkWindow *parent)
+{
+	return;
 }
 
 
@@ -935,98 +718,114 @@ modest_window_mgr_get_hibernation_is_prevented (ModestWindowMgr *self)
 void
 modest_window_mgr_save_state_for_all_windows (ModestWindowMgr *self)
 {
+	GList *window_list;
+	GList *node;
 	g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
 	
-	ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
-
 	/* Iterate over all windows */
-	GList *win = priv->window_list;
-	while (win) {
-		ModestWindow *window = MODEST_WINDOW (win->data);
+	window_list = modest_window_mgr_get_window_list (self);
+	node = window_list;
+	while (node) {
+		ModestWindow *window = MODEST_WINDOW (node->data);
 		if (window) {
 			/* This calls the vfunc, 
 			 * so each window can do its own thing: */
 			modest_window_save_state (window);
 		}	
 		
-		win = g_list_next (win);
+		node = g_list_next (node);
 	}
+	g_list_free (window_list);
 }
 
-static gboolean
-idle_top_modal (gpointer data)
+gint 
+modest_window_mgr_num_windows (ModestWindowMgr *self)
 {
-	ModestWindowMgr *self = MODEST_WINDOW_MGR (data);
-	ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
-	GtkWindow *topmost;
+	ModestWindowMgrPrivate *priv;
+	gint num_windows = 0;
+	GList *window_list;
 
-	/* Get the top modal */
-	g_mutex_lock (priv->queue_lock);
-	topmost = (GtkWindow *) g_queue_peek_head (priv->modal_windows);
-	g_mutex_unlock (priv->queue_lock);
+	g_return_val_if_fail (self && MODEST_IS_WINDOW_MGR(self), -1);
+	
+	priv =  MODEST_WINDOW_MGR_GET_PRIVATE(self);
 
-	/* Show it */
-	if (topmost)
-		gtk_window_present (topmost);
+	window_list = modest_window_mgr_get_window_list (self);
+	
+	if (window_list) {
+		num_windows = g_list_length (window_list);
+		g_list_free (window_list);
+	}
 
-	return FALSE;
+	/* Do not take into account the main window if it was hidden */
+	if (priv->main_window && !GTK_WIDGET_VISIBLE (priv->main_window))
+		num_windows--;
+
+	return num_windows + priv->banner_counter;
 }
 
-static void
-remove_modal_from_queue (GtkWidget *widget,
-			 ModestWindowMgr *self)
+GtkWidget *   
+modest_window_mgr_get_msg_edit_window (ModestWindowMgr *self)
 {
+	GtkWidget *result;
 	ModestWindowMgrPrivate *priv;
-	GList *item = NULL;
 
-	priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+	g_return_val_if_fail (self && MODEST_IS_WINDOW_MGR(self), NULL);
 
-	/* Remove from queue. We don't use remove, because we want to
-	   exit if the widget does not belong to the queue */
-	g_mutex_lock (priv->queue_lock);
-	item = g_queue_find (priv->modal_windows, widget);
-	if (!item) {
-		g_warning ("Trying to remove a modal window that is not registered");
-		g_mutex_unlock (priv->queue_lock);
-		return;
+	priv = MODEST_WINDOW_MGR_GET_PRIVATE(self);
+		
+	if (priv->cached_editor) {
+		result = priv->cached_editor;
+		priv->cached_editor = NULL;
+		load_new_editor (self);
+	} else {
+		result = g_object_new (MODEST_TYPE_MSG_EDIT_WINDOW, NULL);
 	}
-	g_queue_unlink (priv->modal_windows, item);
-	g_mutex_unlock (priv->queue_lock);
-
-	/* Disconnect handler */
-	priv->modal_handler_uids = 
-		modest_signal_mgr_disconnect (priv->modal_handler_uids, 
-					      G_OBJECT (widget),
-					      GTK_IS_DIALOG (widget) ? 
-					      "response" : 
-					      "destroy-event");
-
-	/* Schedule the next one for being shown */
-	g_idle_add (idle_top_modal, self);
+
+	return result;
 }
 
-static gboolean
-on_modal_window_close (GtkWidget *widget,
-		       GdkEvent *event,
-		       gpointer user_data)
+GtkWidget *   
+modest_window_mgr_get_msg_view_window (ModestWindowMgr *self)
 {
-	ModestWindowMgr *self = MODEST_WINDOW_MGR (user_data);
+	GtkWidget *result;
+	ModestWindowMgrPrivate *priv;
 
-	/* Remove modal window from queue */
-	remove_modal_from_queue (widget, self);
+	g_return_val_if_fail (self && MODEST_IS_WINDOW_MGR(self), NULL);
+	
+	priv = MODEST_WINDOW_MGR_GET_PRIVATE(self);
 
-	/* Continue */
-	return FALSE;
+	if (priv->cached_view) {
+		result = priv->cached_view;
+		priv->cached_view = NULL;
+		load_new_view (self);
+	} else {
+		result = g_object_new (MODEST_TYPE_MSG_VIEW_WINDOW, NULL);
+	}
+
+	return result;
 }
 
-static void
-on_modal_dialog_close (GtkDialog *dialog,
-		       gint arg1,
-		       gpointer user_data)
+void           
+modest_window_mgr_register_banner (ModestWindowMgr *self)
 {
-	ModestWindowMgr *self = MODEST_WINDOW_MGR (user_data);
+	ModestWindowMgrPrivate *priv;
+
+	g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
+	priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
 
-	/* Remove modal window from queue */
-	remove_modal_from_queue (GTK_WIDGET (dialog), self);
+	priv->banner_counter++;
+	
 }
 
+void           
+modest_window_mgr_unregister_banner (ModestWindowMgr *self)
+{
+	ModestWindowMgrPrivate *priv;
+
+	g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
+	priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+
+	priv->banner_counter--;
+	if (modest_window_mgr_num_windows (self) == 0)
+		g_signal_emit (self, signals[WINDOW_LIST_EMPTY_SIGNAL], 0);
+}