X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-window-mgr.c;h=91348d73ff946dd930bda8413f908ae7caa918e0;hp=b6ffd3f043a5b155d4da0a468e6d689c527ef4ca;hb=64e307fddcf056bc685688d37f07b806b619da60;hpb=443ff26bfccd8426e91b887ab211cb1ff96f679a

diff --git a/src/widgets/modest-window-mgr.c b/src/widgets/modest-window-mgr.c
index b6ffd3f..91348d7 100644
--- a/src/widgets/modest-window-mgr.c
+++ b/src/widgets/modest-window-mgr.c
@@ -31,6 +31,8 @@
 #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"
@@ -53,13 +55,14 @@ 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;
+	gboolean     fullscreen_mode;
+	gboolean     show_toolbars;
+	gboolean     show_toolbars_fullscreen;
 	
-	GSList* windows_that_prevent_hibernation;
+	GSList       *windows_that_prevent_hibernation;
+	GHashTable   *destroy_handlers;
 };
 #define MODEST_WINDOW_MGR_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                MODEST_TYPE_WINDOW_MGR, \
@@ -120,6 +123,7 @@ modest_window_mgr_init (ModestWindowMgr *obj)
 	   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);
 }
 
 static void
@@ -139,6 +143,12 @@ modest_window_mgr_finalize (GObject *obj)
 		priv->window_list = NULL;
 	}
 
+	/* Free the hash table with the handlers */
+	if (priv->destroy_handlers) {
+		g_hash_table_unref (priv->destroy_handlers);
+		priv->destroy_handlers = NULL;
+	}
+
 	/* Do not unref priv->main_window because it does not hold a
 	   new reference */
 
@@ -159,6 +169,7 @@ 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));
@@ -186,7 +197,9 @@ modest_window_mgr_register_window (ModestWindowMgr *self,
 	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, "destroy", G_CALLBACK (on_window_destroy), self);
+	g_hash_table_insert (priv->destroy_handlers, window, handler_id);
 
 	/* Put into fullscreen if needed */
 	if (priv->fullscreen_mode)
@@ -237,10 +250,16 @@ on_window_destroy (ModestWindow *window, ModestWindowMgr *self)
 			}
 		}
 	} else {
-		if (MODEST_IS_MSG_EDIT_WINDOW (window)) {
-			/* TODO: Save currently edited message to Drafts
-			   folder */
-		}
+		if (MODEST_IS_MSG_EDIT_WINDOW (window))
+			/* Save currently edited message to Drafts */
+			if (modest_msg_edit_window_is_modified (MODEST_MSG_EDIT_WINDOW (window))) {
+				gint response = 
+					modest_platform_run_confirmation_dialog (GTK_WINDOW (self), 
+										 _("mcen_nc_no_email_message_modified_save_changes"));
+				if (response != GTK_RESPONSE_CANCEL) {
+					modest_ui_actions_on_save_to_drafts (NULL, MODEST_MSG_EDIT_WINDOW (window));
+				}
+			}
 	}
 
 	/* Unregister window */
@@ -253,6 +272,7 @@ modest_window_mgr_unregister_window (ModestWindowMgr *self,
 {
 	GList *win;
 	ModestWindowMgrPrivate *priv;
+	gint *handler_id;
 
 	g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
 	g_return_if_fail (MODEST_IS_WINDOW (window));
@@ -269,10 +289,23 @@ modest_window_mgr_unregister_window (ModestWindowMgr *self,
 	if (priv->main_window == window)
 		priv->main_window = NULL;
 
-	/* Remove from list. Remove the reference to the window */
-	g_object_unref (win->data);
+	/* Save state */
+	modest_window_save_state (window);
+
+	/* Remove from list */
 	priv->window_list = g_list_remove_link (priv->window_list, win);
 
+	/* Remove the reference to the window. We need to block the
+	   destroy event handler to avoid recursive calls */
+	handler_id = g_hash_table_lookup (priv->destroy_handlers, window);
+	g_signal_handler_block (window, *handler_id);
+	gtk_widget_destroy (win->data);
+	if (G_IS_OBJECT (window)) {
+		g_warning ("This should not happen the window was not completely destroyed");
+		g_signal_handler_unblock (window, *handler_id);
+	}
+	g_hash_table_remove (priv->destroy_handlers, window);
+
 	/* If there are no more windows registered then exit program */
 	if (priv->window_list == NULL) {
 		ModestConf *conf = modest_runtime_get_conf ();
@@ -300,7 +333,7 @@ compare_msguids (ModestWindow *win,
 	/* 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))
+	if (msg_uid && uid &&!strcmp (msg_uid, uid))
 		return 0;
 	else
 		return 1;
@@ -461,15 +494,14 @@ on_nonhibernating_window_show(GtkWidget *widget, gpointer user_data)
 		G_CALLBACK (on_nonhibernating_window_hide), self);
 }
 
-void modest_window_mgr_prevent_hibernation_while_window_is_shown (ModestWindowMgr *self, GtkWindow *window)
+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
-	{
+	} else {
 		/* Wait for it to be shown: */
 		g_signal_connect (window, "show", 
 			G_CALLBACK (on_nonhibernating_window_show), self);