commit 9830714434c0b2ff8679de2daa68d3aab6f09cc8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Sep 19 16:38:43 2011 +0200

    coding style fix

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

commit 768efa64b2986ffe6e394a7f58262f44e6e2fc99
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Sep 19 16:20:30 2011 +0200

    prepare 3.1.92

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

commit aaff7e95f9dd66f94a3b85e910b049daf9097a0c
Author: Raul Gutierrez Segales <rgs@collabora.co.uk>
Date:   Mon Sep 19 15:09:57 2011 +0100

    Use always-writeable and writeable-properties for alias and groups

    Folks is in the way of deprecating the
    folks_persona_store_get_can_{alias,group}_personas methods in favour
    of directly checking alias and groups properties via
    folks_persona_store_get_always_writeable_properties and
    folks_persona_get_writeable_properties.

 libempathy-gtk/empathy-individual-menu.c |    5 +-
 libempathy/empathy-utils.c               |   94
 ++++++++++++++++++++++++------
 libempathy/empathy-utils.h               |    6 +-
 3 files changed, 83 insertions(+), 22 deletions(-)

commit ccd55bf7585624f1aab05525444449c44310d642
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Mon Sep 19 15:56:49 2011 +0200

    EmpathyChat: Set slider position after a timeout

    This ensure that the window has resized before setting the position
    because GtkPaned needs to know its size allocation

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

 libempathy-gtk/empathy-chat.c |   45
 ++++++++++++++++++++++++++--------------
 1 files changed, 29 insertions(+), 16 deletions(-)

commit 4a6debbdd20ae45b7f5653f2374b0980545ba753
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date:   Mon Sep 19 13:13:49 2011 +0100

    Updated British English translation

 po/en_GB.po |  291
 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 156 insertions(+), 135 deletions(-)

commit be57ef773c5d24c921c586eba75cdd73db23223f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Sep 19 13:50:59 2011 +0200

    Don't assume a connected TpAccount always have a TpConnection

    The connection object may not be there yet if tp-glib is still
    preparing its
    features.

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

 src/empathy.c |   21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)

commit 5ca677e8864ed07d51b243beb9f5fd6a111d305e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Sep 19 12:51:55 2011 +0100

    Build fix

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

commit a3086b1cb486653391d90e34539fe9277b4d2d08
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Thu Sep 8 15:17:24 2011 +0100

    CallWindow: unconditionally connect to notify::call-channel

    Since we can get a new call channel if we e.g. hangup and
    then call again.

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

 src/empathy-call-window.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

commit add501b302cc0d35936417997c861ae274f2803d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Thu Sep 8 15:12:24 2011 +0100

    CallWindow: emit tones using MultipleTones

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

 src/empathy-call-window.c |   84
 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 68 insertions(+), 16 deletions(-)

commit e79a44f083fe138ab9e8b1fe04196e19b8a0cce8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Sep 19 12:18:44 2011 +0200

    Use tp_proxy_prepare_async instead of tp_account_prepare_async

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

commit 6670167794afb834c87fa7bae7286567b7a84cb3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Sep 19 12:18:44 2011 +0200

    Use tp_proxy_prepare_async instead of tp_account_manager_prepare_async

 libempathy-gtk/empathy-account-chooser.c  |    4 ++--
 libempathy-gtk/empathy-account-widget.c   |    4 ++--
 libempathy-gtk/empathy-chat.c             |    4 ++--
 libempathy-gtk/empathy-location-manager.c |    8 ++++----
 libempathy-gtk/empathy-notify-manager.c   |    4 ++--
 libempathy-gtk/empathy-presence-chooser.c |    4 ++--
 libempathy/empathy-account-settings.c     |    4 ++--
 libempathy/empathy-chatroom-manager.c     |    4 ++--
 libempathy/empathy-contact-manager.c      |    4 ++--
 libempathy/empathy-presence-manager.c     |    4 ++--
 src/empathy-account-assistant.c           |    4 ++--
 src/empathy-accounts-dialog.c             |    4 ++--
 src/empathy-accounts.c                    |    4 ++--
 src/empathy-import-widget.c               |    4 ++--
 src/empathy-main-window.c                 |    4 ++--
 src/empathy-migrate-butterfly-logs.c      |    4 ++--
 src/empathy-status-icon.c                 |    4 ++--
 src/empathy.c                             |   10 +++++-----
 18 files changed, 41 insertions(+), 41 deletions(-)

commit e832dfa825bd284600ffa28d2a9180d96c7024a5
Author: Antoine Jacoutot <ajacoutot@openbsd.org>
Date:   Sun Sep 18 12:11:06 2011 +0200

    Sync with the current GSettings schemas install rule from gsettings.m4
    in glib. See #627126 for details.

    This allows to properly install gsettings schemas files on BSDs.

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

 m4/gsettings.m4 |   16 ++--------------
 1 files changed, 2 insertions(+), 14 deletions(-)

