pidgin: dc05140f: Merge updates from the 2.9.0 branch into...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: dc05140f38c2811411a326665b3a2ebb1abeb51a
Parent:   e802003adbf0be4496de3de8ac03b47c1e471d00
Author:   markdoliner at pidgin.im
Date:     06/22/11 03:31:02
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/dc05140f38c2811411a326665b3a2ebb1abeb51a

Changelog: 

Merge updates from the 2.9.0 branch into trunk

Changes against parent e802003adbf0be4496de3de8ac03b47c1e471d00

  patched  ChangeLog
  patched  ChangeLog.API
  patched  configure.ac
  patched  po/ChangeLog

-------------- next part --------------
============================================================
--- ChangeLog	1ef27b5175f75b502ea44cc7ff5fc6dc395f0c0f
+++ ChangeLog	8520aa11d14e8bd47c704daa91bf2381774729d9
@@ -1,24 +1,34 @@ Pidgin and Finch: The Pimpin' Penguin IM
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.8.1 (MM/DD/YYYY):
+version 2.9.1 (MM/DD/YYYY):
+	Gadu-Gadu:
+	* Fixed searching for buddies in public directory. (Tomasz Wasilczyk)
+	  (#5242)
+
+version 2.9.0 (06/23/2011):
 	Pidgin:
+	* Fix a potential remote denial-of-service bug related to displaying
+	  buddy icons.
+	* Significantly improved performance of larger IRC channels (regression
+	  introduced in 2.8.0).
 	* Fix Conversation->Add on AIM and MSN.
-	* Entries in the chat user list are sorted properly again.
+	* Entries in the chat user list are sorted properly again.  This was
+	  inadvertenly broken in 2.8.0.
 
 	Finch:
-	* Fixed logging in to ICQ.
+	* Fix logging in to ICQ.
 
 	libpurple:
 	* media: Actually use the specified TCP port from the TURN configuration to
 	  create a TCP relay candidate.
 
+	AIM and ICQ:
+	* Fix crashes on some non-mainstream OSes when attempting to
+	  printf("%s", NULL).  (Clemens Huebner) (#14297)
+
 	Plugins:
 	* The Evolution Integration plugin compiles again.
 
-	Gadu-Gadu:
-	* Fixed searching for buddies in public directory. (Tomasz Wasilczyk)
-	  (#5242)
-
 version 2.8.0 (06/07/2011):
 	General:
 	* Implement simple silence suppression for voice calls, preventing
============================================================
--- configure.ac	b1b1899627fb72b398d0e6d99229e45ab123d1b5
+++ configure.ac	44ea67db03976e0fc422aca79d9c0c42e19fdff5
@@ -43,9 +43,9 @@ AC_PREREQ([2.50])
 #
 # Make sure to update finch/libgnt/configure.ac with libgnt version changes.
 #
-m4_define([purple_lt_current], [8])
+m4_define([purple_lt_current], [9])
 m4_define([purple_major_version], [2])
-m4_define([purple_minor_version], [8])
+m4_define([purple_minor_version], [9])
 m4_define([purple_micro_version], [1])
 m4_define([purple_version_suffix], [devel])
 m4_define([purple_version],
============================================================
--- po/ChangeLog	3146166b638b3d492987c80e57b163fc19cf58b9
+++ po/ChangeLog	0c6a9192e60f884cc58577950478dda5fb1a81fc
@@ -1,5 +1,11 @@ Pidgin and Finch: The Pimpin' Penguin IM
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.9.1
+	* German translation updated (Bj?rn Voigt, Jochen Kemnade)
+
+version 2.9.0
+	* No changes
+
 version 2.8.0
 	* Albanian translation updated (Besnik Bleta)
 	* Bengali translation updated (Jamil Ahmed)
============================================================
--- ChangeLog.API	e88ff5a0ef1a123eba93668dfde66806ce1e9963
+++ ChangeLog.API	cd8e20003157eb22997e758dd0157383e8a5b3be
@@ -1,5 +1,22 @@ Pidgin and Finch: The Pimpin' Penguin IM
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.9.0:
+	libpurple:
+		Added:
+		* Hash table to PurpleConvChat struct, used to make
+		  purple_conv_chat_cb_find O(1).
+		* ui_data pointer to PurpleConvChatBuddy struct.
+		* deleting-chat-buddy signal (conversation signals)
+		* pidgin_pixbuf_from_data
+		* pidgin_pixbuf_anim_from_data
+		* pidgin_pixbuf_new_from_file
+		* pidgin_pixbuf_new_from_file_at_size
+		* pidgin_pixbuf_new_from_file_at_scale
+
+		Deprecated:
+		* purple_conv_chat_set_users
+		* PurpleConvChat in_room list
+
 version 2.8.0 (06/07/2011):
 	libpurple:
 		Added: