libpurple 32745:a84c7b556d1b: Added tag v2.10.9 for changeset 94...

commits at adium.im commits at adium.im
Mon Nov 24 19:00:12 UTC 2014


details:	http://hg.adium.im/libpurple/rev/a84c7b556d1b
revision:	32745:a84c7b556d1b
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Sun Feb 02 13:29:02 2014 -0800

Added tag v2.10.9 for changeset 9438f4b2904d
Subject: libpurple 32746:e44f4ee0cf4c: Fix make version-check since I deprecated po/ChangeLog.

details:	http://hg.adium.im/libpurple/rev/e44f4ee0cf4c
revision:	32746:e44f4ee0cf4c
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Sun Feb 02 13:36:33 2014 -0800

Fix make version-check since I deprecated po/ChangeLog.
Subject: libpurple 32747:0a0fe7ea9782: Prep for 2.10.10 development.

details:	http://hg.adium.im/libpurple/rev/0a0fe7ea9782
revision:	32747:0a0fe7ea9782
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Sun Feb 02 20:54:12 2014 -0800

Prep for 2.10.10 development.
Subject: libpurple 32748:d6c77b70ab1c: Add Baurzhan Muftakhidinov as Kazakh translator

details:	http://hg.adium.im/libpurple/rev/d6c77b70ab1c
revision:	32748:d6c77b70ab1c
branch:		release-2.x.y
author:		Richard Laager <rlaager at pidgin.im>
date:		Mon Feb 03 01:49:52 2014 -0600

Add Baurzhan Muftakhidinov as Kazakh translator

The kk.po file I added is an empty stub from Transifex.
Subject: libpurple 32749:ea5534f263bb: Add some missing logging newlines

details:	http://hg.adium.im/libpurple/rev/ea5534f263bb
revision:	32749:ea5534f263bb
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Wed Feb 05 01:44:23 2014 -0500

Add some missing logging newlines
Subject: libpurple 32750:9728bb0f6dcc: Print information about the SSL connection to the debug log

details:	http://hg.adium.im/libpurple/rev/9728bb0f6dcc
revision:	32750:9728bb0f6dcc
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Wed Feb 05 01:45:11 2014 -0500

Print information about the SSL connection to the debug log
Subject: libpurple 32751:ec66c1d980ee: Updated Danish translator.

details:	http://hg.adium.im/libpurple/rev/ec66c1d980ee
revision:	32751:ec66c1d980ee
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Wed Feb 05 23:32:04 2014 -0800

Updated Danish translator.

The translation in 2.10.8 was from him. We haven't had a translation from
the previous Danish translators, and Nicky seems willing to entertain the
idea of providing further translations.
Subject: libpurple 32752:f0b3735c950c: Link to wiki over https

details:	http://hg.adium.im/libpurple/rev/f0b3735c950c
revision:	32752:f0b3735c950c
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Thu Feb 06 00:42:34 2014 -0800

Link to wiki over https
Subject: libpurple 32753:8763d2c7eb4a: Remove translations for three languages with <80 translated strings each.

details:	http://hg.adium.im/libpurple/rev/8763d2c7eb4a
revision:	32753:8763d2c7eb4a
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Thu Feb 06 00:43:23 2014 -0800

Remove translations for three languages with <80 translated strings each.
Subject: libpurple 32754:0e2608c5682d: Backport some warning fixes from default branch

details:	http://hg.adium.im/libpurple/rev/0e2608c5682d
revision:	32754:0e2608c5682d
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Mon Feb 10 16:58:03 2014 +0100

Backport some warning fixes from default branch
Subject: libpurple 32755:df5ea49543fd: Fix another perl warning

details:	http://hg.adium.im/libpurple/rev/df5ea49543fd
revision:	32755:df5ea49543fd
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Mon Feb 10 17:27:36 2014 +0100

Fix another perl warning
Subject: libpurple 32756:2ffc6571dc35: Add configure check for e-d-s being lower than 3.6. Refs #15353

details:	http://hg.adium.im/libpurple/rev/2ffc6571dc35
revision:	32756:2ffc6571dc35
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Mon Feb 10 18:33:29 2014 +0100

Add configure check for e-d-s being lower than 3.6. Refs #15353
Subject: libpurple 32757:27725cc141a8: Fix the last ppc64 warning

details:	http://hg.adium.im/libpurple/rev/27725cc141a8
revision:	32757:27725cc141a8
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Thu Feb 13 17:38:17 2014 +0100

Fix the last ppc64 warning
Subject: libpurple 32758:eeb82d3d33b1: Add missing typedef

details:	http://hg.adium.im/libpurple/rev/eeb82d3d33b1
revision:	32758:eeb82d3d33b1
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Thu Feb 13 18:01:36 2014 +0100

Add missing typedef
Subject: libpurple 32759:c8bb4edd6325: Fix build of Finch against Python3.

details:	http://hg.adium.im/libpurple/rev/c8bb4edd6325
revision:	32759:c8bb4edd6325
branch:		release-2.x.y
author:		Ed Catmur <ed at catmur.co.uk>
date:		Thu Feb 13 20:16:25 2014 -0500

Fix build of Finch against Python3.

Fixes #15969.
Subject: libpurple 32760:a591c0486b04: Use python-config to find Python headers and libraries.

details:	http://hg.adium.im/libpurple/rev/a591c0486b04
revision:	32760:a591c0486b04
branch:		release-2.x.y
author:		Elliott Sales de Andrade <qulogic at pidgin.im>
date:		Thu Feb 13 20:22:10 2014 -0500

Use python-config to find Python headers and libraries.

The current method does not work with Python 3 in Fedora, as the
binary, headers, and libraries are suffixed with '3.3m'. The current
test checks the internal version of Python and see '3.3.2' -> '3.3'.
Subject: libpurple 32761:922e7abddb4d: Fix call to Py_SetProgramName in Python3.

details:	http://hg.adium.im/libpurple/rev/922e7abddb4d
revision:	32761:922e7abddb4d
branch:		release-2.x.y
author:		Elliott Sales de Andrade <qulogic at pidgin.im>
date:		Thu Feb 13 20:33:18 2014 -0500

Fix call to Py_SetProgramName in Python3.

Refs #15969.
Subject: libpurple 32762:12216afa24ab: Fix make distcheck for 2.x.y

details:	http://hg.adium.im/libpurple/rev/12216afa24ab
revision:	32762:12216afa24ab
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Sun Feb 16 20:55:36 2014 +0100

Fix make distcheck for 2.x.y
Subject: libpurple 32763:5167fa79481b: Backport 843aba5973db to 2.x.y

details:	http://hg.adium.im/libpurple/rev/5167fa79481b
revision:	32763:5167fa79481b
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Wed Feb 19 13:25:53 2014 +0100

Backport 843aba5973db to 2.x.y
Subject: libpurple 32764:ced9b5336f86: Fix make distcheck for 2.x.y: clean outstanding perl files

details:	http://hg.adium.im/libpurple/rev/ced9b5336f86
revision:	32764:ced9b5336f86
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Mon Feb 24 15:16:21 2014 +0100

Fix make distcheck for 2.x.y: clean outstanding perl files
Subject: libpurple 32765:ba59da68fb79: Fix another perl cleanup failure

details:	http://hg.adium.im/libpurple/rev/ba59da68fb79
revision:	32765:ba59da68fb79
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Mon Feb 24 15:43:08 2014 +0100

Fix another perl cleanup failure
Subject: libpurple 32766:bf491142b9ce: Fix win32 build

details:	http://hg.adium.im/libpurple/rev/bf491142b9ce
revision:	32766:bf491142b9ce
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Fri Feb 28 17:09:00 2014 +0100

Fix win32 build
Subject: libpurple 32767:c9069e0e3c36: Update internal libgadu to 1.12.0-rc2

details:	http://hg.adium.im/libpurple/rev/c9069e0e3c36
revision:	32767:c9069e0e3c36
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Fri Feb 28 17:29:00 2014 +0100

Update internal libgadu to 1.12.0-rc2
Subject: libpurple 32768:1fec9235461d: Merge... my shame...

details:	http://hg.adium.im/libpurple/rev/1fec9235461d
revision:	32768:1fec9235461d
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Fri Feb 28 17:29:53 2014 +0100

Merge... my shame...
Subject: libpurple 32769:6f98141b4183: Fix libgadu 1.12.0-rc2 win32 build

details:	http://hg.adium.im/libpurple/rev/6f98141b4183
revision:	32769:6f98141b4183
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Fri Feb 28 19:21:22 2014 +0100

Fix libgadu 1.12.0-rc2 win32 build
Subject: libpurple 32770:ab82a7fbe630: Pull some ChangeLog tweaks

details:	http://hg.adium.im/libpurple/rev/ab82a7fbe630
revision:	32770:ab82a7fbe630
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Fri Feb 28 21:08:18 2014 +0100

Pull some ChangeLog tweaks
Subject: libpurple 32771:b29a773d89c1: Avoid camel case function name.

details:	http://hg.adium.im/libpurple/rev/b29a773d89c1
revision:	32771:b29a773d89c1
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Sat Mar 01 10:28:28 2014 -0800

Avoid camel case function name.
Subject: libpurple 32772:1bb4759f7b9b: Remove stray whitespace.

details:	http://hg.adium.im/libpurple/rev/1bb4759f7b9b
revision:	32772:1bb4759f7b9b
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Sat Mar 01 10:29:22 2014 -0800

Remove stray whitespace.
Subject: libpurple 32773:426067e03cfc: Fix build with gnutls < 2.10

details:	http://hg.adium.im/libpurple/rev/426067e03cfc
revision:	32773:426067e03cfc
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Sun Mar 02 01:45:23 2014 +0100

Fix build with gnutls < 2.10
Subject: libpurple 32774:783e5cce1a46: Don't make gnutls 2.10 required

details:	http://hg.adium.im/libpurple/rev/783e5cce1a46
revision:	32774:783e5cce1a46
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Sun Mar 02 10:34:51 2014 +0100

Don't make gnutls 2.10 required
Subject: libpurple 32775:fd11790cc4d6: Update internal libgadu to the current version from git

details:	http://hg.adium.im/libpurple/rev/fd11790cc4d6
revision:	32775:fd11790cc4d6
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Fri Mar 07 23:17:08 2014 +0100

Update internal libgadu to the current version from git
Subject: libpurple 32776:469b0ae5fee1: Correct invalid AC_LANG_PROGRAM uses

details:	http://hg.adium.im/libpurple/rev/469b0ae5fee1
revision:	32776:469b0ae5fee1
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Thu Mar 13 12:16:32 2014 +0100

Correct invalid AC_LANG_PROGRAM uses
Subject: libpurple 32777:2bbaed527d93: Add an empty Latvian translation

details:	http://hg.adium.im/libpurple/rev/2bbaed527d93
revision:	32777:2bbaed527d93
branch:		release-2.x.y
author:		Richard Laager <rlaager at pidgin.im>
date:		Wed Mar 19 17:30:58 2014 -0500

Add an empty Latvian translation
Subject: libpurple 32778:fa4ee5636852: Add an empty Tatar translation

details:	http://hg.adium.im/libpurple/rev/fa4ee5636852
revision:	32778:fa4ee5636852
branch:		release-2.x.y
author:		Richard Laager <rlaager at pidgin.im>
date:		Thu Mar 20 21:35:11 2014 -0500

Add an empty Tatar translation
Subject: libpurple 32779:95c2903f8a73: Update the Occitan translator

details:	http://hg.adium.im/libpurple/rev/95c2903f8a73
revision:	32779:95c2903f8a73
branch:		release-2.x.y
author:		Richard Laager <rlaager at pidgin.im>
date:		Thu Mar 20 21:58:41 2014 -0500

Update the Occitan translator
Subject: libpurple 32780:aa6129a3cf67: Update the Telugu translator

details:	http://hg.adium.im/libpurple/rev/aa6129a3cf67
revision:	32780:aa6129a3cf67
branch:		release-2.x.y
author:		Richard Laager <rlaager at pidgin.im>
date:		Thu Mar 20 22:17:44 2014 -0500

Update the Telugu translator

If the old translator responds to me (or otherwise resurfaces soon), we
should probably revert this.
Subject: libpurple 32781:3bce877e1722: Revert to the old Telugu maintainer

details:	http://hg.adium.im/libpurple/rev/3bce877e1722
revision:	32781:3bce877e1722
branch:		release-2.x.y
author:		Richard Laager <rlaager at pidgin.im>
date:		Fri Mar 21 04:40:05 2014 -0500

Revert to the old Telugu maintainer

The existing translator is active and will coordinate the language in
Transifex.
Subject: libpurple 32782:0143226782bb: Update libgadu to the current version from repo

details:	http://hg.adium.im/libpurple/rev/0143226782bb
revision:	32782:0143226782bb
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Sat Mar 22 00:42:07 2014 +0100

Update libgadu to the current version from repo
Subject: libpurple 32783:f4232b1c3263: Update libgadu yet again

details:	http://hg.adium.im/libpurple/rev/f4232b1c3263
revision:	32783:f4232b1c3263
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Mon Mar 24 19:56:42 2014 +0100

Update libgadu yet again
Subject: libpurple 32784:d1b25cb7efa7: Fix gg compilation on windows

details:	http://hg.adium.im/libpurple/rev/d1b25cb7efa7
revision:	32784:d1b25cb7efa7
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Tue Mar 25 17:35:10 2014 -0400

Fix gg compilation on windows
Subject: libpurple 32785:1271f370849f: Update windows NSS version to 3.16

details:	http://hg.adium.im/libpurple/rev/1271f370849f
revision:	32785:1271f370849f
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Tue Mar 25 17:49:31 2014 -0400

Update windows NSS version to 3.16
Subject: libpurple 32786:c7a49364ce5f: Fix load of warnings on win32

details:	http://hg.adium.im/libpurple/rev/c7a49364ce5f
revision:	32786:c7a49364ce5f
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Wed Mar 26 03:01:13 2014 +0100

Fix load of warnings on win32
Subject: libpurple 32787:4c586de55004: libgadu: pick an upstream patch to fix warnings

details:	http://hg.adium.im/libpurple/rev/4c586de55004
revision:	32787:4c586de55004
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Wed Mar 26 03:13:50 2014 +0100

libgadu: pick an upstream patch to fix warnings
Subject: libpurple 32788:d90854f1bb0f: Update the en_AU translator

details:	http://hg.adium.im/libpurple/rev/d90854f1bb0f
revision:	32788:d90854f1bb0f
branch:		release-2.x.y
author:		Richard Laager <rlaager at pidgin.im>
date:		Fri Mar 28 00:06:21 2014 -0500

Update the en_AU translator
Subject: libpurple 32789:a38dc506e387: Fix the "No CS IP Addresses retrieved!" login failure case.  Even with this

