commit f2feaec269edf3af49eea8adc66788d856d6de05
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Mar 3 14:00:08 2010 +0100

    prepare 2.29.91.1 release

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

commit 8b5548ea1250a6889856df24cd04e62ce65b9cc2
Author: vasudeven <agnihot3@gmail.com>
Date:   Wed Mar 3 21:32:27 2010 +0530

    updated Tamil translation

 po/ta.po |  342
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 175 insertions(+), 167 deletions(-)

commit d6c60c80075fac5b34d23d37ec7826835fd02cd6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Wed Mar 3 15:02:51 2010 +0000

    Use the right marshaller for account-created

    Don't try to marshal G_TYPE_OBJECT values with a _POINTER marshaller.
    Fixes: #611224

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

commit 21ffdb809e2ce2f9a67977ccdc2527a887e54d33
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Wed Mar 3 14:44:29 2010 +0100

    Updated Norwegian bokmål translation

 po/nb.po |  435
 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 243 insertions(+), 192 deletions(-)

commit 73b1b8d04ee110d6f9f6f52ba62d26acec06f0f2
Author: Iswandi Basri <pedangsakti@yahoo.com>
Date:   Wed Mar 3 13:31:01 2010 +0100

    Update Malaj translation. Fixes bug 605878.

 po/ms.po | 4013
 +++++++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 3090 insertions(+), 923 deletions(-)

commit 0a7c5c811ceb721a16c69a010c50cd3e20be8f28
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Wed Mar 3 13:18:10 2010 +0100

    Updated Polish translation

 po/pl.po | 2242
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 1418 insertions(+), 824 deletions(-)

commit 4728aaffa21812eb2e6bd8b9eeac0cceccb85437
Merge: 46adf4f 1dab115
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Mar 3 11:54:57 2010 +0100

    Merge branch 'update-display-name-603463'

