commit 61276718fc0643e8951219748b3dd4ee0b282d23
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 8 16:23:20 2010 +0100

    coding style fixes

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

commit 859b7a4bd567c16b210870a41bacf8356cbd0ebc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 8 16:21:42 2010 +0100

    add empathy-chat to POTFILES.in

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

commit 8ba1faac4239c80e8726ecfc868735584383f1b4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 8 16:15:29 2010 +0100

    fix typo in NEWS

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

commit 51df29ca35c95707a1984976e447cb3f0bdeef7a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 8 16:05:47 2010 +0100

    prepare 2.91.2

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

commit dd9ab9cab63618aed2e396b427ffcb9f4240fd6c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 8 15:57:32 2010 +0100

    Depend on latest GLib and GTK+ release

    They have been API changes recently so we are not able to build
    with older
    versions.

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

commit 779b303df490ffa5a044b36c44777e2e0f24cf8c
Merge: 518b442 afb871a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 8 13:39:22 2010 +0100

    Merge branch 'preset-581029'

commit 518b442c06fcc98399440cfe282a319f4d2ba369
Author: Mario Blättermann <mariobl@gnome.org>
Date:   Sat Nov 6 19:25:14 2010 +0100

    [l10n] Updated German doc translation, fixed some more XML errors

 help/de/de.po |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

commit 31a5c98b831e437ce0b4de7aa06d7b09bc8498a6
Author: Mario Blättermann <mariobl@gnome.org>
Date:   Sat Nov 6 19:22:36 2010 +0100

    [l10n] Updated German doc translation, fixed some XML errors

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

commit eee9a0454724a1bc2132a6574aebfa60faefb208
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Fri Nov 5 15:01:36 2010 +0100

    Updated Slovenian translation

 po/sl.po |  545
 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 309 insertions(+), 236 deletions(-)

commit a0d57aa60447a6c2810013bad801b5ecc71d8b8c
Merge: 182b9fa 60ceff6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Nov 4 09:16:41 2010 +0100

    Merge branch 'contact-info-630421'

commit 182b9fa21320d52c886284d652b1a232d3ec2793
Author: ReÅŸat SABIQ <tilde.birlik@gmail.com>
Date:   Thu Nov 4 00:49:19 2010 -0500

    Updated Crimean Tatar (Crimean Turkish) translation

 po/crh.po | 2031
 ++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 1275 insertions(+), 756 deletions(-)

commit a8064b9082e8cab75f72a108359bb5ce5d39675b
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Wed Nov 3 18:03:11 2010 +0100

    Updated Spanish translation

 po/es.po |   38 ++++++++++++++++++++------------------
 1 files changed, 20 insertions(+), 18 deletions(-)

commit 588c9672d3530294f3ce1308754a7121681a6fa0
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Wed Nov 3 08:49:52 2010 -0700

    Always set up the call factory in empathy-av.

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

commit 257e5241380c49fb5498093ccf3ebcced29c7fe1
Merge: c3395bb 6780c24
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Nov 3 16:59:05 2010 +0100

    Merge branch 'av-crash-633816'

commit c3395bb565cc994f4871f52d20e4be506c75d6e8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Nov 3 09:39:43 2010 +0100

    fix syntax error

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

commit 2006f8e4601f2eab8e63884a86c4b4b626e963c6
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Wed Nov 3 10:37:50 2010 +0200

    Updated Hebrew translation.

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

commit 20bf62e79da14568fcd8c65fd561d601acf4b882
Author: Alex Launi <alex.launi@gmail.com>
Date:   Tue Nov 2 21:11:56 2010 -0400

    Reword subscription request dialog to be less technical

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

commit 60ceff650179f376d3f35831a4170b3bc0a2577a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Oct 20 13:38:03 2010 +0200

    Add fields which are supported but not in the vCard

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

commit 56b38154b0c236a158a41989c0cc72e0302cf6ff
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Oct 20 13:12:00 2010 +0200

    split filling of details_to_set and adding the widgets

    This will allow us to add supported fields which are not set in
    the vCard.

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

commit f8a787f1ad106cbb6422038800ee767c1b94a724
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Oct 20 12:59:35 2010 +0200

    contact_widget_details_update_edit: iterate over the fields returned
    by tp_contact_get_contact_info()

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