details:	http://hg.adium.im/libpurple/rev/a38dc506e387
revision:	32789:a38dc506e387
branch:		release-2.x.y
author:		John Bailey <rekkanoryo at rekkanoryo.org>
date:		Sun Mar 30 11:18:43 2014 -0400

Fix the "No CS IP Addresses retrieved!" login failure case.  Even with this
failure, though, I was still able to connect via the scsa.msg.yahoo.com fall
back code I wrote to silence a prior round of complaints.  I have no idea why
Adium users and so many others were having trouble.
Subject: libpurple 32790:0acafcabe759: String "Activate which ID?" marked as translatable

details:	http://hg.adium.im/libpurple/rev/0acafcabe759
revision:	32790:0acafcabe759
branch:		release-2.x.y
author:		Bjoern Voigt <bjoern at cs.tu-berlin.de>
date:		Mon Mar 31 23:59:07 2014 +0200

String "Activate which ID?" marked as translatable
Subject: libpurple 32791:5f18de9732c4: Updated German translation

details:	http://hg.adium.im/libpurple/rev/5f18de9732c4
revision:	32791:5f18de9732c4
branch:		release-2.x.y
author:		Bjoern Voigt <bjoern at cs.tu-berlin.de>
date:		Tue Apr 01 00:00:26 2014 +0200

Updated German translation
Subject: libpurple 32792:703d7d7bdf60: Gadu-Gadu: update internal libgadu to fix bad-alignment warnings

details:	http://hg.adium.im/libpurple/rev/703d7d7bdf60
revision:	32792:703d7d7bdf60
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Thu Apr 03 14:48:56 2014 +0200

Gadu-Gadu: update internal libgadu to fix bad-alignment warnings
Subject: libpurple 32793:61c9fdaa71df: Update libgadu once again

details:	http://hg.adium.im/libpurple/rev/61c9fdaa71df
revision:	32793:61c9fdaa71df
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Thu Apr 03 19:11:37 2014 +0200

Update libgadu once again
Subject: libpurple 32794:3edc70bf4e09: Emit sending/sent signals when doing /me irc command. Fixes #15750

details:	http://hg.adium.im/libpurple/rev/3edc70bf4e09
revision:	32794:3edc70bf4e09
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Sun Apr 27 14:27:09 2014 +0200

Emit sending/sent signals when doing /me irc command. Fixes #15750
Subject: libpurple 32795:943ea9a99d37: Add a ChangeLog entry for #15750

details:	http://hg.adium.im/libpurple/rev/943ea9a99d37
revision:	32795:943ea9a99d37
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Sun Apr 27 14:31:54 2014 +0200

Add a ChangeLog entry for #15750
Subject: libpurple 32796:b68ad4695336: libpurple3 compatibility: don't drop encrypted passwords

details:	http://hg.adium.im/libpurple/rev/b68ad4695336
revision:	32796:b68ad4695336
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Sun Apr 27 17:26:40 2014 +0200

libpurple3 compatibility: don't drop encrypted passwords
Subject: libpurple 32797:ada9d85d4e38: libpurple3 compatibility: fix loading GTalk and Facebook XMPP accounts

details:	http://hg.adium.im/libpurple/rev/ada9d85d4e38
revision:	32797:ada9d85d4e38
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Sun Apr 27 22:31:20 2014 +0200

libpurple3 compatibility: fix loading GTalk and Facebook XMPP accounts
Subject: libpurple 32798:d13ff446f400: Fix a warning

details:	http://hg.adium.im/libpurple/rev/d13ff446f400
revision:	32798:d13ff446f400
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Wed Apr 30 11:56:33 2014 +0200

Fix a warning
Subject: libpurple 32799:d603bfb42fd9: Fix some coverity CWE-484 issues

details:	http://hg.adium.im/libpurple/rev/d603bfb42fd9
revision:	32799:d603bfb42fd9
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Thu May 01 00:14:57 2014 +0200

Fix some coverity CWE-484 issues
Subject: libpurple 32800:cde50837937d: Ifdef some dead code, fixing coverity bugs

details:	http://hg.adium.im/libpurple/rev/cde50837937d
revision:	32800:cde50837937d
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Thu May 01 01:32:03 2014 +0200

Ifdef some dead code, fixing coverity bugs
Subject: libpurple 32801:3e04feabcbfb: Fix some Coverity CWE-457 bugs

details:	http://hg.adium.im/libpurple/rev/3e04feabcbfb
revision:	32801:3e04feabcbfb
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Thu May 01 01:45:25 2014 +0200

Fix some Coverity CWE-457 bugs
Subject: libpurple 32802:4f70b59638a1: Fix a typo

details:	http://hg.adium.im/libpurple/rev/4f70b59638a1
revision:	32802:4f70b59638a1
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Fri May 02 10:57:43 2014 +0200

Fix a typo
Subject: libpurple 32803:e66c9970ddc0: List libpurple and Windows changes above PRPL changes.

details:	http://hg.adium.im/libpurple/rev/e66c9970ddc0
revision:	32803:e66c9970ddc0
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Sun May 04 13:59:47 2014 -0700

List libpurple and Windows changes above PRPL changes.
Subject: libpurple 32804:e9fc7d739621: Don't care about cast-align for 2.x.y on clang

details:	http://hg.adium.im/libpurple/rev/e9fc7d739621
revision:	32804:e9fc7d739621
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 11:00:48 2014 +0200

Don't care about cast-align for 2.x.y on clang
Subject: libpurple 32805:ad46974535ba: Backport makefile fix to not regenerate revision on each make

details:	http://hg.adium.im/libpurple/rev/ad46974535ba
revision:	32805:ad46974535ba
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 12:24:46 2014 +0200

Backport makefile fix to not regenerate revision on each make
Subject: libpurple 32806:da1a0c49f291: Fix bonjour warning

details:	http://hg.adium.im/libpurple/rev/da1a0c49f291
revision:	32806:da1a0c49f291
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 12:25:04 2014 +0200

Fix bonjour warning
Subject: libpurple 32807:3f076483405f: Gadu-Gadu: use asynchronous purple_dnsquery_a_account instead of deprecated gg_gethostbyname

details:	http://hg.adium.im/libpurple/rev/3f076483405f
revision:	32807:3f076483405f
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 12:25:44 2014 +0200

Gadu-Gadu: use asynchronous purple_dnsquery_a_account instead of deprecated gg_gethostbyname
Subject: libpurple 32808:9b7b48f446f4: Backport warning fixes from default

details:	http://hg.adium.im/libpurple/rev/9b7b48f446f4
revision:	32808:9b7b48f446f4
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 12:43:32 2014 +0200

Backport warning fixes from default
Subject: libpurple 32809:c0b60f37a7db: Backport warning fixes for libpurple from default

details:	http://hg.adium.im/libpurple/rev/c0b60f37a7db
revision:	32809:c0b60f37a7db
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 13:03:47 2014 +0200

Backport warning fixes for libpurple from default
Subject: libpurple 32810:ca8204d663bf: Backport warning fixes for Finch from default

details:	http://hg.adium.im/libpurple/rev/ca8204d663bf
revision:	32810:ca8204d663bf
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 13:26:40 2014 +0200

Backport warning fixes for Finch from default
Subject: libpurple 32811:b44c08754471: Backport warning fixes for Pidgin from default

details:	http://hg.adium.im/libpurple/rev/b44c08754471
revision:	32811:b44c08754471
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 13:41:54 2014 +0200

Backport warning fixes for Pidgin from default
Subject: libpurple 32812:e8c02ea0800b: Backport warning fixes for perl from default

details:	http://hg.adium.im/libpurple/rev/e8c02ea0800b
revision:	32812:e8c02ea0800b
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 13:52:59 2014 +0200

Backport warning fixes for perl from default
Subject: libpurple 32813:091d710e14c3: Fix coverity 732034 (CWE-484) again

details:	http://hg.adium.im/libpurple/rev/091d710e14c3
revision:	32813:091d710e14c3
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 13:56:02 2014 +0200

Fix coverity 732034 (CWE-484) again
Subject: libpurple 32814:029ab6fae0e6: Backport more warning fixes for prpls from default

details:	http://hg.adium.im/libpurple/rev/029ab6fae0e6
revision:	32814:029ab6fae0e6
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 14:58:47 2014 +0200

Backport more warning fixes for prpls from default
Subject: libpurple 32815:f7d395700c8b: Backport more warning fixes for libpurple from default

details:	http://hg.adium.im/libpurple/rev/f7d395700c8b
revision:	32815:f7d395700c8b
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 15:05:42 2014 +0200

Backport more warning fixes for libpurple from default
Subject: libpurple 32816:c305fb08c0d1: Backport more warning fixes for libpurple tests from default

details:	http://hg.adium.im/libpurple/rev/c305fb08c0d1
revision:	32816:c305fb08c0d1
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 15:06:30 2014 +0200

Backport more warning fixes for libpurple tests from default
Subject: libpurple 32817:5dc98ddc6a9a: Backport more warning fixes for Pidgin and Finch from default

details:	http://hg.adium.im/libpurple/rev/5dc98ddc6a9a
revision:	32817:5dc98ddc6a9a
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 15:17:11 2014 +0200

Backport more warning fixes for Pidgin and Finch from default
Subject: libpurple 32818:65200382abb9: Backport warning fixes for tcl from deafult

details:	http://hg.adium.im/libpurple/rev/65200382abb9
revision:	32818:65200382abb9
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 15:59:09 2014 +0200

Backport warning fixes for tcl from deafult
Subject: libpurple 32819:7b2dd0100fd6: Fix better

details:	http://hg.adium.im/libpurple/rev/7b2dd0100fd6
revision:	32819:7b2dd0100fd6
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 16:15:03 2014 +0200

Fix better
Subject: libpurple 32820:dcbaf8e5e624: Better warning fixes

details:	http://hg.adium.im/libpurple/rev/dcbaf8e5e624
revision:	32820:dcbaf8e5e624
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 18:28:56 2014 +0200

Better warning fixes
Subject: libpurple 32821:e6937e52930b: Fix some CWE-252 coverity warnings

details:	http://hg.adium.im/libpurple/rev/e6937e52930b
revision:	32821:e6937e52930b
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 19:38:50 2014 +0200

Fix some CWE-252 coverity warnings
Subject: libpurple 32822:34a67264df99: Fix some CWE-476 coverity warnings

details:	http://hg.adium.im/libpurple/rev/34a67264df99
revision:	32822:34a67264df99
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 20:07:13 2014 +0200

Fix some CWE-476 coverity warnings
Subject: libpurple 32823:bd0a2508b477: Fix some other coverity warnings

details:	http://hg.adium.im/libpurple/rev/bd0a2508b477
revision:	32823:bd0a2508b477
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 20:36:57 2014 +0200

Fix some other coverity warnings
Subject: libpurple 32824:4a39ea245fe6: Fix build

details:	http://hg.adium.im/libpurple/rev/4a39ea245fe6
revision:	32824:4a39ea245fe6
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 20:39:01 2014 +0200

Fix build
Subject: libpurple 32825:d0bbb2dad7f3: Fix some CWE-367 coverity warnings

details:	http://hg.adium.im/libpurple/rev/d0bbb2dad7f3
revision:	32825:d0bbb2dad7f3
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 21:40:30 2014 +0200

Fix some CWE-367 coverity warnings
Subject: libpurple 32826:c0db123ecd4e: Fix a warning

details:	http://hg.adium.im/libpurple/rev/c0db123ecd4e
revision:	32826:c0db123ecd4e
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 21:41:26 2014 +0200

Fix a warning
Subject: libpurple 32827:23e05a4a90b3: Silence some already dismissed coverity warnings

details:	http://hg.adium.im/libpurple/rev/23e05a4a90b3
revision:	32827:23e05a4a90b3
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue May 06 23:24:53 2014 +0200

Silence some already dismissed coverity warnings
Subject: libpurple 32828:aeaebd2ba4af: Silence more already dismissed coverity warnings

details:	http://hg.adium.im/libpurple/rev/aeaebd2ba4af
revision:	32828:aeaebd2ba4af
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Wed May 07 00:04:50 2014 +0200

Silence more already dismissed coverity warnings
Subject: libpurple 32829:5841bd4da162: Fix even more coverity warnings

details:	http://hg.adium.im/libpurple/rev/5841bd4da162
revision:	32829:5841bd4da162
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Wed May 07 00:39:44 2014 +0200

Fix even more coverity warnings
Subject: libpurple 32830:77d70db4a1d1: Better comment for #8477

details:	http://hg.adium.im/libpurple/rev/77d70db4a1d1
revision:	32830:77d70db4a1d1
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Wed May 07 00:50:48 2014 +0200

Better comment for #8477
Subject: libpurple 32831:10ae4e6808e5: Silence perl coverity warnings

details:	http://hg.adium.im/libpurple/rev/10ae4e6808e5
revision:	32831:10ae4e6808e5
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Wed May 07 01:28:19 2014 +0200

Silence perl coverity warnings
Subject: libpurple 32832:38c5d7673339: Fix newly introduced blist bug

details:	http://hg.adium.im/libpurple/rev/38c5d7673339
revision:	32832:38c5d7673339
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Wed May 07 11:44:36 2014 +0200

Fix newly introduced blist bug
Subject: libpurple 32833:b94a61dfd064: Backport c1a41f0d1916

details:	http://hg.adium.im/libpurple/rev/b94a61dfd064
revision:	32833:b94a61dfd064
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Wed May 07 11:56:53 2014 +0200

Backport c1a41f0d1916
Subject: libpurple 32834:4db2936dd842: Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)

details:	http://hg.adium.im/libpurple/rev/4db2936dd842
revision:	32834:4db2936dd842
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Wed May 07 13:09:06 2014 +0200

Backport 407e0fa6f7d1: don't split contacts on default group (xmpp)
Subject: libpurple 32835:250cf53c45ad: Don't store default group name

details:	http://hg.adium.im/libpurple/rev/250cf53c45ad
revision:	32835:250cf53c45ad
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Wed May 07 13:15:19 2014 +0200

Don't store default group name
Subject: libpurple 32836:a351cbf422ed: Backport 68d162284480: facebook roster quirks

details:	http://hg.adium.im/libpurple/rev/a351cbf422ed
revision:	32836:a351cbf422ed
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Wed May 07 16:22:23 2014 +0200

Backport 68d162284480: facebook roster quirks
Subject: libpurple 32837:78c429137f3d: Fill ChangeLog for Facebook XMPP roster fixes

details:	http://hg.adium.im/libpurple/rev/78c429137f3d
revision:	32837:78c429137f3d
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Wed May 07 16:36:36 2014 +0200

Fill ChangeLog for Facebook XMPP roster fixes
Subject: libpurple 32838:e8542f42dd97: Facebook XMPP: perform roster cleanup only once

