commit 8103d9d64d3fa440921ae58f05d9c42aed0fc5ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jan 10 15:57:13 2011 +0100

    prepare 2.91.5

 NEWS         |   23 +++++++++++++++++++++++
 configure.ac |    4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)

commit 4fb31c94452dfb42dc7a83ee3f864daabbe60f48
Author: Kushal Das <kushal@fedoraproject.org>
Date:   Mon Jan 10 18:46:06 2011 +0530

    Patch to transfer window to allow opening file with double clicks
    for #637195

 src/empathy-ft-manager.c |   34 +++++++++++++++++++++++++++-------
 1 files changed, 27 insertions(+), 7 deletions(-)

commit 363c9bdf35a11cde6ba7a0da3bc2cb7fcdb7a1b6
Merge: d5f5cfa 98b73f3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jan 10 11:02:02 2011 +0100

    Merge remote branch
    'glassrose/accounts-supporting-chatrooms-only-603027'

commit d5f5cfab4704fad9fad29a1e69a230645f0a4aa5
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Sun Jan 9 00:34:19 2011 +0100

    Updated Galician translations

 po/gl.po |  400
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 220 insertions(+), 180 deletions(-)

commit 98b73f3620f3b2f94e7d2ce3cfd2cd07cc637d13
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:   Mon Jan 3 21:25:43 2011 +0530

    Skip accounts which don't support rooms in "Manage Favorites" dialog

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=603027

 libempathy-gtk/empathy-account-chooser.c |   71
 ++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-account-chooser.h |    4 ++
 src/empathy-chatrooms-window.c           |    2 +-
 src/empathy-new-chatroom-dialog.c        |   71
 +-----------------------------
 4 files changed, 77 insertions(+), 71 deletions(-)

commit 9e70e42316ad1970c4508404baa86c69c81575b0
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Sun Jan 2 18:32:26 2011 +0100

    Updated Norwegian bokmål translation from Torstein Adolf Winterseth

 po/nb.po |  156
 ++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 87 insertions(+), 69 deletions(-)

commit 4c19864b900fb571ce6db077812d3422a23df5db
Author: Mattias Põldaru <mahfiaz gmail com>
Date:   Fri Dec 31 10:52:51 2010 +0200

    [l10n] Updated Estonian translation

 po/et.po |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

commit aa3df0b40d88a51f972f1c635b01402ad56a7946
Author: Daniel Nylander <po@danielnylander.se>
Date:   Wed Dec 29 18:18:19 2010 +0100

    Updated Swedish translation

 po/sv.po | 1504
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 810 insertions(+), 694 deletions(-)

commit 2404d3b7b273d4af4af02b3c0515421d31962046
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Sun Dec 26 19:29:59 2010 +0100

    Remove the chats_new_msg list from EmpathyChatWindow

 src/empathy-chat-window.c |   26 +++++++++-----------------
 1 files changed, 9 insertions(+), 17 deletions(-)

commit d471250122f68adba8625fbc719614f927fa4103
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Sun Dec 26 19:22:04 2010 +0100

    Remove the composing list

 libempathy-gtk/empathy-chat.c |    7 +++++++
 libempathy-gtk/empathy-chat.h |    2 ++
 src/empathy-chat-window.c     |   17 ++---------------
 3 files changed, 11 insertions(+), 15 deletions(-)

commit f49b34ee571c0894ab4e85af27479c288b0560c1
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Sun Dec 26 14:50:11 2010 +0100

    Highlight both the tab and the menu label

 src/empathy-chat-window.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

commit 048bf784409bd5c40705e4169793b0951c709264
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Mon Dec 27 14:55:56 2010 +0100

    Fix lines > 80 chars

 src/empathy-accounts-dialog.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

commit fff4889260ab902aeb409273e41c6f4c5078310c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Mon Dec 27 14:55:19 2010 +0100

    Prevent potential freeing of unitialized data

 src/empathy-accounts-dialog.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

commit 53a5a7f37188ffaf3e050c5ad2e0852095a85c4b
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Sat Dec 25 20:47:24 2010 +0100

    Simplify filter adding code by just using gdk_x11 functions instead
    of hoops

 libempathy-gtk/empathy-avatar-image.c |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

commit bfb7a859f932c540c4695ba5489ab135506e8494
Author: David Laban <david.laban@collabora.co.uk>
Date:   Mon Dec 20 15:46:36 2010 +0000

    Also turn off Access Unit Delimiters (aud)

    AUDs are *completely* pointless in RTP and just waste packets/confuse
    people.

 data/element-properties |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit a8bbe125863cee9c8a857562f99899f800e96cdf
Author: A S Alam <aalam@users.sf.net>
Date:   Wed Dec 29 07:36:25 2010 +0530

    update Punjabi Translation

 po/pa.po |  684
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 374 insertions(+), 310 deletions(-)

