commit 3af3e97869d79ce191713b817d75f47645024c00
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jun 7 17:04:03 2010 +0200

    prepare 2.31.3

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

commit f86e54b3c2ca22f3ce576233bcd78808d9107200
Merge: 7b4c1e7 e53b700
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Mon Jun 7 22:18:06 2010 +1000

    Merge branch 'trivia'

commit e53b7009489b33ed3073a9de89a7488a326a4f01
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Mon Jun 7 21:30:22 2010 +1000

    Makefile.am fixes

 Makefile.am |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

commit 7b4c1e7640abf3abc27ce9d3f7b066b14557840e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue May 18 17:20:23 2010 +0200

    Join room where we have been invited when handling the channel rather
    than we we approve it

 src/empathy-event-manager.c |   15 +--------------
 src/empathy.c               |    7 +++++++
 2 files changed, 8 insertions(+), 14 deletions(-)

commit cd6ab6adeb836cbda38abc502c39d14aedfef7f1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue May 18 17:16:32 2010 +0200

    add empathy_tp_chat_join() and empathy_tp_chat_is_invited()

 libempathy/empathy-tp-chat.c |   49
 ++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-tp-chat.h |    3 ++
 2 files changed, 52 insertions(+), 0 deletions(-)

commit 52bb570645883d3920f4950aa1dca8f6d88b4b32
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jun 7 12:24:22 2010 +0200

    dispatch-operation: fix a race by waiting that TpCall is ready

    The call handler constructor rely on the TpCall to be ready (to fetch the
    EmpathyContact associated with the call). If things are going fast (by
    skipping the approving of the call and handling it right away for example) it
    may no be ready yet.

 libempathy/empathy-dispatch-operation.c |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

commit 63b5db096a4a8e706bf9d2b7043aa6c9fe5d5697
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jun 7 12:24:06 2010 +0200

    dispatch-operation: factor out channel_wrapper_ready

 libempathy/empathy-dispatch-operation.c |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

commit 78a90f6800c2403452712d0a85d0c89a5cc165ea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue May 18 16:40:27 2010 +0200

    add empathy_tp_call_get_status

 libempathy/empathy-tp-call.c |    8 ++++++++
 libempathy/empathy-tp-call.h |    2 ++
 2 files changed, 10 insertions(+), 0 deletions(-)

