[evolution/gnome-3-6] Bug #689966 - MDN bar shown in Sent folder

[Milan Crha <mcrha src gnome org>]

commit d7ec3ffaabf1c3b3a860831e429d4a0942207f87
Author: Milan Crha <mcrha redhat com>
Date:   Mon Dec 10 19:52:04 2012 +0100

    Bug #689966 - MDN bar shown in Sent folder

 modules/mdn/evolution-mdn.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/modules/mdn/evolution-mdn.c b/modules/mdn/evolution-mdn.c
index 03abc00..71f3dc5 100644
--- a/modules/mdn/evolution-mdn.c
+++ b/modules/mdn/evolution-mdn.c
@@ -514,8 +514,15 @@ mdn_message_loaded_cb (EMailReader *reader,
 	if (notify_to == NULL)
 		goto exit;
 
+	/* do not show the notice in special folders */
+	if (em_utils_folder_is_drafts (registry, folder) ||
+	    em_utils_folder_is_templates (registry, folder) ||
+	    em_utils_folder_is_sent (registry, folder) ||
+	    em_utils_folder_is_outbox (registry, folder))
+		goto exit;
+
 	/* This returns a new ESource reference. */
-	source = em_utils_guess_mail_account_with_recipients (
+	source = em_utils_guess_mail_identity_with_recipients (
 		registry, message, folder, message_uid);
 	if (source == NULL)
 		goto exit;
@@ -605,7 +612,7 @@ mdn_message_seen_cb (EMailReader *reader,
 		goto exit;
 
 	/* This returns a new ESource reference. */
-	source = em_utils_guess_mail_account_with_recipients (
+	source = em_utils_guess_mail_identity_with_recipients (
 		registry, message, folder, message_uid);
 	if (source == NULL)
 		goto exit;