commit 8a15d7ddcab9c2379e562e3b72e8ec6b11165d25
Author: Daniel Nylander <po@danielnylander.se>
Date:   Sun Sep 18 19:32:42 2011 +0200

    Updated Swedish translation

 po/sv.po |  181
 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 103 insertions(+), 78 deletions(-)

commit 4729fd834d3b2e518d643875e6b6acbe07fdbcfc
Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:   Sun Sep 18 19:13:43 2011 +0300

    Updated Latvian translation.

 po/lv.po |  408
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 215 insertions(+), 193 deletions(-)

commit 887a1089dc8576da06f50bb22a606e3322de2a82
Author: Muhammet Kara <muhammet.k@gmail.com>
Date:   Sun Sep 18 19:00:17 2011 +0300

    Updated Turkish translation

 po/tr.po | 2184
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 1428 insertions(+), 756 deletions(-)

commit 57fbdc80bfd439d4865855a23ef21f9e434e2810
Author: Jorge González <aloriel@gmail.com>
Date:   Sun Sep 18 17:04:02 2011 +0200

    Updated Spanish translation

 po/es.po |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

commit 128e39f2775c365aa164b2d87a20fa7280da18d5
Author: Jorge González <aloriel@gmail.com>
Date:   Sun Sep 18 16:55:07 2011 +0200

    Updated Spanish translation

 po/es.po |  167
 ++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 98 insertions(+), 69 deletions(-)

commit cd16ab7ec022f007326588f0d280706b618a3f29
Author: Mario Blättermann <mariobl@gnome.org>
Date:   Sun Sep 18 16:23:51 2011 +0200

    [l10n] Updated German translation

 po/de.po |  794
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 438 insertions(+), 356 deletions(-)

commit ef797ff9eba01210d16047e26563b8270ee02081
Author: Aurimas Černius <aurisc4@gmail.com>
Date:   Sun Sep 18 16:34:26 2011 +0300

    Updated Lithuanian translation

 po/lt.po |  472
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 253 insertions(+), 219 deletions(-)

commit e819cd86bfacfda9ee936436a4c2e0b207dfcbab
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:   Sun Sep 18 13:59:43 2011 +0530

    updated Tamil translation

 po/ta.po |  221
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 110 insertions(+), 111 deletions(-)

commit c1b157527522ce7cf83342182f99d93216273f24
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:   Sun Sep 18 13:55:41 2011 +0530

    updated Tamil translation

 po/ta.po |   80
 ++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 50 insertions(+), 30 deletions(-)

commit ed7a75cd3de64fe7ceda6fbc97c4b405e4fc7492
Author: Alexander Shopov <ash@kambanaria.org>
Date:   Sun Sep 18 11:00:06 2011 +0300

    Updated Bulgarian translation

 po/bg.po |  158
 ++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 88 insertions(+), 70 deletions(-)

commit 919a3258cf3757a3653676d08c78709e0dae5f38
Author: A S Alam <aalam@users.sf.net>
Date:   Sun Sep 18 08:58:16 2011 +0530

    update Punjabi Translation

 po/pa.po |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit efc18ab4f5bfdb068c583f21e49dd98d09563163
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:   Sat Sep 17 23:46:31 2011 +0300

    Updated Belarusian translation (some fixes after manual testing).

 po/be.po |   96
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 48 insertions(+), 48 deletions(-)

commit 3d3f0ec702c9436e6d85d3c509f1840ccd74fd83
Author: A S Alam <aalam@users.sf.net>
Date:   Sun Sep 18 01:03:16 2011 +0530

    Updated Punjabi Translation

 po/pa.po |  303
 ++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 159 insertions(+), 144 deletions(-)

commit ceeb1b6f003db30a3ef9cfd993fcff884c86d49b
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Sat Sep 17 11:37:43 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po |  181
 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 103 insertions(+), 78 deletions(-)

commit 79c35acd819667c5558b7479cb9ff80df0f8b154
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:   Sat Sep 17 12:34:10 2011 +0400

    Updated Russian translation

 po/ru.po |  387
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 212 insertions(+), 175 deletions(-)

commit 9d2f4c4ca7362b7b87a4f38b979c995b68a5352b
Author: Jiro Matsuzawa <jmatsuzawa@src.gnome.org>
Date:   Sat Sep 17 11:48:49 2011 +0900

    Updated Japanese translation

 po/ja.po | 2460
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 1596 insertions(+), 864 deletions(-)

commit 27b930e6bdc4331749903a4d6112913660a2c966
Author: Duarte Loreto <happyguy_pt@hotmail.com>
Date:   Sat Sep 17 00:55:19 2011 +0100

    Updated Portuguese translation

 po/pt.po | 2226
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 1427 insertions(+), 799 deletions(-)

commit 669606a45907443b82915e41e46d2e3d966cc549
Author: Milo Casagrande <milo@ubuntu.com>
Date:   Fri Sep 16 19:04:46 2011 +0200

    [l10n] Updated Italian translation

 po/it.po |  285
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 153 insertions(+), 132 deletions(-)

