[evolution/gnome-2-26] Do not crash on delete folder

[Milan Crha <mcrha src gnome org>]

commit 960d91e3089d6e9c21d6065fca6729239c8f39d1
Author: Milan Crha <mcrha redhat com>
Date:   Fri Apr 24 21:07:12 2009 +0200

    Do not crash on	delete folder
    
            ** Fix for bug #579306
    
            * em-folder-utils.c: (em_folder_utils_delete_folder):
            Do not free uninitialized variable.
---
 mail/ChangeLog         |    7 +++++++
 mail/em-folder-utils.c |    2 --
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mail/ChangeLog b/mail/ChangeLog
index d1e0e83..19d3f8f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-24  Milan Crha  <mcrha redhat com>
+
+	** Fix for bug #579306
+
+	* em-folder-utils.c: (em_folder_utils_delete_folder):
+	Do not free uninitialized variable.
+
 2009-04-15  Chenthill Palanisamy  <pchenthill novell com>
 
 	* mail/mail-ops.c: Corrected a typo error.
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 56111ab..14d6f22 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -402,7 +402,6 @@ em_folder_utils_delete_folder (CamelFolder *folder)
 {
 	CamelStore *local;
 	GtkWidget *dialog;
-	char *uri;
 	int flags = 0;
 
 	local = mail_component_peek_local_store (NULL);
@@ -419,7 +418,6 @@ em_folder_utils_delete_folder (CamelFolder *folder)
 		return;
 	}
 
-	g_free (uri);
 	camel_object_ref (folder);
 
 	dialog = e_error_new(NULL,