From 9c4500a9b5b030e6fb2b8c02e518254d94c10add Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 14 Jun 2013 13:45:08 -0400
Subject: MessageList: Add a "folder" property.

Also move the CamelFolder pointer into the private structure.

New functions:

  message_list_ref_folder()
---
 mail/e-mail-reader.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'mail/e-mail-reader.c')

diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index a93d7260b5..18d71b39de 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -2993,10 +2993,18 @@ static CamelFolder *
 mail_reader_get_folder (EMailReader *reader)
 {
 	GtkWidget *message_list;
+	CamelFolder *folder;
 
 	message_list = e_mail_reader_get_message_list (reader);
 
-	return MESSAGE_LIST (message_list)->folder;
+	/* FIXME This is dangerous.  EMailReader should return a
+	 *       new CamelFolder reference and rename this method
+	 *       to "ref_folder()" instead of "get_folder()". */
+	folder = message_list_ref_folder (MESSAGE_LIST (message_list));
+	if (folder != NULL)
+		g_object_unref (folder);
+
+	return folder;
 }
 
 static void
-- 
cgit v1.2.3