commit 8033b91d043505723ebbcb04965de66513e230e7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 19 17:08:04 2009 +0100

    NEWS: update for 2.28.1

 NEWS |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 deletions(-)

commit dbb07f14979a3d205e1dad8c447a659d45891891
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 19 16:59:14 2009 +0100

    next release is going to be 2.28.1

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

commit e85e1ed7fa300a90f6be8037779c7e48b88cacc6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Tue Sep 1 16:20:35 2009 +0100

    Ensure we don't try to register invalid bus names

 libempathy/empathy-handler.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

commit f93812baa5b80a0f29421fefb425429dd837d2dd
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Mon Oct 19 16:58:43 2009 +0100

    Unset pending_call explicitly instead of implicitly

 libempathy/empathy-dispatcher.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

commit 812029d76b3e7a77c028d2c271696a9f7a691356
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 19 14:42:42 2009 +0100

    empathy_call_window_setup_avatars: pass a weak object to
    empathy_tp_contact_factory_get_from_handle

    Pass the call window as weak object to
    empathy_tp_contact_factory_get_from_handle so the callback won't be
    called if the window is destroyed (#598453).

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

commit abfa84d2ad30adfe4f70c707ff179fbdb7a543c5
Author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
Date:   Wed Oct 14 16:59:04 2009 -0500

    Move destruction of connections from finalize to dispose.

    Code can potentially be run between the dispose and finalize
    methods. This
    moves the destruction of connections and subsequently
    outstanding_requests
    into the dispose function so the request callback can't be fired
    between
    unreffing the EmpathyDispatcher and cancelling the pending request.

 libempathy/empathy-dispatcher.c |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

commit fedb537825c0fc8f2ec5f3d21f22b271ec30a263
Author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
Date:   Wed Oct 14 16:23:43 2009 -0500

    Remove the weak_object parameter when requesting channels.

    Use the EmpathyDispatcher pointed to in the DispatcherRequestData
    instead of
    the weak_object. Outstanding channel requests were being cancelled
    in the
    EmpathyDispatcher's finalize method. This had the potential to
    double-cancel
    the requests when the weak_object (EmpathyDispatcher) was unreffed,
    causing a
    segmentation fault.

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

commit 1a7599db774fac2bbd9929e6db7183e932d14792
Author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
Date:   Tue Oct 13 18:40:52 2009 -0500

    Cancel outstanding channel requests if connection to the CM is lost.

    When the connection to a given channel manager was lost (such as
    it crashed),
    any outstanding channel requests were freed, but then the request
    callback
    fired with an invalid (already freed) DispatcherRequestData
    parameter. It
    subsequently used this invalid data and crashed.

    This patch cancels all outstanding channel requests when they are
    freed so the
    callback isn't called with invalid data. Fixes #598332

 libempathy/empathy-dispatcher.c |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

commit aa4ffa3f6455d0dd6f12bfdde0f59f5a1485bbc3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 19 14:26:42 2009 +0100

    rename contact_list_store_finalize to contact_list_store_dispose

    This method just disconnect signals, release references and remove
    idle
    callbacks so it should really be a dispose, not a finalize.

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

commit 5c7d19ff6bf25ba055f9e8dfdf93a366bd92f944
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 19 13:54:34 2009 +0100

    empathy-contact-list-store: remove the setup idle cb when store
    is destroyed

    This ensures that the setup cb isn't called on a destroyed object
    (#598452).

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

commit bd6b127e4ae3f816cfef4c7d9015566f9ca79365
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 19 11:33:48 2009 +0100

    empathy-call-window: use empathy_signal_connect_weak to connect the
    peak-level-changed signal

    That way the callback won't be called once the call window has been
    destroyed (#598432).

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

commit 66fcb76f5ece44ed08a0772c1b361dc792c66dba
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 19 12:06:17 2009 +0100

    empathy_account_settings_get_tp_params: don't raise an error if
    tp_protocol is NULL

 libempathy/empathy-account-settings.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

commit 32aa948aa160687c968fffaf22a68d8d4df08ec3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 19 11:58:52 2009 +0100

    empathy-account-settings: don't cache the TpConnectionManagerProtocol

    The result of tp_connection_manager_get_protocol isn't garanteed to be
    valid after the main loop re-entered. We can't cache it in the account
    settings and so have to request it each time we need it.

 libempathy/empathy-account-settings.c |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

commit c0ea5c2be72209daa5984752de3ca3e8c090de19
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Thu Oct 15 19:19:50 2009 -0400

    Make calling empathy without options idempotent

    When empathy is started without any accounts the account assistant
    shows up,
    but if empathy is already running and is called again nothing
    happens. Fixed
    by always showing the account assistant if empathy is called and
    there are
    no non-salut accounts

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

commit d9f7cbe628bb7b36e58fcdb8666360568c464d2a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 19 10:10:03 2009 +0100

    test-empathy-account-assistant: empathy_account_assistant_new has
    been renamed to empathy_account_assistant_show

 tests/test-empathy-account-assistant.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 936cc96c4491e2917e906be90a48090f269c5c1a
Author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
Date:   Wed Oct 14 17:47:16 2009 -0500

    Fix assertion when closing a call window after CM crashed.

    g_object_unref was called on a NULL pointer.

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

commit 1635293a366236888d8ac1ef0f681d2f0995643a
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:   Mon Oct 19 01:10:30 2009 +0200

    Updated Hungarian translation

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

commit fffdc41ab0256f1e0219ca90f39166a99a5b5b7a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Sun Oct 18 21:31:54 2009 +0100

    Rename HAVE_NBTK to HAVE_MOBLIN

    HAVE_NBTK has been renamed to HAVE_MOBLIN a while ago, apparently
    some #if's
    were missed, causing things to break :(

 src/empathy-status-icon.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 0798d536b0beb6fdf90a35f23305dd15fa5d41b5
Author: Milo Casagrande <milo@ubuntu.com>
Date:   Sun Oct 18 13:24:17 2009 +0200

    Updated Italian translation

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

commit 82986f079e776d0299cfe144c10e5ec80259b0c0
Author: Leonid Kanter <leon@asplinux.ru>
Date:   Sun Oct 18 13:07:33 2009 +0300

    Updated Russian translation

 po/ru.po |  451
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 226 insertions(+), 225 deletions(-)

commit d86e1ee7d40b76dab7bcc1f8a0090777686e1527
Author: Milo Casagrande <milo@ubuntu.com>
Date:   Sat Oct 17 18:36:13 2009 +0200

    Updated Italian translation

 po/it.po |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

commit 5da79e43cd5e9ce33650fffa2889879f66e46077
Author: Jennie Petoumenou <epetoumenou@gmail.com>
Date:   Sat Oct 17 18:16:21 2009 +0300

    Updated Greek documentation translation

 help/el/el.po | 4525
 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 3604 insertions(+), 921 deletions(-)

commit 5395bb722fc1cb6dfbe415908e86734f523c6128
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:   Sat Oct 17 15:09:47 2009 +0100

    idle: work around the case if the session doesn't tell us when we
    go idle (fixes bug #594619)

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-idle.c |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

commit e5111de77de889a6b6db36ca7c6babe1ac110f59
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:   Sat Oct 17 13:13:54 2009 +0100

    debug-window: add C-w keybinding to close the window

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-debug-window.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

commit 034cb4d39a961d1e643889d781704f6fb652b925
Author: André Gondim <andregondim@ubuntu.com>
Date:   Fri Oct 16 08:56:11 2009 -0400

    Updated Brazilian Portuguese translation.

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

commit f23efaa0aa021672002d7b87b723343b4449ef7c
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:   Fri Oct 16 13:12:13 2009 +0100

    presence-chooser: remove "\n"s from DEBUG calls

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-presence-chooser.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

commit a8844c7816553ea10c08d8119cef98a766c15a6d
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:   Fri Oct 16 13:00:05 2009 +0100

    presence-chooser: make the entry not editable when we are offline

    The idea behind this is that you can't set a custom status when you
    are offline. It just doesn't make sense.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

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

commit d3ab564a2a82f592c02f4813a71ba0497aa6841e
Author: Claude Paroz <claude@2xlibre.net>
Date:   Thu Oct 15 18:04:55 2009 +0200

    Updated French translation

 po/fr.po |  201
 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 114 insertions(+), 87 deletions(-)

commit d1dcde5e64f54f75f3c3ecfedcbecbd1178f6ac7
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Thu Oct 15 11:43:10 2009 -0400

    Make sure -h is respected when there were no mc4 accounts to import

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

commit ef109f7f0d83a5122da14e9bca67e973bfd4ff4f
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Sat Aug 22 18:30:46 2009 +0100

    Iterate avatar tokens with a GHashTableIter

 libempathy/empathy-tp-contact-factory.c |   49
 ++++++++++++-------------------
 1 files changed, 19 insertions(+), 30 deletions(-)

commit a584e6f0e24cfb08e8b1103db5449e505cae20e6
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Sat Aug 22 18:24:13 2009 +0100

    Get rid of the last two _run_ calls in Empathy

    Hooray! Also, don't try to get known avatar tokens or capabilities if
    the CM doesn't support them. This reduces the outrageous Debug spam
    when I connect to a Haze account or (worse) a big IRC channel.

    Fixes Gnome bug #532737

 libempathy/empathy-tp-contact-factory.c |   60
 +++++++++++++++----------------
 1 files changed, 29 insertions(+), 31 deletions(-)

commit 04695319095535fc816b62c3054ac514fb64d830
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:   Thu Oct 15 13:43:44 2009 +0200

    Don't try to double free the avatar data (#598423).

    Also, simplify the code for loading the avatar data from the file.

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

commit 837805764a983cb16665c1a61c601aeddd595eb4
Author: A S Alam <aalam@users.sf.net>
Date:   Thu Oct 15 13:24:28 2009 +0530

    Complete Translation for Punjabi

 po/pa.po |  282
 ++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 139 insertions(+), 143 deletions(-)

commit c713d54a46ca7c3e82abfbad51c4008a8894c529
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Wed Oct 14 11:25:12 2009 -0400

    Make sure the account manager is completely unreffed when exiting

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

commit 8c725d53a09f837b2b8980961c6c2f972b7c3bf6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Tue Oct 13 19:57:07 2009 -0400

    Let empathy -a show the assistant if applicable

 src/empathy.c |   63
 +++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 52 insertions(+), 11 deletions(-)

commit 6248651c2f485427863a2e59278ff842e843cf94
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Tue Oct 13 19:38:21 2009 -0400

    When starting hidden don't show the assistant

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

commit aab162dc005bcad24f002f890eafd4b09218c941
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Tue Oct 13 19:22:40 2009 -0400

    Show the assistant if there are no non-salut accounts

 src/empathy-account-assistant.c |   18 +++++++++++++++---
 src/empathy-account-assistant.h |    2 +-
 src/empathy.c                   |   31 +++++++++++++++++++++++++------
 3 files changed, 41 insertions(+), 10 deletions(-)

commit b3369d14c45f2eeb4c85e12aae364f2451cf7753
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Wed Oct 14 12:44:11 2009 -0400

    Use a nicer callback name

 libempathy-gtk/empathy-presence-chooser.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

commit fdd5f1eb67a86cb29c1bd9411180f07a87a6ae97
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Wed Oct 14 12:15:17 2009 -0400

    Use empathy_signal_connect_weak

 libempathy-gtk/empathy-presence-chooser.c |   26
 ++++++++++----------------
 1 files changed, 10 insertions(+), 16 deletions(-)

commit 362126fcade585170c810541055f763a092ddb6a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Tue Oct 13 20:25:04 2009 -0400

    make the presence chooser insensitive no accounts are enabled

    When there are no accounts enabled, there isn't really any point in
    setting a
    presence and it's a bit confusing to the user as their action
    doesn't actually
    have a result

    Fixes #598354

 libempathy-gtk/empathy-presence-chooser.c |   61
 +++++++++++++++++++++++++++-
 1 files changed, 58 insertions(+), 3 deletions(-)

commit 103d148736acf798145ae8f1dacec855779395db
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Oct 14 15:34:01 2009 +0100

    accounts_dialog_add_account: connect notify::display-name using
    empathy_signal_connect_weak

    empathy_signal_connect_weak will disconnect the signal when the
    accounts
    dialog is disposed. (#598408)

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

commit f349318f28d0d1281bc35caaf7b178239ef81b68
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Oct 14 15:20:20 2009 +0100

    copy empathy_signal_connect_weak from telepathy-gabble

 libempathy/empathy-utils.c |   85
 ++++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-utils.h |    5 +++
 2 files changed, 90 insertions(+), 0 deletions(-)

commit 254471c433b9c476d33959572667e22691ad6ede
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Tue Oct 13 16:34:59 2009 -0400

    Use the protocol display name for new account names

    As the default display name for new accounts use the pretty
    human-readable
    version instead of the telepathy protocol names

    Fixes #598355

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

commit ed5e2d5221c6f9fd7ad0dbe31ab89304af57b222
Author: Petr Kovar <pknbe@volny.cz>
Date:   Tue Oct 13 23:17:09 2009 +0200

    Updated Czech translation by Marek Cernocky

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

commit 0d41a2d35b15bbf49dc99e8449fa0495b996cabb
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Mon Oct 12 15:51:33 2009 +0200

    Fix typo, correctly set the description of the sound being played.

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

commit db8c37f80e6d09476f36ce201d2d658fea0b13a5
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:   Sat Oct 10 23:59:59 2009 +0200

    Updated Hungarian translation

 po/hu.po |  167
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 97 insertions(+), 70 deletions(-)

commit 4261c21654c1004a8aff23337f8f8ef13fcb0d98
Author: Petr Kovar <pknbe@volny.cz>
Date:   Sat Oct 10 17:39:57 2009 +0200

    Updated Czech translation by Jan Drabek

    Reviewed by: Lucas Lommer & Petr Kovar.

 po/cs.po | 1637
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 869 insertions(+), 768 deletions(-)

commit b631c9cc6892c1388627270fcffbf7bae85e7af2
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Sat Oct 10 17:10:28 2009 +0200

    Updated Norwegian bokmål translation.

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

commit 200c9be30ad652becde465e9c6e6a51c5690d037
Author: Claude Paroz <claude@2xlibre.net>
Date:   Fri Oct 9 23:16:45 2009 +0200

    Improved French translation

 po/fr.po |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

commit 8a78a9e3fdf869ec75b7a298a2bcbcb59b35d5c0
Author: Alexander Shopov <ash@contact.bg>
Date:   Wed Oct 7 07:33:30 2009 +0300

    Updated Bulgarian translation

 po/bg.po |   96
 +++++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 61 insertions(+), 35 deletions(-)

commit da9f7bf15c05eb933fca1ecf67b1edbb67d9031c
Author: Gil Forcada <gforcada@gnome.org>
Date:   Tue Oct 6 17:11:53 2009 +0200

    Minor fix to Catalan translation

 po/ca.po |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

commit 904393e7b0b9d6bf0f0b9c57824b0bdfad5cb7f1
Author: Gil Forcada <gforcada@gnome.org>
Date:   Tue Oct 6 17:07:18 2009 +0200

    Updated Catalan translation

 po/ca.po | 1609
 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 909 insertions(+), 700 deletions(-)

commit 03480833c13ebe75d30000ce54cf0aefb21f333b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 5 15:07:15 2009 +0100

    accounts_dialog_account_display_name_changed_cb: check that
    accounts_dialog_model_get_selected_settings didn't return NULL
    (#597416)

    All the other callers of this function cope with setting being NULL so
    this one should do as well.

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

commit 10653b7cfa0392e5e57a99e587653cb33db6d822
Author: Theppitak Karoonboonyanan <thep@linux.thai.net>
Date:   Mon Oct 5 22:18:56 2009 +0700

    Updated Thai translation.

 po/th.po | 2466
 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 1683 insertions(+), 783 deletions(-)

commit 3f75d9a1986cad9b8477ec219536bec467858d0e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 5 13:41:10 2009 +0100

    upgrade Python bindings

 python/pyempathy/pyempathy.defs |   15 ---------------
 1 files changed, 0 insertions(+), 15 deletions(-)

commit ee740a408e4c9c78c4f192605ce4eeed1cf6f352
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 5 12:25:57 2009 +0100

    remove empathy_account_manager_remove from header; function has
    been removed

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

commit 55fe2ba0343c33f7b51888a75095d2eb56e7101b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 5 12:25:29 2009 +0100

    remove empathy_tp_contact_list_can_add from header; function has
    been removed

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

commit 6236839e51f08e40e5d539cb63086ef367752e4e
Author: Leonid Kanter <leon@asplinux.ru>
Date:   Mon Oct 5 14:42:03 2009 +0300

    Updated Russian translation by d.yacenko@gmail.com

 po/ru.po |  384
 ++++++++++++++++---------------------------------------------
 1 files changed, 101 insertions(+), 283 deletions(-)

commit ba26b586f37a4ea375e3f672db126ae486374219
Author: Leonid Kanter <leon@asplinux.ru>
Date:   Mon Oct 5 14:18:11 2009 +0300

    Updated Russian translation by d.yacenko@gmail.com

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

commit 75803ff1ae1071ef2d6ae5614cdcec5c2e296f87
Author: Leonid Kanter <leon@asplinux.ru>
Date:   Mon Oct 5 14:17:03 2009 +0300

    Updated Russian translation by d.yacenko@gmail.com

 po/ru.po | 2513
 +++++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 1731 insertions(+), 782 deletions(-)

commit e6325503bf1ecd5e242a8b0447551941793c2285
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Mon Oct 5 12:07:21 2009 +0200

    Rename HAVE_NBTK to HAVE_MOBLIN.

 configure.ac                            |   16 +++++++++-------
 libempathy-gtk/empathy-account-widget.c |   30
 +++++++++++++++---------------
 src/empathy-accounts-dialog.c           |   20 ++++++++++----------
 3 files changed, 34 insertions(+), 32 deletions(-)

commit 82b8df252d5057325f39631a7af2a0960a8edd22
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Mon Oct 5 00:27:29 2009 +0200

    Updated Spanish translation

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

commit 02b3e6660e9706db8db1f8da226103f764640bf3
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Sun Oct 4 09:45:28 2009 +0200

    Updated Slovenian translation

 po/sl.po |   98
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 62 insertions(+), 36 deletions(-)

commit 4b4015905d64f540c587f8dc99ca7886eeb5ec41
Author: Mario Blättermann <mariobl@gnome.org>
Date:   Sat Oct 3 16:05:00 2009 +0200

    Updated German doc translation

 help/de/de.po |  845
 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 577 insertions(+), 268 deletions(-)

commit f399189e0c48f12110d49063df4fb140d17ff999
Author: Milo Casagrande <milo@ubuntu.com>
Date:   Sat Oct 3 14:01:12 2009 +0200

    Updated italian translation

 po/it.po |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

commit 500bafa2f3aa931c2b23270f506ed3dbc764807e
Author: Daniel Nylander <po@danielnylander.se>
Date:   Sat Oct 3 10:15:01 2009 +0200

    Updated Swedish translation

 po/sv.po |  171
 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 97 insertions(+), 74 deletions(-)

commit 331591f8e6c70257ded5a59dc3402af150434d8b
Author: Milo Casagrande <milo@ubuntu.com>
Date:   Fri Oct 2 22:08:29 2009 +0200

    Updated Italian translation

 po/it.po |  171
 ++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 101 insertions(+), 70 deletions(-)

commit 01ded4ba16bdd6b074ac170a83804c4a557134ef
Author: Mario Blättermann <mariobl@gnome.org>
Date:   Fri Oct 2 20:21:20 2009 +0200

    Updated German translation

 po/de.po |  249
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 136 insertions(+), 113 deletions(-)

commit 46818286350ada55f0dee5800c67a577c1f1ac23
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 2 19:15:52 2009 +0100

    start dev of next 2.28.x release

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

commit a60d42b746ec9e85a38fab03c61e8a477e8dc3ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 2 18:27:42 2009 +0100

    upgrade NEWS for 2.28.0.1

 NEWS |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

commit ccd38a70e03526594bb240a6561a8aa24cffd28d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 2 18:19:08 2009 +0100

    next stable release is going to be 2.28.0.1

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

commit e2608a8d9baf93ca56e8e8f66e97099e0a256446
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 2 18:45:41 2009 +0100

    empathy-status-icon: disable notification_action_cb if built without
    moblin

 src/empathy-status-icon.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit b3145a87c4749819586a8e3e3c5c6d2f9ff38a43
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 2 18:35:35 2009 +0100

    display 'Respond' button in notifications only if built for Moblin

    We don't want to have this feature on the desktop until it's properly
    integrated
    (#597124) which will be for 2.30.

 src/empathy-status-icon.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit 6433791a724cd0370b3a065188e4e605b09a29d6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 2 17:23:52 2009 +0100

    empathy-accounts-dialog: 'Create' button should be 'Next' on Moblin

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

commit 21526c22b8183e2306132087eae2df4ff7078ddf
Author: Rob Bradford <rob@linux.intel.com>
Date:   Fri Oct 2 16:04:10 2009 +0100

    Bring up notifications until the conversation is accepted (#597125)

    Rather than filter out message received signals for new conversations
    that have already been tried to be initiated let them pass
    through. This
    results in you getting notifications repeatedly until you open
    accept the
    conversation and open the conversation window with the user.

 src/empathy-event-manager.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

commit af28ad4fad5b0298d61d1b4c5eec31b2e8e00409
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 2 14:12:34 2009 +0100

    fix coding styles

 src/empathy-status-icon.c |   32 +++++++++++++++-----------------
 1 files changed, 15 insertions(+), 17 deletions(-)

commit 7e117916ca6ca5eba9108638885885ef4d19ab1e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 2 13:02:25 2009 +0100

    empathy-status-icon: check if notification daemon supports actions

 src/empathy-status-icon.c |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

commit ce267d2301d36626dc4de3be5ce3b4b28c9eb0a6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 2 12:50:48 2009 +0100

    initialize libnotify earlier in main()

    The status icon will have to query the notify daemon during its
    construction so libnotify has to be already initialized.

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

commit e2e96275266ab5c3435d5a68750ac358b6ec3580
Author: Rob Bradford <rob@linux.intel.com>
Date:   Fri Oct 2 12:27:23 2009 +0100

    Add a "Respond" button to notifications to provide a positive action
    (#589408)

    The positive action is the same positive action that would be
    accomplished by clicking on the status icon.

 src/empathy-status-icon.c |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

commit d6e770d1b8d59919ff7563824843847e9fcddf9a
Merge: 72ee329 b8e7413
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 2 17:36:13 2009 +0100

    Merge commit 'cosimo/moblin' into gnome-2-28

    Conflicts:
	libempathy-gtk/empathy-account-widget.c

commit b8e7413ad4741fea8da9e4eaf75ad29dd5491689
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri Oct 2 12:30:01 2009 +0200

    Remove the logic that re-applies the original enabled value.

    Now that we instant-apply the setting, this is not needed anymore.
    Also, this fixes a crasher.

 libempathy-gtk/empathy-account-widget.c |   21 ++++-----------------
 1 files changed, 4 insertions(+), 17 deletions(-)

commit 324cf197dad2b5125ee2433f4773307cfe3388d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 2 17:01:51 2009 +0100

    empathy-account-widget: document that the 'Account:' string is
    moblin specific

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

commit d95be533cc77f9355c4dae8956f2eebd308bed97
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri Oct 2 18:04:41 2009 +0200

    Fix a typo in a string.

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

commit 9db9e7c08f04949fe14829a3eeea2fd562afa96e
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri Oct 2 15:08:49 2009 +0200

    Change strings for the remove dialog on the moblin build.

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

commit 90b929ff33ebc0c0d28f3fbf402be7a06c7615e6
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri Oct 2 14:51:15 2009 +0200

    Rename the Connect button to "Log in" on Moblin.

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

commit 72ee329e9a99d5890bd0001edadc2df7d57c4dfb
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 28 12:18:40 2009 +0200

    Instant-apply the "enabled" setting.

 libempathy-gtk/empathy-account-widget.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

commit 28f0a856a08ab8e0319e8874963e83bc69bc8a68
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Oct 1 13:05:12 2009 +0200

    Chain up to the parent class render, instead of copying it.

 libempathy-gtk/empathy-cell-renderer-activatable.c |  148
 +-------------------
 1 files changed, 3 insertions(+), 145 deletions(-)

commit 3cecc493d3793bee23d73dbda75a30a4955290b7
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Oct 1 12:14:53 2009 +0200

    Return if the renderer has no pixbuf.

 libempathy-gtk/empathy-cell-renderer-activatable.c |	 3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit b5053cb50edbb10a454524dffc9eb25a0a825ca8
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 30 12:24:30 2009 +0200

    Rename the Create button to Add on moblin.

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

commit a111e7d0dbc0799eebcbc39533a32c5c049cea73
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 30 12:24:18 2009 +0200

    Disable account creation on moblin.

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

commit 08b9757d2f2a4b21744a7fae4b6260d023dc0e9a
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 30 11:07:46 2009 +0200

    Hide the action area if we're on moblin.

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

commit f0cd0bcd902f9091f26e13029c288877008f992e
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 30 10:55:16 2009 +0200

    Add a vertical padding to the rows.

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

commit 20e23ccd473d62c319b23f1bd89ed2b5d45dcd12
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Sep 29 17:31:14 2009 +0200

    Use the property in the accounts dialog.

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

commit 1dd41a76187e118d29be310e9f715e8baa4eeeec
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Sep 29 17:30:23 2009 +0200

    Add a "show-on-select" property.

    This implies copying the render function from gtkcellrendererpixbuf.c
    and modifying it slightly.

 libempathy-gtk/empathy-cell-renderer-activatable.c |  342
 ++++++++++++++++----
 libempathy-gtk/empathy-cell-renderer-activatable.h |	 1 +
 2 files changed, 283 insertions(+), 60 deletions(-)

commit fbf9d25b09b88cff6e6f36c1bfa83c0d37ca5312
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Oct 1 17:52:50 2009 +0200

    Instant-apply the "enabled" setting.

    Conflicts:

	libempathy-gtk/empathy-account-widget.c

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

commit ee7554e574161eaeda14be53ce70abe7be23bb77
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Sun Sep 27 20:17:50 2009 +0200

    Add configure switches for nbtk (off by default).

 configure.ac		    |	28 ++++++++++++++++++++++++++++
 libempathy-gtk/Makefile.am |	 2 ++
 2 files changed, 30 insertions(+), 0 deletions(-)

commit 0d52a331321036c6d368b65db4eaad94d226ee19
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Sun Sep 27 20:16:50 2009 +0200

    Add an optional NbtkGtkLightSwitch.

    Use an optional NbtkGtkLightSwitch instead of a GtkToggleButton to set
    an account enabled/disabled.

 libempathy-gtk/empathy-account-widget.c |   75
 ++++++++++++++++++++++++++++--
 1 files changed, 70 insertions(+), 5 deletions(-)

commit 3d5d198ffc802f888fa7d77b9a4b2ff585779e5b
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 28 12:18:40 2009 +0200

    Instant-apply the "enabled" setting.

 libempathy-gtk/empathy-account-widget.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

commit 38fb111427ddbe8cf8b35fa5e5cfd0f95ebcb66e
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 30 15:06:13 2009 +0200

    Don't rely on EmpathyAccountManager to be ready.

    This fixes a crash when Empathy is launched with the '--accounts'
    option.

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

commit 7af0ccbcb0e074193b018d9e52921179aca5b329
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Sep 30 09:40:16 2009 +0200

    Even if Next*.html are missing, we have to use the appendNextMessage
    js function for consecutive message.

 libempathy-gtk/empathy-theme-adium.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

commit fc27fecb52fe108782e9835bad6c7256d38d6d72
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Sep 28 09:52:41 2009 +0200

    Respect "DisableCombineConsecutive" adium theme setting. Fixes
    bug #596317

 libempathy-gtk/empathy-theme-adium.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

commit 0151759ddfe6a3d659b4b218e0a788c45d561a11
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Sep 28 09:44:30 2009 +0200

    Make the correct fallbacks in case of missing html files in an Adium
    theme. Fixes bug #596303

 libempathy-gtk/empathy-theme-adium.c |  101
 +++++++++++++++++-----------------
 1 files changed, 51 insertions(+), 50 deletions(-)

commit 63c5120cb7999c68fcaeec5fc247c1b59d38c607
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Tue Sep 29 21:24:37 2009 +0200

    Updated German doc translation

 help/de/de.po | 3041
 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 1573 insertions(+), 1468 deletions(-)

commit 72a226c81a8940e776e6f707f6816b4a56e6b65b
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 23 18:10:43 2009 +0200

    Don't show the "missing" image (#595921).

    If the icon theme doesn't have the protocol icon for the account we
    currently selected, show a default icon.

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

commit 2003059d23824f5a6e71004d262c7f592dc8b6dd
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 23 17:51:22 2009 +0200

    Don't always show the main window (#596044).

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

commit 7cf2fa411cce4666f32facbb42cdc7de6e222e15
Author: Kentaro Kazuhama <kazken3@gmail.com>
Date:	Sun Sep 27 12:44:12 2009 +0900

    Updated Japanese translation

 po/ja.po | 2453
 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 1672 insertions(+), 781 deletions(-)

commit 05710e8a814beedb93a79bab120036aff4069bab
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sat Sep 26 16:21:39 2009 +0200

    Updated Italian translation

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

commit 0b622ab2ac01f9c5aadde1256439df0abe71193b
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Sep 25 13:18:14 2009 +0300

    Updated Hebrew translation

 po/he.po |  718
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 456 insertions(+), 262 deletions(-)

commit 5171fdbe77a57be06433674ff1a15289819ce6d4
Author: Tomasz Dominikowski <dominikowski@gmail.com>
Date:	Fri Sep 25 01:06:50 2009 +0200

    Updated Polish translation

 po/pl.po |  363
 ++++++++++++++++++++------------------------------------------
 1 files changed, 117 insertions(+), 246 deletions(-)

commit 84978ae1b087a3a0d13c5c91c83ddcc0bc13ac5d
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 23 18:43:43 2009 +0200

    Don't rely on the widget allocation to be != 0.

    This should fix bug #595945.

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

commit 3c8557efe1b3bb97ba359b1d41165611e568f034
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Thu Sep 24 10:29:14 2009 +0200

    Updated Spanish translation

 po/es.po |  108
 +++++++++++++++++++++++++++----------------------------------
 1 files changed, 48 insertions(+), 60 deletions(-)

commit c09aebc30dda23e1d6f2d9ae48be09ce10509f4b
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Sep 23 15:29:15 2009 +0200

    Init contact_id to NULL to silent some stupid compilators. It can't
    really be used not initialized anyway.

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

commit 6e64203a5b4cf4e080c767fe733f6da96606ab05
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Sep 22 15:24:04 2009 +0100

    Cancel existing group animation before starting another

    Fixes Gnome bug #595962.

 libempathy-gtk/empathy-cell-renderer-expander.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

commit fecc657c0c64133dcf27477ee13e2da24a7f83ed
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Sep 22 10:14:55 2009 +0200

    Do not use math.h for trunc(). It is useless and it does not build
    because we don't link with -lm.

 libempathy-gtk/empathy-location-manager.c |	8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

commit 797cf36440241fd7ee358297efc5dda534069580
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Sep 21 19:54:25 2009 +0200

    Generate changelog only since 2.28.0

 Makefile.am |	  2 +-
 release.py  |	  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 1acb6efda6c938203338f6c184a7e3a8803e579f
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Sep 21 19:33:58 2009 +0200

    Bump version to 2.28.1

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