details:	http://hg.adium.im/libpurple/rev/e8542f42dd97
revision:	32838:e8542f42dd97
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Wed May 07 17:11:45 2014 +0200

Facebook XMPP: perform roster cleanup only once
Subject: libpurple 32839:cc1066974ce4: Fix build

details:	http://hg.adium.im/libpurple/rev/cc1066974ce4
revision:	32839:cc1066974ce4
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Wed May 07 17:16:22 2014 +0200

Fix build
Subject: libpurple 32840:61e8e081e93c: Fix build for glib < 2.32

details:	http://hg.adium.im/libpurple/rev/61e8e081e93c
revision:	32840:61e8e081e93c
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Fri May 09 21:43:36 2014 +0200

Fix build for glib < 2.32
Subject: libpurple 32841:256604cbbe34: Make it possible to move buddies out of default group

details:	http://hg.adium.im/libpurple/rev/256604cbbe34
revision:	32841:256604cbbe34
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Sun May 11 22:22:03 2014 +0200

Make it possible to move buddies out of default group
Subject: libpurple 32842:2897add11757: Silence some coverity false positives

details:	http://hg.adium.im/libpurple/rev/2897add11757
revision:	32842:2897add11757
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Mon May 12 21:13:35 2014 +0200

Silence some coverity false positives
Subject: libpurple 32843:ee9d95cb8ee6: Fix coverity log_reader issues

details:	http://hg.adium.im/libpurple/rev/ee9d95cb8ee6
revision:	32843:ee9d95cb8ee6
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Mon May 12 21:22:30 2014 +0200

Fix coverity log_reader issues
Subject: libpurple 32844:175e769076e1: Fix newly generated coverity warnings

details:	http://hg.adium.im/libpurple/rev/175e769076e1
revision:	32844:175e769076e1
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Mon May 12 22:08:04 2014 +0200

Fix newly generated coverity warnings
Subject: libpurple 32845:fc5300cb3617: Get rid of fair amount of copy-pasta and coverity warnings

details:	http://hg.adium.im/libpurple/rev/fc5300cb3617
revision:	32845:fc5300cb3617
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Mon May 12 22:37:06 2014 +0200

Get rid of fair amount of copy-pasta and coverity warnings
Subject: libpurple 32846:cd7db320cf5c: Fix coverity regression warnings

details:	http://hg.adium.im/libpurple/rev/cd7db320cf5c
revision:	32846:cd7db320cf5c
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Mon May 12 23:32:00 2014 +0200

Fix coverity regression warnings
Subject: libpurple 32847:9a2250c4e9d1: Fix Coverity TOCTOU warnings

details:	http://hg.adium.im/libpurple/rev/9a2250c4e9d1
revision:	32847:9a2250c4e9d1
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Mon May 12 23:55:54 2014 +0200

Fix Coverity TOCTOU warnings
Subject: libpurple 32848:e2ef692ff10a: Fix outstaning Coverity bugs

details:	http://hg.adium.im/libpurple/rev/e2ef692ff10a
revision:	32848:e2ef692ff10a
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Thu May 15 15:01:47 2014 +0200

Fix outstaning Coverity bugs
Subject: libpurple 32849:c986b1e3fa1d: Silence a result_independent_of_operands coverity false positive

details:	http://hg.adium.im/libpurple/rev/c986b1e3fa1d
revision:	32849:c986b1e3fa1d
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Thu May 15 15:19:58 2014 +0200

Silence a result_independent_of_operands coverity false positive
Subject: libpurple 32850:8f2d69e2b8b5: Backport better zephyr coverity fix from default

details:	http://hg.adium.im/libpurple/rev/8f2d69e2b8b5
revision:	32850:8f2d69e2b8b5
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Thu May 15 17:29:04 2014 +0200

Backport better zephyr coverity fix from default
Subject: libpurple 32851:7f35f441b939: Fix a coverity typo

details:	http://hg.adium.im/libpurple/rev/7f35f441b939
revision:	32851:7f35f441b939
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Thu May 15 17:30:07 2014 +0200

Fix a coverity typo
Subject: libpurple 32852:b621a018a338: Coverity bug is now a false positive

details:	http://hg.adium.im/libpurple/rev/b621a018a338
revision:	32852:b621a018a338
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Thu May 15 21:08:10 2014 +0200

Coverity bug is now a false positive
Subject: libpurple 32853:7bbbbfa2439e: Fix win32 build

details:	http://hg.adium.im/libpurple/rev/7bbbbfa2439e
revision:	32853:7bbbbfa2439e
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Fri May 16 11:01:41 2014 -0400

Fix win32 build
Subject: libpurple 32854:d9bdf2de2504: Allan Nordh?y is taking over the Bokm?l Norwegian translation

details:	http://hg.adium.im/libpurple/rev/d9bdf2de2504
revision:	32854:d9bdf2de2504
branch:		release-2.x.y
author:		Richard Laager <rlaager at pidgin.im>
date:		Tue May 20 15:58:29 2014 -0500

Allan Nordh?y is taking over the Bokm?l Norwegian translation
Subject: libpurple 32855:79575a14bd98: Add Akmal Khushvakov for the Uzbek translation

details:	http://hg.adium.im/libpurple/rev/79575a14bd98
revision:	32855:79575a14bd98
branch:		release-2.x.y
author:		Richard Laager <rlaager at pidgin.im>
date:		Thu May 22 18:12:55 2014 -0500

Add Akmal Khushvakov for the Uzbek translation

Again, this is currently an empty .po file.
Subject: libpurple 32856:6f13159fa4fd: Add Chandrakant Dhutadmal for three languages

details:	http://hg.adium.im/libpurple/rev/6f13159fa4fd
revision:	32856:6f13159fa4fd
branch:		release-2.x.y
author:		Richard Laager <rlaager at pidgin.im>
date:		Thu May 22 18:27:09 2014 -0500

Add Chandrakant Dhutadmal for three languages
Subject: libpurple 32857:385126da0582: Add KNTRO for Argentine Spanish

details:	http://hg.adium.im/libpurple/rev/385126da0582
revision:	32857:385126da0582
branch:		release-2.x.y
author:		Richard Laager <rlaager at pidgin.im>
date:		Thu May 22 18:35:00 2014 -0500

Add KNTRO for Argentine Spanish
Subject: libpurple 32858:0e8bb1df9718: Update internal libgadu to 1.12.0

details:	http://hg.adium.im/libpurple/rev/0e8bb1df9718
revision:	32858:0e8bb1df9718
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Mon Jun 16 23:01:47 2014 +0200

Update internal libgadu to 1.12.0
Subject: libpurple 32859:f1c54a78d896: Better check for libgadu GPL compliance, some tidying up

details:	http://hg.adium.im/libpurple/rev/f1c54a78d896
revision:	32859:f1c54a78d896
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue Jun 17 00:03:58 2014 +0200

Better check for libgadu GPL compliance, some tidying up
Subject: libpurple 32860:99a1117a296f: Gadu-Gadu: revert things accidentally removed, fix build

details:	http://hg.adium.im/libpurple/rev/99a1117a296f
revision:	32860:99a1117a296f
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue Jun 17 01:43:39 2014 +0200

Gadu-Gadu: revert things accidentally removed, fix build
Subject: libpurple 32861:88dcb1854782: German translation update

details:	http://hg.adium.im/libpurple/rev/88dcb1854782
revision:	32861:88dcb1854782
branch:		release-2.x.y
author:		Bjoern Voigt <bjoern at cs.tu-berlin.de>
date:		Fri Jun 20 19:20:42 2014 +0200

German translation update
Subject: libpurple 32862:c6926e608dc4: Allow incoming IQ stanzas with an empty 'from' if they're in response to

details:	http://hg.adium.im/libpurple/rev/c6926e608dc4
revision:	32862:c6926e608dc4
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Sun Jun 22 17:48:53 2014 -0700

Allow incoming IQ stanzas with an empty 'from' if they're in response to
an outgoing stanza to our bare or full JID. Patch from Thijs Alkemade
from https://developer.pidgin.im/ticket/15879

Fixes #15879
Subject: libpurple 32863:2948449ffd12: Enhance the "View Certificate" functionality to show issuer information. Refs #7034

details:	http://hg.adium.im/libpurple/rev/2948449ffd12
revision:	32863:2948449ffd12
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Wed Jun 25 18:41:59 2014 -0400

Enhance the "View Certificate" functionality to show issuer information. Refs #7034
Subject: libpurple 32864:33c30c4b33b4: Clarify docs - the PurpleCertificate from purple_certificate_pool_retrieve must

details:	http://hg.adium.im/libpurple/rev/33c30c4b33b4
revision:	32864:33c30c4b33b4
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Wed Jun 25 18:57:26 2014 -0400

Clarify docs - the PurpleCertificate from purple_certificate_pool_retrieve must
be freed using purple_certificate_destroy.
Subject: libpurple 32865:42ba908c25c7: Fix Yahoo login when using the GnuTLS library for TLS connections.

details:	http://hg.adium.im/libpurple/rev/42ba908c25c7
revision:	32865:42ba908c25c7
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Mon Jul 07 00:09:12 2014 -0700

Fix Yahoo login when using the GnuTLS library for TLS connections.

I changed our gnutls plugin to always treat a closed TCP connection
as if the remote server cleanly terminated the SSL session. I think
it's sad that this is necessary, but I also think it's fairly
harmless. See my comments in the code for details.
Subject: libpurple 32866:b952e1fee6ac: German translation update

details:	http://hg.adium.im/libpurple/rev/b952e1fee6ac
revision:	32866:b952e1fee6ac
branch:		release-2.x.y
author:		Bjoern Voigt <bjoern at cs.tu-berlin.de>
date:		Sat Jul 12 10:27:17 2014 +0200

German translation update
Subject: libpurple 32867:f4e63e354f45: Allow and prefer TLS 1.2 and 1.1 when using libnss. Patch from Elrond,

details:	http://hg.adium.im/libpurple/rev/f4e63e354f45
revision:	32867:f4e63e354f45
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Sat Aug 16 16:35:40 2014 -0700

Allow and prefer TLS 1.2 and 1.1 when using libnss. Patch from Elrond,
with additional logging from Ashish Gupta.

Fixes #15909

FYI gnutls enables TLS 1.2 and 1.1 by default, when available, so there's
no need to mirror this change in that code.
Subject: libpurple 32868:a8b55b63ecbb: Print TLS versions as hex, because that's how they're defined and

details:	http://hg.adium.im/libpurple/rev/a8b55b63ecbb
revision:	32868:a8b55b63ecbb
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Fri Sep 12 11:09:41 2014 -0700

Print TLS versions as hex, because that's how they're defined and
they're more human-readable this way.
Subject: libpurple 32869:d13511faaeec: Update NSS to 3.17.1 for the windows build

details:	http://hg.adium.im/libpurple/rev/d13511faaeec
revision:	32869:d13511faaeec
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Sat Sep 27 21:31:32 2014 -0400

Update NSS to 3.17.1 for the windows build
Subject: libpurple 32870:89bb3eaa33b9: Add support for doing the win32 signing with signtool so that we can make SHA256 signatures

details:	http://hg.adium.im/libpurple/rev/89bb3eaa33b9
revision:	32870:89bb3eaa33b9
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Sat Sep 27 22:28:08 2014 -0400

Add support for doing the win32 signing with signtool so that we can make SHA256 signatures
Subject: libpurple 32871:90c81031ac46: Only attempt to change the allowed TLS version range if it's supported.

details:	http://hg.adium.im/libpurple/rev/90c81031ac46
revision:	32871:90c81031ac46
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Sun Sep 28 19:07:00 2014 -0700

Only attempt to change the allowed TLS version range if it's supported.

The necessary functions were added in NSS 3.14.

Hopefully fixes the Jenkins build on debian-ppc64, which is apparently
using a pretty old version of NSS?
https://www.guifications.org/jenkins/view/Pidgin/job/pidgin-debian-ppc64-2.x.y/

Thanks to Tomasz for noticing that it was broken.
Subject: libpurple 32872:6d2325070ec8: Change this to a preprocessor check.

details:	http://hg.adium.im/libpurple/rev/6d2325070ec8
revision:	32872:6d2325070ec8
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Mon Sep 29 23:20:03 2014 -0700

Change this to a preprocessor check.

Obviously this needs to happen at the preprocessor level because
SSLVersionRange won't exist in old versions. I'm not sure when
these constants started appearing... I'm kinda just hoping they've
been around as long as the NSS_VersionCheck function (NSS 3.2, I think,
which was many years ago). I might look into it. But checking this
in now to get in before the nightly Jenkins build for ppc.
Subject: libpurple 32873:2efc22e824ab: Remove debug statement.

details:	http://hg.adium.im/libpurple/rev/2efc22e824ab
revision:	32873:2efc22e824ab
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Tue Sep 30 07:39:51 2014 -0700

Remove debug statement.
Subject: libpurple 32874:1a8a6a18e76e: Gadu-Gadu: fix protobuf-c undefined behaviour. Fixes #16327

details:	http://hg.adium.im/libpurple/rev/1a8a6a18e76e
revision:	32874:1a8a6a18e76e
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Sun Oct 12 19:53:18 2014 +0200

Gadu-Gadu: fix protobuf-c undefined behaviour. Fixes #16327
Subject: libpurple 32875:f2c70cf69561: Translation updates from Transifex.

details:	http://hg.adium.im/libpurple/rev/f2c70cf69561
revision:	32875:f2c70cf69561
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Thu Oct 16 15:57:58 2014 -0700

Translation updates from Transifex.

Obtained using the instructions at https://developer.pidgin.im/wiki/ReleaseProcess
Subject: libpurple 32876:89c89c449595: Use a larger buffer size for untarred filenames.

details:	http://hg.adium.im/libpurple/rev/89c89c449595
revision:	32876:89c89c449595
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Sat Mar 01 16:35:47 2014 -0800

Use a larger buffer size for untarred filenames.

Only used for untarring smiley themes on Windows.
I suspect this won't affect anything. 256 just seems very
small. 4096 seems less likely to lead to truncated filenames
and I'm not worried about trying to open a filename that's
too long for the OS--I think this code handles that sanely.
Subject: libpurple 32877:8f870b9011c9: Fix incorrect uses of strncpy().

details:	http://hg.adium.im/libpurple/rev/8f870b9011c9
revision:	32877:8f870b9011c9
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Sat Mar 01 16:58:05 2014 -0800

Fix incorrect uses of strncpy().

I think these aren't actually a problem because prefix is 155 bytes and
filename is 100 bytes, but that's no excuse for writing bad code.

The third argument to strncpy is intended to be the size of the destination
buffer--not the size of the source. We have less error-prone functions now,
let's use them.
Subject: libpurple 32878:f0861dc04cf3: ACTUALLY use size of destination buffer.

