X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-window-mgr.c;h=5cdd6d9cf9eb6bb409e463f122c48d2ee14b51e1;hp=528fa335add5d7f72904de4c61ac31f6f1a3fd0d;hb=20cf2b2c65c9ac52d827dd7818819fe734471e96;hpb=dde66f6a3aceb78ed40d8ae247bd613ab25b8fff

diff --git a/src/widgets/modest-window-mgr.c b/src/widgets/modest-window-mgr.c
index 528fa33..5cdd6d9 100644
--- a/src/widgets/modest-window-mgr.c
+++ b/src/widgets/modest-window-mgr.c
@@ -30,18 +30,22 @@
 #include <string.h>
 #include "modest-window-mgr.h"
 #include "modest-runtime.h"
+#include "modest-tny-folder.h"
+#include "modest-ui-actions.h"
+#include "modest-platform.h"
 #include "widgets/modest-main-window.h"
 #include "widgets/modest-msg-edit-window.h"
 #include "widgets/modest-msg-view-window.h"
-/* include other impl specific header files */
+
 
 /* 'private'/'protected' functions */
 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 void on_window_destroy            (ModestWindow *window, 
-					  ModestWindowMgr *self);
+static gboolean on_window_destroy            (ModestWindow *window,
+					      GdkEvent *event,
+					      ModestWindowMgr *self);
 
 /* list my signals  */
 enum {
@@ -52,11 +56,21 @@ enum {
 
 typedef struct _ModestWindowMgrPrivate ModestWindowMgrPrivate;
 struct _ModestWindowMgrPrivate {
-	GList *window_list;
+	GList        *window_list;
+
 	ModestWindow *main_window;
-	gboolean fullscreen_mode;
-	gboolean show_toolbars;
-	gboolean show_toolbars_fullscreen;
+	GtkDialog    *easysetup_dialog;
+	
+	gboolean     fullscreen_mode;
+	gboolean     show_toolbars;
+	gboolean     show_toolbars_fullscreen;
+	
+	GSList       *windows_that_prevent_hibernation;
+	GSList       *preregistered_uids;
+	GHashTable   *destroy_handlers;
+	GHashTable   *viewer_handlers;
+	
+	guint        closing_time;
 };
 #define MODEST_WINDOW_MGR_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                MODEST_TYPE_WINDOW_MGR, \
@@ -112,11 +126,18 @@ modest_window_mgr_init (ModestWindowMgr *obj)
 	priv->window_list = NULL;
 	priv->main_window = NULL;
 	priv->fullscreen_mode = FALSE;
+	priv->easysetup_dialog = NULL;
+	
+	priv->preregistered_uids = NULL;
 
 	/* Could not initialize it from gconf, singletons are not
 	   ready yet */
 	priv->show_toolbars = FALSE;
 	priv->show_toolbars_fullscreen = FALSE;
+	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;
 }
 
 static void
@@ -136,9 +157,32 @@ modest_window_mgr_finalize (GObject *obj)
 		priv->window_list = NULL;
 	}
 
+	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->viewer_handlers) {
+		g_hash_table_destroy (priv->viewer_handlers);
+		priv->viewer_handlers = NULL;
+	}
+
+	if (priv->easysetup_dialog) {
+		g_warning ("%s: forgot to destroy an easysetup dialog somewhere",
+			   __FUNCTION__);
+		gtk_widget_destroy (GTK_WIDGET(priv->easysetup_dialog));
+		priv->easysetup_dialog = NULL;
+	}
+	
 	/* Do not unref priv->main_window because it does not hold a
 	   new reference */
 
+	
 	G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -148,6 +192,173 @@ modest_window_mgr_new (void)
 	return MODEST_WINDOW_MGR(g_object_new(MODEST_TYPE_WINDOW_MGR, NULL));
 }
 