commit 1ce2aa6b4cf7d049fd3c51784ff447d608cd1084
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Sep 16 14:23:13 2011 +0200

    avatar-chooser: disable 'take picture' button if there is no camera
    connected

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

 libempathy-gtk/empathy-avatar-chooser.c |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

commit 49f3411a5c414ec1a6a7cf68de9ef7c8c8cb7938
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Sep 16 14:14:17 2011 +0200

    avatar-chooser: split creation of the file chooser dialog

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

 libempathy-gtk/empathy-avatar-chooser.c |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

commit 7dc159658c022fdd1bd3f05dfa3bdc8c21b88369
Author: Antonio Fernandes C. Neto <fernandesn@gnome.org>
Date:   Fri Sep 16 08:57:18 2011 -0300

    Updated Brazilian Portuguese translation

 po/pt_BR.po |  160
 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 91 insertions(+), 69 deletions(-)

commit 1049880bd7c7176a8e8c22fcab61006aeaf9911f
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date:   Fri Sep 16 13:41:39 2011 +0200

    Updated Danish translation

 po/da.po |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

commit 3594bf73250ba466307f01eb95db2eed766998f1
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date:   Fri Sep 16 13:39:23 2011 +0200

    Updated Danish translation

 po/da.po |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

commit 7d1903a1479461de3f3322bed4df0913271b5f42
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date:   Fri Sep 16 13:32:55 2011 +0200

    Updated Danish translation

 po/da.po | 2256
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 1436 insertions(+), 820 deletions(-)

commit 0fab2d22847ee90c06be84bac9935942e39039b1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Sep 16 10:32:18 2011 +0200

    tp-roomlist: pass self as weak object to
    tp_cli_channel_type_room_list_call_list_rooms

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

 libempathy/empathy-tp-roomlist.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit e3ac85477f053b98531e1b295c498b41659ab0eb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Sep 16 10:26:42 2011 +0200

    tp-roomlist: ensure that we stay alive during the
    create_and_handle_channel async call

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

 libempathy/empathy-tp-roomlist.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

commit 708aa24958f0e211f8582e3662b149f4ddb1305b
Author: Bruno Brouard <annoa.b@gmail.com>
Date:   Thu Sep 15 23:40:06 2011 +0200

    Updated French translation

 po/fr.po | 2253
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 1435 insertions(+), 818 deletions(-)

commit 972b917c9e2ddcac86d7b9f7799158f77f5aedbf
Author: Fran Dieguez <fran@openhost.es>
Date:   Thu Sep 15 21:02:33 2011 +0200

    Updated Galician translations

 po/gl.po |  157
 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 89 insertions(+), 68 deletions(-)

commit fd0437bd1669e2d1992c2f36884003d60686dca9
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:   Thu Sep 15 19:25:39 2011 +0300

    Updated Belarusian translation.

 po/be.po |  142
 +++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 81 insertions(+), 61 deletions(-)

commit c74b2a54f8f53dddf5b2c0b6c3ed2427e54b1f90
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Thu Sep 15 15:32:12 2011 +0200

    Updated Polish translation

 po/pl.po |  142
 +++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 81 insertions(+), 61 deletions(-)

commit e3327f1e82fbf9c386bbb0cc07a87d47ad89d6fe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Sep 15 15:13:07 2011 +0200

    log-window: fix translators comment

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

 libempathy-gtk/empathy-log-window.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

commit 63ad9ebf15467a134ab044969faecbf3f4a2a758
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Sep 15 15:06:19 2011 +0200

    log-window: properly translate duration strings

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

 libempathy-gtk/empathy-log-window.c |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

commit 051beb6158c98cd2aa6c7219fc3c94a7eb3ae7b0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Sep 6 09:26:50 2011 +0200

    Disable contact and contact list search when disconnected

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

 src/empathy-main-window.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

commit 7bd81c09f38bc0d4672e0674b00851be3fce7b39
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date:   Thu Sep 15 18:31:48 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  616
 +++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po |  619
 +++++++++++++++++++++++++++++++----------------------------
 2 files changed, 653 insertions(+), 582 deletions(-)

commit 87f3753ef09050949f28ecdc8272579cb9225641
Merge: 4c7ee0a 42ea425
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Sep 15 11:53:46 2011 +0200

    Merge remote-tracking branch 'pochu/call-reuse-windows-580794'

commit 4c7ee0a436cea45e4351e857577ddf944d36b2f3
Author: Alban Crequy <alban.crequy@collabora.co.uk>
Date:   Wed Sep 14 15:40:44 2011 -0400

    Remove unused variables [-Werror=unused-but-set-variable]

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

 libempathy-gtk/empathy-contact-list-store.c |    2 --
 libempathy-gtk/empathy-individual-store.c   |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)

commit e5eefe62e3fc0d0b9c1df569489ab13f76e00a59
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Sep 13 15:45:19 2011 +0200

    contact-list-store: store GtkTreeIter rather than GtkTreeRowReference
    in the cache

    GtkTreeRowReference keeps a ref on the store introducing a ref cycle.

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

 libempathy-gtk/empathy-contact-list-store.c |   79
 +++++++--------------------
 1 files changed, 20 insertions(+), 59 deletions(-)