details:	http://hg.adium.im/libpurple/rev/f0861dc04cf3
revision:	32878:f0861dc04cf3
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Sat Mar 01 17:00:29 2014 -0800

ACTUALLY use size of destination buffer.

Whoops :-P
Subject: libpurple 32879:38653c63a0d2: Fix sizeof calls.

details:	http://hg.adium.im/libpurple/rev/38653c63a0d2
revision:	32879:38653c63a0d2
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Sat Mar 01 17:04:55 2014 -0800

Fix sizeof calls.

Sorry, forgot that sizeof(pointer to stack buffer) doesn't do what
I want.
Subject: libpurple 32880:a9504b165b27: Rip out "only" list support from our Windows untar code.

details:	http://hg.adium.im/libpurple/rev/a9504b165b27
revision:	32880:a9504b165b27
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Sat Mar 01 17:13:32 2014 -0800

Rip out "only" list support from our Windows untar code.

We don't use it, and it's easier for me to rip it out than try to
figure out if my change broke the if statement here.
Subject: libpurple 32881:f38a5005e8a8: Don't reuse the n2 variable.

details:	http://hg.adium.im/libpurple/rev/f38a5005e8a8
revision:	32881:f38a5005e8a8
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Tue Mar 04 23:01:37 2014 -0800

Don't reuse the n2 variable.

Use a separate variable, just to avoid confusion. Local variables
are EXTREMELY cheap, since they're just an address on the stack.

Using separate variables for separate uses reduces chances of bugs.
Subject: libpurple 32882:68b8eb10977f: Fix a bug in the untar code that we use on Windows where we

details:	http://hg.adium.im/libpurple/rev/68b8eb10977f
revision:	32882:68b8eb10977f
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Tue Mar 04 23:12:23 2014 -0800

Fix a bug in the untar code that we use on Windows where we
weren't stripping the drive letter from the path of files in the
tar archive, which could allow a malicious tar file to overwrite
arbitrary files on the file system.

Thanks to Yves Younan of Sourcefire VRT for discovering this and
reporting it to us.
Subject: libpurple 32883:6c4d5b524296: Merge

details:	http://hg.adium.im/libpurple/rev/6c4d5b524296
revision:	32883:6c4d5b524296
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Mon Mar 24 20:01:11 2014 -0400

Merge
Subject: libpurple 32884:6436e14bdb9d: Add bounds checking when parsing emoticon responses in MXit. This fixes

details:	http://hg.adium.im/libpurple/rev/6436e14bdb9d
revision:	32884:6436e14bdb9d
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Mon Apr 07 23:45:55 2014 -0700

Add bounds checking when parsing emoticon responses in MXit. This fixes
a potential remote crash when parsing a malformed emoticon response.
We'll need to get a CVE ID for this.

Discovered by Yves Younan and Richard Johnson of Sourcefire VRT. Thanks
to Sourcefire VRT for finding this and reporting it to us!
Subject: libpurple 32885:44fd89158777: In Novell Groupwise, fix potential remote crash parsing server message

details:	http://hg.adium.im/libpurple/rev/44fd89158777
revision:	32885:44fd89158777
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Tue Apr 08 00:31:25 2014 -0700

In Novell Groupwise, fix potential remote crash parsing server message
that indicates that a large amount of memory should be allocated. I
added arbitrary max size checks that are hopefully larger than any real
expected value. It was kinda weird that the existing check on checked
MAXINT. We'll want to request a CVE ID for this.

Discovered by Yves Younan and Richard Johnson of Sourcefire VRT
Subject: libpurple 32886:a324d01ba1c5: Manual merge. Only 1 easy conflict in ChangeLog.

details:	http://hg.adium.im/libpurple/rev/a324d01ba1c5
revision:	32886:a324d01ba1c5
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Sat Apr 12 22:28:05 2014 -0700

Manual merge. Only 1 easy conflict in ChangeLog.
Subject: libpurple 32887:be8209a19937: Merge pidgin/main branch release-2.x.y into private/main branch release-2.x.y.

details:	http://hg.adium.im/libpurple/rev/be8209a19937
revision:	32887:be8209a19937
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Sun May 04 14:33:20 2014 -0700

Merge pidgin/main branch release-2.x.y into private/main branch release-2.x.y.
Only one file with conflicts: ChangeLog.
Subject: libpurple 32888:c4ebf4d738f9: Pull changes from ssh://hg@hg.pidgin.im/pidgin/main

details:	http://hg.adium.im/libpurple/rev/c4ebf4d738f9
revision:	32888:c4ebf4d738f9
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Tue Jun 17 23:14:13 2014 -0700

Pull changes from ssh://hg@hg.pidgin.im/pidgin/main
Easy manual merge: Only conflicts were in ChangeLog.
Subject: libpurple 32889:16e588dfd8c5: Merge changes from the pidgin.main release-2.x.y branch into

details:	http://hg.adium.im/libpurple/rev/16e588dfd8c5
revision:	32889:16e588dfd8c5
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Mon Jul 07 23:59:49 2014 -0700

Merge changes from the pidgin.main release-2.x.y branch into
the private release-2.x.y.

No manual changes needed.
Subject: libpurple 32890:db951baf06ac: Merge the release-2.x.y branch from the main pidgin/main repo

details:	http://hg.adium.im/libpurple/rev/db951baf06ac
revision:	32890:db951baf06ac
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Thu Oct 09 20:56:08 2014 -0700

Merge the release-2.x.y branch from the main pidgin/main repo
into the release-2.x.y branch in our private repo.
Subject: libpurple 32891:2e4475087f04: Fix basic constraints checking for both our SSL plugins.

details:	http://hg.adium.im/libpurple/rev/2e4475087f04
revision:	32891:2e4475087f04
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Sun Oct 12 23:28:58 2014 -0700

Fix basic constraints checking for both our SSL plugins.

This was reported to our private security at pidgin.im mailing list
by an anonymous person and Jacob Appelbaum of the Tor project.

The general problem is described by Moxie Marlinspike here:
http://www.thoughtcrime.org/ie-ssl-chain.txt

Turns out BOTH of our SSL/TLS plugins are vulnerable to this. It allows
a malicious man-in-the-middle to impersonate an https server accessed by
Pidgin.

The fix for this was difficult. We'd really like to just delegate all cert
validate to the NSS or GnuTLS plugins and not do any of it ourselves, because
they're experts and we're not. And this is essentially the change we made for
NSS. However, this was difficult for GnuTLS because we need a context that we
don't have access to in the right function. We could have done it, but it
would have been a little hacky. So for our GnuTLS plugin we added basic
constraints checking ourselves. In Pidgin 3.0.0 would should clean this up
and remove a lot of internal cert validation and ALWAYS delegate to the
SSL/TLS library.

The NSS parts of this patch were written by Kai Engert and Daniel Atallah.
I wrote the GnuTLS parts.

We'll be requesting a CVE number for this.

Also, my thanks to Jacob Appelbaum and Moxie Marlinspike for their efforts
over many years to improve the security of the software that we use on a
daily basis. They are both stand-out citizens who have made contributions
to protect the privacy of all internet users. Thanks, guys!
Subject: libpurple 32892:c890736a8d5a: Add placeholder CVE # to make it more likely we'll remember to enter it here.

details:	http://hg.adium.im/libpurple/rev/c890736a8d5a
revision:	32892:c890736a8d5a
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Mon Oct 13 23:06:08 2014 -0700

Add placeholder CVE # to make it more likely we'll remember to enter it here.
Subject: libpurple 32893:ea46ab68f0dc: Fix a possible information leak when preping XMPP JIDs.

details:	http://hg.adium.im/libpurple/rev/ea46ab68f0dc
revision:	32893:ea46ab68f0dc
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Mon Oct 13 23:47:37 2014 -0700

Fix a possible information leak when preping XMPP JIDs.

Discovered and fixed by Thijs Alkemade and Paul Aurich and reported
to us privately on our security at pidgin.im mailing list.
Subject: libpurple 32894:5c2b82c2873d: Add CVE values, update Sourcefire VRT reference to Cisco Talos

details:	http://hg.adium.im/libpurple/rev/5c2b82c2873d
revision:	32894:5c2b82c2873d
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Tue Oct 14 12:47:43 2014 -0400

Add CVE values, update Sourcefire VRT reference to Cisco Talos
Subject: libpurple 32895:bc2dd1ef2a42: Merge pidgin/main release-2.x.y branch into private/main release-2.x.y

details:	http://hg.adium.im/libpurple/rev/bc2dd1ef2a42
revision:	32895:bc2dd1ef2a42
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Thu Oct 16 11:36:22 2014 -0700

Merge pidgin/main release-2.x.y branch into private/main release-2.x.y

No conflicts.
Subject: libpurple 32896:4bf8cf402f8c: Merge pidgin/main release-2.x.y branch in private/main release-2.x.y branch

details:	http://hg.adium.im/libpurple/rev/4bf8cf402f8c
revision:	32896:4bf8cf402f8c
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Thu Oct 16 16:01:07 2014 -0700

Merge pidgin/main release-2.x.y branch in private/main release-2.x.y branch

No merge conflicts.
Subject: libpurple 32897:b7fedd2a570b: Prep for 2.10.10

details:	http://hg.adium.im/libpurple/rev/b7fedd2a570b
revision:	32897:b7fedd2a570b
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Thu Oct 16 16:48:32 2014 -0700

Prep for 2.10.10
Subject: libpurple 32898:ff76d0c38380: Added tag v2.10.10 for changeset b7fedd2a570b

details:	http://hg.adium.im/libpurple/rev/ff76d0c38380
revision:	32898:ff76d0c38380
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Thu Oct 16 17:19:06 2014 -0700

Added tag v2.10.10 for changeset b7fedd2a570b
Subject: libpurple 32899:b21ae97e61db: Prep for development.

details:	http://hg.adium.im/libpurple/rev/b21ae97e61db
revision:	32899:b21ae97e61db
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Wed Oct 22 07:28:30 2014 -0700

Prep for development.
Subject: libpurple 32900:9086eaeacd2c: Improve NSS handling for unknown CAs

details:	http://hg.adium.im/libpurple/rev/9086eaeacd2c
revision:	32900:9086eaeacd2c
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Mon Oct 27 09:14:59 2014 -0400

Improve NSS handling for unknown CAs
Subject: libpurple 32901:eac4ec7a2532: Make NSIS translation processing more robust - handle quotes within text

details:	http://hg.adium.im/libpurple/rev/eac4ec7a2532
revision:	32901:eac4ec7a2532
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Mon Oct 27 13:30:15 2014 -0400

Make NSIS translation processing more robust - handle quotes within text
Subject: libpurple 32902:94ef6e02c72d: Fix loading the text replacement plugin's dict file, which was broken by e6937e52930b. Fixes #16408

details:	http://hg.adium.im/libpurple/rev/94ef6e02c72d
revision:	32902:94ef6e02c72d
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Tue Oct 28 22:23:50 2014 -0400

Fix loading the text replacement plugin's dict file, which was broken by e6937e52930b. Fixes #16408
Subject: libpurple 32903:befb6523dc5c: Fix NSS handling of self-signed certificates. Fixes #16412.

details:	http://hg.adium.im/libpurple/rev/befb6523dc5c
revision:	32903:befb6523dc5c
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Fri Oct 31 18:01:24 2014 -0400

Fix NSS handling of self-signed certificates. Fixes #16412.
Subject: libpurple 32904:681554f27e84: As of NSS 3.15.2, NSS_SetDomesticPolicy() doesn't do anything, so don't use it.

details:	http://hg.adium.im/libpurple/rev/681554f27e84
revision:	32904:681554f27e84
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Fri Oct 31 18:02:39 2014 -0400

As of NSS 3.15.2, NSS_SetDomesticPolicy() doesn't do anything, so don't use it.
Subject: libpurple 32905:9bafa7dfb2a3: Add logging of supported and enabled cipher suites to the NSS plugin.

details:	http://hg.adium.im/libpurple/rev/9bafa7dfb2a3
revision:	32905:9bafa7dfb2a3
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Fri Oct 31 18:16:41 2014 -0400

Add logging of supported and enabled cipher suites to the NSS plugin.
Subject: libpurple 32906:115560993ff5: Make the plugin preferences frame scrollable

details:	http://hg.adium.im/libpurple/rev/115560993ff5
revision:	32906:115560993ff5
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Sat Nov 01 01:32:47 2014 -0400

Make the plugin preferences frame scrollable

 * this prevents the dialog from getting out of had when plugins do weird things
Subject: libpurple 32907:9ad79bb177e9: Mark the Uzbek translator's name for translation

details:	http://hg.adium.im/libpurple/rev/9ad79bb177e9
revision:	32907:9ad79bb177e9
branch:		release-2.x.y
author:		Richard Laager <rlaager at pidgin.im>
date:		Fri Oct 24 14:08:12 2014 -0500

Mark the Uzbek translator's name for translation

I think he wanted to transliterate it or something.  This has been
sitting in my tree for a while.
Subject: libpurple 32908:a7ec400d350e: Josef Andersson is taking over the Swedish translation.

details:	http://hg.adium.im/libpurple/rev/a7ec400d350e
revision:	32908:a7ec400d350e
branch:		release-2.x.y
author:		Richard Laager <rlaager at pidgin.im>
date:		Fri Oct 24 14:10:17 2014 -0500

Josef Andersson is taking over the Swedish translation.

He'll be using Transifex.
Subject: libpurple 32909:d49c53487db2: Add a(n empty) Kurdish (Sorani) translation

details:	http://hg.adium.im/libpurple/rev/d49c53487db2
revision:	32909:d49c53487db2
branch:		release-2.x.y
author:		Richard Laager <rlaager at pidgin.im>
date:		Mon Nov 03 11:21:05 2014 -0600

Add a(n empty) Kurdish (Sorani) translation
Subject: libpurple 32910:c05804b2619a: Merging, I guess?

details:	http://hg.adium.im/libpurple/rev/c05804b2619a
revision:	32910:c05804b2619a
branch:		release-2.x.y
author:		Richard Laager <rlaager at pidgin.im>
date:		Mon Nov 03 11:25:23 2014 -0600

Merging, I guess?
Subject: libpurple 32911:ca3ea8900dc9: Don't use GnuTLS, if it's disabled. Fixes #16431

details:	http://hg.adium.im/libpurple/rev/ca3ea8900dc9
revision:	32911:ca3ea8900dc9
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Tue Nov 04 21:37:38 2014 +0100

Don't use GnuTLS, if it's disabled. Fixes #16431
Subject: libpurple 32912:703e982d8d18: Fix building with NSS 3.10.8 (which is what squeeze has and is probably the oldest we need to worry about)