+
+
+
+/* do we have uid? */
+static gboolean
+has_uid (GSList *list, const gchar *uid)
+{
+	GSList *cursor = list;
+
+	if (!uid)
+		return FALSE;
+	
+	while (cursor) {
+		if (cursor->data && strcmp (cursor->data, uid) == 0)
+			return TRUE;
+		cursor = g_slist_next (cursor);
+	}
+	return FALSE;
+}
+
+
+/* remove all from the list have have uid = uid */
+static GSList*
+remove_uid (GSList *list, const gchar *uid)
+{
+	GSList *cursor = list, *start = list;
+	
+	if (!uid)
+		return FALSE;
+	
+	while (cursor) {
+		GSList *next = g_slist_next (cursor);
+		if (cursor->data && strcmp (cursor->data, uid) == 0) {
+			g_free (cursor->data);
+			start = g_slist_delete_link (start, cursor);
+		}
+		cursor = next;
+	}
+	return start;
+}
+
+
+static GSList *
+append_uid (GSList *list, const gchar *uid)
+{
+	return g_slist_append (list, g_strdup(uid));
+}
+
+
+
+void 
+modest_window_mgr_register_header (ModestWindowMgr *self,  TnyHeader *header)
+{
+	ModestWindowMgrPrivate *priv;
+	gchar* uid;
+	
+	g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
+	g_return_if_fail (TNY_IS_HEADER(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 ("registering new uid %s", uid);
+		priv->preregistered_uids = append_uid (priv->preregistered_uids, uid);
+	} else
+		g_debug ("already had uid %s", uid);
+
+	g_free (uid);
+}
+
+void 
+modest_window_mgr_unregister_header (ModestWindowMgr *self,  TnyHeader *header)
+{
+	ModestWindowMgrPrivate *priv;
+	gchar* uid;
+	
+	g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
+	g_return_if_fail (TNY_IS_HEADER(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);
+		priv->preregistered_uids = append_uid (priv->preregistered_uids, uid);
+	} else
+		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);
+	}
+
+	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;
+
+	/* 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));
+	}
+	
+	if (msg_uid && uid &&!strcmp (msg_uid, uid))
+		return 0;
+	else
+		return 1;
+}
+
+
+gboolean
+modest_window_mgr_find_registered_header (ModestWindowMgr *self, TnyHeader *header,
+					  ModestWindow **win)
+{
+	ModestWindowMgrPrivate *priv;
+	gchar* uid;
+	gboolean has_header, has_window = FALSE;
+	GList *item = NULL;
+
+	g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), FALSE);
+	g_return_val_if_fail (TNY_IS_HEADER(header), FALSE);
+	
+	priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+
+	uid = modest_tny_folder_get_header_unique_id (header);
+	
+	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;
+}
+
+
+
 void 
 modest_window_mgr_register_window (ModestWindowMgr *self, 
 				   ModestWindow *window)
@@ -156,34 +367,76 @@ modest_window_mgr_register_window (ModestWindowMgr *self,
 	GList *win;
 	gboolean show;
 	ModestWindowMgrPrivate *priv;
+	gint *handler_id;
 
 	g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
-	g_return_if_fail (MODEST_IS_WINDOW (window));
+	g_return_if_fail (GTK_IS_WINDOW (window));
 
 	priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
 
 	win = g_list_find (priv->window_list, window);
 	if (win) {
-		g_warning ("Trying to register an already registered window");
+		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 ("Trying to register a second main window");
+			g_warning ("%s: trying to register a second main window",
+				   __FUNCTION__);
 			return;
 		} else {
 			priv->main_window = window;
 		}
 	}
 
+	/* remove from the list of pre-registered uids */
+	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>");
+
+		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);
+
+		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 */
-	g_signal_connect (window, "destroy", G_CALLBACK (on_window_destroy), self);
+	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)
@@ -207,8 +460,10 @@ modest_window_mgr_register_window (ModestWindowMgr *self,
 	modest_window_show_toolbar (window, show);
 }
 
-static void
-on_window_destroy (ModestWindow *window, ModestWindowMgr *self)
+static gboolean
+on_window_destroy (ModestWindow *window, 
+		   GdkEvent *event,
+		   ModestWindowMgr *self)
 {
 	/* Specific stuff first */
 	if (MODEST_IS_MAIN_WINDOW (window)) {
@@ -225,6 +480,7 @@ on_window_destroy (ModestWindow *window, ModestWindowMgr *self)
 					if (iter->data != window) {
 						GList *tmp = iter->next;
 						on_window_destroy (MODEST_WINDOW (iter->data),
+								   event,
 								   self);
 						iter = tmp;
 					} else {
@@ -233,23 +489,111 @@ on_window_destroy (ModestWindow *window, ModestWindowMgr *self)
 				} while (iter);
 			}
 		}
-	} else {
+	}
+	else {
 		if (MODEST_IS_MSG_EDIT_WINDOW (window)) {
-			/* TODO: Save currently edited message to Drafts
-			   folder */
+			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))) {
+				
+				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));
+				
+			} 
 		}
 	}
 
+	/* Save configuration state (TODO: why edit window does not require this function ?) */
+	if (!MODEST_IS_MSG_EDIT_WINDOW (window)) 
+		modest_window_save_state (MODEST_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)
+{
+	gulong *handler_id;
+
+	handler_id = (gulong *) value;
+	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;
+}
+
+
 void 
 modest_window_mgr_unregister_window (ModestWindowMgr *self, 
 				     ModestWindow *window)
 {
 	GList *win;
 	ModestWindowMgrPrivate *priv;
+	gulong *tmp, handler_id;
 
 	g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
 	g_return_if_fail (MODEST_IS_WINDOW (window));
@@ -262,65 +606,63 @@ modest_window_mgr_unregister_window (ModestWindowMgr *self,
 		return;
 	}
 
-	/* Remove from list. Remove the reference to the window */
-	g_object_unref (win->data);
-	priv->window_list = g_list_remove_link (priv->window_list, win);
+	/* 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) {
+		
 		ModestConf *conf = modest_runtime_get_conf ();
-
 		/* Save show toolbar status */
 		modest_conf_set_bool (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, 
 				      priv->show_toolbars_fullscreen, NULL);
 		modest_conf_set_bool (conf, MODEST_CONF_SHOW_TOOLBAR, 
 				      priv->show_toolbars, NULL);
 
-		/* Quit main loop */
-		gtk_main_quit ();
+		g_timeout_add (CLOSING_RETRY_INTERVAL,
+			       (GSourceFunc)on_quit_maybe, self);
 	}
 }
 
