commit 36bf86cda2f19c44fb09f2254f098ca16ed0c86b
Author: Guillaume Desmottes <[email protected]>
Date:   Tue Mar 22 16:36:49 2011 +0100

   prepare 2.91.92

NEWS         |   44 ++++++++++++++++++++++++++++++++++++++++++++
configure.ac |    6 +++---
2 files changed, 47 insertions(+), 3 deletions(-)

commit 5de055b29a5d04c5fc9220321a3f18fd30ce85d7
Merge: e68f144 91ddb84
Author: Stef Walter <[email protected]>
Date:   Tue Mar 22 17:16:35 2011 +0100

   Merge branch 'unbreak-tests'

commit 91ddb848264326ad2cec68ca750424b1649e7f64
Author: Stef Walter <[email protected]>
Date:   Tue Mar 22 17:10:32 2011 +0100

   Fix calls to empathy_tls_verifier_new() in tests.

tests/empathy-tls-test.c |   87
++++++++++++++++++++++++++++++++++++++++------
1 files changed, 76 insertions(+), 11 deletions(-)

commit e68f14484d688716bb3d09fbc9ee4fa5ad17db9e
Author: Emilio Pozuelo Monfort <[email protected]>
Date:   Tue Mar 22 15:25:26 2011 +0000

   Don't try to block personas that don't support blocking

libempathy/empathy-individual-manager.c |   11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)

commit 6c943efd9aabd9d0d8674c3c58d2e58efdb412f6
Author: Stef Walter <[email protected]>
Date:   Mon Mar 21 10:58:31 2011 +0100

   Only add the 'extra-certificate-identities' parameter if gabble
   supports it.

libempathy-gtk/empathy-protocol-chooser.c |    8 ++++++--
libempathy/empathy-account-settings.c     |    7 +++++++
libempathy/empathy-account-settings.h     |    4 ++++
3 files changed, 17 insertions(+), 2 deletions(-)

commit 6cd0e1c0916e69eb15192c6bdbf1b5d7ee599f5a
Author: Stef Walter <[email protected]>
Date:   Fri Mar 18 14:38:10 2011 +0100

   Create GTalk accounts with extra-certificate-identities =
   'talk.google.com'

   When creating google talk accounts, allow 'talk.google.com' as
   an extra
   identity for server certificate validation.

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

libempathy-gtk/empathy-protocol-chooser.c |    7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)

commit 6c5affb1f943b6685a0ac63adcfff24b47be6e2e
Merge: 5316d72 698675b
Author: Stef Walter <[email protected]>
Date:   Tue Mar 22 15:22:43 2011 +0100

   Merge branch 'reference-identities'

   Conflicts:
       libempathy/empathy-server-tls-handler.c

commit 698675bdc1fbc7e6e622be24e272df7e70f34716
Author: Stef Walter <[email protected]>
Date:   Tue Mar 22 15:13:33 2011 +0100

   Use telepathy property constants in server EmpathyServerTLSHandler

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

libempathy/empathy-server-tls-handler.c |    8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

commit 5316d721a24d2c1c2496f751a4cf139d88e274c1
Merge: e5bfa46 f357bd6
Author: Guillaume Desmottes <[email protected]>
Date:   Tue Mar 22 14:54:32 2011 +0100

   Merge branch 'stable-block-645504'

commit e5bfa46e3a659aec01d328ab041a6e4ce1a5e446
Author: Milo Casagrande <[email protected]>
Date:   Tue Mar 22 14:32:25 2011 +0100

   Updated Italian translation

po/it.po | 1682
++++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 971 insertions(+), 711 deletions(-)

commit 3bea79c93cd58333c4ccaee60afe98f861001afd
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Mar 7 11:31:48 2011 +0100

   accounts_dialog_add_account: ensure that the selected account is
   still visible in the treeview

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

