changeset 31409:8cd02ebf6ed6

merged from im.pidgin.pidgin

--- a/ChangeLog	Tue Nov 23 20:02:24 2010 +0900
+++ b/ChangeLog	Wed Nov 24 19:52:47 2010 +0900
@@ -1,22 +1,25 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.7.7 (??/??/????):
+version 2.7.8 (??/??/????):
+	MSN:
+	* Don't show ourselves in the list of endpoints that can be disconnected.
+
+version 2.7.7 (11/23/2010):
 	General:
-	* Allow multiple certificates to share the same Distinguished Name (DN).
+	* Allow multiple CA certificates to share the same Distinguished Name
+	  (DN).  Partially fixes remaining MSN issues from #12906.
+	* The GNUTLS SSL plugin now discards any certificate (and all subsequent
+	  certificates) in a chain if it did not sign the previous certificate.
 	  Partially fixes remaining MSN issues from #12906.
-	* The GNUTLS SSL plugin now discards any certificate in a chain that did
-	  not sign the previous certificate.  Once one certificate is discarded,
-	  all subsequent certificates are discarded.  Partially fixes remaining
-	  MSN issues from #12906.
+	* Open requests related to a file transfer are now closed when the request
+	  is cancelled locally. (#11666)
 
 	AIM and ICQ:
-	* AIM should now connect if "Use clientLogin" is off and the "Server"
-	  field is set to anything but "login.oscar.aol.com". (#12948)
+	* AIM should now connect if "Use clientLogin" is turned off and the
+	  "Server" field is set to anything other than "login.oscar.aol.com" or
+	  "slogin.oscar.aol.com". (#12948)
 	* Fix a crash on connection loss. (#5927)
 
-	MSN:
-	* Don't show ourselves in the list of endpoints that can be disconnected.
-
 version 2.7.6 (11/21/2010):
 	General:
 	* Included Microsoft Internet Authority 2010 and Microsoft Secure Server

--- a/ChangeLog.API	Tue Nov 23 20:02:24 2010 +0900
+++ b/ChangeLog.API	Wed Nov 24 19:52:47 2010 +0900
@@ -1,5 +1,11 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.7.8 (??/??/????):
+	* No changes
+
+version 2.7.7 (11/23/2010):
+	* No changes
+
 version 2.7.6 (11/21/2010):
 	* No changes
 

--- a/NEWS	Tue Nov 23 20:02:24 2010 +0900
+++ b/NEWS	Wed Nov 24 19:52:47 2010 +0900
@@ -2,6 +2,15 @@
 
 Our development blog is available at: http://planet.pidgin.im
 
+2.7.8 (??/??/????):
+
+2.7.7 (11/23/2010):
+	John: Well, this time around, we should finally have the certificate
+	issue really and fully fixed for all of you MSN users.  Also, we have
+	a few AIM-related fixes in this release, most notably the fix for the
+	new "SSL Handshake Failure" message some of you got after upgrading.
+	That one was an oversight on our part.  Enjoy the fixes!
+
 2.7.6 (11/21/2010):
 	Jorge: In this release I have merged two branches where I have spent
 	most of my time in the last months, the MSNP16 and SLP-rewrite.  I 

--- a/configure.ac	Tue Nov 23 20:02:24 2010 +0900
+++ b/configure.ac	Wed Nov 24 19:52:47 2010 +0900
@@ -46,7 +46,7 @@
 m4_define([purple_lt_current], [7])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [7])
-m4_define([purple_micro_version], [7])
+m4_define([purple_micro_version], [8])
 m4_define([purple_version_suffix], [devel])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
@@ -55,7 +55,7 @@
 m4_define([gnt_lt_current], [8])
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [8])
-m4_define([gnt_micro_version], [4])
+m4_define([gnt_micro_version], [5])
 m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])

--- a/pidgin.spec.in	Tue Nov 23 20:02:24 2010 +0900
+++ b/pidgin.spec.in	Wed Nov 24 19:52:47 2010 +0900
@@ -46,14 +46,14 @@
 %if "%{_vendor}" == "suse"
 # For SuSE:
 BuildRequires: gnutls-devel
-%define sslopts "--enable-gnutls=yes --enable-nss=no"
+%define sslopts --enable-gnutls=yes --enable-nss=no
 %{?_with_dbus:BuildRequires: dbus-1-devel >= 0.35}
 %{!?_without_gstreamer:BuildRequires: gstreamer010-devel >= 0.10}
 Requires(pre): gconf2
 Requires(post): gconf2
 Requires(preun): gconf2
 %else
-%define sslopts "--enable-gnutls=no --enable-nss=yes"
+%define sslopts --enable-gnutls=no --enable-nss=yes
 %{?_with_dbus:BuildRequires: dbus-devel >= 0.35}
 %{!?_without_gstreamer:BuildRequires: gstreamer-devel >= 0.10}
 Requires(pre): GConf2