commit f57e122a8c74452214cfcfcab1cfaa669d8c9e9e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jun 7 11:06:05 2010 +0200

    empathy_call_window_set_send_video: only disable preview if we need to

    There is no point to stop the camera if we're about to restart it
    right after
    because "preview only" is enabled.
    Furthermore that causes weird races making the video jumps out of
    the window
    (#62076).

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

commit b6800e4915dba910dae84f0bedc76c6dbde318ce
Author: Laurent Bigonville <bigon@bigon.be>
Date:   Sat Jun 5 14:26:41 2010 +0200

    Do not require geoclue provider to support updates

    Requiring that provider supports updates reduce the choice to almost
    zero (#620657).

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

commit db76f50da5903bb18fb480beaf430cb7329b2679
Author: Javier Jardón <jjardon@gnome.org>
Date:   Sun Jun 6 17:55:12 2010 +0200

    [docs] Remove omf.in file: It's not needed anymore

 help/empathy.omf.in |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

commit 76565f1667094528459fc2cfa80932a48b60158a
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Fri Jun 4 22:01:23 2010 +0200

    One more coding style fix

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

commit 8b82da132567baf8f4ad19353d6b37731f20435a
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Fri Jun 4 21:43:26 2010 +0200

    Fix some coding styles

 libempathy-gtk/empathy-contact-list-view.c |   48
 ++++++++++++------------
 src/empathy-main-window.c                  |   56
 ++++++++++++++--------------
 2 files changed, 52 insertions(+), 52 deletions(-)

commit 685f79252197d6e2d9d51e132bd19c8beb1ba6b4
Author: Sira Nokyoongtong <gumaraa@gmail.com>
Date:   Fri Jun 4 20:54:48 2010 +0700

    Updated Thai translation.

 po/th.po | 1256
 +++++++++++++++++++++++---------------------------------------
 1 files changed, 468 insertions(+), 788 deletions(-)

commit 3ca24320ad62f6207501197d290a47d99bb487e4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Jun 4 11:44:06 2010 +0200

    chatrooms-window: remove the 'edit' button

    It has never been implemented so there is no point keeping it
    (#520207).

 src/empathy-chatrooms-window.c  |   66
 ---------------------------------------
 src/empathy-chatrooms-window.ui |   24 ++++++--------
 2 files changed, 10 insertions(+), 80 deletions(-)

commit 3e383f71374ddc2a4eac3f012ad4b93236fc6887
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Thu Jun 3 21:40:18 2010 +0200

    Updated Galician translations

 po/gl.po |   83
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 43 insertions(+), 40 deletions(-)

commit 1b5d073289b76ccaa74da4feea023ad4896a1977
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Thu Jun 3 21:28:31 2010 +0200

    Updated Spanish translation

 po/es.po |  110
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 55 insertions(+), 55 deletions(-)

commit 29e870fa4ecbfe926b0f1eced78705ca9305b592
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Thu Jun 3 18:44:40 2010 +0300

    Updated Hebrew translation.

 po/he.po |   90
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 45 insertions(+), 45 deletions(-)

commit 01f25c3ca3f7780086720be3a9ccecdda96e7517
Author: Paul Sladen <gnome@paul.sladen.org>
Date:   Thu Jun 3 17:04:07 2010 +0200

    Make FullName clearer (#611466)

 data/empathy.desktop.in.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 55b79bd79477ddb3be777d760e19fa1bc468e56b
Author: Rob Bradford <rob@linux.intel.com>
Date:   Thu Jun 3 14:24:21 2010 +0100

    accounts-dialog: avoid leaking the account status message

    Originally this function mixed const and allocated strings using
    the same
    variable, resulting in leaks. This change refactors the code
    slightly to
    prevent such leaks.

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

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

commit ff6007612e6560514dbd6a5a581475d72de8c29d
Author: Rob Bradford <rob@linux.intel.com>
Date:   Wed Jun 2 12:47:34 2010 +0100

    accounts-dialog: Ensure correct connectivity information

    Move the creation of the EmpathyConnectivity object to the dialog
    construction so that there is time for the asynchronous calls that
    the EmpathyConnectivity makes (in ConnMan mode) to return.

    Without this change the error is always reported as network connection
    failure
    rather than the real error when built with ConnMan.

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

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

commit 7d4202aa8e193c22e9cc3871fbc384454cb734ef
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Jun 3 12:26:55 2010 +0200

    change 'disconnect' label to 'finally'

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

commit 585d72aa81e740176a8482312a24ad70afbb2009
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Jun 3 11:27:16 2010 +0200

    Don't wait longer than 5 seconds when trying to join chatrooms

    If the accounts takes ages to connect or was disabled, it would be
    weird to
    automatically join the room a long time after the user asked to join
    favorite rooms.

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

commit 37e0041feb76a63e8a4d93bb8686d12266d117aa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Jun 3 11:14:45 2010 +0200

    Join chatroom favorites once the account is connected (#620439)

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

commit b9c8f8942d4d01118e73f6abddfd53d284b865c6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Jun 3 11:00:44 2010 +0200

    factor out join_chatroom

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

commit 8229e3eeedecaebce510ff1197dc3412e00bc5f7
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Thu Jun 3 11:49:19 2010 +0200

    Updated Spanish translation, applied patch by Florian Müllner
    <fmuellner@gnome.org> that fixes two typos

 help/es/es.po |   38 ++++++++++++--------------------------
 1 files changed, 12 insertions(+), 26 deletions(-)

commit 5eba91c37b0fdcd1eb5a905477cc98dc1c6d15d9
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Thu Jun 3 17:59:44 2010 +1000

    Only create the EmpathyAccountsDialog if required

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

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

commit 38bbb04d30bed88cf7af9e14c5183149fdb635c9
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Thu Jun 3 16:20:58 2010 +1000

    Update location for mx-gtk.h

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

commit d754e98ad2c3a5deefc47e1b3eeedbd982360cf4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri May 28 09:24:18 2010 +0200

    log-window: start the search when the entry is activated (#619863)

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

commit b4db990e6e7273cef3be093304a1fea7b783bb21
Merge: a27cf4d b00a994
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Wed Jun 2 11:11:48 2010 +1000

    Merge branch 'debug-get-protocols-612523'

commit b00a994614d945e17d5004cce623658ee2dd0b82
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Thu Mar 11 11:57:54 2010 +1100

    empathy-debug-window: Add protocol names next to the CMs in the
    dropdown

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

 src/empathy-debug-window.c |  120
 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 106 insertions(+), 14 deletions(-)

commit a27cf4d72f1bcbc67a287e365cb07f28d9d8ab66
Author: Wouter Bolsterlee <wbolster@gnome.org>
Date:   Mon May 31 19:43:24 2010 +0200

    Dutch translation updated by Wouter Bolsterlee

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

commit c66fe4bf653d0e1252b2b43324a2b3ec5b88bee7
Author: Hannie Dumoleyn <lafeber-dumoleyn2@zonnet.nl>
Date:   Mon May 31 19:39:14 2010 +0200

    Dutch translation updated by Hannie Dumoleyn

 po/nl.po | 5759
 +++++++++++++++++++++++++-------------------------------------
 1 files changed, 2267 insertions(+), 3492 deletions(-)

commit b7115a8d8c39b1320886fba97d65c2cf50aa7522
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Sun May 30 18:01:05 2010 +0200

    Updated Galician translationsus

 po/gl.po |  375
 +++++++++++++++++++++++++++++++------------------------------
 1 files changed, 191 insertions(+), 184 deletions(-)

commit aa091f48b6d22ce558aa2f3dd5eec7d7fc361381
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Sun May 30 15:11:55 2010 +0200

    Updated Norwegian bokmål translation

 po/nb.po |  364
 +++++++++++++++++++++++++++++++------------------------------
 1 files changed, 185 insertions(+), 179 deletions(-)

commit 91505a9b06c100931de5d617b09bda400043c2ca
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Sun May 30 02:59:52 2010 +0300

    Updated Hebrew translation.

 po/he.po | 1502
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 765 insertions(+), 737 deletions(-)

commit bbcab52f24f48ac22e1230fda4b95697055c9a50
Author: Mario Blättermann <mariobl@gnome.org>
Date:   Fri May 28 22:17:23 2010 +0200

    Updated German doc translation

 help/de/de.po |   96
 +++++++++++++++++++++++++--------------------------------
 1 files changed, 42 insertions(+), 54 deletions(-)

commit a9f889317e902de3f70719cdc8431a7558f7a10f
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Fri May 28 19:49:10 2010 +0200

    Updated Spanish translation

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

commit 5ab918a38a75d877cf0a8b3b79da0f2fc723e16c
Merge: 246115e 9cd83f1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri May 28 09:09:44 2010 +0200

    Merge branch 'import-617971'

commit 246115e48e4b1103132695f20a80bf74fe3640c2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu May 27 17:03:11 2010 +0200

    coding style fixes

 libempathy/empathy-chatroom-manager.c |    2 +-
 src/empathy-chat-window.c             |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 9e50b650fef38479ad10c5518e4c85a13f2d7a6e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu May 27 16:59:44 2010 +0200

    rephrase important room menu

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

commit c886f096cf16280f02e4f5c4b3211f6dc8711f97
Author: Jonas Bonn <jonas@southpole.se>
Date:   Fri Mar 5 16:52:08 2010 +0100

    Make chatroom manager retain room's "always_urgent" state

    This patch adds the always_urgent property to the list of chatroom
    properties that are saved by the chatroom manager for the favorite
    chatrooms.  This allows Empathy to bring favorite chatrooms back
    up with the same notification properties they had the last time they
    were used.

    This seems reasonable as a room marked as "Notify Always" will
    most likely
    be of such a character that this would be a reasonable setting
    every time
    the room is joined.

 libempathy/empathy-chatroom-manager.c   |   14 ++++++++++++++
 libempathy/empathy-chatroom-manager.dtd |    3 ++-
 2 files changed, 16 insertions(+), 1 deletions(-)

commit 6da94f6bce71e0d2c1b44260da986eecd089defa
Author: Jonas Bonn <jonas@southpole.se>
Date:   Fri Mar 5 12:55:25 2010 +0100

    Add option to make chatroom "always urgent" (#611894)

    Often a user wants to be immediately notified of posts to a chatroom
    even when
    the post does not address them directly by name.  This patch adds
    a room
    option to make all posts to the room "urgent", meaning that the
    system-specific
    urgency action should be taken -- notification, window urgency
    hint, etc.

    Two specific use cases for when one may want this:

    i)  Low-traffic rooms (so that one does not have to go check the
    room all the
    time)
    ii)  Error-logging room (room to which errors from some other
    system(s) are
    logged)

    The "always urgent" option is off by default when joining a room.

 libempathy/empathy-chatroom.c |   48 ++++++++++++++++++++++++++++++++++-
 libempathy/empathy-chatroom.h |    3 ++
 src/empathy-chat-window.c     |   56
 ++++++++++++++++++++++++++++++++++++++--
 src/empathy-chat-window.ui    |    7 +++++
 4 files changed, 110 insertions(+), 4 deletions(-)

commit 2f9166bf42462e44b40462cbd9fc562f6cf507af
Author: Jonas Bonn <jonas@southpole.se>
Date:   Fri Mar 5 17:02:53 2010 +0100

    Use ensure_chatroom in callback

    The new function ensure_chatroom should be used by favorite-toggled
    callback.

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

commit 2cf16f8c3b783ac09ed638633b34dffc50279106
Author: Jonas Bonn <jonas@southpole.se>
Date:   Fri Mar 5 16:42:05 2010 +0100

    Add function ensure_chatroom to chatroom manager

    This function tries to find an existing chatroom, but if it fails
    to do so it creates a new room and returns that instead.

 libempathy/empathy-chatroom-manager.c |   22 ++++++++++++++++++++++
 libempathy/empathy-chatroom-manager.h |    4 ++++
 2 files changed, 26 insertions(+), 0 deletions(-)

commit 09969c342e7b887bdfc92ff52a6862ae0fe8fa3b
Author: Mattias Põldaru <mahfiaz gmail com>
Date:   Thu May 27 13:16:18 2010 +0300

    Estonian translation updated

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

commit 6caef8aaf683117fb559a8c3c98e001a782914a4
Author: Robert McQueen <robert.mcqueen@collabora.co.uk>
Date:   Thu May 27 10:21:26 2010 +0200

    fix 0-byte logfile crash (#619736)

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

commit c75bdbbfc79d0489051bb5f87227647157476433
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Wed May 26 18:00:42 2010 +0200

    Updated Spanish translation

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

commit 4e1b91e8cfa635fde04960c43312034b8a54d8e1
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   Wed May 26 11:08:34 2010 +0100

    with-session-bus.sh: update from telepathy-glib, fixing bash-specific
    &> redirection

 tools/with-session-bus.sh |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

commit 961f968f204547c34ad419786447d1904783497f
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   Wed May 26 11:08:01 2010 +0100

    configure.ac: improve portability of test(1) calls

    The "==" operator isn't POSIX (use "="), and the -a and -o connectors
    aren't POSIX (use test foo && test bar, test foo || test bar).

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

commit 4ba1a8de87f108ad073e388711c4d6b05009851e
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Thu May 20 16:12:57 2010 +0200

    Make sure to not infinite loop when scaling avatar.

    1) Add a limit of 10 retries, to be sure to never do more in the
    worst case.
    2) Only keep converted data that respect the requirements, make sure
    to not
    accept bigger data than maximum_bytes, even if it is close to
    the limit.
    3) Stop the loop if the new factor does not change the image
    resolution. That
    means we already found the optimal size.

    Fixes bug #619701

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

commit 1ea03406fc359c1623909ff6705c9c67b0e0c30b
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Sun May 23 13:13:13 2010 +0200

    Remove EmpathyContactMonitor, it is not used anymore

    Fixes bug #619489

 libempathy/Makefile.am               |    2 -
 libempathy/empathy-contact-list.c    |   12 -
 libempathy/empathy-contact-list.h    |    4 -
 libempathy/empathy-contact-manager.c |   20 --
 libempathy/empathy-contact-monitor.c |  417
 ----------------------------------
 libempathy/empathy-contact-monitor.h |   63 -----
 libempathy/empathy-tp-chat.c         |   24 --
 7 files changed, 0 insertions(+), 542 deletions(-)

commit a9b78b0a3a5fe71e3119016c9f438d3897509bf8
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Sun May 23 13:09:20 2010 +0200

    Do not use EmpathyContactMonitor to know when a contact gets
    online/offline

 src/empathy-event-manager.c |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

commit 58521ffc5dc4ca1b67ce3df25c16799237061f02
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Sun May 23 12:57:31 2010 +0200

    Play sound for contact connected/disconnected from EmpathyEventManager
    instead of main window

 src/empathy-event-manager.c |   38 ++++++++++++++++++++++-----------
 src/empathy-main-window.c   |   47
 -------------------------------------------
 2 files changed, 25 insertions(+), 60 deletions(-)

commit a3006260dcca6bac7a2f291389823584a136f2d8
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Sun May 23 12:48:45 2010 +0200

    Do not use EmpathyContactMonitor to know when a contact is added

 src/empathy-main-window.c |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

commit ea03354dacd0da472875bb64d0f2d8c124f3193b
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Wed May 26 11:34:06 2010 +0200

    Move empathy_tp_contact_factory_set_alias() to EmpathyContact

 libempathy-gtk/empathy-contact-dialogs.c |    2 +-
 libempathy-gtk/empathy-contact-widget.c  |    2 +-
 libempathy/empathy-contact.c             |   38 ++++++++++++++++++++++++
 libempathy/empathy-contact.h             |    1 +
 libempathy/empathy-tp-contact-factory.c  |   46
 ------------------------------
 libempathy/empathy-tp-contact-factory.h  |    2 -
 6 files changed, 41 insertions(+), 50 deletions(-)

commit 986064a03ac759da8e87d085b8941444c8b57c5a
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Wed May 26 11:26:57 2010 +0200

    Make clear that contacts_table doesn't keep any ref

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

commit b8ff75d21c1be60e6df472a35599a9e22046a92b
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Mon May 10 12:36:28 2010 +0200

    Port to new EmpathyTpContactFactory API

 libempathy-gtk/empathy-contact-dialogs.c   |   10 +----
 libempathy-gtk/empathy-contact-list-view.c |   19 ++++-------
 libempathy-gtk/empathy-contact-widget.c    |   24 +++----------
 libempathy-gtk/empathy-new-call-dialog.c   |    8 +---
 libempathy/empathy-dispatch-operation.c    |    8 +---
 libempathy/empathy-dispatcher.c            |    8 +---
 libempathy/empathy-ft-handler.c            |   10 ++----
 libempathy/empathy-tp-call.c               |    7 +---
 libempathy/empathy-tp-chat.c               |   50
 +++++++++++++---------------
 libempathy/empathy-tp-contact-list.c       |   15 ++------
 src/empathy-call-window.c                  |    8 +---
 src/empathy-chat-window.c                  |    9 +----
 src/empathy-event-manager.c                |   16 ++-------
 13 files changed, 60 insertions(+), 132 deletions(-)

commit 696bd076bbd431aad122c66cadfb6ec3f5ff1762
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Mon May 10 12:35:19 2010 +0200

    Kill EmpathyTpContactFactory object. Its API stays as helper code on TpConnection.

    Note that it uses empathy_contact_dup_from_tp_contact() internally,
    so we are
    sure to really have at most one EmpathyContact object per TpContact

    Fixes bug #619488

 libempathy/empathy-tp-contact-factory.c |  359
 +++++--------------------------
 libempathy/empathy-tp-contact-factory.h |   38 +---
 2 files changed, 57 insertions(+), 340 deletions(-)

commit 373413516c18200750da27f385da588da6c297cc
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Mon May 10 12:34:42 2010 +0200

    Add empathy_contact_dup_from_tp_contact()

    This API make sure to return a singleton EmpathyContact for any
    TpContact

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

commit 84419982180bd444e611b874add261d053341e5f
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Tue May 25 19:29:49 2010 +0200

    Bump required telepathy-glib to 0.11.6

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

commit 6cd1d1bb310a9a427caad3b5de657ad9c4ad929b
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Fri May 7 10:10:22 2010 +0200

    Make use of TP_CONTACT_FEATURE_AVATAR_DATA

    Fixes bug #579812

 libempathy/empathy-contact.c            |   77 ++++++-----
 libempathy/empathy-contact.h            |    4 -
 libempathy/empathy-tp-contact-factory.c |  226
 +------------------------------
 3 files changed, 41 insertions(+), 266 deletions(-)

commit 622c0860406745563cfe146bc299dfde1938fed6
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Thu Apr 29 11:29:37 2010 +0200

    Stop getting avatar requirements in EmpathyTpContactFactory

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

commit ed5ef81eb92e49309f986acf9cd3ef6415c0ccad
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Thu Apr 29 11:24:24 2010 +0200

    Make use of TP_CONNECTION_FEATURE_AVATAR_REQUIREMENTS

    Fixes bug #616603

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

commit 6559cf694da1f141c8b958542ad6a5e61f3a336f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed May 26 11:05:05 2010 +0200

    invite-participant-dialog: translate the 'invite' button (#619678)

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

commit 1a45d12ba4413512b389cd8ac00c02ad98477ce7
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Tue May 25 17:58:02 2010 +0200

    Updated Spanish translation

 po/es.po |  178
 +++++++++++++++++++++++++++++++------------------------------
 1 files changed, 90 insertions(+), 88 deletions(-)

commit 9cd83f199da867a18e8182e230505cb6ec8b6409
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue May 25 14:45:05 2010 +0200

    assistant: call empathy_import_widget_add_selected_accounts in
    impl_signal_apply as well

    If the user already has a salut account configured, the import page
    is the
    last one of the assistant. So impl_signal_apply() is called instead of
    impl_signal_prepare(). (#617971)

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

commit 1991cfd7220438c19cee7cb20861ddda57bd7ce7
Author: Frédéric Péters <fpeters@0d.be>
Date:   Tue May 25 13:27:49 2010 +0200

    Fixed typo in variable name

 release.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 1a0a1811e796c9117e1bfe1e2ecc091d21e8b87d
Author: Gabriel Burt <gabriel.burt@gmail.com>
Date:   Sat May 22 09:44:25 2010 -0700

    Fix contact menu items' capitalization (#619378)

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

commit 397550f132803b8ff16aeb8fd402fba1d9b01fbd
Author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
Date:   Thu May 13 03:23:00 2010 -0500

    Fix and improve spell-checking (#604159)

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

commit b8bd45099ed48decb876233cab1f2df217abc323
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue May 25 11:23:08 2010 +0200

    hardcode facebook server to workaround SRV lookup issues

 src/empathy-account-assistant.c |    3 +++
 src/empathy-accounts-dialog.c   |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

commit dc191ab0d987dd5478365e5d19da7dad55d11002
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Tue May 25 08:33:46 2010 +0200

    Updated Spanish translation

 po/es.po |  407
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 204 insertions(+), 203 deletions(-)

commit 9966caf8ea6fc6f5a5e6698371a9cfc6f24d7c41
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon May 24 17:21:28 2010 +0200

    remove the release flag

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