pidgin: c84a41f4: patch from Martin von Gagern that uses a...

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: c84a41f40179331c218ac05005ce7805129049e5
Ancestor: e347e340d58d48fe4f4011e8b9d77168e4f09fc9
Author: khc at pidgin.im
Date: 2009-02-21T23:26:22
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c84a41f40179331c218ac05005ce7805129049e5

Modified files:
        COPYRIGHT libpurple/plugins/ssl/ssl-gnutls.c

ChangeLog: 

patch from Martin von Gagern that uses a new gnutls option to enable better
compatibility with a msn contact server

Fixes #3456


-------------- next part --------------
============================================================
--- COPYRIGHT	3ff2ad57bb07779567664e343888b5bf8d5e939c
+++ COPYRIGHT	89a9beff1daba8aede31ec18fe3e19168d513ff4
@@ -143,6 +143,7 @@ Max G.
 Adam Fritzler
 Takao Fujiwara
 Max G.
+Martin von Gagern
 Fran?ois Gagn?
 Andrew Gaul
 Evgueni V. Gavrilov
============================================================
--- libpurple/plugins/ssl/ssl-gnutls.c	37ec4c66c78f459d80e7cd1c154b05411de315c4
+++ libpurple/plugins/ssl/ssl-gnutls.c	9f036d72d3d1c8cc2629efa68f609bc8794ff6a0
@@ -256,7 +256,9 @@ ssl_gnutls_connect(PurpleSslConnection *
 	gsc->private_data = gnutls_data;
 
 	gnutls_init(&gnutls_data->session, GNUTLS_CLIENT);
-	gnutls_set_default_priority(gnutls_data->session);
+	if (gnutls_priority_set_direct(gnutls_data->session,
+		                             "NORMAL:%SSL3_RECORD_VERSION", NULL))
+		gnutls_priority_set_direct(gnutls_data->session, "NORMAL", NULL);
 
 	gnutls_certificate_type_set_priority(gnutls_data->session,
 		cert_type_priority);