commit 64aab02057a9a9496bcc94435f47f6a91cf1564a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 18 11:29:52 2010 +0200

    prepare 2.31.90 release

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

commit 83bb1d62a578f41b8961c59cf805230b6ccc0e67
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 17 16:51:39 2010 +0200

    event-manager: use tp_user_action_time_from_x11()

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

commit 4c7bf004cedea3f3faca74ca9308ba826c3ecaab
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 17 16:49:59 2010 +0200

    empathy_chat_window_present_chat: use
    tp_user_action_time_should_present

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

commit 682b70335bf789a60508f1d0b1b1ab119fc3f4dc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 17 16:36:54 2010 +0200

    use TP_USER_ACTION_TIME_* (#627165)

 libempathy-gtk/empathy-chat.c             |    4 ++--
 libempathy-gtk/empathy-share-my-desktop.c |    2 +-
 libempathy/empathy-dispatcher.h           |    3 ---
 libempathy/empathy-ft-handler.c           |    2 +-
 libempathy/empathy-tp-chat.c              |    2 +-
 src/empathy-chat-manager.c                |    4 ++--
 src/empathy-chat-window.c                 |    6 +++---
 src/empathy-event-manager.c               |    6 +++---
 src/empathy.c                             |    4 ++--
 9 files changed, 15 insertions(+), 18 deletions(-)

commit ea6b6013b18549e10cda58468b42e6fc732e6fcd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 17 16:28:37 2010 +0200

    Update tp-glib dep to 0.11.13

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

commit 1214fc8fc351f1861add2b6adbc6b1334bced1f7
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Tue Aug 17 18:55:12 2010 +0100

    Aggregate group expansion/contraction in EmpathyIndividualView

    The idle handler for expanding/contracting groups was getting
    scheduled many
    hundreds of times more than necessary when initialising the contact
    list.
    This aggregates expansion/contraction of group rows into a single idle
    handler call which expands or contracts a number of rows at once.

 libempathy-gtk/empathy-individual-view.c |  132
 ++++++++++++++++++++++--------
 1 files changed, 96 insertions(+), 36 deletions(-)

commit 8362ce9f550adecdbb48391dc7a342f3cdd2ad13
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Tue Aug 17 17:59:06 2010 +0100

    Don't recursively expand contact list rows unnecessarily

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

commit 9e050b87711ad401c2a19b0c59fbe4ed0a4bd325
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Tue Aug 17 11:54:57 2010 +0100

    Bug 626552 — Sporadic tree model warnings upon initial fill
    in Empathy

    Work around bgo#621076 in EmpathyIndividualView to ensure that all
    individuals and groups are visible in the contact list on initial
    load.
    Closes: bgo#626552

 libempathy-gtk/empathy-individual-view.c |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

commit 8a94e12fda3bc8d98b32f7ef05a32af7875da6f7
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Tue Aug 17 15:18:26 2010 +0100

    Rearrange functions in EmpathyIndividualView

 libempathy-gtk/empathy-individual-view.c |  218
 +++++++++++++++---------------
 1 files changed, 109 insertions(+), 109 deletions(-)

commit 57c1c9e225fee6aa2e08ffc85418a8c3fa4e0daf
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Tue Aug 17 18:37:04 2010 +0200

    Updated Galician translations

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

commit 302275ca112b66a6932dd7912b58c9910648c44d
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Tue Aug 17 17:37:18 2010 +0200

    Updated Spanish translation

 po/es.po |   64
 ++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 34 insertions(+), 30 deletions(-)

commit 2b0610ec22197d334ee3af336cafaa57a513823e
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Tue Aug 17 14:38:33 2010 +0200

    Updated Slovenian translation

 po/sl.po |   77
 +++++++++++++++++++++++++++----------------------------------
 1 files changed, 34 insertions(+), 43 deletions(-)

commit 3a21eabe7faefff44c3690c00b38ff63cca1f808
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Tue Aug 17 14:27:00 2010 +0200

    Updated Slovenian translation

 po/sl.po |   35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 deletions(-)

commit 62f67957957bd4616bd2b8371cdf37cb3ef8c972
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 13 11:32:00 2010 +0200

    add preference to disable logging (#567858)

 libempathy/empathy-gsettings.h |    3 +++
 src/empathy-preferences.c      |   11 +++++++++++
 src/empathy-preferences.ui     |   14 ++++++++++++++
 3 files changed, 28 insertions(+), 0 deletions(-)

commit 7abe2062d5933836bf6d3eb5de28179bf3aa4a64
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Tue Aug 17 02:00:33 2010 +0300

    Updated Hebrew translation.

 po/he.po |  393
 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 224 insertions(+), 169 deletions(-)

commit 5d5ac4802ebcc1a1b9b3b5aff408a1032d4feb55
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Mon Aug 16 23:35:22 2010 +0200

    Updated Spanish translation

 po/es.po |  193
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 102 insertions(+), 91 deletions(-)

commit 977d92ecf1403c7597cb243ed4dd7e2b1a5e8ba5
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Mon Aug 16 18:17:36 2010 +0200

    Updated Galician translations

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

commit c643efd2670c2cfa708eea02db2bb98fc05d44a3
Author: Travis Reitter <treitter@gmail.com>
Date:   Fri Aug 13 16:49:34 2010 -0700

    Support previous conversations in the Personas menu.

 libempathy-gtk/empathy-individual-menu.c |   55
 +++++++++++++++++-------------
 libempathy-gtk/empathy-individual-menu.h |    3 +-
 2 files changed, 33 insertions(+), 25 deletions(-)

commit 7bf345fee3e9fb42b5717ed9a51fb9f466a08e8f
Author: Travis Reitter <treitter@gmail.com>
Date:   Thu Aug 12 17:06:50 2010 -0700

    Support chat room invites in the Personas menu.

 libempathy-gtk/empathy-individual-menu.c |  107
 ++++++++++++++++++-----------
 libempathy-gtk/empathy-individual-menu.h |    3 +-
 2 files changed, 68 insertions(+), 42 deletions(-)

commit 383c3b1166a577e9fe5ae6bd6934c92f8499cc5f
Author: Travis Reitter <treitter@gmail.com>
Date:   Thu Aug 12 16:08:25 2010 -0700

    Support desktop sharing in the Personas menu.

 libempathy-gtk/empathy-individual-menu.c |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

commit 90a91152a1d7db0c8f33eaf73ca766051efd7422
Author: Travis Reitter <treitter@gmail.com>
Date:   Thu Aug 12 15:54:21 2010 -0700

    Also support file transfer in the Personas menu.

 libempathy-gtk/empathy-individual-menu.c |   24 ++++++++++++++++++------
 libempathy-gtk/empathy-individual-menu.h |    3 ++-
 2 files changed, 20 insertions(+), 7 deletions(-)

commit b52cc53444e1373c7f4d179634fcf8566f0786f3
Author: Travis Reitter <treitter@gmail.com>
Date:   Thu Aug 12 15:38:29 2010 -0700

    Support calls in the Personas menu.

 libempathy-gtk/empathy-individual-menu.c |   48
 ++++++++++++++++++++++-------
 libempathy-gtk/empathy-individual-menu.h |    6 ++-
 libempathy-gtk/empathy-individual-view.c |    4 +-
 3 files changed, 42 insertions(+), 16 deletions(-)

commit eba39f0ca541d20531528eb92e86aa7d623bf3fd
Author: Travis Reitter <treitter@gmail.com>
Date:   Thu Aug 12 14:12:43 2010 -0700

    Add Personas entries to the contact menu.

    This lets us specifically select which contact to chat and perform
    other actions
    with.

 libempathy-gtk/empathy-individual-menu.c |  145
 ++++++++++++++++++++++++++++--
 libempathy-gtk/empathy-individual-menu.h |    6 +-
 2 files changed, 143 insertions(+), 8 deletions(-)

commit a626735369a638e882e95b5bc4291cc9eed03465
Author: Travis Reitter <treitter@gmail.com>
Date:   Thu Aug 12 13:05:00 2010 -0700

    Make the Share my Desktop item map to the first capable contact.

 libempathy-gtk/empathy-individual-menu.c |   24 +++++-------------------
 1 files changed, 5 insertions(+), 19 deletions(-)

commit 8cb990ba2b68d4c3eb30f3fcdc536b3f2503f80d
Author: Travis Reitter <treitter@gmail.com>
Date:   Thu Aug 12 08:09:25 2010 -0700

    Make the Invite to Chat Room list all possible rooms for all
    subcontacts.

 libempathy-gtk/empathy-individual-menu.c |  115
 +++++++++++++++++++++++++----
 1 files changed, 99 insertions(+), 16 deletions(-)

commit 65ebc3c5f77b566def16ef0477109877d82fe185
Author: Travis Reitter <treitter@gmail.com>
Date:   Wed Aug 11 10:33:40 2010 -0700

    Make Send File context menu choose the first capable contact.

 libempathy-gtk/empathy-individual-menu.c |   24 ++++++------------------
 1 files changed, 6 insertions(+), 18 deletions(-)

commit 148655a23b2ead60f6349590d8ce7793abe11989
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Mon Jul 5 15:58:52 2010 +0100

    Make the individual menu items map to the first capable contact.

    Previously, they assumed every Individual contained exactly one
    TpContact.

 libempathy-gtk/empathy-individual-menu.c |  121
 +++++++++++++++++++----------
 1 files changed, 79 insertions(+), 42 deletions(-)

commit 0bb172885c0bcaa133a091bde15805aa98912503
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Mon Jul 5 17:09:35 2010 +0100

    Show information for all an individual's personas in the information
    dialogue

 libempathy-gtk/Makefile.am                         |    2 +
 .../empathy-individual-information-dialog.c        |  262
 ++++++++++++++++++++
 .../empathy-individual-information-dialog.h        |   60 +++++
 libempathy-gtk/empathy-individual-menu.c           |    8 +-
 4 files changed, 326 insertions(+), 6 deletions(-)

commit ab7d6e660430a089bde964895a8229cb2f96ca55
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Mon Aug 16 14:33:08 2010 +0200

    Updated Slovenian translation

 po/sl.po |  157
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 84 insertions(+), 73 deletions(-)

commit dc3a07f523c0d903d62cc9d871095605d35a99fe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 16 10:29:54 2010 +0200

    log-viewer: rename labels of the Back and Previous buttons

    "Find previous" and "Find next" is what we are already using in the
    chat view
    (#626994).

 libempathy-gtk/empathy-log-window.ui |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

commit 1006c7a80aa4010a73ac4cef2213b5d32ab33e9a
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Mon Aug 16 10:31:14 2010 +0200

    Updated Galician translations

 po/gl.po |  207
 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 117 insertions(+), 90 deletions(-)

commit c0c7a37b928335ace7f541b7759e46931f81afdd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 16 10:18:34 2010 +0200

    log-window: fix ordering of the Back and Previous buttons (#626992)

 libempathy-gtk/empathy-log-window.ui |   58
 +++++++++++++++++++++------------
 1 files changed, 37 insertions(+), 21 deletions(-)

commit 90eb02c032e70dc8b2e01739bde6a083668d253b
Author: A S Alam <aalam@users.sf.net>
Date:   Tue Aug 17 07:18:39 2010 +0530

    update translation for Punjabi

 po/pa.po |  652
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 376 insertions(+), 276 deletions(-)

commit 033c9bf29b0a47c9c24fb2057ce52565cc356fcb
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Sun Aug 15 20:44:53 2010 +0200

    Updated Spanish translation

 po/es.po |  333
 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 190 insertions(+), 143 deletions(-)

commit 83612527fdb34beb1c7a6c5e35748efb3b1859a8
Author: Daniel Nylander <po@danielnylander.se>
Date:   Sat Aug 14 13:12:00 2010 +0200

    Updated Swedish translation

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

commit 81c51d3c1b3fd68cb31848ef86d8c3d1859aacdf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 13 12:21:23 2010 +0200

    event-manager: we don't use the dispatcher any more

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

commit 5d63780e638c33a9622b5f205890a4daef06d250
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 13 11:12:10 2010 +0200

    empathy_contact_new can be static now

    Everyone should use empathy_contact_dup_from_tp_contact()

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

commit d84c92507bd5398340faf5323965df92f97bb4e2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 13 11:12:00 2010 +0200

    persona-view: use empathy_contact_dup_from_tp_contact instead of
    empathy_contact_new

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

commit 36d92a29445e3841c2c20befad039031fcd869bc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 13 11:08:52 2010 +0200

    persona-store: use empathy_contact_dup_from_tp_contact instead of
    empathy_contact_new

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

commit 3d2f200b14e889d1ac91b3d081c1c00abd0d2e37
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 12 17:00:15 2010 +0200

    add g_return_val_if_fail in _new functions

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

commit 4454890cf434cece46d5cf56b3e23b500cb6ac43
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 12 16:37:52 2010 +0200

    empathy_tp_call_get_connection_manager: use the account directly

 libempathy/empathy-tp-call.c |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)

commit 2f6aec58f110a13b8c370d676bdd9fb6946893ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 12 16:34:52 2010 +0200

    tp-call: add account property

 libempathy/empathy-call-factory.c |    2 +-
 libempathy/empathy-call-handler.c |   10 +++++++---
 libempathy/empathy-tp-call.c      |   32 +++++++++++++++++++++++++++++++-
 libempathy/empathy-tp-call.h      |    5 ++++-
 src/empathy-event-manager.c       |    2 +-
 5 files changed, 44 insertions(+), 7 deletions(-)

commit ce0fe44e47aa8c1b5365d1e3140aff59fcfff4f7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 12 16:25:53 2010 +0200

    chat: get the account from the tp-chat

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

commit 567a34cbbb5c93b40ee44739fff9a908bd31195b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 12 16:16:27 2010 +0200

    tp-chat: add 'account' property

 libempathy/empathy-tp-chat.c |   40
 +++++++++++++++++++++++++++++++++++-----
 libempathy/empathy-tp-chat.h |    4 +++-
 src/empathy-chat-manager.c   |    2 +-
 src/empathy-event-manager.c  |    2 +-
 4 files changed, 40 insertions(+), 8 deletions(-)

commit d25eb63968ae1880fb75fba2726c0e02a02f7e90
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Thu Aug 12 14:09:58 2010 +0200

    Updated Slovenian translation

 po/sl.po |  310
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 166 insertions(+), 144 deletions(-)

commit cabd8bb506a891fd75ba2a9edb43783e479161ab
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 12 12:24:39 2010 +0200

    widget-irc: call update_server_params in setup so buttons are updated
    (#626620)

    Thanks to Bilal Akhtar for the original patch.

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

commit faa8d609e0c6bcb70a61f1e78ea97d0557a98942
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 12 11:12:34 2010 +0200

    compare accounts using their object paths rather than their TpAccount

    It's safer and we could have 2 proxies for the same Account.

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

commit 193a5cf3e7a55366f6ad6adb8496e0ccbd6e15b1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 12 11:06:46 2010 +0200

    use tp_strdiff

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

commit 5a811009ecdfaf640e41a46e9edece1f3ef5bced
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 12 11:03:14 2010 +0200

    use explicit pointer comparaisons

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

commit 647d188902cbd616ad2a3681e9b3062fad46d31c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 12 10:55:12 2010 +0200

    select_account_once_ready: free the account and ID to avoid leaks

 libempathy-gtk/empathy-log-window.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

commit ba7ad370ba65cf7a2f445307b445681a488b0d96
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 11 16:27:07 2010 +0200

    bump logger dep to 0.1.5

    The fix for #622714 relies on fdo #29058 which has been fixed in
    logger 0.1.5

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

commit 4f9a1a249f0447b45f8c96d3228013280e94e082
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 14 15:36:04 2010 +0200

    select the account once we have populated the model with its chats
    (#622714)

 libempathy-gtk/empathy-log-window.c |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

commit d21720ea54edc73128bcdcdcc4faee834d7c1c4f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 14 15:10:22 2010 +0200

    log_manager_got_chats_cb: don't rely on the selected account any more

    Getting the chats is now an async operation, so the selected
    account could
    have changed while we were fetching the chats. So instead of using the
    currently selected account we use the account we receive from the hit.

    Note that this depends on this fix in the logger:
    https://bugs.freedesktop.org/show_bug.cgi?id=29058

 libempathy-gtk/empathy-log-window.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

commit 12bbcaef96d24f781f1cc12757a09acc15b217ba
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Jul 13 15:49:54 2010 +0200

    no need to pass account and chat infos to
    log_window_chats_set_selected

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

commit 5e5c683936f90d3cdc8028827b3d45d71e7dc4a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Jul 13 15:44:08 2010 +0200

    also use select_account_once_ready when the window already exists

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

commit 861b7dab7368472935d533a9bb0c65ad6c1e35c2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Jul 13 15:42:45 2010 +0200

    keep a ref on the account

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

commit 67372f1ad852b29b7c8c638a7bae397b6be3098c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Jul 13 15:41:33 2010 +0200

    factor out select_account_once_ready

 libempathy-gtk/empathy-log-window.c |   34
 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

commit 99c59741441d9b10df00b2c63f5a119de9cfc5f2
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Wed Aug 11 17:39:54 2010 +0100

    Fix linking menu entry mnemonic

    Closes: bgo#626130

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

commit dd8b8fb6b503194aecec14b4f5f9186c253a46c6
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Thu Aug 5 17:28:16 2010 +0100

    Add EmpathyLinkingDialog

    A dialogue which uses EmpathyIndividualLinker to allow linking
    of Individuals,
    accessible by a "Link" entry in the contacts' context menu.

 libempathy-gtk/Makefile.am               |    2 +
 libempathy-gtk/empathy-individual-menu.c |   39 +++++++-
 libempathy-gtk/empathy-individual-menu.h |    4 +-
 libempathy-gtk/empathy-linking-dialog.c  |  175
 ++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-linking-dialog.h  |   61 +++++++++++
 po/POTFILES.in                           |    1 +
 6 files changed, 280 insertions(+), 2 deletions(-)

commit 9d23b85fc16e7bc4b83af2850fdd2e96909b09d9
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Mon Aug 9 11:25:20 2010 +0100

    Allow linking personas through EmpathyIndividualManager

    Wrap the FolksIndividualAggregator persona linking API in
    EmpathyIndividualManager with some basic error reporting (it isn't
    expected
    that linking will fail).

 libempathy/empathy-individual-manager.c |   34
 +++++++++++++++++++++++++++++++
 libempathy/empathy-individual-manager.h |    3 ++
 2 files changed, 37 insertions(+), 0 deletions(-)

commit 4b7d482ea72ad143c4ed2c7b778581ed669723e3
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Thu Aug 5 17:27:24 2010 +0100

    Add EmpathyIndividualLinker

    This is a widget to allow selection of Individuals to link together
    to form
    linked Individuals.

 libempathy-gtk/Makefile.am                 |    2 +
 libempathy-gtk/empathy-individual-linker.c |  609
 ++++++++++++++++++++++++++++
 libempathy-gtk/empathy-individual-linker.h |   70 ++++
 po/POTFILES.in                             |    1 +
 4 files changed, 682 insertions(+), 0 deletions(-)

commit 62318cf781b2d94dc8bc4d5f084e12e6a269f354
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Thu Aug 5 17:27:44 2010 +0100

    Add EmpathyIndividualWidget

    This displays details for a single Individual, in much the same
    way that
    EmpathyContactWidget displays the details of a single Persona.

 libempathy-gtk/Makefile.am                 |    2 +
 libempathy-gtk/empathy-individual-widget.c |  257
 ++++++++++++++++++++++++++++
 libempathy-gtk/empathy-individual-widget.h |  106 ++++++++++++
 3 files changed, 365 insertions(+), 0 deletions(-)

commit 9acc3aabf75d159a0c7b6bb729ccfd9d8daff865
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Wed Aug 4 16:49:11 2010 +0100

    Add EmpathyPersonaStore and EmpathyPersonaView

    Based on stripped-down versions of EmpathyContactListStore and
    EmpathyContactListView, these allow listing of all the Personas for
    a given
    Individual.

 libempathy-gtk/Makefile.am             |    4 +
 libempathy-gtk/empathy-persona-store.c | 1168
 ++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-persona-store.h |  107 +++
 libempathy-gtk/empathy-persona-view.c  |  574 ++++++++++++++++
 libempathy-gtk/empathy-persona-view.h  |   74 ++
 5 files changed, 1927 insertions(+), 0 deletions(-)

commit 7322c5352d6b719da9f632c68fa48ae1ea81977f
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Wed Aug 11 17:29:47 2010 +0100

    Bump libfolks requirement to 0.1.13 for the linking API changes

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

commit f84b2a0c688bf42002ddb93ca941af166c846687
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Thu Aug 5 17:14:06 2010 +0100

    Only enable row reordering in EmpathyIndividualView if dragging
    is enabled

 libempathy-gtk/empathy-individual-view.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

commit c10575354749cf6e26a2826a214a31eac4815196
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Wed Aug 11 18:27:41 2010 +0200

    Updated galician translations

 po/gl.po |  339
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 181 insertions(+), 158 deletions(-)

commit aef77c9a4bd157f0dd128a845c26c7ff134b3b2d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 11 17:30:40 2010 +0200

    remove empathy-dispatch-operation

 libempathy/Makefile.am                  |    2 -
 libempathy/empathy-call-factory.h       |    1 -
 libempathy/empathy-dispatch-operation.c |  627
 -------------------------------
 libempathy/empathy-dispatch-operation.h |  126 ------
 libempathy/empathy-dispatcher.h         |    1 -
 libempathy/empathy-ft-factory.h         |    1 -
 libempathy/empathy-utils.c              |    1 -
 src/empathy.c                           |    1 -
 8 files changed, 0 insertions(+), 760 deletions(-)

commit e5f1b9ae3ff61e5a4ed0dca4576879744032233c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 11 17:22:46 2010 +0200

    dispatcher: remove more unused attributes and code

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

commit adacbe4f6ef767063a0727368de48cecef1f8fb6
Merge: 02cc95c 4e2b408
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 11 17:28:01 2010 +0200

    Merge remote branch 'lfrb/ft-cancel'

commit 02cc95c188b9b29e91b0e6ffae5325c20b10377a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 11 17:15:26 2010 +0200

    dispatcher: use TpCapabilities to get the RCC (#626636)

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

commit 1c08a3a0b5538cc4e1b97535efd66f6f0d5146d5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 11 17:05:33 2010 +0200

    dispatcher: use tp_proxy_prepare_async instead of
    tp_connection_call_when_ready

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

commit 4e2b40828d4f8c7fd4cbaf27ff345ce2adb4ffcf
Author: Louis-Francis Ratté-Boulianne
<louis-francis.ratte-boulianne@collabora.co.uk>
Date:   Wed Aug 11 11:09:34 2010 -0400

    Ignore socket errors when closing the file-transfer channel

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

commit dd4f24ee49d50145a30722010f6d849d36129c7c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 11 16:44:33 2010 +0200

    bye bye empathy-handler

 libempathy/Makefile.am       |    2 -
 libempathy/empathy-handler.c |  416
 ------------------------------------------
 libempathy/empathy-handler.h |   91 ---------
 3 files changed, 0 insertions(+), 509 deletions(-)

commit 7ccdd1850f123f1e4a3bcc019ab422b1291c39e1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 10 17:27:56 2010 +0200

    dispatcher: remove channel handling and requesting code

 libempathy/empathy-dispatcher.c |  945
 ---------------------------------------
 libempathy/empathy-dispatcher.h |   28 --
 2 files changed, 0 insertions(+), 973 deletions(-)

commit 95efa6ca70aa8cf1dc3283706c2254f45cad59c5
Merge: 9a48fa9 734ecf3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 11 16:20:42 2010 +0200

    Merge branch 'request-chat-626630'

commit 734ecf362e856ea8cc61f119dc371cd90b7851af
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 11 15:32:52 2010 +0200

    empathy_dispatcher_join_muc: use TpAccountChannelRequest

 libempathy/empathy-dispatcher.c |  103
 +++++---------------------------------
 1 files changed, 14 insertions(+), 89 deletions(-)

commit d339921eaf86de17aaae585070ae479cfbf4734f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 11 15:28:09 2010 +0200

    empathy_dispatcher_join_muc: get an account instead of a connection

 libempathy-gtk/empathy-chat.c     |    9 +++--
 libempathy/empathy-dispatcher.c   |   13 +++++--
 libempathy/empathy-dispatcher.h   |    2 +-
 src/empathy-chat-manager.c        |   62
 ++++++-------------------------------
 src/empathy-main-window.c         |    5 +--
 src/empathy-new-chatroom-dialog.c |    6 ++--
 src/empathy.c                     |    9 ++---
 7 files changed, 32 insertions(+), 74 deletions(-)

commit fabcd2ec298f6773112c6fad57238c6f7bc2d77e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 11 15:08:39 2010 +0200

    re-implement empathy_dispatcher_chat_with_contact using
    empathy_dispatcher_chat_with_contact_id

    We don't use the callback arg anyway.

 libempathy-gtk/empathy-contact-list-view.c |    2 +-
 libempathy-gtk/empathy-contact-menu.c      |    3 +-
 libempathy-gtk/empathy-individual-menu.c   |    3 +-
 libempathy-gtk/empathy-individual-view.c   |    2 +-
 libempathy/empathy-dispatcher.c            |   46
 ++-------------------------
 libempathy/empathy-dispatcher.h            |    4 +--
 tests/interactive/empetit.c                |   22 +-------------
 7 files changed, 10 insertions(+), 72 deletions(-)

commit 17624f70285d74ed77f27d62f452095589512310
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 11 14:54:44 2010 +0200

    empathy_dispatcher_chat_with_contact_id: use TpAccountChannelRequest

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

commit 72e7c137e1ce5f45c93583540b04fc106b2656d1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 11 14:48:40 2010 +0200

    empathy_dispatcher_chat_with_contact_id: get a TpAccount instead of
    a TpConnection

 libempathy-gtk/empathy-chat.c               |   20 ++++++--------------
 libempathy-gtk/empathy-new-message-dialog.c |    8 ++++----
 libempathy/empathy-dispatcher.c             |   13 +++++++++----
 libempathy/empathy-dispatcher.h             |    2 +-
 src/empathy-chat-manager.c                  |    6 +++++-
 src/empathy-chat-window.c                   |   10 ++--------
 6 files changed, 27 insertions(+), 32 deletions(-)

commit 9a48fa95672a4e3287dc6564f676bed5dbb7d358
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Wed Aug 11 14:40:22 2010 +0200

    Updated Slovenian translation

 po/sl.po |  101
 ++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 56 insertions(+), 45 deletions(-)

commit 8a8ba7a5697c6e5494854c99dc9aa4a7fc7a45bd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 11 14:32:02 2010 +0200

    empathy_dispatcher_chat_with_contact_id: remove callback argument

    It's unused anyway.

 libempathy-gtk/empathy-chat.c               |    3 +--
 libempathy-gtk/empathy-new-message-dialog.c |    2 +-
 libempathy/empathy-dispatcher.c             |    8 +++-----
 libempathy/empathy-dispatcher.h             |    5 ++---
 src/empathy-chat-manager.c                  |    2 +-
 src/empathy-chat-window.c                   |    2 +-
 6 files changed, 9 insertions(+), 13 deletions(-)

commit d82293953e49e54dbdaba7f0fe71ef6387099e2f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 11 14:17:57 2010 +0200

    empathy_call_factory_new_call_with_streams: don't leak the hash table

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

commit c6840c1afba475378163f5bb54cc1abcbc2deccc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 10 17:25:35 2010 +0200

    share-my-desktop: use TpAccountChannelRequest

 libempathy-gtk/empathy-share-my-desktop.c |   32
 +++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 8 deletions(-)

commit 45e0ed0dd99ba9909721ef0838306764c9156655
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 10 17:19:12 2010 +0200

    tp-chat: use TpAccountChannelRequest

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

commit 8bf01d9bbd8a80cd1d898ecc26430304ac1482c9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 10 17:07:08 2010 +0200

    new-call-dialog: use TpAccountChannelRequest

 libempathy-gtk/empathy-new-call-dialog.c |   35
 +++++++++++++++++++++--------
 1 files changed, 25 insertions(+), 10 deletions(-)

commit b952de7a60106948665bc429ebc5129539d4ff2a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 10 16:44:48 2010 +0200

    call-factory: use TpAccountChannelRequest to request the media channel

 libempathy/empathy-call-factory.c |   33
 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 deletions(-)

commit 3f28e2304aab16ad6d68054a19dcbfdd5c75e7c8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 9 14:57:08 2010 +0200

    empathy_call_factory_new_call_with_streams: remove callback arg

    If you want to handle the channel yourself then use
    TpAccountChannelRequest.

 libempathy-gtk/empathy-contact-menu.c    |    4 ++--
 libempathy-gtk/empathy-individual-menu.c |    4 ++--
 libempathy/empathy-call-factory.c        |    3 +--
 libempathy/empathy-call-factory.h        |    1 -
 4 files changed, 5 insertions(+), 7 deletions(-)

commit 82ffd1da38bd5e6b81d757d5218b41cde85d77ae
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 9 14:53:40 2010 +0200

    empathy_call_handler_start_call: use
    tp_account_channel_request_create_and_handle_channel_async

 libempathy/empathy-call-handler.c |   43
 +++++++++++++++++++++++++-----------
 1 files changed, 30 insertions(+), 13 deletions(-)

commit 17810b94827e9103136ea2cf9192629eebe689b0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 9 14:53:08 2010 +0200

    factor out empathy_call_factory_create_request

 libempathy/empathy-call-factory.c |   31 ++++++++++++++++++++-----------
 libempathy/empathy-call-factory.h |    4 ++++
 2 files changed, 24 insertions(+), 11 deletions(-)

commit 617ccb69392445c4843b879ddc997885df81e8f8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 11 10:19:12 2010 +0200

    add support for the errors introduced in spec 0.19.11

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

commit de947130fc39cc6168f18b87b82707a529094e2f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 11 12:18:40 2010 +0200

    fix indentation

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

commit ccad7f9df7f97342731733cc7027054b693e240b
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Tue Aug 10 17:38:32 2010 +0100

    Don't abort when closing the FT dialogue

    Ensure we handle the case where the dialogue is closed by the window
    manager or programmatically gracefully.

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

commit 105ef42a1690c3c092879995767584b640741e12
Author: Bilal Akhtar <bilalakhtar96@yahoo.com>
Date:   Wed Aug 11 10:43:20 2010 +0200

    Use GimpNet as default IRC network (#625675)

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

commit 0c52aee9583e68377b3c5da4d4f671761ae33e10
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Jul 1 17:05:32 2010 +0200

    stop using Empathy's internal dispatcher to request FT channel

 libempathy/empathy-ft-handler.c |   49
 ++++++++++++++++++++++----------------
 1 files changed, 28 insertions(+), 21 deletions(-)

commit faccecc4a1c1d2f08c98aa0c1b1418e70ce3990f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 10 16:18:43 2010 +0200

    bump tp-glib dep to 0.11.12

    We need it for TpAccountChannelRequest.

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

commit 247b08745627b9189ef93c50a346f2a7b7c52e1c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Jun 29 17:14:25 2010 +0200

    Use TpSimpleHandler to handle incoming file transfer (#623139)

 libempathy/empathy-ft-factory.c |  128
 ++++++++++++++++++++++++++++-----------
 libempathy/empathy-ft-factory.h |    5 +-
 src/empathy.c                   |    6 ++
 3 files changed, 102 insertions(+), 37 deletions(-)

commit a3392a992e98b330d9a604a7b539dbed60e6f375
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Jun 29 17:09:24 2010 +0200

    tp-file: remove unused ready variable

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

commit 325786d466cc7a8b6eed06e52b9b5223ba5dc7fd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Jun 29 17:06:11 2010 +0200

    tp-file: no need to pass the incoming property during construction

    We can infer it from the channel properties.

 libempathy/empathy-tp-file.c |   19 +++++++++----------
 libempathy/empathy-tp-file.h |    3 +--
 src/empathy-event-manager.c  |    2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

commit e497426234daf06bded1096fee6596b1e367a018
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Jun 29 16:45:34 2010 +0200

    call-factory: don't leak the handler

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

commit b5b068d39f35ace8b1328c27a0b3d7e9de735dea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Jun 29 16:39:06 2010 +0200

    stop handling internally FT channels

 libempathy/empathy-dispatch-operation.c |   13 +-----
 src/empathy.c                           |   65
 +-----------------------------
 2 files changed, 5 insertions(+), 73 deletions(-)

commit 56e0f6c86b79bfd6ac8807f15c098e627922cb30
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 10 17:30:53 2010 +0200

    remove empathy_dispatcher_send_file_to_contact prototype

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

commit 9db18eddff2b697256b6fcde7bbcb57bcef5c48d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 10 16:58:45 2010 +0200

    empathy_contact_selector_dialog_get_selected: allow to get the
    account as well

 libempathy-gtk/empathy-contact-selector-dialog.c |   15 +++++++++++++--
 libempathy-gtk/empathy-contact-selector-dialog.h |    3 ++-
 libempathy-gtk/empathy-new-call-dialog.c         |    2 +-
 libempathy-gtk/empathy-new-message-dialog.c      |    2 +-
 src/empathy-chat-window.c                        |    2 +-
 5 files changed, 18 insertions(+), 6 deletions(-)

commit e3e5ad3b663cd9c4c7df7fbfe4a4bdaf171f6063
Author: Daniel Nylander <po@danielnylander.se>
Date:   Tue Aug 10 15:50:52 2010 +0200

    Updated Swedish translation

 po/sv.po | 1548
 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 866 insertions(+), 682 deletions(-)

commit 8a5b247139826f2fae8f66bd512f544bd069c810
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Mon Aug 9 15:49:11 2010 +0100

    Minor coding style fixes in EmpathyIndividual[Store|View]

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

commit bec8141c7c525d4198c0b2cf6a867fff344d3a14
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 9 15:28:53 2010 +0200

    empathy-individual-menu: no need to get the call factory

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

commit 934b3c383e8e4f26ab7edef385767d9e7836f729
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Mon Aug 9 14:49:33 2010 +0200

    Updated Slovenian translation

 po/sl.po |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

commit 8f599de3f64c57848bb27c6fdbc26c47337530fc
Author: Nicolò Chieffo <84yelo3@gmail.com>
Date:   Mon Aug 9 13:25:11 2010 +0200

    Allow translators to localize time formats (#623934)

 libempathy/empathy-time.h |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

commit 878faf8c3357c3b96a5dc49d53754382079bd470
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Fri Aug 6 10:40:38 2010 +0100

    Fix capability change notification in the EmpathyIndividualStore

    Closes: bgo#626162

 libempathy-gtk/empathy-individual-store.c |   41
 ++++++++++++++++++++++++----
 1 files changed, 35 insertions(+), 6 deletions(-)

commit da3e8203013b3cf8329fceedaf07c0827cb27114
Author: Felix Kaser <f.kaser@gmx.net>
Date:   Mon Aug 9 11:25:21 2010 +0200

    only show label during search

    don't change the behavior of the contact list when empty
    (without searching)

 src/empathy-main-window.c |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)

commit fa83f9abc2842ee142e373f4bdb1ad9b1a243594
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Mon Aug 9 12:21:44 2010 +0300

    Updated Hebrew translation.

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

commit 6b4f49860f7e5f19ea86c96e25ac42daf6bb078b
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Mon Aug 9 12:12:57 2010 +0300

    Updated Hebrew translation.

 po/he.po |  411
 +++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 249 insertions(+), 162 deletions(-)

commit 2f7d7b2d43b15f9133e2c89ead564651b03e6bd5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 9 10:05:35 2010 +0200

    use gtk_clutter_init rather than clutter_init

    This should fix the "Unable to make the stage window ..... the
    current GLX
    drawable" warning.
    Thanks to Jiri Techet to have spotted this.

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

commit 8f76c30b382669eb3bd2d630b686100886e0114e
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Mon Aug 9 02:28:08 2010 +0200

    Updated Spanish translation

 po/es.po |  272
 ++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 134 insertions(+), 138 deletions(-)

commit 16db868e0bad210cce52cc472c6598bfcf2436c8
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Fri Aug 6 14:04:02 2010 +0100

    Remove uses of new GStreamer API

    Various GstMessageType members were added after 0.10.0, so we
    shouldn't
    use them.

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

commit 4bfa27bac875e9c5e4615fc907c343436198c7ee
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Fri Aug 6 14:51:34 2010 +0200

    Updated Slovenian translation

 po/sl.po |  412
 +++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 250 insertions(+), 162 deletions(-)

commit a423a3b9b916f2188063f4c3abbf376bb5548b09
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Fri Aug 6 13:11:40 2010 +0100

    Add casts to fix constness problems in empathy-import-pidgin.c

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

commit 265a072dab29839e7e195470f49e7f9980afc838
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Thu Aug 5 15:53:33 2010 +0100

    Cast away constness of strings in GtkTargetEntry structs

    This stops gcc warning us about GTK+'s broken API which uses
    non-const string
    fields in a static struct.

 libempathy-gtk/empathy-individual-view.c |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

commit 9039976a1e17444081eb9df2e480d3b4c5266a88
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Thu Jul 8 12:13:02 2010 +0100

    Add noreturn annotation to version callback function

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

commit 03e54b66952397d0a54807f74187c5b68b5eb12c
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Thu Jul 8 12:12:27 2010 +0100

    Fix old-style function definition (missing void)

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

commit a3faa867baeb51bb55e04fb507aaa45038f760a5
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Thu Jul 8 11:56:13 2010 +0100

    Fix constness of various variables and parameters

 libempathy-gtk/empathy-individual-store.c |    4 ++--
 libempathy-gtk/empathy-ui-utils.c         |    6 +++---
 libempathy-gtk/empathy-ui-utils.h         |    2 +-
 libempathy-gtk/empathy-video-src.c        |    4 ++--
 libempathy-gtk/totem-subtitle-encoding.c  |    6 +++---
 libempathy/empathy-utils.c                |    2 +-
 src/empathy-accounts-dialog.c             |    6 +++---
 src/empathy-call-window.c                 |    2 +-
 src/empathy-import-pidgin.c               |    6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)

commit f8c37da731af9f6cd74e7a0ef08fa02059d981ac
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Thu Jul 8 11:39:07 2010 +0100

    Fix missing entries in switch statements

    Added missing default cases and missing enum cases.

 libempathy-gtk/empathy-account-widget.c     |    1 +
 libempathy-gtk/empathy-avatar-image.c       |    4 +--
 libempathy-gtk/empathy-chat.c               |    4 +++
 libempathy-gtk/empathy-contact-list-store.c |    3 ++
 libempathy-gtk/empathy-contact-list-view.c  |    4 +--
 libempathy-gtk/empathy-individual-store.c   |    3 ++
 libempathy-gtk/empathy-individual-view.c    |    4 +--
 libempathy-gtk/empathy-live-search.c        |   24 ++++++++++++++++++++++
 libempathy-gtk/empathy-ui-utils.c           |    1 +
 libempathy/empathy-contact.c                |    6 +++++
 libempathy/empathy-dispatch-operation.c     |    5 +++-
 libempathy/empathy-dispatcher.c             |    3 ++
 libempathy/empathy-ft-handler.c             |    1 +
 libempathy/empathy-message.c                |    3 ++
 libempathy/empathy-status-presets.c         |    4 ++-
 libempathy/empathy-utils.c                  |    7 ++++++
 src/empathy-account-assistant.c             |   14 ++++--------
 src/empathy-call-window.c                   |   29
 +++++++++++++++++++++++++++
 src/empathy-ft-manager.c                    |    2 +
 src/empathy-main-window.c                   |    3 ++
 20 files changed, 105 insertions(+), 20 deletions(-)

commit 5cc326f741ab695e4fac8f4c4ccd99cf235115fc
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Thu Jul 8 11:09:54 2010 +0100

    Use #ifdef instead of #if to avoid warnings of undefined symbols

 libempathy-gtk/empathy-contact-widget.c |   10 +++++-----
 libempathy/empathy-contact.c            |    8 ++++----
 src/empathy-main-window.c               |    4 ++--
 src/empathy-preferences.c               |    2 +-
 src/empathy.c                           |   10 +++++-----
 5 files changed, 17 insertions(+), 17 deletions(-)

commit fd4fddb72a34a446b06068b0aeeba4e04b6f57c3
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Thu Aug 5 16:30:30 2010 +0200

    Updated Spanish translation

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

commit 439b05f9d36c750da3e490a8667dde2aeeb06e52
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Thu Aug 5 12:53:37 2010 +0100

    Fix memory corruption introduced by not removing a weak pointer

    This rewrites the weak pointer code for active individuals in
    EmpathyIndividualStore to use weak references, which has the added
    benefit of
    meaning we can remove the timeout if the individual disappears,
    rather than
    executing it anyway and just bailing out. Closes: bgo#625641

 libempathy-gtk/empathy-individual-store.c |   56
 ++++++++++++++++++++---------
 1 files changed, 39 insertions(+), 17 deletions(-)

commit bd7b9b376ea305ca57bb0beab6bfae8a82d69012
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Thu Aug 5 16:09:56 2010 +0200

    Updated Galician translations

 po/gl.po |  240
 +++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 161 insertions(+), 79 deletions(-)

commit 7cd053aff86931fdf85c8016701956d1fb43e646
Author: Felix Kaser <f.kaser@gmx.net>
Date:   Thu Aug 5 12:55:31 2010 +0200

    use different labels if view is empty

    either show "no match found" or "your contact list is empty".
    fixes bug #621642

 libempathy-gtk/empathy-individual-view.c |   13 +++++++++++++
 libempathy-gtk/empathy-individual-view.h |    3 +++
 src/empathy-main-window.c                |   28
 +++++++++++++++++++---------
 src/empathy-main-window.ui               |   19 +++++++++----------
 4 files changed, 44 insertions(+), 19 deletions(-)

commit b3ee9d59131212736dc713e7f1687cf8536bb979
Author: Felix Kaser <f.kaser@gmx.net>
Date:   Thu Aug 5 12:12:28 2010 +0200

    show label if contact list is empty

    at the moment there is only one label, but we should distinguish
    if the contact list is empty because no contact is online or
    because the live search matched nothing

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

commit d9db9822240a5aece8ee660bebb2afe7202a7f53
Author: Felix Kaser <f.kaser@gmx.net>
Date:   Thu Aug 5 10:19:39 2010 +0200

    added structure to show text when list empty

    I've added a notebook which holds the treeview and on another page
    it holds a label. The logic when to switch has to be implemented.

 src/empathy-main-window.c  |    9 +++++++++
 src/empathy-main-window.ui |   31 ++++++++++++++++++++++++++-----
 2 files changed, 35 insertions(+), 5 deletions(-)

commit fe3dade449f6c4ef735166696fe86de968122b94
Merge: c735abd 717184f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 5 14:19:18 2010 +0200

    Merge branch 'connection-error-523895'

commit 717184f6d506b0fe6ea316accbb6aeebb3253919
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 5 14:17:33 2010 +0200

    no need to pass the reason to main_window_error_display

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

commit 1707cb8bb953cb4886a8e3b8ab0eeddf0d6b0567
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 5 14:14:34 2010 +0200

    no need to pass the reason to empathy_account_get_error_message

 libempathy/empathy-utils.c    |    6 ++++--
 libempathy/empathy-utils.h    |    3 +--
 src/empathy-accounts-dialog.c |    4 ++--
 src/empathy-main-window.c     |    2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

commit b5e7268ebc857928c6672d84b23c1c05f9a45bd5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 5 14:11:04 2010 +0200

    empathy_account_get_error_message: no need to get the details
    hash table

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

commit b5c916cfcee92d2c20d4ee25889dd56d9abb8721
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 5 13:43:02 2010 +0200

    empathy_status_reason_get_default_message can be static now

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

commit d3c850f72226ae5b9a6d0cdaf357d81f0fd261d1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 5 13:40:57 2010 +0200

    accounts-dialog: use empathy_account_get_error_message (#523895)

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

commit 42d87a3d0d9048d6661449a5997d7dadc9a2a3c4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 5 13:37:52 2010 +0200

    main-window: use empathy_account_get_error_message (#523895)

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

commit fde1ddca54a6f94fd4112f9d4e5c49d823ed00a4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 5 13:37:35 2010 +0200

    add empathy_account_get_error_message

 libempathy/empathy-utils.c |   21 ++++++++++++++++++++-
 libempathy/empathy-utils.h |    4 +++-
 2 files changed, 23 insertions(+), 2 deletions(-)

commit 3486c2525088388b5d1fa39b4099f8b80743fd00
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 5 12:50:37 2010 +0200

    create_errors_to_message_hash: add support for more errors

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

commit 0b5e1ce2f0aafecaaf855b1f81d52821862f6526
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 5 12:38:26 2010 +0200

    add empathy_dbus_error_name_get_default_message

    Reuse existing errors for now.

 libempathy/empathy-utils.c |   44
 ++++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-utils.h |    1 +
 2 files changed, 45 insertions(+), 0 deletions(-)

commit 76a6ff433280ed7bee6346ab05caa00ceb2aba49
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 3 17:47:23 2010 +0200

    main-window: pass the TpConnectionStatusReason to
    main_window_error_display

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

commit c735abd4a11c57d0cabb50051e45b57cdb80652d
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Thu Aug 5 12:21:50 2010 +0200

    Updated Spanish translation

 po/es.po |  150
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 89 insertions(+), 61 deletions(-)

commit d4397c1120f65ce0f4051156c255857d08b1b4ae
Merge: 493056e 6d744e0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 5 12:06:53 2010 +0200

    Merge branch 'av-candidate-624344'

commit 6d744e08f1cc7169b79fedade4681d5c67fadcd4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 5 12:01:46 2010 +0200

    display the tooltip on the info image

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

commit f74839c25648a0ed910d582d84965f3c0107b45e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 5 11:44:36 2010 +0200

    add 'info' icon next to the candidates

 src/empathy-call-window.ui |   96
 ++++++++++++++++++++++++++++++++++++-------
 1 files changed, 80 insertions(+), 16 deletions(-)

commit 493056ec895710376ee79e403e6c17ea93029e4a
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Wed Aug 4 17:20:30 2010 +0100

    Fix an assertion failure in the filtering code due to show-offline
    changes

    individual_view_is_visible_individual() is now called even when
    the live
    search widget isn't in use, so has to fail gracefully in that case.
    Closes: bgo#626041

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

commit 1b603a6d7dcc0a46544b8f34baa1610195e8f6c7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 4 11:23:18 2010 +0200

    call-window: use candidates-changed signal

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

commit a27087fda3a50d3454384bfa3664f79a17ac3f0a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 4 11:23:01 2010 +0200

    call-handler: add candidates-changed signal

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

commit fd401e8a06921ead2aa06131afdd08ee46b9de92
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 4 11:08:05 2010 +0200

    use a space to separate the IP from the port

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

commit 2b7aea94f1db089bb9f3fee62fd924f7a2c27c63
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 4 10:56:28 2010 +0200

    add tooltips giving a bit more context about the candidate

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

commit 6f618087dea59d0a7c0d4ff0c63cd0dc38f76ac2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 4 10:50:25 2010 +0200

    destroy the old candidates before updating them

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

commit c2aacd4f46a4fbb449f78809a88aff08d3084974
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 3 17:00:49 2010 +0200

    call-window: display candidates info (#599166)

 src/empathy-call-window.c  |  129 +++++++++++++++++++++++
 src/empathy-call-window.ui |  241
 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 370 insertions(+), 0 deletions(-)

commit 81e35b4237433cf031004aa840e94d5f03c1b2f8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 3 17:00:26 2010 +0200

    call-handler: add properties tracking the candidates

 libempathy/empathy-call-handler.c |  161
 +++++++++++++++++++++++++++++++++++++
 libempathy/empathy-call-handler.h |   12 +++
 2 files changed, 173 insertions(+), 0 deletions(-)

commit b51dda50b585f6c3cee76996bfb6f45da000447d
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Wed Aug 4 14:05:20 2010 +0200

    Updated Norwegian bokmål translation

 po/nb.po |  461
 ++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 257 insertions(+), 204 deletions(-)

commit ed56a1d64e3aa20e47452374fa4fd76c86271e7f
Author: Brian Curtis <bcurtiswx@ubuntu.com>
Date:   Wed Aug 4 12:34:38 2010 +0200

    irc-networks: Remove Ubuntu Servers (#625950)

    It's redundant with freenode.

 libempathy/irc-networks.xml |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

commit 6eb5156a637f6790b09e1b9a6df99302d5d560a9
Author: A S Alam <aalam@users.sf.net>
Date:   Wed Aug 4 14:13:28 2010 +0530

    update Punjabi Translation by A S Alam

 po/pa.po | 1466
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 799 insertions(+), 667 deletions(-)

commit e9125fce7bd864e9b9292c2b890007b2c245f536
Author: Felix Kaser <f.kaser@gmx.net>
Date:   Tue Aug 3 14:19:46 2010 +0200

    use member variable instead of getter

 libempathy-gtk/empathy-individual-view.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

commit dfa83a219e8ac885f2e9930656e5d186a164b386
Author: Felix Kaser <f.kaser@gmx.net>
Date:   Tue Aug 3 13:54:12 2010 +0200

    removed fixme comment when toggling show_offline

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

commit a84e9e79c7f7a0dca20e1f5b5bc576400238e55c
Author: Felix Kaser <f.kaser@gmx.net>
Date:   Tue Aug 3 13:01:29 2010 +0200

    refactored show_offline property to the view

    the show offline property was moved from the individual store to the
    individual view. this allows to easily and automatically search
    through
    offline contacts as well.

 libempathy-gtk/empathy-individual-store.c |  106
 +----------------------------
 libempathy-gtk/empathy-individual-store.h |    7 --
 libempathy-gtk/empathy-individual-view.c  |   63 ++++++++++++++++-
 libempathy-gtk/empathy-individual-view.h  |    7 ++
 src/empathy-main-window.c                 |    2 +-
 5 files changed, 70 insertions(+), 115 deletions(-)

commit f5f67749239b7b6b8898c31acc3df33f4d02cd32
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Tue Aug 3 14:37:02 2010 +0200

    Updated Slovenian translation

 po/sl.po |  837
 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 470 insertions(+), 367 deletions(-)

commit ed0f30f24ec8f045647b3886da9cd086f263c5f1
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Tue Aug 3 14:34:05 2010 +0200

    Connect signals only once, it's enough

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

commit acc539549da986e0cfb4dd29142dcdf34743ce7d
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Mon Aug 2 18:29:40 2010 +0100

    Ensure contacts have a persona set

    Ensure that contacts created by
    empathy_contact_dup_from_folks_individual()
    have a persona set, so that things like custom presence messages
    in contact
    tooltips work again. This requires that we don't set the alias on the
    contacts during the initial contact population period, or we'll end
    up with
    duplicates of each contact in the list. Closes: bgo#625828

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

commit 737212cbc975c9113f4aaf105fb765811805c54a
Author: Felix Kaser <f.kaser@gmx.net>
Date:   Tue Aug 3 11:06:56 2010 +0200

    fixing a method name typo

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

commit 9901d38f39d9d4a71f8232ec4b6ea24426b6b062
Author: Leonid Kanter <leon@asplinux.ru>
Date:   Tue Aug 3 12:04:05 2010 +0300

    Updated Russian translation from Александр Семёнов
    <rotuka@ya.ru>

 po/ru.po | 1457
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 795 insertions(+), 662 deletions(-)

commit 8f92e7fc2a7f3f3fe86f8f1ac5b226d443352e2e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 3 10:14:02 2010 +0200

    contact: coding style fix

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

commit 663ef268deaa411db38c865ce90260d86eea0b41
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 2 11:17:38 2010 +0200

    Add a translator comment explaining the "reduce location" semantic
    (#624062)

    Thanks to mahfiaz@gmail.com for his suggestion.

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

commit a1528a5fb3a3bfc78edeedd2c6c28093a879cee7
Author: Funda Wang <fundawang@gmail.com>
Date:   Tue Aug 3 15:34:52 2010 +0800

    Updated zh_CN translation.

 po/ChangeLog |    4 ++
 po/zh_CN.po  |  147
 +++++++++++++++++++++++++++++-----------------------------
 2 files changed, 77 insertions(+), 74 deletions(-)

commit 791e5739bca80309501825f48da93a78aaba0b3c
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Mon Jul 19 18:55:35 2010 +0100

    Maintain a list of Individuals which have EmpathyContacts in the
    manager

    This is necessary so that Individuals can be tracked as
    EmpathyContact-carrying Personas are added and removed from them, and
    to ensure that the IndividualManager doesn't use Individuals without
    EmpathyContacts.

 libempathy/empathy-contact.c            |    3 +-
 libempathy/empathy-individual-manager.c |  137
 +++++++++++++++++++++++++------
 2 files changed, 115 insertions(+), 25 deletions(-)

commit 26193e7075c04d7ec01b6a75a71206a3e690b6e8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 2 18:12:06 2010 +0200

    remove released flag

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