changeset 20029:51aff4db29da

merge of '15e090cc3c5ac0e910b83a17267afbabea78ef86' and '6d38e424cdf835b16ceeb7b90f893db804540ff3'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Fri, 14 Sep 2007 08:31:50 +0000
parents bef95e866af8 (diff) a2b4eac83902 (current diff)
children faf39a913c61 cd2b19529dff
files ChangeLog ChangeLog.API
diffstat 6 files changed, 41 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Sep 14 08:27:26 2007 +0000
+++ b/ChangeLog	Fri Sep 14 08:31:50 2007 +0000
@@ -1,6 +1,8 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 Version 2.2.0 (09/13/2007):
+	http://developer.pidgin.im/query?status=closed&milestone=2.2.0
+
 	Libpurple:
 	* New protocol plugin: MySpaceIM (Jeff Connelly, Google Summer of
 	  Code)
@@ -9,17 +11,30 @@
 	  Monitzer, Google Summer of Code for Adium)
 	* Certificate management. Libpurple will validate certificates on
 	  SSL-encrypted protocols (William Ehlhardt, Google Summer of Code)
+	* Some adjustments were made to fix sending messages when using
+	  the MSN HTTP method. (Laszlo Pandy)
+	* Yahoo! Chat is fixed.
+	* Some AIM file transfer issues between Pidgin and other clients
+	  have been fixed. (Kyryll A Mirnenko)
+	* Properly restore idle status and time for AIM and ICQ accounts
+	  when they reconnect after being disconnected.
 
 	Pidgin:
-	* Insert Horizontal Rules and Strikethrough text from toolbar
+	* Insert Horizontal Rules and Strikethrough text from toolbar.
 	* Option to show protocol icons in the buddy list, from the
-	  Buddies > Show menu (Justin Heiner)
-	* Ability to build with native, non-X11 GTK+ on OSX (Anders
+	  Buddies > Show menu. (Justin Heiner)
+	* Ability to build with native, non-X11 GTK+ on OSX. (Anders
 	  Hasselqvist)
-	* Remember the 'Enable Sounds' setting for a conversation
+	* Remember the 'Enable Sounds' setting for a conversation.
+	* Right-clicking the empty space in the formatting toolbar
+	  allows you to toggle back to the old "ungrouped" version.
+	* Protocols supporting account registration via Pidgin now show
+	  a descriptive checkbox instead of a vague "Register" button.
+	* Fixed a bug where a tab would be shown on single conversations
+	  when tabs were disabled.
 
 	Finch:
-	* Per-conversation mute and logging options (accessible from the menu)
+	* Per-conversation mute and logging options (accessible from the menu).
 
 version 2.1.1 (08/20/2007):
 	Yahoo:
--- a/ChangeLog.API	Fri Sep 14 08:27:26 2007 +0000
+++ b/ChangeLog.API	Fri Sep 14 08:31:50 2007 +0000
@@ -18,6 +18,10 @@
 		* purple_conversation_get_message_history() to retrieve a list of
 		  PurpleConvMessage's in a conversation, and
 		  purple_conversation_clear_message_history to clear the history.
+		* purple_certificate_* functions in libpurple/certificate.h - "A public-key certificate API"
+		* purple_ssl_get_peer_certificates() and associated field in PurpleSslOps to retrieve a server's presented SSL certificate chain.
+		* PurpleSslConnection::verifier to provide a "how to verify the peer's certificates" callback to the SSL handlers. See certificate.h for more on this.
+		* purple_ssl_connect_with_host_fd() to create an SSL connection from a file descriptor and provide a hostname with it to authenticate the peer against.
 
 		Changed:
 		* purple_prefs_load is now called within purple_prefs_init.
--- a/ChangeLog.win32	Fri Sep 14 08:27:26 2007 +0000
+++ b/ChangeLog.win32	Fri Sep 14 08:31:50 2007 +0000
@@ -1,4 +1,4 @@
-version 2.2.0 (??/??/2007):
+version 2.2.0 (09/13/2007):
 	* Updated gtkspell to 2.0.11
 	* Upgrade SILC to use the 1.1.2 toolkit
 
--- a/NEWS	Fri Sep 14 08:27:26 2007 +0000
+++ b/NEWS	Fri Sep 14 08:31:50 2007 +0000
@@ -7,6 +7,18 @@
 	existing protocol, XMPP, and nifty new certificate management
 	to make sure your IM server is who it says it is.
 
+	Ka-Hing: A number of you noticed crashes when dragging windows
+	around when certain options are enabled. Well, that was my fault,
+	and Sadrul fixed it. So Props to him and poos to me. I haven't
+	done much for this release, but the next one should contain
+	something that I helped work on. Hint: students are cheap slave
+	coders!
+
+	Kevin: I haven't really been coding much in Pidgin, and this
+	release is no exception, but I will be working on getting our
+	wonderful web site to be a little more functional by next
+	release.  I promise!
+
 2.1.1 (8/20/2007):
 	Sean: Continuing our schedule of frequent releases, Pidgin 2.1.1
 	is out. In it, we've addressed a lot of UI issues from our
--- a/configure.ac	Fri Sep 14 08:27:26 2007 +0000
+++ b/configure.ac	Fri Sep 14 08:31:50 2007 +0000
@@ -47,7 +47,7 @@
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [2])
 m4_define([purple_micro_version], [0])
-m4_define([purple_version_suffix], [devel])
+m4_define([purple_version_suffix], [])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
@@ -56,7 +56,7 @@
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [2])
 m4_define([gnt_micro_version], [0])
-m4_define([gnt_version_suffix], [devel])
+m4_define([gnt_version_suffix], [])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
 m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))
--- a/pidgin/gtkdialogs.c	Fri Sep 14 08:27:26 2007 +0000
+++ b/pidgin/gtkdialogs.c	Fri Sep 14 08:31:50 2007 +0000
@@ -365,7 +365,9 @@
 	filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "logo.png", NULL);
 	pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 	g_free(filename);
+#ifdef 0  /* Don't versionize the logo when the logo has the version in it */
 	pidgin_logo_versionize(&pixbuf, logo);
+#endif
 	gtk_widget_destroy(logo);
 	logo = gtk_image_new_from_pixbuf(pixbuf);
 	gdk_pixbuf_unref(pixbuf);