commit 7561e27e705ff2df727a96016f57a60e3d0e0376
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Sep 13 15:45:19 2011 +0200

    individual-store: store GtkTreeIter rather than GtkTreeRowReference
    in the cache

    GtkTreeRowReference keeps a ref on the store introducing a ref cycle.

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

 libempathy-gtk/empathy-individual-store.c |   85
 +++++++----------------------
 1 files changed, 21 insertions(+), 64 deletions(-)

commit 0cfae9679043ad56e28677b2333ffbe8a5e7d3df
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Sep 14 12:04:07 2011 +0200

    goa-mc-plugin: do not set the ConnectAutomatically Account property

    GOA accounts should behave like regular TP accounts and so shouldn't
    connect
    automatically.

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

 goa-mc-plugin/mcp-account-manager-goa.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit dc761ca9d13c3f242e06cd4756f3e448a2e3c030
Author: Krasimir Chonov <mk2616@abv.bg>
Date:   Thu Sep 15 08:18:30 2011 +0300

    Updated Bulgarian translation

 po/bg.po | 2156
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 1376 insertions(+), 780 deletions(-)

commit 48b1f9b7296429dca020545095f1e370793a0df1
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:   Wed Sep 14 21:58:55 2011 +0300

    Updated Belarusian translation.

 po/be.po |  277
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 146 insertions(+), 131 deletions(-)

commit 6ac4e08359a3d5c33e2f38dcd0129b5180810bba
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Sep 14 16:43:25 2011 +0200

    sasl-handler: only save password if we manage to connect

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

 libempathy/empathy-server-sasl-handler.c |   56
 ++++++++++++++++++------------
 1 files changed, 34 insertions(+), 22 deletions(-)

commit ba16c4a15b9977e61461bd9f222104eaa2204ee3
Author: Cosimo Alfarano <cosimo.alfarano@collabora.com>
Date:   Tue Sep 13 14:35:55 2011 +0100

    Update Collabora copyright in About Window

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

commit 9219415733151bc6d48d88bacf19cdad647a6c69
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Sep 13 12:17:50 2011 +0200

    GOA plugin: only save parameters from GOA accounts

    We should let MC deal with normal accounts.

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

 goa-mc-plugin/mcp-account-manager-goa.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

commit b981b3d1a13e22c80c21b61131c4f07053840149
Author: Rajesh Ranjan <rranjan@redhat.com>
Date:   Wed Sep 14 13:26:42 2011 +0530

    hindi update

 po/hi.po |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit ff653a8bf28b71c883881bec14e31defb9d54123
Author: Rajesh Ranjan <rranjan@redhat.com>
Date:   Wed Sep 14 13:25:25 2011 +0530

    hindi update

 po/hi.po |  406
 ++++++++++++++++++++++----------------------------------------
 1 files changed, 143 insertions(+), 263 deletions(-)

commit a18fc91fb327a2b0c4d37d51b575e18a6f3070f4
Author: Rajesh Ranjan <rranjan@redhat.com>
Date:   Wed Sep 14 11:30:50 2011 +0530

    hindi update

 po/hi.po |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 715a87d3400b16ffe636b92de1fdd25ec22ea56a
Author: Rajesh Ranjan <rranjan@redhat.com>
Date:   Wed Sep 14 11:29:19 2011 +0530

    hindi update

 po/hi.po | 2751
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 1711 insertions(+), 1040 deletions(-)

commit e84794239a4c2a89b4381fdaf1cb3104d0ad9773
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Tue Sep 13 20:55:49 2011 +0200

    Updated Polish translation

 po/pl.po |  133
 +++++++++++++++++++++++++++++++------------------------------
 1 files changed, 68 insertions(+), 65 deletions(-)

commit a0ef67f006e0dee00ed1bc6f22323aad2ea3d39d
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:   Tue Sep 13 19:39:12 2011 +0530

    updated Tamil translation

 po/ta.po |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit aa12b7ccf9887e0901dd8464be1200381e8413b9
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:   Tue Sep 13 19:38:14 2011 +0530

    updated Tamil translation

 po/ta.po |  304
 +++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 164 insertions(+), 140 deletions(-)

commit 40bf91b05f4d3408e195b4a1218de673d6ee7fbf
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Mon Sep 12 16:52:34 2011 -0400

    individual-widget: use GtkGrid instead of GtkTable internally

    EmpathyIndividualWidget (used both in the contact information dialogs
    and in the tooltips) use a GtkTable internally to layout contact
    details.

    GtkTable is being deprecated, and does not correctly support
    width-for-height size negotiation. So, there are cases where we get
    funny overallocations bugs for wrapping GtkLabels; this is especially
    annoying for tooltips, as they tend to grow huge vertically.

    Porting the code to use a better container such as GtkGrid solves the
    bug. This patch does not cover all the use of GtkTable in
    EmpathyIndividualWidget, but enough to fix the tooltip sizing.

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

 libempathy-gtk/empathy-individual-widget.c |  243
 ++++++++++++++--------------
 1 files changed, 118 insertions(+), 125 deletions(-)

