From 0559de901e376c897515d684b357e6d9566f3b89 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 29 Jan 2013 15:52:45 +0000
Subject: Bug #692777 - Crash on folder rename

---
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 24a46ed..bad33f5 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -685,9 +685,6 @@ mail_backend_folder_renamed_cb (MailFolderCache *folder_cache,
 
 	g_list_free_full (list, (GDestroyNotify) g_object_unref);
 
-	g_free (old_uri);
-	g_free (new_uri);
-
 	/* Rename GalView files. */
 
 	for (ii = 0; ii < G_N_ELEMENTS (cachenames); ii++) {
@@ -704,6 +701,9 @@ mail_backend_folder_renamed_cb (MailFolderCache *folder_cache,
 		g_free (newname);
 	}
 
+	g_free (old_uri);
+	g_free (new_uri);
+
 	/* This does something completely different.
 	 * XXX Make it a separate signal handler? */
 	mail_filter_rename_folder (
--
cgit v0.9.0.2