Re: [evolution-patches] fix for bug #33933 (for 2.0.4)

[Not Zed <notzed ximian com>]

definitely worth it for 2.0, please commit

On Wed, 2005-02-09 at 12:34 -0500, Jeffrey Stedfast wrote:

Not sure how important this is (not many users have reported it?) but
the fix is pretty trivial and I've already fixed it in HEAD so here's
the patch.

Jeff

text/plain attachment (33933.patch), ""

? 33933.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3444.2.43
diff -u -r1.3444.2.43 ChangeLog
--- ChangeLog	7 Feb 2005 03:25:41 -0000	1.3444.2.43
+++ ChangeLog	9 Feb 2005 17:31:59 -0000
@@ -1,3 +1,8 @@
+2005-02-09  Jeffrey Stedfast  <fejj novell com>
+
+	* message-list.c (message_list_set_folder): Reset the
+	normalised_hash. Fixes bug #33933.
+
 2005-02-04  Not Zed  <NotZed Ximian com>
 
 	** See bug #65329
Index: message-list.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/message-list.c,v
retrieving revision 1.397.4.2
diff -u -r1.397.4.2 message-list.c
--- message-list.c	19 Jan 2005 03:56:16 -0000	1.397.4.2
+++ message-list.c	9 Feb 2005 17:31:59 -0000
@@ -1832,10 +1832,12 @@
 	g_signal_connect (((GtkScrolledWindow *) message_list)->vscrollbar, "value-changed", G_CALLBACK (ml_scrolled), message_list);
 }
 
-static void
+static gboolean
 normalised_free (gpointer key, gpointer value, gpointer user_data)
 {
 	e_poolv_destroy (value);
+	
+	return TRUE;
 }
 
 static void
@@ -1903,7 +1905,7 @@
 	MessageList *message_list = MESSAGE_LIST (object);
 	struct _MessageListPrivate *p = message_list->priv;
 	
-	g_hash_table_foreach (message_list->normalised_hash, normalised_free, NULL);
+	g_hash_table_foreach (message_list->normalised_hash, (GHFunc) normalised_free, NULL);
 	g_hash_table_destroy (message_list->normalised_hash);
 	
 	if (message_list->thread_tree)
@@ -2779,7 +2781,9 @@
 		g_source_remove (message_list->idle_id);
 		message_list->idle_id = 0;
 	}
-
+	
+	g_hash_table_foreach_remove (message_list->normalised_hash, normalised_free, NULL);
+	
 	mail_regen_cancel(message_list);
 	
 	if (message_list->folder != NULL) {