From: Sergio Villar Senin <svillar@igalia.com>
Date: Tue, 18 Aug 2009 16:06:07 +0000 (+0200)
Subject: Fixes NB#133699, do not open the folders window over the headers window
X-Git-Tag: 3.0.17-rc36~2
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=1e28fdab8e4d9664b91bc107dc3f7810a3f1b3c4

Fixes NB#133699, do not open the folders window over the headers window
---

diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c
index 0e1d8d4..36f7b3c 100644
--- a/src/hildon2/modest-hildon2-window-mgr.c
+++ b/src/hildon2/modest-hildon2-window-mgr.c
@@ -520,8 +520,11 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self,
 	}
 
 	/* Do not go backwards */
-	if ((MODEST_IS_MSG_VIEW_WINDOW (current_top) || MODEST_IS_MSG_EDIT_WINDOW (current_top)) &&
-	    (MODEST_IS_FOLDER_WINDOW (window) || MODEST_IS_ACCOUNTS_WINDOW (window) || 
+	if ((MODEST_IS_MSG_VIEW_WINDOW (current_top) ||
+	     MODEST_IS_MSG_EDIT_WINDOW (current_top) ||
+	     MODEST_IS_HEADER_WINDOW (current_top)) &&
+	    (MODEST_IS_FOLDER_WINDOW (window) ||
+	     MODEST_IS_ACCOUNTS_WINDOW (window) ||
 	     MODEST_IS_MAILBOXES_WINDOW (window))) {
 		gtk_window_present (GTK_WINDOW (current_top));
 		return FALSE;