commit 0a3f996d2ec2eed860edda7c36a9b6bdbd9d2722
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Fri Sep 9 15:28:42 2011 +0100

    AccountChooser: don't return garbage from _set_account

    Previously, the 'set' field of the stack-allocated 'data' structure
    was
    not initialized. It's explicitly set to TRUE if the account is found,
    but never otherwise set; so if the account is not found, this function
    returned random garbage.

    Reviewed-by: Xavier Claessens <xclaesse@gmail.com>

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

commit 80a217a0b8533f8f936140082b90da793bc1b154
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Sep 13 10:24:48 2011 +0200

    notifications-approver: move translators comment right before
    the string

    Comments have to be on the line just before the string to be picked by
    gettext.

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

 src/empathy-notifications-approver.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

commit 2a856251402a5ed06a5f9853b7b26abfcbf5eb3c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Sep 12 16:58:46 2011 +0200

    theme-adium: ensure we always use the same color when sending messages

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

 libempathy-gtk/empathy-theme-adium.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

commit 36211fc1a6e977c82e1f6467691a499fe6b68410
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Sep 12 16:10:13 2011 +0200

    rename text/{persona,individual}-id as they are not standard

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

 libempathy-gtk/empathy-individual-linker.c |    2 +-
 libempathy-gtk/empathy-individual-view.c   |    8 ++++----
 libempathy-gtk/empathy-persona-view.c      |    6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

commit 656e9addef5ab7c5d3dc21fc0c502a15fc94331e
Author: Yinghua Wang <wantinghard@gmail.com>
Date:   Tue Sep 13 12:58:53 2011 +0800

    update Simplified Chinese (zh_CN) translation; fix format

 po/zh_CN.po | 1208
 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 634 insertions(+), 574 deletions(-)

commit dafc0ff233c2d02c607bb6ee67e714ba698319fc
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Mon Aug 29 20:43:22 2011 +0100

    individual-manager: Port to the new individuals_changed_detailed
    signal

    Closes: bgo#657746

 configure.ac                            |    2 +-
 libempathy/empathy-individual-manager.c |   35
 +++++++++++++++++++++++--------
 2 files changed, 27 insertions(+), 10 deletions(-)

commit 03eeddb4c836614b2bf1f935472bd66c98003aa1
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Mon Sep 12 20:50:33 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po |  256
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 132 insertions(+), 124 deletions(-)

commit e872c255f2145985a0f881d68b247a221338fdb3
Author: Daniel Nylander <po@danielnylander.se>
Date:   Mon Sep 12 17:55:01 2011 +0200

    Updated Swedish translation

 po/sv.po |  292
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 152 insertions(+), 140 deletions(-)

commit 5b8d5406a2096aaa9d84f79c115464eb190d0830
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Sep 12 15:15:07 2011 +0200

    individual-manager: dup the Individual ID instead of borrowing it

    It's not immutable any more so we have to copy the string.

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

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

commit f0ca128096983de9df36d0fa981a0c3dcdaf5c99
Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:   Mon Sep 12 00:41:08 2011 +0300

    Updated Latvian translation.

 po/lv.po | 1699
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 914 insertions(+), 785 deletions(-)

commit 3b2e8219315d0fd6b108eb12f1be5ae099a2a88f
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Sun Sep 11 11:47:52 2011 +0200

    Updated Spanish translation

 po/es.po |  128
 ++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 63 insertions(+), 65 deletions(-)

commit 74063b2c0a809709865a81dfa38915a97f427219
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Sat Sep 10 11:12:19 2011 +0200

    Updated Spanish translation

 po/es.po |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

commit aa064bdc58a5a897583367f7234c067f4e634a66
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Sat Sep 10 10:49:12 2011 +0200

    Updated Spanish translation

 po/es.po |  149
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 80 insertions(+), 69 deletions(-)

commit 736ce66f04aec5531ebdc7c8f649f162c4c898d1
Author: Fran Dieguez <fran@openhost.es>
Date:   Sat Sep 10 03:36:36 2011 +0200

    Updated galician translations

 po/gl.po |  262
 ++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 137 insertions(+), 125 deletions(-)

commit 1b9ddda224af418ca0f1de9d9743bc8327efc337
Author: Marek Černocký <marek@manet.cz>
Date:   Fri Sep 9 22:21:30 2011 +0200

    Updated Czech translation

 po/cs.po |  165
 ++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 81 insertions(+), 84 deletions(-)

commit a537a927a4b1af4468c57a9307ca3468a5e52838
Author: Hannie Dumoleyn <hannie@ubuntu-nl.org>
Date:   Fri Sep 9 18:38:57 2011 +0200

    Updated Dutch translation by Hannie Dumoleyn

 po/nl.po |  294
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 156 insertions(+), 138 deletions(-)