details:	http://hg.adium.im/libpurple/rev/703e982d8d18
revision:	32912:703e982d8d18
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Wed Nov 05 00:07:54 2014 -0500

Fix building with NSS 3.10.8 (which is what squeeze has and is probably the oldest we need to worry about)
Subject: libpurple 32913:f26d96f03176: Update NSS Default Cipher suites

details:	http://hg.adium.im/libpurple/rev/f26d96f03176
revision:	32913:f26d96f03176
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Wed Nov 05 00:09:52 2014 -0500

Update NSS Default Cipher suites

 * Use Firefox as a base reference, include some previously used stuff and enable various PFS certificates
 * The following certificates were previously enabled (when using NSS 3.17.1)
   and are no longer enabled:
  * Various using RC2 and MD5
  * TLS_DHE_DSS_WITH_AES_256_CBC_SHA
  * TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
  * TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA
  * TLS_DHE_DSS_WITH_RC4_128_SHA
  * TLS_RSA_WITH_3DES_EDE_CBC_SHA
  * TLS_RSA_WITH_RC4_128_SHA (this is probably the most controversial removal)
  * TLS_RSA_WITH_RC4_128_MD5
  * TLS_DHE_RSA_WITH_DES_CBC_SHA
  * TLS_DHE_DSS_WITH_DES_CBC_SHA

Refs #8062, Fixes #16262
Subject: libpurple 32914:277c5fda03fe: Fix plugin pref choice labels to be dynamically allocated.

details:	http://hg.adium.im/libpurple/rev/277c5fda03fe
revision:	32914:277c5fda03fe
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Wed Nov 05 00:59:59 2014 -0500

Fix plugin pref choice labels to be dynamically allocated.
Subject: libpurple 32915:b92cde3dabc6: Use tab indentation for first level, then spaces.

details:	http://hg.adium.im/libpurple/rev/b92cde3dabc6
revision:	32915:b92cde3dabc6
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Tue Nov 04 22:15:29 2014 -0800

Use tab indentation for first level, then spaces.
Subject: libpurple 32916:5fdaf1c7c04f: Merge heads of release-2.x.y branch. No overlapping files.

details:	http://hg.adium.im/libpurple/rev/5fdaf1c7c04f
revision:	32916:5fdaf1c7c04f
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Tue Nov 04 22:16:05 2014 -0800

Merge heads of release-2.x.y branch. No overlapping files.
Subject: libpurple 32917:f3d4e059a391: Oops, fix a double free introduced in 277c5fda03fe.

details:	http://hg.adium.im/libpurple/rev/f3d4e059a391
revision:	32917:f3d4e059a391
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Wed Nov 05 12:04:11 2014 -0500

Oops, fix a double free introduced in 277c5fda03fe.
Subject: libpurple 32918:1cdc641d433e: Add "NSS Preferences" plugin which allows configuration Min/Max TLS version and Ciphers.

details:	http://hg.adium.im/libpurple/rev/1cdc641d433e
revision:	32918:1cdc641d433e
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Wed Nov 05 13:13:37 2014 -0500

Add "NSS Preferences" plugin which allows configuration Min/Max TLS version and Ciphers.

 * The TLS version settings require NSS 3.14 or newer

Refs #8061
Subject: libpurple 32919:0223e88d7858: SSL_LIBRARY_VERSION_TLS_1_3 is a recent addition - yay buildbots

details:	http://hg.adium.im/libpurple/rev/0223e88d7858
revision:	32919:0223e88d7858
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Wed Nov 05 14:01:46 2014 -0500

SSL_LIBRARY_VERSION_TLS_1_3 is a recent addition - yay buildbots
Subject: libpurple 32920:2d081c7c20eb: Add missing nss-prefs.c file to POTFILES.in

details:	http://hg.adium.im/libpurple/rev/2d081c7c20eb
revision:	32920:2d081c7c20eb
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Thu Nov 06 10:45:12 2014 +0100

Add missing nss-prefs.c file to POTFILES.in
Subject: libpurple 32921:6f5e35bda0c9: I guess there are NSS versions that support the SSL_VersionRange stuff, but not TLS 1.2 - I thought they came in at the same time.

details:	http://hg.adium.im/libpurple/rev/6f5e35bda0c9
revision:	32921:6f5e35bda0c9
branch:		release-2.x.y
author:		Daniel Atallah <datallah at pidgin.im>
date:		Fri Nov 07 12:16:35 2014 -0500

I guess there are NSS versions that support the SSL_VersionRange stuff, but not TLS 1.2 - I thought they came in at the same time.
Subject: libpurple 32922:f6a91e6c77a4: msn: Update Application ID to re-enable buddy list.

details:	http://hg.adium.im/libpurple/rev/f6a91e6c77a4
revision:	32922:f6a91e6c77a4
branch:		release-2.x.y
author:		Elliott Sales de Andrade <qulogic at pidgin.im>
date:		Wed Nov 12 00:31:53 2014 -0500

msn: Update Application ID to re-enable buddy list.

Thanks to TReKiE on IRC for the new ID.
Subject: libpurple 32923:c6a0feac708f: Move data files into their own directory.

details:	http://hg.adium.im/libpurple/rev/c6a0feac708f
revision:	32923:c6a0feac708f
branch:		release-2.x.y
author:		Elliott Sales de Andrade <qulogic at pidgin.im>
date:		Mon Nov 10 16:17:31 2014 -0500

Move data files into their own directory.
Subject: libpurple 32924:cd6ec0a2dfd5: Add an AppData description file from Richard Hughes.

details:	http://hg.adium.im/libpurple/rev/cd6ec0a2dfd5
revision:	32924:cd6ec0a2dfd5
branch:		release-2.x.y
author:		Elliott Sales de Andrade <qulogic at pidgin.im>
date:		Sat Nov 08 01:42:55 2014 -0500

Add an AppData description file from Richard Hughes.
Subject: libpurple 32925:ee51d84aacbf: msn: Hard fail if buddy list is unavailable.

details:	http://hg.adium.im/libpurple/rev/ee51d84aacbf
revision:	32925:ee51d84aacbf
branch:		release-2.x.y
author:		Elliott Sales de Andrade <qulogic at pidgin.im>
date:		Wed Nov 12 02:21:47 2014 -0500

msn: Hard fail if buddy list is unavailable.

Previously, this would blindly continue to attempt to connect, and
that's a lot of extra load as in the recent case of the ApplicationId
being disabled on the MSN servers.
Subject: libpurple 32926:a3fe30a2666b: Fix signed/unsigned comparison warning.

details:	http://hg.adium.im/libpurple/rev/a3fe30a2666b
revision:	32926:a3fe30a2666b
branch:		release-2.x.y
author:		Elliott Sales de Andrade <qulogic at pidgin.im>
date:		Wed Nov 12 19:15:24 2014 -0500

Fix signed/unsigned comparison warning.

The test still works correctly without the fix, but this is quieter.
Subject: libpurple 32927:a437550a9308: Remove -Wno-sign-compare and backport fixes from default.

details:	http://hg.adium.im/libpurple/rev/a437550a9308
revision:	32927:a437550a9308
branch:		release-2.x.y
author:		Elliott Sales de Andrade <qulogic at pidgin.im>
date:		Thu Nov 13 00:56:55 2014 -0500

Remove -Wno-sign-compare and backport fixes from default.
Subject: libpurple 32928:3e9f76ca1f04: Fix warnings that only seem to appear on Jenkins.

details:	http://hg.adium.im/libpurple/rev/3e9f76ca1f04
revision:	32928:3e9f76ca1f04
branch:		release-2.x.y
author:		Elliott Sales de Andrade <qulogic at pidgin.im>
date:		Thu Nov 13 01:27:59 2014 -0500

Fix warnings that only seem to appear on Jenkins.
Subject: libpurple 32929:2c1483188cf5: Fix a couple more signed/unsigned warnings.

details:	http://hg.adium.im/libpurple/rev/2c1483188cf5
revision:	32929:2c1483188cf5
branch:		release-2.x.y
author:		Elliott Sales de Andrade <qulogic at pidgin.im>
date:		Thu Nov 13 03:55:54 2014 -0500

Fix a couple more signed/unsigned warnings.

I still don't know why these only appear on Jenkins...
Subject: libpurple 32930:88ce4f534696: Display IRC MOTD in font-family: monospace.  Fixes #13727

details:	http://hg.adium.im/libpurple/rev/88ce4f534696
revision:	32930:88ce4f534696
branch:		release-2.x.y
author:		Ethan Blanton <elb at fiji-systems.com>
date:		Fri Nov 14 11:45:35 2014 -0500

Display IRC MOTD in font-family: monospace.  Fixes #13727
Subject: libpurple 32931:7d5c6f160954: Tweak debug messages about on/offline MSN messages.

details:	http://hg.adium.im/libpurple/rev/7d5c6f160954
revision:	32931:7d5c6f160954
branch:		release-2.x.y
author:		Elliott Sales de Andrade <qulogic at pidgin.im>
date:		Thu Nov 13 19:03:19 2014 -0500

Tweak debug messages about on/offline MSN messages.
Subject: libpurple 32932:78abe6e4a789: Merge heads.

details:	http://hg.adium.im/libpurple/rev/78abe6e4a789
revision:	32932:78abe6e4a789
branch:		release-2.x.y
author:		Elliott Sales de Andrade <qulogic at pidgin.im>
date:		Sat Nov 15 02:00:24 2014 -0500

Merge heads.
Subject: libpurple 32933:14555e001a59: Fix leak in previous commit.

details:	http://hg.adium.im/libpurple/rev/14555e001a59
revision:	32933:14555e001a59
branch:		release-2.x.y
author:		Elliott Sales de Andrade <qulogic at pidgin.im>
date:		Sat Nov 15 02:03:19 2014 -0500

Fix leak in previous commit.

Refs #13727. Thanks TypoNAM on IRC.
Subject: libpurple 32934:26ad8040bdb4: Typo ("Unknorn error" -> "Unknown error")

details:	http://hg.adium.im/libpurple/rev/26ad8040bdb4
revision:	32934:26ad8040bdb4
branch:		release-2.x.y
author:		Bjoern Voigt <bjoern at cs.tu-berlin.de>
date:		Tue Nov 18 22:34:21 2014 +0100

Typo ("Unknorn error" -> "Unknown error")
Subject: libpurple 32935:f0c5f4056c51: Fix minor assertion.

details:	http://hg.adium.im/libpurple/rev/f0c5f4056c51
revision:	32935:f0c5f4056c51
branch:		release-2.x.y
author:		Elliott Sales de Andrade <qulogic at pidgin.im>
date:		Sat Nov 15 19:43:02 2014 -0500

Fix minor assertion.

The body of a SOAP callback may not exist yet if it's prematurely freed.
Subject: libpurple 32936:9afe309dc92a: msn: Workaround servers sending nearly-empty Allow list.

details:	http://hg.adium.im/libpurple/rev/9afe309dc92a
revision:	32936:9afe309dc92a
branch:		release-2.x.y
author:		Elliott Sales de Andrade <qulogic at pidgin.im>
date:		Tue Nov 18 22:34:52 2014 -0500

msn: Workaround servers sending nearly-empty Allow list.

If buddy is on neither Allow nor Block list, then add to Allow list.
At some point, we should figure out if the NetworkInfo really is used
for this sort of thing.
Subject: libpurple 32937:277fb538e26f: msn: Don't auto-Allow users on Pending list.

details:	http://hg.adium.im/libpurple/rev/277fb538e26f
revision:	32937:277fb538e26f
branch:		release-2.x.y
author:		Elliott Sales de Andrade <qulogic at pidgin.im>
date:		Tue Nov 18 22:59:16 2014 -0500

msn: Don't auto-Allow users on Pending list.
Subject: libpurple 32938:e1fa63d0bdaa: msn: Bump ApplicationID again.

details:	http://hg.adium.im/libpurple/rev/e1fa63d0bdaa
revision:	32938:e1fa63d0bdaa
branch:		release-2.x.y
author:		Elliott Sales de Andrade <qulogic at pidgin.im>
date:		Tue Nov 18 23:01:05 2014 -0500

msn: Bump ApplicationID again.

Hopefully, this extends the time until it's killed even more.
Subject: libpurple 32939:6fbf2999c739: ChangeLog msn fixes.

details:	http://hg.adium.im/libpurple/rev/6fbf2999c739
revision:	32939:6fbf2999c739
branch:		release-2.x.y
author:		Elliott Sales de Andrade <qulogic at pidgin.im>
date:		Tue Nov 18 23:03:52 2014 -0500

ChangeLog msn fixes.
Subject: libpurple 32940:157dceb38867: Pull translations from Transifex.

details:	http://hg.adium.im/libpurple/rev/157dceb38867
revision:	32940:157dceb38867
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Sat Nov 22 10:24:22 2014 -0800

Pull translations from Transifex.

Following the instructions at https://developer.pidgin.im/wiki/ReleaseProcess
Subject: libpurple 32941:14de4c200d57: Prep for 2.10.11.

details:	http://hg.adium.im/libpurple/rev/14de4c200d57
revision:	32941:14de4c200d57
branch:		release-2.x.y
author:		Mark Doliner <mark at kingant.net>
date:		Sat Nov 22 10:26:09 2014 -0800

Prep for 2.10.11.

I'm hoping to build and release tomorrow. Does that sound ok to people?
Subject: libpurple 32942:393916c77699: Fix build for platforms without AF_LOCAL definition

details:	http://hg.adium.im/libpurple/rev/393916c77699
revision:	32942:393916c77699
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Sat Nov 22 23:34:30 2014 +0100

Fix build for platforms without AF_LOCAL definition
Subject: libpurple 32943:e38a9aa5b1f8: Gadu-Gadu: handle invalid debug prints. Refs #16471

details:	http://hg.adium.im/libpurple/rev/e38a9aa5b1f8
revision:	32943:e38a9aa5b1f8
branch:		release-2.x.y
author:		Tomasz Wasilczyk <twasilczyk at pidgin.im>
date:		Sun Nov 23 00:03:11 2014 +0100

Gadu-Gadu: handle invalid debug prints. Refs #16471
Subject: libpurple 32944:782798bd8798: Merged libpurple 2.10.11 into adium-1.5.x.

details:	http://hg.adium.im/libpurple/rev/782798bd8798
revision:	32944:782798bd8798
branch:		adium-1.5.x
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Mon Nov 24 19:58:23 2014 +0100

Merged libpurple 2.10.11 into adium-1.5.x.

diffs (truncated from 665318 to 1000 lines):

diff -r 9438f4b2904d -r 782798bd8798 .hgignore
--- a/.hgignore	Sun Feb 02 13:11:51 2014 -0800
+++ b/.hgignore	Mon Nov 24 19:58:23 2014 +0100
@@ -56,7 +56,7 @@
 libpurple/dbus-types.c
 libpurple/dbus-types.h
 libpurple/example/nullclient