commit a2421fe9c16830e31ffab506d65a4463fd2b5e03
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Oct 20 12:57:31 2010 +0200

    log an error if SetContactInfo() fails

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

commit 897caa5f59139e690778f006ce69518cc484a25a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Oct 20 12:55:38 2010 +0200

    field_value_is_empty: check that all the values are empty

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

commit a71719b4f268e0a1872007af770593773332cb0f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Sep 29 12:18:42 2010 +0200

    field_spec_match_field: check that parameters are matching as well
    (#630421)

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

commit b05d78f8dcf7e952be1a1ffd88757370ec3e19cf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Sep 29 12:13:25 2010 +0200

    factor out field_spec_match_field()

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

commit 66ccf35fe60be0a85aa9e6a242bdd1a2ba6706a3
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Wed Nov 3 09:11:52 2010 +0200

    Updated Hebrew translation.

 po/he.po |   75
 ++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 39 insertions(+), 36 deletions(-)

commit 6780c24c52863706602cf0b900ba4adc298180fe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Nov 2 14:58:03 2010 +0100

    Don't destroy the call factory right away (#633816)

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

commit 5645e5b10dff5b440ab0343bcd1f930bee5f985b
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Tue Nov 2 11:10:45 2010 +0100

    Updated Spanish translation

 po/es.po |   77
 ++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 40 insertions(+), 37 deletions(-)

commit 0c927779b5b37ba01bb710b86e21c55f35e7ad94
Author: Vitaly Minko <vitaly.mink@gmail.com>
Date:   Tue Nov 2 10:08:15 2010 +0100

    Escape URL itself along with the title (#616339)

 libempathy-gtk/empathy-string-parser.c |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

commit dff6d4ec7292db208dac8abf44a238764b1e3915
Merge: b776688 6f6c118
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Nov 2 10:05:28 2010 +0100

    Merge remote branch 'vminko/fix-609942'

commit b77668866f1d5cc4fed07786c659380c8e95e1e5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 25 11:03:05 2010 +0200

    improve hash mismatch error (#632926)

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

commit 6f6c118815634fa3ddbd62df46e7447341a81f5b
Author: Vitaly Minko <vitaly.minko@gmail.com>
Date:   Mon Nov 1 18:55:00 2010 +0300

    String parser is changed in order not to break URLs at apostrophes.

 libempathy-gtk/empathy-string-parser.c |   12 ++++++------
 tests/empathy-parser-test.c            |    6 +++++-
 2 files changed, 11 insertions(+), 7 deletions(-)

commit 68e5dfaa9c4e5ee49efa13421eb9fc4dfdb04077
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Thu Oct 28 09:52:20 2010 -0700

    empathy: use the proper exit status

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

commit 3afb04af72b24948e033a22800957a4564cce23c
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Thu Oct 28 09:50:29 2010 -0700

    empathy-debugger: use the proper exit status

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

commit d304979d6dc8bfb35d2f4ecb69456868d4d89064
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Thu Oct 28 09:50:03 2010 -0700

    empathy-chat: use the proper exit status

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

commit 3993edbacf01218a50b206f5f1fdd0ad981b576b
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Thu Oct 28 09:51:23 2010 -0700

    empathy-av: use the proper exit status

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

commit 9fa6495ab8e1900c020b0e6e265d380b68b405a7
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Thu Oct 28 09:48:29 2010 -0700

    empathy-accounts: use the proper exit status

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

commit e7568fd64d8ec733efea5f6563bf7d286319edfc
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Wed Oct 27 17:31:02 2010 -0700

    Make the chat program not exit after 60 seconds.

    We were mis-handling the GApplication holds, which let it time-out,
    even if a
    chat window was open.

    Helps bgo#632912.

 src/empathy-chat.c |   59
 +++++++++++++++-------------------------------------
 1 files changed, 17 insertions(+), 42 deletions(-)

commit d298521fb71385e25ce924bd051ecaed73ae14e7
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Wed Oct 27 11:21:04 2010 -0700

    Make the core empathy a command-line GApplication.

    Helps bgo#632912.

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

commit ae2279dbd9844674ea90bb161078dfc3925573cd
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Tue Oct 26 10:39:18 2010 -0700

    Make empathy-accounts use act as a "command-line" GApplication

    Helps bgo#632912.

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

commit 1cee1d840d87c1cb55ea35b17c58f3d7c69931be
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Fri Oct 22 13:06:45 2010 -0700

    Relocate static function to eliminate prototype.

 src/empathy-av.c |   36 +++++++++++++++---------------------
 1 files changed, 15 insertions(+), 21 deletions(-)

commit ad19fb0668dcd21c0ac82e3c0fc81f6fa03dd92a
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Fri Oct 22 13:05:54 2010 -0700

    Don't try to register for unique bus names in remote instances
    of empathy-av.

 src/empathy-av.c |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)

commit 8857f63fb88c5b6cc3fed75143a9b58da439f583
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Fri Oct 22 13:03:55 2010 -0700

    Properly handle remote instances of empathy-av.

    Also cut out unncessary window counting that GApplication does for us.

    Fixes bgo#632912.

 src/empathy-av.c |   63
 +++++++++++++++++------------------------------------
 1 files changed, 20 insertions(+), 43 deletions(-)

commit f6e6e24cd11b820e382e687626b52dd3eb6364a7
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Fri Oct 22 12:35:50 2010 -0700

    Properly handle remote instances of the accounts dialog.

    Helps bgo#632912.

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

commit f9e4c3d37f6cc259beca5b4dde709a34e517d2c6
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Fri Oct 22 12:16:18 2010 -0700

    Properly handle remote instances of the debugger.

    Helps bgo#632912.

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

commit 0ff09c9c9bf89948a8e37b3c3606fc42f0d8e618
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Fri Oct 22 12:04:26 2010 -0700

    Don't try to register for unique bus names in remote instances
    of Empathy.

    This means, that remote (secondary) instances of Empathy won't try
    to hold the
    Chat or FT bus names (which will always fail.

    It also means that remote instances don't try to hold the GApplication
    (though
    they would release it upon exit anyhow).

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

commit 4c8dc9d04de6f80c8e5406495e71d0dca9f73369
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Fri Oct 22 11:47:29 2010 -0700

    Cut out unnecessary empathy_app_new().

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

commit f0bc602802fd56095886b1d6b1b054a44320973d
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Fri Oct 22 11:41:47 2010 -0700

    Make the Empathy core program act as a unique app.

    This means that instances beyond the first simply raise the initial
    instance and
    exit.

    Helps bgo#632912.

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

commit 8b529506fbc4265b44ab35cda5bdc99978192680
Merge: 2237080 5c9cc71
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 29 09:50:04 2010 +0200

    Merge branch 'muc-crash-633329'

commit 22370808b807c31c111fea61a33aa19d2dec1f03
Author: Vitaly Minko <vitaly.mink@gmail.com>
Date:   Thu Oct 28 15:40:56 2010 +0200

    Allow to drop contacts on the group names (#619961)

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

commit 91a0c4fcb278477422e1c89f517cc0f5c833de33
Merge: 10de0a2 01566e5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Oct 28 15:23:48 2010 +0200

    Merge remote branch 'vminko/fix-612205-v2'

commit 01566e5ee1cc585aeda44f58d76874ac1faaa63a
Author: Vitaly Minko <vitaly.minko@gmail.com>
Date:   Thu Oct 28 16:52:16 2010 +0400

    Copy topic selection manually since Ctrl-C is bound to the menu item.

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

commit 10de0a21f8abf9ad1719039addf347e03a6324dd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Oct 28 14:28:54 2010 +0200

    rename timeout_id to auto_scroll_timeout_id

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

commit 512026609a385f2715350d275f987ca61dbc2ad8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Oct 28 14:26:38 2010 +0200

    move AutoScrollData to priv

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

commit 047aefcdfb7a8f19d6cb569375601e81cae30a38
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Oct 28 10:10:30 2010 +0200

    Use GTK3 API

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

commit 7fc61f47a6133047135b01190ad3dc8e9eed4489
Author: Vitaly Minko <vitaly.minko@gmail.com>
Date:   Wed Oct 27 23:39:32 2010 +0400

    Add auto scrolling when drag-and-dropping contacts (#619858).

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

commit 5c9cc71dd871671cf6654fbe968755654081946e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Oct 28 09:32:47 2010 +0200

    chat-manager: keep a ref on the chatroom mgr

    This avoid to recreate one each time we need it.

 src/empathy-chat-manager.c |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

commit 43810b24c12d81f26f4d38035ae911a1a7a0bbcc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Oct 28 09:31:54 2010 +0200

    chatroom-manager: ensure that we stay alive while preparing the AM

    This manager uses to be always alive but that's not longer tree
    since we
    splitted the chat client (#633329).

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

commit 8fcbe3e7f71eeb6bca559dd6c36711b7fa5078c4
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Wed Oct 27 17:52:09 2010 -0700

    Fix the subtitution for the libexecdir path in the Chat service file.

 data/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit f8f79bf5b2597b0239fb12c426907cf2b918bddc
Author: Aron Xu <aronxu@gnome.org>
Date:   Wed Oct 27 16:01:02 2010 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po | 1004
 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 533 insertions(+), 471 deletions(-)

commit 85bcf8d0266294ebc9ba66062812cbee40791de5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Oct 27 17:53:12 2010 +0200

    empathy-chat is installed in libexecdir

 ...esktop.Telepathy.Client.Empathy.Chat.service.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit afb871aad6cf857d445d9235fc1e956518f76e5f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Oct 27 17:20:34 2010 +0200

    Don't use 'Preset' in the UI (#581029)

 libempathy-gtk/empathy-status-preset-dialog.ui |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 77da3f09f8e74d8dd96efc1cce1efe46f8a352fc
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Tue Oct 26 10:45:42 2010 +0200

    Updated Spanish translation

 po/es.po |   41 ++++++++++++++++++++++-------------------
 1 files changed, 22 insertions(+), 19 deletions(-)

commit 9c832ed43560894522aaf832ac6c9d91831ee051
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Tue Oct 26 08:23:55 2010 +0200

    Updated Hebrew translation.

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

commit a00833accf9eb1c4470feac282b4679df3e2629d
Author: Francisca Gallardo <fran.gallardop@gmail.com>
Date:   Mon Oct 25 20:07:49 2010 -0300

    empathy-account: change Salut -> People Nearby

    Changed error message
    "Don't display any dialogs if there are any non-Salut accounts"
    to "Don't display any dialogs unless there are only 'People Nearby'
    accounts"

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

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

commit 8f0fbd89ee0d514bdc664850541416cac9090204
Merge: 1e6d192 34a97e5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 25 14:33:47 2010 +0200

    Merge remote branch 'vminko/fix-573283'

commit 34a97e543d2d8e306333d3e8682316c7e0ea8444
Author: Vitaly Minko <vitaly.minko@gmail.com>
Date:   Mon Oct 25 14:10:38 2010 +0400

    Fixing incorrect indentation.

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

commit 1e6d192d7a61c14fefae302f2109a91a9a916287
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 25 11:14:31 2010 +0200

    src/Makefile.am: add $(NULL)

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

commit 426487b5817b6f75c77ee888b3355fd7b89981a2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 25 10:29:44 2010 +0200

    coding style fix

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

commit 3af8594e436d5c88e531fcd6f36a1d81b20b133e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Oct 19 16:20:06 2010 +0200

    empathy.c: stop instantiating the chat manager

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

commit 3c1151db28aa6d8726a763060070e0c8eb961e2d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Oct 19 16:12:53 2010 +0200

    Create 'empathy-chat' handling text channels (#631946)

 src/.gitignore     |    1 +
 src/Makefile.am    |   10 +++-
 src/empathy-chat.c |  174
 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 184 insertions(+), 1 deletions(-)

commit f116e5268165cce8c67d6876b6819790ba29c683
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Oct 19 16:11:11 2010 +0200

    chat-manager: add API to track the number of handled chats

 src/empathy-chat-manager.c |   61
 ++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-chat-manager.h |    2 +
 2 files changed, 63 insertions(+), 0 deletions(-)

commit 912a3822ff6dcedcf6336191aab3bd363d7e24bb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Oct 19 15:40:47 2010 +0200

    chat-manager: make clear that we are dealing with *closed* chats

 src/empathy-chat-manager.c |   39 ++++++++++++++++++++-------------------
 src/empathy-chat-manager.h |    2 +-
 src/empathy-chat-window.c  |    4 ++--
 3 files changed, 23 insertions(+), 22 deletions(-)

commit dc277e086d67b4e5ae53211229368c1bd7572844
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Oct 19 15:37:03 2010 +0200

    rename the chat handler to Empathy.Chat

 data/.gitignore                                    |    2 +-
 data/Empathy.Chat.client                           |   14 ++++++++++++++
 data/Empathy.client                                |   14 --------------
 data/Makefile.am                                   |    6 +++---
 ...esktop.Telepathy.Client.Empathy.Chat.service.in |    3 +++
 ...freedesktop.Telepathy.Client.Empathy.service.in |    3 ---
 src/empathy-chat-manager.c                         |    2 +-
 7 files changed, 22 insertions(+), 22 deletions(-)

commit eaffceb6b4a5ea9d15a0aaa41885b258dcbc0cf2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Oct 19 15:33:59 2010 +0200

    idle.h: we have to include account from tp-glib

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

commit f3028d109fb45840c5ef7f63dc14de74593f5079
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Sat Oct 23 02:34:13 2010 +0200

    Updated Hebrew translation.

 po/he.po |  136
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 75 insertions(+), 61 deletions(-)

commit dbe9379eb6d3f1f51dbbe293a8cf347efedf85f1
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:   Sat Oct 23 01:02:36 2010 +0200

    Updated Catalan (Valencian) translation

 po/ca@valencia.po | 1993
 +++++++++++++++++++++++++++++++++--------------------
 1 files changed, 1251 insertions(+), 742 deletions(-)

commit 06edcef25a101bd47b7958732561d4b1ebe17dfc
Author: Vitaly Minko <vitaly.minko@gmail.com>
Date:   Fri Oct 22 20:58:57 2010 +0400

    Disable meaningless popup menu items in the contact menu (#573283).

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

commit d6fb6d85664ad4c56cddb7e07ffd49287fddb58a
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Fri Oct 22 14:57:47 2010 +0200

    Updated Spanish translation

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

commit a0570eb786037e9855a0a8a51aabc5c6130ad342
Merge: 45e2e34 2324b39
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 22 14:18:34 2010 +0200

    Merge remote branch 'vminko/fix-625780'

commit 45e2e349b685c33338ab3e60a64b038d0b22385a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 22 13:09:17 2010 +0200

    empathy.c: call g_application_hold() on the app

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

commit dd2c970a735a8099b00df7423cf8fe0dc8f4c473
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 22 13:07:46 2010 +0200

    GApplication is not a initable anymore

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

commit 7c8a06a7cd034f24df4c532533ef144cb87145ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 22 12:58:09 2010 +0200

    gtk_text_view_get_vadjustment() has been removed

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

commit d2f7a29078e2b351e1c52cc6db049808ae86ae1f
Author: Vitaly Minko <vitaly.mink@gmail.com>
Date:   Fri Oct 22 14:08:22 2010 +0200

    add a new popup-menu item in the chat window allowing to add words
    to dictionaries (#550775).

 libempathy-gtk/empathy-chat.c  |  134
 +++++++++++++++++++++++++++++++++++++++-
 libempathy-gtk/empathy-spell.c |   31 +++++++++-
 libempathy-gtk/empathy-spell.h |    2 +
 3 files changed, 165 insertions(+), 2 deletions(-)

commit 3c83182d654711d5f86b30ed8b7d3bf9af418d94
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Thu Oct 21 14:37:01 2010 -0700

    Port the a/v app to new G/tkApplication.

    Fixes bgo#632846.

 src/empathy-av.c |   41 +++++++++++++++++++----------------------
 1 files changed, 19 insertions(+), 22 deletions(-)

commit ca04b3480cf5a55767065324b29e5babb2039b37
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Thu Oct 21 14:31:23 2010 -0700

    Port the accounts dialog to new G/tkApplication.

    Helps bgo#632846.

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

commit 73c0679204bc2e268f866ca802772c3f6a26288c
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Thu Oct 21 14:27:23 2010 -0700

    Port the debugger to new G/tkApplication.

    Helps bgo#632846.

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

commit 29fd0970e4c60963117322c3d067b93fa9461293
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Thu Oct 21 14:22:16 2010 -0700

    Port core Empathy to new G/tkApplication.

    Helps bgo#632846.

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

commit 2324b39d322867c4ef583265cf7c5d840a72cb02
Author: Vitaly Minko <vitaly.minko@gmail.com>
Date:   Thu Oct 21 19:07:33 2010 +0400

    Return existing default chat window when it's hidden, just restore
    it in this case (#625780).

 src/empathy-chat-window.c |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

commit 063c4fb406eda4278493cc3ee24ad63a12b83996
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Thu Oct 21 12:05:58 2010 +0200

    Updated Spanish translation

 po/es.po |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

commit 92202b819168ac29193936540bf47137185052dc
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Thu Oct 21 13:20:58 2010 +1100

    Don't assume account will exist when accessing storage restrictions

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

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

commit eb798b30942ae008bde80decf023534111478919
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Wed Oct 20 23:46:01 2010 +0200

    Updated Hebrew translation.

 po/he.po |  274
 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 154 insertions(+), 120 deletions(-)

commit c9ee1b685ba3fa505914c7e1f9bb705ea88e5ff0
Author: Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>
Date:   Thu Oct 21 00:57:11 2010 +0900

    Updated Japanese translation

 po/ja.po |  295
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 148 insertions(+), 147 deletions(-)

commit 2d56a523190e64ae61d5ff470d2fe1b4ba357944
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:   Wed Oct 20 12:19:31 2010 +0200

    Updated comments translations

 help/hu/hu.po |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

commit d64a75e1138fb8f871589e7b3eb8285d4b92cdd5
Merge: 0b0bc2d ce75052
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Oct 20 11:02:25 2010 +0200

    Merge branch 'kill-dispatcher-632550'

commit ce75052d1555213bf6cdfd99a585e1edb9d86044
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Oct 20 09:08:55 2010 +0200

    use tp_asv_* and TP_PROP_*

 libempathy/empathy-ft-handler.c |   70
 +++++++++++++--------------------------
 1 files changed, 23 insertions(+), 47 deletions(-)

commit 0b0bc2d054b03840557339661af757083dc00850
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Wed Oct 20 09:10:19 2010 +0200

    Updated galician translations and help

 help/gl/gl.po |  108 ++++++++++++++++++++---
 po/gl.po      |  278
 ++++++++++++++++++++++++++++++++-------------------------
 2 files changed, 253 insertions(+), 133 deletions(-)

commit 225932c9e57331509eb15ac402af6020027fc08a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Oct 19 14:53:39 2010 +0200

    remove empathy_dispatcher_find_requestable_channel_classes_async
    (#632550)

 libempathy/empathy-dispatcher.c |  124
 ---------------------------------------
 libempathy/empathy-dispatcher.h |    6 --
 2 files changed, 0 insertions(+), 130 deletions(-)

commit e502bb48739f6d5b63dbee2c698b090928110400
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Oct 19 14:51:02 2010 +0200

    no more need to iterate twice over the channel classes

 libempathy/empathy-ft-handler.c |   74
 +++++++++++++++++---------------------
 1 files changed, 33 insertions(+), 41 deletions(-)

commit a360151f84ffc367ce9d749eacca3cde155649db
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Oct 19 14:42:41 2010 +0200

    empathy-ft-handler: re-implement
    empathy_dispatcher_find_requestable_channel_classes_async using
    TpCapabilities

 libempathy/empathy-ft-handler.c |   56
 ++++++++++++++++++++++++++++++++++----
 1 files changed, 50 insertions(+), 6 deletions(-)

commit cb265f95cc5ca492f8808be0ab81d70e8e77d843
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Oct 19 13:13:16 2010 +0200

    tp-chat: stop using EmpathyDispatcher to check if Conference is
    supported

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

commit 3e908f6ba9caefd06a6fbedb7dae55c3a71b9f44
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Oct 19 13:12:09 2010 +0200

    Ensure that the connection of the account passed to EmpathyTpChat
    has capabilities ready

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

commit 2bd0ca2b99c6c010e8c46865942e91ca755d4e4a
Author: Claude Paroz <claude@2xlibre.net>
Date:   Wed Oct 20 08:38:42 2010 +0200

    [help] Fix XML validity of French translation

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

commit 8909adc8fa36c39d26d21bc7e3c3065bb1b6b74d
Author: William Jon McCann <jmccann@redhat.com>
Date:   Tue Oct 12 02:15:51 2010 -0400

    Port to libnotify 0.7.0

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

 configure.ac              |    2 +-
 src/empathy-chat-window.c |    2 +-
 src/empathy-status-icon.c |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

commit 0ca576c2a57d4628328696b2803553d2de748c87
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Tue Oct 19 00:37:16 2010 +0200

    Updated Spanish translation

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

commit 4632bf414e157820e87f4ea22d4a73a84db843d5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 18 16:44:59 2010 +0200

    remove released flag

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