commit fefa9b3c72bdbf01277a606816fc15ac53ee780a
Author: A S Alam <aalam@users.sf.net>
Date:   Fri Sep 9 20:06:20 2011 +0530

    update PunjabiTranslation

 po/pa.po | 1127
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 597 insertions(+), 530 deletions(-)

commit 6939a5c3d045b1915d06539f96d758dfa22318e8
Author: Fran Dieguez <fran@openhost.es>
Date:   Fri Sep 9 14:54:49 2011 +0200

    Updated galician translations for docs

 help/gl/gl.po | 4624
 +++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 3492 insertions(+), 1132 deletions(-)

commit a5dfe754e2d7aa6a57f455c9a569c4f185466348
Author: Antonio Fernandes C. Neto <fernandesn@gnome.org>
Date:   Fri Sep 9 08:37:19 2011 -0400

    Updated Brazilian Portuguese translation.

 po/pt_BR.po |  298
 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 160 insertions(+), 138 deletions(-)

commit c785ff79365fb91a41e38458ae6ea5cf02cbaa8f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Sep 9 13:45:31 2011 +0200

    dup_color_balance: check that element currently implements
    GstColorBalance

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

 src/empathy-video-src.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

commit 890efc4f52b81bf90fb5d130124d68fe071abc3f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Sep 9 13:39:44 2011 +0200

    video-src: factor out dup_color_balance()

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

 src/empathy-video-src.c |   47
 +++++++++++++++++++++++------------------------
 1 files changed, 23 insertions(+), 24 deletions(-)

commit 3dd675c21527cabb74cd9b4301ea82324e0f17b6
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Fri Sep 9 12:29:35 2011 +0200

    Because we like whales

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

commit 56f569b22192230080eb6c20d0d5474fa7e47086
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Sep 9 12:51:33 2011 +0200

    individual_store_remove_individual: ensure that the store stays
    alive during the process

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

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

commit 683c88254e5488ef7b0d8d0e0fd05f46c41f5914
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Sep 9 12:49:46 2011 +0200

    contact_list_store_remove_contact: ensure that the store stays alive
    during the process

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

 libempathy-gtk/empathy-contact-list-store.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

commit c4051a34512dd7daeca7f1fa2e84d5d05805601a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Fri Sep 9 11:48:05 2011 +0100

    Require Clutter 1.7 for empathy-call

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

commit e8232dec177feb06147149ebb9f16a7de9804351
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Fri Sep 9 13:04:47 2011 +0300

    Updated Hebrew translation.

 po/he.po |  550
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 300 insertions(+), 250 deletions(-)

commit e2d79382597aa0e866694a810b83cdce0ebc593f
Author: Milo Casagrande <milo@ubuntu.com>
Date:   Thu Sep 8 22:33:24 2011 +0200

    [l10n] Updated Italian translation

 po/it.po | 2205
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 1398 insertions(+), 807 deletions(-)

commit 188b5e8d6f9896326ed0530fb2294b9b12a215ae
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Thu Sep 8 21:54:07 2011 +0200

    Updated Polish translation

 po/pl.po | 2162
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 1370 insertions(+), 792 deletions(-)

commit af574cb3638d7be10b79fdfd86313f5a1428047b
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date:   Thu Sep 8 16:28:01 2011 +0100

    Added British English translation

 po/en_GB.po | 2259
 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 1420 insertions(+), 839 deletions(-)

commit ad119467cf50c8437a62ba6e6f483eb9032771a9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Sep 8 17:02:44 2011 +0200

    factor out empathy_get_tp_contact_for_individual

 libempathy/empathy-utils.c              |   38
 +++++++++++++++++++++++++++++++
 libempathy/empathy-utils.h              |    3 ++
 src/empathy-invite-participant-dialog.c |   32 ++-----------------------
 3 files changed, 44 insertions(+), 29 deletions(-)

commit c8b29cfe85216cc692cc7e95c969e3678c153d72
Merge: 777e9d3 cbb85fe
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Thu Sep 8 13:15:53 2011 +0100

    Merge branch '657335-Preferences-Calls-Tab'

commit 777e9d330ae950e5cc89f757317fde4e96762363
Author: Jussi Kukkonen <jku@linux.intel.com>
Date:   Tue Sep 6 11:50:35 2011 +0300

    log-window: sort "Who" list store alphabetically

    Currently "Who"-list is sorted with "g_strcmp0 (name)" which
    is not what we want (e.g. "Chris" becomes before "bob" because of
    the initial capital letter).

    Start sorting using g_utf8_collate_key().

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

 libempathy-gtk/empathy-log-window.c |   38
 ++++++++++++++++++++++++----------
 1 files changed, 27 insertions(+), 11 deletions(-)

commit 42ea425116ef9c079fa199039e3ac5ed0bb8e150
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Jul 11 12:45:25 2011 +0100

    CallWindow: explain call states

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

 src/empathy-call-window.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

