[evolution/email-factory-3-4: 35/38] commit 63404e5dc1d21c07abbaa29d0223695d479523a0 Author: Matthew Barnes <mbarnes redhat com> Date:

[Srinivasa Ragavan <sragavan src gnome org>]

commit 36059a21d35035407b00513fdfd18c9c85818a06
Author: Srinivasa Ragavan <sragavan gnome org>
Date:   Fri Dec 16 16:00:19 2011 +0530

    commit 63404e5dc1d21c07abbaa29d0223695d479523a0
    Author: Matthew Barnes <mbarnes redhat com>
    Date:   Tue Dec 13 13:10:30 2011 -0500
    
        MailFolderCache: Fix a double-free on unsubscribe.
    
        The 'folders' hash table has a GDestroyNotify callback now,
        but we were still freeing the folder_info struct
        explicitly.

 libemail-engine/mail-folder-cache.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/libemail-engine/mail-folder-cache.c b/libemail-engine/mail-folder-cache.c
index 3cb77f2..648b40f 100644
--- a/libemail-engine/mail-folder-cache.c
+++ b/libemail-engine/mail-folder-cache.c
@@ -655,9 +655,8 @@ store_folder_unsubscribed_cb (CamelStore *store,
 	if (si) {
 		mfi = g_hash_table_lookup (si->folders, info->full_name);
 		if (mfi) {
-			g_hash_table_remove (si->folders, mfi->full_name);
 			unset_folder_info (self, mfi, TRUE, TRUE);
-			free_folder_info (mfi);
+			g_hash_table_remove (si->folders, mfi->full_name);
 		}
 	}
 	g_mutex_unlock (self->priv->stores_mutex);