From: Jose Dapena Paz <jdapena@igalia.com>
Date: Fri, 19 Dec 2008 11:43:13 +0000 (+0000)
Subject: 	* Allow opening multiple viewers in nested messages
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=968ad3ac2546051f86c768cd38fc435dd44d7b8d

	* Allow opening multiple viewers in nested messages
	* Fixes a crash added with the latest changes in the window manager

pmo-drop-split-view-r6947
---

diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c
index 8c7548d..b628c05 100644
--- a/src/hildon2/modest-hildon2-window-mgr.c
+++ b/src/hildon2/modest-hildon2-window-mgr.c
@@ -338,7 +338,7 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self,
 	HildonProgram *program;
 	GtkWidget *current_top;
 	HildonWindowStack *stack;
-	gboolean nested_msg;
+	gboolean nested_msg = FALSE;
 
 	g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self), FALSE);
 	g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
@@ -365,10 +365,11 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self,
 	priv->window_list = g_list_prepend (priv->window_list, window);
 
 	current_top = hildon_window_stack_peek (stack);
+	nested_msg = MODEST_IS_MSG_VIEW_WINDOW (window) && 
+		MODEST_IS_MSG_VIEW_WINDOW (parent);
 
-        nested_msg = MODEST_IS_MSG_VIEW_WINDOW (window) && 
-                MODEST_IS_MSG_VIEW_WINDOW (parent);
-	/* Close views if they're being shown */
+	/* 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))) {