-libpurple/gconf/purple.schemas$
+libpurple/data/gconf/purple.schemas$
 libpurple/marshallers.[ch]
 libpurple/plugins/dbus-example-bindings.c
 libpurple/plugins/perl/common/Makefile.PL$
@@ -85,11 +85,13 @@
 pidgin-*.*.*-win32bin$
 pidgin-.*.tar.bz2
 pidgin-.*.tar.gz
+pidgin-[0-9a-z.-]+/
 pidgin.apspec$
-pidgin.desktop$
-pidgin.desktop.in$
 pidgin.spec$
 pidgin/pidgin$
+pidgin/data/pidgin.appdata.xml$
+pidgin/data/pidgin.desktop$
+pidgin/data/pidgin.desktop.in$
 pidgin/pixmaps/emotes/default/24/theme
 pidgin/pixmaps/emotes/none/theme
 pidgin/pixmaps/emotes/small/16/theme
diff -r 9438f4b2904d -r 782798bd8798 .hgtags
--- a/.hgtags	Sun Feb 02 13:11:51 2014 -0800
+++ b/.hgtags	Mon Nov 24 19:58:23 2014 +0100
@@ -2,3 +2,5 @@
 4992bd90d8ad78ebdd324dd90d3e9d443f7dd002 v2.10.6
 ad7e7fb98db3bbd7bf9ab49072fd34cd4fa25dd9 v2.10.7
 5010e6877abce3bfc2a4912e6b38fed7d6d3df19 v2.10.8
+9438f4b2904d9574b9e6ffba463d354b3661139f v2.10.9
+b7fedd2a570b760f252cf8a65a584137ab0af2cb v2.10.10
diff -r 9438f4b2904d -r 782798bd8798 COPYRIGHT
--- a/COPYRIGHT	Sun Feb 02 13:11:51 2014 -0800
+++ b/COPYRIGHT	Mon Nov 24 19:58:23 2014 +0100
@@ -21,6 +21,7 @@
 Saleem Abdulrasool
 Jakub Adam
 Dave Ahlswede
+Haval A. Ahmed
 Thijs Alkemade
 Manuel Amador
 Matt Amato
@@ -145,6 +146,7 @@
 Philip Derrin
 Taso N. Devetzis
 Balwinder Singh Dheeman
+Chandrakant Dhutadmal
 Andrew Dieffenbach
 Finlay Dobbie
 Mark Doliner
@@ -160,6 +162,7 @@
 Markus Elfring
 Nelson Elhage
 Ignacio J. Elia
+Kai Engert
 Brian Enigma
 Mattias Eriksson
 Pat Erley
@@ -271,9 +274,11 @@
 John Kelm
 Jochen Kemnade
 Yann Kerherve
+Akmal Khushvakov
 Gordian Klein
 Marten Klencke
 Krzysztof Klinikowski
+KNTRO
 Akuke Kok
 Kir Kolyshkin
 Ivan Komarov
@@ -336,6 +341,7 @@
 Simo Mattila
 Robert Matusewicz
 Michal Matyska
+Rudolfs Mazurs
 Ryan McCabe
 Peter McCurdy
 Kurt McKee
@@ -373,6 +379,7 @@
 Dennis Nezic
 Matthew A. Nicholson
 Andreas Nilsson
+Allan Nordhøy
 Henning Norén
 Szilard Novaki
 Novell
@@ -561,6 +568,8 @@
 Dmitry Utkin
 Igor Vlasenko
 István Váradi
+ILDAR Valeev
+Cédric Valmary
 Martijn van Beers
 Gideon van Melle
 Arjan van de Ven