commit 0b9a9d0171d55523519249a55971c9f4f051dc4c
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Mar 7 11:05:23 2011 +0100

   accounts_dialog_model_set_selected: use select_and_scroll_to_iter

   That way we also scroll to the selected account (#643860).

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

commit 0ac4dcb553efbdd058a5b37ba948c1d542d87075
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Mar 7 11:03:33 2011 +0100

   factor out select_and_scroll_to_iter()

src/empathy-accounts-dialog.c |   37
+++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)

commit bf2ef141ceb1515dfabfd07b29236e13d333c884
Author: Cheng-Chia Tseng <[email protected]>
Date:   Tue Mar 22 19:21:39 2011 +0800

   Updated Traditional Chinese translation(Hong Kong and Taiwan)

po/zh_HK.po |  827
+++++++++++++++++++++++++++++++++--------------------------
po/zh_TW.po |  827
+++++++++++++++++++++++++++++++++--------------------------
2 files changed, 932 insertions(+), 722 deletions(-)

commit f357bd611198d6156f3e58604729e24ad3366cea
Author: Guillaume Desmottes <[email protected]>
Date:   Tue Mar 22 11:39:23 2011 +0100

   stop generating API for ContactBlocking

.../Connection_Interface_Contact_Blocking.xml      |  172
--------------------
extensions/Makefile.am                             |    1 -
extensions/misc.xml                                |    1 -
3 files changed, 0 insertions(+), 174 deletions(-)

commit 8b7056b27d71eb651bed271013ab3515b399cc83
Author: Guillaume Desmottes <[email protected]>
Date:   Tue Mar 22 11:48:15 2011 +0100

   Use stable API for ContactBlocking (#645504)

libempathy/empathy-tp-contact-list.c |   12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)

commit ce0a41ef7bd65f6c1ef5e96bb4317cf5cdf26fc5
Author: Guillaume Desmottes <[email protected]>
Date:   Tue Mar 22 11:46:37 2011 +0100

   depends on telepathy-glib 0.14.1

   We need it for ContactBlocking API.

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

commit 1b68d34282947697e1c173456bdb35700dc0f19e
Author: Dan Williams <[email protected]>
Date:   Tue Mar 22 10:04:24 2011 +0100

   Handle new NM 0.9 states (#644412)

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

commit 5d27216d4ee76a9bb460b69370f205652a6d9c09
Author: Danielle Madeley <[email protected]>
Date:   Tue Mar 22 14:44:12 2011 +1100

   Remove user from the blocked list when readding them

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

libempathy/empathy-tp-contact-list.c |    8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)

commit 17e2fea441df25d3b91597957744f172a0d80668
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Mar 21 12:31:07 2011 +0100

   account_chooser_update_iter: don't leak the TpAccount

libempathy-gtk/empathy-account-chooser.c |    2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

commit 4d795d822f9590c2916bfa64b4cbc3d536e3ad4a
Author: Emilio Pozuelo Monfort <[email protected]>
Date:   Mon Mar 21 17:52:10 2011 +0000

   Also show an avatar when blocking from a conversation

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

libempathy-gtk/empathy-contact-dialogs.c |   11 +++++++++--
libempathy-gtk/empathy-contact-dialogs.h |    1 +
libempathy-gtk/empathy-contact-menu.c    |    5 ++++-
3 files changed, 14 insertions(+), 3 deletions(-)

commit 9c4deab9ee56bd39de5f4828d774a4d1be59a7bb
Author: Yuri Myasoedov <[email protected]>
Date:   Mon Mar 21 23:07:50 2011 +0300

   Updated Russian translation

po/ru.po |  293
+++++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 193 insertions(+), 100 deletions(-)

commit 0b92a57a1c29bb3195345cec85b7ce6e19a29a02
Author: Shankar Prasad <[email protected]>
Date:   Mon Mar 21 16:12:50 2011 +0530

   Updated kn translations

po/kn.po |  271
++++++++++++++++++++++++++++++++++----------------------------
1 files changed, 148 insertions(+), 123 deletions(-)