commit 309ca0453965d145bfeec6d9a497330833c76b7b
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue Sep 6 12:00:31 2011 +0100

    Resize the hangup button in ::realize

    So that it's not resized many times.

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

 src/empathy-call-window.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

commit 3f30f0aac8ec4f21acb84e4b5b9afa6acd131b99
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Sep 7 13:19:24 2011 +0100

    CallWindow: display a dialog to accept or reject incoming calls

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

 src/empathy-call-window.c |   72
 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 59 insertions(+), 13 deletions(-)

commit ee02c5c89132db72e5cd987cd443cd09202b6f5b
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Sep 7 15:54:29 2011 +0100

    Let the existing call window know about new incoming calls

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

 src/empathy-call-window.c |   62
 +++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-call.c        |   38 +++++++++++++++++++++++++++
 2 files changed, 100 insertions(+), 0 deletions(-)

commit d5136f90339362d53d780700808dc055fc0a7121
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Fri Jul 8 12:46:33 2011 +0100

    Reuse Call windows when possible

    If we have a call window opened for a contact and we get an
    incoming call from the same person, use the existing window
    instead of creating another one.

    Based on a patch from Jonathan Tellier.

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

 src/empathy-call-window.c |   47
 +++++++++++++++++++++++++++++++++-----------
 src/empathy-call-window.h |    6 +++++
 src/empathy-call.c        |   43 +++++++++++++++++++++++++++++++++++-----
 3 files changed, 78 insertions(+), 18 deletions(-)

commit 44731ebba06458462f5c26fed8fd0abab30e7450
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Jul 18 17:07:45 2011 +0100

    Make EmpathyCallFactory an approver

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

 src/empathy-call-factory.c |   98
 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 98 insertions(+), 0 deletions(-)

commit 391bad3cd5545b504fd69563b3bb598320c4957d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Jul 18 16:28:36 2011 +0100

    CallFactory: make it a TpBaseClient subclass

    So that we can make it both a handler and an observer at the
    same time.

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

 src/empathy-call-factory.c |  106
 +++++++++++++++-----------------------------
 src/empathy-call-factory.h |    5 +-
 2 files changed, 38 insertions(+), 73 deletions(-)

commit 180787f1addccd923d50b45858ba24a0487e98bc
Author: Timo Jyrinki <timo@debian.org>
Date:   Thu Sep 8 13:41:45 2011 +0300

    Update Finnish translation

 po/fi.po | 2969
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 1901 insertions(+), 1068 deletions(-)

commit 48ac7cb1cb93bb1e0f94db7160f13da5342aa704
Author: Marek Černocký <marek@manet.cz>
Date:   Thu Sep 8 10:55:28 2011 +0200

    Updated Czech translation

 po/cs.po | 1507
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 821 insertions(+), 686 deletions(-)

commit 77cd4e037d3bc5a91b408d8ed5b22c1cf29718c9
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:   Thu Sep 8 10:09:08 2011 +0400

    Updated Russian translation

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

commit fd43479df7b581f4406054d1573c393523eae320
Author: Xandru Armesto <xandru@softastur.org>
Date:   Wed Sep 7 17:36:13 2011 +0200

    Updated asturian translation

 po/ast.po | 3043
 +++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 2034 insertions(+), 1009 deletions(-)

commit 508b8346cb1f840ddb35a367d4a3d38b7b9271eb
Author: Andika Triwidada <andika@gmail.com>
Date:   Wed Sep 7 20:58:11 2011 +0700

    Updated Indonesian translation

 po/id.po | 1067
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 544 insertions(+), 523 deletions(-)

commit a9eb911ea875ce7e9a1c43fe76ddc77811887a60
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Sep 7 12:05:52 2011 +0200

    update_geocode: don't try to get position if location is empty

    geocode-glib won't be able to much if contact's location dict
    is empty.

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

commit ab9ee7fa8f55743968169bdaef7515a7ed52eef8
Author: Fran Dieguez <fran@openhost.es>
Date:   Wed Sep 7 02:34:25 2011 +0200

    Updated galician translations

 po/gl.po |   47 +++++++++++++++++++++++++++++------------------
 1 files changed, 29 insertions(+), 18 deletions(-)

commit 2903da2d9daa7ab3bf26eea250a612501594d3d8
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:   Wed Sep 7 01:40:08 2011 +0300

    Updated Belarusian translation.

 po/be.po |   44 +++++++++++++++++++++++++++-----------------
 1 files changed, 27 insertions(+), 17 deletions(-)

commit 0cd4f036ea16c9232e5bfd5b25cd5265d9ccd692
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Tue Sep 6 21:53:02 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po |  102
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 56 insertions(+), 46 deletions(-)

commit c748ade7736f4ff27b912214ba54c0d6ee78162d
Author: Mario Blättermann <mariobl@gnome.org>
Date:   Tue Sep 6 20:56:36 2011 +0200

    [l10n] Updated German doc translation

 help/de/de.po |  917
 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 470 insertions(+), 447 deletions(-)