diff -r 9438f4b2904d -r 782798bd8798 ChangeLog
--- a/ChangeLog	Sun Feb 02 13:11:51 2014 -0800
+++ b/ChangeLog	Mon Nov 24 19:58:23 2014 +0100
@@ -1,5 +1,78 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.10.11 (11/23/14):
+	General:
+	* Fix handling of Self-Signed SSL/TLS Certificates when using the NSS
+	  plugin (#16412)
+	* Improve default cipher suites used with the NSS plugin (#16262)
+	* Add NSS Preferences plugin which allows the SSL/TLS Versions and
+	  cipher suites to be configured (#8061)
+
+	Gadu-Gadu:
+	* Fix a bug that prevented plugin to load when compiled without GnuTLS.
+	  (mancha) (#16431)
+	* Fix build for platforms without AF_LOCAL definition. (#16404)
+
+	MSN:
+	* Fix broken login due to server change (dx, TReKiE). (#16451, #16455)
+	* Fail early when buddy list is unavailable instead of wasting bandwidth
+	  endlessly re-trying.
+
+version 2.10.10 (10/22/14):
+	General:
+	* Check the basic constraints extension when validating SSL/TLS
+	  certificates. This fixes a security hole that allowed a malicious
+	  man-in-the-middle to impersonate an IM server or any other https
+	  endpoint. This affected both the NSS and GnuTLS plugins. (Discovered
+	  by an anonymous person and Jacob Appelbaum of the Tor Project, with
+	  thanks to Moxie Marlinspike for first publishing about this type of
+	  vulnerability. Thanks to Kai Engert for guidance and for some of the
+	  NSS changes) (CVE-2014-3694)
+	* Allow and prefer TLS 1.2 and 1.1 when using the NSS plugin for SSL.
+	  (Elrond and Ashish Gupta) (#15909)
+
+	libpurple3 compatibility:
+	* Encrypted account passwords are preserved until the new one is set.
+	* Fix loading Google Talk and Facebook XMPP accounts.
+
+	Windows-Specific Changes:
+	* Don't allow overwriting arbitrary files on the file system when the
+	  user installs a smiley theme via drag-and-drop. (Discovered by Yves
+	  Younan of Cisco Talos) (CVE-2014-3697)
+	* Updates to dependencies:
+		* NSS 3.17.1 and NSPR 4.10.7
+
+	Finch:
+	* Fix build against Python 3. (Ed Catmur) (#15969)
+
+	Gadu-Gadu:
+	* Updated internal libgadu to version 1.12.0.
+
+	Groupwise:
+	* Fix potential remote crash parsing server message that indicates that
+	  a large amount of memory should be allocated. (Discovered by Yves Younan
+	  and Richard Johnson of Cisco Talos) (CVE-2014-3696)
+
+	IRC:
+	* Fix a possible leak of unencrypted data when using /me command
+	  with OTR. (Thijs Alkemade) (#15750)
+
+	MXit:
+	* Fix potential remote crash parsing a malformed emoticon response.
+	  (Discovered by Yves Younan and Richard Johnson of Cisco Talos)
+	  (CVE-2014-3695)
+
+	XMPP:
+	* Fix potential information leak where a malicious XMPP server and
+	  possibly even a malicious remote user could create a carefully crafted
+	  XMPP message that causes libpurple to send an XMPP message containing
+	  arbitrary memory. (Discovered and fixed by Thijs Alkemade and Paul
+	  Aurich) (CVE-2014-3698)
+	* Fix Facebook XMPP roster quirks. (#15041, #15957)
+
+	Yahoo:
+	* Fix login when using the GnuTLS library for TLS connections. (#16172)
+
 version 2.10.9 (2/2/2014):
 	XMPP:
 	* Fix problems logging into some servers including jabber.org and
@@ -126,7 +199,7 @@
 	Plugins:
 	* Fix crash in contact availability plugin.
 	* Fix perl function Purple::Network::ip_atoi
-	* Add Ubuntu Unity UI integration plugin.
+	* Add Unity integration plugin.
 
 version 2.10.7 (02/13/2013):
 	Alien hatchery:
@@ -209,7 +282,7 @@
 	  this issue and suggesting solutions. (#15277)
 	* Updates to a number of dependencies, some of which have security
 	  related fixes. Thanks again to Jacob Appelbaum and Jurre van Bergen
-	  for identifying the vulnerable libraries and to Dieter Verfaillie 
+	  for identifying the vulnerable libraries and to Dieter Verfaillie
 	  for helping getting the libraries updated. (#14571, #15285, #15286)
 		* ATK 1.32.0-2
 		* Cyrus SASL 2.1.25
@@ -786,7 +859,7 @@
 	* Added extended capabilities support (none implemented).
 	* Merged the work done on the Google SoC (major rewrite of SLP code)
 	* Reworked the data transfer architecture.
-	  (http://developer.pidgin.im/wiki/SlpArchitecture)
+	  (https://developer.pidgin.im/wiki/SlpArchitecture)
 	* Lots of little changes.
 	* Don't process zero-length DC messages. (#12660)
 	* Fixed a bunch of memory leaks.
@@ -2187,7 +2260,7 @@
 	* Various memory leak fixes
 
 version 2.4.2 (05/17/2008):
-	http://developer.pidgin.im/query?status=closed&milestone=2.4.2
+	https://developer.pidgin.im/query?status=closed&milestone=2.4.2
 	libpurple:
 	* In MySpaceIM, messages from spambots are discarded (Justin Williams)
 	* Strip mIRC formatting codes from quit and part messages.
@@ -2253,7 +2326,7 @@
 	  enabled).
 
 version 2.4.1 (03/31/2008):
-	http://developer.pidgin.im/query?status=closed&milestone=2.4.1
+	https://developer.pidgin.im/query?status=closed&milestone=2.4.1
 
 	libpurple:
 	* Treat AIM Unicode messages as UTF-16 rather than UCS-2; this
@@ -2289,7 +2362,7 @@
 	  on the right to show it.
 
 version 2.4.0 (02/29/2008):
-	http://developer.pidgin.im/query?status=closed&milestone=2.4.0
+	https://developer.pidgin.im/query?status=closed&milestone=2.4.0
 
 	libpurple:
 	* Added support for offline messages for AIM accounts (thanks to
@@ -2348,7 +2421,7 @@
 	* Fixed a bug preventing finch working on x86_64
 
 version 2.3.1 (12/7/2007):
-	http://developer.pidgin.im/query?status=closed&milestone=2.3.1
+	https://developer.pidgin.im/query?status=closed&milestone=2.3.1
 		NOTE: Due to the way this release was made, it is possible that
 		      bugs marked as fixed in 2.3.1 will not be fixed until the
 		      next release.
@@ -2369,7 +2442,7 @@
 	* Prevent autoaccept plugin overwriting existing files
 
 version 2.3.0 (11/24/2007):
-	http://developer.pidgin.im/query?status=closed&milestone=2.3.0
+	https://developer.pidgin.im/query?status=closed&milestone=2.3.0
 		NOTE: Some bugs marked fixed in 2.2.1, 2.2.2 or 2.2.3 may not
 		      have been fixed until this release (2.3.0).
 
@@ -2442,7 +2515,7 @@
 	* 'yank' operation for the entry boxes. The default binding is ctrl+y.
 
 version 2.2.2 (10/23/2007):
-	http://developer.pidgin.im/query?status=closed&milestone=2.2.2
+	https://developer.pidgin.im/query?status=closed&milestone=2.2.2
 		NOTE: Due to the way this release was made, it is possible that
 			  bugs marked as fixed in 2.2.1 or 2.2.2 will not be fixed
 			  until the next release.
@@ -2454,7 +2527,7 @@
 	  how this is done on other platforms.
 
 version 2.2.1 (09/29/2007):
-	http://developer.pidgin.im/query?status=closed&milestone=2.2.1
+	https://developer.pidgin.im/query?status=closed&milestone=2.2.1
 		NOTE: Due to the backporting that happened for the actual
 		      release, it is possible bugs marked as fixed in 2.2.1
 		      will not be fixed until 2.2.2.
@@ -2479,7 +2552,7 @@
 	  dialog.
 
 version 2.2.0 (09/13/2007):
-	http://developer.pidgin.im/query?status=closed&milestone=2.2.0
+	https://developer.pidgin.im/query?status=closed&milestone=2.2.0
 
 	libpurple:
 	* New protocol plugin: MySpaceIM (Jeff Connelly, Google Summer of
@@ -2857,7 +2930,7 @@
 	  Summer of Code)
 	* Updated Gadu-Gadu protocol support (Bartosz Oler, Google Summer of
 	  Code).  This requires the libgadu library.  See
-	  http://pidgin.im/faq.php#libgadu for more information.
+	  https://pidgin.im/faq.php#libgadu for more information.
 	* SIP/SIMPLE support (Thomas Butter, Google Summer of Code)
 	* Sametime protocol support
 	  Requires the meanwhile library: http://meanwhile.sourceforge.net
diff -r 9438f4b2904d -r 782798bd8798 ChangeLog.API
--- a/ChangeLog.API	Sun Feb 02 13:11:51 2014 -0800
+++ b/ChangeLog.API	Mon Nov 24 19:58:23 2014 +0100
@@ -1,5 +1,11 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.10.11:
+	* No changes
+
+version 2.10.10:
+	* No changes
+
 version 2.10.9:
 	* No changes
 
diff -r 9438f4b2904d -r 782798bd8798 Makefile.am
--- a/Makefile.am	Sun Feb 02 13:11:51 2014 -0800
+++ b/Makefile.am	Mon Nov 24 19:58:23 2014 +0100
@@ -19,7 +19,6 @@
 		package_revision.h \
 		pidgin.apspec.in \
 		pidgin.spec.in \
-		pidgin.desktop.in \
 		po/Makefile.mingw \
 		valgrind-suppressions
 
@@ -49,7 +48,6 @@
 # Ensure ChangeLogs have the correct version
 	head ChangeLog     | grep "^version $(PACKAGE_VERSION) (.*):$$" >/dev/null
 	head ChangeLog.API | grep "^version $(PACKAGE_VERSION):$$" >/dev/null
-	head po/ChangeLog  | grep "^version $(PACKAGE_VERSION)$$" >/dev/null
 
 # Ensure we're working from a tag...
 	test x`hg log -r "tag($(PACKAGE_VERSION))" --template "{node}"` = x`hg id -i --debug`
@@ -66,16 +64,7 @@
 
 if INSTALL_I18N
 PO_DIR=po
-DESKTOP_FILE=pidgin.desktop
-
-if ENABLE_GTK
-appsdir = $(datadir)/applications
-apps_in_files = pidgin.desktop.in
-apps_DATA = $(apps_in_files:.desktop.in=.desktop)
- at INTLTOOL_DESKTOP_RULE@
-endif #ENABLE_GTK
-
-endif #INSTALL_I18N
+endif
 
 if ENABLE_GTK
 GTK_DIR=pidgin
@@ -85,23 +74,29 @@
 GNT_DIR=finch
 endif
 
-# This is phony, so that we always try to rebuild it.  If it succeeds
-# in calculating changes, it produces its target; otherwise, its
-# target does not exist.
-.PHONY: package_revision_raw.txt
+# We always try to rebuild all objects that depends on this dummy target.
+.FORCE:
+
 # if both attempts fail, then we need to remove the empty file that >
 # creates, and also make sure that the shell command exits
 # successfully; the rm -f ensures both
-package_revision_raw.txt:
+package_revision_raw.txt: .FORCE
 	$(AM_V_GEN)REAL_BLDDIR=$$PWD/$(top_builddir); \
-	(hg --cwd $(srcdir) id -i --debug) 2>/dev/null >$@ \
-	|| rm -f $@
+	(hg --cwd $(srcdir) id -i --debug) 2>/dev/null >$@.new \
+	|| rm -f $@.new
+	$(AM_V_at)if test -f $@.new; then \
+		if ! diff $@ $@.new > /dev/null; then \
+			mv $@.new $@; \
+		else \
+			rm $@.new; \
+		fi \
+	fi
 package_revision.h: package_revision_raw.txt
 	$(AM_V_GEN)if test -f $<; then \
-	  echo "#define REVISION \"`cat $<`\"" > $@; \
+		echo "#define REVISION \"`cat $<`\"" > $@; \
 	fi
 	$(AM_V_at)if test ! -f $@ -a -f $(srcdir)/$@; then \
-	  cp $(srcdir)/$@ $@; \
+		cp $(srcdir)/$@ $@; \
 	fi
 	$(AM_V_at)test -f $@ || echo "#define REVISION \"unknown\"" > $@
 
@@ -139,9 +134,10 @@
 
 # perl's MakeMaker uninstall foo doesn't work well with DESTDIR set, which
 # breaks "make distcheck" unless we ignore perl things
+# TODO drop it when we drop perl wrapper
 
 distuninstallcheck_listfiles = \
-	find . -type f -print | grep -v perl | grep -v Purple.3pm
+	find . -type f -print | grep -v perl | grep -v Purple.3pm | grep -v Pidgin.3pm
 
-DISTCLEANFILES= $(DESKTOP_FILE) libpurple/gconf/purple.schemas intltool-extract \
-			intltool-merge intltool-update
+DISTCLEANFILES= intltool-extract intltool-merge intltool-update \
+			package_revision_raw.txt
diff -r 9438f4b2904d -r 782798bd8798 Makefile.mingw
--- a/Makefile.mingw	Sun Feb 02 13:11:51 2014 -0800
+++ b/Makefile.mingw	Mon Nov 24 19:58:23 2014 +0100
@@ -33,12 +33,21 @@
 
 GTK_INSTALL_VERSION = 2.16.6.2
 
+ifdef SIGNTOOL
+authenticode_sign = $(SIGNTOOL) sign \
+		    /fd SHA256 \
+		    /f "$(SIGNTOOL_PFX)" /p "$(SIGNTOOL_PASSWORD)" \
+		    /d $(2) /du "https://pidgin.im" \
+		    /tr "http://timestamp.comodoca.com/rfc3161" /td SHA256 \
+		    $(1)
+else
 authenticode_sign = $(MONO_SIGNCODE) \
 		    -spc "$(SIGNCODE_SPC)" -v "$(SIGNCODE_PVK)" \
 		    -a sha1 -$$ commercial \
 		    -n "$(2)" -i "https://pidgin.im" \
 		    -t "http://timestamp.verisign.com/scripts/timstamp.dll" -tr 10 \
 		    $(1) && rm -f $(1).bak
+endif
 
 gpg_sign = $(GPG_SIGN) -ab $(1) && $(GPG_SIGN) --verify $(1).asc
 
diff -r 9438f4b2904d -r 782798bd8798 autogen.sh
--- a/autogen.sh	Sun Feb 02 13:11:51 2014 -0800
+++ b/autogen.sh	Mon Nov 24 19:58:23 2014 +0100
@@ -160,5 +160,7 @@
 ###############################################################################
 # Run configure
 ###############################################################################
-echo "running ./configure ${CONFIGURE_FLAGS} $@"
-./configure ${CONFIGURE_FLAGS} $@
+if test -z "$NOCONFIGURE"; then
+	echo "running ./configure ${CONFIGURE_FLAGS} $@"
+	./configure ${CONFIGURE_FLAGS} $@
+fi
diff -r 9438f4b2904d -r 782798bd8798 configure.ac
--- a/configure.ac	Sun Feb 02 13:11:51 2014 -0800
+++ b/configure.ac	Mon Nov 24 19:58:23 2014 +0100
@@ -46,7 +46,7 @@
 m4_define([purple_lt_current], [10])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [10])
-m4_define([purple_micro_version], [9])
+m4_define([purple_micro_version], [11])
 m4_define([purple_version_suffix], [])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
@@ -304,7 +304,7 @@
 	GETTEXT_PACKAGE=pidgin
 	AC_SUBST(GETTEXT_PACKAGE)
 
-	ALL_LINGUAS="af am ar ast az be at latin bg bn bn_IN bs ca ca at valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu hy id it ja ka km kn ko ku lo lt mai mhr mk mn mr ms_MY my_MM nb ne nl nn oc or pa pl pt_BR pt ps ro ru si sk sl sq sr sr at latin sv sw ta te th tr uk ur vi xh zh_CN zh_HK zh_TW"
+	ALL_LINGUAS="af am ar ast az be at latin bg bn bn_IN bs ca ca at valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ku ku_IQ lt lv mai mhr mk mn mr my_MM nb ne nl nn oc or pa pl pt_BR pt ps ro ru si sk sl sq sr sr at latin sv sw ta te th tr tt uk ur vi xh zh_CN zh_HK zh_TW"
 	AM_GLIB_GNU_GETTEXT
 
 	dnl If we don't have msgfmt, then po/ is going to fail -- ensure that
@@ -569,7 +569,7 @@
 	dnl # Check for stuff needed by the Evolution integration plugin.
 	dnl #######################################################################
 	if test "x$enable_gevolution" = "xyes"; then
-		evo_deps="libebook-1.2 libedata-book-1.2"
+		evo_deps="libebook-1.2 libedata-book-1.2 evolution-data-server-1.2 < 3.6"
 		PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, , [
 			enable_gevolution="no"
 		])
@@ -577,6 +577,8 @@
 			evo_deps="libebook-1.0 libedata-book-1.0"
 			PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, [
 				enable_gevolution="yes"
+			], [
+				enable_gevolution="no"
 			])
 		fi
 		if test "x$enable_gevolution" = "xyes"; then
@@ -586,7 +588,7 @@
 		else
 			if test "x$force_deps" = "xyes" ; then
 				AC_MSG_ERROR([
-Evolution development headers not found.
+Evolution development headers not found (libebook, libedata-book, evolution-data-server < 3.6).
 Use --disable-gevolution if you do not need it.
 ])
 			fi
@@ -1021,98 +1023,64 @@
 fi
 
 dnl #######################################################################
-dnl # Check for Gadu-Gadu client includes and libraries
+dnl # Check for Gadu-Gadu protocol library (libgadu)
 dnl #######################################################################
-AC_ARG_WITH(gadu-includes, [AC_HELP_STRING([--with-gadu-includes=DIR], [compile the Gadu-Gadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"])
-AC_ARG_WITH(gadu-libs, [AC_HELP_STRING([--with-gadu-libs=DIR], [compile the Gadu-Gadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"])
-GADU_CFLAGS=""
-GADU_LIBS=""
-if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then
-	gadu_manual_check="yes"
-else
-	gadu_manual_check="no"
-fi
-if test "x$gadu_manual_check" = "xno"; then
-	PKG_CHECK_MODULES(GADU, [libgadu >= 1.11.0], [
-		gadu_includes="yes"
-		gadu_libs="yes"
-	], [
-		gadu_includes="no"
+
+PKG_CHECK_MODULES(LIBGADU, [libgadu >= 1.12.0], [have_libgadu=yes], [have_libgadu=no])
+
+if test "x$have_libgadu" = "xyes"; then
+	AC_CHECK_LIB(gadu, gg_is_gpl_compliant, , [
+		LIBGADU_LIBS=""
+		LIBGADU_CFLAGS=""
+		have_libgadu=no
+		AC_MSG_WARN([
+libgadu is not compatible with the GPL when compiled with OpenSSL support.
+
+To compile against system libgadu, please recompile libgadu using:
+./configure --with-openssl=no
+Then rerun this ./configure
+
+Falling back to using our own copy of libgadu.
+		])
 	])
-else
-	if test "$ac_gadu_includes" != "no"; then
-		GADU_CFLAGS="-I$ac_gadu_includes"
-	fi
-	CPPFLAGS_save="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
-	AC_CHECK_HEADER(libgadu.h, [gadu_includes=yes])
-	CPPFLAGS="$CPPFLAGS_save"
-
-	if test "$ac_gadu_libs" != "no"; then
-		GADU_LIBS="-L$ac_gadu_libs"
-	fi
-	GADU_LIBS="$GADU_LIBS -lgadu"
-	AC_CHECK_LIB(gadu, gg_libgadu_version, [gadu_libs=yes], , $GADU_LIBS)
-fi
-GADU_CFLAGS=`echo $GADU_CFLAGS |$sedpath 's/-Wall//'`
-
-if test "x$gadu_libs" = "xyes"; then
-	AC_MSG_CHECKING(for libgadu GPL compatibility)
-	CPPFLAGS_save="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[
-#if defined(__GG_LIBGADU_HAVE_OPENSSL) || defined(GG_CONFIG_HAVE_OPENSSL)
-#error "libgadu is not compatible with the GPL when compiled with OpenSSL support."
-#endif
-	]])], [
-		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[
-#if GG_DEFAULT_PROTOCOL_VERSION < 0x2e
-#error "Your libgadu version is too old. libpurple requires 1.11.0 or higher."
-#endif
-		]])], [
-			AC_MSG_RESULT(yes)
-			AC_DEFINE([HAVE_LIBGADU], [1],
-				[Define to 1 if you have libgadu.])
-		], [
-			AC_MSG_RESULT(no)
-			echo
-			echo
-			echo "Your supplied copy of libgadu is too old."
-			echo "Install version 1.11.0 or newer."
-			echo "Then rerun this ./configure"
-			echo
-			echo "Falling back to using our own copy of libgadu"
-			echo
-			GADU_LIBS=""
-			GADU_CFLAGS=""
-			gadu_libs=no
-		])
-	], [
-		AC_MSG_RESULT(no)
-		echo
-		echo
-		echo "libgadu is not compatible with the GPL when compiled with OpenSSL support."
-		echo "To compile against system libgadu, please recompile libgadu using:"
-		echo "./autogen.sh --disable-libgadu-openssl --disable-static --enable-shared"
-		echo "Then rerun this ./configure"
-		echo
-		echo "Falling back to using our own copy of libgadu"
-		echo
-		GADU_LIBS=""
-		GADU_CFLAGS=""
-		gadu_libs=no
-	])
-	CPPFLAGS="$CPPFLAGS_save"
 fi
 
-AM_CONDITIONAL(USE_INTERNAL_LIBGADU, test "x$gadu_libs" != "xyes")
+AM_CONDITIONAL(HAVE_LIBGADU, test "x$have_libgadu" = "xyes")
+if test "x$have_libgadu" = "xyes"; then
+	AC_DEFINE(HAVE_LIBGADU, 1, [Linked with external libgadu])
+else
+	AC_CHECK_LIB(gnutls, gnutls_certificate_set_x509_system_trust, [gg_have_gnutls_csxst=yes], [gg_have_gnutls_csxst=no])
 
-if test "x$gadu_libs" = "x"; then
-	gadu_libs=no
+	gg_gnutls_sts=""
+	if test "x$gg_have_gnutls_csxst" = "xno"; then
+		for i in /etc/ssl/ca-bundle.pem \
+			/etc/ssl/certs/ca-certificates.crt \
+			/etc/pki/tls/cert.pem \
+			/usr/local/share/certs/ca-root-nss.crt \
+			/etc/ssl/cert.pem
+		do
+			if test -e $i; then
+				gg_gnutls_sts="$i"
+				break
+			fi
+		done
+	fi
+
+	if test "x$gg_have_gnutls_csxst" = "xyes"; then
+		AC_DEFINE(HAVE_GNUTLS_CERTIFICATE_SET_X509_SYSTEM_TRUST, 1, [gnutls contains the gnutls_certificate_set_x509_system_trust function])
+	fi
+	if test "x$gg_gnutls_sts" != "x"; then
+		AC_DEFINE_UNQUOTED(GG_CONFIG_GNUTLS_SYSTEM_TRUST_STORE, ["$gg_gnutls_sts"], [use the given file as GnuTLS default trust store])
+	fi
+
+	PKG_CHECK_MODULES([GNUTLS_2_10], [gnutls >= 2.10.0], [
+		AC_DEFINE([HAVE_GNUTLS_2_10], [], [Defined if GnuTLS >= 2.10.0 is available.])
+	],:)
 fi
 
-AC_SUBST(GADU_LIBS)
-AC_SUBST(GADU_CFLAGS)
+AC_SUBST(LIBGADU_LIBS)
+AC_SUBST(LIBGADU_CFLAGS)
+
 
 AC_ARG_ENABLE(distrib,,,enable_distrib=no)
 AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes")
@@ -1286,7 +1254,7 @@
 			"-Wdeclaration-after-statement" \
 			"-Wendif-labels" \
 			"-Werror-implicit-function-declaration" \
-			"-Wextra -Wno-sign-compare -Wno-unused-parameter" \
+			"-Wextra -Wno-unused-parameter" \
 			"-Wformat-security" \
 				"-Werror=format-security" \
 			"-Winit-self" \
@@ -1299,9 +1267,7 @@
 		orig_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $newflag"
 		AC_MSG_CHECKING(for $newflag option to gcc)
-		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
-			int main() {return 0;}
-		]])], [
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], [
 			AC_MSG_RESULT(yes)
 			CFLAGS="$orig_CFLAGS"
 			DEBUG_CFLAGS="$DEBUG_CFLAGS $newflag"
@@ -1314,7 +1280,6 @@
 	if test "x$enable_fortify" = "xyes"; then
 		AC_MSG_CHECKING(for FORTIFY_SOURCE support)
 		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <features.h>]], [[
-			int main() {
 			#if !(__GNUC_PREREQ (4, 1) \
 				|| (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (4, 0)) \
 				|| (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (3, 4) \
@@ -1324,7 +1289,6 @@
 			#error No FORTIFY_SOURCE support
 			#endif
 				return 0;
-			}
 		]])], [
 			AC_MSG_RESULT(yes)
 			DEBUG_CFLAGS="$DEBUG_CFLAGS -Wp,-D_FORTIFY_SOURCE=2"
@@ -1344,6 +1308,17 @@
 
 AC_PATH_PROG(pidginpath, pidgin)
 
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [
+	#if !defined(__clang__)
+	#error
+	#endif
+])], have_clang=yes, have_clang=no)
+
+if test "x$have_clang" = "xyes"; then
+	dnl we don't care about it for 2.x.y
+	DEBUG_CFLAGS=`echo $DEBUG_CFLAGS |$sedpath 's/-Wcast-align//'`
+fi
+
 dnl #######################################################################
 dnl # Check for D-Bus libraries
 dnl #######################################################################
@@ -1513,27 +1488,15 @@
 dnl (Thanks to XChat)
 if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then
 	AC_MSG_CHECKING(for Python compile flags)
-	PY_PREFIX=`$PYTHON -c 'import sys ; sys.stdout.write(sys.prefix)'`
-	PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; sys.stdout.write(sys.exec_prefix)'`
-	changequote(<<, >>)dnl
-	PY_VERSION=`$PYTHON -c 'import sys ; sys.stdout.write(sys.version[0:3])'`
-	PY_MAJOR=`$PYTHON -c 'import sys ; sys.stdout.write(sys.version[0:2])'`
-	changequote([, ])dnl
-	if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then
-		AC_MSG_RESULT()
-		AC_CHECK_LIB(pthread, pthread_create, )
-		AC_CHECK_LIB(util, openpty, )
-		AC_CHECK_LIB(db, dbopen, )
-		PY_LIBS="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config -lpython$PY_VERSION"
-		PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
+	if test -f ${PYTHON}-config; then
+		PY_CFLAGS=`${PYTHON}-config --includes`
+		PY_LIBS=`${PYTHON}-config --libs`
 		AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.])
-		dnl Because the above AC_CHECK_LIB get in the way...
-		AC_MSG_CHECKING(for Python compile flags)
 		AC_MSG_RESULT(ok)
 	else
-		AC_MSG_RESULT([Can't find Python.h])
+		AC_MSG_RESULT([Cannot find ${PYTHON}-config])
+		PY_CFLAGS=""
 		PY_LIBS=""
-		PY_CFLAGS=""
 	fi
 fi
 AC_SUBST(PY_CFLAGS)
@@ -2562,10 +2525,11 @@
 		   m4macros/Makefile
 		   pidgin.apspec
 		   pidgin/Makefile
-		   pidgin/pidgin.pc
-		   pidgin/pidgin-uninstalled.pc
-		   pidgin/pidgin-2.pc
-		   pidgin/pidgin-2-uninstalled.pc
+		   pidgin/data/pidgin.desktop.in
+		   pidgin/data/pidgin.pc
+		   pidgin/data/pidgin-uninstalled.pc
+		   pidgin/data/pidgin-2.pc
+		   pidgin/data/pidgin-2-uninstalled.pc
 		   pidgin/pixmaps/Makefile
 		   pidgin/pixmaps/emotes/default/24/Makefile
 		   pidgin/pixmaps/emotes/none/Makefile
@@ -2579,13 +2543,13 @@
 		   pidgin/plugins/perl/Makefile
 		   pidgin/plugins/perl/common/Makefile.PL
 		   pidgin/plugins/ticker/Makefile
+		   libpurple/data/gconf/Makefile
+		   libpurple/data/purple.pc
+		   libpurple/data/purple-uninstalled.pc
+		   libpurple/data/purple-2.pc
+		   libpurple/data/purple-2-uninstalled.pc
 		   libpurple/ciphers/Makefile
 		   libpurple/example/Makefile
-		   libpurple/gconf/Makefile
-		   libpurple/purple.pc
-		   libpurple/purple-uninstalled.pc
-		   libpurple/purple-2.pc
-		   libpurple/purple-2-uninstalled.pc
 		   libpurple/plugins/Makefile
 		   libpurple/plugins/mono/Makefile
 		   libpurple/plugins/mono/api/Makefile
@@ -2624,7 +2588,6 @@
 		   finch/libgnt/wms/Makefile
 		   finch/plugins/Makefile
 		   po/Makefile.in
-		   pidgin.desktop.in
 		   pidgin.spec
 		  ])
 AC_OUTPUT
@@ -2656,7 +2619,7 @@
 echo Build with Cyrus SASL support. : $enable_cyrus_sasl
 echo Use kerberos 4 with zephyr.... : $kerberos
 echo Use external libzephyr........ : $zephyr
-echo Use external libgadu.......... : $gadu_libs
+echo Use external libgadu.......... : $have_libgadu
 echo Install pixmaps............... : $enable_pixmaps
 echo Old tray icon compatibility... : $enable_traycompat
 echo Install translations.......... : $enable_i18n
@@ -2695,3 +2658,4 @@
 echo configure complete, now type \'make\'
 echo
 
+
diff -r 9438f4b2904d -r 782798bd8798 finch/finch.c
--- a/finch/finch.c	Sun Feb 02 13:11:51 2014 -0800
+++ b/finch/finch.c	Mon Nov 24 19:58:23 2014 +0100
@@ -269,7 +269,6 @@
 	gboolean opt_version = FALSE;
 	char *opt_config_dir_arg = NULL;
 	gboolean debug_enabled = FALSE;
-	struct stat st;
 
 	struct option long_options[] = {
 		{"config",   required_argument, NULL, 'c'},
@@ -379,8 +378,8 @@
 	purple_idle_set_ui_ops(finch_idle_get_ui_ops());
 
 	path = g_build_filename(purple_user_dir(), "plugins", NULL);
-	if (!g_stat(path, &st))
-		g_mkdir(path, S_IRUSR | S_IWUSR | S_IXUSR);
+	if (g_mkdir(path, S_IRUSR | S_IWUSR | S_IXUSR) != 0 && errno != EEXIST)
+		fprintf(stderr, "Couldn't create plugins dir\n");
 	purple_plugins_add_search_path(path);
 	g_free(path);
 
@@ -448,7 +447,13 @@
 {
 	signal(SIGPIPE, SIG_IGN);
 
+#if !GLIB_CHECK_VERSION(2, 32, 0)
+	/* GLib threading system is automaticaly initialized since 2.32.
+	 * For earlier versions, it have to be initialized before calling any
+	 * Glib or GTK+ functions.
+	 */
 	g_thread_init(NULL);
+#endif
 
 	g_set_prgname("Finch");
 	g_set_application_name(_("Finch"));
diff -r 9438f4b2904d -r 782798bd8798 finch/gntdebug.c
--- a/finch/gntdebug.c	Sun Feb 02 13:11:51 2014 -0800
+++ b/finch/gntdebug.c	Mon Nov 24 19:58:23 2014 +0100
@@ -135,6 +135,7 @@
 		{
 			case PURPLE_DEBUG_WARNING:
 				flag |= GNT_TEXT_FLAG_UNDERLINE;
+				/* fall through */
 			case PURPLE_DEBUG_ERROR:
 			case PURPLE_DEBUG_FATAL:
 				flag |= GNT_TEXT_FLAG_BOLD;
diff -r 9438f4b2904d -r 782798bd8798 finch/gntmedia.c
--- a/finch/gntmedia.c	Sun Feb 02 13:11:51 2014 -0800
+++ b/finch/gntmedia.c	Mon Nov 24 19:58:23 2014 +0100
@@ -408,9 +408,9 @@
 	if (!purple_prpl_initiate_media(account,
 			purple_conversation_get_name(conv),
 			PURPLE_MEDIA_AUDIO))
-		return PURPLE_CMD_STATUS_FAILED;
+		return PURPLE_CMD_RET_FAILED;
 
-	return PURPLE_CMD_STATUS_OK;
+	return PURPLE_CMD_RET_OK;
 }
 
 static GstElement *
diff -r 9438f4b2904d -r 782798bd8798 finch/gntnotify.c
--- a/finch/gntnotify.c	Sun Feb 02 13:11:51 2014 -0800
+++ b/finch/gntnotify.c	Mon Nov 24 19:58:23 2014 +0100
@@ -47,24 +47,26 @@
 } emaildialog;
 
 static void
-notify_msg_window_destroy_cb(GntWidget *window, PurpleNotifyMsgType type)
+notify_msg_window_destroy_cb(GntWidget *window, PurpleNotifyType type)
 {
 	purple_notify_close(type, window);
 }
 
 static void *
-finch_notify_message(PurpleNotifyMsgType type, const char *title,
-		const char *primary, const char *secondary)
+finch_notify_common(PurpleNotifyType ntype, PurpleNotifyMsgType msgtype,
+	const char *title, const char *primary, const char *secondary)
 {
 	GntWidget *window, *button;
 	GntTextFormatFlags pf = 0, sf = 0;
 
-	switch (type)
+	switch (msgtype)
 	{
 		case PURPLE_NOTIFY_MSG_ERROR:
 			sf |= GNT_TEXT_FLAG_BOLD;
+			/* fall through */
 		case PURPLE_NOTIFY_MSG_WARNING:
 			pf |= GNT_TEXT_FLAG_UNDERLINE;
+			/* fall through */
 		case PURPLE_NOTIFY_MSG_INFO:
 			pf |= GNT_TEXT_FLAG_BOLD;
 			break;
@@ -84,24 +86,16 @@
 
 	if (secondary) {
 		GntWidget *msg;
-		/* XXX: This is broken.  type is PurpleNotifyMsgType, not
-		 * PurpleNotifyType.  Also, the if() followed by the
-		 * inner switch doesn't make much sense.
-		 */
-		if (type == PURPLE_NOTIFY_FORMATTED) {
+		if (ntype == PURPLE_NOTIFY_FORMATTED) {
 			int width = -1, height = -1;
 			char *plain = (char*)secondary;
 			msg = gnt_text_view_new();
 			gnt_text_view_set_flag(GNT_TEXT_VIEW(msg), GNT_TEXT_VIEW_TOP_ALIGN | GNT_TEXT_VIEW_NO_SCROLL);
-			switch (type) {
-				case PURPLE_NOTIFY_FORMATTED:
-					plain = purple_markup_strip_html(secondary);
-					if (gnt_util_parse_xhtml_to_textview(secondary, GNT_TEXT_VIEW(msg)))
-						break;
-					/* Fallthrough */
-				default:
-					gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(msg), plain, sf);
-			}
+
+			plain = purple_markup_strip_html(secondary);
+			if (!gnt_util_parse_xhtml_to_textview(secondary, GNT_TEXT_VIEW(msg)))
+				gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(msg), plain, sf);
+
 			gnt_text_view_attach_scroll_widget(GNT_TEXT_VIEW(msg), button);
 			gnt_util_get_text_bound(plain, &width, &height);
 			gnt_widget_set_size(msg, width + 3, height + 1);
@@ -118,12 +112,20 @@
 	g_signal_connect_swapped(G_OBJECT(button), "activate",
 			G_CALLBACK(gnt_widget_destroy), window);
 	g_signal_connect(G_OBJECT(window), "destroy",
-			G_CALLBACK(notify_msg_window_destroy_cb), GINT_TO_POINTER(type));
+			G_CALLBACK(notify_msg_window_destroy_cb), GINT_TO_POINTER(ntype));
 
 	gnt_widget_show(window);
 	return window;
 }
 
+static void *
+finch_notify_message(PurpleNotifyMsgType type, const char *title,
+	const char *primary, const char *secondary)
+{
+	return finch_notify_common(PURPLE_NOTIFY_MESSAGE, type, title, primary,
+		secondary);
+}
+
 /* handle is, in all/most occasions, a GntWidget * */
 static void finch_close_notify(PurpleNotifyType type, void *handle)
 {
@@ -156,7 +158,8 @@
 	void *ret;
 
 	purple_markup_html_to_xhtml(t, &xhtml, NULL);
-	ret = finch_notify_message(PURPLE_NOTIFY_FORMATTED, title, primary, xhtml);
+	ret = finch_notify_common(PURPLE_NOTIFY_FORMATTED,
+		PURPLE_NOTIFY_MSG_INFO, title, primary, xhtml);
 
 	g_free(t);
 	g_free(xhtml);
@@ -249,7 +252,8 @@
 		return NULL;
 	}
 
-	ret = finch_notify_message(PURPLE_NOTIFY_EMAIL, _("New Mail"), _("You have mail!"), message->str);
+	ret = finch_notify_common(PURPLE_NOTIFY_EMAIL, PURPLE_NOTIFY_MSG_INFO,
+		_("New Mail"), _("You have mail!"), message->str);
 	g_string_free(message, TRUE);
 	return ret;
 }
@@ -490,7 +494,8 @@
 static void *
 finch_notify_uri(const char *url)
 {
-	return finch_notify_message(PURPLE_NOTIFY_URI, _("URI"), url, NULL);
+	return finch_notify_common(PURPLE_NOTIFY_URI, PURPLE_NOTIFY_MSG_INFO,
+		_("URI"), url, NULL);
 }
 
 static PurpleNotifyUiOps ops =
diff -r 9438f4b2904d -r 782798bd8798 finch/gntprefs.c
--- a/finch/gntprefs.c	Sun Feb 02 13:11:51 2014 -0800
+++ b/finch/gntprefs.c	Mon Nov 24 19:58:23 2014 +0100
@@ -155,12 +155,14 @@
 			switch (prefs->type)
 			{
 				case PURPLE_PREF_BOOLEAN:
-					sscanf(iter->data, "%d", &idata);
+					if (sscanf(iter->data, "%d", &idata) != 1)
+						idata = FALSE;
 					if (purple_prefs_get_bool(prefs->pref) == idata)
 						select = TRUE;
 					break;
 				case PURPLE_PREF_INT:
-					sscanf(iter->data, "%d", &idata);
+					if (sscanf(iter->data, "%d", &idata) != 1)
+						idata = 0;
 					if (purple_prefs_get_int(prefs->pref) == idata)
 						select = TRUE;
 					break;
diff -r 9438f4b2904d -r 782798bd8798 finch/gntrequest.c
--- a/finch/gntrequest.c	Sun Feb 02 13:11:51 2014 -0800
+++ b/finch/gntrequest.c	Mon Nov 24 19:58:23 2014 +0100
@@ -268,7 +268,7 @@
 		va_list actions)
 {
 	GntWidget *window, *box, *button, *focus = NULL;
-	int i;
+	gsize i;
 
 	window = setup_request_window(title, primary, secondary, PURPLE_REQUEST_ACTION);
 
@@ -287,7 +287,7 @@
 		g_object_set_data(G_OBJECT(button), "activate-id", GINT_TO_POINTER(i));
 		g_signal_connect(G_OBJECT(button), "activate", G_CALLBACK(request_action_cb), window);
 
-		if (i == default_value)
+		if (default_value >= 0 && i == (gsize)default_value)
 			focus = button;
 	}
 
@@ -854,8 +854,11 @@
 				case PURPLE_PREF_INT:
 				{
 					long int tmp = GPOINTER_TO_INT(val);




More information about the commits mailing list