[evolution] Fix few memory leaks

[Milan Crha <mcrha src gnome org>]

commit e5eb699ce36f57891cbe255a8f4054ab6fc6acbd
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jun 27 20:17:28 2012 +0200

    Fix few memory leaks

 mail/message-list.c                 |   13 +++++++------
 modules/mail/e-mail-shell-sidebar.c |    2 ++
 2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/mail/message-list.c b/mail/message-list.c
index 850ef07..849fae8 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -2665,15 +2665,16 @@ message_list_dispose (GObject *object)
 
 	priv->destroyed = TRUE;
 
-	if (message_list->folder) {
+	if (message_list->folder)
 		mail_regen_cancel (message_list);
 
-		if (message_list->uid_nodemap) {
-			g_hash_table_foreach (message_list->uid_nodemap, (GHFunc) clear_info, message_list);
-			g_hash_table_destroy (message_list->uid_nodemap);
-			message_list->uid_nodemap = NULL;
-		}
+	if (message_list->uid_nodemap) {
+		g_hash_table_foreach (message_list->uid_nodemap, (GHFunc) clear_info, message_list);
+		g_hash_table_destroy (message_list->uid_nodemap);
+		message_list->uid_nodemap = NULL;
+	}
 
+	if (message_list->folder) {
 		g_signal_handlers_disconnect_by_func (
 			message_list->folder, folder_changed, message_list);
 		g_object_unref (message_list->folder);
diff --git a/modules/mail/e-mail-shell-sidebar.c b/modules/mail/e-mail-shell-sidebar.c
index 857a0d6..2c2cdfb 100644
--- a/modules/mail/e-mail-shell-sidebar.c
+++ b/modules/mail/e-mail-shell-sidebar.c
@@ -73,6 +73,8 @@ mail_shell_sidebar_selection_changed_cb (EShellSidebar *shell_sidebar,
 	if (is_folder)
 		icon_name = em_folder_utils_get_icon_name (flags);
 	else {
+		g_free (display_name);
+
 		icon_name = shell_view_class->icon_name;
 		display_name = g_strdup (shell_view_class->label);
 	}