[evolution/email-factory-3-4: 45/53] commit 9a38889305241f6831feda75d175c34b1c743646 Author: Matthew Barnes <mbarnes redhat com> Date:

[Srinivasa Ragavan <sragavan src gnome org>]

commit 0f251e0e06ae3bed3750a57a5a7f5dd339887d8c
Author: Srinivasa Ragavan <sragavan gnome org>
Date:   Tue Jan 3 13:11:15 2012 +0530

    commit 9a38889305241f6831feda75d175c34b1c743646
    Author: Matthew Barnes <mbarnes redhat com>
    Date:   Thu Dec 22 23:59:30 2011 -0500
    
        Bug 666706 - MailFolderCache: Crash on visiting a renamed folder

 libemail-engine/mail-folder-cache.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/libemail-engine/mail-folder-cache.c b/libemail-engine/mail-folder-cache.c
index 9a239b5..f58d220 100644
--- a/libemail-engine/mail-folder-cache.c
+++ b/libemail-engine/mail-folder-cache.c
@@ -695,8 +695,10 @@ rename_folders (MailFolderCache *self,
 	if (mfi) {
 		up->oldfull = mfi->full_name;
 
+		/* Be careful not to invoke the destroy function. */
+		g_hash_table_steal (si->folders, mfi->full_name);
+		
 		/* Its a rename op */
-		g_hash_table_remove (si->folders, mfi->full_name);
 		mfi->full_name = g_strdup (fi->full_name);
 		mfi->flags = fi->flags;
 		mfi->has_children = fi->child != NULL;