commit a8e558e10b1b5170346a75e1322f75d8ebad1662
Author: Sjoerd Simons <[email protected]>
Date:   Sun Mar 20 12:44:51 2011 +0000

   Fix some races in the chatroom joining code

   The auto-reconnection logic for chatrooms was a bit odd. It would for
   every chatroom that existed when the account manager was prepared
   connect once to status-changed for each account for each chatroom...

   Change this such that whenever an account connects, we simply
   get the then current list of chatrooms and auto-connect those
   as needed.

   This fixes issues when a chatroom gets removed from the manager
   and when
   the auto-connect options on a chatrooms change.

src/empathy.c |   72
++++++++++++++++++++++++++++++---------------------------
1 files changed, 38 insertions(+), 34 deletions(-)

commit 79cf371093d1a1b0d9120a4bbcc5d73c7c67842d
Author: Duarte Loreto <[email protected]>
Date:   Mon Mar 21 00:19:03 2011 +0000

   Updated Portuguese translation

po/pt.po |  747
++++++++++++++++++++++++++++++++++---------------------------
1 files changed, 416 insertions(+), 331 deletions(-)

commit 85bac3ba97a74efcc7c2a3ba835bd47431deddfb
Author: Gil Forcada <[email protected]>
Date:   Sun Mar 20 21:25:58 2011 +0100

   [l10n]Updated Catalan translation

po/ca.po |  663
++++++++++++++++++++++++++++++++++----------------------------
1 files changed, 364 insertions(+), 299 deletions(-)

commit 24a0b04281688f4fc1b7696d9ca806f1bae661dc
Author: Rudolfs Mazurs <[email protected]>
Date:   Sun Mar 20 17:03:09 2011 +0200

   Updated Latvian translation.

po/lv.po | 1299
+++++++++++++++++++++++++++++++-------------------------------
1 files changed, 659 insertions(+), 640 deletions(-)

commit 819b9a246ae94aff9e55a706f37fcc00e1f0bcf2
Author: Kjartan Maraas <[email protected]>
Date:   Sun Mar 20 11:25:09 2011 +0100

   Updated Norwegian bokmål translation

po/nb.po |  216
+++++++++++++++++++++++++++++++-------------------------------
1 files changed, 108 insertions(+), 108 deletions(-)

commit 5acdf1332d6af7d895745ffe60bce72d7f4e3b69
Author: Kjartan Maraas <[email protected]>
Date:   Thu Mar 17 09:53:23 2011 +0100

   Updated Norwegian bokmål translation

po/nb.po |  589
++++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 339 insertions(+), 250 deletions(-)

commit 8e4b1bdae8815bc8e64eea6ec78592c50c413bc8
Author: Aron Xu <[email protected]>
Date:   Sat Mar 19 16:16:57 2011 +0000

   Update Simplified Chinese translation.

po/zh_CN.po |  877
+++++++++++++++++++++++++++++++----------------------------
1 files changed, 463 insertions(+), 414 deletions(-)

commit 882505f1fe475d4ec325e86a4858850eb086d3b3
Author: Piotr Drąg <[email protected]>
Date:   Sat Mar 19 16:12:27 2011 +0100

   Updated Polish translation

po/pl.po |  656
+++++++++++++++++++++++++++++++++++---------------------------
1 files changed, 368 insertions(+), 288 deletions(-)

commit 02922b22156fafc1c02a2e93cd2dee1394bb2f24
Author: Dirgita <[email protected]>
Date:   Sat Mar 19 22:09:44 2011 +0700

   Updated Indonesian translation

po/id.po | 2710
++++++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 1831 insertions(+), 879 deletions(-)

commit 24741700bd129cd0a7a6da87f6335ac98caa0e60
Author: Changwoo Ryu <[email protected]>
Date:   Sat Mar 19 22:11:38 2011 +0900

   Updated Korean translation