commit 92ca9d1a3c9fbe40b9f2d22d7377075e23cbecab
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Tue Dec 28 23:30:37 2010 +0100

    Updated Slovenian translation

 po/sl.po |  396
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 217 insertions(+), 179 deletions(-)

commit c6b58a76e119e7c5a9b57f5e216e72c000268165
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Sun Dec 26 19:55:05 2010 +0200

    Updated Hebrew translation.

 po/he.po |   69
 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 39 insertions(+), 30 deletions(-)

commit 3becee6fc229553a28149c9ebde7b14a775d6850
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Fri Dec 24 18:15:01 2010 +0100

    Updated Spanish translation

 po/es.po |   79
 +++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 43 insertions(+), 36 deletions(-)

commit 72a3058937bee67024b9bf87ff50f73409109c63
Author: Stef Walter <stefw@collabora.co.uk>
Date:   Fri Dec 24 09:32:35 2010 -0600

    libempathy: Fix free of uninitialized variables.

    When a pinned certificate is present, these don't get initialized.

 libempathy/empathy-tls-verifier.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit 36c700d49ac25f40e7ce47784fdf199c17ae8261
Author: Stef Walter <stefw@collabora.co.uk>
Date:   Mon Dec 13 20:34:56 2010 +0000

    libempathy: Store pinned certificate for end entity cert in the chain.

    https://bugzilla.gnome.org/show_bug.cgi?id=636258

 libempathy/empathy-tls-verifier.c |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

commit 00da7eadfe0ed7c4d080cc1ee076302c37ec0f7b
Author: Stef Walter <stefw@collabora.co.uk>
Date:   Mon Dec 13 20:25:38 2010 +0000

    tests: Fix memory leak of dbus connection

    https://bugzilla.gnome.org/show_bug.cgi?id=636258#c3

 tests/empathy-tls-test.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit f1bc5efbef341a2af2ebf0f9fc3f687503fe7e07
Author: Stef Walter <stefw@collabora.co.uk>
Date:   Mon Dec 13 20:25:08 2010 +0000

    libempathy: Fix memory leaks and use consistent naming for various
    arrays.

    https://bugzilla.gnome.org/show_bug.cgi?id=636258#c3

 libempathy/empathy-tls-verifier.c |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)

commit de7d7bf967502778c927d80121e4aaf0a52a7461
Author: Stef Walter <stefw@collabora.co.uk>
Date:   Mon Dec 13 17:46:03 2010 +0000

    libempathy: Fix leak of certificate data.

    https://bugzilla.gnome.org/show_bug.cgi?id=636258#c3

 libempathy/empathy-tls-verifier.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 14baa8d05d72d94431b3422bf455835bd065707e
Author: Stef Walter <stefw@collabora.co.uk>
Date:   Mon Dec 13 17:42:15 2010 +0000

    libempathy, tests: Wrap new function arguments properly.

    https://bugzilla.gnome.org/show_bug.cgi?id=636258#c3

 libempathy/empathy-tls-verifier.c |   16 +++++++++++-----
 tests/empathy-tls-test.c          |   35
 ++++++++++++++++++++++++-----------
 2 files changed, 35 insertions(+), 16 deletions(-)

commit c9562e1613eac9ded3a3e211dbd2e5420a46602b
Author: Stef Walter <stefw@collabora.co.uk>
Date:   Sat Dec 11 03:31:01 2010 +0000

    tests: Lookup the pkcs11 standalone directory at run time.

    Rather than cluttering up configure, lookup the relevant
    directory at runtime.

 configure.ac             |    6 ------
 tests/Makefile.am        |    1 -
 tests/empathy-tls-test.c |   21 ++++++++++++++++++++-
 3 files changed, 20 insertions(+), 8 deletions(-)

commit e694852b60dd75c8fe25d167672ca647006a5e8d
Author: Stef Walter <stefw@collabora.co.uk>
Date:   Sat Dec 11 03:16:16 2010 +0000

    libempathy: Match changes in libgcr terminology and debug output.

    Add debug output for certificate chain, and fix up for some changes
    in libgcr terminology.

 libempathy/empathy-tls-verifier.c |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 deletions(-)

commit ad51bca6104dc154fd1fdc3b177f160c8f05cd34
Author: Stef Walter <stefw@collabora.co.uk>
Date:   Fri Dec 10 23:04:52 2010 +0000

    libempathy: Use new certificate chain facilities in libgcr

    Build the chain with new GcrCertificateChain and then use gnutls
    to verify it.

 libempathy/empathy-tls-verifier.c |  291
 +++++++++++++------------------------
 1 files changed, 103 insertions(+), 188 deletions(-)

