# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1309031642 0
# Node ID 910e966d18b30f8111af84694fcfa9df50cd612a
# Parent  94e1e3ed0bb0f73b59c7214a65d105221ea02de1# Parent  a99a4f9b7171c426cb9f3d856e45bdec9a9d05ab
propagate from branch 'im.pidgin.pidgin.next.minor' (head 9681bcefcadc4b4fad248fd0ec922892aaefdd76)
            to branch 'im.pidgin.pidgin' (head d9152f1035ac663af38a0af967f66cf614804d6e)

diff -r a99a4f9b7171 -r 910e966d18b3 ChangeLog
--- a/ChangeLog	Sat Jun 25 02:47:48 2011 +0000
+++ b/ChangeLog	Sat Jun 25 19:54:02 2011 +0000
@@ -1,5 +1,10 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.9.0 (MM/DD/YYYY):
+	Pidgin:
+	* Significantly improved performance of larger IRC channels (regression
+	  introduced in 2.8.0)
+
 version 2.9.1 (MM/DD/YYYY):
 	Gadu-Gadu:
 	* Fixed searching for buddies in public directory. (Tomasz Wasilczyk)
diff -r a99a4f9b7171 -r 910e966d18b3 ChangeLog.API
diff -r a99a4f9b7171 -r 910e966d18b3 configure.ac
--- a/configure.ac	Sat Jun 25 02:47:48 2011 +0000
+++ b/configure.ac	Sat Jun 25 19:54:02 2011 +0000
@@ -46,7 +46,7 @@
 m4_define([purple_lt_current], [9])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [9])
-m4_define([purple_micro_version], [1])
+m4_define([purple_micro_version], [0])
 m4_define([purple_version_suffix], [devel])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
diff -r a99a4f9b7171 -r 910e966d18b3 libpurple/conversation.c
diff -r a99a4f9b7171 -r 910e966d18b3 libpurple/conversation.h
diff -r a99a4f9b7171 -r 910e966d18b3 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Sat Jun 25 02:47:48 2011 +0000
+++ b/pidgin/gtkconv.c	Sat Jun 25 19:54:02 2011 +0000
@@ -6320,8 +6320,6 @@
 		gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
 		gtk_tree_row_reference_free(ref);
 		cbuddy->ui_data = NULL;
-	}
-
 	if (cbuddy)
 		add_chat_buddy_common(conv, cbuddy, NULL);
 }