Mercurial Mercurial > loudmouth / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #7 from isbear/master
authorMikael <mikael@lilotux.net>
Thu, 15 Nov 2012 12:18:09 -0800
changeset 642 3810c9e91f8e
parent 639 fffbd7c4f6c5 (current diff)
parent 641 5f8cc804645d (diff)
child 643 e7ef923056d7
Merge pull request #7 from isbear/master Fix mcabber room name
--- a/README	Thu Nov 15 11:31:22 2012 -0800
+++ b/README	Thu Nov 15 12:18:09 2012 -0800
@@ -64,7 +64,7 @@
 <http://loudmouth-project.org>.
 
 This fork of loudmouth is lazily maintained by MCabber community, members
-of which can be found in official mcabber chatroom: <xmpp:mcabber@lilotux.net>.
+of which can be found in official mcabber chatroom: <xmpp:mcabber@conf.lilotux.net>.
 
 Bugs can be also reported (to not lose track of them) to github bugtracker:
 <http://github.com/mcabber/loudmouth/issues>
--- a/loudmouth/lm-ssl-gnutls.c	Thu Nov 15 11:31:22 2012 -0800
+++ b/loudmouth/lm-ssl-gnutls.c	Thu Nov 15 12:18:09 2012 -0800
@@ -199,7 +199,7 @@
 
     gnutls_init (&ssl->gnutls_session, GNUTLS_CLIENT);
     gnutls_priority_set_direct (ssl->gnutls_session,
-                        "NORMAL:+CTYPE-X.509:+CTYPE-OPENPGP:+COMP-DEFLATE",
+                        "NORMAL:+CTYPE-X.509:+CTYPE-OPENPGP:+COMP-DEFLATE:+COMP-NULL",
 			NULL);
     gnutls_credentials_set (ssl->gnutls_session,
                             GNUTLS_CRD_CERTIFICATE,
loudmouth