commit 1dab11523a8fffd546d154ca21c79a8c76d0c3c0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Mar 3 11:46:30 2010 +0100

    update display name after editing if it hasn't been overridden
    (#603463)

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

commit b0ef41dd204e2841a3f1eeb6c5dca709f2e725b1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Mar 3 11:45:39 2010 +0100

    account-widget: try to guess if the display name has been manually
    changed by the user

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

commit b31d50fb0533f178263d8ce111b56517dd0faf9a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Mar 3 11:44:24 2010 +0100

    empathy_account_settings_set_display_name_async: don't do anything
    if not needed

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

commit f4d060f23d99950a2686fc1dffa2101fd855e82a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Mar 3 11:43:46 2010 +0100

    no need to call empathy_account_settings_is_ready in account-widget's
    dispose function

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

commit 46adf4f15f0d9fee5b3b2e22e2cffca0d48a7184
Author: Alexander Shopov <ash@contact.bg>
Date:   Wed Mar 3 11:46:45 2010 +0200

    Updated Bulgarian translation

 po/bg.po |  329
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 166 insertions(+), 163 deletions(-)

commit 67308bd569a5a3884225b65b8514725fdf8f3117
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Mar 3 10:23:01 2010 +0100

    accounts-dialog: set display-name before creating the account

    This saves us a D-Bus call.

 libempathy-gtk/empathy-account-widget.c |   13 +++++++++++++
 src/empathy-accounts-dialog.c           |    9 ---------
 2 files changed, 13 insertions(+), 9 deletions(-)

commit 37ae70ceec9ead69d1584067ed9a489f309d1961
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Mar 3 10:15:37 2010 +0100

    assistant: call empathy_account_widget_get_default_display_name
    before actually creating the account

    This saves us a D-Bus call.

 src/empathy-account-assistant.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

commit 46d00adb33b8b356e56f633d2ac25dfa06705bbe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Mar 3 09:48:23 2010 +0100

    assistant: always uses empathy_account_widget_get_default_display_name
    to get a better display name

    EmpathyAccountSettings is created with a default display name such as
    "New
    Jabber account". But once the account has been created we want to
    update it to
    a more relevant name. (#611675)

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

commit 4a7553f1f6ab0f7675da83749ab91515450f9944
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Wed Mar 3 07:48:12 2010 +0100

    Updated Spanish translation

 po/es.po |   62
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 33 insertions(+), 29 deletions(-)

commit 36ea10ea3a0bdbd6300bea47cedeab4cc08751a2
Merge: 5697449 52d67df
Author: Travis Reitter <treitter@gmail.com>
Date:   Tue Mar 2 10:57:36 2010 -0800

    Merge branch 'more-accounts-fixes'

commit 56974492dc44aaa3b993e30b7338b58ab723afd3
Author: Milo Casagrande <milo@ubuntu.com>
Date:   Tue Mar 2 19:08:29 2010 +0100

    Updated Italian translation

 po/it.po |  145
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 72 insertions(+), 73 deletions(-)

commit 52d67df161e27a893bc24a13a50d86bf251f5ad9
Author: Travis Reitter <treitter@gmail.com>
Date:   Tue Mar 2 09:06:12 2010 -0800

    Remove EmpathyAccountsPlugin's requirement that it be a singleton,
    so we can reset the embedded control panel to a sane state every
    time we open it.

 src/cc-empathy-accounts-page.c |   26 +++++++++++++++-----------
 src/empathy-accounts-dialog.c  |   27 ---------------------------
 2 files changed, 15 insertions(+), 38 deletions(-)

commit b3b45bb5fddd4a52fddf719ae6b79909d11632b0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Mar 2 16:52:09 2010 +0100

    empathy-accounts: the TpDBusDaemon is not used any more

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

commit d1aba86ad64035b92811b0c0a33b3409754c956f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Mar 2 10:25:52 2010 +0100

    account-assistant: ensure that new accounts are connected (#611565)

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

commit b7329ee88d54447ed5b8a0de32a6b26a25ef5024
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Mar 2 10:25:46 2010 +0100

    factor out empathy_connect_new_account

 libempathy-gtk/empathy-account-widget.c |   28 +----------------------
 libempathy/empathy-utils.c              |   37
 +++++++++++++++++++++++++++++++
 libempathy/empathy-utils.h              |    4 +++
 3 files changed, 42 insertions(+), 27 deletions(-)

commit 2af6c1375e1465566d57170d8090e1b425de88fa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Mar 2 10:03:40 2010 +0100

    account-widget: change presence to online when creating a new account

    account_widget_account_enabled_cb was forcing the presence by
    setting the
    current most available presence to the newly created account.
    But if user was starting Empathy for the first time, this presence
    was offline
    so the account wasn't connected. (#611565)

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

commit b228ca8e3fd252d289f06699c0e1f6bc62f6ea5b
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Tue Mar 2 15:29:53 2010 +0100

    Updated Slovenian translation

 po/sl.po |   58
 ++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 32 insertions(+), 26 deletions(-)

commit 41ca7cb4fea39f928976b7b69466a61c78a5f7ed
Merge: 74b2a16 3c8e671
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Tue Mar 2 11:39:14 2010 +0000

    Merge branch 'accounts-wizard'

commit 3c8e671463630b94f8238ea8caaf6a03b2165278
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Tue Mar 2 11:17:54 2010 +0000

    Remove code that will always fail and has no use

    libunique will already register a unique name and we have no
    other dbus
    services so we don't need to register a unique name ourselves. Also
    trying to register one which is the same as what we suggest to
    libunique
    will always fail and is thus pointless

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

commit 9a9ce40c7f0a6e5fc19e035dba5c1812a9d4434a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Tue Mar 2 11:17:35 2010 +0000

    Improve debugging and don't use g_debug

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

commit 0309966cb4998548e404c1d76bd6c94a5e0f4259
Author: Travis Reitter <treitter@gmail.com>
Date:   Mon Mar 1 15:54:13 2010 -0800

    Disable the Cancel button in the accounts dialog if there are no
    existing accounts to display (ie, we're creating our first account).

 libempathy-gtk/empathy-account-widget.c |   44 +++++++++++++++++-
 libempathy-gtk/empathy-account-widget.h |    3 +
 src/empathy-accounts-dialog.c           |   73
 ++++++++++++++++++++++++++++++-
 3 files changed, 116 insertions(+), 4 deletions(-)

commit 7210d151056d3c0a1b0469f7af1aee06b7805538
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Mon Mar 1 19:01:54 2010 +0000

    Simplify empathy_accounts_import

 src/empathy-accounts-common.c |   25 ++++++-------------------
 src/empathy-accounts-common.h |    2 +-
 2 files changed, 7 insertions(+), 20 deletions(-)

commit b0de7c5d5d8c93dd7b74a77b4892c331f37f5441
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Mon Mar 1 18:59:38 2010 +0000

    Make the empathy-account code be slightly more streamlined

    On every run of the accounts UI we should try to import MC4 accounts
    (if they
    weren't imported already). Also replace the --try-import option with
    --if-needed to better document the fact that it will only display
    the UI if
    needed.

 src/empathy-accounts-common.c |   56 +--------------------------
 src/empathy-accounts-common.h |    4 --
 src/empathy-accounts-dialog.c |    6 +-
 src/empathy-accounts-dialog.h |    2 +-
 src/empathy-accounts.c        |   85
 ++++++++++++++++++++++------------------
 src/empathy.c                 |    5 +-
 6 files changed, 55 insertions(+), 103 deletions(-)

commit 886357ee6af17fe37523337209a09aa6f3112604
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Mon Mar 1 18:32:28 2010 +0000

    Always popup the accounts wizard if we don't have salut accounts

 src/cc-empathy-accounts-page.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

commit 8fb1b3a30ee4a9bc98087781cd6651cab8c4c96d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Mon Mar 1 18:28:24 2010 +0000

    Only launch empathy-accounts if needed

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

commit 8254654ccb030f05cd72f1c011d02c4de8816589
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Mon Mar 1 18:25:19 2010 +0000

    Also potentially popup the account dialog when activate by libunique

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

commit 74b2a167ce29bbda607b1b1a0ac8ef96c51a924c
Author: Jennie Petoumenou <epetoumenou@gmail.com>
Date:   Mon Mar 1 08:40:05 2010 -0800

    Updated Greek translation

 po/el.po |  771
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 402 insertions(+), 369 deletions(-)

commit 2f54d54b0f73b08de6be479eb62bf49b4a1162dc
Merge: 2af7013 5b1255d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Mar 1 13:41:46 2010 +0100

    Merge commit 'ka/tpl-0.1.1'

commit 2af7013df4478db4683da15582705da493cb4cef
Author: blueomega <blueomega.gmail.com>
Date:   Mon Mar 1 07:59:32 2010 +0200

    Updated Hebrew translation

 po/he.po | 1777
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 1022 insertions(+), 755 deletions(-)

commit 67c96f4177dfc04a36e853957b0bef7825fded55
Author: Daniel Nylander <po@danielnylander.se>
Date:   Sun Feb 28 21:04:03 2010 +0100

    Updated Swedish translation

 po/sv.po |  356
 ++++++++++++++++++++++++++++----------------------------------
 1 files changed, 159 insertions(+), 197 deletions(-)

commit 165cfca726200c8df42a031686301f86bc67f530
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Feb 26 14:20:04 2010 +0000

    remove empathy-starred and empathy-unstarred icons

    We don't need those any more.

 data/icons/Makefile.am                             |   10 ----------
 data/icons/hicolor_apps_16x16_empathy-starred.png  |  Bin 1468 -> 0 bytes
 .../icons/hicolor_apps_16x16_empathy-unstarred.png |  Bin 1424 -> 0 bytes
 data/icons/hicolor_apps_22x22_empathy-starred.png  |  Bin 2310 -> 0 bytes
 .../icons/hicolor_apps_22x22_empathy-unstarred.png |  Bin 2390 -> 0 bytes
 data/icons/hicolor_apps_24x24_empathy-starred.png  |  Bin 2634 -> 0 bytes
 .../icons/hicolor_apps_24x24_empathy-unstarred.png |  Bin 2693 -> 0 bytes
 data/icons/hicolor_apps_32x32_empathy-starred.png  |  Bin 3989 -> 0 bytes
 .../icons/hicolor_apps_32x32_empathy-unstarred.png |  Bin 4086 -> 0 bytes
 data/icons/hicolor_apps_48x48_empathy-starred.png  |  Bin 2658 -> 0 bytes
 .../icons/hicolor_apps_48x48_empathy-unstarred.png |  Bin 2255 -> 0 bytes
 11 files changed, 0 insertions(+), 10 deletions(-)

commit 379db3d78312b3159693d8c98a1b6ee0805702d1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Feb 26 14:19:06 2010 +0000

    update the not-favorite icon when the theme is changed

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

commit 96f6ab994f7631af1a478f0f625357976195ace0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Feb 26 14:04:00 2010 +0000

    presence-chooser: Grey the 'favorite' icon when the status is not
    a favorite

    This is more coherent as the favorite icon is now theme dependent
    and fix the
    problem that the old unstarred icon was not really visible (#584629).

 libempathy-gtk/empathy-presence-chooser.c |   27
 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

commit a8afec3bb227e3a04a3cbb4d6b14f5ba5882654a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Feb 26 13:42:43 2010 +0000

    presence-chooser: use 'emblem-favorite' instead of our own icon

    gnome-icon-theme has an icon for favorites; we should use it
    instead of
    re-inventing our own.

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

commit 79df35b2f0c0d68ec60ae880c70b17cc014c684d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Feb 26 13:35:53 2010 +0000

    accounts-dialog: update the status info when account when account
    is enabled

    If we are offline and we enable a disabled account, the info bar
    message
    should be updated from "Acconut Disabled" to "Status is set to
    Offline"
    (#610847).

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

commit 74be0ae5e7a1c1fe845a056cd38977c649e0989a
Author: Travis Reitter <treitter@gmail.com>
Date:   Fri Feb 26 15:13:36 2010 -0800

    When we're creating our first account, don't let the remove button
    become sensitive when we change the account protocol

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

commit d5ae581b39fd3532e8a8e90d383164039b2fafc7
Author: Travis Reitter <treitter@gmail.com>
Date:   Fri Feb 26 12:08:27 2010 -0800

    Don't create some extra "ghost" account if we're creating our first
    account and we change protocols in the protocol combo box.

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

commit a84e1e573eec373609ede78a56103dbab3da6046
Merge: 79c2194 08cf375
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Sat Feb 27 09:19:13 2010 +1100

    Merge branch 'show-assistant-611131'

commit 79c219478f9ace0c2a767771def2c81ddc6e1a3a
Author: Milo Casagrande <milo@ubuntu.com>
Date:   Fri Feb 26 21:19:58 2010 +0100

    Updated Italian translation

 po/it.po |  187
 +++++++++++++++++++++++++++++++------------------------------
 1 files changed, 95 insertions(+), 92 deletions(-)

commit 2bc424cbbdc47ddd1e8cc76273a8c09b782afbb6
Author: Mario Blättermann <mariobl@gnome.org>
Date:   Fri Feb 26 21:18:26 2010 +0100

    Updated German translation

 po/de.po |  252
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 126 insertions(+), 126 deletions(-)

commit b847ad5c4af3920bed5fa880ae2c4416725fc3f9
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Fri Feb 26 15:24:30 2010 +0100

    Updated Slovenian translation

 po/sl.po |  256
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 129 insertions(+), 127 deletions(-)

commit b4bb3fb577d6eaddaa8ca90fff22ef96e37ad356
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Fri Feb 26 14:56:57 2010 +0100

    Updated Spanish translation

 po/es.po |  248
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 123 insertions(+), 125 deletions(-)

commit 5b1255d0e3e92635985aa058bdd87670e8891095
Author: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Date:   Fri Feb 26 13:52:36 2010 +0000

    Update to TPL 0.1.1

    Updated the the pkg-config version to 0.1.1
    Updated the the pkg-config dep name fom libtelepathy-logger to
    telepathy-logger
    Updated TPL's _finish() methods using one for each async API.

 configure.ac                        |    4 ++--
 libempathy-gtk/empathy-chat.c       |    2 +-
 libempathy-gtk/empathy-log-window.c |   12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

commit f0b184b4100b558e418fb5879fed994c6d48fca2
Author: Mattias Põldaru <mahfiaz gmail com>
Date:   Fri Feb 26 13:30:51 2010 +0200

    Estonian translation updated

 po/et.po |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

commit 4baafa4a6c64a678e0f52a376d3907337297ac2f
Author: Mattias Põldaru <mahfiaz gmail com>
Date:   Fri Feb 26 13:10:10 2010 +0200

    Estonian translation updated

 po/et.po |  132
 ++++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 91 insertions(+), 41 deletions(-)

commit 04a3f49597c3ffb367b48fe6c01f972bdd15ea11
Merge: e86aa10 28244a9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Feb 26 08:49:16 2010 +0000

    Merge commit 'ka/empathy-tpl-20100225-ifdef'

commit e86aa1065dbf60d7a1e68bf50d9fbbccbb34312a
Author: Rob Bradford <rob@linux.intel.com>
Date:   Thu Feb 25 22:16:09 2010 +0000

    Remove the SKIP_TASKBAR hint when the main window is activated

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

commit 3403dfda538c4ff2d3eacfb3b148602d493033ea
Author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
Date:   Mon Feb 22 21:23:43 2010 -0600

    Add the capability to search debug messages in the debug window.

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

commit 08cf375e793f4f9255e10ca61850af279a07ce1a
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Fri Feb 26 11:56:24 2010 +1100

    empathy-accounts: Check to see if there are no accounts thus show
    the assistant

    Fixes: #611131

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

commit 28244a9c41e2c4274d2cb298c20b5e8909f7578a
Author: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Date:   Thu Feb 25 19:15:15 2010 +0000

    moving retrieving_backlog = FALSE right before
    empathy_chat_messages_read()

    or it will allow race conditions

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

commit 9010489b970c479609c095ec6b15b1e893e8b548
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Thu Feb 25 12:30:56 2010 +0000

    Don't try to close channels thrice.

    Fixes: #611071

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

commit 8d4d46e440c7a6bd321fc098265db8ede27c07de
Author: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Date:   Tue Feb 23 19:32:57 2010 +0000

    TPL Enabling patch, all-in-one.

    By default TPL is disabled, use --enable-tpl configure option to
    enable it.

 configure.ac                           |   28 ++
 libempathy-gtk/Makefile.am             |    2 +
 libempathy-gtk/empathy-chat.c          |  183 ++++++++++--
 libempathy-gtk/empathy-contact-menu.c  |   18 +-
 libempathy-gtk/empathy-log-window.c    |  533
 +++++++++++++++++++++++++++++++-
 libempathy/Makefile.am                 |   34 ++-
 libempathy/empathy-contact.c           |   30 ++
 libempathy/empathy-contact.h           |    7 +
 libempathy/empathy-log-manager.h       |    4 +
 libempathy/empathy-log-store-empathy.h |    4 +
 libempathy/empathy-log-store.h         |    4 +
 libempathy/empathy-message.c           |   78 +++++
 libempathy/empathy-message.h           |    6 +
 src/Makefile.am                        |    2 +
 src/empathy-chat-window.c              |    2 +
 src/empathy.c                          |   18 +-
 16 files changed, 909 insertions(+), 44 deletions(-)

commit 53271ff381e1908a6d99a188d6030e4f859e182d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Feb 25 17:24:48 2010 +0000

    set empathy_released to 0

    I forgot to set it after latest release...

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

commit 351da00be344cf578612ae5ef5eb2d708473dd77
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Feb 25 15:46:00 2010 +0000

    show map license

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

commit d74946a42f83c5daaf0847011d722cf6138a4eed
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Feb 25 09:51:23 2010 +0000

    contact-widget: increase zoom on map

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

commit 8e24107b437f63d9b2ca93e0d5b7379ee87af98d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Thu Feb 25 15:24:52 2010 +0000

    Cope with tp-glib calling the callback in sync

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

commit 0e74039b5cadb3e33aa01f5c2f3650b9d39f16ae
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Thu Feb 25 15:18:10 2010 +0000

    No reason to get Channels from connections, that's MCs job

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

commit 3e67f2f4f77ba1e59f69721f9821a482cba1678a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Feb 25 09:42:07 2010 +0000

    contact-widget: display map even if contact only published his lat/lon

    We used to hide the whole location vbox if no field was displayed
    in the
    location table (such as street, city, etc).
    But if contact only publishes it's lat and lon, we can at least
    display the
    map widget. (#611062)

 libempathy-gtk/empathy-contact-widget.c |   27
 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

commit ed582f419d68c95dabfc26d4453c89d0d7f038a4
Merge: 81aeb65 0653070
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Wed Feb 24 20:14:24 2010 +0000

    Merge branch 'requests'. Fixes: #598905

commit 81aeb65dee8294293fca221cf72a63cefde67d07
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:   Wed Feb 24 20:36:52 2010 +0200

    Updated Arabic translation

 po/ar.po |   43 ++++++++++++++++---------------------------
 1 files changed, 16 insertions(+), 27 deletions(-)

commit 065307088d490e8f8bc4c04d3981b047c9fb408f
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Wed Feb 24 16:50:54 2010 +0000

    Not using the weak object anymore, get the dispatcher request data
    from request data

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

commit c292475ad620051bc676321adfb832b8efca770c
Author: Sander Dijkhuis <sander.dijkhuis@gmail.com>
Date:   Tue Feb 23 23:08:21 2010 +0100

    Remove inset frame from contact list in main window

    This looks cleaner. (#610886)

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

commit 1e878d27797a90e0602180972f1727caed6c87eb
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Wed Feb 24 15:55:14 2010 +0000

    Use a appropriate unique name for Empathy unique app

 libempathy/empathy-utils.h |    2 --
 src/empathy-debug-window.c |    4 ++--
 src/empathy.c              |    2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

commit b05a5abcc6842be084aa12632b8ddd8d11dfa485
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Wed Feb 24 14:44:09 2010 +0000

    Assert that the account exists

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

commit 05caf0ff7d093fa342fbff5e7c0e681750bf1523
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Wed Feb 24 14:43:56 2010 +0000

    Small coding style fix

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

commit c98d650deadd48624a6dba026aa466ddc5b58626
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Mon Oct 12 16:33:45 2009 -0400

    Set ourselves as the preferred handler if there is a callback

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

commit 0e9bd3f5a6c19512f088993bfac8cec6aaabff7b
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Mon Oct 12 14:11:58 2009 -0400

    If we're asked to handle a channel twice, assume it's due to user
    action

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

commit eea99156d893167e6289906e4c237ad5210dbc99
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Wed Sep 2 18:29:48 2009 +0100

    Add a debug message for when errors are signaled

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

commit eb8a6e36a56cbc3342368baf8190e0ef17e9a8f7
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Wed Sep 2 18:29:32 2009 +0100

    Add a convenience function to get the busname of a handler

 libempathy/empathy-handler.c |   10 +++++++++-
 libempathy/empathy-handler.h |    2 ++
 2 files changed, 11 insertions(+), 1 deletions(-)

commit 871cd053641dfb087db16e120c53c338cc442d4a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Tue Sep 1 16:19:54 2009 +0100

    Output the path before trying to register it

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

commit 09a20a4289d896f18360be9020c984876d55a29b
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Tue Sep 1 16:18:10 2009 +0100

    Replace tabs with spaces

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

commit 696f7bdae93846bdf809ae7e19be5f2ea9913fe6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Tue Sep 1 15:20:27 2009 +0100

    Remove dead code related to outstanding channels

    With the move to the ChannelDispatcher channels we've requested will
    either not
    be dispatched through HandleChannels (because we used the old way
    of directly
    requesting it on the MC) or will get passed after we've started the
    request and
    can thus be dispatched right away. The concept of oustanding channel
    is thus
    obsolete.

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

commit 93aeafe92673b2e383fbfe3426c7ab918829d7ad
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Tue Sep 1 14:18:42 2009 +0100

    Don't ever drop requested channels

    Before moving to the ChannelDispatcher we got channels either
    through the
    NewChannel(s) signal or as a result of requesting a channel from
    the CM. Now
    that we've moved to the ChannelDispatcher, we only get channels that
    we should
    handle through HandleChannels. So we shouldn't filter any of them.

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

commit 6c349195014a84995fa3283611eebd77f66046d3
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Tue Sep 1 14:18:02 2009 +0100

    Check if channels we requested satisfy requests

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

commit 6298cb37bb9a2d5ba87be44733136f6f373c9941
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Tue Sep 1 11:45:22 2009 +0100

    Request channels from the CD instead of the CM

 libempathy/empathy-dispatcher.c |  168
 ++++++++++++++++++++++++++++++++------
 1 files changed, 141 insertions(+), 27 deletions(-)

commit d66105db6105b9ffc3ede09b2513f1243e0a426d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Feb 24 15:05:15 2010 +0000

    empathy_account_settings_has_account: cope with priv->account
    being NULL

    priv->account is not garantee to be set so
    empathy_account_settings_has_account
    shouldn't assume it is (#610942).

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

commit 6ba961fc2bd6d0e1e5b58ad5509ed0b63c427c74
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:   Wed Feb 24 22:39:09 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |   25 ++++++++++++-------------
 po/zh_TW.po |   25 ++++++++++++-------------
 2 files changed, 24 insertions(+), 26 deletions(-)

commit b40ac31881aeb905e0d7fde73f5ac4e5d1f50152
Author: Bruce Cowan <bcowan@fastmail.co.uk>
Date:   Wed Feb 24 13:54:00 2010 +0000

    Updated British English translation

 po/en_GB.po | 1131
 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 631 insertions(+), 500 deletions(-)

commit 25d5765846da294ca8b42e9ff4d2c25be84cf763
Author: Mario Blättermann <mariobl@gnome.org>
Date:   Tue Feb 23 22:27:56 2010 +0100

    Updated German translation

 po/de.po |  853
 ++++++++++++++++----------------------------------------------
 1 files changed, 223 insertions(+), 630 deletions(-)

commit 775fecfd93f0df135771692526f1af3ac864819d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 23 14:39:10 2010 +0000

    contact-selector: EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS contains
    a pixbuf now

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

commit 1c9bb59ff2669b5778dfe551288b5f5af0676318
Author: Brian Pepple <bpepple@fedoraproject.org>
Date:   Mon Feb 22 19:39:31 2010 -0500

    Add missing libm linking (#610751)

 src/Makefile.am |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit e11a543286c84b3c1cdd3d7c616ed555bbe715ee
Author: Alexander Shopov <ash@contact.bg>
Date:   Tue Feb 23 10:11:41 2010 +0200

    Updated Bulgarian translation

 po/bg.po |  389
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 226 insertions(+), 163 deletions(-)

commit 700fcc2dfb0d745b79e25f37828d63f8c3b828b4
Author: Daniel Nylander <po@danielnylander.se>
Date:   Mon Feb 22 22:42:11 2010 +0100

    Updated Swedish translation

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

commit 510ac416e1e33ce0f655e47837e0e4e4202a46a5
Author: Milo Casagrande <milo@ubuntu.com>
Date:   Mon Feb 22 22:31:18 2010 +0100

    Updated Italian translation

 po/it.po | 2058
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 1238 insertions(+), 820 deletions(-)