po/ko.po |  460
+++++++++++++++++++++++++++++++-------------------------------
1 files changed, 233 insertions(+), 227 deletions(-)

commit 9ef9a7660d00fb00e59af3217f38da56e2d76884
Author: Khaled Hosny <[email protected]>
Date:   Sat Mar 19 02:56:20 2011 +0200

   Updated Arabic translation

po/ar.po |  512
+++++++++++++++++++++++++++++++-------------------------------
1 files changed, 257 insertions(+), 255 deletions(-)

commit 6fc411c2e7a53eafe132c67c7ce430df665e5493
Author: Emilio Pozuelo Monfort <[email protected]>
Date:   Fri Mar 18 21:00:21 2011 +0000

   Use the right marshal file

libempathy-gtk/empathy-chat.c |    4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

commit c39a6c8faba251e0ef0bef64412fbd3ddd5c2ea2
Author: Emilio Pozuelo Monfort <[email protected]>
Date:   Fri Mar 18 14:39:06 2011 +0000

   Assistant: put the protocol chooser next to the label

src/empathy-account-assistant.c |    9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)

commit f1975e66ba22bfcfeeb2b1583143693a454aad89
Author: Stef Walter <[email protected]>
Date:   Fri Mar 18 14:48:55 2011 +0100

   Style changes from review for ReferenceIdentities code

libempathy/empathy-server-tls-handler.c |   14 +++++++++-----
libempathy/empathy-tls-verifier.c       |   15 +++++++++------
src/empathy-auth-client.c               |    2 +-
3 files changed, 19 insertions(+), 12 deletions(-)

commit 87fe6f3680d91edc933bc767cae6e500b8bac011
Author: Will Thompson <[email protected]>
Date:   Fri Mar 18 11:19:34 2011 +0000

   Map Ctrl-Shift-F to contact search and Ctrl-F to find

   As discussed on <https://bugzilla.gnome.org/show_bug.cgi?id=645121>,
   currently Ctrl-F opens the contact search dialog, and there's no
   keyboard shortcut for searching within the contact list (other
   than just
   typing). The Gnome HIG handles this situation: it says that the former
   should be Ctrl-Shift-F and the latter should be Ctrl-F.
   <http://library.gnome.org/devel/hig-book/2.32/input-keyboard.html.en#standard-shortcuts>

src/empathy-main-window.ui |    2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

commit 5719134cc2ecacb5076c9e8133feb8473979b5f5
Author: Shankar Prasad <[email protected]>
Date:   Fri Mar 18 18:39:37 2011 +0530

   Updated kn translations

po/kn.po | 3731
++++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 2642 insertions(+), 1089 deletions(-)

commit 053503cfa6ee966a91f85069e0eda6da0335b0e6
Author: Guillaume Desmottes <[email protected]>
Date:   Fri Mar 18 11:45:49 2011 +0100

   auth-factory: allow to handle more than one auth channel at the same
   time (#645112)

libempathy/empathy-auth-factory.c |   50
++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 12 deletions(-)

commit b531101e9f3b6654476d236213ea22e100869a9c
Author: Guillaume Desmottes <[email protected]>
Date:   Fri Mar 18 11:43:16 2011 +0100

   auth-factory: use a proper priv pointer

libempathy/empathy-auth-factory.c |    4 ++--
libempathy/empathy-auth-factory.h |    3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)

commit 37e2773cfddb5ef46d79ccd70593bd16066e6512
Author: Guillaume Desmottes <[email protected]>
Date:   Fri Mar 18 11:42:24 2011 +0100

   add empathy_server_sasl_handler_get_channel()

libempathy/empathy-server-sasl-handler.c |   12 ++++++++++++
libempathy/empathy-server-sasl-handler.h |    3 +++
2 files changed, 15 insertions(+), 0 deletions(-)

