From: Alberto Garcia <agarcia@igalia.com>
Date: Thu, 6 Mar 2008 18:57:35 +0000 (+0000)
Subject: * src/maemo/modest-msg-view-window.c
X-Git-Tag: git_migration_finished~1581
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=5160784c7b83181a46cc62f84da3ec18c4e5905d

* src/maemo/modest-msg-view-window.c
(message_reader_performer):
Call modest_window_mgr_register_header() before retrieving a new message
(view_msg_cb):
Call modest_window_mgr_unregister_header() after retrieving the message
Fixes NB#81606

pmo-trunk-r4284
---

diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c
index eada9a6..49a7720 100644
--- a/src/maemo/modest-msg-view-window.c
+++ b/src/maemo/modest-msg-view-window.c
@@ -1628,6 +1628,9 @@ message_reader_performer (gboolean canceled,
 		goto frees;
 	}
 
+	/* Register the header - it'll be unregistered in the callback */
+	modest_window_mgr_register_header (modest_runtime_get_window_mgr (), info->header, NULL);
+
 	/* New mail operation */
 	mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window),
 								 modest_ui_actions_disk_operations_error_handler, 
@@ -1833,6 +1836,9 @@ view_msg_cb (ModestMailOperation *mail_op,
 	ModestMsgViewWindowPrivate *priv = NULL;
 	GtkTreeRowReference *row_reference = NULL;
 
+	/* Unregister the header (it was registered before creating the mail operation) */
+	modest_window_mgr_unregister_header (modest_runtime_get_window_mgr (), header);
+
 	row_reference = (GtkTreeRowReference *) user_data;
 	if (canceled) {
 		gtk_tree_row_reference_free (row_reference);