commit 02798920bfc26c86f0b4fb356f5635c3a20f203c
Author: Stef Walter <stefw@collabora.co.uk>
Date:   Fri Dec 10 04:25:13 2010 +0000

    test: Add tests which load PKCS#11 modules for TLS verification.

    Add various tests which load gnome-keyring PKCS#11 modules and
    use them in the TLS verification. These are the standalone
    versions of the builtin gnome-keyring PKCS#11 modules.

 configure.ac                                     |    6 +
 tests/Makefile.am                                |    2 +
 tests/certificates/collabora-ca/collabora-ca.cer |  Bin 0 -> 1536 bytes
 tests/empathy-tls-test.c                         |  279
 ++++++++++++++++++----
 4 files changed, 242 insertions(+), 45 deletions(-)

commit eb0e10eba858ed194ec5a6bb63670ed80245a76b
Author: Stef Walter <stefw@collabora.co.uk>
Date:   Fri Dec 10 03:48:13 2010 +0000

    libempathy: Complete successful verification properly.

    Complete TLS verification properly in TLS verifier.

 libempathy/empathy-tls-verifier.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 430516c8f22e26821a22868621e59ec201d6a805
Author: Stef Walter <stefw@collabora.co.uk>
Date:   Thu Dec 9 22:14:38 2010 +0000

    tests: Add test for basic verification.

    This test depends on the certificates you have in gnome-keyring,
    will fix this dependency in later commits.

 tests/empathy-tls-test.c |   60
 ++++++++++++++++++++++++++++++++++++----------
 1 files changed, 47 insertions(+), 13 deletions(-)

commit d6cacab44d2c134688c79be7d62ab4307ce7f527
Author: Stef Walter <stefw@collabora.co.uk>
Date:   Thu Dec 9 22:14:19 2010 +0000

    libempathy: Fix reference counting of certs in verifier.

 libempathy/empathy-tls-verifier.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

commit 34934197b7a1fb237c810c6de1aa498b4abbbc53
Author: Stef Walter <stefw@collabora.co.uk>
Date:   Thu Dec 9 21:51:28 2010 +0000

    tests: Add mock object and test infrastructure for testing tls.

    Create a mock o.f.T.Authentication.TLSCertificate object and connect
    to it in various tests.

    Loads certificate data from certificates/ subdir

 tests/.gitignore                         |    1 +
 tests/Makefile.am                        |    6 +-
 tests/certificates/dhansak-collabora.cer |  Bin 0 -> 1200 bytes
 tests/empathy-tls-test.c                 |  356
 ++++++++++++++++++++++++++++++
 4 files changed, 362 insertions(+), 1 deletions(-)

commit 636f502149f77a80ef1b79cfc6d2da4b20c6ec7c
Author: Stef Walter <stefw@collabora.co.uk>
Date:   Mon Dec 6 22:47:13 2010 +0000

    libempathy: Use new gcr functions properly and fix build.

    libgcr now uses single header include model.

 libempathy/empathy-tls-verifier.c |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

commit 59384754d15dc9340466dbb69ad615ffc76ffb6a
Author: Stef Walter <stefw@collabora.co.uk>
Date:   Thu Dec 2 19:55:54 2010 +0000

    libempathy: Load complete certificate chain even when not sent.

    Even when a complete certificate chain is not sent by the remote
    host, we can load a complete certificate chain based on the local
    certificates.

 libempathy/empathy-tls-verifier.c |  186
 ++++++++++++++++++++++++++-----------
 1 files changed, 133 insertions(+), 53 deletions(-)

commit edc69d9089b2d49570fa0644a4ef4f223c64550e
Author: Stef Walter <stefw@collabora.co.uk>
Date:   Thu Dec 2 18:10:14 2010 +0000

    configure: Remove option to specify system certificates.

    These are now handled by gnome-keyring through libgcr.

 configure.ac |   33 ---------------------------------
 1 files changed, 0 insertions(+), 33 deletions(-)

commit 8d72b18028c35d887c2352e3f08aacd9b7096f4c
Author: Stef Walter <stefw@collabora.co.uk>
Date:   Thu Dec 2 18:08:51 2010 +0000

    libempathy: Store certificate exceptions in gnome-keyring.

    Use libgcr to store certificate trust exceptions properly.

 libempathy/empathy-tls-certificate.c |  127
 ----------------------------------
 libempathy/empathy-tls-certificate.h |    2 -
 libempathy/empathy-tls-verifier.c    |   21 ++++++
 libempathy/empathy-tls-verifier.h    |    2 +
 src/empathy-auth-client.c            |   14 +++-
 5 files changed, 33 insertions(+), 133 deletions(-)

commit c55c9a4dd8848f7257794dc9fc8f8138f1b47f43
Author: Stef Walter <stefw@collabora.co.uk>
Date:   Thu Dec 2 17:46:47 2010 +0000

    libempathy: Use trust assertions instead of certificate directories.

    Initial implementation.

 libempathy/Makefile.am            |    2 +
 libempathy/empathy-tls-verifier.c |  460
 ++++++++++---------------------------
 src/Makefile.am                   |    1 +
 3 files changed, 125 insertions(+), 338 deletions(-)