Don't need to dup the string: the relevant gnome-dialog routine already

        * session.c (request_callback): Don't need to dup the string: the
        relevant gnome-dialog routine already does.

        * message-list.c (message_list_destroy): Free the uid_nodemap.
        (hide_save_state): Free the filename when we're done.

svn path=/trunk/; revision=9452

1 files changed, 8 insertions, 0 deletions

diff --git a/mail/message-list.c b/mail/message-list.c
index 39445a2be6..dc4eff7ef0 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -119,6 +119,8 @@ static void hide_load_state(MessageList *ml);
 /*static void mail_do_regenerate_messagelist (MessageList *list, const char *search, const char *hideexpr, CamelFolderChangeInfo *changes);*/
 static void mail_regen_list(MessageList *ml, const char *search, const char *hideexpr, CamelFolderChangeInfo *changes);
 
+static void clear_info(char *key, ETreePath *node, MessageList *ml);
+
 enum {
 	MESSAGE_SELECTED,
 	LAST_SIGNAL
@@ -1169,6 +1171,11 @@ message_list_destroy (GtkObject *object)
 		message_list->hidden_pool = 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);
+	}
+
 	g_free(message_list->cursor_uid);
 
 	g_mutex_free(message_list->hide_lock);
@@ -2253,6 +2260,7 @@ static void hide_save_state(MessageList *ml)
 			g_hash_table_foreach(ml->hidden, (GHFunc)hide_save_1, out);
 		fclose(out);
 	}
+	g_free (filename);
 
 	MESSAGE_LIST_UNLOCK(ml, hide_lock);
 }