commit 2eb0d2db6f945cb72fd9e9a909dd1d95c79e7d02
Author: Stef Walter <[email protected]>
Date:   Fri Mar 18 11:40:54 2011 +0100

   Free priv->hostname in EmpathyServerTlsHandler

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

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

commit 25ed247445aacfce41e0c15aac08cc5697427c1a
Author: Emilio Pozuelo Monfort <[email protected]>
Date:   Fri Mar 18 11:14:51 2011 +0000

   Display an avatar on the block contact dialog

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

libempathy-gtk/empathy-individual-dialogs.c |    8 ++
libempathy-gtk/empathy-individual-dialogs.h |    1 +
libempathy-gtk/empathy-individual-view.c    |  170
++++++++++++++++-----------
3 files changed, 111 insertions(+), 68 deletions(-)

commit 3b10103f06517cd7bfbb1576daadaf4855b800a2
Author: Stef Walter <[email protected]>
Date:   Fri Mar 18 11:59:02 2011 +0100

   Use ServerTLSConnection.ReferenceIdentities to check cert identity.

   The certificate identity can be checked against more than just
   one piece of information. Load and use all the reference identities
   to check the identity of the certificate.

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

libempathy/empathy-server-tls-handler.c |   41
++++++++++++++++++++++++++++++-
libempathy/empathy-tls-verifier.c       |   38
+++++++++++++++++++++++++---
libempathy/empathy-tls-verifier.h       |    3 +-
src/empathy-auth-client.c               |    6 ++++-
4 files changed, 81 insertions(+), 7 deletions(-)

commit 00f27e9c52f494cad1b36e0e106a129e884ac428
Author: Stef Walter <[email protected]>
Date:   Fri Mar 18 11:40:54 2011 +0100

   Free priv->hostname in EmpathyServerTlsHandler

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

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

commit 385b1a5c6c3f0fd9d7cd5d33843466ed9e1238cc
Author: Guillaume Desmottes <[email protected]>
Date:   Fri Mar 18 10:33:49 2011 +0100

   Allow to Observe a ServerAuthentication channel while handling
   another one

   There is no reason to refuse to Observe it. (#645108)

libempathy/empathy-auth-factory.c |    3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

commit f1d664454fafb8f183c8721154f534f71d8423ea
Author: Guillaume Desmottes <[email protected]>
Date:   Fri Mar 18 10:27:23 2011 +0100

   common_checks: tell the truth in debug messages

   It's really confusing to read a "Can't handle.." error while it's
   actually an
   observe error.

libempathy/empathy-auth-factory.c |   16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)

commit 73720bb84423e70ad21599b4713d1137f8a85e73
Author: Guillaume Desmottes <[email protected]>
Date:   Fri Mar 18 10:23:58 2011 +0100

   common_checks: rename must_be_sasl arg to observe

   It was things clearer and easier to understand.

libempathy/empathy-auth-factory.c |    9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)

commit 1d04deb0ffa562830485ba2eb626c123082afa3b
Author: Danielle Madeley <[email protected]>
Date:   Fri Mar 18 08:33:07 2011 +1100

   Fix the icon metadata

   The new Empathy icon was mistakenly named 'Pidgin' in the metadata.
   Clearly when Jakub drew it he thought he was drawing it for
   Pidgin. Renaming
   it to Empathy so people don't get confused.

data/icons/empathy.svg |    6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

commit 5970402dc0e1971226b9c29014da43c8e354c1fd
Author: Daniel Korostil <[email protected]>
Date:   Thu Mar 17 19:41:01 2011 +0200

   Uploaded Ukranian

po/uk.po |  642
+++++++++++++++++++++++++++++++++++---------------------------
1 files changed, 361 insertions(+), 281 deletions(-)

commit 728a0418bb6dbf5b3f16bd3b12ca802d1530de60
Author: Guillaume Desmottes <[email protected]>
Date:   Thu Mar 17 16:18:02 2011 +0100

   remove released flag

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