-static gint
-compare_msguids (ModestWindow *win,
-		 const gchar *uid)
-{
-	const gchar *msg_uid;
-
-	if (!MODEST_IS_MSG_VIEW_WINDOW (win))
-		return 1;
-
-	/* Get message uid from msg window */
-	msg_uid = modest_msg_view_window_get_message_uid (MODEST_MSG_VIEW_WINDOW (win));
-	if (msg_uid && !strcmp (msg_uid, uid))
-		return 0;
-	else
-		return 1;
-}
-
-ModestWindow*  
-modest_window_mgr_find_window_by_msguid (ModestWindowMgr *self, 
-					 const gchar *msguid)
-{
-	ModestWindowMgrPrivate *priv;
-	GList *win = NULL;
-
-	g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), NULL);
-	g_return_val_if_fail (msguid != NULL, NULL);
-
-	priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
 
-	/* Look for the window */
-	if (priv->window_list)
-		win = g_list_find_custom (priv->window_list, 
-					  msguid, 
-					  (GCompareFunc) compare_msguids);
-
-	if (win)
-		return win->data;
-	else 
-		return NULL;
-}
 
 void
 modest_window_mgr_set_fullscreen_mode (ModestWindowMgr *self,
@@ -412,10 +754,118 @@ ModestWindow*
 modest_window_mgr_get_main_window (ModestWindowMgr *self)
 {
 	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;
+}
+
 
+GtkDialog*
+modest_window_mgr_get_easysetup_dialog (ModestWindowMgr *self)
+{
+	ModestWindowMgrPrivate *priv;
+	
 	g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), NULL);
+	priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+
+	return priv->easysetup_dialog;
+}
+
 
+GtkDialog*
+modest_window_mgr_set_easysetup_dialog (ModestWindowMgr *self, GtkDialog *dialog)
+{
+	ModestWindowMgrPrivate *priv;
+	
+	g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), NULL);
 	priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
 
-	return priv->main_window;
+	return priv->easysetup_dialog = dialog;
+}
+
+
+static void
+on_nonhibernating_window_hide(GtkWidget *widget, gpointer user_data)
+{
+	ModestWindowMgr *self = MODEST_WINDOW_MGR (user_data);
+	ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+	
+	/* Forget this window,
+	 * so hibernation will be allowed again if no windows are remembered: */
+	priv->windows_that_prevent_hibernation =
+		g_slist_remove (priv->windows_that_prevent_hibernation, GTK_WINDOW(widget));
+}
+
+static void
+on_nonhibernating_window_show(GtkWidget *widget, gpointer user_data)
+{
+	ModestWindowMgr *self = MODEST_WINDOW_MGR (user_data);
+	ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+	
+	GtkWindow *window = GTK_WINDOW (widget);
+	
+	priv->windows_that_prevent_hibernation = 
+			g_slist_append (priv->windows_that_prevent_hibernation, window);
+	
+	/* Allow hibernation again when the window has been hidden: */
+	g_signal_connect (window, "hide", 
+		G_CALLBACK (on_nonhibernating_window_hide), self);
+}
+
+void
+modest_window_mgr_prevent_hibernation_while_window_is_shown (ModestWindowMgr *self,
+								  GtkWindow *window)
+{
+	g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
+	
+	if (GTK_WIDGET_VISIBLE(window)) {
+		on_nonhibernating_window_show (GTK_WIDGET (window), self);
+	} else {
+		/* Wait for it to be shown: */
+		g_signal_connect (window, "show", 
+			G_CALLBACK (on_nonhibernating_window_show), self);	
+	}
+}
+
+gboolean
+modest_window_mgr_get_hibernation_is_prevented (ModestWindowMgr *self)
+{
+	g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), FALSE);
+	
+	ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+	
+	/* Prevent hibernation if any open windows are currently 
+	 * preventing hibernation: */
+	return (g_slist_length (priv->windows_that_prevent_hibernation) > 0);
+}
+
+
+void
+modest_window_mgr_save_state_for_all_windows (ModestWindowMgr *self)
+{
+	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);
+		if (window) {
+			/* This calls the vfunc, 
+			 * so each window can do its own thing: */
+			modest_window_save_state (window);
+		}	
+		
+		win = g_list_next (win);
+	}
 }