commit 2365a93233ce5750a0fe3d810ac2d65f602f1564
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Tue Sep 6 20:04:21 2011 +0200

    Updated Spanish translation

 po/es.po |  182
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 97 insertions(+), 85 deletions(-)

commit 4c56f91672941396112202617345b1b0445c29e0
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Tue Sep 6 11:25:26 2011 +0100

    ContactSelector: mark standard action as the default.

    This allows Gtk+ to style the button differently to indicate that it
    will be pressed when the user hits Enter; it also fixes hitting
    enter in
    the New Conversation dialog, which does not consider
    GTK_RESPONSE_ACCEPT
    to be a reasonable response and ignores it. So we get a bug fix and
    better styling in exchange for less code!

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

 libempathy-gtk/empathy-contact-selector-dialog.c |   21
 +++++----------------
 1 files changed, 5 insertions(+), 16 deletions(-)

commit 36ef8807996629af42cec57fdb2adf4799b1cba4
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Tue Sep 6 11:06:30 2011 +0100

    IndividualManager: disconnect handler from aggregator

    Previously, the handler for
    FolksIndividualAggregator::individuals-changed was never disconnected;
    thus it could be called after EmpathyIndividualManager dies (if its
    aggregator outlives it), and crash us.

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

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

commit f05b344066594fc4acd07865b70a6865d599c5d6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Sep 6 18:55:34 2011 +0200

    use champlain 0.12

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

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

commit 4ed88cebf36575508f7eb7931b9f46b8f661a60e
Author: Alban Browaeys <prahal@yahoo.com>
Date:   Wed Aug 31 15:13:33 2011 +0200

    import: prevent haze to be used for irc

    Prevent haze to be used for irc even if sole connection
    manager to support it.
    Reworked by Guillaume Desmottes <gdesmott@gnome.org> .

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

 src/empathy-import-utils.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

commit 905dec95625ac420b3fc2914b5d365a89e5b70f8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Sep 6 18:18:05 2011 +0200

    individual-store: use Folks directly to watch is-favourite changes

    We already use it to check if a contact is in favourite or not.
    The contact manager should probably be killed at some point any way.

 libempathy-gtk/empathy-individual-store.c |   38
 +++++++++++++---------------
 1 files changed, 18 insertions(+), 20 deletions(-)

commit cbb85fe9590befd0b020b8dbf77233d32c906e42
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Tue Sep 6 11:49:05 2011 +0100

    Preferences: explain what echo cancellation means

 src/empathy-preferences.ui |   43
 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 42 insertions(+), 1 deletions(-)

commit bb6e00b22a1c7ee318e701d3780338d13be7e9e5
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Tue Sep 6 17:35:53 2011 +0200

    Updated POTFILES.in

 po/POTFILES.in |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit 0f2e15e0a3e294e47eec19659c0a02582e2198fb
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Tue Sep 6 15:52:34 2011 +0100

    TpChat: don't crash with broken TpProperties implementations

    I forgot to take the Telepathy.Properties interface out of Gabble
    when I
    removed Telepathy.Properties support from it. So Empathy called
    ListProperties() on it anyway: fine, you might think, except the
    callback set priv->had_properties_list to TRUE even if the method
    returned an error. empathy_tp_chat_set_property() and
    empathy_tp_chat_get_property() assume that if
    priv->had_properties_list is
    TRUE, priv->properties is not NULL.

    While I hope that we can delete this code entirely pretty soon,
    getting
    this crash fix in seems like a good idea.

    Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

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

commit 2f334ccf04bdd42251132b5216859fd9d22ed100
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Thu Aug 25 16:03:37 2011 +0100

    Preferences: reindent .ui file for Theme tab

    There are no XML changes in this commit, just indentation changes.

 src/empathy-preferences.ui |  184
 ++++++++++++++++++++++----------------------
 1 files changed, 92 insertions(+), 92 deletions(-)

commit 820ebbc7f67288715794f712be7c9f12130b7565
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Thu Aug 25 16:02:14 2011 +0100

    Preferences: remove Appearance label in Themes tab.

    This label doesn't add anything, so I removed it. The indentation is
    weird because I hand-edited the Glade file to show that nothing's
    really
    changed: I'll reindent it in the next patch.

 src/empathy-preferences.ui |   41
 +----------------------------------------
 1 files changed, 1 insertions(+), 40 deletions(-)

commit 3db17606a2d9e16abb9bff10233a579852b8559b
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Thu Aug 25 15:40:17 2011 +0100

    Call preferences: add colons to labels

 src/empathy-preferences.ui |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit b77af8e37dff739e55a69f85f89fc3031620e1e3
Merge: 64a35d4 5bc58b6
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Tue Sep 6 18:54:03 2011 +1000

    Merge branch 'remove-cc-plugin'

commit 64a35d4c6eddc71236c8883b8b057a48538020b4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Sep 6 10:22:53 2011 +0200

    remove release flag

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