commit ee250be18179af8d60d26448c99711d5879e59b2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Apr 15 17:14:38 2015 +0200

    3.12.9

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

commit 7116e60319f81f010c56f0fe3d320a48806546ab
Author: Marek Černocký <marek@manet.cz>
Date:   Tue Apr 14 11:41:03 2015 +0200

    Updated Czech translation

 help/cs/cs.po | 140
 ++++++++++++++++++++--------------------------------------
 1 file changed, 49 insertions(+), 91 deletions(-)

commit 359c5f0994c4bd820ebd9a40f29816d1f7d96cf3
Author: Tom Tryfonidis <tomtryf@gmail.com>
Date:   Mon Apr 13 14:05:17 2015 +0300

    Updated Greek help translation

 help/el/el.po | 182
 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 87 insertions(+), 95 deletions(-)

commit edf8e1b9b21b058edaf832c93c17c2e92cb6bdb2
Author: Gábor Kelemen <kelemeng@openscope.org>
Date:   Sun Apr 12 09:08:26 2015 +0000

    Updated Hungarian translation

 help/hu/hu.po | 176
 +++++++++++++++++++++++++++-------------------------------
 1 file changed, 83 insertions(+), 93 deletions(-)

commit df4151e7258daf69b38379018f52a6b1c4edb834
Author: Petr Kovar <pkovar@redhat.com>
Date:   Fri Apr 10 18:18:04 2015 +0200

    help: Remove MSN & FB

    MSN is being deprecated, FB support has been removed.

 help/C/audio-video.page    | 18 ------------------
 help/C/create-account.page | 11 -----------
 help/C/introduction.page   |  2 +-
 help/C/link-contacts.page  |  6 +++---
 4 files changed, 4 insertions(+), 33 deletions(-)

commit d011952ad86433ff190a62a6f221b13bdfd12cf5
Author: Petr Kovar <pkovar@redhat.com>
Date:   Thu Apr 9 21:57:12 2015 +0200

    help: Remove MSN link

 help/C/create-account.page | 3 ---
 1 file changed, 3 deletions(-)

commit 872cb6d515bb0a7b590b7e0d8038525377732f78
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:   Wed Apr 8 20:17:52 2015 +0300

    [l10n] Updated Estonian translation

 po/et.po | 119
 +++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 77 insertions(+), 42 deletions(-)

commit fa7ff05827bbd1d8359422fceda547461cf0c617
Author: Gábor Kelemen <kelemeng@openscope.org>
Date:   Tue Apr 7 22:30:26 2015 +0000

    Updated Hungarian translation

 help/hu/hu.po | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

commit 7567d73f333e6de41ee534750b6d8732693a0259
Author: Ting-Wei Lan <lantw@src.gnome.org>
Date:   Sun Apr 5 23:45:43 2015 +0800

    trivial: Fix a wrong header guard

    This problem was caught by clang.

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

 libempathy-gtk/empathy-smiley-manager.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ece2e03a412c7517ae35020a6d0280915fa1caa1
Author: Marek Černocký <marek@manet.cz>
Date:   Thu Apr 2 22:01:30 2015 +0200

    Udated Czech translation

 help/cs/cs.po | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

commit df0409a3c262a8b3214df3d82edce7ab4b82281b
Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date:   Wed Apr 1 14:15:39 2015 +0200

    Fix typo in documentation

 help/C/index.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c10bbdcc3a0ac786bfb6a55e0c857270022a38f7
Author: Fabrice Bellet <fabrice@bellet.info>
Date:   Sun Mar 22 13:49:12 2015 +0100

    geoclue-helper: Provide a DesktopId

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

 configure.ac                            | 2 +-
 libempathy-gtk/empathy-geoclue-helper.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 6cf30c4c6c50d93efd4834523923eb4cfecefdc4
Author: Gábor Kelemen <kelemeng@openscope.org>
Date:   Sat Mar 21 00:16:36 2015 +0000

    Updated Hungarian translation

 help/hu/hu.po | 107
 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 53 insertions(+), 54 deletions(-)

commit 1e7b099a4dbff4f835308af38d6e33a7eae7a21e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Mar 16 10:03:48 2015 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 898ba346ceb2c8e3358bba97b9405cd7a9199de1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Mar 16 09:57:01 2015 +0100

    NEWS: explain why FB chat is going away

 NEWS | 3 +++
 1 file changed, 3 insertions(+)

commit 97012dbbc6c9bf4942e48f8a70d81e889ac58b8f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Mar 16 09:48:55 2015 +0100

    3.12.8

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

commit 29b956745586e58ce61cd66c1ebf48a625bb0ae7
Merge: 22a1f0d f815a6b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Mar 16 09:43:38 2015 +0100

    Merge remote-tracking branch 'micro/fix-build'

commit 22a1f0d6b93976416b8f4cdb0971d835e7d639c9
Author: Josef Andersson <josef.andersson@gmail.com>
Date:   Sun Mar 15 21:14:32 2015 +0000

    Updated Swedish translation

 po/sv.po | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

commit f815a6b963bcb7ed8ca2e2c24b66e1858f0e01a0
Author: Mirco Tischler <mt-ml@gmx.de>
Date:   Sun Mar 15 11:37:53 2015 +0100

    libempathy-gtk: fix uninitialized variable

    With -Werror this broke the build.

 libempathy-gtk/empathy-contact-chooser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 52a1a92ad5f32a7cfb87fc9f12ebaef546ace3a5
Author: Baurzhan Muftakhidinov <baurthefirst@gmail.com>
Date:   Sun Mar 15 03:32:29 2015 +0000

    Updated Kazakh translation

 po/kk.po | 117
 ++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 52 insertions(+), 65 deletions(-)

commit b4de3ce4ced25dc7afd9b918b0300e85f31cd1c3
Author: Samir Ribic <samir.ribic@etf.unsa.ba>
Date:   Fri Mar 13 20:27:05 2015 +0000

    Added Bosnian translation

 po/LINGUAS |    1 +
 po/bs.po   | 3665
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 3666 insertions(+)

commit 8cf2c6933763caf5653ede5b343e57f09f968cbd
Author: Debarshi Ray <debarshir@gnome.org>
Date:   Thu Mar 12 17:49:10 2015 +0100

    goa-mc-plugin: Remove Facebook chat using Jabber

    Facebook has dropped support for XMPP in version 2.0 of the Graph API.
    There is no known alternative for this.

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

 goa-mc-plugin/mcp-account-manager-goa.c | 13 -------------
 1 file changed, 13 deletions(-)

commit 721401310464a9238c652c994d92dd509e27b36c
Author: Efstathios Iosifidis <iefstathios@gmail.com>
Date:   Wed Mar 11 13:22:58 2015 +0000

    Updated Greek translation

 help/el/el.po | 79
 +++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 50 insertions(+), 29 deletions(-)

commit 298c2f0b4a63bc4bcacccbb60aad961363b91a40
Author: Benjamin Steinwender <b@stbe.at>
Date:   Tue Mar 10 21:04:22 2015 +0000

    Updated German translation

 po/de.po | 966
 +++++++++++++++++++++++++++------------------------------------
 1 file changed, 414 insertions(+), 552 deletions(-)

commit c9f2450e028eec117ceec687e04be108464a6877
Author: Baurzhan Muftakhidinov <baurthefirst@gmail.com>
Date:   Sun Mar 8 08:50:06 2015 +0000

    Updated Kazakh translation

 po/kk.po | 4339
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 2273 insertions(+), 2066 deletions(-)

commit 35685e0d4d1ee1b800f763f02941b6daea738926
Author: Andre Klapper <ak-47@gmx.net>
Date:   Mon Feb 16 01:07:40 2015 +0100

    Fix broken sk translation

 po/sk.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0d58ffa08cb4ae7c62b793a39879f28c47d9b91f
Author: Andre Klapper <ak-47@gmx.net>
Date:   Mon Feb 16 01:07:09 2015 +0100

    Fix broken nl translation

 po/nl.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ce4233950a4c04b4c2e186e980f1deb46a6c5d71
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Wed Feb 4 13:13:50 2015 +0100

    Updated Spanish translation

 help/es/es.po | 90
 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

commit 41fcfbe5bfcd33575975cac20b2dcaff871bc2d6
Author: Marek Černocký <marek@manet.cz>
Date:   Wed Feb 4 12:11:35 2015 +0100

    Updated Czech translation

 help/cs/cs.po | 69
 +++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 26 deletions(-)

commit bfbed98da971b55fe4f09987c5dad6bd5e66ad1d
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sat Aug 24 18:56:02 2013 -0500

    help: caution users about using Ignore SSL Errors

    Trusting the server is no reason to ignore SSL errors.  SSL is
    what you
    use to make sure you're talking to the server you trust

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

 help/C/account-jabber.page | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit 76d4b19f98a1a98bd7e3aeadc0ace6ba0364e4dc
Author: Josef Andersson <josef.andersson@gmail.com>
Date:   Sun Dec 28 11:18:58 2014 +0000

    Updated Swedish translation

 po/sv.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit bd41af28fbe6e77acc84f2b65c6a8788cfed5469
Author: Christian Kirbach <Christian.Kirbach@gmail.com>
Date:   Tue Dec 23 23:29:50 2014 +0000

    Updated German translation

 help/de/de.po | 2114
 ++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1257 insertions(+), 857 deletions(-)

commit 0ad631c610d8424b3b8c9b3977508efbe610f428
Author: Marek Černocký <marek@manet.cz>
Date:   Thu Nov 27 08:49:34 2014 +0100

    Updated Czech translation

 po/cs.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 759062feb26ab0a9bf791157cbc0154286b291a1
Author: Marek Černocký <marek@manet.cz>
Date:   Thu Nov 27 08:49:27 2014 +0100

    Updated Czech translation

 help/cs/cs.po | 231
 +++++++++++++++++++++-------------------------------------
 1 file changed, 85 insertions(+), 146 deletions(-)

commit bb73b5cfbc56cd3838d851e0819a6b880b76d5c2
Author: Tom Tryfonidis <tomtryf@gmail.com>
Date:   Tue Nov 18 08:35:46 2014 +0000

    Updated Greek translation

 help/el/el.po | 481
 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 232 insertions(+), 249 deletions(-)

commit ad5511a36cd88f773a6576cfcb9a86f53065697a
Author: Necdet Yücel <necdetyucel@gmail.com>
Date:   Mon Nov 17 07:36:55 2014 +0000

    Updated Turkish translation

 po/tr.po | 2881
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1315 insertions(+), 1566 deletions(-)

commit 4b85f42ba3b1a0deab2b02de5f6fa16d3d582d8e
Author: Erwin Poeze <donnut@look.com>
Date:   Tue Nov 11 17:52:44 2014 +0100

    Updated Dutch translation master

 po/nl.po | 4829
 +++++++++++++++++++++++++-------------------------------------
 1 file changed, 1917 insertions(+), 2912 deletions(-)

commit db7fe679424ee59189b7fbc03a8c5299eaf14baa
Author: Timo Jyrinki <timo@debian.org>
Date:   Mon Nov 3 18:52:19 2014 +0200

    Change Finnish translation team web page to l10n.gnome.org

 po/fi.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b6ad472f53d9415237de85e293b633ccfd6b567e
Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date:   Fri Oct 31 22:15:44 2014 +0000

    Updated Swedish translation

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

commit e9d2c81a48807965662c0102bd44cb3bd266f5e3
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Wed Oct 15 18:32:26 2014 +0200

    Updated Spanish translation

 help/es/es.po | 314
 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 158 insertions(+), 156 deletions(-)

commit fe562bde101e75f02436ace709c3a4b468ab27c3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Oct 14 10:45:00 2014 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4e2de14972a8d91642bfe6abd974cfb0dfc0d5dd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Oct 14 10:39:56 2014 +0200

    3.12.7

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

commit 43ce3f55ebed0e89d6a4ecab682818141bf23dc3
Author: Arash Mousavi <mousavi.arash@gmail.com>
Date:   Fri Oct 10 22:39:16 2014 +0330

    Updates Persian Translations

 po/fa.po | 681
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 351 insertions(+), 330 deletions(-)

commit 48e02ad33c00171447afa369b26a54a6a0cc0de5
Author: Gábor Kelemen <kelemeng@openscope.org>
Date:   Tue Oct 7 23:14:12 2014 +0000

    Updated Hungarian translation

 help/hu/hu.po | 2260
 ++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 1289 insertions(+), 971 deletions(-)

commit d0102a42b4aa656c37e84b4e139a9325e08d7180
Author: Ekaterina Gerasimova <kittykat3756@gmail.com>
Date:   Tue Oct 7 18:09:41 2014 +0100

    help: remove icon list for audio/video

 help/C/audio-video.page | 64
 +++++++------------------------------------------
 1 file changed, 9 insertions(+), 55 deletions(-)

commit 3b6777c7fcd24ef5d65feb327f9e32fb4929d738
Author: David King <amigadave@amigadave.com>
Date:   Tue Oct 7 11:21:17 2014 +0100

    help: Review add-account.page

    https://mail.gnome.org/archives/docs-feedback/2014-September/msg00046.html

 help/C/add-account.page | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

commit 2b28e310869b6bb823528d7ac1e12c179ac00f28
Author: Krasimir Chonov <mk2616@abv.bg>
Date:   Tue Oct 7 06:03:46 2014 +0300

    Updated Bulgarian translation

 po/bg.po | 2438
 ++++++++++++++++++++------------------------------------------
 1 file changed, 793 insertions(+), 1645 deletions(-)

commit dbd7ad7359ce7139fe25abda2bdf77b8c3eccf21
Author: Sebastian Rasmussen <sebras@gmail.com>
Date:   Wed Sep 24 14:49:17 2014 +0000

    Updated Swedish translation

 po/sv.po | 5569
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 2898 insertions(+), 2671 deletions(-)

commit da8ac61b86ff19453e3f1b5b9f6528da74a39e5e
Author: Saibal Ray <sray@redhat.com>
Date:   Wed Sep 24 07:50:28 2014 +0000

    Updated Bengali (India) translation

 po/bn_IN.po | 3088
 +++++++++++++++++++++++++++--------------------------------
 1 file changed, 1423 insertions(+), 1665 deletions(-)

commit 554d62683315136cefbb0c8b87fb4145d1da9352
Author: Krishnababu Krothapalli <k.meetme@gmail.com>
Date:   Tue Sep 23 14:25:03 2014 +0000

    Updated Telugu translation

 po/te.po | 719
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 390 insertions(+), 329 deletions(-)

commit 2a5f0a76cf61101377e57536138db5587b6648ef
Author: Rajesh Ranjan <rajeshkajha@yahoo.com>
Date:   Mon Sep 22 09:54:17 2014 +0000

    Updated Hindi translation

 po/hi.po | 2980
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 1368 insertions(+), 1612 deletions(-)

commit 5702bf6d1f842257d506dc59c566120a2715bc27
Author: Maria  Mavridou <mavridou@gmail.com>
Date:   Sun Sep 21 13:42:23 2014 +0000

    Updated Greek translation

 po/el.po | 631
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 317 insertions(+), 314 deletions(-)

commit b205da2b93de729d935a82cbb3460b92151b40f2
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Wed Sep 17 23:29:37 2014 +0200

    Updated Galician translations for docs

 help/gl/gl.po | 2825
 +++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1749 insertions(+), 1076 deletions(-)

commit 5654fc5297f7b298e16b0d043aa6304d64def77d
Author: Saibal Ray <sray@redhat.com>
Date:   Tue Sep 16 10:44:58 2014 +0000

    Updated Bengali (India) translation

 po/bn_IN.po | 5135
 +++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 3417 insertions(+), 1718 deletions(-)

commit 232f07c447e11e8c529f4a252cb64a726746f295
Author: Shantha kumar <shantha.thamizh@gmail.com>
Date:   Mon Sep 15 13:35:18 2014 +0000

    Updated Tamil translation

 po/ta.po | 536
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 259 insertions(+), 277 deletions(-)

commit 3599f9a7edc74854a8ae2a1b479bee98544f0220
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Sep 12 10:06:57 2014 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7c2d4386c9781ea0b1e485cc84ac098217a00191
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Sep 12 09:52:51 2014 +0200

    3.12.6

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

commit 05687495cc78fe906ebe760e0f1fccaffc768bb0
Author: Kevin Haller <kevin.haller@outofbits.com>
Date:   Thu Sep 11 22:56:37 2014 +0200

    Center the 'smiley images' inside the menu items

    Adds the #GtkImage widget to the menu item (act like #GtkBin) and
    sets the stylename 'empathy-smiley-menu-item'.

    The style of the menu item can be changed with CSS (empathy.css >
    .empathy-smiley-menu-item).

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

 data/empathy.css                        | 5 +++++
 libempathy-gtk/empathy-smiley-manager.c | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

commit 78a3728b67fc10a28084780247df60cfaa4837d2
Author: Sandeep Sheshrao Shedmake <sshedmak@redhat.com>
Date:   Fri Sep 12 09:40:43 2014 +0530

    Updated Marathi Translations

 po/mr.po | 2986
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1370 insertions(+), 1616 deletions(-)

commit f246db66a02efa6b0dd0c287f11b7bcc4f17a8a3
Author: Sweta Kothari <swkothar@redhat.com>
Date:   Thu Sep 11 11:29:13 2014 +0530

    Updated gujarati translations

 po/gu.po | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 0c3c443cbeeb94a5ded012a833c680e86356dfe1
Author: Manoj Kumar Giri <mgiri@redhat.com>
Date:   Wed Sep 10 08:21:19 2014 +0000

    Updated Oriya translation

 po/or.po | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

commit 14af451fd643644b2b2cdafa841e3dac8ecca84d
Author: Dušan Kazik <prescott66@gmail.com>
Date:   Tue Sep 9 13:36:18 2014 +0000

    Updated Slovak translation

 po/sk.po | 1026
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 495 insertions(+), 531 deletions(-)

commit 658c1c7a71f72ced70c3955d32023be87cfae5e4
Author: Ville-Pekka Vainio <vpvainio@iki.fi>
Date:   Sun Sep 7 13:26:04 2014 +0300

    Finnish translation update by Jiri Grönroos

 po/fi.po | 222
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 111 insertions(+), 111 deletions(-)

commit d661213874f15d86af40326e576deb142d55e2e6
Author: Changwoo Ryu <cwryu@debian.org>
Date:   Sat Sep 6 06:00:12 2014 +0900

    Updated Korean translation

 po/ko.po | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

commit 41b03a4aa6782c6345cd048b40344ae0cea2635e
Author: Shankar Prasad <prasad.mvs@gmail.com>
Date:   Thu Sep 4 16:55:45 2014 +0000

    Updated Kannada translation

 po/kn.po | 3181
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1460 insertions(+), 1721 deletions(-)

commit 5866c6a4589de69a3e7c82aecf78880e69df6b3a
Author: Sweta Kothari <swkothar@redhat.com>
Date:   Wed Sep 3 15:36:44 2014 +0530

    Updated gujarati translations

 po/gu.po | 2960
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1353 insertions(+), 1607 deletions(-)

commit c6cee47a6da4b09b42213dcd1d903979a0f54f57
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 28 13:31:44 2014 +0200

    don't pass a GError when first trying to start gnome-contacts

 libempathy-gtk/empathy-individual-information-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a8a060fb4022f07e60a7c7f97ea1591152cb89cf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 28 12:10:35 2014 +0200

    roster-window: fix crash if empathy_chatroom_manager_find() failed

    This function doesn't use/set a GError so we shouldn't try to use it.

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

commit 994c6fe2f4bb5f86204dea109821de3cd7d611ad
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 28 11:13:27 2014 +0200

    update gnome-contacts's desktop file

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

 libempathy-gtk/empathy-individual-information-dialog.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 39a9e7b9ec898ef699086505ce6734a5f0edd309
Author: Manoj Kumar Giri <mgiri@redhat.com>
Date:   Tue Aug 26 14:49:09 2014 +0000

    Updated Oriya translation

 po/or.po | 2985
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1363 insertions(+), 1622 deletions(-)

commit df839f860ea720c79878b50cbbc1018fa7e8bccb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 20 15:04:01 2014 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fa90da82bb1eedc545f1189d4bbf5bb93d9fe3a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 20 14:53:12 2014 +0200

    3.12.5

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

commit 392dd5d417c8efc71cb986685f21c733f8a6a622
Author: Christian Kirbach <christian.kirbach@gmail.com>
Date:   Fri Aug 15 17:53:18 2014 +0200

    Updated German translation

 po/de.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 574d65ff37d4f76afc288400e7cab471e93b9f3b
Author: Frédéric Péters <fpeters@0d.be>
Date:   Wed Jul 9 14:46:39 2014 +0200

    libempathy-gtk: chain GtkCombobox subclass constructors to parent

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

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

commit e134dd342599ea69bdca19ac7ca27f5ecd1fd634
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Thu Jul 31 17:32:23 2014 +0200

    doap: add <programming-language>

 empathy.doap | 1 +
 1 file changed, 1 insertion(+)

commit 81f1a15c6a6d3967d0bcd56e088429b93655b4d3
Author: Olav Vitters <olav@vitters.nl>
Date:   Wed Jul 30 19:42:39 2014 +0200

    doap category core-apps

 empathy.doap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5ca828f6f67868745a697c755360caf333835836
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jun 23 18:21:54 2014 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0eee2312758104f3b9b04753a358d82aa96a28a7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jun 23 18:15:38 2014 +0200

    3.12.4

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

commit 8ac7209da2305762f9ef2c711c555afb19e85b62
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jun 23 15:35:03 2014 +0200

    individual-menu: stop creating single_individual

    This code was always pretty hacky and created loads of nasty bugs
    so I'm glad
    to get rid of it.

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

 libempathy-gtk/empathy-individual-menu.c | 10 ----------
 1 file changed, 10 deletions(-)

commit a2a7b6ecc313022e4e0904651ba4b27ae83ca293
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jun 23 15:33:11 2014 +0200

    individual-menu: remove 'block' item from personas sub menus

    Blocking a specific persona from an individual is a very uncommon
    operation.
    Either you want to block the full individual or the personas
    shouldn't be
    linked together.
    There is not much point cluttering the menu with it.

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

 libempathy-gtk/empathy-individual-menu.c | 14 --------------
 1 file changed, 14 deletions(-)

commit 1f9230409b3e8bdba369a994102b53a9e591ba6e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jun 23 15:10:17 2014 +0200

    individual-menu: use the proper persona in submenus

    'single_individual' uses to be a FolksIndivudal containing a single
    persona
    (the one from the submenu) ensuring that operations (chat, call,
    etc) were
    performed on this very persona.

    But we broke this in 0909d1f884c4542553d98b18e7622664d2a02169 by
    replacing the
    empathy_create_individual_from_tp_contact() call by
    empathy_ensure_individual_from_tp_contact() as the same individuals
    (the one
    will all the personas) was now used in all the sub menus.

    Fixing this by introducing 'contact' variant of the menu_item_new
    methods
    which is always cleaner.

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

 libempathy-gtk/empathy-individual-menu.c | 155
 +++++++++++++++++++++++++++++--
 1 file changed, 146 insertions(+), 9 deletions(-)

commit ad1b40b1d31b4c612a94736f27072baab4ac1364
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jun 23 14:54:09 2014 +0200

    individual-menu: factor out some item_new() code

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

 libempathy-gtk/empathy-individual-menu.c | 158
 +++++++++++++++++++++++--------
 1 file changed, 121 insertions(+), 37 deletions(-)

commit 8a91bd6aa01f46742c11b22c7d404c9f6d56b7a9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jun 23 14:39:28 2014 +0200

    individual-menu: rename menu_item_new functions

    - Remove the namespace prefix for static functions
    - Add 'individual' suffix

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

 libempathy-gtk/empathy-individual-menu.c | 114
 ++++++++++++++-----------------
 libempathy-gtk/empathy-individual-menu.h |   4 +-
 libempathy-gtk/empathy-individual-view.c |   6 +-
 3 files changed, 59 insertions(+), 65 deletions(-)

commit d53111417536194edd8bfd66f98630416de72e50
Author: Giovanni Campagna <gcampagna@src.gnome.org>
Date:   Fri Jan 10 11:03:28 2014 +0100

    EmpathySmileyManager: use the proper Unicode characters

    For emoticons that are part of the freedesktop icon spec and of
    Unicode 6.3, recognize the character and replace it with the icon.
    Also, prefer the unicode character to the older ASCII encoding.
    This ensures the maximum compatibility with Hangouts, and also
    looks nice on iOS/Android.

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

 libempathy-gtk/empathy-smiley-manager.c | 69
 ++++++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 23 deletions(-)

commit 1d7db6929a00bf0fc87be40e3a9628ff6bed473a
Author: Giovanni Campagna <gcampagna@src.gnome.org>
Date:   Mon Jan 28 10:21:49 2013 +0100

    Be more compatible with Facebook emoticon codes

    Since we support Facebook chat, and interoperate with the chat
    from the
    browser, we need to support roughly the same emoticon codes.

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

 libempathy-gtk/empathy-smiley-manager.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 1460786fe3362c7b33a3f37f8f353e391e267566
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jun 11 14:02:28 2014 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 99a7002f326e5210852c0be25b7d0ff9c93f7db2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jun 11 13:45:59 2014 +0200

    3.12.3

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

commit e8316b6de102ebcc818989c10ac2801ad12a196e
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:   Tue Jun 3 15:13:54 2014 +0200

    goa-mc-plugin: Remove Windows Live chat using Jabber

    Microsoft has been planning to drop Windows Live Messenger in
    favour of
    Skype for quite some time now. The XMPP gateway that we used does not
    work anymore. However, you can continue using the proprietary MSN
    protocol.

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

 goa-mc-plugin/mcp-account-manager-goa.c | 13 -------------
 1 file changed, 13 deletions(-)

commit 6598a3c9d90ce78fd2fd641ca552840742756dfb
Author: Juan A. Suarez Romero <jasuarez@igalia.com>
Date:   Thu Mar 20 15:04:53 2014 +0000

    Add missing textdomain() call

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

 src/empathy-accounts.c | 1 +
 1 file changed, 1 insertion(+)

commit 49a243cad6305982770295dae06db6a2a74309f4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed May 14 10:12:23 2014 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9c08470223a2f42956e34b5f34f95acd8b2ce076
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed May 14 10:04:00 2014 +0200

    3.12.2

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

commit 27e5ea6576bb953663d738838e1d21228ca8483b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed May 14 10:02:17 2014 +0200

    telepathy-account-widgets: update

 telepathy-account-widgets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0d1aa34131c115f7af4aaf838e66700bdd0b17c5
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:   Fri May 9 00:30:18 2014 +0200

    [l10n] Updated Catalan (Valencian) translation

 po/ca@valencia.po | 644
 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 340 insertions(+), 304 deletions(-)

commit 7023cbdb67789733af78d29328203ecc8f9ba86d
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Thu May 8 20:59:23 2014 +0200

    Updated Spanish Translation

 po/es.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2f0809f96025b0138e26935ba0e089faacac4a4a
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Thu May 8 19:58:03 2014 +0200

    Updated Spanish Translation

 po/es.po | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 247a87515b6d2380f06ab4fbc2c7d31869c0d5cc
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:   Sun May 4 21:16:16 2014 +0200

    Updated Belarusian translation.

 po/be.po | 590
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 287 insertions(+), 303 deletions(-)

commit 556ab98d090c29a2a3b9f094d25eb80f1acf6d2c
Author: Daniel Șerbănescu <cyber19rider@gmail.com>
Date:   Wed Apr 23 21:39:44 2014 +0200

    Updated Romanian Translation

 po/ro.po | 6826
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 3333 insertions(+), 3493 deletions(-)

commit 3483e7f97ed6d20427672fe68ef03a36ddedda47
Author: Xavier Claessens <xavier.claessens@collabora.com>
Date:   Tue Apr 22 14:33:03 2014 -0400

    EmpathyChat: Fix pending messages not being displayed

    We don't have to wait for backlog to be inserted before adding
    pending messages anymore since backlog are prepended in the view.

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

 libempathy-gtk/empathy-chat.c | 37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

commit bed9eb7d447239ff4400b3c976e58b657fa4a08e
Author: Dirgita <dirgitadevina@gmail.com>
Date:   Wed Apr 23 09:45:30 2014 +0000

    Updated Indonesian translation

 po/id.po | 483
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 240 insertions(+), 243 deletions(-)

commit dd2380c0dcd2219108c308f85a0db8bae296ba73
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Tue Apr 15 14:16:10 2014 +0200

    Updated Spanish translation

 help/es/es.po | 1786
 +++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1107 insertions(+), 679 deletions(-)

commit dbeacaafeb80ed0cb773d20ad6c31886c6a94e35
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Apr 14 16:37:00 2014 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 460d0eafa4c585907795d26155ab05315863561b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Apr 14 16:30:54 2014 +0200

    3.12.1

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

commit 9de04c34266010d3a5fd833552d20190833b927e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Apr 14 16:30:34 2014 +0200

    release.py: update last_tag_pattern

 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 14411be8f985fbbb3778d1ba11e960c9831db1aa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Apr 14 16:29:14 2014 +0200

    telepathy-account-widgets: update

 telepathy-account-widgets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e7edc15b11a0a5dde7961be50fb1848ca3a718d0
Author: Yuri Myasoedov <ymyasoedov@yandex.ru>
Date:   Wed Apr 9 00:14:57 2014 +0400

    Fixed Russian translation

 po/ru.po | 67
 ++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

commit 898b06fe186f2b1e15c7c0fc43a2042db58e1bf1
Author: Christian Kirbach <christian.kirbach@gmail.com>
Date:   Sat Apr 5 22:19:15 2014 +0200

    Updated German translation

 po/de.po | 584
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 291 insertions(+), 293 deletions(-)

commit 7c157b3b3d14ea9d648cb7d80c4c89a59c3e590a
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Sun Mar 30 19:05:21 2014 +0200

    doap: update URLs

 empathy.doap | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 35ddfed09cfb7d36fe68425407847c8a63f1a5e4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Mar 24 16:15:58 2014 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a3e844ffb8fa971ace5cc41842e4a7895221a0ac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Mar 24 16:05:58 2014 +0100

    3.12.0

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

commit c1bb0f0f74b79bdb90870664bfeadab1649d97fa
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date:   Sun Mar 23 19:17:48 2014 +0100

    Updated Danish translation

 po/da.po | 949
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 492 insertions(+), 457 deletions(-)

commit 942f50c2d7e029d2e88ab8175f694c75fe0a8c90
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:   Sat Mar 22 16:25:33 2014 +0100

    Updated Basque language

 po/eu.po | 951
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 495 insertions(+), 456 deletions(-)

commit 922d19b53585a9dcca9c4675ddccec93aa827829
Author: A S Alam <apreet.alam@gmail.com>
Date:   Wed Mar 19 15:44:20 2014 -0500

    update Punjabi Translation 19March2014: Alam

 po/pa.po | 597
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 294 insertions(+), 303 deletions(-)

commit 8a982ebe47a2f62c932b12b5f3973b7a9f98cca6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Mar 17 14:03:08 2014 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8f9bae7982a29f4c150973e87d28bd0a595fde1a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Mar 17 13:58:31 2014 +0100

    3.11.92

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

commit 30bf2244e4c9de614a13bf6d7a7e60f520bd6098
Author: Marek Černocký <marek@manet.cz>
Date:   Mon Mar 17 08:41:31 2014 +0100

    Updated Czech translation

 help/cs/cs.po | 1586
 +++++++++++++++++++--------------------------------------
 1 file changed, 528 insertions(+), 1058 deletions(-)

commit f3da6a42222c3da9bad3dad37bdefb1c3c6761c2
Author: Ville-Pekka Vainio <vpvainio@iki.fi>
Date:   Sun Mar 16 20:32:00 2014 +0200

    Finnish translation update by Jiri Grönroos

 po/fi.po | 969
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 490 insertions(+), 479 deletions(-)

commit 8bc003cd4503e82ff8e16a29469942cc5a7d70b1
Author: Frédéric Péters <fpeters@0d.be>
Date:   Sun Mar 16 12:25:57 2014 +0000

    Updated French translation

 po/fr.po | 951
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 493 insertions(+), 458 deletions(-)

commit afa9a2f98293b458b9150bef2d806fdaac02dca2
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:   Sun Mar 16 09:13:11 2014 +0100

    Updated Serbian translation

 po/sr.po       | 575
 ++++++++++++++++++++++++++++-----------------------------
 po/sr@latin.po | 575
 ++++++++++++++++++++++++++++-----------------------------
 2 files changed, 574 insertions(+), 576 deletions(-)

commit 4259216b355f15e7c5cb1d98aaefc79c6f79e23a
Author: Tiagosdot <almosthumane@portugalmail.pt>
Date:   Tue Mar 11 22:41:16 2014 +0000

    Updated Portuguese translation

 po/pt.po | 577
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 309 insertions(+), 268 deletions(-)

commit 88c3f14bcd0deb75279da3048ae27bd986f46f59
Author: Tomáš Karger <tomkarger@gmail.com>
Date:   Tue Mar 11 17:51:46 2014 +0100

    Updated Czech translation

 help/cs/cs.po | 4904
 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 3933 insertions(+), 971 deletions(-)

commit 0ffe41a31e0c173e7b19f6f82abafec544792edf
Author: Yuri Myasoedov <ymyasoedov@yandex.ru>
Date:   Tue Mar 11 20:48:17 2014 +0400

    Updated Russian translation

 po/ru.po | 577
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 288 insertions(+), 289 deletions(-)

commit 6584664d2606918634c372fbe08c73854d8ce4a9
Author: Paweł Żołnowski <pawel@zolnowski.name>
Date:   Mon Mar 10 17:11:59 2014 +0100

    Updated Polish translation

 po/pl.po | 575
 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 267 insertions(+), 308 deletions(-)

commit b877f9cad0e9d7cfcfcebaaf33dc39b427e61e38
Author: Marek Černocký <marek@manet.cz>
Date:   Sun Mar 9 11:02:57 2014 +0100

    Updated Czech translation

 po/cs.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1fcceb631927cd7a7866d5e9670c24ad473baec9
Author: Marek Černocký <marek@manet.cz>
Date:   Sat Mar 8 20:40:34 2014 +0100

    Updated Czech translation

 po/cs.po | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

commit 49234e48052ae4f93748d04c1004c23703052617
Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
Date:   Sat Mar 8 15:28:29 2014 +0200

    Updated Latvian translation

 po/lv.po | 617
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 307 insertions(+), 310 deletions(-)

commit f11a97f4f89173c6c6554c176fc783f7908d0397
Author: Changwoo Ryu <cwryu@debian.org>
Date:   Thu Mar 6 23:33:26 2014 +0900

    Updated Korean translation

 po/ko.po | 897
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 443 insertions(+), 454 deletions(-)

commit ea9c2d80377d256ed1021f3cab46ae027cebc69e
Author: Pau Iranzo <paugnu@gmail.com>
Date:   Thu Mar 6 00:38:59 2014 +0100

    [l10n] Update Catalan translation

 po/ca.po | 956
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 496 insertions(+), 460 deletions(-)

commit 0d49f10adc35bfdb127ced50132678da4bcbb477
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Wed Mar 5 07:11:24 2014 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 172
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 86 insertions(+), 86 deletions(-)

commit 698b4b63cb2678256448f58fb830b27c5fc6cc07
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Mar 3 15:11:27 2014 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5d3b35a68ae8074f3b383959b9a48650391ec2b8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Mar 3 15:04:41 2014 +0100

    3.11.91

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

commit 285239d678d01e5fdf500817d206efad52f82e85
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Mar 3 15:01:35 2014 +0100

    telepathy-account-widgets: update to master

 telepathy-account-widgets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8d7b620729e05462e2f03eeaf1b3689305b0ba32
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 25 17:33:56 2014 +0100

    use TpAccountChannelRequest Conference high level API

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

 libempathy/empathy-tp-chat.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

commit c6613010ca396821df9923b3a3a88f6709a636b9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 25 17:31:40 2014 +0100

    tp-chat: stop setting TargetHandleType: None

    It's now down automatically by TpAccountChannelRequest.

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

 libempathy/empathy-tp-chat.c | 4 ----
 1 file changed, 4 deletions(-)

commit ba5187f04923631b7d7b1d770577d60292ea7c07
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 25 17:31:27 2014 +0100

    use tp_account_channel_request_set_sms_channel()

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

 libempathy/empathy-request-util.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit d91d34838448da5145035e3715db743d08e0761d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 25 17:30:31 2014 +0100

    use tp_account_channel_request_set_file_transfer_hash()

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

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

commit 05277804298243cba14676f60e8e0e771821ab86
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 25 17:28:30 2014 +0100

    use tp_account_channel_request_new_stream_tube()

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

 libempathy-gtk/empathy-share-my-desktop.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

commit 96d54005b3a7f81f7f4320e5e074c1042a914576
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 25 17:28:20 2014 +0100

    bump tp-glib dep

    Needed for newer TpAccountChannelRequest API.

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

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

commit a8fc1ca2f2f72041e74d4507e5a4809e6d34cd31
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Feb 24 15:05:15 2014 +0100

    ft-handler: use TpAccountChannelRequest higher level API

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

 libempathy/empathy-ft-handler.c | 60
 ++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 40 deletions(-)

commit 7bc22f4ce28451115bbb92d760cb52316bdb6775
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Feb 24 15:05:15 2014 +0100

    tp-chat: use TpAccountChannelRequest higher level API

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

 libempathy/empathy-tp-chat.c | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

commit dba59427329cbf16ea0c976057045d7d1b1efd88
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Feb 24 15:05:15 2014 +0100

    request-util: use TpAccountChannelRequest higher level API

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

 libempathy/empathy-request-util.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

commit 4bf3c0df71c73abfe6a8d4ad3b55fd7baf592bb1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Feb 24 15:59:55 2014 +0100

    share-my-desktop: use tp_account_channel_request_set_target_contact()

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

 libempathy-gtk/empathy-share-my-desktop.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit a58c33ecd0e4cc738a7495477d53ae3aa8aa00a6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Feb 24 15:59:42 2014 +0100

    empathy-chat: use tp_account_channel_request_new_text()

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

 libempathy-gtk/empathy-chat.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

commit 25f83bd5627ab9812cd1e402863079b7b7fe368f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Feb 24 15:05:15 2014 +0100

    call-utils: use TpAccountChannelRequest higher level API

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

 libempathy-gtk/empathy-call-utils.c | 53
 +++++++++++++++----------------------
 libempathy-gtk/empathy-call-utils.h |  6 +++--
 src/empathy-call-handler.c          |  7 ++---
 3 files changed, 28 insertions(+), 38 deletions(-)

commit 6a1fee5ce2917c193e82288ddc9788d1192fbb84
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Feb 24 14:46:18 2014 +0100

    call-handler: remove 'initial-audio' prop

    It was always set to TRUE anyway.

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

 src/empathy-call-handler.c | 15 ---------------
 1 file changed, 15 deletions(-)

commit 1fd36e1e67a9c6cc3b0be6250809424045e56d20
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Feb 24 14:33:55 2014 +0100

    empathy_call_new_with_streams: remove initial_audio arg

    We always pass TRUE.

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

 libempathy-gtk/empathy-call-utils.c      | 13 ++++---------
 libempathy-gtk/empathy-call-utils.h      |  2 --
 libempathy-gtk/empathy-individual-menu.c |  8 +++-----
 libempathy-gtk/empathy-log-window.c      |  2 +-
 libempathy-gtk/empathy-new-call-dialog.c |  2 +-
 src/empathy-call-handler.c               |  3 +--
 6 files changed, 10 insertions(+), 20 deletions(-)

commit 912bbee404f948ae85d8c5705857b7dde0595ea0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Feb 24 14:31:10 2014 +0100

    call-utils: inline call_new_with_streams()

    We no longer support fallbacking to StreamedMedia so there is no
    point keeping
    this static function.

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

 libempathy-gtk/empathy-call-utils.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

commit 69becc7294ec42d528ec30abd43c2c5124f01ab9
Author: Aurimas Černius <aurisc4@gmail.com>
Date:   Mon Feb 24 23:32:24 2014 +0200

    Updated Lithuanian translation

 po/lt.po | 496
 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 228 insertions(+), 268 deletions(-)

commit 0ef34eea7f5e8d126903d65d190fdd2b3fe5ff80
Author: Robert Ancell <robert.ancell@canonical.com>
Date:   Wed Feb 19 19:29:22 2014 +1300

    Use new name of Ubuntu Online Accounts panel.

    Since migrating to unity-control-center the name for the credentials
    panel has changed. Use this new name.

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

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

commit 523fae52e96c033d90cc11e9b3f447a4f7da952d
Author: Balázs Úr <urbalazs@src.gnome.org>
Date:   Sun Feb 23 16:43:31 2014 +0100

    Updated Hungarian translation

 po/hu.po | 542
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 269 insertions(+), 273 deletions(-)

commit c711e4fb1f34a7eff947c7cd056f6ce5b6a5f46e
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Wed Feb 19 20:32:48 2014 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 347
 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 157 insertions(+), 190 deletions(-)

commit 27a951b3c4b730451561dc028b203cbe16699847
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Feb 17 10:53:46 2014 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6b63b922ffce038d67c3806bf8e1e294d3d50f4a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Feb 17 10:45:14 2014 +0100

    add Chat_Manager.xml to EXTRA_DIST

 src/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 1274e1e7ec0d7eada5b5725ddb711776cf43e95f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Feb 17 10:34:21 2014 +0100

    3.11.90

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

commit e0106b3e929b7c4ab37daa8b4838eb6e3bdb8562
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Feb 12 16:15:11 2014 +0100

    configure: Nautilus sendto plugin has been removed

 configure.ac | 1 -
 1 file changed, 1 deletion(-)

commit 98f90419c27a362d34b4ef2f05f42e658f92e5fc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Feb 7 10:10:54 2014 +0100

    extensions: remove Chat_Manager.xml

    We use GDBus now.

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

 extensions/Chat_Manager.xml | 36 ------------------------------------
 extensions/Makefile.am      |  1 -
 extensions/misc.xml         |  1 -
 3 files changed, 38 deletions(-)

commit 710247a3cbb18bd06a2f8408e0705eb74ebd036c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Feb 6 13:12:45 2014 +0100

    chat-mgr: use GDBus service API

    We have now to use the GtkApplication bus name when calling the
    method as GBus
    uses this bus name and not the Telepathy one which is used by
    dbus-glib.

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

 src/empathy-chat-manager.c | 55
 +++++++++++++++++++++++++---------------------
 src/empathy-chat-manager.h |  5 +++--
 2 files changed, 33 insertions(+), 27 deletions(-)

commit b941bce456bf366afcaf3304d13b9d797770b5b5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Feb 6 12:08:45 2014 +0100

    chat-mgr: Use GDBus client side API

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

 src/Makefile.am            |  2 ++
 src/empathy-chat-manager.c | 66
 +++++++++++++++++++++++++++++++++++-----------
 2 files changed, 52 insertions(+), 16 deletions(-)

commit f5c313c887e0fa9faca7a05165e7b6df25761917
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Feb 6 11:41:52 2014 +0100

    generate GDBus API for the chat manager

    Plan is to get rid of our own code gen system in next.

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

 src/.gitignore       |  2 ++
 src/Chat_Manager.xml | 36 ++++++++++++++++++++++++++++++++++++
 src/Makefile.am      | 10 ++++++++++
 3 files changed, 48 insertions(+)

commit 941b6fa8304c1cc678b08520fa19284aa72d1345
Author: Daniel Korostil <ted.korostiled@gmail.com>
Date:   Tue Feb 11 23:31:02 2014 +0200

    Updated Ukrainian translation

 po/uk.po | 957
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 498 insertions(+), 459 deletions(-)

commit cee3345378c311a0368c430fff7fd9a2c96b248c
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   Wed Feb 5 18:35:34 2014 +0000

    GOA plugin: implement both MC 5.16 and MC 5.18 APIs

 goa-mc-plugin/mcp-account-manager-goa.c | 403
 ++++++++++++++++++++++++++++----
 1 file changed, 364 insertions(+), 39 deletions(-)

commit e967f59e2207021bb84880ac26ae487478cba019
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   Mon Jan 27 18:41:49 2014 +0000

    GOA plugin: use signal-emission helpers

 goa-mc-plugin/mcp-account-manager-goa.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit e5995a21713cb333285f8a4bf5a612e11f6e271a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Feb 6 14:58:51 2014 +0100

    add empathy-bus-names.h

    It's convenient to have a single file containing all the D-Bus names
    so a
    component can easily call a method on another one.

    Also rename from DBUS_NAME to BUS_NAME to stay coherent with the
    TP_BUS_NAME.

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

 libempathy/Makefile.am         |  1 +
 libempathy/empathy-bus-names.h | 29 +++++++++++++++++++++++++++++
 src/empathy-accounts.c         |  5 ++---
 src/empathy-call.c             |  5 ++---
 src/empathy-chat.c             |  5 ++---
 src/empathy-debugger.c         |  5 ++---
 src/empathy.c                  |  5 ++---
 7 files changed, 40 insertions(+), 15 deletions(-)

commit 983d1b03fa252ea5743d58f290ab70be8fa8c291
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Feb 6 15:06:37 2014 +0100

    prefix Telepathy bus names with TP_

    So it's clearer that we are referring the Telepathy bus name and
    not the
    GtkApplication one.

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

 libempathy-gtk/empathy-call-utils.c |  2 +-
 libempathy-gtk/empathy-chat.c       |  2 +-
 libempathy/empathy-ft-factory.c     |  2 +-
 libempathy/empathy-request-util.c   |  5 +++--
 libempathy/empathy-request-util.h   | 12 ++++++------
 libempathy/empathy-tp-chat.c        |  2 +-
 src/empathy-call-factory.c          |  2 +-
 src/empathy-call-window.c           |  2 +-
 src/empathy-chat-manager.c          |  4 ++--
 9 files changed, 17 insertions(+), 16 deletions(-)

commit 21674ad377f646ef1e242f7e4260ee2398a220be
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Feb 6 14:48:57 2014 +0100

    chat-manager: define CHAT_MANAGER_PATH

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

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

commit b3931621477caaf971d83bc3753c39493a2bb0dd
Author: Jorge Pérez Pérez <jorgtum@gmail.com>
Date:   Wed Feb 5 18:32:12 2014 +0100

    Updated Aragonese translation

 po/an.po | 3454
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1715 insertions(+), 1739 deletions(-)

commit 9cfe2fdfe9441fb783396fa46f5e2767d887e8a6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Feb 5 16:45:39 2014 +0100

    audio-src: use gst 1.0 caps format

 src/empathy-audio-src.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c4ebbe6b043f60ae0075836027270fc819411a9e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Feb 3 19:16:51 2014 +0100

    debug-window: disable Debug on all proxies when exiting

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

 src/empathy-debug-window.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

commit e4d1698671dfede8f2ffae8f639d223c1c9c3959
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Feb 3 18:29:41 2014 +0100

    debug-window: fix leak on all TpDebugClient

    The store keeps its own ref and the client is reffed while the async
    call so
    we can unref it right away.

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

 src/empathy-debug-window.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit d646a882bc484bb0b0c839bbecda53fd15ba7af9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Feb 3 18:23:07 2014 +0100

    debug-window: fix proxy leak

    gtk_list_store_get() gives us a new ref.

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

 src/empathy-debug-window.c | 2 ++
 1 file changed, 2 insertions(+)

commit 7c86586442819aa47a4672671211d31cb8e2461a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Feb 3 19:02:12 2014 +0100

    debug-window: prevent using the store when disposing

    Using g_signal_connect_object() isn't enought as it prevents from
    calling the
    callback when the windows has been destroyed but not while disposing
    it.

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

 src/empathy-debug-window.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 853493de898bef9428e1188ba8c07eb9915c977a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Feb 3 18:18:49 2014 +0100

    debug-window: prevent proxy_invalidated_cb to be called after dispose

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

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

commit 7106b92ef5c6fcb7b3d46f0de600bf73fb4e9555
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Feb 5 13:53:28 2014 +0100

    remove INSTALL

    It's generated by autogen.

 .gitignore | 1 +
 INSTALL    | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

commit f468afa9675ccbfbecb6cc5de1609783f9b9c136
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 4 13:42:08 2014 +0100

    Renaming: use tp-glib API instead of generating it as an extension

 extensions/Connection_Interface_Renaming.xml | 98
 ----------------------------
 extensions/Makefile.am                       |  1 -
 extensions/misc.xml                          |  1 -
 libempathy-gtk/empathy-chat.c                | 11 ++--
 4 files changed, 5 insertions(+), 106 deletions(-)

commit 19298a84cb67fc761b93b8eeb1d82b952932cf25
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 4 13:38:43 2014 +0100

    depend on tp-glib 0.23.0

    Needed for Renaming API.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0b7605b100b04719c8b8fc3fd3eea854d57b9978
Author: Shankar Prasad <prasad.mvs@gmail.com>
Date:   Mon Feb 3 18:07:21 2014 +0530

    updated kn.po

 po/kn.po | 2283
 +++++++++++++++++++++++---------------------------------------
 1 file changed, 833 insertions(+), 1450 deletions(-)

commit 896d0dd1e918cc369ac37296a351a01ced9be00a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Feb 3 12:04:59 2014 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c05fe49ca4c3f2ad444339ebe75dfcfde4a0d779
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Feb 3 12:00:15 2014 +0100

    3.11.5

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

commit e3b9f2165d0f0b0e64332c8a0643a92453f4e217
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Dec 15 15:51:27 2010 +0000

    Set the license type instead of the license text.

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

 src/empathy-about-dialog.c | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

commit b3bac91e0d137e541802313031bbf16e58261eca
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:   Tue Jan 28 20:15:05 2014 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 727
 +++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 734
 ++++++++++++++++++++++++++++++++----------------------------
 2 files changed, 765 insertions(+), 696 deletions(-)

commit 367cb0a23315c4025be0b5f0a9fdf87b0830b0e3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jan 27 13:06:02 2014 +0100

    event-manager: remove HandleWith() fallback

    Mission-control 5.5.0 has been released 3.5 years ago...

 src/empathy-event-manager.c | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

commit b9f326caa4fb29fbd7d3e8d31897da1e35815273
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jan 27 13:03:13 2014 +0100

    call-window: use HandleWithTime()

    Makes transition to next easier as HandleWith() is going to always
    have the
    'time' argument.

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

commit 6fbee4087b38af7aa9b3e9db445ffd53f4fb9f52
Author: Yosef Or Boczko <yoseforb@src.gnome.org>
Date:   Sun Jan 26 01:02:20 2014 +0200

    Updated Hebrew translation

 po/he.po | 855
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 442 insertions(+), 413 deletions(-)

commit ad1ecbc08c9965f72a12f6b46ca447823ffbc4a7
Author: Nilamdyuti Goswami <ngoswami@redhat.com>
Date:   Wed Jan 22 20:47:12 2014 +0530

    Assamese translation updated

 po/as.po | 783
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 407 insertions(+), 376 deletions(-)

commit 7937dcc5d61fab1895bb2de6387874258a671d2f
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Tue Jan 21 21:11:57 2014 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 358
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 175 insertions(+), 183 deletions(-)

commit 3a92e88e0e56da488a221c5ae7b248ed8c80df2f
Author: Victor Ibragimov <victor.ibragimov@gmail.com>
Date:   Tue Jan 21 16:04:50 2014 +0500

    Tajik translation updated

 po/tg.po | 4334
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 2150 insertions(+), 2184 deletions(-)

commit 545390cb46575edecf2c3fb74ebe42c554a0709b
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Mon Jan 20 21:36:39 2014 +0100

    Updated Slovenian translation

 po/sl.po | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit 8bd9e8665c3e566302b7bbfa0c59aad042b8d7a7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jan 20 16:00:43 2014 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f97b8a29540f34a9cc8378634f9b4670d44c2124
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jan 20 15:54:50 2014 +0100

    3.11.4

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

commit 996f54e4a847489c625c6a813c76f0d5644ae042
Author: Wylmer Wang <wantinghard@gmail.com>
Date:   Sun Jan 19 09:50:17 2014 +0800

    Revert "Update Chinese simplified translation"

    This reverts commit f43358a4cf5228790dd4b1a03aae74730228e417.

 po/zh_CN.po | 7145
 ++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 4351 insertions(+), 2794 deletions(-)

commit a7d85669976bf2343ea3c420263582c048fc562a
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Sat Jan 18 14:13:25 2014 +0100

    Add a trailing semicolon to keywords in Turkish translation

 po/tr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4a9807910648d75977162928cbf25e577358d8d6
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Sat Jan 18 14:12:33 2014 +0100

    Add a trailing semicolon to keywords in Slovak translation

 po/sk.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f43358a4cf5228790dd4b1a03aae74730228e417
Author: Tong Hui <tonghuix@gmmail.com>
Date:   Sat Jan 18 11:29:52 2014 +0800

    Update Chinese simplified translation

 po/zh_CN.po | 7169
 +++++++++++++++++++++++------------------------------------
 1 file changed, 2806 insertions(+), 4363 deletions(-)

commit 7413907f46ef2f742d61cc3752b57d4a85208424
Author: Wylmer Wang <wantinghard@gmail.com>
Date:   Sat Jan 18 10:28:59 2014 +0800

    Fix a mistake in Chinese simplified translation that may block
    compiling

 po/zh_CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 649c99c125a3134584cff3160c08c2e4c4f81e2b
Author: Marek Černocký <marek@manet.cz>
Date:   Fri Jan 17 14:28:58 2014 +0100

    Updated Czech translation

 po/cs.po | 356
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 174 insertions(+), 182 deletions(-)

commit 14720d3a27d7810af608f8bbb9c7fea6f7d28a8d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jan 13 10:15:25 2014 +0100

    telepathy-account-widgets: update to master

    Needed to fix bgo#710252.

 telepathy-account-widgets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a9ffa65a771b4cc3feca06366cc1568e5d616382
Author: Dimitris Spingos <dmtrs32@gmail.com>
Date:   Sun Jan 12 20:10:53 2014 +0200

    Updated Greek translation

 po/el.po | 410
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 206 insertions(+), 204 deletions(-)

commit b41c72fd744c3a2d2e66a6a075ee96346a6fbc55
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Jan 7 11:18:20 2014 +0100

    remove EGGLISTBOX_CFLAGS

    We stopped using egg-list-box a while ago.

 libempathy-gtk/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

commit df6bd22f9a320dad25eaffa5c061921de7ee351b
Merge: 5739650 4a0d05f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Jan 7 10:38:32 2014 +0100

    Merge branch 'gnome-3-10'

    Conflicts:
	NEWS
	configure.ac
	help/el/el.po

commit 4a0d05f76bb33b1a78c96333780d38b23cc74b16
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 7 10:37:51 2014 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8b2b650001042efed6b84281ddedad0e0c2eb6f2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 7 10:32:16 2014 +0100

    3.10.3

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

commit 57396500ea506ca42677292b6ab8e0cf664e5f7f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 6 15:23:16 2014 +0100

    run coding style checks on tests

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

 tests/Makefile.am	       | 12 ++++++++++++
 tests/interactive/Makefile.am | 14 ++++++++++++++
 2 files changed, 26 insertions(+)

commit 1bb72627c34c990adb807a633464ee9ca276290e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 6 15:27:45 2014 +0100

    mock-pkcs11: use g_hash_table_unref()

    Same effect here but g_hash_table_destroy() is banned from our
    "coding style"
    check tools.

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

 tests/mock-pkcs11.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 7c3dfe14b806582b204ec447354e28ff689e061e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 6 15:27:20 2014 +0100

    Update FSF postal address

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

 tests/interactive/test-empathy-calendar-button.c	  | 7 +++----
 tests/interactive/test-empathy-contact-blocking-dialog.c | 7 +++----
 tests/interactive/test-empathy-presence-chooser.c	  | 7 +++----
 tests/interactive/test-empathy-status-preset-dialog.c	  | 7 +++----
 tests/mock-pkcs11.c					  | 3 +--
 tests/mock-pkcs11.h					  | 3 +--
 6 files changed, 14 insertions(+), 20 deletions(-)

commit 5e8fcdce36151ee61fbbe3937b2a8d1e58850b6e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 6 15:27:03 2014 +0100

    coding style fixes

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

 tests/empathy-tls-test.c | 7 ++++---
 tests/mock-pkcs11.c	  | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

commit 747da9fea882b5e4962e2d1f3e4f86074a350633
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 6 15:17:34 2014 +0100

    telepathy-account-widgets: update to master

 telepathy-account-widgets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c204482d591d7e6e38b5bded637eff6f69e05ca0
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Mon Jan 6 09:30:13 2014 +0100

    [l10n] Updated Italian translation.

 po/it.po | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 16bade3274574551b98d07252276d1de6585bdbc
Author: Andika Triwidada <andika@gmail.com>
Date:	Sat Jan 4 12:58:09 2014 +0700

    Updated Indonesian translation

 po/id.po | 392
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 192 insertions(+), 200 deletions(-)

commit 51de235d7db35d6e4ae87f4196b7060fb40afe96
Author: Dimitris Spingos <dmtrs32@gmail.com>
Date:	Fri Jan 3 11:56:09 2014 +0200

    Updated Greek translation of help

 help/el/el.po | 993
 +++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 559 insertions(+), 434 deletions(-)

commit 23937af16dffe6a80d72b110fb28dbe21b0af0c9
Author: Rafael Ferreira <rafael.f.f1@gmail.com>
Date:	Thu Jan 2 05:34:24 2014 -0200

    Updated Brazilian Portuguese translation

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

commit 94af51365ffd0895b2c808358b1e4361ddc3ad31
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Dec 30 11:50:40 2013 +0100

    Updated Spanish translation

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

commit 801790847fde7c295676020ebc5c30f463caf7dc
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Mon Dec 30 01:08:24 2013 +0100

    Updated Galician translations

 po/gl.po		   | 9 ++++-----
 telepathy-account-widgets | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

commit 8ea105b6e4b6a42e758ab6514d754dca2ce3059c
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Thu Dec 19 01:51:48 2013 +0100

    Updated Galician translations

 po/gl.po | 366
 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 171 insertions(+), 195 deletions(-)

commit 4524002368150694c16581b4a8d3481808ded736
Author: Wylmer Wang <wantinghard@gmail.com>
Date:	Sat Dec 28 20:44:19 2013 +0800

    Update Chinese simplified translation

 po/zh_CN.po | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

commit e6b830dbe26a16407beba356eefdf85f79da9f2a
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:	Mon Dec 9 11:43:02 2013 -0600

    app menu: standardize Help/About/Quit

    We're going to use simply "About" instead of "About Empathy"

    https://wiki.gnome.org/Design/HIG/ApplicationMenus

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

 src/empathy-roster-window-menubar.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 41d6dccc6ecdb3cf13ffd43533e612c2b71b71d7
Merge: 4de10b5 ac8964d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 27 17:00:04 2013 +0100

    Merge branch 'gnome-3-10'

commit ac8964d55c1c8fa4b349a0b3c995d605b3ed33c9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 27 16:55:46 2013 +0100

    roster-view: check the 'expanded' property on the GtkExpander

    EmpathyRosterGroup is no longer a GtkExpander subclass but a
    GtkListBoxRow
    one.

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

 libempathy-gtk/empathy-roster-view.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 4de10b5ccf45229e8557b808ae601073d23251c4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 27 16:42:20 2013 +0100

    tp-account-widgets: update to master

 telepathy-account-widgets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7ff769c94a88f7ef6adce284accf6a4ab8a9b359
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Mon Dec 23 20:05:31 2013 +0100

    Updated Slovenian translation

 po/sl.po | 231
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 115 insertions(+), 116 deletions(-)

commit 64781f19b47a4f9373c40fa824fec11bd9778f2b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 19 12:25:54 2013 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a0b6270e802ea4342f365273106977a9ff2d09a4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 19 09:37:05 2013 +0100

    3.11.3

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

commit 1e71da786fcbc2ff9f4aa026b2b1fa05a752b499
Merge: bd75afa 4ef07b0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 19 09:35:25 2013 +0100

    Merge remote-tracking branch 'origin/gnome-3-10'

    Conflicts:
	NEWS
	configure.ac
	po/es.po
	po/ta.po
	po/te.po
	po/zh_CN.po

commit 4ef07b0e1e7c5d67d34856f243063cc039086058
Author: Krishnababu Krothapalli <kkrothap@redhat.com>
Date:	Wed Dec 18 17:46:46 2013 +0530

    Updated Telugu Translations

 po/te.po | 3082
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1385 insertions(+), 1697 deletions(-)

commit bd75afa700247fae45e2dcb6c1dd59db14f62d9f
Author: Krishnababu Krothapalli <kkrothap@redhat.com>
Date:	Wed Dec 18 17:46:06 2013 +0530

    Updated Telugu Translations

 po/te.po | 3092
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1390 insertions(+), 1702 deletions(-)

commit 84ff393a3d0a3e47af0c7c1bf39ba21337c6e18c
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Wed Dec 11 10:28:39 2013 +0100

    [l10n] Updated Italian translation.

 po/it.po | 386
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 189 insertions(+), 197 deletions(-)

commit 0f827184d7c64b36ed1ea148c43bbb6adede673f
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Dec 9 16:02:26 2013 +0100

    Updated Spanish translation

 po/es.po | 241
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 120 insertions(+), 121 deletions(-)

commit f99af4b5fa0758618a7333e1f299bf921a11cefa
Author: A S Alam <apreet.alam@gmail.com>
Date:	Sat Dec 7 19:15:42 2013 -0600

    Update Punjabi Translation by Alam

 po/pa.po | 819
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 424 insertions(+), 395 deletions(-)

commit 33a577e5fb206ad24c2f919fd2b18934989cf865
Author: 甘露(Gan  Lu) <rhythm.gan@gmail.com>
Date:	Sat Dec 7 14:27:13 2013 +0800

    Update Chinese simplified translation

 po/zh_CN.po | 2700
 +++++++++++++++++++++++++++--------------------------------
 1 file changed, 1217 insertions(+), 1483 deletions(-)

commit fd3e5983011ce2522aa27a75057f31162e59cb6e
Author: Wylmer Wang <wantinghard@gmail.com>
Date:	Sat Dec 7 14:25:55 2013 +0800

    Update Chinese simplified translation

 po/zh_CN.po | 2681
 +++++++++++++++++++++++++++--------------------------------
 1 file changed, 1207 insertions(+), 1474 deletions(-)

commit b7f620fff4aa8933eb7a35a2959746f652964767
Author: Will Thompson <will@willthompson.co.uk>
Date:	Tue Oct 8 08:22:33 2013 +0100

    Roster: use the plural for "any contacts"

    In the context of “You haven't added any contact yet”,
    “contact” should
    be plural. This patch fixes the LANG=C string; translators can
    do their
    thing.

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

 src/empathy-roster-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 96f2a474e0cdc5f8fe8a482d14a1a97c519def3a
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Nov 21 18:09:16 2013 +0000

    libempathy: Remove empathy_create_individual_from_tp_contact()

    It has been replaced by empathy_ensure_individual_from_tp_contact(),
    which can’t cause internal state corruption in libfolks by
    wrapping an
    existing Persona in a second Individual when it’s already wrapped in
    one.

    This has also been fixed in libfolks.

    See: https://bugzilla.redhat.com/show_bug.cgi?id=1031252

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

 libempathy-gtk/empathy-contact-chooser.c	   |  2 +-
 libempathy-gtk/empathy-individual-menu.c	   |  2 +-
 libempathy-gtk/empathy-individual-store-channel.c |  2 +-
 libempathy/empathy-utils.c			   | 20
 --------------------
 libempathy/empathy-utils.h			   |  3 ---
 5 files changed, 3 insertions(+), 26 deletions(-)

commit 0909d1f884c4542553d98b18e7622664d2a02169
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Nov 21 18:09:16 2013 +0000

    libempathy: Remove empathy_create_individual_from_tp_contact()

    It has been replaced by empathy_ensure_individual_from_tp_contact(),
    which can’t cause internal state corruption in libfolks by
    wrapping an
    existing Persona in a second Individual when it’s already wrapped in
    one.

    This has also been fixed in libfolks.

    See: https://bugzilla.redhat.com/show_bug.cgi?id=1031252

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

 libempathy-gtk/empathy-contact-chooser.c	   |  2 +-
 libempathy-gtk/empathy-individual-menu.c	   |  2 +-
 libempathy-gtk/empathy-individual-store-channel.c |  2 +-
 libempathy/empathy-utils.c			   | 20
 --------------------
 libempathy/empathy-utils.h			   |  3 ---
 5 files changed, 3 insertions(+), 26 deletions(-)

commit 561774b13b402c3f33b5264efc5abd091aa563cf
Author: Dimitris Spingos <dmtrs32@gmail.com>
Date:	Sat Nov 23 00:14:31 2013 +0200

    Updated Greek translation

 help/el/el.po | 2466
 ++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1497 insertions(+), 969 deletions(-)

commit 8defe68d6698b61146f4c91aa7fed82babc5a868
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Nov 20 13:15:07 2013 +0100

    Updated Spanish translation

 po/es.po | 108
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

commit e0d7b54019ebbea8e8f751b92801e7c4c2a2dc1c
Author: Shantha kumar <shkumar@redhat.com>
Date:	Wed Nov 20 13:28:39 2013 +0530

    Updated Tamil Translations

 po/ta.po | 2904
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 1335 insertions(+), 1569 deletions(-)

commit 684cd7457b2f0f31ee6eed6835834864621158b4
Author: Shantha kumar <shkumar@redhat.com>
Date:	Wed Nov 20 13:23:49 2013 +0530

    Updated Tamil Translations

 po/ta.po | 2907
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 1335 insertions(+), 1572 deletions(-)

commit 25b40bf1b21a7c73a5b87649e3fb3536d64d0a97
Author: Veena Katiyar <veenakatiyar0509@gmail.com>
Date:	Mon Nov 18 00:39:18 2013 +0530

    Insert smileys at the cursor position

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

 libempathy-gtk/empathy-chat.c | 15 ++++++++-------
 libempathy-gtk/empathy-chat.h |  3 +++
 src/empathy-chat-window.c     |  7 ++-----
 3 files changed, 13 insertions(+), 12 deletions(-)

commit 7f44d7db80e54db89d38eef093799aaa2eef978a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 11 11:06:11 2013 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 29be6a50139382fd52ab5261cd130d67fe26fcc4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 11 11:01:31 2013 +0100

    3.10.2

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

commit d9518854b285b88e53f6d8fd96582e7e88b80be3
Author: Benjamin Steinwender <b@stbe.at>
Date:	Mon Nov 4 18:38:14 2013 +0100

    Updated German translation

 po/de.po | 792
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 412 insertions(+), 380 deletions(-)

commit 8b783df8f293a93405b591522f5289006286f1f4
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Thu Oct 31 13:39:21 2013 -0400

    SASL: fix facebook mechanism

    libsoup was escaping '_' and '.' in the challenge response but the
    facebook server is not expecting that.

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

 libempathy/empathy-sasl-mechanisms.c | 33
 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

commit 31e04cc0ac313d270b96188338ef8c9d2004acc7
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Thu Oct 31 13:39:21 2013 -0400

    SASL: fix facebook mechanism

    libsoup was escaping '_' and '.' in the challenge response but the
    facebook server is not expecting that.

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

 libempathy/empathy-sasl-mechanisms.c | 33
 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

commit 46f82b56bd2902de606c9827a0f59bc5d1afb6fc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 31 10:56:12 2013 +0100

    remove test.{manager,profile}

    They are not used since a while.

 tests/Makefile.am  | 4 ----
 tests/test.manager | 5 -----
 tests/test.profile | 4 ----
 3 files changed, 13 deletions(-)

commit 3b6db195f7c07c8cc0a7cbf32fa276cdc9bb1a19
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 31 16:45:56 2013 +0100

    release.py: update last_tag_pattern

 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 46bb87f715bad480e13eab36b8530d77665291a4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 31 16:45:42 2013 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 41856adcd7395a3e7b68af67dbdc23d66c3c29f1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 31 16:38:46 2013 +0100

    3.11.1

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

commit d33879921acbd5f1d92565d7e58850aec590c293
Merge: f3e31a9 b36536e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 31 16:26:01 2013 +0100

    Merge branch 'gnome-3-10'

commit b36536e8da8702006ccff21c6c9a11ccaa98b5b8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 31 14:00:45 2013 +0100

    release.py: Use spaces identations

    In PEP-8 we trust.

 release.py | 540
 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 269 insertions(+), 271 deletions(-)

commit 63c723259e40da25c7ab3a8be1b05a2083fa9915
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 31 13:46:47 2013 +0100

    release.py: use dateutil's parser

    Makes code much easier and fix a crash if the commit date includes
    a negative
    timezone offset (like 'Mon Oct 14 13:13:03 2013 -0400').

 release.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit f3e31a9f4bde7ce243e92d9d43c4ce8005dd2231
Merge: 81c169d 381eb51
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 31 13:24:27 2013 +0100

    Merge branch 'gnome-3-10'

commit 381eb5147aad3488f000201487ec744252698977
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 31 13:23:17 2013 +0100

    release.py: update last_tag_pattern

 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 81c169d8dcc6b3b3c2c9a2253da23c5e657ddf3a
Merge: 459911d fabe2b1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 31 13:21:23 2013 +0100

    Merge remote-tracking branch 'origin/gnome-3-10'

    Conflicts:
	po/cs.po
	po/es.po
	po/nb.po

commit 459911df1c715b033211f5358425ce3ed7be3512
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Oct 25 16:39:56 2013 +0200

    Updated Spanish translation

 po/es.po | 168
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 83 insertions(+), 85 deletions(-)

commit 7fd3e9d678b493a72c51301e233870c9960985ea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 25 10:46:42 2013 +0200

    accounts-dialog: early return if gtk_tree_view_get_selection
    returns NULL

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

commit 7102b6cd6883c326ef6b1cf56f4c846b0996b271
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 25 11:13:50 2013 +0200

    remove protocol icons from empathy tree

    We were actually shipping these icons in empathy/data/icons and
    telepathy-account-widgets/data/icons/ but both were installed to
    the same
    path!

 data/icons/Makefile.am				    |	124 -
 data/icons/hicolor_apps_16x16_im-aim.png	    |	Bin 795 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-ekiga.png	    |	Bin 844 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-facebook.png	    |	Bin 552 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-gadugadu.png	    |	Bin 775 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-gizmo.png	    |	Bin 861 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-google-talk.png   |	Bin 828 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-groupwise.png     |	Bin 865 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-icq.png	    |	Bin 936 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-irc.png	    |	Bin 848 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-jabber.png	    |	Bin 663 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-local-xmpp.png    |	Bin 891 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-meanwhile.png     |	Bin 938 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-msn.png	    |	Bin 835 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-mxit.png	    |	Bin 560 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-myspace.png	    |	Bin 624 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-qq.png	    |	Bin 823 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-sametime.png	    |	Bin 817 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-silc.png	    |	Bin 359 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-sip.png	    |	Bin 630 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-yahoo.png	    |	Bin 906 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-zephyr.png	    |	Bin 695 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-aim.png	    |	Bin 1134 ->
 0 bytes
 data/icons/hicolor_apps_22x22_im-ekiga.png	    |	Bin 1299 ->
 0 bytes
 data/icons/hicolor_apps_22x22_im-facebook.png	    |	Bin 731 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-gadugadu.png	    |	Bin 1207 ->
 0 bytes
 data/icons/hicolor_apps_22x22_im-gizmo.png	    |	Bin 1301 ->
 0 bytes
 data/icons/hicolor_apps_22x22_im-google-talk.png   |	Bin 1252 ->
 0 bytes
 data/icons/hicolor_apps_22x22_im-groupwise.png     |	Bin 1330 ->
 0 bytes
 data/icons/hicolor_apps_22x22_im-icq.png	    |	Bin 1359 ->
 0 bytes
 data/icons/hicolor_apps_22x22_im-irc.png	    |	Bin 1218 ->
 0 bytes
 data/icons/hicolor_apps_22x22_im-jabber.png	    |	Bin 953 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-local-xmpp.png    |	Bin 1293 ->
 0 bytes
 data/icons/hicolor_apps_22x22_im-meanwhile.png     |	Bin 1538 ->
 0 bytes
 data/icons/hicolor_apps_22x22_im-msn.png	    |	Bin 1281 ->
 0 bytes
 data/icons/hicolor_apps_22x22_im-mxit.png	    |	Bin 828 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-myspace.png	    |	Bin 884 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-qq.png	    |	Bin 1264 ->
 0 bytes
 data/icons/hicolor_apps_22x22_im-sametime.png	    |	Bin 1225 ->
 0 bytes
 data/icons/hicolor_apps_22x22_im-silc.png	    |	Bin 510 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-sip.png	    |	Bin 824 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-yahoo.png	    |	Bin 1261 ->
 0 bytes
 data/icons/hicolor_apps_22x22_im-zephyr.png	    |	Bin 995 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-aim.png	    |	Bin 1218 ->
 0 bytes
 data/icons/hicolor_apps_24x24_im-ekiga.png	    |	Bin 1431 ->
 0 bytes
 data/icons/hicolor_apps_24x24_im-gadugadu.png	    |	Bin 1338 ->
 0 bytes
 data/icons/hicolor_apps_24x24_im-gizmo.png	    |	Bin 1437 ->
 0 bytes
 data/icons/hicolor_apps_24x24_im-google-talk.png   |	Bin 1363 ->
 0 bytes
 data/icons/hicolor_apps_24x24_im-groupwise.png     |	Bin 1494 ->
 0 bytes
 data/icons/hicolor_apps_24x24_im-icq.png	    |	Bin 1512 ->
 0 bytes
 data/icons/hicolor_apps_24x24_im-irc.png	    |	Bin 1308 ->
 0 bytes
 data/icons/hicolor_apps_24x24_im-jabber.png	    |	Bin 1013 ->
 0 bytes
 data/icons/hicolor_apps_24x24_im-local-xmpp.png    |	Bin 1562 ->
 0 bytes
 data/icons/hicolor_apps_24x24_im-meanwhile.png     |	Bin 1423 ->
 0 bytes
 data/icons/hicolor_apps_24x24_im-msn.png	    |	Bin 1407 ->
 0 bytes
 data/icons/hicolor_apps_24x24_im-mxit.png	    |	Bin 767 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-myspace.png	    |	Bin 799 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-qq.png	    |	Bin 1421 ->
 0 bytes
 data/icons/hicolor_apps_24x24_im-sametime.png	    |	Bin 1398 ->
 0 bytes
 data/icons/hicolor_apps_24x24_im-silc.png	    |	Bin 476 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-sip.png	    |	Bin 816 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-yahoo.png	    |	Bin 1411 ->
 0 bytes
 data/icons/hicolor_apps_24x24_im-zephyr.png	    |	Bin 1049 ->
 0 bytes
 data/icons/hicolor_apps_32x32_im-aim.png	    |	Bin 1777 ->
 0 bytes
 data/icons/hicolor_apps_32x32_im-ekiga.png	    |	Bin 2118 ->
 0 bytes
 data/icons/hicolor_apps_32x32_im-gadugadu.png	    |	Bin 1986 ->
 0 bytes
 data/icons/hicolor_apps_32x32_im-gizmo.png	    |	Bin 2061 ->
 0 bytes
 data/icons/hicolor_apps_32x32_im-google-talk.png   |	Bin 1893 ->
 0 bytes
 data/icons/hicolor_apps_32x32_im-groupwise.png     |	Bin 2164 ->
 0 bytes
 data/icons/hicolor_apps_32x32_im-icq.png	    |	Bin 2121 ->
 0 bytes
 data/icons/hicolor_apps_32x32_im-irc.png	    |	Bin 1695 ->
 0 bytes
 data/icons/hicolor_apps_32x32_im-jabber.png	    |	Bin 1492 ->
 0 bytes
 data/icons/hicolor_apps_32x32_im-local-xmpp.png    |	Bin 2355 ->
 0 bytes
 data/icons/hicolor_apps_32x32_im-meanwhile.png     |	Bin 2086 ->
 0 bytes
 data/icons/hicolor_apps_32x32_im-msn.png	    |	Bin 1660 ->
 0 bytes
 data/icons/hicolor_apps_32x32_im-mxit.png	    |	Bin 998 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-myspace.png	    |	Bin 1174 ->
 0 bytes
 data/icons/hicolor_apps_32x32_im-qq.png	    |	Bin 2105 ->
 0 bytes
 data/icons/hicolor_apps_32x32_im-sametime.png	    |	Bin 1994 ->
 0 bytes
 data/icons/hicolor_apps_32x32_im-silc.png	    |	Bin 547 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-sip.png	    |	Bin 1151 ->
 0 bytes
 data/icons/hicolor_apps_32x32_im-yahoo.png	    |	Bin 1955 ->
 0 bytes
 data/icons/hicolor_apps_32x32_im-zephyr.png	    |	Bin 1500 ->
 0 bytes
 data/icons/hicolor_apps_48x48_im-aim.png	    |	Bin 2953 ->
 0 bytes
 data/icons/hicolor_apps_48x48_im-ekiga.png	    |	Bin 3706 ->
 0 bytes
 data/icons/hicolor_apps_48x48_im-facebook.png	    |	Bin 1521 ->
 0 bytes
 data/icons/hicolor_apps_48x48_im-gadugadu.png	    |	Bin 3210 ->
 0 bytes
 data/icons/hicolor_apps_48x48_im-gizmo.png	    |	Bin 3284 ->
 0 bytes
 data/icons/hicolor_apps_48x48_im-google-talk.png   |	Bin 3043 ->
 0 bytes
 data/icons/hicolor_apps_48x48_im-groupwise.png     |	Bin 3817 ->
 0 bytes
 data/icons/hicolor_apps_48x48_im-icq.png	    |	Bin 3418 ->
 0 bytes
 data/icons/hicolor_apps_48x48_im-irc.png	    |	Bin 2428 ->
 0 bytes
 data/icons/hicolor_apps_48x48_im-jabber.png	    |	Bin 2413 ->
 0 bytes
 data/icons/hicolor_apps_48x48_im-local-xmpp.png    |	Bin 4188 ->
 0 bytes
 data/icons/hicolor_apps_48x48_im-meanwhile.png     |	Bin 3647 ->
 0 bytes
 data/icons/hicolor_apps_48x48_im-msn.png	    |	Bin 2778 ->
 0 bytes
 data/icons/hicolor_apps_48x48_im-mxit.png	    |	Bin 1306 ->
 0 bytes
 data/icons/hicolor_apps_48x48_im-myspace.png	    |	Bin 1619 ->
 0 bytes
 data/icons/hicolor_apps_48x48_im-qq.png	    |	Bin 3653 ->
 0 bytes
 data/icons/hicolor_apps_48x48_im-sametime.png	    |	Bin 3417 ->
 0 bytes
 data/icons/hicolor_apps_48x48_im-silc.png	    |	Bin 749 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-sip.png	    |	Bin 1405 ->
 0 bytes
 data/icons/hicolor_apps_48x48_im-yahoo.png	    |	Bin 3211 ->
 0 bytes
 data/icons/hicolor_apps_48x48_im-zephyr.png	    |	Bin 2303 ->
 0 bytes
 data/icons/hicolor_apps_scalable_im-aim.svg	    |	183 -
 data/icons/hicolor_apps_scalable_im-ekiga.svg	    |	441 -
 data/icons/hicolor_apps_scalable_im-gadugadu.svg   |	225 -
 data/icons/hicolor_apps_scalable_im-gizmo.svg	    |	269 -
 .../icons/hicolor_apps_scalable_im-google-talk.svg |	301 -
 data/icons/hicolor_apps_scalable_im-groupwise.svg  |	215 -
 data/icons/hicolor_apps_scalable_im-icq.svg	    |	200 -
 data/icons/hicolor_apps_scalable_im-irc.svg	    |	785 -
 data/icons/hicolor_apps_scalable_im-jabber.svg     |	632 -
 data/icons/hicolor_apps_scalable_im-local-xmpp.svg | 13059
 ---------------
 data/icons/hicolor_apps_scalable_im-meanwhile.svg  |	174 -
 data/icons/hicolor_apps_scalable_im-msn.svg	    |	174 -
 data/icons/hicolor_apps_scalable_im-mxit.svg	    |	106 -
 data/icons/hicolor_apps_scalable_im-myspace.svg    |	109 -
 data/icons/hicolor_apps_scalable_im-qq.svg	    |	290 -
 data/icons/hicolor_apps_scalable_im-sametime.svg   |	127 -
 data/icons/hicolor_apps_scalable_im-silc.svg	    |	103 -
 data/icons/hicolor_apps_scalable_im-sip.svg	    |	251 -
 data/icons/hicolor_apps_scalable_im-yahoo.svg	    |	266 -
 data/icons/hicolor_apps_scalable_im-zephyr.svg     |	182 -
 data/icons/local-xmpp.svg			    | 16338
 -------------------
 125 files changed, 34554 deletions(-)

commit fabe2b1b33eda5bac20e745cd0af5f96bba1b553
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Fri Oct 25 01:12:07 2013 +0200

    Updated Galician translations

 po/gl.po | 901
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 464 insertions(+), 437 deletions(-)

commit afd6c51230db7c8573c7768685c26370a13259c8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 24 17:11:56 2013 +0200

    tp-chat: prepare CONTACTS before our custom feature

    We rely on TP_CHANNEL_FEATURE_CONTACTS being prepared when preparing
    EMPATHY_TP_CHAT_FEATURE_READY.

 libempathy/empathy-tp-chat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit d03958aaabe8f905d99704b912801ac1afb88c40
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Thu Oct 24 11:34:27 2013 +0200

    Updated Serbian translation

 po/sr.po	| 87
 +++++++++++++++++++++++++++++++++++++---------------------
 po/sr@latin.po | 87
 +++++++++++++++++++++++++++++++++++++---------------------
 2 files changed, 110 insertions(+), 64 deletions(-)

commit 72643d65cd60941b535acd09c578736b030e6c6d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 23 16:49:11 2013 +0200

    event-manager: ignore StreamedMedia

 src/empathy-event-manager.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit b7ff7d8e75ef4568cd6e428dd9914adc1108302a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 22 13:19:57 2013 +0200

    location-manager: include telepathy-glib-dbus.h

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

commit 6fa878bf752d6a397bd876d34fb5c30ea0f9ea8e
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Tue Oct 22 20:02:30 2013 +0200

    Updated Slovenian translation

 po/sl.po | 894
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 461 insertions(+), 433 deletions(-)

commit 16ef704200bb6a84de12e0ea2e494421a1c080e3
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Tue Oct 22 20:02:21 2013 +0200

    Updated Slovenian translation

 po/sl.po | 210
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 115 insertions(+), 95 deletions(-)

commit f8ab1983718a518c038c85c8acbc78393ac665af
Author: Yuri Myasoedov <ymyasoedov@yandex.ru>
Date:	Tue Oct 22 20:48:11 2013 +0400

    Updated Russian translation

 po/ru.po | 1363
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 805 insertions(+), 558 deletions(-)

commit 43777066590288e1af7a19beee51e875a9143f5c
Author: Yuri Myasoedov <ymyasoedov@yandex.ru>
Date:	Tue Oct 22 20:48:11 2013 +0400

    Updated Russian translation

 po/ru.po | 1363
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 805 insertions(+), 558 deletions(-)

commit 4d556f5f50f2b462ccd9d404f8cf1d5cd1b1fd42
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 22 10:41:52 2013 +0200

    stop using tp_account_manager_is_prepared()

    It has been deprecated.

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

commit 0e2e4e79bf14b2bd72458ca0a60c5b8dc1c9b67a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 22 10:38:21 2013 +0200

    Stop observing/approving StreamedMedia channels

 libempathy-gtk/empathy-log-window.c | 11 ++---------
 src/empathy-call-observer.c	     | 14 +++-----------
 src/empathy-event-manager.c	     |	9 +--------
 3 files changed, 6 insertions(+), 28 deletions(-)

commit 9fe2361afd9beb6fa5ab10f6caed08b264adcaf5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 22 12:50:47 2013 +0200

    telepathy-account-widgets: sync to master

 telepathy-account-widgets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0272da48071b607da189fb571e20cde8a488641b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 22 12:39:17 2013 +0200

    remove nautilus-sendto plugin

    Latest versions of nautilus-sendto doesn't support plugins any more.

 Makefile.am					  |   7 +-
 configure.ac					  |  26 --
 nautilus-sendto-plugin/Makefile.am		  |  23 --
 nautilus-sendto-plugin/empathy-nautilus-sendto.c | 306
 -----------------------
 po/POTFILES.in					  |   2 -
 5 files changed, 1 insertion(+), 363 deletions(-)

commit e5648bccea44c87c00f72f7501048810276a6d27
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 22 12:34:26 2013 +0200

    Use AM_CPPFLAGS instead of deprecated INCLUDES

 nautilus-sendto-plugin/Makefile.am			       | 2 +-
 ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am | 2 +-
 ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 506d80481e303bdc03cf93e0688a96d2253bf822
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 22 12:06:46 2013 +0200

    Use AC_PROG_MKDIR_P and MKDIR_P instead of AM_PROG_MKDIR_P and mkdir_p

    The latter are deprecated, and recent Automake makes a lot of noise
    about them.

 configure.ac		| 2 +-
 extensions/Makefile.am | 4 ++--
 tools/lcov.am		| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

commit 4b0430db4bf7cdbef60290bdcca94bd1e5cf05d3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 22 11:36:34 2013 +0200

    use the plugindir pc variable from MC

    The whole point of this variable is to give us the path where
    plugins are
    supposed to be installed. We should just use it instead of
    re-implementing it
    assuming the location.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9419a9b70f97e3617571ea3ce02138105117788a
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Oct 18 14:26:43 2013 +0100

    libempathy: Fix several memory leaks from libgee

    See commit 039dc326208e02b687e93739434e27a867f4ffa7.

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

 libempathy/empathy-individual-manager.c | 9 ++++++---
 libempathy/empathy-utils.c		 | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

commit c754b1deab91b48e6b203dd2c6f1293a124c66af
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Oct 18 14:24:15 2013 +0100

    libempathy-gtk: Fix several memory leaks from libgee

    libgee’s GeeIterator returns a new reference from most of its
    methods,
    especially gee_iterable_iterator() and gee_iterator_get(). Add
    corresponding
    g_object_unref() calls.

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

 libempathy-gtk/empathy-individual-menu.c	  | 51
 ++++++++++++++++--------
 libempathy-gtk/empathy-individual-widget.c	  |  4 +-
 libempathy-gtk/empathy-roster-model-aggregator.c | 13 ++++--
 3 files changed, 48 insertions(+), 20 deletions(-)

commit 35b9f0c90f66e81f5008ff866b5b4b4b47aae0a5
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Oct 18 14:26:43 2013 +0100

    libempathy: Fix several memory leaks from libgee

    See commit 039dc326208e02b687e93739434e27a867f4ffa7.

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

 libempathy/empathy-individual-manager.c | 9 ++++++---
 libempathy/empathy-utils.c		 | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

commit 5d618c618444363615431646471df7670ed76cf1
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Oct 18 14:24:15 2013 +0100

    libempathy-gtk: Fix several memory leaks from libgee

    libgee’s GeeIterator returns a new reference from most of its
    methods,
    especially gee_iterable_iterator() and gee_iterator_get(). Add
    corresponding
    g_object_unref() calls.

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

 libempathy-gtk/empathy-individual-menu.c	  | 51
 ++++++++++++++++--------
 libempathy-gtk/empathy-individual-widget.c	  |  4 +-
 libempathy-gtk/empathy-roster-model-aggregator.c | 13 ++++--
 3 files changed, 48 insertions(+), 20 deletions(-)

commit 4882b051fe63abaa6dc4926442a161f3190df0e6
Author: Efstathios Iosifidis <iosifidis@opensuse.org>
Date:	Tue Oct 22 11:49:38 2013 +0300

    Updated Greek translation

 po/el.po | 2894
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1322 insertions(+), 1572 deletions(-)

commit f4b71253c05ec02d675e19273bfed275f4324bd1
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Mon Oct 21 18:56:13 2013 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 775
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 402 insertions(+), 373 deletions(-)

commit 176724235b5de1370db15f2be7bc6a7f58f7a2b9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 21 14:51:09 2013 +0200

    stop generating ServerTLSConnection

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

 extensions/Channel_Type_Server_TLS_Connection.xml | 69
 -----------------------
 extensions/Makefile.am				   |  1 -
 extensions/misc.xml				   |  1 -
 3 files changed, 71 deletions(-)

commit c91d6c07b42df289e40ccc59882d0ad60573c2d2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 21 14:48:09 2013 +0200

    stop using generated ServerTLSConnection API

    It's been generated in telepathy-glib since 0.19.0

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

 libempathy/empathy-auth-factory.c	 | 8 +++-----
 libempathy/empathy-server-tls-handler.c | 3 +--
 2 files changed, 4 insertions(+), 7 deletions(-)

commit ddcd1beb479b2ba5884b2a4d3d626c2671c123d7
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Mon Oct 21 11:00:27 2013 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 773
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 401 insertions(+), 372 deletions(-)

commit 467955fd12d829ad0f17351d34bea1af1e61de30
Author: Balázs Úr <urbalazs@src.gnome.org>
Date:	Sun Oct 20 11:50:19 2013 +0200

    Updated Hungarian translation

 po/hu.po | 797
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 415 insertions(+), 382 deletions(-)

commit c25bf37cf6e727f5e1b1430e87b02c1273f4f210
Author: Balázs Úr <urbalazs@src.gnome.org>
Date:	Sun Oct 20 11:50:19 2013 +0200

    Updated Hungarian translation

 po/hu.po | 797
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 415 insertions(+), 382 deletions(-)

commit 72320ed4208563a19822fb33fadb4dd8dc85679a
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Oct 20 11:15:22 2013 +0200

    [l10n] Updated Italian translation.

 po/it.po | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

commit f804255977f078bdfcda88963f23f05d42961717
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Oct 20 11:15:22 2013 +0200

    [l10n] Updated Italian translation.

 po/it.po | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

commit 36f50be55d1ed83eb82a341afdba33e77383c5c4
Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
Date:	Sat Oct 19 16:08:42 2013 +0300

    Updated Latvian translation

 help/lv/lv.po | 2757
 +++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1718 insertions(+), 1039 deletions(-)

commit 2e46b14972a367095eb52425828ff34aebc7e94c
Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
Date:	Sat Oct 19 16:07:09 2013 +0300

    Updated Latvian translation

 help/lv/lv.po | 2757
 +++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1718 insertions(+), 1039 deletions(-)

commit 7aad0ee54eb95fd5d6e0d46441621db13cae3810
Author: Aurimas Černius <aurisc4@gmail.com>
Date:	Fri Oct 18 22:27:06 2013 +0300

    Updated Lithuanian translation

 po/lt.po | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

commit 0f46f534256be4b2bfb3bd33bd1727aa2a969b03
Author: Marek Černocký <marek@manet.cz>
Date:	Fri Oct 18 16:39:36 2013 +0200

    Updated Czech translation

 po/cs.po | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

commit d62b4ce5c6b37d48fcbdd50a8b00bed1369bdcac
Author: Marek Černocký <marek@manet.cz>
Date:	Fri Oct 18 16:39:06 2013 +0200

    Updated Czech translation

 po/cs.po | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

commit 179b5f2a48b44cc1a9283d87d38f2fc60d06f5cc
Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
Date:	Thu Oct 17 10:49:31 2013 +0300

    Updated Latvian translation

 po/lv.po | 814
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 419 insertions(+), 395 deletions(-)

commit c5d4a68126194d71fb41314cb881abbf9b6425ce
Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
Date:	Thu Oct 17 10:49:10 2013 +0300

    Updated Latvian translation

 po/lv.po | 814
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 419 insertions(+), 395 deletions(-)

commit 68611e3b592f7fe56f1cac62db8767460f93ed0a
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Wed Oct 16 18:49:56 2013 +0200

    Updated Polish translation

 po/pl.po | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

commit a8bdc4bd211f124d49e59559d473b755f54a9d82
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Wed Oct 16 18:49:56 2013 +0200

    Updated Polish translation

 po/pl.po | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

commit d984699da2bd6cfc210e3bbbe2925d6eb0d613ea
Author: Rafael Ferreira <rafael.f.f1@gmail.com>
Date:	Wed Oct 16 08:44:32 2013 -0300

    Updated Brazilian Portuguese translation, proofread by Enrico
    Nicoletto

 po/pt_BR.po | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

commit 45fcef49e5e08100494fc83c90ec6655d3dfc47a
Author: Rafael Ferreira <rafael.f.f1@gmail.com>
Date:	Wed Oct 16 08:44:32 2013 -0300

    Updated Brazilian Portuguese translation, proofread by Enrico
    Nicoletto

 po/pt_BR.po | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

commit 4c17e1d6710fab9c569a426c30dd09c53d08ecb9
Author: Andika Triwidada <andika@gmail.com>
Date:	Wed Oct 16 16:22:43 2013 +0700

    Updated Indonesian translation

 po/id.po | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

commit b332b1b830ea63f14bf2e29ede171b79eb275b19
Author: Andika Triwidada <andika@gmail.com>
Date:	Wed Oct 16 16:22:43 2013 +0700

    Updated Indonesian translation

 po/id.po | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

commit 4fb87d9e5485bae75036726337529e080c17cd3c
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Oct 16 11:08:11 2013 +0200

    Updated Spanish translation

 po/es.po | 897
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 460 insertions(+), 437 deletions(-)

commit 09fd7c4a7c9fcb02e80d26b351a6a5a87a614460
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Oct 16 11:05:31 2013 +0200

    Updated Spanish translation

 po/es.po | 62
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 32 insertions(+), 30 deletions(-)

commit 2a6fe8c345d7685e630390c46773d6ddc3946fe8
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Oct 16 11:05:21 2013 +0200

    Updated Spanish translation

 po/es.po | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

commit c1d5e82faf3636f1f66cd56313a6035120bd4461
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Oct 16 11:02:25 2013 +0200

    Added missing file

 data/empathy.appdata.xml.in | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit 207b37adbcb2b0ab096deacd7eee67fdbb5cdf59
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Oct 16 10:55:50 2013 +0200

    Make Appdata file translatable

 data/Makefile.am	  | 11 ++++++++---
 data/empathy.appdata.xml | 18 ------------------
 po/POTFILES.in		  |  1 +
 3 files changed, 9 insertions(+), 21 deletions(-)

commit 2ff6f2ac3cc7ab01a9c67b67a9818c995f5b5ee7
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Oct 16 10:54:51 2013 +0200

    Make Appdata file translatable

 data/Makefile.am	     | 11 ++++++++---
 data/empathy.appdata.xml    | 18 ------------------
 data/empathy.appdata.xml.in | 18 ++++++++++++++++++
 po/POTFILES.in		     |	1 +
 4 files changed, 27 insertions(+), 21 deletions(-)

commit c539516015558f3d60367db0f4381790672c7bb3
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Tue Oct 15 23:46:57 2013 +0300

    Updated Belarusian translation.

 po/be.po | 755
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 384 insertions(+), 371 deletions(-)

commit eb1f950c87fc68be712ab50d1f1bb9d3b389bf0a
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Tue Oct 15 19:37:30 2013 +0200

    Updated Serbian translation

 po/sr.po	| 800
 ++++++++++++++++++++++++++++-----------------------------
 po/sr@latin.po | 800
 ++++++++++++++++++++++++++++-----------------------------
 2 files changed, 800 insertions(+), 800 deletions(-)

commit 36d740fd03246017663422be6754ffcf5c45eacc
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Tue Oct 15 16:33:26 2013 +0200

    Updated Spanish translation

 po/es.po | 873
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 436 insertions(+), 437 deletions(-)

commit f365eedf91e7cbb50fedf00b81b7ad5720fdbf70
Author: Enrico Nicoletto <liverig@gmail.com>
Date:	Tue Oct 15 10:05:24 2013 -0300

    Updated Brazilian Portuguese translation

 po/pt_BR.po | 861
 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 432 insertions(+), 429 deletions(-)

commit f6596d5fd7a1cfce8320f0de303e40ab92612bf5
Author: Enrico Nicoletto <liverig@gmail.com>
Date:	Tue Oct 15 10:05:24 2013 -0300

    Updated Brazilian Portuguese translation

 po/pt_BR.po | 861
 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 432 insertions(+), 429 deletions(-)

commit 1ef260640721c89312c8b5ed2ce1d1ee89ed62c1
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Tue Oct 15 13:43:36 2013 +0200

    [l10n] Updated Italian translation.

 po/it.po | 780
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 398 insertions(+), 382 deletions(-)

commit 19e7386dc04f2f53929f3d44ea3e4018ebe45aff
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Tue Oct 15 13:43:36 2013 +0200

    [l10n] Updated Italian translation.

 po/it.po | 780
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 398 insertions(+), 382 deletions(-)

commit 02a8b9fd4cf6ac69eb99523e720cdca8c0ff2db5
Author: Andika Triwidada <andika@gmail.com>
Date:	Tue Oct 15 11:59:52 2013 +0700

    Updated Indonesian translation

 po/id.po | 777
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 395 insertions(+), 382 deletions(-)

commit 2c51255f7f6a478d01468c7978859ad714f9e0ef
Author: Andika Triwidada <andika@gmail.com>
Date:	Tue Oct 15 11:59:52 2013 +0700

    Updated Indonesian translation

 po/id.po | 777
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 395 insertions(+), 382 deletions(-)

commit ed1db1159c51dedf9805cfe74a024c1fda6c2b9e
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Mon Oct 14 23:23:07 2013 +0200

    Updated Slovenian translation

 po/sl.po | 870
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 439 insertions(+), 431 deletions(-)

commit 3ec526e7af7ea1886f513b2645856ee3f5bc211c
Author: Aurimas Černius <aurisc4@gmail.com>
Date:	Mon Oct 14 22:23:02 2013 +0300

    Updated Lithuanian translation

 po/lt.po | 785
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 396 insertions(+), 389 deletions(-)

commit 4f11c5638758baa659ce66dc7bf81a9db0693924
Author: Marek Černocký <marek@manet.cz>
Date:	Mon Oct 14 21:13:21 2013 +0200

    Updated Czech translation

 po/cs.po | 775
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 394 insertions(+), 381 deletions(-)

commit 5ce0eb5a66b05141ab870af4fc9008c8c20b6585
Author: Marek Černocký <marek@manet.cz>
Date:	Mon Oct 14 21:12:55 2013 +0200

    Updated Czech translation

 po/cs.po | 777
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 395 insertions(+), 382 deletions(-)

commit 56924df4278bbe9ec96492e426e744c1ec12b02d
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Mon Oct 14 19:56:17 2013 +0200

    Updated Polish translation

 po/pl.po | 775
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 394 insertions(+), 381 deletions(-)

commit 35ada57bd2eb45b0d86c959f681dd18ab6979590
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Mon Oct 14 19:56:17 2013 +0200

    Updated Polish translation

 po/pl.po | 775
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 394 insertions(+), 381 deletions(-)

commit 10268f4c962a5c307dd012089d03ac1e5c07c9ca
Merge: dcc9d91 bcd1f9a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 14 13:13:03 2013 -0400

    Merge branch 'gnome-3-10'

    Conflicts:
	po/pt.po
	src/empathy-audio-sink.c

commit bcd1f9ac9f8cae420e1f9616d94b9b518c740704
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 14 13:05:48 2013 -0400

    translate "Call $NUMBER" menu items

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

commit 9fe29f86005eb60a7505bd2c9733390793836f7e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 14 12:50:01 2013 -0400

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 50233ad566158a3e6cc571ad553c5f01d8b4bbfa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 14 12:42:52 2013 -0400

    3.10.1

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

commit dea9f68e37b897f61eba440128fbc6dfb0b97f7e
Author: Will Thompson <will@willthompson.co.uk>
Date:	Wed Oct 9 16:16:41 2013 +0100

    audio-sink: fix compilation with GStreamer 0.10

    66e393b removed this include, but without it compilation fails for
    me. I
    assume this is beacuse I am building Empathy against GStreamer
    0.10 and
    Emanuele was building against GStreamer 1.0 when removing unneeded
    includes.

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

 src/empathy-audio-sink.c | 1 +
 1 file changed, 1 insertion(+)

commit 7f98a88b11f2e8896dc0f2d2e412e62075a6590c
Author: António Lima <amrlima@gmail.com>
Date:	Sun Oct 13 12:30:07 2013 +0100

    Updated Portuguese translation

 po/pt.po | 3038
 ++++++++++++++++++++++++++------------------------------------
 1 file changed, 1283 insertions(+), 1755 deletions(-)

commit dcc9d91154890cacbc8afabd60c44582df94c434
Author: António Lima <amrlima@gmail.com>
Date:	Sun Oct 13 12:13:31 2013 +0100

    Updated Portuguese translation

 po/pt.po | 3038
 ++++++++++++++++++++++++++------------------------------------
 1 file changed, 1283 insertions(+), 1755 deletions(-)

commit 5719d87e280399be56970a84bfd7419e5baa7e8f
Merge: 5f8e3b0 33ee7a9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Sat Oct 12 17:51:39 2013 -0400

    Merge branch 'gnome-3-10'

    Conflicts:
	configure.ac

commit 33ee7a9336197b3b43d87a90c667920b1c5c7e00
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Sat Oct 12 17:24:20 2013 -0400

    use list_names_cb to find MC

    Make the code more symetric.

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

 src/empathy-debug-window.c | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

commit 28cd04d99c680753672f6c2f7bb0191b319dd8da
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Sat Oct 12 17:09:01 2013 -0400

    debug: factor out helpers

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

 src/empathy-debug-window.c | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

commit 12c7e0dc5a4c83d619d9983bc32b8caebab520aa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Sat Oct 12 17:01:21 2013 -0400

    debug: stop using tp_list_connection_names()

    Make the code more symetric.

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

 src/empathy-debug-window.c | 53
 +++++-----------------------------------------
 1 file changed, 5 insertions(+), 48 deletions(-)

commit 13a7933cbde1f932c18f3196b5f3c38f23fd8bb4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Sat Oct 12 16:51:06 2013 -0400

    debug: make add_client() more generic

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

 src/empathy-debug-window.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit 13f025bb32e7e1f2e59f33ffb39d9049a1e7ff17
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Sat Oct 12 16:16:44 2013 -0400

    use Cogl versioning macros

 configure.ac | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 5f8e3b0e2da0a65b77cd8d45f187a9f417ba22c0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Sat Oct 12 16:16:44 2013 -0400

    use Cogl versioning macros

 configure.ac | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 6d695da35c880ced97ff42e08604d64d13a52869
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Sat Oct 12 12:41:15 2013 -0400

    telepathy-account-widgets: update to master

 telepathy-account-widgets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5b1c37af695779b8222d03ecc8a176139d23e244
Author: Jiro Matsuzawa <jmatsuzawa@gnome.org>
Date:	Sat Oct 12 22:10:11 2013 +0900

    l10n: Update Japanese translation

 po/ja.po | 363
 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 166 insertions(+), 197 deletions(-)

commit b5e7595dbc7982029cccccd4037f3bcc0a667c4c
Author: Jiro Matsuzawa <jmatsuzawa@gnome.org>
Date:	Sat Oct 12 22:10:11 2013 +0900

    l10n: Update Japanese translation

 po/ja.po | 363
 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 166 insertions(+), 197 deletions(-)

commit 1633ffab993d9d06761669f6f8f7527da0cc231f
Author: Arash Mousavi <mousavi.arash@gmail.com>
Date:	Thu Oct 10 20:26:52 2013 +0330

    L10N: Updated Persian translations

 po/fa.po | 2855
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1287 insertions(+), 1568 deletions(-)

commit d3433a630e6324ccaf3ca197bedb6c1ff00567ac
Author: Arash Mousavi <mousavi.arash@gmail.com>
Date:	Thu Oct 10 20:25:02 2013 +0330

    L10N: Updated Persian translations

 po/fa.po | 2855
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1287 insertions(+), 1568 deletions(-)

commit d743c1464a7417c1828d71966db052d2b60e796b
Merge: 22effb2 01a825b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 10 10:07:00 2013 -0400

    Merge branch 'gnome-3-10'

commit 01a825bb9832b2c89f41172713412448b9c86923
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 10 10:05:41 2013 -0400

    telepathy-account-widgets: update

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

 telepathy-account-widgets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d88af3dffda23055d29ed11a256e72d949889a33
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:	Sun Oct 6 22:03:32 2013 +0200

    [l10n] Updated Catalan (Valencian) translation

 po/ca@valencia.po | 5100
 +++++++----------------------------------------------
 1 file changed, 670 insertions(+), 4430 deletions(-)

commit 8daa7e53530c1cd633178ffbabd67075d5571e83
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Oct 2 16:53:43 2013 -0400

    EmpathyMessage: remove flags, they are useless

 libempathy-gtk/empathy-chat.c |  4 +---
 libempathy/empathy-message.c  | 37 ++-----------------------------------
 libempathy/empathy-message.h  |  2 --
 3 files changed, 3 insertions(+), 40 deletions(-)

commit 8e0edf2980df05df3fd39cbe3e417b012b313393
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Oct 2 16:50:59 2013 -0400

    Add missing telepathy-glib-dbus.h includes

 libempathy-gtk/empathy-call-utils.c		  | 1 +
 libempathy-gtk/empathy-chat.c			  | 1 +
 libempathy-gtk/empathy-contact-blocking-dialog.c | 1 +
 libempathy-gtk/empathy-individual-dialogs.c	  | 1 +
 libempathy-gtk/empathy-individual-menu.c	  | 1 +
 libempathy-gtk/empathy-individual-widget.c	  | 1 +
 libempathy-gtk/empathy-log-window.c		  | 1 +
 libempathy-gtk/empathy-share-my-desktop.c	  | 2 ++
 libempathy-gtk/empathy-subscription-dialog.c	  | 1 +
 libempathy/empathy-auth-factory.c		  | 1 +
 libempathy/empathy-chatroom-manager.c		  | 1 +
 libempathy/empathy-client-factory.c		  | 1 +
 libempathy/empathy-ft-factory.c		  | 2 ++
 libempathy/empathy-ft-handler.c		  | 1 +
 libempathy/empathy-individual-manager.c	  | 1 +
 libempathy/empathy-request-util.c		  | 2 ++
 libempathy/empathy-sasl-mechanisms.c		  | 1 +
 libempathy/empathy-server-sasl-handler.c	  | 1 +
 libempathy/empathy-server-tls-handler.c	  | 2 ++
 libempathy/empathy-tp-chat.c			  | 1 +
 libempathy/empathy-utils.c			  | 1 +
 src/empathy-accounts.c				  | 1 +
 src/empathy-call-factory.c			  | 2 ++
 src/empathy-call-observer.c			  | 1 +
 src/empathy-call-window.c			  | 1 +
 src/empathy-chat-manager.c			  | 1 +
 src/empathy-debug-window.c			  | 1 +
 src/empathy-event-manager.c			  | 1 +
 src/empathy-import-widget.c			  | 1 +
 src/empathy-invite-participant-dialog.c	  | 1 +
 src/empathy-preferences.c			  | 1 +
 31 files changed, 36 insertions(+)

commit 480300ee4c05856a02a561240090fb39efb678bc
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Oct 2 16:08:39 2013 -0400

    Rename NUM_TP_ to TP_NUM_

 libempathy-gtk/empathy-tls-dialog.c   | 2 +-
 libempathy/empathy-contact.c	       | 2 +-
 libempathy/empathy-presence-manager.c | 6 +++---
 libempathy/empathy-status-presets.c   | 4 ++--
 tests/empathy-tls-test.c	       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

commit 22effb216e3a82f97da599b8885a6cadb488b4c5
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:	Sun Oct 6 22:03:32 2013 +0200

    [l10n] Updated Catalan (Valencian) translation

 po/ca@valencia.po | 5100
 +++++++----------------------------------------------
 1 file changed, 670 insertions(+), 4430 deletions(-)

commit 864a9b3129b14146ba0d2e893da99ced1960a678
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Oct 2 16:53:43 2013 -0400

    EmpathyMessage: remove flags, they are useless

 libempathy-gtk/empathy-chat.c |  4 +---
 libempathy/empathy-message.c  | 37 ++-----------------------------------
 libempathy/empathy-message.h  |  2 --
 3 files changed, 3 insertions(+), 40 deletions(-)

commit 7c2e5a7f9d0ce3ee96f34fd954e6f147abd0c8b0
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Oct 2 16:50:59 2013 -0400

    Add missing telepathy-glib-dbus.h includes

 libempathy-gtk/empathy-call-utils.c		  | 1 +
 libempathy-gtk/empathy-chat.c			  | 1 +
 libempathy-gtk/empathy-contact-blocking-dialog.c | 1 +
 libempathy-gtk/empathy-individual-dialogs.c	  | 1 +
 libempathy-gtk/empathy-individual-menu.c	  | 1 +
 libempathy-gtk/empathy-individual-widget.c	  | 1 +
 libempathy-gtk/empathy-log-window.c		  | 1 +
 libempathy-gtk/empathy-share-my-desktop.c	  | 2 ++
 libempathy-gtk/empathy-subscription-dialog.c	  | 1 +
 libempathy/empathy-auth-factory.c		  | 1 +
 libempathy/empathy-chatroom-manager.c		  | 1 +
 libempathy/empathy-client-factory.c		  | 1 +
 libempathy/empathy-ft-factory.c		  | 2 ++
 libempathy/empathy-ft-handler.c		  | 1 +
 libempathy/empathy-individual-manager.c	  | 1 +
 libempathy/empathy-request-util.c		  | 2 ++
 libempathy/empathy-sasl-mechanisms.c		  | 1 +
 libempathy/empathy-server-sasl-handler.c	  | 1 +
 libempathy/empathy-server-tls-handler.c	  | 2 ++
 libempathy/empathy-tp-chat.c			  | 1 +
 libempathy/empathy-utils.c			  | 1 +
 src/empathy-accounts.c				  | 1 +
 src/empathy-call-factory.c			  | 2 ++
 src/empathy-call-observer.c			  | 1 +
 src/empathy-call-window.c			  | 1 +
 src/empathy-chat-manager.c			  | 1 +
 src/empathy-debug-window.c			  | 1 +
 src/empathy-event-manager.c			  | 1 +
 src/empathy-import-widget.c			  | 1 +
 src/empathy-invite-participant-dialog.c	  | 1 +
 src/empathy-preferences.c			  | 1 +
 31 files changed, 36 insertions(+)

commit c9ed3ccb624594660908c3d39ea8d182079dd000
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Oct 2 16:08:39 2013 -0400

    Rename NUM_TP_ to TP_NUM_

 libempathy-gtk/empathy-tls-dialog.c   | 2 +-
 libempathy/empathy-contact.c	       | 2 +-
 libempathy/empathy-presence-manager.c | 6 +++---
 libempathy/empathy-status-presets.c   | 4 ++--
 tests/empathy-tls-test.c	       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

commit e3cbf70a3ca4aba15a65ae170c0a0d54573b7649
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Tue Oct 1 14:31:58 2013 -0400

    Drop support for gstreamer 0.10

    GStreamer 1.0 is now mandatory.

 configure.ac		   | 58
 ++++++++++-------------------------------------
 src/empathy-audio-sink.c  | 22 ------------------
 src/empathy-audio-src.c   |  8 -------
 src/empathy-call-window.c | 42 +---------------------------------
 src/empathy-video-src.c   | 26 ---------------------
 5 files changed, 13 insertions(+), 143 deletions(-)

commit ee16f6d2271dfbd4c304a167c10161160f88ec9f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 3 11:10:46 2013 +0200

    ui-utils: remove useless self assignations

 libempathy-gtk/empathy-ui-utils.c | 6 ------
 1 file changed, 6 deletions(-)

commit 384ac925c41afea86fa9148c363c124ffcb661e7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 3 11:10:10 2013 +0200

    individual-widget: fix enum casting warning

 libempathy-gtk/empathy-individual-widget.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 71e69f68ae8e7ac926440e454620116661db59b9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 3 11:07:02 2013 +0200

    use folks_presence_details_get_default_message_from_type

    This has been introduced in folks since a while (0.7.1).

    Fix a FIXME and remove a enum casting warning.

 libempathy-gtk/empathy-individual-widget.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 7988da4b4ae7a2a183f2668c37e4ba0b96937cb9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 3 11:04:02 2013 +0200

    individual-view: fix enum casting warning

    Thanks clang for catching this!

 libempathy-gtk/empathy-individual-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e74e60626bbe30607234b92f825ccc0349fb503b
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date:	Mon Sep 30 19:20:34 2013 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

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

commit e7441bf9bbef93c39d38c9b266d53ef23597e108
Author: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date:	Thu Sep 26 16:17:54 2013 +0400

    EmpathyDebugWindow: set request widget size, drop set default size

    Empathy debug window opens w/ weird size. This caused by scrolled
    window. In official documentation of gtk+ I look that uses:
    gtk_widget_set_size_request (window, 300, 300);
    And it's work!

    Set default size isn't needed.

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

    Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>

 src/empathy-debug-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bb59da84356c47dd83b8b704ec0767176872754d
Author: Emin Tufan Çetin <etcetin@gmail.com>
Date:	Thu Sep 26 00:30:25 2013 +0300

    [l10n]Updated Turkish translation

 po/tr.po | 5449
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 2833 insertions(+), 2616 deletions(-)

commit 78ac77df184361b57a89170bf0472f71d197754f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 25 14:36:55 2013 +0200

    individual-store-channel: don't steal pixbuf store reference

    empathy_individual_store_get_individual_status_icon() doesn't return
    a reffed
    pixbuf so we have to ref it explicitly.

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

 libempathy-gtk/empathy-individual-store-channel.c | 3 +++
 1 file changed, 3 insertions(+)

commit f4ebc8f15b96354f65023148465f8f88b55c1496
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 11 16:41:24 2013 +0200

    use (room-name, account-path) as primary key when removing GMenuItem

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

 src/empathy-roster-window.c | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

commit a0602d0d2e8824394ba738a8677909b5c4676d95
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 11 16:27:04 2013 +0200

    menu_removed_cb: fix 'name' leak

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

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

commit ff897a9a71c4eb91548f40ab6ea09e17936cd8c1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 11 16:24:42 2013 +0200

    menu_removed_cb: call g_menu_model_get_n_items() once

    No need to call it during each iteration.

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

 src/empathy-roster-window.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 091002b85df80403470285c6e8d85617306467a8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 11 11:09:15 2013 +0200

    Create one single GAction to join rooms

    The proper way to handle multi menu items having the same semantic
    is to have
    one single GAction associated with different GMenuItem having specific
    parameters instead of having one action per menu item.

    Fix bgo#707885 as we no longer have spaces in GMenuItem action names.

 src/empathy-roster-window.c | 80
 ++++++++++++++++++++++++++-------------------
 1 file changed, 46 insertions(+), 34 deletions(-)

commit c19df458d8846dc961984990f103b79bb39f9bf9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 24 15:56:58 2013 +0200

    preferences: remove location resources BIND_SENSITIVE calls

    32529f49e3935b5f4fd747fcfe2d62322f86ec52 removed the BIND_ACTIVE
    calls but I
    forgot those.

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

 src/empathy-preferences.c | 6 ------
 1 file changed, 6 deletions(-)

commit 846cf36946ff8c36cf75678d9ed6552c33326228
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 24 17:14:21 2013 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 72bf71739ec99d5fa4131d2b7c0244a7218e694f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 24 17:09:08 2013 +0200

    3.10.0

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

commit b205d66b7ecf9c0eb6aa89ff4f67b73bc211bc07
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 24 16:38:25 2013 +0200

    theme-adium: still execute the start of the script if ressource
    is missing

    This fix a regression introduced by
    19e784a4b2655db5cf414c7ce43662a9adb9d0c6.

    If empathy-chat.js can't be find (like in the preferences dialog)
    we still
    want to execute the start of the script.

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

 libempathy-gtk/empathy-theme-adium.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit fcba8619c50e66c4300099e861b0c5ab78f7d739
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date:	Mon Sep 23 21:48:45 2013 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

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

commit 0190fc7fa45c0693f1cfa1be4cb5a3b4b2b329b3
Author: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date:	Thu Sep 19 23:53:27 2013 +0400

    EmpathyDebugger: Initialize gint argc as 0

    Since f451000063d5e20b337d2a8d7b0d7faf6429af6b empathy-debugger
    crashes
    on start, because have cycle w/ argc++, but argc is uninitialized.

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

    Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>

 src/empathy-debugger.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 46f4a8bd263224a3cc86aab84341775528d60a33
Author: victory <victory.deb@gmail.com>
Date:	Mon Sep 23 17:12:10 2013 +0900

    l10n: Update Japanese translation

 po/ja.po | 90
 ++++++++++++++++++++++++----------------------------------------
 1 file changed, 33 insertions(+), 57 deletions(-)

commit 4939634cf2248261077ad508838f3ade36a6c766
Author: Jiro Matsuzawa <jmatsuzawa@gnome.org>
Date:	Mon Sep 23 17:11:16 2013 +0900

    l10n: Update Japanese translation

    Merge the latest pot.

 po/ja.po | 2913
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 1356 insertions(+), 1557 deletions(-)

commit 74864c243b9571bff4339861c9514df2264f46e0
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	Mon Sep 23 10:01:09 2013 +0300

    [l10n] Updated Estonian translation

 po/et.po | 1365
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 678 insertions(+), 687 deletions(-)

commit 2cf3cbd5945dc05183a562c82093000ed6336342
Author: Daniel Korostil <ted.korostiled@gmail.com>
Date:	Sat Sep 21 21:03:44 2013 +0300

    Updated Ukrainian

 po/uk.po | 2788
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1248 insertions(+), 1540 deletions(-)

commit e88863b2888a3b68dc60e4497f5e0b3c7d84224f
Author: Peter Mráz <etkinator@gmail.com>
Date:	Sat Sep 21 19:12:52 2013 +0200

    Updated slovak translation

 po/sk.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2d8e1b905b1aac058268e63b8b5e966dc01aa0e2
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Thu Sep 19 20:50:06 2013 +0200

    Update Arabic translation

 po/ar.po | 3064
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 1413 insertions(+), 1651 deletions(-)

commit 0d02c94dfc76da8dc5c06be4e36b7919243ceb85
Author: Josep Sànchez <papapep@gmx.com>
Date:	Wed Sep 18 23:56:55 2013 +0200

    [l10n] Update Catalan translation

 po/ca.po | 5054
 ++++++++------------------------------------------------------
 1 file changed, 647 insertions(+), 4407 deletions(-)

commit 878319954abed5dcb72ffd92262a780eae08d8f5
Author: Enrico Nicoletto <liverig@gmail.com>
Date:	Wed Sep 18 20:11:59 2013 -0300

    Updated Brazilian Portuguese translation

 help/Makefile.am    |	  2 +-
 help/pt_BR/pt_BR.po | 3661
 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 3662 insertions(+), 1 deletion(-)

commit 255f1a228489cc65d768b609f1a318808aee6637
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Wed Sep 18 18:03:01 2013 +0200

    Updated Basque language

 po/eu.po | 2782
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1247 insertions(+), 1535 deletions(-)

commit 32045c1ddb7e96e2612bad53811559ca1c92ec37
Author: A S Alam <apreet.alam@gmail.com>
Date:	Tue Sep 17 19:55:02 2013 -0500

    Punjabi Translation updated by Aman

 po/pa.po | 2808
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1265 insertions(+), 1543 deletions(-)

commit 46b24776f85bd176aca2b9693499db3ddd6cf0de
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 17 12:18:18 2013 +0200

    coding style fixes

 libempathy-gtk/empathy-protocol-chooser.c | 2 +-
 libempathy-gtk/empathy-roster-view.c	   | 4 ++--
 src/empathy-accounts.c			   | 2 +-
 src/empathy-debugger.c			   | 2 +-
 src/empathy.c				   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

commit 71a71435e2e68d8239a0ffebf55b0e70fd899eac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 17 12:15:21 2013 +0200

    add missing config.h includes

 extensions/extensions-cli.c		  | 2 ++
 extensions/extensions.c		  | 2 ++
 tests/empathy-chatroom-manager-test.c	  | 2 ++
 tests/empathy-chatroom-test.c		  | 2 ++
 tests/empathy-irc-network-manager-test.c | 2 ++
 tests/empathy-irc-network-test.c	  | 2 ++
 tests/empathy-irc-server-test.c	  | 2 ++
 tests/empathy-tls-test.c		  | 2 ++
 8 files changed, 16 insertions(+)

commit 8a75eddb82f9ec2715c10c2a96dc11986e0768c5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 17 12:15:04 2013 +0200

    tls-test: use tp-glib single headers

 tests/empathy-tls-test.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit f7707b70f09c63f379641263afca637ae2827d30
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date:	Mon Sep 16 21:13:05 2013 +0200

    Updated Danish translation

 po/da.po | 2791
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1250 insertions(+), 1541 deletions(-)

commit 4fd881173572da6eee4d43d3f70086f246c79c5a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 16 17:44:32 2013 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2570147eeea5091acd02ff310f722161f4ae328a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 16 17:38:09 2013 +0200

    prepare 3.9.92

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

commit c2e916b5226ef76ce686119b79d1f49574e5c480
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 16 17:17:09 2013 +0200

    Template.html: remove DOCTYPE

    This ensures that WebKit considers the document in 'quirks' mode
    which is now
    needed when using document.body.scrollTop (used to check if we
    should scroll
    down or not when adding a new message).

    See https://bugs.webkit.org/show_bug.cgi?id=121419 for details.

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

 data/Template.html | 1 -
 1 file changed, 1 deletion(-)

commit 5c48cc7d0603f68feed952c1a63fe1452baad56d
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Fri Sep 13 17:07:30 2013 -0400

    nautilus-send-to: Use GtkListBox API instead of EggListBox

 nautilus-sendto-plugin/empathy-nautilus-sendto.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit d3646aa06b78b80ab9389ae03ac21554339b2746
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Fri Sep 13 17:01:19 2013 -0400

    Stop using deprecated libaccounts-glib functions

 configure.ac					    |  2 +-
 libempathy/empathy-uoa-auth-handler.c		    | 64
 ++++++++++++++--------
 telepathy-account-widgets			    |  2 +-
 .../account-plugins/empathy-accounts-plugin.c	    | 12 ++--
 4 files changed, 49 insertions(+), 31 deletions(-)

commit d193c9e8695cc70e279c5fb9cecaebc55e606827
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Fri Sep 13 15:49:23 2013 -0400

    Stop using Folks deprecated functions

 configure.ac					  | 2 +-
 libempathy-gtk/empathy-roster-model-aggregator.c | 2 +-
 libempathy/empathy-individual-manager.c	  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 149a905bd95e78f8ba6c1bc35444fba3aabbe28a
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Fri Sep 13 17:32:42 2013 -0400

    Fix UOA build

 .../cc-plugins/account-plugins/Makefile.am	    |  2 ++
 .../empathy-accounts-plugin-widget.c		    | 38
 +++++++++++-----------
 .../account-plugins/empathy-accounts-plugin.c	    |  5 +--
 .../cc-plugins/app-plugin/Makefile.am		    |  2 ++
 .../app-plugin/empathy-app-plugin-widget.c	    | 12 +++----
 5 files changed, 32 insertions(+), 27 deletions(-)

commit 6f4863853b0d09071ec20a9d106c2df152066b76
Author: Ville-Pekka Vainio <vpvainio@iki.fi>
Date:	Sat Sep 14 22:57:49 2013 +0300

    Finnish translation update by Jiri Grönroos

 po/fi.po | 2930
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1331 insertions(+), 1599 deletions(-)

commit 17930334bab62edd3fcb6825315e000814c5dfa9
Author: Benjamin Steinwender <b@stbe.at>
Date:	Sat Sep 14 20:23:08 2013 +0200

    Updated German translation

 po/de.po | 2299
 ++++++++++++++++++++++----------------------------------------
 1 file changed, 829 insertions(+), 1470 deletions(-)

commit 3a9decce3f1655b4a707739df979617382134b25
Author: Changwoo Ryu <cwryu@debian.org>
Date:	Sat Sep 14 07:09:04 2013 +0900

    Updated Korean translation

 po/ko.po | 2175
 ++++++++++++++++++--------------------------------------------
 1 file changed, 637 insertions(+), 1538 deletions(-)

commit fe42637e27b2e0184e7916f6b00a6ef3d8e32798
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Thu Sep 12 16:08:05 2013 +0200

    Updated Hungarian translation

 po/hu.po | 2544
 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 1124 insertions(+), 1420 deletions(-)

commit 6c695a09cb1588942b05b5126c35451eedce9c69
Author: Nilamdyuti Goswami <ngoswami@redhat.com>
Date:	Thu Sep 12 14:45:11 2013 +0530

    Assamese Translation Updated

 po/as.po | 2838
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1277 insertions(+), 1561 deletions(-)

commit 29e64dbc45497fcbf67f611351e586c71ed2397e
Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
Date:	Wed Sep 11 23:01:03 2013 +0300

    Updated Latvian translation

 po/lv.po | 2810
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1267 insertions(+), 1543 deletions(-)

commit 994efa439ede5106f0f0f903400bcc0291f94018
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Thu Sep 12 00:03:45 2013 +0530

    Use tpaw_uoa_manager_dup instead of empathy_uoa_manager_dup

 libempathy/empathy-uoa-auth-handler.c | 2 +-
 src/empathy-sanity-cleaning.c	       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 3f134034c3024e9d07da80f8b1866ae4bb52c1cc
Author: Pavol Klačanský <pavol@klacansky.com>
Date:	Tue Sep 10 21:19:30 2013 +0200

    Updated slovak translation

 po/sk.po | 228
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 115 insertions(+), 113 deletions(-)

commit a23ab54e521f5f9fb55bcaf2d4fe78eb03bafbd4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 10 09:28:13 2013 +0200

    .gitignore: automake 1.13 copies in /test-driver

 .gitignore | 1 +
 1 file changed, 1 insertion(+)

commit d121d6a9b9d4d3a654dfd2b0e900be216f161dba
Merge: 9129f3e 8c83da9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 9 16:24:21 2013 +0200

    Merge branch 'gnome-3-8'

    Conflicts:
	NEWS
	configure.ac

commit 8c83da990d4791fc91b52856536c3d05f59bc832
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 9 16:23:37 2013 +0200

    debug-window: fix typo

 src/empathy-debug-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6cb72e7ccff8d0b9c2c779d4b4d852873705a642
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 9 15:48:52 2013 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3ac598277bb65f10dcb0c4f979c66e692cc089ce
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 9 15:39:43 2013 +0200

    prepare 3.8.4

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

commit 9129f3e31d22e7b375f3c90fd2e89e05f5e564eb
Merge: d0f21a3 fa72bed
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 9 15:22:44 2013 +0200

    Merge branch 'gnome-3-8'

    Conflicts:
	libempathy/empathy-keyring.c

commit fa72bed70086dc63d06577fde43dc6ed7196e0b9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 9 15:16:05 2013 +0200

    debug-window: ellipsize the message text renderer

    Ridiculously long messages were crashing empathy-debugger because
    Pango
    weren't able to display them all.

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

 src/empathy-debug-window.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit d0f21a3141e42af7db300c7ffe8d1f2c32843bc0
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Mon Sep 9 16:15:12 2013 +0400

    Updated Russian translation

 po/ru.po | 2706
 ++++++++++++++++++--------------------------------------------
 1 file changed, 790 insertions(+), 1916 deletions(-)

commit ade90f4f06e468aa3190334fba5d5232626d9ea7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 9 10:36:20 2013 +0200

    add empathy.appdata.xml

 data/Makefile.am	  |  4 ++++
 data/empathy.appdata.xml | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

commit b0d8548254d521cc2d0371e1005a5f3f0d4a6bcf
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Mon Sep 9 00:30:32 2013 +0200

    Updated Hungarian help translation

 help/hu/hu.po | 1170
 ++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 702 insertions(+), 468 deletions(-)

commit 43b93ba01895fc2deb22d461375528c68c3ccdc5
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sun Sep 8 19:25:03 2013 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 795
 +++++++--------------------------------------------------------
 1 file changed, 89 insertions(+), 706 deletions(-)

commit 8eede3f7b5d9f4f72be0d30bd4274ed872b4e6d0
Author: Andika Triwidada <andika@gmail.com>
Date:	Sun Sep 8 18:55:40 2013 +0700

    Updated Indonesian translation

 po/id.po | 2169
 ++++++++++++++++++--------------------------------------------
 1 file changed, 627 insertions(+), 1542 deletions(-)

commit ecd9facd260a0391449a6373b1d67921e636baae
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Sun Sep 8 11:48:43 2013 +0300

    Updated Belarusian translation.

 po/be.po | 2170
 ++++++++++++++++++--------------------------------------------
 1 file changed, 629 insertions(+), 1541 deletions(-)

commit 3441f551bfe909035301748d903746c25eb3d5d0
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Sat Sep 7 05:20:03 2013 +0200

    Updated Serbian translation

 po/sr.po	| 2204
 +++++++++++++++++---------------------------------------
 po/sr@latin.po | 2204
 +++++++++++++++++---------------------------------------
 2 files changed, 1294 insertions(+), 3114 deletions(-)

commit ea5ffd2ccf42b587351453d629b4c244c910b1f7
Author: Marek Černocký <marek@manet.cz>
Date:	Thu Sep 5 15:09:33 2013 +0200

    Updated Czech translation

 po/cs.po | 1912
 ++++++++++++++++----------------------------------------------
 1 file changed, 490 insertions(+), 1422 deletions(-)

commit d6dc1b7b7d99b31e304fc862f9dc9a3913fb6552
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 5 09:33:37 2013 +0200

    bump GDK_VERSION_MIN_REQUIRED to 3.8

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

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3ce67215498ee974d39efc3b49455c9f4d9d4a01
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 5 09:33:12 2013 +0200

    stop using gtk_style_context_get_font

    It's been deprecated.

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

 libempathy-gtk/empathy-cell-renderer-text.c | 7 +++++--
 src/empathy-chat-window.c		     | 9 ++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

commit 6d0aaf470a2e8b189370eba8c30f0e7181fbd365
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 5 09:31:06 2013 +0200

    stop using gtk_icon_info_free()

    It's been deprecated.

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

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

commit 9f41e5eec7a8971dee4e76636dcdb4318083f6f3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 4 16:02:53 2013 +0200

    remove egg-list-box

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

 .gitmodules		     |	3 ---
 autogen.sh		     |	6 +-----
 configure.ac		     | 10 ----------
 libempathy-gtk/Makefile.am  |	3 ---
 libempathy-gtk/egg-list-box |	1 -
 po/POTFILES.skip	     |	2 --
 6 files changed, 1 insertion(+), 24 deletions(-)

commit 505ec4079c478b56ce279fad99fdfdd28f2310c6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 4 16:19:48 2013 +0200

    roster-view: inherit from GtkListBox

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

 libempathy-gtk/empathy-roster-view.c		    | 143
 ++++++++++-----------
 libempathy-gtk/empathy-roster-view.h		    |	7 +-
 src/empathy-roster-window.c			    |  11 +-
 tests/interactive/test-empathy-dual-roster-view.c  |	3 +-
 .../test-empathy-roster-model-aggregator.c	    |	3 +-
 tests/interactive/test-empathy-roster-view.c	    |	3 +-
 6 files changed, 80 insertions(+), 90 deletions(-)

commit a2b853f3f87579d32a835c22bfcdedeab965df8c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 29 11:49:48 2013 +0200

    roster-group: inherit from GtkListBoxRow

    Need to be pack in a GtkListBox.

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

 libempathy-gtk/empathy-roster-group.c | 13 +++++++++----
 libempathy-gtk/empathy-roster-group.h |  7 +++++--
 libempathy-gtk/empathy-roster-view.c  |  6 +++---
 3 files changed, 17 insertions(+), 9 deletions(-)

commit 0e9e3cf651969dc4b4e82ddade02a02ca0ba1e5d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 4 15:55:33 2013 +0200

    roster-contact: inherit from GtkListBoxRow

    Need to be pack in a GtkListBox.

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

 libempathy-gtk/empathy-roster-contact.c | 15 ++++++++-------
 libempathy-gtk/empathy-roster-contact.h |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

commit 1c2c4983ab5a54b87c8e028202318505c8d0eed1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 29 11:49:48 2013 +0200

    depends on Gtk+ 3.9.4

    Needed for GtkListBox.

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

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

commit 2922737e84cc38ca3f151602b2a94acda74a2008
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 4 12:59:40 2013 +0200

    fix 'popup-individual-menu' in roster tests

    We added the 'group' argument to the signal.

 tests/interactive/test-empathy-dual-roster-view.c	  | 5 +++--
 tests/interactive/test-empathy-roster-model-aggregator.c | 5 +++--
 tests/interactive/test-empathy-roster-view.c		  | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

commit 24238851a5f3617c52bd60d1f99ac5eef0c079a1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 4 09:52:24 2013 +0200

    depend on Geoclue 1.99.3

    This version has been released with the 'export D-Bus XML' patch.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 778f771983892402d252a19bcd5ef5eae5d5d35e
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date:	Wed Sep 4 14:48:08 2013 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 2751
 ++++++++++++++++++++++++++--------------------------------
 po/zh_TW.po | 2752
 ++++++++++++++++++++++++++---------------------------------
 2 files changed, 2462 insertions(+), 3041 deletions(-)

commit cf5171d8486f05eef961e8023e4f552dc3ef99cf
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Wed Sep 4 02:21:51 2013 +0200

    Updated Polish translation

 po/pl.po | 223
 +++++++++++++++++++++++++--------------------------------------
 1 file changed, 87 insertions(+), 136 deletions(-)

commit 5cf33aa72f4e113afeb6fcae006c305dad872ad6
Author: Alexandre Franke <alexandre.franke@gmail.com>
Date:	Tue Sep 3 23:57:46 2013 +0200

    Update French translation

 po/fr.po | 2791
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1254 insertions(+), 1537 deletions(-)

commit d69d3952b53b7caa94e41d46fc6f76f726e98751
Author: Seán de Búrca <leftmostcat@gmail.com>
Date:	Tue Sep 3 15:52:36 2013 -0600

    Updated Irish translation

 po/ga.po | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 4b4ee4c871f9ac669c1c67c1c2d24af56e2dc2b7
Author: Aurimas Černius <aurisc4@gmail.com>
Date:	Wed Sep 4 00:14:59 2013 +0300

    Updated Lithuanian translation

 po/lt.po | 295
 +++++++++++++++++++++++++++------------------------------------
 1 file changed, 126 insertions(+), 169 deletions(-)

commit 65d08744465386ef287d80b04632f4c9cc5de737
Author: Seán de Búrca <leftmostcat@gmail.com>
Date:	Tue Sep 3 13:03:22 2013 -0600

    Updated Irish translation

 po/ga.po | 374
 ++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 165 insertions(+), 209 deletions(-)

commit 13b8e2d6845c6807b4b104d78d3c4a97b076355b
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Tue Sep 3 18:17:10 2013 +0200

    [l10n] Updated Italian translation.

 po/it.po | 133
 +++++++++++++++++----------------------------------------------
 1 file changed, 35 insertions(+), 98 deletions(-)

commit d5303e7d1ca5571ee9fd84e07ff500ac835413a4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 3 17:15:51 2013 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d0e784f22efcc6cbf85f1c74446c4fb8c091e03b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 3 17:10:36 2013 +0200

    3.9.91

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

commit 71f08a0f943ee4d0da96222ca78b8908a460eaa4
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Tue Sep 3 16:04:39 2013 +0100

    telepathy-account-widgets: update submodule

    This update is needed to fix an issue with translations, see
    https://bugzilla.gnome.org/show_bug.cgi?id=707208

 telepathy-account-widgets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fba02abc7c353ba4a464cff2335076c78161f046
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Tue Sep 3 16:00:36 2013 +0100

    configure.ac: pass --with-gettext-package to tp-aw's configure

    telepathy-account-widgets is a submodule, so it can be included by
    multiple projects. If we don't have a different per-project
    GETTEXT_PACKAGE we end up with different projects shipping .mo files
    supposed to be installed in the same location.

 configure.ac | 1 +
 1 file changed, 1 insertion(+)

commit 00fe6300fe015f7ac6caaedf297103d20f038165
Author: Tim Lunn <tim@feathertop.org>
Date:	Tue Sep 3 11:39:46 2013 +1000

    UOA: Fix build failure

    This was a regression caused by
    c689cd6a91cb2a31ce0d03f47e59ca4e3f368e9c

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

 libempathy/empathy-uoa-auth-handler.c | 2 +-
 src/empathy-sanity-cleaning.c	       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 32529f49e3935b5f4fd747fcfe2d62322f86ec52
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 2 14:45:32 2013 +0200

    preferences: remove location sources preferences

    Not used anymore with Geoclue 2.

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

 data/empathy.convert		    |  3 --
 data/org.gnome.Empathy.gschema.xml | 15 -------
 libempathy/empathy-gsettings.h     |  3 --
 src/empathy-preferences.c	    |  6 ---
 src/empathy-preferences.ui	    | 88
 --------------------------------------
 5 files changed, 115 deletions(-)

commit f6f6c6421e0e286db920d3e01fa64cc3ebe4f4df
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 2 14:37:41 2013 +0200

    location-manager: use Geoclue 2

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

 libempathy-gtk/empathy-location-manager.c | 443
 +++++-------------------------
 1 file changed, 72 insertions(+), 371 deletions(-)

commit dcb5ddc560b51cc5eb59a2ef27d91cf279271f36
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 2 14:21:12 2013 +0200

    add empathy-geoclue-helper

    Based on a proposed API on fdo#68658. May end up in geoclue at
    some point.

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

 configure.ac				 |  13 +-
 libempathy-gtk/.gitignore		 |   2 +
 libempathy-gtk/Makefile.am		 |  19 +-
 libempathy-gtk/empathy-geoclue-helper.c | 523
 ++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-geoclue-helper.h |  99 ++++++
 5 files changed, 651 insertions(+), 5 deletions(-)

commit 28be7462f56d5ab80c360d3090de6298a96a3e01
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 30 15:37:03 2013 +0200

    depends on GLib 2.37

    Needed for the latest GDbus code gen.

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

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

commit 5101f2c6fb25c5b843eafdccd9e3f8e3824c82ee
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Tue Sep 3 12:11:46 2013 +0300

    Updated Hebrew translation.

 po/he.po | 168
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 87 insertions(+), 81 deletions(-)

commit 534d63f778f431bb017527ce19a9b390b0624d1e
Author: Rafael Ferreira <rafael.f.f1@gmail.com>
Date:	Mon Sep 2 20:57:31 2013 -0300

    Update Brazilian Portuguese translation, proofread by Enrico Nicoletto

 po/pt_BR.po | 1009
 ++++++-----------------------------------------------------
 1 file changed, 89 insertions(+), 920 deletions(-)

commit 0cb69b7763e2e0a923426fe6690e5ce66b98ce99
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Mon Sep 2 23:00:39 2013 +0200

    Updated Slovenian translation

 po/sl.po | 2469
 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 1084 insertions(+), 1385 deletions(-)

commit 816887feeee72b5437d6a58bad69ffbe6eb9d685
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Sep 2 18:04:46 2013 +0200

    Updated Spanish translation

 po/es.po | 2443
 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 1075 insertions(+), 1368 deletions(-)

commit 19e784a4b2655db5cf414c7ce43662a9adb9d0c6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 2 17:33:48 2013 +0200

    theme-adium: deal with g_resources_lookup_data() failing

    Only empathy-chat registers the gresources so when executing this
    code from
    the empathy process (theme preview in the preferences dialog) we
    don't find
    the resource. That's fine as this JS code is only used for the
    infinite
    callback but best to not warning.

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

 libempathy-gtk/empathy-theme-adium.c | 3 +++
 1 file changed, 3 insertions(+)

commit c7103f75e10d3c8efd65f6e60bc446a198cbb080
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Mon Sep 2 17:06:05 2013 +0200

    Updated Galician translations

 po/gl.po | 64
 ++++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 36 insertions(+), 28 deletions(-)

commit 8afea2c3fb4dcff5b22f3382dff4f1aeee8ba764
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 2 15:06:57 2013 +0200

    telepathy-account-widgets: update to master

 telepathy-account-widgets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 19ba093fed63fb9aae5888fa03bd3261146a635d
Author: Seán de Búrca <leftmostcat@gmail.com>
Date:	Mon Sep 2 01:13:51 2013 -0600

    Updated Irish translation

 po/ga.po | 185
 ++++++++++++++++++++++++++-------------------------------------
 1 file changed, 77 insertions(+), 108 deletions(-)

commit 386237efa3a448829433d5883dbfbea82b246798
Author: Seán de Búrca <leftmostcat@gmail.com>
Date:	Thu Aug 29 21:24:46 2013 -0600

    Use typographical ellipses consistently

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

 libempathy-gtk/empathy-log-window.ui |  4 ++--
 src/empathy-accounts-dialog.c	      |  2 +-
 src/empathy-roster-window-menubar.ui | 10 +++++-----
 src/empathy-roster-window.c	      |  2 +-
 src/empathy-roster-window.ui	      |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

commit 4d9e7ccbabfff99fa1786066c75f7a276fed3923
Author: Seán de Búrca <leftmostcat@gmail.com>
Date:	Thu Aug 29 15:47:31 2013 -0600

    Updated Irish translation

 po/ga.po | 2335
 ++++++++++++++++++++------------------------------------------
 1 file changed, 747 insertions(+), 1588 deletions(-)

commit 34bf737d7c2f15a952a9f431b6760c4f741bf6cf
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Thu Aug 29 01:10:00 2013 +0200

    Updated POTFILES.skip

 po/POTFILES.skip | 2 ++
 1 file changed, 2 insertions(+)

commit 42ffbec9e4de4b2d34769d3fc9851572e1f3c3e8
Author: Pavol Klačanský <pavol@klacansky.com>
Date:	Wed Aug 28 20:47:30 2013 +0200

    Updated slovak translation

 po/sk.po | 816
 ++++-----------------------------------------------------------
 1 file changed, 47 insertions(+), 769 deletions(-)

commit d5827a8b1c3602d685b5a3a353368ea7417e4053
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 28 16:08:39 2013 +0200

    egg-list-box: update to master

    Update the signature of our sort function as its API changed.

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

 libempathy-gtk/egg-list-box	      | 2 +-
 libempathy-gtk/empathy-roster-view.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 0ce20ee95fb3dc4e259b641928bf4ad891b1fd43
Author: Aurimas Černius <aurisc4@gmail.com>
Date:	Tue Aug 27 22:57:19 2013 +0300

    Updated Lithuanian translation

 po/lt.po | 1778
 ++++++++++++++++----------------------------------------------
 1 file changed, 447 insertions(+), 1331 deletions(-)

commit 9f8fcc3d15c96917dc20cd968fffcfd472931b68
Author: Seán de Búrca <leftmostcat@gmail.com>
Date:	Mon Aug 26 15:02:19 2013 -0600

    Fix build with correct macro

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

 src/empathy-roster-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2ac6c3ae63c17b8a4b3559d8d2587fff7d63b4cb
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Tue Aug 27 03:16:56 2013 +0200

    Updated Galician translations

 po/gl.po | 2436
 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 1066 insertions(+), 1370 deletions(-)

commit ef161f03ceaad1999e41f8a06626b056a5b7e675
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sat Aug 24 18:51:12 2013 +0200

    [l10n] Updated Italian translation.

 po/it.po | 1838
 ++++++++++++++++----------------------------------------------
 1 file changed, 472 insertions(+), 1366 deletions(-)

commit a66eb2416fc90deef46ee1c94271d7be869bc383
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Mon Jul 22 23:10:41 2013 +0530

    RosterWindow: Connect to signal "menu-item-activated" from
    EmpathyIndividualMenu

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

 src/empathy-roster-window.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit d841954eddd303fe94a73a6f75926a3ffbedf212
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Thu Jul 18 17:10:53 2013 +0530

    Emit menu-item-activated when an action is performed from the
    individual menu

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

 libempathy-gtk/empathy-individual-menu.c | 86
 +++++++++++++++++++++++---------
 libempathy-gtk/empathy-individual-menu.h |  4 +-
 libempathy-gtk/empathy-individual-view.c |  4 +-
 3 files changed, 66 insertions(+), 28 deletions(-)

commit 5aab8d1d5ccc341695d3241edc743299c1e62187
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Mon Jul 22 22:24:31 2013 +0530

    Deploy a signal "menu-item-activated" in EmpathyIndividualMenu

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

 libempathy-gtk/empathy-individual-menu.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit 75f2647273711e9c3af162a12d3fb58737e91c9b
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Mon Jul 22 15:12:54 2013 +0530

    Roster: Hide search-bar on hitting Enter on selected individual

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

 src/empathy-roster-window.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit a2461f80c26b11e689f462142d10cb4862d38e38
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Thu Aug 22 15:26:51 2013 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 2332
 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 1014 insertions(+), 1318 deletions(-)

commit 01f7c68912d1897f0a709a4138d9c7aa54c4f21b
Author: Pavol Klačanský <pavol@klacansky.com>
Date:	Wed Aug 21 22:18:34 2013 +0200

    Updated slovak translation

 po/sk.po | 7130
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 3422 insertions(+), 3708 deletions(-)

commit 68cd4414cd8ff8163d178e4dc4ac69ca7600ba40
Author: Alexandre Franke <alexandre.franke@gmail.com>
Date:	Wed Aug 21 21:22:07 2013 +0200

    Update French translation

 help/fr/fr.po | 1091
 +++++++++++++++++++++++++++++++++------------------------
 1 file changed, 632 insertions(+), 459 deletions(-)

commit df11586236807cefcbf82a99b28406dfc41a3ef2
Author: Enrico Nicoletto <liverig@gmail.com>
Date:	Wed Aug 21 15:45:35 2013 -0300

    Updated Brazilian Portuguese translation

 po/pt_BR.po | 2389
 ++++++++++++++++++++++++++---------------------------------
 1 file changed, 1042 insertions(+), 1347 deletions(-)

commit 04f0c0274568e77a2d4b17244987c383f5fa8f46
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Wed Aug 21 13:10:44 2013 +0300

    Updated Hebrew translation.

 po/he.po | 2364
 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 1030 insertions(+), 1334 deletions(-)

commit b7ea134936d9a6d4723b6b6e9f9bd63a2d802ed2
Author: Andrea Veri <av@gnome.org>
Date:	Wed Aug 21 00:04:08 2013 +0200

    <name> should match repository's name.

 empathy.doap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 12fc11d86592f8a5c11bf9135e19b7961d55aee1
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Tue Aug 20 22:48:09 2013 +0200

    Updated Polish translation

 po/pl.po | 2099
 ++++++++++++++++++--------------------------------------------
 1 file changed, 618 insertions(+), 1481 deletions(-)

commit 77e07fc2d134a663ff2af3dcb500f3f6c386ee5e
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Aug 20 16:21:57 2013 +0200

    call-window: ensure "Swap camera" is only visible when there are
    >1 cameras

    It was possible to get into a state where "Swap camera" was visible
    even when there was only one camera connected.

 src/empathy-call-window.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

commit 1fca8aff9bd2bbd3b54022983a6533f2dfd74e89
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 20 14:04:48 2013 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b5d33b6f579527f84857224f86462b4a4874286f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 20 13:58:00 2013 +0200

    3.9.90

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

commit a5974320dc481846931f4bd24f279b7edea8b03b
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Thu Aug 1 17:29:48 2013 +0100

    POTFILES.skip: ignore the whole telepathy-account-widgets directory

 po/POTFILES.skip | 2 ++
 1 file changed, 2 insertions(+)

commit 2269246c68289af5406a9d1006ce4b38d28696ef
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Thu Aug 1 15:39:34 2013 +0100

    empathy-env.in: set TPAW_SRCDIR

 tools/empathy-env.in | 3 +++
 1 file changed, 3 insertions(+)

commit 80137708540beac4d4c43cfc4da0fcaef41c6478
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Thu Aug 1 15:44:41 2013 +0100

    configure.ac: get the UOA provider name from tp-aw's pkg-config file

 configure.ac | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 81c7fc7c78edc166017d677339bd774c487e0cd4
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Tue Aug 20 10:09:48 2013 +0100

    configure.ac: if unreleased, enable tp-aw's extra warnings

    telepathy-account-widget cannot rely on a variable similar to
    empathy_released for extra warnings, so Empathy's configure script
    passes --enable-unreleased-checks to it if empathy_released is not 1.

 configure.ac | 4 ++++
 1 file changed, 4 insertions(+)

commit 8e03d34d20359a48bbc3f6d9e98971248e81f550
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Thu Aug 1 15:37:52 2013 +0100

    configure.ac: pass --with-pkgdatadir to tp-aw's configure

 configure.ac | 1 +
 1 file changed, 1 insertion(+)

commit 07a671af77628fe419e0933e3a04dedf1f4efaa6
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon May 20 13:40:37 2013 +0100

    tp-account-widgets: remove internal copy

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

 tp-account-widgets/.gitignore			    |	 1 -
 tp-account-widgets/Makefile.am			    |  167 --
 tp-account-widgets/cheese-camera-device-monitor.c  |  406 ----
 tp-account-widgets/cheese-camera-device-monitor.h  |	67 -
 tp-account-widgets/irc-networks.xml		    |  545 -----
 tp-account-widgets/totem-subtitle-encoding.c	    |  584 -----
 tp-account-widgets/totem-subtitle-encoding.h	    |	41 -
 tp-account-widgets/tpaw-account-settings.c	    | 1653 --------------
 tp-account-widgets/tpaw-account-settings.h	    |  207 --
 tp-account-widgets/tpaw-account-widget-aim.ui	    |  299 ---
 tp-account-widgets/tpaw-account-widget-generic.ui  |  122 -
 .../tpaw-account-widget-groupwise.ui		    |  292 ---
 tp-account-widgets/tpaw-account-widget-icq.ui	    |  320 ---
 tp-account-widgets/tpaw-account-widget-irc.c	    |  242 --
 tp-account-widgets/tpaw-account-widget-irc.h	    |	42 -
 tp-account-widgets/tpaw-account-widget-irc.ui	    |  603 -----
 tp-account-widgets/tpaw-account-widget-jabber.ui   |  792 -------
 .../tpaw-account-widget-local-xmpp.ui		    |  217 --
 tp-account-widgets/tpaw-account-widget-msn.ui	    |  292 ---
 tp-account-widgets/tpaw-account-widget-private.h   |	45 -
 tp-account-widgets/tpaw-account-widget-sip.c	    |  260 ---
 tp-account-widgets/tpaw-account-widget-sip.h	    |	34 -
 tp-account-widgets/tpaw-account-widget-sip.ui	    |  731 ------
 tp-account-widgets/tpaw-account-widget-yahoo.ui    |  330 ---
 tp-account-widgets/tpaw-account-widget.c	    | 2372
 --------------------
 tp-account-widgets/tpaw-account-widget.h	    |	95 -
 .../tpaw-account-widgets.gresource.xml		    |	17 -
 tp-account-widgets/tpaw-avatar-chooser.c	    | 1221 ----------
 tp-account-widgets/tpaw-avatar-chooser.h	    |	67 -
 tp-account-widgets/tpaw-builder.c		    |  178 --
 tp-account-widgets/tpaw-builder.h		    |	49 -
 tp-account-widgets/tpaw-calendar-button.c	    |  273 ---
 tp-account-widgets/tpaw-calendar-button.h	    |	67 -
 tp-account-widgets/tpaw-camera-monitor.c	    |  295 ---
 tp-account-widgets/tpaw-camera-monitor.h	    |	69 -
 tp-account-widgets/tpaw-connection-managers.c	    |  324 ---
 tp-account-widgets/tpaw-connection-managers.h	    |	89 -
 tp-account-widgets/tpaw-contactinfo-utils.c	    |  265 ---
 tp-account-widgets/tpaw-contactinfo-utils.h	    |	45 -
 tp-account-widgets/tpaw-debug.c		    |  149 --
 tp-account-widgets/tpaw-debug.h		    |	87 -
 tp-account-widgets/tpaw-gsettings.h		    |	37 -
 tp-account-widgets/tpaw-images.h		    |	31 -
 .../tpaw-irc-network-chooser-dialog.c		    |  731 ------
 .../tpaw-irc-network-chooser-dialog.h		    |	73 -
 tp-account-widgets/tpaw-irc-network-chooser.c	    |  407 ----
 tp-account-widgets/tpaw-irc-network-chooser.h	    |	67 -
 tp-account-widgets/tpaw-irc-network-dialog.c	    |  590 -----
 tp-account-widgets/tpaw-irc-network-dialog.h	    |	35 -
 tp-account-widgets/tpaw-irc-network-manager.c	    |  822 -------
 tp-account-widgets/tpaw-irc-network-manager.h	    |	88 -
 tp-account-widgets/tpaw-irc-network.c		    |  364 ---
 tp-account-widgets/tpaw-irc-network.h		    |	87 -
 tp-account-widgets/tpaw-irc-networks.dtd	    |	18 -
 tp-account-widgets/tpaw-irc-server.c		    |  216 --
 tp-account-widgets/tpaw-irc-server.h		    |	65 -
 tp-account-widgets/tpaw-keyring.c		    |  720 ------
 tp-account-widgets/tpaw-keyring.h		    |	62 -
 tp-account-widgets/tpaw-live-search.c		    |  699 ------
 tp-account-widgets/tpaw-live-search.h		    |	80 -
 tp-account-widgets/tpaw-pixbuf-utils.c		    |  183 --
 tp-account-widgets/tpaw-pixbuf-utils.h		    |	48 -
 tp-account-widgets/tpaw-protocol.c		    |  544 -----
 tp-account-widgets/tpaw-protocol.h		    |	95 -
 tp-account-widgets/tpaw-string-parser.c	    |  199 --
 tp-account-widgets/tpaw-string-parser.h	    |	85 -
 tp-account-widgets/tpaw-time.c			    |  144 --
 tp-account-widgets/tpaw-time.h			    |	48 -
 tp-account-widgets/tpaw-uoa-utils.c		    |	49 -
 tp-account-widgets/tpaw-uoa-utils.h		    |	35 -
 tp-account-widgets/tpaw-user-info.c		    |  775 -------
 tp-account-widgets/tpaw-user-info.h		    |	74 -
 tp-account-widgets/tpaw-utils.c		    |  314 ---
 tp-account-widgets/tpaw-utils.h		    |  117 -
 74 files changed, 21856 deletions(-)

commit 3d1021753d01d973c929c8758b11a147498377cc
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon May 20 14:08:16 2013 +0100

    Use the telepathy-account-widgets submodule instead of the internal
    copy

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

 Makefile.am			    |  7 +++----
 autogen.sh			    |  6 +++++-
 configure.ac			    | 11 ++++++++++-
 libempathy-gtk/Makefile.am	    |  4 ++--
 libempathy/Makefile.am		    |  2 ++
 nautilus-sendto-plugin/Makefile.am |  2 ++
 src/Makefile.am		    |  4 ++--
 tests/Makefile.am		    |  4 ++--
 tests/interactive/Makefile.am	    |  4 ++--
 9 files changed, 30 insertions(+), 14 deletions(-)

commit 53a77d63614b6de76f0113b6d79a2c5ef9509e10
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Tue Aug 20 12:10:47 2013 +0100

    Add telepathy-account-widgets submodule

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

 .gitmodules		   | 3 +++
 telepathy-account-widgets | 1 +
 2 files changed, 4 insertions(+)

commit 0ede81245895faba6b31809cb905894f1afa98a7
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Thu Jul 25 17:16:16 2013 +0100

    POTFILES.in: remove files that were moved to tp-account-widgets

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

 po/POTFILES.in | 22 ----------------------
 1 file changed, 22 deletions(-)

commit eea136fc60c9b3cbb58820fb54d8b3d27901c2f8
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Tue Jul 30 17:33:39 2013 +0100

    tp-account-widgets/Makefile.am: don't check the style of copied files

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

 tp-account-widgets/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 540509cdee5b939f9965ae0fb6106a3b40a2ae3d
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon Jul 29 08:20:25 2013 +0100

    account-widget: add an "action-area" property

    This allows user of the class to get the buttons packed in a different
    widget, for instance the one returned by gtk_dialog_get_action_area.

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

 .../empathy-local-xmpp-assistant-widget.c	    |  2 +-
 libempathy-gtk/empathy-new-account-dialog.c	    |  3 +-
 src/empathy-accounts-dialog.c			    |  2 +-
 tp-account-widgets/tpaw-account-widget.c	    | 70
 +++++++++++++++++-----
 tp-account-widgets/tpaw-account-widget.h	    |  1 +
 5 files changed, 59 insertions(+), 19 deletions(-)

commit b16515893aeebd0dbd1623c6928f467cc0a17b63
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon Jul 29 08:04:15 2013 +0100

    account-widget: make the buttons look like normal dialog buttons

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

 tp-account-widgets/tpaw-account-widget.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 7385a4cd1409c00a6237187e72f90e50569fe0d4
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Fri Jul 26 14:37:42 2013 +0100

    protocol-chooser: port to TpawProtocol

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

 libempathy-gtk/empathy-protocol-chooser.c | 444
 ++++--------------------------
 libempathy-gtk/empathy-protocol-chooser.h |   7 +-
 2 files changed, 54 insertions(+), 397 deletions(-)

commit 533a7c55da7621aaefa3d3fabb45d3529be29f86
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Fri Jul 26 14:36:23 2013 +0100

    protocol: add an object to represent a protocol and a way to list them

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

 tp-account-widgets/Makefile.am     |	2 +
 tp-account-widgets/tpaw-protocol.c | 544
 +++++++++++++++++++++++++++++++++++++
 tp-account-widgets/tpaw-protocol.h |  95 +++++++
 3 files changed, 641 insertions(+)

commit 7647a821fd1155a4d8c791df993ad59b6b89a715
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon May 13 10:37:34 2013 +0100

    tp-account-widgets/Makefile.am: remove Empathy's include paths

    tp-account-widgets doesn't depend on Empathy headers any more!

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

 tp-account-widgets/Makefile.am | 2 --
 1 file changed, 2 deletions(-)

commit b879d882f8b12126cc8f513a88aae77c2c65ae5f
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon May 13 10:23:22 2013 +0100

    tp-account-widgets: don't include empathy(-ui)-utils.h

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

 tp-account-widgets/tpaw-account-settings.c	      | 1 -
 tp-account-widgets/tpaw-account-widget-irc.c	      | 1 -
 tp-account-widgets/tpaw-account-widget-sip.c	      | 1 -
 tp-account-widgets/tpaw-account-widget.c	      | 2 --
 tp-account-widgets/tpaw-avatar-chooser.c	      | 3 ---
 tp-account-widgets/tpaw-connection-managers.c	      | 1 -
 tp-account-widgets/tpaw-irc-network-chooser-dialog.c | 1 -
 tp-account-widgets/tpaw-irc-network-chooser.c	      | 2 --
 tp-account-widgets/tpaw-irc-network-dialog.c	      | 1 -
 tp-account-widgets/tpaw-irc-network-manager.c	      | 1 -
 tp-account-widgets/tpaw-irc-network.c		      | 1 -
 tp-account-widgets/tpaw-irc-server.c		      | 1 -
 tp-account-widgets/tpaw-keyring.c		      | 1 -
 tp-account-widgets/tpaw-live-search.c		      | 1 -
 tp-account-widgets/tpaw-string-parser.c	      | 2 --
 tp-account-widgets/tpaw-user-info.c		      | 2 --
 16 files changed, 22 deletions(-)

commit df2ff24c6a132e4b6cd40c9f82a24cec8c04a4aa
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon May 13 10:25:27 2013 +0100

    tp-account-widgets: use g_strcmp0 instead of strcmp

    There was no bug in this code, but I noticed the usage of strcmp
    because
    of compilation errors caused by some changes to the
    includes. g_strcmp0
    is safer as it handles NULLs.

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

 tp-account-widgets/tpaw-account-settings.c    | 2 +-
 tp-account-widgets/tpaw-account-widget.c      | 2 +-
 tp-account-widgets/tpaw-irc-network-manager.c | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

commit 72b6c3a680852d93aba90bfd87db0b7477b3f4f5
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon May 13 10:33:16 2013 +0100

    irc-network-dialog: include stdlib.h needed for strtoul

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

 tp-account-widgets/tpaw-irc-network-dialog.c | 1 +
 1 file changed, 1 insertion(+)

commit 5a1d279f345b8eb6e7c737e8dc1074c9737c0cc1
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Tue Jul 30 14:44:41 2013 +0100

    tpaw-string-parser: include string.h needed for strlen

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

 tp-account-widgets/tpaw-string-parser.c | 1 +
 1 file changed, 1 insertion(+)

commit 08a5c44c218c9a93d60c0975c317f0a7be4b677b
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon May 13 11:11:26 2013 +0100

    tpaw-utils: add the TPAW namespace to ACCOUNT_WIDGETS_RESOURCES_PREFIX

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

 tp-account-widgets/tpaw-account-widget.c     | 6 +++---
 tp-account-widgets/tpaw-irc-network-dialog.c | 2 +-
 tp-account-widgets/tpaw-utils.h	      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

commit 912b898b3ebc2bc096394686a10db1beae648e48
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon May 13 10:24:18 2013 +0100

    tpaw-utils: move ACCOUNT_WIDGETS_RESOURCES_PREFIX from Empathy

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

 libempathy-gtk/empathy-ui-utils.h	      | 2 --
 tp-account-widgets/tpaw-irc-network-dialog.c | 1 +
 tp-account-widgets/tpaw-utils.h	      | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

commit 70373899543768fd84a43b5cd777a986bfb4d156
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Fri May 10 18:10:20 2013 +0100

    debug: remove EMPATHY_DEBUG_IRC as it's not needed any more

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

 libempathy/empathy-debug.c |  1 -
 libempathy/empathy-debug.h | 25 ++++++++++++-------------
 2 files changed, 12 insertions(+), 14 deletions(-)

commit f9baf55754d0ebfefedb9685a1aca3f7f743975c
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Tue Jul 30 14:37:30 2013 +0100

    calendar-button: don't use the non-existing TPAW_DEBUG_OTHER_THING
    flag

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

 tp-account-widgets/tpaw-calendar-button.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e5783e685c3db89d4791c2f31a75c4204d1cb4a7
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Fri May 10 18:07:52 2013 +0100

    tpaw-debug: remove unused debug keys

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

 tp-account-widgets/tpaw-debug.c | 13 -------------
 tp-account-widgets/tpaw-debug.h | 21 ++++-----------------
 2 files changed, 4 insertions(+), 30 deletions(-)

commit 95684ec0c1ec4c598fdc29a3fd366ff5e7e2e1b2
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Fri May 10 18:04:54 2013 +0100

    tp-account-widgets: use TpAW's debugging functions instead of
    Empathy's

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

 tp-account-widgets/cheese-camera-device-monitor.c    | 4 ++--
 tp-account-widgets/tpaw-account-settings.c	      | 4 ++--
 tp-account-widgets/tpaw-account-widget-irc.c	      | 4 ++--
 tp-account-widgets/tpaw-account-widget.c	      | 4 ++--
 tp-account-widgets/tpaw-avatar-chooser.c	      | 4 ++--
 tp-account-widgets/tpaw-builder.c		      | 4 ++--
 tp-account-widgets/tpaw-calendar-button.c	      | 4 ++--
 tp-account-widgets/tpaw-camera-monitor.c	      | 4 ++--
 tp-account-widgets/tpaw-connection-managers.c	      | 4 ++--
 tp-account-widgets/tpaw-irc-network-chooser-dialog.c | 4 ++--
 tp-account-widgets/tpaw-irc-network-chooser.c	      | 4 ++--
 tp-account-widgets/tpaw-irc-network-manager.c	      | 4 ++--
 tp-account-widgets/tpaw-keyring.c		      | 4 ++--
 tp-account-widgets/tpaw-pixbuf-utils.c		      | 4 ++--
 tp-account-widgets/tpaw-uoa-utils.c		      | 4 ++--
 tp-account-widgets/tpaw-user-info.c		      | 4 ++--
 tp-account-widgets/tpaw-utils.c		      | 4 ++--
 17 files changed, 34 insertions(+), 34 deletions(-)

commit 1068d0c9446ddac9c03c8bc82bbd356647e134c4
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Fri May 10 18:00:09 2013 +0100

    debug: set tp-account-widgets's debug flags

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

 libempathy/empathy-debug.c | 3 +++
 1 file changed, 3 insertions(+)

commit 60114c1bce5b6814c17d6c83718318e1518ae330
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Fri May 10 17:57:44 2013 +0100

    tpaw-debug: don't set tp-glib's debug flags, Empathy does that

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

 tp-account-widgets/tpaw-debug.c | 2 --
 1 file changed, 2 deletions(-)

commit 76818b8b1ad18e0f9d7a44fb8545a820f9764052
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Fri May 10 17:50:33 2013 +0100

    tpaw-debug: copy from Empathy

    This commit just copies the files and renames the function.
    tp-account-widget's debugging stuff is not functional yet.

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

 tp-account-widgets/Makefile.am  |   2 +
 tp-account-widgets/tpaw-debug.c | 164
 ++++++++++++++++++++++++++++++++++++++++
 tp-account-widgets/tpaw-debug.h | 100 ++++++++++++++++++++++++
 3 files changed, 266 insertions(+)

commit a56fa2a95e93ad68ca08f336178b26baf3b3f29d
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Tue Jul 30 16:08:34 2013 +0100

    pixbuf-utils: copy the generic pixbuf-related utily functions
    from Empathy

    This commit also changes the licence of the moved code from GPL
    to LGPL.
    See GOSSIP-RELICENSING.txt for details.

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

 libempathy-gtk/empathy-account-chooser.c	    |	5 +-
 libempathy-gtk/empathy-avatar-image.c		    |	7 +-
 libempathy-gtk/empathy-individual-store-channel.c  |	4 +-
 libempathy-gtk/empathy-individual-view.c	    |	5 +-
 .../empathy-local-xmpp-assistant-widget.c	    |	3 +-
 libempathy-gtk/empathy-notify-manager.c	    |	3 +-
 libempathy-gtk/empathy-protocol-chooser.c	    |	7 +-
 libempathy-gtk/empathy-roster-contact.c	    |	3 +-
 libempathy-gtk/empathy-smiley-manager.c	    |	5 +-
 libempathy-gtk/empathy-theme-adium.c		    |	3 +-
 libempathy-gtk/empathy-ui-utils.c		    | 156
 +-----------------
 libempathy-gtk/empathy-ui-utils.h		    |  13 --
 src/empathy-accounts-dialog.c			    |	3 +-
 src/empathy-call-window.c			    |	3 +-
 tp-account-widgets/Makefile.am			    |	2 +
 tp-account-widgets/tpaw-avatar-chooser.c	    |	9 +-
 tp-account-widgets/tpaw-pixbuf-utils.c		    | 183
 +++++++++++++++++++++
 tp-account-widgets/tpaw-pixbuf-utils.h		    |  48 ++++++
 18 files changed, 272 insertions(+), 190 deletions(-)

commit 3abe4df5f32c37e968d0556c755b8387d9f1f771
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Fri May 10 17:01:31 2013 +0100

    tpaw-utils: use self->priv instead of EMPATHY_GET_PRIV(self)

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

 tp-account-widgets/tpaw-account-settings.c	    | 545
 +++++++++------------
 tp-account-widgets/tpaw-account-settings.h	    |	5 +-
 tp-account-widgets/tpaw-connection-managers.c	    |  70 +--
 tp-account-widgets/tpaw-connection-managers.h	    |	4 +-
 .../tpaw-irc-network-chooser-dialog.c		    | 217 ++++----
 .../tpaw-irc-network-chooser-dialog.h		    |	4 +-
 tp-account-widgets/tpaw-irc-network-chooser.c	    | 135 +++--
 tp-account-widgets/tpaw-irc-network-chooser.h	    |	4 +-
 tp-account-widgets/tpaw-irc-network-manager.c	    | 140 +++---
 tp-account-widgets/tpaw-irc-network-manager.h	    |	5 +-
 tp-account-widgets/tpaw-irc-network.c		    |  79 ++-
 tp-account-widgets/tpaw-irc-network.h		    |	3 +-
 tp-account-widgets/tpaw-irc-server.c		    |  37 +-
 tp-account-widgets/tpaw-irc-server.h		    |	3 +-
 tp-account-widgets/tpaw-live-search.c		    | 119 ++---
 tp-account-widgets/tpaw-live-search.h		    |	3 +-
 16 files changed, 597 insertions(+), 776 deletions(-)

commit 7eae2e49e62834cfff13cc2ee10b37eaff38a6fb
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Fri May 10 16:58:34 2013 +0100

    tpaw-utils: move EMP_STR_EMPTY to tp-aw and rename it

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

 libempathy-gtk/empathy-base-password-dialog.c	    |  5 +++--
 libempathy-gtk/empathy-cell-renderer-text.c	    |  6 ++++--
 libempathy-gtk/empathy-chat.c			    | 23
 +++++++++++-----------
 libempathy-gtk/empathy-contact-widget.c	    |  3 ++-
 libempathy-gtk/empathy-geometry.c		    |  5 +++--
 libempathy-gtk/empathy-groups-widget.c		    |  5 +++--
 libempathy-gtk/empathy-individual-store.c	    |  3 ++-
 libempathy-gtk/empathy-individual-view.c	    |  2 +-
 libempathy-gtk/empathy-individual-widget.c	    |  3 ++-
 libempathy-gtk/empathy-log-window.c		    |  5 +++--
 libempathy-gtk/empathy-presence-chooser.c	    |  3 ++-
 libempathy-gtk/empathy-search-bar.c		    |  7 ++++---
 libempathy-gtk/empathy-smiley-manager.c	    |  6 ++++--
 libempathy/empathy-chatroom.c			    |  4 +++-
 libempathy/empathy-contact.c			    | 16 ++++++++-------
 libempathy/empathy-ft-handler.c		    |  5 +++--
 libempathy/empathy-presence-manager.c		    |  4 +++-
 libempathy/empathy-tp-chat.c			    |  4 +++-
 libempathy/empathy-utils.h			    |  1 -
 src/empathy-chat-window.c			    |  7 ++++---
 src/empathy-debug-window.c			    |  7 ++++---
 src/empathy-event-manager.c			    |  3 ++-
 src/empathy-import-pidgin.c			    |  3 ++-
 src/empathy-import-utils.c			    |  3 ++-
 src/empathy-new-chatroom-dialog.c		    |  5 +++--
 src/empathy-status-icon.c			    |  2 +-
 tp-account-widgets/tpaw-account-widget.c	    | 12 +++++------
 .../tpaw-irc-network-chooser-dialog.c		    |  3 ++-
 tp-account-widgets/tpaw-live-search.c		    |  7 ++++---
 tp-account-widgets/tpaw-utils.h		    |  2 ++
 30 files changed, 98 insertions(+), 66 deletions(-)

commit 6609b50bce338fdb3fe470f57727d30211c8d104
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Tue Jul 30 16:15:05 2013 +0100

    tpaw-utils: copy URL handling functions from Empathy to tp-aw

    This commit also changes the licence of the moved code from GPL
    to LGPL.
    See GOSSIP-RELICENSING.txt for details.

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

 libempathy-gtk/empathy-ui-utils.c	 | 43
 ++-------------------------------
 libempathy-gtk/empathy-ui-utils.h	 |  4 ---
 tp-account-widgets/tpaw-string-parser.c |  4 ++-
 tp-account-widgets/tpaw-utils.c	 | 40
 ++++++++++++++++++++++++++++++
 tp-account-widgets/tpaw-utils.h	 |  5 ++++
 5 files changed, 50 insertions(+), 46 deletions(-)

commit 5c0d938cf15d07c0f7511c5acb9a3d8e42278e0d
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Fri May 10 16:08:28 2013 +0100

    tpaw-utils: move empathy_xml_validate_from_resource to tp-aw and
    rename it

    This commit also changes the licence of the moved code (all
    copyrighted by
    Collabora Ltd.) from GPL to LGPL.

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

 libempathy/empathy-chatroom-manager.c	       |  3 ++-
 libempathy/empathy-contact-groups.c	       |  3 ++-
 libempathy/empathy-status-presets.c	       |  3 ++-
 libempathy/empathy-utils.c		       | 35
 --------------------------
 libempathy/empathy-utils.h		       |  2 --
 tp-account-widgets/tpaw-irc-network-manager.c |  3 ++-
 tp-account-widgets/tpaw-utils.c	       | 36
 +++++++++++++++++++++++++++
 tp-account-widgets/tpaw-utils.h	       |  6 +++++
 8 files changed, 50 insertions(+), 41 deletions(-)

commit 4598bce7db6276a9f1f9e21adef8723b646bf44b
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Fri May 10 15:09:02 2013 +0100

    tpaw-utils: move empathy_window_present* to tp-aw and rename it

    This commit also changes the licence of the moved code from GPL
    to LGPL.
    See GOSSIP-RELICENSING.txt for details.

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

 libempathy-gtk/empathy-ui-utils.c	       | 41 ---------------------
 libempathy-gtk/empathy-ui-utils.h	       |  5 ---
 src/empathy-call-window.c		       |  3 +-
 src/empathy-call.c			       |  3 +-
 src/empathy-chat-window.c		       |  2 +-
 src/empathy-status-icon.c		       |  3 +-
 src/empathy.c				       |  3 +-
 tp-account-widgets/tpaw-irc-network-chooser.c |  2 +-
 tp-account-widgets/tpaw-utils.c	       | 53
 +++++++++++++++++++++++++++
 tp-account-widgets/tpaw-utils.h	       |  9 +++++
 10 files changed, 72 insertions(+), 52 deletions(-)

commit 44c61cce71ad3683aa6a284ce117e286423f555c
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Fri May 10 14:25:22 2013 +0100

    tpaw-utils: move empathy_get_toplevel_window to tp-aw and rename it

    This commit also changes the licence of the moved code from GPL
    to LGPL.
    See GOSSIP-RELICENSING.txt for details.

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

 libempathy-gtk/empathy-individual-view.c      |  3 ++-
 libempathy-gtk/empathy-ui-utils.c	       | 15 ---------------
 libempathy-gtk/empathy-ui-utils.h	       |  1 -
 tp-account-widgets/tpaw-avatar-chooser.c      |  4 ++--
 tp-account-widgets/tpaw-irc-network-chooser.c |  3 ++-
 tp-account-widgets/tpaw-utils.c	       | 19 ++++++++++++++++++-
 tp-account-widgets/tpaw-utils.h	       |  7 ++++++-
 7 files changed, 30 insertions(+), 22 deletions(-)

commit 431c21692c396b39764eca31c3c4f05f4507ce59
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Thu May 9 17:10:17 2013 +0100

    tpaw-utils: move empathy_implement_finish_* to tp-aw and rename them

    All the code was initially written for wocky which is under LGPL.

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

 libempathy/empathy-client-factory.c	  |  4 ++-
 libempathy/empathy-individual-manager.c  |  4 ++-
 libempathy/empathy-sasl-mechanisms.c	  |  3 ++-
 libempathy/empathy-utils.h		  | 45
 --------------------------------
 src/empathy-audio-src.c		  |  4 ++-
 src/empathy-mic-monitor.c		  |  7 ++---
 tp-account-widgets/tpaw-avatar-chooser.c |  3 ++-
 tp-account-widgets/tpaw-keyring.c	  | 11 ++++----
 tp-account-widgets/tpaw-user-info.c	  |  3 ++-
 tp-account-widgets/tpaw-utils.h	  | 45
 ++++++++++++++++++++++++++++++++
 10 files changed, 70 insertions(+), 59 deletions(-)

commit fad2ecd3f071c671425954638081c641ff603503
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Tue Jul 30 14:09:13 2013 +0100

    user-info: move from Empathy to tp-account-widgets

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

 libempathy-gtk/Makefile.am	     |	 2 -
 libempathy-gtk/empathy-user-info.c  | 776
 ------------------------------------
 libempathy-gtk/empathy-user-info.h  |	75 ----
 src/empathy-accounts-dialog.c	     |	 8 +-
 tp-account-widgets/Makefile.am      |	 2 +
 tp-account-widgets/tpaw-user-info.c | 776
 ++++++++++++++++++++++++++++++++++++
 tp-account-widgets/tpaw-user-info.h |	74 ++++
 7 files changed, 856 insertions(+), 857 deletions(-)

commit 897485f18cd903d83d109a4d671e2841a41c64a7
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Tue Jul 30 14:00:26 2013 +0100

    avatar-chooser: move from Empathy to tp-account-widgets

    This commit also changes the licence of the moved code from GPL
    to LGPL.
    EmpathyAvatarChooser was based on Evolution's EImageChooser that was
    originally LGPL. The later contributions were relicensed by the
    authors,
    see GOSSIP-RELICENSING.txt for details.

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

 libempathy-gtk/Makefile.am		  |    2 -
 libempathy-gtk/empathy-avatar-chooser.c  | 1222
 ------------------------------
 libempathy-gtk/empathy-avatar-chooser.h  |   67 --
 libempathy-gtk/empathy-user-info.c	  |   12 +-
 tp-account-widgets/Makefile.am		  |    4 +
 tp-account-widgets/tpaw-avatar-chooser.c | 1222
 ++++++++++++++++++++++++++++++
 tp-account-widgets/tpaw-avatar-chooser.h |   67 ++
 7 files changed, 1299 insertions(+), 1297 deletions(-)

commit 6338748568d1a37c423568e91e60eb838188a3c2
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Tue Jul 30 13:52:30 2013 +0100

    tpaw-images: move the default avatar definition from Empathy to tp-aw

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

 libempathy-gtk/empathy-avatar-chooser.c |  4 ++--
 libempathy-gtk/empathy-images.h	 |  1 -
 libempathy-gtk/empathy-log-window.c	 |  3 ++-
 libempathy-gtk/empathy-roster-contact.c |  4 ++--
 libempathy-gtk/empathy-theme-adium.c	 |  3 ++-
 src/empathy-call-observer.c		 |  4 ++--
 src/empathy-call-window.c		 |  3 ++-
 src/empathy-event-manager.c		 |  5 +++--
 tp-account-widgets/Makefile.am		 |  1 +
 tp-account-widgets/tpaw-images.h	 | 31
 +++++++++++++++++++++++++++++++
 10 files changed, 47 insertions(+), 12 deletions(-)

commit 6388cda27235b0bb0f19fbd94eef5ca138cf075b
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Tue Jul 30 08:23:26 2013 +0100

    tpaw-gsettings: move the avatar path stuff from Empathy to tp-aw

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

 libempathy-gtk/empathy-avatar-chooser.c |  8 +++----
 libempathy/empathy-gsettings.h		 |  1 -
 tp-account-widgets/Makefile.am		 |  1 +
 tp-account-widgets/tpaw-gsettings.h	 | 37
 +++++++++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 5 deletions(-)

commit f6d827a6b1006858de979d6627598fa17098ee62
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon Jul 29 16:20:24 2013 +0100

    camera-monitor: move from Empathy to tp-account-widgets

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

 libempathy-gtk/empathy-avatar-chooser.c  |   6 +-
 libempathy-gtk/empathy-individual-menu.c |   6 +-
 libempathy-gtk/empathy-log-window.c	  |   6 +-
 libempathy-gtk/empathy-new-call-dialog.c |   6 +-
 libempathy/Makefile.am			  |   3 -
 libempathy/empathy-camera-monitor.c	  | 295
 -------------------------------
 libempathy/empathy-camera-monitor.h	  |  69 --------
 src/empathy-call-window.c		  |  26 +--
 src/empathy-camera-menu.c		  |  21 +--
 tp-account-widgets/Makefile.am		  |   2 +
 tp-account-widgets/tpaw-camera-monitor.c | 295
 +++++++++++++++++++++++++++++++
 tp-account-widgets/tpaw-camera-monitor.h |  69 ++++++++
 12 files changed, 402 insertions(+), 402 deletions(-)

commit 6400b739ecdf0e14ad3cc1c6c7032a4eb486bb0e
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon Jul 29 16:07:52 2013 +0100

    cheese-camera-device-monitor: move from Empathy to tp-account-widgets

    This commit also changes the licence of the moved code from GPL
    to LGPL.
    See GOSSIP-RELICENSING.txt for details.

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

 libempathy/Makefile.am				   |   2 +-
 libempathy/cheese-camera-device-monitor.c	   | 407
 ----------------------
 libempathy/cheese-camera-device-monitor.h	   |  68 ----
 libempathy/empathy-camera-monitor.c		   |  12 +-
 tp-account-widgets/Makefile.am			   |  11 +
 tp-account-widgets/cheese-camera-device-monitor.c | 406
 +++++++++++++++++++++
 tp-account-widgets/cheese-camera-device-monitor.h |  67 ++++
 7 files changed, 491 insertions(+), 482 deletions(-)

commit 7f50fe46dc08956800ee9d63f5191b0d754ca106
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon Jul 29 14:20:00 2013 +0100

    calendar-button: move from Empathy to tp-accounts-widgets

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

 libempathy-gtk/Makefile.am			  |   2 -
 libempathy-gtk/empathy-calendar-button.c	  | 273
 -----------------------
 libempathy-gtk/empathy-calendar-button.h	  |  67 ------
 libempathy-gtk/empathy-user-info.c		  |  10 +-
 tests/interactive/test-empathy-calendar-button.c |   8 +-
 tp-account-widgets/Makefile.am			  |   2 +
 tp-account-widgets/tpaw-calendar-button.c	  | 273
 +++++++++++++++++++++++
 tp-account-widgets/tpaw-calendar-button.h	  |  67 ++++++
 8 files changed, 351 insertions(+), 351 deletions(-)

commit 45e5ffdb0c84f0026cf552fe885f06498eaddb39
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon Jul 29 14:12:14 2013 +0100

    contactinfo-utils: move from Empathy to tp-account-widgets

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

 libempathy-gtk/Makefile.am		     |	 2 -
 libempathy-gtk/empathy-contactinfo-utils.c  | 265
 ----------------------------
 libempathy-gtk/empathy-contactinfo-utils.h  |	45 -----
 libempathy-gtk/empathy-individual-widget.c  |	10 +-
 libempathy-gtk/empathy-user-info.c	     |	10 +-
 tp-account-widgets/Makefile.am		     |	 2 +
 tp-account-widgets/tpaw-contactinfo-utils.c | 265
 ++++++++++++++++++++++++++++
 tp-account-widgets/tpaw-contactinfo-utils.h |	45 +++++
 8 files changed, 322 insertions(+), 322 deletions(-)

commit c1f785d53882e5d06bdcf3692d1002e1607e4259
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon Jul 29 14:06:33 2013 +0100

    contactinfo-utils: remove the include for empathy-ui-utils.h

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

 libempathy-gtk/empathy-contactinfo-utils.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 89db427d713a8704e632776a1d7a628123cc82ff
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon Jul 29 14:01:56 2013 +0100

    string-parser: move everything except for _match_smiley(), to tp-aw

    empathy_string_match_smiley() depends on other files and it's
    not needed
    by tp-account-widgets, so we can leave it in libempathy-gtk.

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

 libempathy-gtk/empathy-chat.c		    |	2 +-
 libempathy-gtk/empathy-contact-widget.c    |	4 +-
 libempathy-gtk/empathy-contactinfo-utils.c |	4 +-
 libempathy-gtk/empathy-individual-widget.c |	2 +-
 libempathy-gtk/empathy-log-window.c	    |	4 +-
 libempathy-gtk/empathy-string-parser.c     | 190
 +--------------------------
 libempathy-gtk/empathy-string-parser.h     |  60 +--------
 libempathy-gtk/empathy-theme-adium.c	    |	4 +-
 libempathy-gtk/empathy-webkit-utils.c	    |  23 ++--
 libempathy-gtk/empathy-webkit-utils.h	    |	5 +-
 tests/empathy-parser-test.c		    |	9 +-
 tp-account-widgets/Makefile.am		    |	2 +
 tp-account-widgets/tpaw-string-parser.c    | 198
 +++++++++++++++++++++++++++++
 tp-account-widgets/tpaw-string-parser.h    |  85 +++++++++++++
 14 files changed, 324 insertions(+), 268 deletions(-)

commit d9f45de3b3da70e5d047313e0abb816d9f2fca3f
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon Jul 29 10:28:48 2013 +0100

    contactinfo-utils: move create_channel_list_label to individual-widget

    This removed the dependency of contactinfo-utils on
    empathy-request-util.h, so it's easier to move tp tp-account-widgets.

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

 libempathy-gtk/empathy-contactinfo-utils.c | 65
 ----------------------------
 libempathy-gtk/empathy-contactinfo-utils.h |  4 --
 libempathy-gtk/empathy-individual-widget.c | 68
 +++++++++++++++++++++++++++++-
 3 files changed, 66 insertions(+), 71 deletions(-)

commit 59d0c113fdf2e565f512c98334a1808cfd216fa9
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon Jul 29 09:32:09 2013 +0100

    time: move from Empathy to tp-account-widgets

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

 libempathy-gtk/empathy-contactinfo-utils.c |	4 +-
 libempathy-gtk/empathy-individual-widget.c |	6 +-
 libempathy-gtk/empathy-location-manager.c  |	4 +-
 libempathy-gtk/empathy-theme-adium.c	    |  18 ++--
 libempathy-gtk/empathy-user-info.c	    |	4 +-
 libempathy/Makefile.am			    |	2 -
 libempathy/empathy-ft-handler.c	    |	6 +-
 libempathy/empathy-message.c		    |	6 +-
 libempathy/empathy-time.c		    | 144
 -----------------------------
 libempathy/empathy-time.h		    |  48 ----------
 tp-account-widgets/Makefile.am		    |	2 +
 tp-account-widgets/tpaw-time.c		    | 144
 +++++++++++++++++++++++++++++
 tp-account-widgets/tpaw-time.h		    |  48 ++++++++++
 13 files changed, 218 insertions(+), 218 deletions(-)

commit 1f633bf20747995395b1dcc7001e0c9502104eda
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Thu May 9 15:50:15 2013 +0100

    builder: move empathy_builder_* from Empathy to tp-account-widgets

    This commit also changes the licence of the moved code from GPL
    to LGPL.
    See GOSSIP-RELICENSING.txt for details.

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

 libempathy-gtk/empathy-chat.c			  |   5 +-
 libempathy-gtk/empathy-contact-blocking-dialog.c |   5 +-
 libempathy-gtk/empathy-contact-widget.c	  |   3 +-
 libempathy-gtk/empathy-individual-widget.c	  |   3 +-
 libempathy-gtk/empathy-log-window.c		  |   5 +-
 libempathy-gtk/empathy-search-bar.c		  |   5 +-
 libempathy-gtk/empathy-status-preset-dialog.c	  |   5 +-
 libempathy-gtk/empathy-ui-utils.c		  | 148
 ---------------------
 libempathy-gtk/empathy-ui-utils.h		  |  14 --
 src/empathy-accounts-dialog.c			  |   5 +-
 src/empathy-call-window-fullscreen.c		  |   4 +-
 src/empathy-call-window.c			  |   5 +-
 src/empathy-chat-window.c			  |   5 +-
 src/empathy-chatrooms-window.c			  |  23 ++--
 src/empathy-ft-manager.c			  |   7 +-
 src/empathy-import-widget.c			  |   5 +-
 src/empathy-new-chatroom-dialog.c		  |   5 +-
 src/empathy-preferences.c			  |   3 +-
 src/empathy-roster-window.c			  |   5 +-
 src/empathy-status-icon.c			  |   6 +-
 tp-account-widgets/tpaw-account-widget-irc.c	  |   9 +-
 tp-account-widgets/tpaw-account-widget-sip.c	  |   7 +-
 tp-account-widgets/tpaw-account-widget.c	  |  33 ++---
 tp-account-widgets/tpaw-builder.c		  | 156
 +++++++++++++++++++++++
 tp-account-widgets/tpaw-builder.h		  |  18 +++
 tp-account-widgets/tpaw-irc-network-dialog.c	  |   5 +-
 26 files changed, 265 insertions(+), 229 deletions(-)

commit eb7ddccaf6365f4ceb45d8a2ccd006e67e5dd340
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Thu May 9 13:56:32 2013 +0100

    builder: add stub header and source file for tpaw_builder_* functions

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

 tp-account-widgets/Makefile.am    |  2 ++
 tp-account-widgets/tpaw-builder.c | 22 ++++++++++++++++++++++
 tp-account-widgets/tpaw-builder.h | 31 +++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+)

commit 406dc1041ff2d0575e43bb0c320a072d29e4af79
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Thu May 9 13:44:04 2013 +0100

    live-search: move from Empathy to tp-account-widgets

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

 libempathy-gtk/Makefile.am			    |	2 -
 libempathy-gtk/empathy-contact-chooser.c	    |	2 +-
 libempathy-gtk/empathy-individual-view.c	    |  14 +-
 libempathy-gtk/empathy-individual-view.h	    |	4 +-
 libempathy-gtk/empathy-live-search.c		    | 728
 ---------------------
 libempathy-gtk/empathy-live-search.h		    |  79 ---
 libempathy-gtk/empathy-roster-view.c		    |  10 +-
 libempathy-gtk/empathy-roster-view.h		    |	5 +-
 libempathy-gtk/empathy-ui-utils.c		    |	8 +-
 src/empathy-roster-window.c			    |	4 +-
 tests/empathy-live-search-test.c		    |	4 +-
 tests/interactive/Makefile.am			    |	1 +
 tests/interactive/test-empathy-dual-roster-view.c  |	4 +-
 .../test-empathy-roster-model-aggregator.c	    |	4 +-
 tests/interactive/test-empathy-roster-view.c	    |	4 +-
 tp-account-widgets/Makefile.am			    |	2 +
 .../tpaw-irc-network-chooser-dialog.c		    |  12 +-
 tp-account-widgets/tpaw-live-search.c		    | 728
 +++++++++++++++++++++
 tp-account-widgets/tpaw-live-search.h		    |  79 +++
 19 files changed, 848 insertions(+), 846 deletions(-)

commit 740b695e21016ff7b568b069734b29e780b459e5
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Wed May 8 15:45:45 2013 +0100

    account-settings: don't set the presence on newly created accounts

    What happened before this patch was:
    1) tpaw_account_settings_do_create_account() sets the requested
    presence
       to the global requested presence in Empathy;
    2) If the requested presence is unset, unknown or offline,
       empathy_connect_new_account() sets it to available;
    3) Every process with a TpAccountManager object in memory that was
       previously used to set the requested presence will try to set the
       presence on the new account.

    The first step is a problem as it doesn't work if the account
    is created
    by a process that is not Empathy as the other processes have no way of
    knowing what Empathy's requested presence is.
    This doesn't matter as, in the third step, both Empathy and
    gnome-shell
    (and any other process using a TpAccountManager) will try to set the
    presence to their own idea of the current requested presence. Of
    course
    this is a race condition, see [1], but the behaviour is not changed by
    this patch.
    In case there is no process using a TpAccountManager, the second step
    will still guarantee that the newly created account goes online.

    [1] https://bugs.freedesktop.org/show_bug.cgi?id=24104

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

 tp-account-widgets/tpaw-account-settings.c | 16 ----------------
 1 file changed, 16 deletions(-)

commit 654aaea6780716ff7973530859d2b1b86e2f7ca3
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon May 6 17:04:23 2013 +0100

    tpaw-utils: copy empathy_make_color_whiter()

    This commit also changes the licence of the moved code from GPL
    to LGPL.
    See GOSSIP-RELICENSING.txt for details.

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

 tp-account-widgets/tpaw-account-widget.c |  4 ++--
 tp-account-widgets/tpaw-utils.c	  | 10 ++++++++++
 tp-account-widgets/tpaw-utils.h	  |  3 +++
 3 files changed, 15 insertions(+), 2 deletions(-)

commit 3de3a5ab30345befbbccfbcb5bdc19d4fd28339b
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon May 6 15:19:57 2013 +0100

    utils: remove empathy_account_has_uri_scheme_tel()

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

 libempathy/empathy-utils.c | 19 -------------------
 libempathy/empathy-utils.h |  2 --
 2 files changed, 21 deletions(-)

commit c07fb4e3252593b3be0b7d7b1a802a0639334c10
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Wed May 8 14:49:45 2013 +0100

    account-settings: use TpAccount's functions for schemes instead
    of Empathy's

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

 tp-account-widgets/tpaw-account-settings.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit dc1515185c316d2e333ff38e879993a0af70accb
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Wed May 8 14:47:08 2013 +0100

    individual-menu: use TpAccount's functions for schemes instead
    of Empathy's

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

 libempathy-gtk/empathy-individual-menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4e0f97a1942d1ae0b4b3846d43e3769fdb076b44
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon May 6 14:39:09 2013 +0100

    tpaw-utils: move functions for protocol and service display
    information

    The following functions were moved from empathy to tp-aw and renamed
    accordingly:
    * empathy_protocol_icon_name;
    * empathy_protocol_name_to_display_name;
    * empathy_service_name_to_display_name.

    This commit also changes the licence of the moved code (all
    copyrighted
    by Collabora Ltd.) from GPL to LGPL.

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

 libempathy-gtk/empathy-protocol-chooser.c  | 13 +++--
 libempathy-gtk/empathy-theme-adium.c	    |  3 +-
 libempathy/empathy-utils.c		    | 86
 -----------------------------
 libempathy/empathy-utils.h		    |  4 --
 src/empathy-accounts-dialog.c		    |  2 +-
 tp-account-widgets/tpaw-account-settings.c |  3 +-
 tp-account-widgets/tpaw-account-widget.c   |  2 +-
 tp-account-widgets/tpaw-utils.c	    | 89
 ++++++++++++++++++++++++++++++
 tp-account-widgets/tpaw-utils.h	    |  5 ++
 9 files changed, 107 insertions(+), 100 deletions(-)

commit 88819ece017f0693803f33bb560e4d01140174c1
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon May 6 14:02:09 2013 +0100

    tpaw-utils: move empathy_connect_new_account to tp-aw and rename it

    This commit also changes the licence of the moved code (all
    copyrighted
    by Collabora Ltd.) from GPL to LGPL.

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

 .../empathy-local-xmpp-assistant-widget.c	    |  3 +-
 libempathy/empathy-utils.c			    | 43
 --------------------
 libempathy/empathy-utils.h			    |  3 --
 src/empathy-accounts-dialog.c			    |  3 +-
 src/empathy-import-widget.c			    |  3 +-
 tp-account-widgets/tpaw-account-widget.c	    |  3 +-
 tp-account-widgets/tpaw-utils.c		    | 46
 +++++++++++++++++++++-
 tp-account-widgets/tpaw-utils.h		    |  7 +++-
 8 files changed, 59 insertions(+), 52 deletions(-)

commit dc5ad68355fa55261f24098d9be184a2c6f6f459
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon May 6 11:37:47 2013 +0100

    tpaw-utils: add stub for files with misc utility functions

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

 tp-account-widgets/Makefile.am  |  1 +
 tp-account-widgets/tpaw-utils.c | 25 +++++++++++++++++++++++++
 tp-account-widgets/tpaw-utils.h | 30 ++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+)

commit c689cd6a91cb2a31ce0d03f47e59ca4e3f368e9c
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Fri Jul 26 10:44:30 2013 +0100

    uoa-utils: move from Empathy to tp-aw

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

 libempathy/Makefile.am		       |  2 --
 libempathy/empathy-uoa-auth-handler.c |  2 +-
 libempathy/empathy-uoa-utils.c        | 49
 -----------------------------------
 libempathy/empathy-uoa-utils.h        | 35 -------------------------
 tp-account-widgets/Makefile.am        | 16 +++++++++++-
 tp-account-widgets/tpaw-keyring.c     |  6 ++---
 tp-account-widgets/tpaw-uoa-utils.c   | 49
 +++++++++++++++++++++++++++++++++++
 tp-account-widgets/tpaw-uoa-utils.h   | 35 +++++++++++++++++++++++++
 8 files changed, 103 insertions(+), 91 deletions(-)

commit 2d72679026f5f39eeffa10e474bcf151ca2002db
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon May 13 14:58:05 2013 +0100

    keyring: explain why the schema name still contains “Empathy”

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

 tp-account-widgets/tpaw-keyring.c | 2 ++
 1 file changed, 2 insertions(+)

commit 2d543808216afa7bd287ec78fa69a16f576652a3
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Thu Jul 25 16:24:14 2013 +0100

    keyring: move from Empathy to tp-account-widgets

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

 libempathy-gtk/empathy-chat.c		    |	8 +-
 libempathy/Makefile.am			    |	2 -
 libempathy/empathy-auth-factory.c	    |	7 +-
 libempathy/empathy-keyring.c		    | 718
 -----------------------------
 libempathy/empathy-keyring.h		    |  63 ---
 libempathy/empathy-server-sasl-handler.c   |  13 +-
 libempathy/empathy-uoa-auth-handler.c	    |	7 +-
 src/empathy-sanity-cleaning.c		    |  10 +-
 tests/interactive/Makefile.am		    |	1 +
 tp-account-widgets/Makefile.am		    |	2 +
 tp-account-widgets/tpaw-account-settings.c |  16 +-
 tp-account-widgets/tpaw-keyring.c	    | 718
 +++++++++++++++++++++++++++++
 tp-account-widgets/tpaw-keyring.h	    |  62 +++
 13 files changed, 815 insertions(+), 812 deletions(-)

commit 53a376be8d68d95c30cb66495d42d3c18947473f
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Wed May 8 15:14:35 2013 +0100

    connection-managers: move from Empathy to tp-account-widgets

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

 libempathy-gtk/empathy-protocol-chooser.c     |  14 +-
 libempathy/Makefile.am			       |   2 -
 libempathy/empathy-connection-managers.c      | 349
 --------------------------
 libempathy/empathy-connection-managers.h      |  87 -------
 src/empathy-accounts-dialog.c		       |  12 +-
 src/empathy-import-dialog.c		       |  10 +-
 src/empathy-import-dialog.h		       |   4 +-
 src/empathy-import-utils.c		       |   9 +-
 src/empathy-import-widget.c		       |  10 +-
 src/empathy-import-widget.h		       |   4 +-
 tp-account-widgets/Makefile.am		       |   2 +
 tp-account-widgets/tpaw-account-settings.c    |  10 +-
 tp-account-widgets/tpaw-connection-managers.c | 349
 ++++++++++++++++++++++++++
 tp-account-widgets/tpaw-connection-managers.h |  87 +++++++
 14 files changed, 475 insertions(+), 474 deletions(-)

commit eaa41abfebc3fbf9c2d6a673940e36a4af008cac
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon May 13 10:43:05 2013 +0100

    account-settings: fix a reference to empathy-account-widget.c

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

 tp-account-widgets/tpaw-account-settings.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fa2f3a41fd62737b803b9307b51415aa32dc6715
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Wed May 8 14:39:41 2013 +0100

    account-settings: move from Empathy to tp-account-widgets

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

 .../empathy-local-xmpp-assistant-widget.c	    |	14 +-
 libempathy-gtk/empathy-new-account-dialog.c	    |	10 +-
 libempathy-gtk/empathy-new-account-dialog.h	    |	 5 +-
 libempathy-gtk/empathy-protocol-chooser.c	    |	26 +-
 libempathy-gtk/empathy-protocol-chooser.h	    |	 5 +-
 libempathy/Makefile.am				    |	 2 -
 libempathy/empathy-account-settings.c		    | 1724
 --------------------
 libempathy/empathy-account-settings.h		    |  204 ---
 src/empathy-accounts-dialog.c			    |	60 +-
 tp-account-widgets/Makefile.am			    |	 2 +
 tp-account-widgets/tpaw-account-settings.c	    | 1724
 ++++++++++++++++++++
 tp-account-widgets/tpaw-account-settings.h	    |  204 +++
 tp-account-widgets/tpaw-account-widget-irc.c	    |	26 +-
 tp-account-widgets/tpaw-account-widget-sip.c	    |	 6 +-
 tp-account-widgets/tpaw-account-widget.c	    |  142 +-
 tp-account-widgets/tpaw-account-widget.h	    |	 6 +-
 .../tpaw-irc-network-chooser-dialog.c		    |	 8 +-
 .../tpaw-irc-network-chooser-dialog.h		    |	 4 +-
 tp-account-widgets/tpaw-irc-network-chooser.c	    |	30 +-
 tp-account-widgets/tpaw-irc-network-chooser.h	    |	 4 +-
 20 files changed, 2102 insertions(+), 2104 deletions(-)

commit e72ddde10dd32bcad39c604c579faa04c822d2be
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Thu Aug 1 07:43:38 2013 +0100

    irc-network: change the license header from the GPL to the LGPL one

    The license of this file should have been LGPL from the start (see the
    header file too). Anyway, we have permission to relicense this file to
    LGPL, see GOSSIP-RELICENSING.txt for details.

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

 tp-account-widgets/tpaw-irc-network.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

commit aabb5d1f1bea8276d85293890f7db3302cb04199
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Thu Aug 1 07:33:40 2013 +0100

    account-widget: change the license header from the GPL to the LGPL one

    We have permission to relicense these files to LGPL, see
    GOSSIP-RELICENSING.txt for details.

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

 tp-account-widgets/tpaw-account-widget-private.h | 19 +++++++++----------
 tp-account-widgets/tpaw-account-widget.c	  | 19 +++++++++----------
 tp-account-widgets/tpaw-account-widget.h	  | 19 +++++++++----------
 3 files changed, 27 insertions(+), 30 deletions(-)

commit cb439fdc95542dc6a918ac16f1d52db7017a7092
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Mon May 13 10:47:00 2013 +0100

    tp-account-widgets: refer to the right renamed files

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

 tp-account-widgets/tpaw-account-widget.c     | 8 ++++----
 tp-account-widgets/tpaw-irc-network-dialog.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

commit ba499bfd6f960e26cd7776db7dd183137b705144
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Wed May 8 17:17:30 2013 +0100

    tp-account-widgets: rename all the files from empathy-* to tpaw-*

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

 .../empathy-local-xmpp-assistant-widget.c	    |	 2 +-
 libempathy-gtk/empathy-new-account-dialog.c	    |	 2 +-
 src/empathy-accounts-dialog.c			    |	 2 +-
 tests/empathy-irc-network-manager-test.c	    |	 2 +-
 tests/empathy-irc-network-test.c		    |	 2 +-
 tests/empathy-irc-server-test.c		    |	 2 +-
 tests/test-irc-helper.h			    |	 2 +-
 tp-account-widgets/.gitignore			    |	 2 +-
 tp-account-widgets/Makefile.am			    |	76 +-
 tp-account-widgets/empathy-account-widget-aim.ui   |  299 ---
 .../empathy-account-widget-generic.ui		    |  122 -
 .../empathy-account-widget-groupwise.ui	    |  292 ---
 tp-account-widgets/empathy-account-widget-icq.ui   |  320 ---
 tp-account-widgets/empathy-account-widget-irc.c    |  242 --
 tp-account-widgets/empathy-account-widget-irc.h    |	42 -
 tp-account-widgets/empathy-account-widget-irc.ui   |  603 -----
 .../empathy-account-widget-jabber.ui		    |  792 -------
 .../empathy-account-widget-local-xmpp.ui	    |  217 --
 tp-account-widgets/empathy-account-widget-msn.ui   |  292 ---
 .../empathy-account-widget-private.h		    |	46 -
 tp-account-widgets/empathy-account-widget-sip.c    |  260 ---
 tp-account-widgets/empathy-account-widget-sip.h    |	34 -
 tp-account-widgets/empathy-account-widget-sip.ui   |  731 ------
 tp-account-widgets/empathy-account-widget-yahoo.ui |  330 ---
 tp-account-widgets/empathy-account-widget.c	    | 2331
 --------------------
 tp-account-widgets/empathy-account-widget.h	    |	95 -
 .../empathy-account-widgets.gresource.xml	    |	17 -
 .../empathy-irc-network-chooser-dialog.c	    |  740 -------
 .../empathy-irc-network-chooser-dialog.h	    |	71 -
 tp-account-widgets/empathy-irc-network-chooser.c   |  421 ----
 tp-account-widgets/empathy-irc-network-chooser.h   |	65 -
 tp-account-widgets/empathy-irc-network-dialog.c    |  588 -----
 tp-account-widgets/empathy-irc-network-dialog.h    |	35 -
 tp-account-widgets/empathy-irc-network-manager.c   |  852 -------
 tp-account-widgets/empathy-irc-network-manager.h   |	85 -
 tp-account-widgets/empathy-irc-network.c	    |  389 ----
 tp-account-widgets/empathy-irc-network.h	    |	86 -
 tp-account-widgets/empathy-irc-networks.dtd	    |	18 -
 tp-account-widgets/empathy-irc-server.c	    |  222 --
 tp-account-widgets/empathy-irc-server.h	    |	64 -
 tp-account-widgets/tpaw-account-widget-aim.ui	    |  299 +++
 tp-account-widgets/tpaw-account-widget-generic.ui  |  122 +
 .../tpaw-account-widget-groupwise.ui		    |  292 +++
 tp-account-widgets/tpaw-account-widget-icq.ui	    |  320 +++
 tp-account-widgets/tpaw-account-widget-irc.c	    |  242 ++
 tp-account-widgets/tpaw-account-widget-irc.h	    |	42 +
 tp-account-widgets/tpaw-account-widget-irc.ui	    |  603 +++++
 tp-account-widgets/tpaw-account-widget-jabber.ui   |  792 +++++++
 .../tpaw-account-widget-local-xmpp.ui		    |  217 ++
 tp-account-widgets/tpaw-account-widget-msn.ui	    |  292 +++
 tp-account-widgets/tpaw-account-widget-private.h   |	46 +
 tp-account-widgets/tpaw-account-widget-sip.c	    |  260 +++
 tp-account-widgets/tpaw-account-widget-sip.h	    |	34 +
 tp-account-widgets/tpaw-account-widget-sip.ui	    |  731 ++++++
 tp-account-widgets/tpaw-account-widget-yahoo.ui    |  330 +++
 tp-account-widgets/tpaw-account-widget.c	    | 2331
 ++++++++++++++++++++
 tp-account-widgets/tpaw-account-widget.h	    |	95 +
 .../tpaw-account-widgets.gresource.xml		    |	17 +
 .../tpaw-irc-network-chooser-dialog.c		    |  740 +++++++
 .../tpaw-irc-network-chooser-dialog.h		    |	71 +
 tp-account-widgets/tpaw-irc-network-chooser.c	    |  421 ++++
 tp-account-widgets/tpaw-irc-network-chooser.h	    |	65 +
 tp-account-widgets/tpaw-irc-network-dialog.c	    |  588 +++++
 tp-account-widgets/tpaw-irc-network-dialog.h	    |	35 +
 tp-account-widgets/tpaw-irc-network-manager.c	    |  852 +++++++
 tp-account-widgets/tpaw-irc-network-manager.h	    |	85 +
 tp-account-widgets/tpaw-irc-network.c		    |  389 ++++
 tp-account-widgets/tpaw-irc-network.h		    |	86 +
 tp-account-widgets/tpaw-irc-networks.dtd	    |	18 +
 tp-account-widgets/tpaw-irc-server.c		    |  222 ++
 tp-account-widgets/tpaw-irc-server.h		    |	64 +
 .../empathy-accounts-plugin-widget.c		    |	 4 +-
 72 files changed, 10749 insertions(+), 10749 deletions(-)

commit 42456ae2a2c758db70cc093679d05675293758cb
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Wed Apr 3 13:14:33 2013 +0200

    tp-account-widgets: Switch the symbols namespace to tpaw

    The file names have been kept unchanged to keep the diff simple
    and will
    be updated later. This makes easier to spot where the account widgets
    still rely on libempathy.

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

 .../empathy-local-xmpp-assistant-widget.c	    |	8 +-
 libempathy-gtk/empathy-new-account-dialog.c	    |  12 +-
 src/empathy-accounts-dialog.c			    |  26 +--
 tests/empathy-irc-network-manager-test.c	    | 146 ++++++-------
 tests/empathy-irc-network-test.c		    |  66 +++---
 tests/empathy-irc-server-test.c		    |  18 +-
 tests/test-irc-helper.c			    |	8 +-
 tests/test-irc-helper.h			    |	4 +-
 tp-account-widgets/empathy-account-widget-irc.c    |  46 ++--
 tp-account-widgets/empathy-account-widget-irc.h    |  14 +-
 .../empathy-account-widget-private.h		    |  12 +-
 tp-account-widgets/empathy-account-widget-sip.c    |  34 +--
 tp-account-widgets/empathy-account-widget-sip.h    |	8 +-
 tp-account-widgets/empathy-account-widget.c	    | 232
 ++++++++++-----------
 tp-account-widgets/empathy-account-widget.h	    |  76 +++----
 .../empathy-irc-network-chooser-dialog.c	    | 188
 ++++++++---------
 .../empathy-irc-network-chooser-dialog.h	    |  48 ++---
 tp-account-widgets/empathy-irc-network-chooser.c   | 132 ++++++------
 tp-account-widgets/empathy-irc-network-chooser.h   |  42 ++--
 tp-account-widgets/empathy-irc-network-dialog.c    |  80 +++----
 tp-account-widgets/empathy-irc-network-dialog.h    |	8 +-
 tp-account-widgets/empathy-irc-network-manager.c   | 230
 ++++++++++----------
 tp-account-widgets/empathy-irc-network-manager.h   |  72 +++----
 tp-account-widgets/empathy-irc-network.c	    | 158 +++++++-------
 tp-account-widgets/empathy-irc-network.h	    |  66 +++---
 tp-account-widgets/empathy-irc-server.c	    |  56 ++---
 tp-account-widgets/empathy-irc-server.h	    |  44 ++--
 27 files changed, 917 insertions(+), 917 deletions(-)

commit 75df7ae67b78f94dd69ac5c6ad079e3d360c8461
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Tue Mar 26 23:19:28 2013 +0100

    tp-account-widgets: Move the IRC network list with the related sources

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

 libempathy/Makefile.am				    |	8 +-
 libempathy/empathy-dtd.gresource.xml		    |	1 -
 libempathy/empathy-irc-networks.dtd		    |  18 -
 libempathy/irc-networks.xml			    | 545
 ---------------------
 tp-account-widgets/Makefile.am			    |  10 +
 .../empathy-account-widgets.gresource.xml	    |	1 +
 tp-account-widgets/empathy-irc-network-manager.c   |	4 +-
 tp-account-widgets/empathy-irc-networks.dtd	    |  18 +
 tp-account-widgets/irc-networks.xml		    | 545
 +++++++++++++++++++++
 9 files changed, 578 insertions(+), 572 deletions(-)

commit e2c9efce03711a62db2eadc118fd2266da325d73
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Tue Mar 26 17:39:28 2013 +0100

    tp-account-widgets: Move the IRC support sources with the account
    widget

    To handle different networks and servers the IRC account widget uses
    many helper object and functions. Move them close to the IRC account
    widget sources.

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

 libempathy/Makefile.am				  |   6 -
 libempathy/empathy-irc-network-manager.c	  | 852
 -----------------------
 libempathy/empathy-irc-network-manager.h	  |  85 ---
 libempathy/empathy-irc-network.c		  | 389 -----------
 libempathy/empathy-irc-network.h		  |  86 ---
 libempathy/empathy-irc-server.c		  | 222 ------
 libempathy/empathy-irc-server.h		  |  64 --
 tests/Makefile.am				  |   2 +
 tp-account-widgets/Makefile.am			  |   9 +-
 tp-account-widgets/empathy-irc-network-manager.c | 852
 +++++++++++++++++++++++
 tp-account-widgets/empathy-irc-network-manager.h |  85 +++
 tp-account-widgets/empathy-irc-network.c	  | 389 +++++++++++
 tp-account-widgets/empathy-irc-network.h	  |  86 +++
 tp-account-widgets/empathy-irc-server.c	  | 222 ++++++
 tp-account-widgets/empathy-irc-server.h	  |  64 ++
 15 files changed, 1707 insertions(+), 1706 deletions(-)

commit 5cbc27ef0f4373175af5725d1a0b78d464bb23b3
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Mon Mar 25 16:38:16 2013 +0100

    tp-account-widgets: Move account widgets code in the
    tp-account-widgets subdir

    Start moving the account widgets code in a subdir before fully
    isolating
    it and stubbing it out in a submodule.

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

 Makefile.am					    |	 5 +-
 configure.ac					    |	 1 +
 libempathy-gtk/.gitignore			    |	 1 -
 libempathy-gtk/Makefile.am			    |	29 +-
 libempathy-gtk/empathy-account-widget-aim.ui	    |  299 ---
 libempathy-gtk/empathy-account-widget-generic.ui   |  122 -
 libempathy-gtk/empathy-account-widget-groupwise.ui |  292 ---
 libempathy-gtk/empathy-account-widget-icq.ui	    |  320 ---
 libempathy-gtk/empathy-account-widget-irc.c	    |  242 --
 libempathy-gtk/empathy-account-widget-irc.h	    |	42 -
 libempathy-gtk/empathy-account-widget-irc.ui	    |  603 -----
 libempathy-gtk/empathy-account-widget-jabber.ui    |  792 -------
 .../empathy-account-widget-local-xmpp.ui	    |  217 --
 libempathy-gtk/empathy-account-widget-msn.ui	    |  292 ---
 libempathy-gtk/empathy-account-widget-private.h    |	46 -
 libempathy-gtk/empathy-account-widget-sip.c	    |  260 ---
 libempathy-gtk/empathy-account-widget-sip.h	    |	34 -
 libempathy-gtk/empathy-account-widget-sip.ui	    |  731 ------
 libempathy-gtk/empathy-account-widget-yahoo.ui     |  330 ---
 libempathy-gtk/empathy-account-widget.c	    | 2331
 --------------------
 libempathy-gtk/empathy-account-widget.h	    |	95 -
 .../empathy-account-widgets.gresource.xml	    |	16 -
 .../empathy-irc-network-chooser-dialog.c	    |  740 -------
 .../empathy-irc-network-chooser-dialog.h	    |	71 -
 libempathy-gtk/empathy-irc-network-chooser.c	    |  421 ----
 libempathy-gtk/empathy-irc-network-chooser.h	    |	65 -
 libempathy-gtk/empathy-irc-network-dialog.c	    |  588 -----
 libempathy-gtk/empathy-irc-network-dialog.h	    |	35 -
 libempathy-gtk/totem-subtitle-encoding.c	    |  584 -----
 libempathy-gtk/totem-subtitle-encoding.h	    |	41 -
 src/Makefile.am				    |	 2 +
 tp-account-widgets/.gitignore			    |	 1 +
 tp-account-widgets/Makefile.am			    |	94 +
 tp-account-widgets/empathy-account-widget-aim.ui   |  299 +++
 .../empathy-account-widget-generic.ui		    |  122 +
 .../empathy-account-widget-groupwise.ui	    |  292 +++
 tp-account-widgets/empathy-account-widget-icq.ui   |  320 +++
 tp-account-widgets/empathy-account-widget-irc.c    |  242 ++
 tp-account-widgets/empathy-account-widget-irc.h    |	42 +
 tp-account-widgets/empathy-account-widget-irc.ui   |  603 +++++
 .../empathy-account-widget-jabber.ui		    |  792 +++++++
 .../empathy-account-widget-local-xmpp.ui	    |  217 ++
 tp-account-widgets/empathy-account-widget-msn.ui   |  292 +++
 .../empathy-account-widget-private.h		    |	46 +
 tp-account-widgets/empathy-account-widget-sip.c    |  260 +++
 tp-account-widgets/empathy-account-widget-sip.h    |	34 +
 tp-account-widgets/empathy-account-widget-sip.ui   |  731 ++++++
 tp-account-widgets/empathy-account-widget-yahoo.ui |  330 +++
 tp-account-widgets/empathy-account-widget.c	    | 2331
 ++++++++++++++++++++
 tp-account-widgets/empathy-account-widget.h	    |	95 +
 .../empathy-account-widgets.gresource.xml	    |	16 +
 .../empathy-irc-network-chooser-dialog.c	    |  740 +++++++
 .../empathy-irc-network-chooser-dialog.h	    |	71 +
 tp-account-widgets/empathy-irc-network-chooser.c   |  421 ++++
 tp-account-widgets/empathy-irc-network-chooser.h   |	65 +
 tp-account-widgets/empathy-irc-network-dialog.c    |  588 +++++
 tp-account-widgets/empathy-irc-network-dialog.h    |	35 +
 tp-account-widgets/totem-subtitle-encoding.c	    |  584 +++++
 tp-account-widgets/totem-subtitle-encoding.h	    |	41 +
 59 files changed, 9713 insertions(+), 9638 deletions(-)

commit 80a78928abd6a5c581e6c0e6036d3e7aea31d7ad
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Tue Apr 2 12:14:52 2013 +0200

    accounts-dialog: Include the proper account-widget header

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

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 33f662f61206873aa52be7fd2270d204259065e9
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Tue Jun 25 13:47:13 2013 +0100

    GOSSIP-RELICENSING: emails authorising us to relicense code for tp-aw

    The following people agreed with the relicensing of their code:
     - Martyn Russell <martyn@lanedo.com>
     - Richard Hult <richard@tinybird.com>
     - Mikael Hallendal <micke@tinybird.com>
     - Jonny Lamb <jonnylamb@gnome.org>
     - Felix Kaser <f.kaser@gmx.net>
     - Cosimo Cecchi <cosimoc@gnome.org>
     - Travis Reitter <treitter@gmail.com>
     - Xavier Claessens <xclaesse@gmail.com>
     - Marco Barisione <marco@barisione.org>
     - Danielle Madeley <danielle@madeley.id.au>
     - Chandni Verma <chandniverma2112@gmail.com>
     - Cyril Roelandt <tipecaml@gmail.com>
     - Dimitris Zenios <dimitris.zenios@gmail.com>
     - Jonathan Tellier <jonathan.tellier@gmail.com>
     - Marc Plano-Lesay <marc.planolesay@gmail.com>
     - Vitaly Minko <vitaly.minko@gmail.com>
     - Frederic Peters <fpeters@0d.be>
     - Andreas Henriksson <andreas@fatal.se>
     - Vincent Untz <vuntz@gnome.org>
     - Baptiste Mille-Mathias <baptistem@gnome.org>
     - Susana Pereira <susana.pereira@gmail.com>
     - Steve Frécinaux <code@istique.net>
     - Lars-Peter Clausen <lars@metafoo.de>
     - Milo Casagrande <milo@ubuntu.com>
     - Philip Withnall <philip@tecnocode.co.uk>
     - Bastien Nocera <hadess@hadess.net>
     - Daniel G. Siegel <dgsiegel@gnome.org>
     - Filippo Argiolas <filippo.argiolas@gmail.com>
     - Jaap Haitsma <jaap@haitsma.org>
     - Ryan Zeigler <zeiglerr@gmail.com>
     - Raluca-Elena Podiuc <ralucaelena1985@gmail.com>

    Collabora Ltd. agrees with the relicensing of the code (contributed by
    various authors) needed for telepathy-account-widgets (this work
    is done
    for Collabora).

    Richard Hult agrees with relicensing the code owned by
    Imendio/Tinybird.

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

 GOSSIP-RELICENSING.txt | 3378
 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 3378 insertions(+)

commit 8da5fa02e056fb702e9dcc0fee38fa85ef008538
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Aug 19 18:07:11 2013 +0200

    preferences: only show autoconnect when shell isn't running

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

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

commit ceb440fa6973252ad44d6f4913fa1bf22dd58a89
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Mon Aug 19 22:06:06 2013 +0200

    Updated Slovenian translation

 po/sl.po | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

commit ea7ca80b38c6630ff1347bf4ffcdce0595b1f9d5
Author: Christian Kirbach <christian.kirbach@gmail.com>
Date:	Mon Aug 19 19:26:23 2013 +0200

    Updated German translation

 po/de.po | 1468
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 744 insertions(+), 724 deletions(-)

commit 26b2fa11168acca03ffe892fda13bc5284f65ec0
Author: Marek Černocký <marek@manet.cz>
Date:	Mon Aug 19 19:05:36 2013 +0200

    Updated Czech translation

 po/cs.po | 144
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 74 insertions(+), 70 deletions(-)

commit d354e170b39901c06b927534318fbd24cb0ee95f
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 19 13:02:46 2013 +0200

    Do not ring on incoming calls when busy

    Signed-off-by: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

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

 src/empathy-event-manager.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

commit 831d0d218b0a8a257dca4e7c96bdc264595a8a6f
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Aug 19 11:41:35 2013 +0200

    Updated Spanish translation

 po/es.po | 147
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 75 insertions(+), 72 deletions(-)

commit adca7a01979ea64a3a570743fdbfd7a3c535f4fd
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Aug 16 13:43:49 2013 +0200

    Set a title to password dialogs

    Signed-off-by: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

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

 libempathy-gtk/empathy-password-dialog.c | 2 ++
 1 file changed, 2 insertions(+)

commit 1158a1e2814e74ce115cfa201fd8a908a79cbd7e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Aug 16 13:43:00 2013 +0200

    Add missing include

    Needed for EMPATHY_LOCATION_*.

    Signed-off-by: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

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

 libempathy/empathy-contact.c | 1 +
 1 file changed, 1 insertion(+)

commit 429f40b3dd1074929dab0ef1eeb5155264e72576
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Aug 18 14:17:22 2013 +0200

    [l10n] Updated Italian translation.

 po/it.po | 316
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 165 insertions(+), 151 deletions(-)

commit 99fb7ccb312d4ef6879a7ac1900a078ee0f21699
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Sat Aug 17 17:10:32 2013 +0200

    Updated Slovenian translation

 po/sl.po | 463
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 240 insertions(+), 223 deletions(-)

commit acaa1e4f9d2c5e746e895a7ca3e6002ac502cc2a
Author: Andreas Henriksson <andreas@fatal.se>
Date:	Wed Aug 14 21:44:24 2013 +0200

    Use new GeocodeLocation API in geocode-glib 0.99.1

    Use new accessor functions. The location structure members has
    been hidden.
    Use regular g_object_unref, since the geocode_location_free has been
    removed.

    See:
    https://git.gnome.org/browse/geocode-glib/commit?id=5372f2f7ff97707dcc839bd3ed79ea9f289f7409
    "lib: Turn GeocodeLocation into a proper GObject"

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

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

commit 4682c05ce90708e89c8690d4fb395fcee73b9d71
Author: Andreas Henriksson <andreas@fatal.se>
Date:	Wed Aug 14 20:40:48 2013 +0200

    Use new api-versioned name for geocode-glib

    geocode-glib has changed the name of the pkg-config file
    to include the api version. Update configure script accordingly.

    See:
    https://git.gnome.org/browse/geocode-glib/commit/?id=1cadaa879b7d72d973880680b5f947fd5c275974
    "pkg-config: Version the pkg-config file"

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

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b7bfb4d892c8dfc59c2a017d1227c9cc5ca16549
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Tue Jul 30 23:51:38 2013 +0530

    Show typing icon against composing members of a MUC

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

 libempathy-gtk/empathy-individual-store-channel.c | 67
 +++++++++++++++++++++++
 1 file changed, 67 insertions(+)

commit 2088b62035060aa42cc52bca7c3b1f6609751c32
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Wed Aug 14 12:18:13 2013 +0530

    Make individual_store_find_contact and free_iters protected

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

 libempathy-gtk/empathy-individual-store.c | 21 +++++++++++----------
 libempathy-gtk/empathy-individual-store.h |  5 +++++
 2 files changed, 16 insertions(+), 10 deletions(-)

commit 083966864e828b6c226285ac833a2179df9bb6f9
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Fri Jul 12 20:46:31 2013 +0530

    Contact should leave 'Ungrouped' group immediately upon first joining
    a group

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

 libempathy-gtk/empathy-roster-view.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit b595f2d54c32e2ce5fdda1b4adf46b22115eced8
Author: Aurimas Černius <aurisc4@gmail.com>
Date:	Sun Aug 11 20:10:35 2013 +0300

    Updated Lithuanian translation

 po/lt.po | 2039
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1124 insertions(+), 915 deletions(-)

commit 435400f698853bd615f0ccff4303f96d06df53c0
Author: Christian Kirbach <christian.kirbach@gmail.com>
Date:	Sat Aug 10 12:02:53 2013 +0200

    Updated German help translation

 help/de/de.po | 1103
 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 601 insertions(+), 502 deletions(-)

commit 2031d27b406ce42602b5f8ed2c059c2a9296a87c
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Thu Aug 8 16:58:07 2013 +0200

    EmpathyAccountsDialog: Simplify the way we update account display
    name label in infobar

    accounts_dialog_update_status_infobar() is the function responsible
    for doing all updates.

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

 src/empathy-accounts-dialog.c | 47
 +++++++++++--------------------------------
 1 file changed, 12 insertions(+), 35 deletions(-)

commit 1db39a3dc2832b385070206aeccd24587c052394
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Thu Aug 8 16:56:27 2013 +0200

    EmpathyAccountSettings: remember the new account display name when
    setting one.

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

 libempathy/empathy-account-settings.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

commit 392f45b77654627cf50c8e902fdc60ecb0b9e208
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Thu Aug 8 14:50:26 2013 +0200

    EmpathyUserInfo: Update identifier/alias when they change on the
    account

    When the account goes online the account's nickname quickly changes
    from
    the identifier to the actual nickname from the self VCard.

    Identifier can change as well when editing account settings.

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

 libempathy-gtk/empathy-user-info.c | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

commit 42c46fc9f73d06a10cd08e94bbec5885196eec4a
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Thu Aug 8 20:58:53 2013 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 173
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 93 insertions(+), 80 deletions(-)

commit be542f50da6bc3e7d24b808aac16b1f542be7dc0
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 7 19:29:15 2013 +0200

    Don't dereference a NULL error

    libsecret returns FALSE without an error in some cases but we
    unconditionally dereference it, causing a crash.

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

 libempathy/empathy-keyring.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit a243fdeec4e1f6cb2aff0e7a821fd167f21932bf
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 7 19:29:15 2013 +0200

    Don't dereference a NULL error

    libsecret returns FALSE without an error in some cases but we
    unconditionally dereference it, causing a crash.

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

 libempathy/empathy-keyring.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 57a1c2ea90fa02bfeea2c24570132681e8dd22e8
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Wed Aug 7 19:30:47 2013 +0200

    Updated Hungarian translation

 po/hu.po | 1444
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 730 insertions(+), 714 deletions(-)

commit b557adcf50f8a84424414a88cc129ecadb185057
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 7 16:39:02 2013 +0200

    use the user_action_time received from TP when presenting existing
    call window

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

 src/empathy-call-window.c | 7 +++++--
 src/empathy-call-window.h | 4 +++-
 src/empathy-call.c	   | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

commit 1d448e21f4b4d8caa3b08696586dba6be2ecf098
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 7 16:43:13 2013 +0200

    empathy_call_window_present(): rename to _new_handler()

    The name was miss leading as this function do more than just
    presenting the
    window.

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

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

commit 9a68f9d151f0ecd31a364946f816325037bdaf42
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 7 16:39:02 2013 +0200

    use the user_action_time received from TP when presenting new
    call window

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

 src/empathy-call-factory.c | 4 ++--
 src/empathy-call.c	    | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

commit 3beb1bb570e4f722ae77d42e64410ef93437544b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 7 16:33:59 2013 +0200

    call-factory::new-call-handler: remove unused 'outgoing' arg

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

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

commit cd240b10a8196fe4289ebe926ae4ea47f4be4365
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Tue Aug 6 15:48:27 2013 +0530

    fix memory leak

 libempathy-gtk/empathy-individual-menu.c | 1 +
 1 file changed, 1 insertion(+)

commit 8813a1d0dbb2fd256e47cbc25dadcc6dd86e4475
Author: Rafael Ferreira <rafael.f.f1@gmail.com>
Date:	Mon Aug 5 23:16:46 2013 -0300

    Updated Brazilian Portuguese translation

 po/pt_BR.po | 1439
 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 729 insertions(+), 710 deletions(-)

commit 63e3a649a5a00aa0f36434f42aae8f68bc3a2394
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Sat Aug 3 20:43:01 2013 +0530

    Fix assertion failure on opening conversation menu in 1-1 chats

 src/empathy-chat-window.c | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

commit b9065d414976bf126494fb1c0cfcc055c55856e0
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Fri Aug 2 12:34:29 2013 +0200

    Updated Galician translations

 po/gl.po | 239
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 128 insertions(+), 111 deletions(-)

commit cb5af073236ec93feb0f1bcc6104d065324dede0
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Wed Jul 31 09:21:38 2013 +0300

    Updated Hebrew translation.

 po/he.po | 973
 +++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 602 insertions(+), 371 deletions(-)

commit b82f0dc15a5ac436bdb51f300e514fff4a1d8953
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Jul 26 11:28:06 2013 +0200

    Updated Spanish translation

 po/es.po | 224
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 119 insertions(+), 105 deletions(-)

commit e74ffbd34ba628cf44f94a065bc9f527b0a6507f
Author: Alban Crequy <alban.crequy@collabora.co.uk>
Date:	Thu Jul 25 14:10:04 2013 +0100

    calls: only set InitialAudio or InitialVideo if they are true

    Any genuinely voice-only CM might not include InitialVideo in its
    advertised RequestableChannelClass. Empathy must not add
    InitialVideo=false then but just not include it.

 libempathy-gtk/empathy-call-utils.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

commit e6a71b9f7681a4547a68d8a3f06bbe4325d00a04
Author: Marek Černocký <marek@manet.cz>
Date:	Mon Jul 22 08:18:49 2013 +0200

    Updated Czech translation

 po/cs.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 6f162c0e722c5d64bad1632065806107b004dddf
Author: Marek Černocký <marek@manet.cz>
Date:	Mon Jul 22 08:11:30 2013 +0200

    Updated Czech translation

 po/cs.po | 222
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 117 insertions(+), 105 deletions(-)

commit 177e43407a443b8a34b8e8b320c2293c47fcbf23
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Sun Jun 30 20:23:09 2013 +0530

    Show a 'Remove from Group <group-name>' button in remove dialog

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

 libempathy-gtk/empathy-individual-menu.c | 79
 +++++++++++++++++++++++++++-----
 1 file changed, 68 insertions(+), 11 deletions(-)

commit ade3fc34bbc44dac9220e60f496e82f651180755
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Sun Jun 30 00:44:20 2013 +0530

    Install property active-group in EmpathyIndividualMenu

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

 libempathy-gtk/empathy-chat.c		  |  2 +-
 libempathy-gtk/empathy-individual-menu.c | 36
 +++++++++++++++++++++++++++++++-
 libempathy-gtk/empathy-individual-menu.h |  1 +
 libempathy-gtk/empathy-individual-view.c |  4 ++--
 libempathy-gtk/empathy-roster-view.c	  |  7 +++++--
 src/empathy-roster-window.c		  |  4 +++-
 6 files changed, 47 insertions(+), 7 deletions(-)

commit 1fc5a6fccf25ed44d39837125916f5282bf80abb
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Thu Jul 18 15:09:35 2013 +0100

    GOA: ignore non-Telepathy accounts

    This fixes a crash when trying to remove a GOA account without chat
    support.

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

 goa-mc-plugin/mcp-account-manager-goa.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 07c3b37828c4ecb649e439859254916a87b36707
Author: Marco Barisione <marco.barisione@collabora.co.uk>
Date:	Thu Jul 18 15:09:35 2013 +0100

    GOA: ignore non-Telepathy accounts

    This fixes a crash when trying to remove a GOA account without chat
    support.

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

 goa-mc-plugin/mcp-account-manager-goa.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit a073a5676a16dde521676f9701d51929d811d4a9
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Sat May 28 13:11:34 2011 +0530

    "Join Chat" and "Leave Chat" menu items for Conversation menu in MUCs

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

 src/empathy-chat-window.c  | 57
 ++++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-chat-window.ui | 15 ++++++++++++
 2 files changed, 72 insertions(+)

commit 7fdb6c3eca0837719c1970353f46ac38686867d6
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Thu Jul 18 13:45:36 2013 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 122
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 63 insertions(+), 59 deletions(-)

commit 2873368e36050e4969c3f91775b92fda27b9fcb5
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Thu Jul 18 12:49:16 2013 +0200

    EmpathySoundManager: Fix playing sound when account goes online.

    We need to use the requested presence instead of the current presence
    to check if we should play sound, because in the case of an account
    that just got connected, its current presence may still be OFFLINE.

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

 libempathy-gtk/empathy-sound-manager.c | 36
 +++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

commit eaa91c2dea8e630e113025764d678c823761e1e6
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Thu Jul 18 12:31:49 2013 +0200

    Move empathy_check_available_state() from utils to sound-manager

    It is used only from one place, there is no reason to have it
    in utils.

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

 libempathy-gtk/empathy-sound-manager.c | 18 ++++++++++++++++++
 libempathy/empathy-utils.c		| 18 ------------------
 libempathy/empathy-utils.h		|  1 -
 3 files changed, 18 insertions(+), 19 deletions(-)

commit 2d71ae69bc60d3825feafb0e2315069498010aee
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Thu Jul 18 11:13:48 2013 +0200

    EmpathyEventManager: Do not miss contact signon even for new contacts

    When a new contact is added, it could already be online,
    especially with Salut.

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

 src/empathy-event-manager.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

commit afb3644656e56aaefd56f8ec822472ab8c5d5239
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Wed Jul 17 09:16:14 2013 +0200

    [l10n] Updated Italian translation.

 po/it.po | 100
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 53 insertions(+), 47 deletions(-)

commit 5b67f38e862fc48b9ba4873f4e8b6aef955750ef
Author: Pavol Klačanský <pavol@klacansky.com>
Date:	Sat Jul 13 18:22:29 2013 +0200

    Updated slovak translation

 po/sk.po | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

commit b30fe91ec7e921e6bd23722447478dfcb9f64a22
Author: Wylmer Wang <wantinghard@gmail.com>
Date:	Thu Jul 11 15:40:25 2013 +0800

    update Simplified Chinese (zh_CN) translation

 po/zh_CN.po | 1576
 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 826 insertions(+), 750 deletions(-)

commit 4831504c7abf7c59ddc87362ba2b81c5378bdb00
Author: Marek Černocký <marek@manet.cz>
Date:	Tue Jul 9 21:07:50 2013 +0200

    Updated Czech translation

 po/cs.po | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

commit 8991b0bd4316261776e7093aeae3534c68183722
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Mon Jul 8 17:08:07 2013 -0700

    Remove the name of an account once it has been deleted.

    This fixes a minor security issue where information about an account
    (its
    name) could be displayed after the point it was deleted. It only
    lasted
    until Empathy was quit. This patch ensures the name is scrubbed
    from Empathy
    immediately.

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

 src/empathy-roster-window.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 27d365076acf6cd2fffa652043f375273ab815a5
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Tue Jul 9 12:56:33 2013 +0200

    Updated Spanish translation

 po/es.po | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

commit 9918bf4a948b64c5785bc0cf2945081e0f13323e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 9 11:06:54 2013 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a3011571d33687f47bf723f0816a2b68025c184a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 9 10:38:47 2013 +0200

    3.9.4

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

commit a79f388bd7ab91925b0131837f1d9d8247eecb62
Author: Frédéric Péters <fpeters@0d.be>
Date:	Tue Jul 2 10:33:13 2013 +0200

    roster: compare elements as utf8 strings, for correct collation

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

 libempathy-gtk/empathy-roster-view.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 3823c48231c9a81c4e916057ff8de6245d7d112a
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Jul 8 12:26:40 2013 +0200

    EmpathySearchContactDialog: Set search entry insensitive when search
    is not supported

    There is no point in letting user type something if the search
    button is insensitive anyway.

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

 libempathy-gtk/empathy-contact-search-dialog.c | 2 ++
 1 file changed, 2 insertions(+)

commit a97c124798eea75187267f92d0e8f43beed07877
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Jul 8 12:26:07 2013 +0200

    EmpathyContactSearchDialog: Set line wrap on message pages instead
    of ellipsize

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

 libempathy-gtk/empathy-contact-search-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b5c17731e76ff1dd2fa034e9cbcaa59a1965f25a
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Jul 8 12:19:02 2013 +0200

    EmpathyContactSearchDialog: Add a "Not Supported" message page

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

 libempathy-gtk/empathy-contact-search-dialog.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

commit bda80eccdf3e79c195bfa7982a9955c401e31c48
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Jul 8 12:06:48 2013 +0200

    EmpathyContactSearchDialog: factor out append_message_page()

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

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

commit 6c1e9287426b155c8047d518e1e6d8955f9d6fc4
Author: Pavol Klačanský <pavol@klacansky.com>
Date:	Sun Jul 7 21:12:29 2013 +0200

    Updated slovak translation

 po/sk.po | 137
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 69 insertions(+), 68 deletions(-)

commit 36f3996835e652b363d9643e3cdd77114a0cea04
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Thu Jul 4 11:23:07 2013 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 76
 ++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

commit 41789e84bd7c53c78ee255315b010a057c2b6b70
Author: Marek Černocký <marek@manet.cz>
Date:	Fri Jun 28 18:38:26 2013 +0200

    Updated Czech translation

 po/cs.po | 134
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 67 insertions(+), 67 deletions(-)

commit e1f74de26e52ce0ccb9b3df61c21bc406ff7aef2
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Fri Jun 28 02:00:01 2013 +0200

    Updated Galician translations

 po/gl.po | 134
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 67 insertions(+), 67 deletions(-)

commit df93e66c9804dffe126727a8a3f2b0c7f3312de8
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Thu Jun 27 13:02:04 2013 +0200

    Updated Spanish translation

 po/es.po | 119
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 60 insertions(+), 59 deletions(-)

commit 5d36322c998cc4de8f6633205b85c1b854684e12
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Jun 26 15:29:31 2013 +0200

    AccountsDialog: Truncate too long account names

    This prevent strings to be too big.

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

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

commit 8e692d867aa5a7679b8123a6c3f32d06c6bb0d56
Merge: dc44f6d 76a11c0
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Jun 26 15:29:13 2013 +0200

    Merge branch 'gnome-3-8'

commit 76a11c06dae40c16d70c506b808bec51d5a1cd13
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Jun 26 15:28:26 2013 +0200

    AccountsDialog: Ellipsize account dispaly name

    This fix gnome-shell crash if the name is too big,
    because it makes the window huge.

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

 src/empathy-accounts-dialog.c | 1 +
 1 file changed, 1 insertion(+)

commit dc44f6dd6245befd9e9e44ac77bb879725f7c3fc
Merge: e80012b 6bace22
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 26 10:47:31 2013 +0200

    Merge branch 'gnome-3-8'

commit 6bace22f3ffb9695870267e2a59858b3feeaa83e
Author: Ryan Lortie <desrt@desrt.ca>
Date:	Sat Jun 8 12:19:39 2013 -0400

    Fix escaping of text in empathy log window

    We insert text into the log window by using a javascript expression,
    with the text to insert quoted with single quotes.

    Ensure that we apply the correct escaping so that backslashes
    and quote
    characters are taken literally.

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

 libempathy-gtk/empathy-log-window.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

commit e80012b79bb56bbb7d4616f58b5509775e0e355f
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Jun 24 16:30:03 2013 +0200

    Updated Spanish translation

 help/es/es.po | 392
 +++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 234 insertions(+), 158 deletions(-)

commit 32c18db0675431e2b49f81f993d747a8c8e396e8
Author: Ekaterina Gerasimova <kittykat3756@gmail.com>
Date:	Sun Jun 23 18:38:41 2013 +0100

    Add help <desc> and update index.page

    Every page should have a description and a proper
    title. library.gnome.org will soon use these.

 help/C/index.page | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

commit 7c146f3ae79007a01cb314dcd27443619db897fa
Author: Ekaterina Gerasimova <kittykat3756@gmail.com>
Date:	Sun Jun 23 17:28:43 2013 +0100

    Update create-account help page

    Update the page as it was somewhat out of date.

 help/C/accounts-window.page |	 1 -
 help/C/add-account.page     |	 2 +-
 help/C/create-account.page  | 159
 +++++++++++++++++++++-----------------------
 3 files changed, 77 insertions(+), 85 deletions(-)

commit e4b46ee11ff0589ed6c4c2a1b00a0ebaee5898c9
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Thu Jun 20 10:32:40 2013 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 114
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 57 insertions(+), 57 deletions(-)

commit 61458c333b662457e6c3572999fd981abbaeb33d
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Mon Jun 17 22:39:57 2013 +0200

    [l10n] Updated Italian translation.

 po/it.po | 247
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 123 insertions(+), 124 deletions(-)

commit ec3bc28238ca47c193ae17c145fbadc715cc839c
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Jun 17 17:53:17 2013 +0200

    Updated Spanish translation

 po/es.po | 82
 ++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

commit 629089fa336147447b209a56d0682d8b3c2a6432
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 17 12:06:50 2013 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1730bb66236f2a1a64866d088a37a1f7af6e6a6d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 17 11:59:45 2013 +0200

    3.9.3

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

commit b7c6186d4b17e1ee7064de7b3c5255988304bc33
Merge: 54917ba e23e2b8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 17 11:58:28 2013 +0200

    Merge remote-tracking branch 'origin/gnome-3-8'

commit 54917ba3ec27170caeaf07abdf30b93a4bc4167f
Author: Sindhu S <sindhus@live.in>
Date:	Sun Jun 9 12:51:43 2013 +0530

    Fix new account dialog for title conforming to HIG

    Changed new account dialog title from "Adding new account" to
    "Add new account" compliant with GNOME HIG.

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

 libempathy-gtk/empathy-new-account-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e23e2b8330f63207867224ab96ef11b2aedf9cfc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 10 10:07:33 2013 +0200

    debug-window: fix messages array leak

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

 src/empathy-debug-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 37deb64980a9896e8748fb4cb0fc84c59b95bf89
Merge: 7d395c5 69cd22c
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Tue Jun 11 11:34:34 2013 +0200

    Merge branch 'gnome-3-8'

commit 69cd22c4b53c2b25cf5a22180bfddf0784c8db33
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Jun 10 17:34:01 2013 +0200

    EmpathyNewChatroomDialog: Do not crash if the CM omitted handle-name

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

 src/empathy-new-chatroom-dialog.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 351ba3a165a5c8e74cca0f8160c399d9bb669e29
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Jun 10 17:09:19 2013 +0200

    EmpathyNewChatroomDialog: Make sure we use the TpRoomList that
    correspond to selected account

    When switching account  before tp_room_list_new_async() finish,
    there is a race for which one will finish first. We ignore the
    new TpRoomList if it does not correspond to the currently
    selected account.

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

 src/empathy-new-chatroom-dialog.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

commit 6f3a33388a48a134142795540571f425ea165d26
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Jun 10 17:08:11 2013 +0200

    EmpathyNewChatroom: Fix comment to correspond to the reality

    The comments where out of sync with the en COL_* enum.

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

 src/empathy-new-chatroom-dialog.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 7d395c53d8d2fb7f2a5fa496555cb09cbdaa0be9
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sat Jun 1 23:18:38 2013 +0200

    Updated Galician translations

 po/gl.po | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 5a664d3ba3a58addaed43167ef3c6f94562c896b
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sat Jun 1 23:03:13 2013 +0200

    Updated Galician translations

 po/gl.po | 1444
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 721 insertions(+), 723 deletions(-)

commit 3a02bb02d5093e5cd331b43c1d0b845a835625d3
Author: Iain Lane <iain.lane@canonical.com>
Date:	Thu May 30 15:30:14 2013 +0100

    empathy-sanity-checker: Include empathy-keyring.h when HAVE_UOA
    is defined.

    We use empathy_keyring_set_account_password_finish and friends from
    here.

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

 src/empathy-sanity-cleaning.c | 1 +
 1 file changed, 1 insertion(+)

commit 7608ea1a67e4b1c9cf5d14cb061fd1a66f65f51b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 29 16:34:42 2013 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0c2fb857804274bea66d0ee7c8fa0a3b8cc54110
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 29 16:29:03 2013 +0200

    prepare 3.9.2

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

commit 3c82d19411c5e6dd7f2ba78a8d2a01d42829b84b
Author: Marek Černocký <marek@manet.cz>
Date:	Wed May 29 01:54:10 2013 +0200

    Updated Czech translation

 po/cs.po | 1443
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 722 insertions(+), 721 deletions(-)

commit dbfffe0c15992edf80e0029f3ab76132cc2a0e6b
Author: Pavol Klačanský <pavol@klacansky.com>
Date:	Fri May 24 23:32:02 2013 +0200

    Updated slovak translation

 po/sk.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 200bc3bf01464604cdd15fdda56db90c68b5d90b
Author: Pavol Klačanský <pavol@klacansky.com>
Date:	Fri May 24 23:25:44 2013 +0200

    Updated slovak translation

 po/sk.po | 1435
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 716 insertions(+), 719 deletions(-)

commit 9d408bd199a0b577eaec9826df060397578f3a37
Merge: 138123c ec619f9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 24 16:00:49 2013 +0200

    Merge branch 'gnome-3-8'

    Conflicts:
	NEWS
	configure.ac

commit ec619f9805258aa9d623e2651fb604b80d49f795
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 24 15:59:57 2013 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0292ce27a6059f9dac82ecd55ae53f4bad6bda41
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 24 15:53:24 2013 +0200

    3.8.3

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

commit fa9fe6db3a9bf4cdb268a7cc1ec0c42201837b5d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 24 15:49:50 2013 +0200

    debug-window: pass the proper type when setting 'yalign'

 src/empathy-debug-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 06a14ea83b6f301eab4de9488df89838db4b2589
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 24 15:29:47 2013 +0200

    new-chatroom-dialog: use tp_g_signal_connect_object()

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

 src/empathy-new-chatroom-dialog.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 7e2db943e0c9a6f5764504460e64ffec9bb87d67
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 24 14:43:27 2013 +0200

    Revert "log-window: escape the body of the message"

    This commit introduced a nasty regression breaking UTF-8 logs
    (#692746).
    I prefer to revert it as #691085 was a far less anoying bug.

    We'll re-fix #691085 once we'll have a UTF-8 friendly escape function
    in GLib
    (#89548).

    This reverts commit 1e7449f5a14e2f031389808206c9991f65d3ade7.

 libempathy-gtk/empathy-log-window.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

commit 138123c86b9e6a6bf67a188d1e67bd0444c7ebff
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri May 24 11:48:28 2013 +0300

    Updated Hebrew translation.

 po/he.po | 1510
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 753 insertions(+), 757 deletions(-)

commit 460aeb4236d18d2b4d6486e16d1aa725b5a696fd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 20 10:25:17 2013 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b0d08102b64ed36b92016c90ed775bb4462d4adf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 20 10:20:00 2013 +0200

    prepare 3.8.2

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

commit d4cf1bd5e911ebb2f4441b62381326472a92a784
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri May 17 13:05:36 2013 +0200

    Updated Spanish translation

 help/es/es.po | 585
 +++++++++++++++++++++++++++-------------------------------
 1 file changed, 274 insertions(+), 311 deletions(-)

commit bfef2b4465c23a7a048b4e4e0937a4d1857caa91
Author: Ekaterina Gerasimova <kittykat3756@gmail.com>
Date:	Fri May 17 00:04:02 2013 +0100

    Mark untranslatable images in help

    Mark images without text as untranslatable in user help. At the same
    time, mark author emails as untranslatable.

 help/C/account-irc.page	| 12 ++++++++----
 help/C/overview.page		| 13 +++++++------
 help/C/prob-conn-auth.page	| 15 +++++++--------
 help/C/prob-conn-name.page	| 13 ++++++-------
 help/C/prob-conn-neterror.page | 15 +++++++--------
 help/C/status-icons.page	| 15 ++++++++-------
 6 files changed, 43 insertions(+), 40 deletions(-)

commit b6bd3aef0a762a938ecbdec79011f5f114b52598
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Thu May 16 13:28:11 2013 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 1440
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 717 insertions(+), 723 deletions(-)

commit c9f2de4d93971e70adb9add1c56449d4f173a99f
Author: Sindhu S <sindhus@live.in>
Date:	Fri May 10 20:43:40 2013 +0530

    Add gnome-help/C entry to .gitignore

    The command `git status` will now recognize new *.page added in help/C

 help/.gitignore | 1 +
 1 file changed, 1 insertion(+)

commit 3990a508cf3b0e3082f3dd556e417cce920acaf4
Author: Gil Forcada <gforcada@gnome.org>
Date:	Wed May 8 23:44:19 2013 +0200

    [l10n] Update Catalan documentation

 help/ca/ca.po | 69
 ++++++++++++++++++++++++++---------------------------------
 1 file changed, 30 insertions(+), 39 deletions(-)

commit 6cbfd5e5417cf998fa6b3a002bd535817667e3fa
Author: Manel Vidal <verduler@gmail.com>
Date:	Wed May 8 23:10:41 2013 +0200

    [l10n] Update Catalan documentation

 help/ca/ca.po | 5182
 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 2623 insertions(+), 2559 deletions(-)

commit 83c85e98027758ea3afafe183ee2de9f4047e6be
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Tue May 7 15:11:40 2013 +0200

    Fix UOA build error

 ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

commit 10983e93f69ddcc048cc582d777433ca2c7a2b39
Merge: 87d26a1 add79d5
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Tue May 7 15:24:13 2013 +0200

    Merge branch 'gnome-3-8'

commit add79d54e3c0149a2c336077d1e37c60d54c5ace
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Tue May 7 15:14:48 2013 +0200

    Fix crash when displaying google account vcard

 libempathy-gtk/empathy-user-info.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit 87d26a13dcafdbd1a2f19817a987ad43b2a5336d
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Sat May 4 21:32:34 2013 +0200

    Updated Slovenian translation

 po/sl.po | 1988
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1092 insertions(+), 896 deletions(-)

commit 549d69ba253ba81a3534d762d41eb54213f92cc0
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri May 3 18:15:09 2013 +0200

    Updated Spanish translation

 po/es.po | 1438
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 717 insertions(+), 721 deletions(-)

commit e9cc1a9afaa6d9293281d554e3bf1cae9f22a1ef
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 3 15:07:22 2013 +0200

    release: update last_tag_pattern

 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 61980ecf6d092062f78c23b286f75666332217ed
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 3 15:07:15 2013 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f9951a15e44d4c23c74d0237bfba9112ef7b81a2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 3 14:59:23 2013 +0200

    prepare 3.9.1

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

commit f2d81bc778ae11d5518d9b054ce230fc90d37c82
Author: B.Prathibha <prathibhab@cdac.in>
Date:	Mon Jan 21 20:43:42 2013 +0530

    GNOME Goal: Update icon names

    Corrected the icon names as per the icon naming spec.

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

 libempathy-gtk/empathy-avatar-chooser.c | 2 +-
 src/empathy-call-window.c		 | 2 +-
 src/empathy-call-window.ui		 | 2 +-
 src/empathy-preferences.c		 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

commit 285452f0b9b234879a1b690398b8967095f716dc
Author: SandipTiwari <sandipnathtiwari@gmail.com>
Date:	Sat Apr 20 11:54:39 2013 +0530

    fixed grammatical error: setup -> set up could find this error only
    in src/empathy-roster-window.c changed from "You need to setup an
    ..." to "You need to set up an ..." as suggested.

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

 src/empathy-roster-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6bdef2ef6259bda727a2cbe3a827c4a39b73a7e8
Merge: c4a27ed e4dbe9f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 3 14:32:22 2013 +0200

    Merge branch 'gnome-3-8'

commit e4dbe9ffb7c239cb2ea304a9a13fcfa6573c63e1
Author: Olivier Crête <olivier.crete@collabora.com>
Date:	Wed Apr 3 15:45:18 2013 -0400

    call-window: Remember that the audio output has been added

    Otherwise it tries to re-add it.

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

 src/empathy-call-window.c | 1 +
 1 file changed, 1 insertion(+)

commit c4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed
Merge: eb3b3c9 63ded64
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 3 14:19:23 2013 +0200

    Merge branch 'gnome-3-8'

    Conflicts:
	src/empathy.c

commit 63ded644beff3bb2501c3df640ca3af795b29e16
Author: Stef Walter <stefw@gnome.org>
Date:	Sat Apr 27 09:35:37 2013 +0200

    libempathy: Fix build by adding missing math.h header

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

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

commit eb3b3c918fdb99db70d539257e8a1723f280e821
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Thu May 2 19:36:56 2013 +0200

    Updated Spanish translation

 help/es/es.po | 241
 ++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 148 insertions(+), 93 deletions(-)

commit c1f6327303dfa50e97a02bfad8161553aa549575
Author: Shobha Tyagi <tyagishobha@gmail.com>
Date:	Sat Apr 27 01:10:26 2013 +0530

    Updated link-contacts.page, bug 677549

 help/C/link-contacts.page | 73
 +++++++++++++++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 25 deletions(-)

commit 026eb8a2a612069392d1ee290ef4762818f6862d
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Apr 28 12:51:49 2013 +0200

    [l10n] Updated Italian translation.

 po/it.po | 1431
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 715 insertions(+), 716 deletions(-)

commit a6212601d430562157a200b3810010db809e7d0c
Author: Dimitris Spingos <dmtrs32@gmail.com>
Date:	Fri Apr 26 00:06:26 2013 +0300

    Updated Greek translation

 help/el/el.po | 409
 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 211 insertions(+), 198 deletions(-)

commit a1d3a40624db8c6e745e125672aa8bcf2e3972ab
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Apr 24 12:20:19 2013 +0200

    Updated Spanish translation

 help/es/es.po | 209
 +++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 119 insertions(+), 90 deletions(-)

commit 3ed22ee666073b063d24a9971cd3c345236cf56e
Author: Wylmer Wang <wantinghard@gmail.com>
Date:	Sat Apr 20 03:53:12 2013 +0800

    Update Simplified Chinese help translation

 help/zh_CN/zh_CN.po | 5021
 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 2716 insertions(+), 2305 deletions(-)

commit a599028bba6dba2b9b0f4cc97b6d1879b364ba5f
Author: Ekaterina Gerasimova <kittykat3756@gmail.com>
Date:	Mon Apr 15 22:48:58 2013 +0100

    Update video call help for 3.8

 help/C/figures/camera-web.png | Bin 881 -> 0 bytes
 help/C/video-call.page        |  32 ++++++++++++++++++--------------
 help/Makefile.am	       |   1 -
 3 files changed, 18 insertions(+), 15 deletions(-)

commit 65d8bef73f2ff7d2025e51fa87e9981c95ea9ad6
Author: Ekaterina Gerasimova <kittykat3756@gmail.com>
Date:	Mon Apr 15 21:28:26 2013 +0100

    Update help for making audio calls

    Update the help for 3.8 and delete icon that is no longer dispayed in
    the application.

 help/C/audio-call.page			   |  30
 +++++++++++++++++++-----------
 help/C/figures/audio-input-microphone.png | Bin 650 -> 0 bytes
 help/Makefile.am			   |   1 -
 3 files changed, 19 insertions(+), 12 deletions(-)

commit 80fa7919b3a10bfd4c9c9f2da023f6ef294a1007
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 15 17:17:30 2013 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2c27c59d8aed1d89251aa5e5ecc061900ef3f84a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 15 17:11:52 2013 +0200

    3.8.1

 NEWS | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit eb096925243e96cc474127fe47cdd8ab0726b678
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 15 17:08:01 2013 +0200

    prepare 3.8.1

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

commit fe2c67d1a5099aeeb20445835d661ee5d054917b
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Apr 12 18:20:05 2013 +0200

    Updated Spanish translation

 help/es/es.po | 80
 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 39 insertions(+), 41 deletions(-)

commit aad54d87ec506eac48edea50bb64c4de91cbe72a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 10 10:54:47 2013 +0100

    empathy-utils: add missing math.h include

 libempathy/empathy-utils.c | 1 +
 1 file changed, 1 insertion(+)

commit ac62fdf444bb350cd2a8d5932652080d4c788eeb
Author: Reşat SABIQ <tilde.birlik@gmail.com>
Date:	Sun Apr 7 19:47:38 2013 -0500

    Updated Crimean Tatar (Crimean Turkish) translation

 po/crh.po | 5104
 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 2576 insertions(+), 2528 deletions(-)

commit 8bf61b23decc821be5ad5f41efbce59d498eb8e0
Author: Reşat SABIQ <tilde.birlik@gmail.com>
Date:	Sun Apr 7 19:47:38 2013 -0500

    Updated Crimean Tatar (Crimean Turkish) translation

 po/crh.po | 5104
 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 2576 insertions(+), 2528 deletions(-)

commit 6bbe15b989af157bf3ff3b44fcea854940046ccf
Author: Christian Kirbach <Christian.Kirbach@googlemail.com>
Date:	Fri Apr 5 14:36:35 2013 +0200

    Updated German help translation

 help/de/de.po | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

commit 23a6a8ed50eaaefc129cad12d603c5f145c5e313
Author: Christian Kirbach <Christian.Kirbach@googlemail.com>
Date:	Fri Apr 5 14:36:08 2013 +0200

    Updated German help translation

 help/de/de.po | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

commit e1e7dde31143a916e804980bb5baf0d32060ad8d
Author: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date:	Thu Apr 4 17:55:32 2013 +0200

    EmpathyApp: don't open the main instance if only the preferences
    are requested

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

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

commit f451000063d5e20b337d2a8d7b0d7faf6429af6b
Author: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date:	Fri Apr 5 13:35:09 2013 +0200

    EmpathyDebugger: Use application activate and keep platform data

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

 src/empathy-debugger.c | 70
 ++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 51 insertions(+), 19 deletions(-)

commit 3a39843acfea0204024761b7103305fa39f15244
Author: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date:	Thu Apr 4 18:09:41 2013 +0200

    EmpathyApp: Use GAction to pass the command-line to main instance

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

 src/empathy.c | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

commit 569fc6d306d3eda566845666495bd7e34d197f9d
Author: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date:	Thu Apr 4 17:55:32 2013 +0200

    EmpathyApp: don't open the main instance if only the preferences
    are requested

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

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

commit 0f64b475daf19bd7167fe22354880c604152ec8b
Author: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date:	Thu Apr 4 22:40:12 2013 +0200

    EmpathyChat: pass platform-data when activating

    This can be done by not initializing gtk before that the application
    will do it.

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

commit ed8bfa0abe0762b422be84aa00d77c798a5c95e8
Author: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date:	Thu Apr 4 21:06:32 2013 +0200

    EmpathyAccounts: use GApplication activate

 src/empathy-accounts.c | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

commit 76838dc0b21a942f99228753ed3a48142803f640
Author: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date:	Thu Apr 4 23:31:49 2013 +0200

    EmpathyApp: don't activate app with invalid commandline

 src/empathy.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit c34fe48f550f43c0a93e122fd0f486cc5c5eeb03
Author: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date:	Thu Apr 4 23:23:27 2013 +0200

    EmpathyApp: clear errors in command-line initialization

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

commit c9f46637f57ac0ca04b5b5557c5b27536305b2d6
Author: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date:	Thu Apr 4 12:28:54 2013 +0200

    empaty.desktop: enable StartupNotify

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

 data/empathy.desktop.in.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3bb08adbbb6948628e865479abd6befbfc4ff6e9
Author: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date:	Thu Apr 4 18:50:57 2013 +0200

    Empathy: Use g_application_activate to pass platform-data to the
    GtkApplication

    Also we make sure that the DESKTOP_STARTUP_ID env variable is
    not unset
    when initializing gtk.

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

 src/empathy.c | 43 ++++++++++++++++---------------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

commit 9419483e04bfe9f6fba0828bdeed7c260c8a22db
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Thu Apr 4 15:20:14 2013 +0200

    keyring: Drop legacy function after the libsecret migration

 libempathy-gtk/empathy-chat.c | 10 ++--------
 libempathy/empathy-keyring.c  |  6 ------
 libempathy/empathy-keyring.h  |  2 --
 3 files changed, 2 insertions(+), 16 deletions(-)

commit f5d311ec7a8e609dbd94914e15d2bd983f05224c
Merge: 0ad138f 3af2b86
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Apr 3 10:09:56 2013 +0200

    Merge branch 'gnome-3-8'

commit 3af2b86ec550ae1f37f25504afb95c590e7dd085
Author: Lukas Vacek <lucas.vacek@gmail.com>
Date:	Mon Apr 1 21:28:13 2013 +0100

    UOA: Do not segfault when "Done" or "Cancel" button clicked but
    widget is not ready yet

 .../account-plugins/empathy-accounts-plugin-widget.c		|
 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 0ad138fa1c21e7f58b617fe34506ee3dc3bdc695
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Mon Apr 1 23:21:09 2013 +0200

    Clean up #include directives in source files

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

 extensions/extensions.h			   | 1 -
 goa-mc-plugin/mcp-account-manager-goa.c	   | 1 -
 goa-mc-plugin/mission-control-plugin.c		   | 2 --
 libempathy-gtk/empathy-account-widget-irc.h	   | 2 --
 libempathy-gtk/empathy-account-widget-private.h   | 3 ---
 libempathy-gtk/empathy-account-widget-sip.h	   | 2 --
 libempathy-gtk/empathy-bad-password-dialog.h	   | 3 ---
 libempathy-gtk/empathy-base-password-dialog.h	   | 1 -
 libempathy-gtk/empathy-calendar-button.h	   | 1 -
 libempathy-gtk/empathy-call-utils.c		   | 1 -
 libempathy-gtk/empathy-call-utils.h		   | 1 -
 libempathy-gtk/empathy-contactinfo-utils.h	   | 1 -
 libempathy-gtk/empathy-geometry.h		   | 1 -
 libempathy-gtk/empathy-individual-store-manager.h | 2 +-
 libempathy-gtk/empathy-irc-network-dialog.c	   | 1 -
 libempathy-gtk/empathy-log-window.c		   | 1 -
 libempathy-gtk/empathy-new-call-dialog.h	   | 1 -
 libempathy-gtk/empathy-new-message-dialog.h	   | 1 -
 libempathy-gtk/empathy-notify-manager.h	   | 1 -
 libempathy-gtk/empathy-password-dialog.h	   | 1 -
 libempathy-gtk/empathy-plist.h			   | 1 -
 libempathy-gtk/empathy-protocol-chooser.h	   | 1 -
 libempathy-gtk/empathy-roster-model.h		   | 1 -
 libempathy-gtk/empathy-search-bar.h		   | 3 +--
 libempathy-gtk/empathy-smiley-manager.h	   | 1 -
 libempathy-gtk/empathy-sound-manager.h		   | 1 -
 libempathy-gtk/empathy-status-preset-dialog.h	   | 1 -
 libempathy-gtk/empathy-theme-manager.c		   | 3 ---
 libempathy-gtk/empathy-theme-manager.h		   | 1 -
 libempathy-gtk/empathy-tls-dialog.h		   | 1 -
 libempathy/empathy-utils.c			   | 1 -
 nautilus-sendto-plugin/empathy-nautilus-sendto.c  | 8 --------
 src/empathy-accounts-common.c			   | 1 -
 src/empathy-accounts-common.h			   | 1 -
 src/empathy-audio-sink.h			   | 1 -
 src/empathy-audio-src.h			   | 1 -
 src/empathy-call-factory.h			   | 1 -
 src/empathy-call-handler.h			   | 2 --
 src/empathy-call-observer.h			   | 1 -
 src/empathy-call-window-fullscreen.h		   | 2 --
 src/empathy-call-window.h			   | 1 -
 src/empathy-camera-menu.h			   | 1 -
 src/empathy-chat-manager.c			   | 1 -
 src/empathy-chat-manager.h			   | 1 -
 src/empathy-chat-window.c			   | 2 --
 src/empathy-chat-window.h			   | 1 -
 src/empathy-debug-window.h			   | 1 -
 src/empathy-event-manager.h			   | 1 -
 src/empathy-ft-manager.h			   | 2 --
 src/empathy-import-utils.h			   | 1 -
 src/empathy-import-widget.c			   | 1 -
 src/empathy-import-widget.h			   | 1 -
 src/empathy-mic-monitor.c			   | 1 -
 src/empathy-mic-monitor.h			   | 1 -
 src/empathy-new-chatroom-dialog.h		   | 1 -
 src/empathy-rounded-actor.h			   | 1 -
 src/empathy-rounded-rectangle.h		   | 1 -
 src/empathy-rounded-texture.h			   | 1 -
 src/empathy-status-icon.h			   | 1 -
 src/empathy-video-src.h			   | 1 -
 tests/empathy-chatroom-manager-test.c		   | 6 ------
 tests/empathy-tls-test.c			   | 6 ------
 tests/mock-pkcs11.c				   | 2 --
 tests/mock-pkcs11.h				   | 2 --
 tests/test-helper.c				   | 5 -----
 tests/test-irc-helper.h			   | 3 ---
 66 files changed, 2 insertions(+), 105 deletions(-)

commit b25bcd6653db5ae5f771256aad95c5a93875ecda
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Mon Apr 1 18:10:01 2013 +0200

    Clean up #include directives in headers

    Reorder some inclusions and remove a few blank lines.

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

 libempathy-gtk/empathy-account-chooser.h			       |
 1 -
 libempathy-gtk/empathy-account-widget-irc.h			       |
 1 +
 libempathy-gtk/empathy-account-widget-private.h		       |
 3 ++-
 libempathy-gtk/empathy-account-widget-sip.h			       |
 1 +
 libempathy-gtk/empathy-chat.h					       |
 3 +--
 libempathy-gtk/empathy-contact-widget.h			       |
 2 +-
 libempathy-gtk/empathy-contactinfo-utils.h			       |
 1 -
 libempathy-gtk/empathy-dialpad-button.h			       |
 1 -
 libempathy-gtk/empathy-groups-widget.h				       |
 1 -
 libempathy-gtk/empathy-individual-dialogs.h			       |
 1 -
 libempathy-gtk/empathy-individual-edit-dialog.h		       |
 1 -
 libempathy-gtk/empathy-individual-information-dialog.h		       |
 1 -
 libempathy-gtk/empathy-individual-store-manager.h		       |
 1 -
 libempathy-gtk/empathy-individual-view.h			       |
 3 +--
 libempathy-gtk/empathy-individual-widget.h			       |
 1 -
 libempathy-gtk/empathy-local-xmpp-assistant-widget.h		       |
 1 -
 libempathy-gtk/empathy-location-manager.h			       |
 1 -
 libempathy-gtk/empathy-notify-manager.h			       |
 3 +--
 libempathy-gtk/empathy-password-dialog.h			       |
 3 +--
 libempathy-gtk/empathy-protocol-chooser.h			       |
 1 -
 libempathy-gtk/empathy-roster-model-aggregator.h		       |
 1 -
 libempathy-gtk/empathy-roster-model.h				       |
 1 -
 libempathy-gtk/empathy-roster-view.h				       |
 1 -
 libempathy-gtk/empathy-sound-manager.h				       |
 1 -
 libempathy-gtk/empathy-tls-dialog.h				       |
 1 -
 libempathy-gtk/empathy-ui-utils.h				       |
 1 -
 libempathy-gtk/empathy-user-info.h				       |
 1 -
 libempathy/empathy-account-settings.h				       |
 1 -
 libempathy/empathy-auth-factory.h				       |
 1 -
 libempathy/empathy-chatroom-manager.h				       |
 1 -
 libempathy/empathy-chatroom.h					       |
 1 -
 libempathy/empathy-connection-aggregator.h			       |
 1 -
 libempathy/empathy-connection-managers.h			       |
 1 -
 libempathy/empathy-contact.h					       |
 1 -
 libempathy/empathy-debug.h					       |
 3 ---
 libempathy/empathy-ft-handler.h				       |
 1 -
 libempathy/empathy-keyring.h					       |
 1 -
 libempathy/empathy-presence-manager.h				       |
 1 -
 libempathy/empathy-request-util.h				       |
 1 -
 libempathy/empathy-server-sasl-handler.h			       |
 1 -
 libempathy/empathy-server-tls-handler.h			       |
 1 -
 libempathy/empathy-time.h					       |
 1 -
 libempathy/empathy-tls-verifier.h				       |
 1 -
 libempathy/empathy-tp-chat.h					       |
 1 -
 libempathy/empathy-utils.h					       |
 1 -
 src/empathy-accounts-dialog.h					       |
 1 -
 src/empathy-call-handler.h					       |
 2 --
 src/empathy-call-window.h					       |
 2 +-
 src/empathy-invite-participant-dialog.h			       |
 1 -
 src/empathy-sanity-cleaning.h					       |
 4 ++++
 tests/mock-pkcs11.h						       |
 4 +---
 tests/test-irc-helper.h					       |
 2 +-
 .../cc-plugins/account-plugins/empathy-accounts-plugin-widget.h       |
 2 --
 .../cc-plugins/app-plugin/empathy-app-plugin-widget.h		       |
 2 --
 ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h     |
 1 -
 ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h     |
 1 -
 56 files changed, 16 insertions(+), 64 deletions(-)

commit 0d137b74e57840bd85f090becd4144f62c89d6ab
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Mon Apr 1 17:04:08 2013 +0200

    Reorder header inclusions accordingly to the Telepathy coding style

    Sort by:
    • "config.h"
    • API declarations, if any
    • public libraries
    • internal headers, alphabetically sorted (mostly)

    http://telepathy.freedesktop.org/wiki/Style#A.23includes

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

 goa-mc-plugin/mcp-account-manager-goa.c	    |  6 ++--
 goa-mc-plugin/mission-control-plugin.c		    |  2 ++
 libempathy-gtk/empathy-account-chooser.c	    |  2 +-
 libempathy-gtk/empathy-account-selector-dialog.c   |  1 -
 libempathy-gtk/empathy-account-widget-irc.c	    |  2 +-
 libempathy-gtk/empathy-account-widget-sip.c	    |  2 +-
 libempathy-gtk/empathy-account-widget.c	    |  8 ++---
 libempathy-gtk/empathy-avatar-chooser.c	    | 13 ++++---
 libempathy-gtk/empathy-avatar-chooser.h	    |  1 +
 libempathy-gtk/empathy-avatar-image.c		    |  4 +--
 libempathy-gtk/empathy-avatar-image.h		    |  2 ++
 libempathy-gtk/empathy-bad-password-dialog.c	    |  1 -
 libempathy-gtk/empathy-base-password-dialog.c	    |  4 +--
 libempathy-gtk/empathy-calendar-button.c	    |  3 +-
 libempathy-gtk/empathy-call-utils.c		    |  5 +--
 libempathy-gtk/empathy-call-utils.h		    |  3 ++
 libempathy-gtk/empathy-cell-renderer-activatable.c |  3 +-
 libempathy-gtk/empathy-cell-renderer-expander.c    |  4 ++-
 libempathy-gtk/empathy-cell-renderer-text.c	    |  2 +-
 libempathy-gtk/empathy-chat.c			    | 20 +++++------
 libempathy-gtk/empathy-contact-blocking-dialog.c   |  7 ++--
 libempathy-gtk/empathy-contact-chooser.c	    |  4 +--
 libempathy-gtk/empathy-contact-search-dialog.c     | 11 +++---
 libempathy-gtk/empathy-contact-widget.c	    |  9 +++--
 libempathy-gtk/empathy-contactinfo-utils.c	    |  5 ++-
 libempathy-gtk/empathy-dialpad-button.c	    |  2 --
 libempathy-gtk/empathy-dialpad-widget.c	    |  1 -
 libempathy-gtk/empathy-geometry.c		    |  4 +--
 libempathy-gtk/empathy-groups-widget.c		    |  3 +-
 libempathy-gtk/empathy-individual-dialogs.c	    |  5 ++-
 libempathy-gtk/empathy-individual-edit-dialog.c    |  5 ++-
 .../empathy-individual-information-dialog.c	    |  7 ++--
 libempathy-gtk/empathy-individual-menu.c	    | 22 ++++++------
 libempathy-gtk/empathy-individual-store-channel.c  |  3 +-
 libempathy-gtk/empathy-individual-store-channel.h  |  1 +
 libempathy-gtk/empathy-individual-store-manager.c  |  1 -
 libempathy-gtk/empathy-individual-store.c	    |  6 ++--
 libempathy-gtk/empathy-individual-view.c	    | 18 +++++-----
 libempathy-gtk/empathy-individual-widget.c	    |  8 ++---
 libempathy-gtk/empathy-input-text-view.c	    |  1 +
 .../empathy-irc-network-chooser-dialog.c	    |  6 ++--
 libempathy-gtk/empathy-irc-network-chooser.c	    |  8 ++---
 libempathy-gtk/empathy-irc-network-dialog.c	    |  6 ++--
 libempathy-gtk/empathy-live-search.c		    |  3 +-
 .../empathy-local-xmpp-assistant-widget.c	    |  3 +-
 libempathy-gtk/empathy-location-manager.c	    |  3 +-
 libempathy-gtk/empathy-log-window.c		    | 21 +++++------
 libempathy-gtk/empathy-log-window.h		    |  1 +
 libempathy-gtk/empathy-new-account-dialog.c	    |  6 ++--
 libempathy-gtk/empathy-new-call-dialog.c	    | 12 +++----
 libempathy-gtk/empathy-new-message-dialog.c	    |  8 ++---
 libempathy-gtk/empathy-notify-manager.c	    |  6 ++--
 libempathy-gtk/empathy-password-dialog.c	    |  1 -
 libempathy-gtk/empathy-plist.c			    |  3 +-
 libempathy-gtk/empathy-presence-chooser.c	    |  3 +-
 libempathy-gtk/empathy-protocol-chooser.c	    |  5 ++-
 libempathy-gtk/empathy-roster-contact.c	    |  6 ++--
 libempathy-gtk/empathy-roster-group.c		    |  1 -
 libempathy-gtk/empathy-roster-model-aggregator.c   |  3 +-
 libempathy-gtk/empathy-roster-model-manager.c	    |  4 +--
 libempathy-gtk/empathy-roster-model.c		    |  1 -
 libempathy-gtk/empathy-roster-view.c		    |  2 --
 libempathy-gtk/empathy-search-bar.c		    |  5 ++-
 libempathy-gtk/empathy-share-my-desktop.c	    |  3 +-
 libempathy-gtk/empathy-smiley-manager.c	    |  4 +--
 libempathy-gtk/empathy-sound-manager.c		    |  6 ++--
 libempathy-gtk/empathy-spell.c			    |  4 +--
 libempathy-gtk/empathy-status-preset-dialog.c	    |  7 ++--
 libempathy-gtk/empathy-status-preset-dialog.h	    |  1 +
 libempathy-gtk/empathy-string-parser.c		    |  2 +-
 libempathy-gtk/empathy-subscription-dialog.c	    |  7 ++--
 libempathy-gtk/empathy-theme-adium.c		    | 11 +++---
 libempathy-gtk/empathy-theme-manager.c		    |  4 +--
 libempathy-gtk/empathy-tls-dialog.c		    |  4 +--
 libempathy-gtk/empathy-ui-utils.c		    |  6 ++--
 libempathy-gtk/empathy-user-info.c		    | 10 +++---
 libempathy-gtk/empathy-webkit-utils.c		    |  4 +--
 libempathy/empathy-account-settings.c		    |  4 +--
 libempathy/empathy-auth-factory.c		    |  6 ++--
 libempathy/empathy-camera-monitor.c		    |  2 +-
 libempathy/empathy-chatroom-manager.c		    |  2 +-
 libempathy/empathy-chatroom.c			    |  2 +-
 libempathy/empathy-client-factory.c		    |  1 -
 libempathy/empathy-connection-aggregator.c	    |  1 -
 libempathy/empathy-connection-managers.c	    |  2 +-
 libempathy/empathy-contact-groups.c		    |  2 +-
 libempathy/empathy-contact-groups.h		    |  4 +--
 libempathy/empathy-contact.c			    |  1 +
 libempathy/empathy-debug.c			    |  1 -
 libempathy/empathy-ft-factory.c		    |  2 ++
 libempathy/empathy-ft-handler.c		    |  2 +-
 libempathy/empathy-goa-auth-handler.c		    |  5 +--
 libempathy/empathy-individual-manager.c	    |  2 +-
 libempathy/empathy-irc-network-manager.c	    |  2 +-
 libempathy/empathy-irc-network.c		    |  2 +-
 libempathy/empathy-irc-server.c		    |  2 +-
 libempathy/empathy-keyring.c			    |  4 +--
 libempathy/empathy-message.c			    |  2 +-
 libempathy/empathy-pkg-kit.c			    |  1 -
 libempathy/empathy-presence-manager.c		    |  1 -
 libempathy/empathy-request-util.c		    |  1 -
 libempathy/empathy-sasl-mechanisms.c		    |  2 +-
 libempathy/empathy-server-sasl-handler.c	    |  5 ++-
 libempathy/empathy-server-tls-handler.c	    |  7 ++--
 libempathy/empathy-status-presets.c		    |  2 +-
 libempathy/empathy-time.c			    |  3 +-
 libempathy/empathy-tls-verifier.c		    |  4 +--
 libempathy/empathy-tp-chat.c			    |  2 +-
 libempathy/empathy-uoa-auth-handler.c		    |  7 ++--
 libempathy/empathy-uoa-utils.c			    |  2 +-
 libempathy/empathy-utils.c			    |  4 +--
 src/empathy-about-dialog.c			    |  3 +-
 src/empathy-accounts-common.c			    |  5 ++-
 src/empathy-accounts-common.h			    |  7 ++++
 src/empathy-accounts-dialog.c			    | 18 +++++-----
 src/empathy-accounts.c				    |  6 ++--
 src/empathy-audio-sink.c			    |  2 +-
 src/empathy-audio-src.c			    |  5 ++-
 src/empathy-audio-utils.c			    |  3 +-
 src/empathy-auth-client.c			    | 14 ++++----
 src/empathy-call-factory.c			    |  3 +-
 src/empathy-call-factory.h			    |  1 +
 src/empathy-call-handler.c			    |  6 ++--
 src/empathy-call-observer.c			    |  3 +-
 src/empathy-call-window-fullscreen.c		    |  3 +-
 src/empathy-call-window.c			    | 31 ++++++++--------
 src/empathy-call.c				    |  6 ++--
 src/empathy-camera-menu.c			    |  3 +-
 src/empathy-chat-manager.c			    | 12 +++----
 src/empathy-chat-window.c			    | 22 ++++++------
 src/empathy-chat-window.h			    |  2 +-
 src/empathy-chat.c				    |  7 ++--
 src/empathy-chatrooms-window.c			    |  8 ++---
 src/empathy-debug-window.c			    |  9 +++--
 src/empathy-debug-window.h			    |  4 +--
 src/empathy-debugger.c				    |  3 +-
 src/empathy-event-manager.c			    | 16 ++++-----
 src/empathy-ft-manager.c			    | 11 +++---
 src/empathy-import-dialog.c			    |  4 +--
 src/empathy-import-pidgin.c			    |  4 +--
 src/empathy-import-utils.c			    |  7 ++--
 src/empathy-import-widget.c			    | 11 +++---
 src/empathy-import-widget.h			    |  2 +-
 src/empathy-invite-participant-dialog.c	    |  6 ++--
 src/empathy-mic-menu.c				    |  2 +-
 src/empathy-mic-monitor.c			    |  3 +-
 src/empathy-mic-monitor.h			    |  2 +-
 src/empathy-new-chatroom-dialog.c		    | 10 +++---
 src/empathy-new-chatroom-dialog.h		    |  1 +
 src/empathy-notifications-approver.c		    |  6 ++--
 src/empathy-preferences.c			    | 10 +++---
 src/empathy-roster-window.c			    | 42
 +++++++++++-----------
 src/empathy-rounded-actor.c			    |  1 -
 src/empathy-rounded-rectangle.c		    |  3 +-
 src/empathy-rounded-texture.c			    |  1 +
 src/empathy-sanity-cleaning.c			    | 14 ++++----
 src/empathy-status-icon.c			    | 12 +++----
 src/empathy-status-icon.h			    |  1 +
 src/empathy-video-src.c			    |  3 +-
 src/empathy.c					    | 23 ++++++------
 tests/empathy-chatroom-manager-test.c		    |  2 --
 tests/empathy-chatroom-test.c			    |  1 -
 tests/empathy-irc-network-manager-test.c	    |  5 ++-
 tests/empathy-irc-network-test.c		    |  5 ++-
 tests/empathy-irc-server-test.c		    |  5 ++-
 tests/empathy-live-search-test.c		    |  3 +-
 tests/empathy-parser-test.c			    |  6 ++--
 tests/empathy-tls-test.c			    | 11 +++---
 tests/interactive/empathy-logs.c		    |  5 +--
 tests/interactive/test-empathy-account-chooser.c   |  4 +--
 .../test-empathy-contact-blocking-dialog.c	    |  5 ++-
 tests/interactive/test-empathy-dual-roster-view.c  |  3 +-
 tests/interactive/test-empathy-presence-chooser.c  |  5 ++-
 tests/interactive/test-empathy-protocol-chooser.c  |  4 +--
 .../test-empathy-roster-model-aggregator.c	    |  5 ++-
 tests/interactive/test-empathy-roster-view.c	    |  3 +-
 .../test-empathy-status-preset-dialog.c	    |  5 ++-
 tests/mock-pkcs11.c				    |  3 --
 tests/test-helper.c				    |  5 +--
 tests/test-irc-helper.c			    |  1 +
 .../mc-plugin/empathy-webcredentials-monitor.c     |  5 +--
 .../mc-plugin/mcp-account-manager-uoa.c	    |  2 --
 .../mc-plugin/mission-control-plugin.c		    |  2 ++
 183 files changed, 427 insertions(+), 542 deletions(-)

commit 4d8ed19e779716a81fe7b37aa0f51a68057e0a2a
Author: Ekaterina Gerasimova <kittykat3756@gmail.com>
Date:	Mon Apr 1 14:25:01 2013 +0100

    help: Fix broken link

 help/C/add-contact.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 675ef0c9f43f035aa167bacfb60f726ad41bc8a9
Author: Ekaterina Gerasimova <kittykat3756@gmail.com>
Date:	Mon Apr 1 14:21:25 2013 +0100

    help: Mark icon as untranslatable

    Mark the icon in the index as untranslatable, but the fallback text as
    translatable.

 help/C/index.page | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 41d2d42c2461e9577f4b8802828e505bf49d1f32
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Mon Apr 1 11:48:00 2013 +0200

    chat-resources: Fix dependencies generation on $(srcdir) !=
    $(builddir)

    `glib-compile-resources generate-dependencies' needs the --sourcedir
    flag to be able to work properly when $(srcdir) != $(builddir).
    Spotted by running `make distcheck'.

 src/Makefile.am | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

commit 15460fa9ae4e6a19e8b6e971014deb50746d90ee
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Thu Mar 28 12:32:45 2013 +0100

    Use a flat namespace for internal includes

    Directly add the libempathy, libempathy-gtk and extensions directories
    to the include search path. This decouples header inclusions from
    their
    location and helps when reorganizing the source files layout.

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

 libempathy-gtk/Makefile.am			    |  6 ++--
 libempathy-gtk/empathy-account-chooser.c	    |  2 +-
 libempathy-gtk/empathy-account-widget-irc.c	    |  2 +-
 libempathy-gtk/empathy-account-widget-irc.h	    |  4 +--
 libempathy-gtk/empathy-account-widget-private.h    |  2 +-
 libempathy-gtk/empathy-account-widget-sip.h	    |  2 +-
 libempathy-gtk/empathy-account-widget.c	    |  4 +--
 libempathy-gtk/empathy-account-widget.h	    |  2 +-
 libempathy-gtk/empathy-avatar-chooser.c	    |  8 ++---
 libempathy-gtk/empathy-avatar-image.c		    |  2 +-
 libempathy-gtk/empathy-bad-password-dialog.c	    |  2 +-
 libempathy-gtk/empathy-bad-password-dialog.h	    |  2 +-
 libempathy-gtk/empathy-base-password-dialog.c	    |  4 +--
 libempathy-gtk/empathy-calendar-button.c	    |  2 +-
 libempathy-gtk/empathy-call-utils.c		    |  4 +--
 libempathy-gtk/empathy-cell-renderer-activatable.c |  2 +-
 libempathy-gtk/empathy-cell-renderer-expander.c    |  2 +-
 libempathy-gtk/empathy-cell-renderer-text.c	    |  2 +-
 libempathy-gtk/empathy-chat.c			    | 14 ++++----
 libempathy-gtk/empathy-chat.h			    |  6 ++--
 libempathy-gtk/empathy-contact-blocking-dialog.c   |  4 +--
 libempathy-gtk/empathy-contact-chooser.c	    |  4 +--
 libempathy-gtk/empathy-contact-search-dialog.c     |  6 ++--
 libempathy-gtk/empathy-contact-widget.c	    |  6 ++--
 libempathy-gtk/empathy-contact-widget.h	    |  2 +-
 libempathy-gtk/empathy-contactinfo-utils.c	    |  4 +--
 libempathy-gtk/empathy-geometry.c		    |  4 +--
 libempathy-gtk/empathy-groups-widget.c		    |  4 +--
 libempathy-gtk/empathy-individual-dialogs.c	    |  4 +--
 libempathy-gtk/empathy-individual-edit-dialog.c    |  2 +-
 .../empathy-individual-information-dialog.c	    |  8 ++---
 libempathy-gtk/empathy-individual-menu.c	    | 12 +++----
 libempathy-gtk/empathy-individual-store-channel.c  |  4 +--
 libempathy-gtk/empathy-individual-store-channel.h  |  2 +-
 libempathy-gtk/empathy-individual-store-manager.c  |  2 +-
 libempathy-gtk/empathy-individual-store-manager.h  |  4 +--
 libempathy-gtk/empathy-individual-store.c	    |  4 +--
 libempathy-gtk/empathy-individual-view.c	    | 12 +++----
 libempathy-gtk/empathy-individual-widget.c	    |  8 ++---
 .../empathy-irc-network-chooser-dialog.c	    |  6 ++--
 .../empathy-irc-network-chooser-dialog.h	    |  4 +--
 libempathy-gtk/empathy-irc-network-chooser.c	    |  6 ++--
 libempathy-gtk/empathy-irc-network-chooser.h	    |  4 +--
 libempathy-gtk/empathy-irc-network-dialog.c	    |  2 +-
 libempathy-gtk/empathy-irc-network-dialog.h	    |  2 +-
 libempathy-gtk/empathy-live-search.c		    |  2 +-
 .../empathy-local-xmpp-assistant-widget.c	    |  4 +--
 libempathy-gtk/empathy-location-manager.c	    |  8 ++---
 libempathy-gtk/empathy-log-window.c		    | 14 ++++----
 libempathy-gtk/empathy-new-account-dialog.c	    |  2 +-
 libempathy-gtk/empathy-new-account-dialog.h	    |  2 +-
 libempathy-gtk/empathy-new-call-dialog.c	    |  6 ++--
 libempathy-gtk/empathy-new-message-dialog.c	    |  4 +--
 libempathy-gtk/empathy-notify-manager.c	    |  6 ++--
 libempathy-gtk/empathy-notify-manager.h	    |  2 +-
 libempathy-gtk/empathy-password-dialog.c	    |  2 +-
 libempathy-gtk/empathy-password-dialog.h	    |  4 +--
 libempathy-gtk/empathy-presence-chooser.c	    |  8 ++---
 libempathy-gtk/empathy-protocol-chooser.c	    |  6 ++--
 libempathy-gtk/empathy-protocol-chooser.h	    |  2 +-
 libempathy-gtk/empathy-roster-contact.c	    |  2 +-
 libempathy-gtk/empathy-roster-model-manager.c	    |  2 +-
 libempathy-gtk/empathy-roster-model-manager.h	    |  2 +-
 libempathy-gtk/empathy-roster-view.c		    |  2 +-
 libempathy-gtk/empathy-roster-view.h		    |  6 ++--
 libempathy-gtk/empathy-search-bar.c		    |  2 +-
 libempathy-gtk/empathy-share-my-desktop.c	    |  2 +-
 libempathy-gtk/empathy-share-my-desktop.h	    |  2 +-
 libempathy-gtk/empathy-smiley-manager.c	    |  2 +-
 libempathy-gtk/empathy-sound-manager.c		    |  6 ++--
 libempathy-gtk/empathy-spell.c			    |  4 +--
 libempathy-gtk/empathy-status-preset-dialog.c	    |  6 ++--
 libempathy-gtk/empathy-subscription-dialog.c	    |  2 +-
 libempathy-gtk/empathy-theme-adium.c		    |  8 ++---
 libempathy-gtk/empathy-theme-adium.h		    |  2 +-
 libempathy-gtk/empathy-theme-manager.c		    |  4 +--
 libempathy-gtk/empathy-tls-dialog.c		    |  4 +--
 libempathy-gtk/empathy-ui-utils.c		    |  6 ++--
 libempathy-gtk/empathy-ui-utils.h		    |  4 +--
 libempathy-gtk/empathy-user-info.c		    |  6 ++--
 libempathy/Makefile.am				    |  5 ++-
 libempathy/empathy-auth-factory.c		    |  2 +-
 libempathy/empathy-chatroom.h			    |  2 +-
 libempathy/empathy-server-sasl-handler.c	    |  2 +-
 libempathy/empathy-server-tls-handler.c	    |  2 +-
 libempathy/empathy-utils.c			    |  2 +-
 nautilus-sendto-plugin/Makefile.am		    |  3 +-
 nautilus-sendto-plugin/empathy-nautilus-sendto.c   | 22 ++++++------
 src/Makefile.am				    |  6 +++-
 src/empathy-accounts-common.c			    |  4 +--
 src/empathy-accounts-dialog.c			    | 16 ++++-----
 src/empathy-accounts.c				    |  6 ++--
 src/empathy-audio-sink.c			    |  2 +-
 src/empathy-audio-src.c			    |  4 +--
 src/empathy-audio-utils.c			    |  4 +--
 src/empathy-auth-client.c			    | 18 +++++-----
 src/empathy-call-factory.c			    |  6 ++--
 src/empathy-call-handler.c			    |  6 ++--
 src/empathy-call-handler.h			    |  2 +-
 src/empathy-call-observer.c			    |  6 ++--
 src/empathy-call-window-fullscreen.c		    |  4 +--
 src/empathy-call-window.c			    | 24 ++++++-------
 src/empathy-call.c				    |  4 +--
 src/empathy-camera-menu.c			    |  6 ++--
 src/empathy-chat-manager.c			    | 12 +++----
 src/empathy-chat-manager.h			    |  2 +-
 src/empathy-chat-window.c			    | 28 +++++++--------
 src/empathy-chat-window.h			    |  2 +-
 src/empathy-chat.c				    |  8 ++---
 src/empathy-chatrooms-window.c			    |  8 ++---
 src/empathy-debug-window.c			    |  8 ++---
 src/empathy-debugger.c				    |  2 +-
 src/empathy-event-manager.c			    | 26 +++++++-------
 src/empathy-event-manager.h			    |  2 +-
 src/empathy-ft-manager.c			    |  8 ++---
 src/empathy-ft-manager.h			    |  2 +-
 src/empathy-import-dialog.c			    |  4 +--
 src/empathy-import-dialog.h			    |  2 +-
 src/empathy-import-pidgin.c			    |  4 +--
 src/empathy-import-utils.c			    |  4 +--
 src/empathy-import-widget.c			    |  6 ++--
 src/empathy-import-widget.h			    |  2 +-
 src/empathy-invite-participant-dialog.c	    |  4 +--
 src/empathy-invite-participant-dialog.h	    |  2 +-
 src/empathy-mic-menu.c				    |  2 +-
 src/empathy-mic-monitor.c			    |  4 +--
 src/empathy-new-chatroom-dialog.c		    | 12 +++----
 src/empathy-notifications-approver.c		    |  6 ++--
 src/empathy-preferences.c			    | 14 ++++----
 src/empathy-roster-window.c			    | 42
 +++++++++++-----------
 src/empathy-sanity-cleaning.c			    | 10 +++---
 src/empathy-status-icon.c			    | 14 ++++----
 src/empathy-video-src.c			    |  2 +-
 src/empathy.c					    | 24 ++++++-------
 tests/Makefile.am				    |  3 +-
 tests/empathy-chatroom-manager-test.c		    |  2 +-
 tests/empathy-chatroom-test.c			    |  2 +-
 tests/empathy-irc-network-manager-test.c	    |  2 +-
 tests/empathy-irc-network-test.c		    |  2 +-
 tests/empathy-irc-server-test.c		    |  2 +-
 tests/empathy-live-search-test.c		    |  4 +--
 tests/empathy-parser-test.c			    |  4 +--
 tests/empathy-tls-test.c			    |  2 +-
 tests/interactive/Makefile.am			    |  3 +-
 tests/interactive/empathy-logs.c		    |  8 ++---
 tests/interactive/test-empathy-account-chooser.c   |  4 +--
 tests/interactive/test-empathy-calendar-button.c   |  2 +-
 .../test-empathy-contact-blocking-dialog.c	    |  6 ++--
 tests/interactive/test-empathy-dual-roster-view.c  |  8 ++---
 tests/interactive/test-empathy-presence-chooser.c  |  6 ++--
 tests/interactive/test-empathy-protocol-chooser.c  |  4 +--
 .../test-empathy-roster-model-aggregator.c	    |  8 ++---
 tests/interactive/test-empathy-roster-view.c	    |  8 ++---
 .../test-empathy-status-preset-dialog.c	    |  6 ++--
 tests/test-helper.c				    |  2 +-
 tests/test-irc-helper.h			    |  6 ++--
 .../cc-plugins/account-plugins/Makefile.am	    |  3 +-
 .../empathy-accounts-plugin-widget.c		    |  2 +-
 .../account-plugins/empathy-accounts-plugin.c	    |  4 +--
 .../app-plugin/empathy-app-plugin-widget.c	    |  4 +--
 .../cc-plugins/app-plugin/empathy-app-plugin.c     |  2 +-
 161 files changed, 440 insertions(+), 433 deletions(-)

commit 5c440c4e08f8102a9b73244697e69ad4855dbdef
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Thu Mar 28 12:36:27 2013 +0100

    Avoid include path overspecifications

    If we're under the libempathy directory there's no need to prefix
    include file paths with it, and the same is true for libempathy-gtk.

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

 libempathy-gtk/empathy-contact-blocking-dialog.c     |  4 ++--
 libempathy-gtk/empathy-contact-chooser.c	      |  6 +++---
 libempathy-gtk/empathy-contact-search-dialog.c       | 10 +++++-----
 libempathy-gtk/empathy-dialpad-widget.c	      |  2 +-
 libempathy-gtk/empathy-local-xmpp-assistant-widget.c |  4 ++--
 libempathy-gtk/empathy-new-account-dialog.c	      |  4 ++--
 libempathy-gtk/empathy-new-call-dialog.c	      |  6 +++---
 libempathy-gtk/empathy-new-message-dialog.c	      |  6 +++---
 libempathy-gtk/empathy-notify-manager.c	      |  2 +-
 libempathy-gtk/empathy-roster-contact.c	      |  4 ++--
 libempathy-gtk/empathy-roster-view.c		      |  6 +++---
 libempathy-gtk/empathy-subscription-dialog.c	      |  2 +-
 libempathy/cheese-camera-device-monitor.c	      |  2 +-
 libempathy/empathy-account-settings.c		      |  2 +-
 libempathy/empathy-connection-managers.c	      |  2 +-
 libempathy/empathy-pkg-kit.c			      |  2 +-
 libempathy/empathy-request-util.c		      |  2 +-
 17 files changed, 33 insertions(+), 33 deletions(-)

commit 2ea4af7e920798004db89ce4ab4f768b65dd2a20
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Thu Mar 28 12:15:33 2013 +0100

    Use double quotes for all internal headers

    This makes a bit more obvious which headers come from public libraries
    and which ones come from uninstalled utility libraries.

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

 libempathy-gtk/Makefile.am			    |  2 +-
 libempathy-gtk/empathy-account-chooser.c	    |  2 +-
 libempathy-gtk/empathy-account-widget-irc.c	    |  2 +-
 libempathy-gtk/empathy-account-widget-irc.h	    |  4 +--
 libempathy-gtk/empathy-account-widget-private.h    |  2 +-
 libempathy-gtk/empathy-account-widget-sip.h	    |  2 +-
 libempathy-gtk/empathy-account-widget.c	    |  4 +--
 libempathy-gtk/empathy-account-widget.h	    |  2 +-
 libempathy-gtk/empathy-avatar-chooser.c	    |  8 ++---
 libempathy-gtk/empathy-avatar-image.c		    |  2 +-
 libempathy-gtk/empathy-bad-password-dialog.c	    |  2 +-
 libempathy-gtk/empathy-bad-password-dialog.h	    |  2 +-
 libempathy-gtk/empathy-base-password-dialog.c	    |  4 +--
 libempathy-gtk/empathy-calendar-button.c	    |  2 +-
 libempathy-gtk/empathy-call-utils.c		    |  4 +--
 libempathy-gtk/empathy-cell-renderer-activatable.c |  2 +-
 libempathy-gtk/empathy-cell-renderer-expander.c    |  2 +-
 libempathy-gtk/empathy-cell-renderer-text.c	    |  2 +-
 libempathy-gtk/empathy-chat.c			    | 12 +++----
 libempathy-gtk/empathy-chat.h			    |  6 ++--
 libempathy-gtk/empathy-contact-blocking-dialog.c   |  8 ++---
 libempathy-gtk/empathy-contact-chooser.c	    | 10 +++---
 libempathy-gtk/empathy-contact-search-dialog.c     | 16 ++++-----
 libempathy-gtk/empathy-contact-widget.c	    |  6 ++--
 libempathy-gtk/empathy-contact-widget.h	    |  2 +-
 libempathy-gtk/empathy-contactinfo-utils.c	    |  4 +--
 libempathy-gtk/empathy-dialpad-widget.c	    |  2 +-
 libempathy-gtk/empathy-geometry.c		    |  2 +-
 libempathy-gtk/empathy-groups-widget.c		    |  4 +--
 libempathy-gtk/empathy-individual-dialogs.c	    |  4 +--
 libempathy-gtk/empathy-individual-edit-dialog.c    |  2 +-
 .../empathy-individual-information-dialog.c	    |  8 ++---
 libempathy-gtk/empathy-individual-menu.c	    | 12 +++----
 libempathy-gtk/empathy-individual-store-channel.c  |  4 +--
 libempathy-gtk/empathy-individual-store-channel.h  |  2 +-
 libempathy-gtk/empathy-individual-store-manager.c  |  2 +-
 libempathy-gtk/empathy-individual-store-manager.h  |  4 +--
 libempathy-gtk/empathy-individual-store.c	    |  4 +--
 libempathy-gtk/empathy-individual-view.c	    | 12 +++----
 libempathy-gtk/empathy-individual-widget.c	    |  8 ++---
 .../empathy-irc-network-chooser-dialog.c	    |  6 ++--
 .../empathy-irc-network-chooser-dialog.h	    |  4 +--
 libempathy-gtk/empathy-irc-network-chooser.c	    |  6 ++--
 libempathy-gtk/empathy-irc-network-chooser.h	    |  4 +--
 libempathy-gtk/empathy-irc-network-dialog.c	    |  2 +-
 libempathy-gtk/empathy-irc-network-dialog.h	    |  2 +-
 libempathy-gtk/empathy-live-search.c		    |  2 +-
 .../empathy-local-xmpp-assistant-widget.c	    |  8 ++---
 libempathy-gtk/empathy-log-window.c		    | 14 ++++----
 libempathy-gtk/empathy-new-account-dialog.c	    |  6 ++--
 libempathy-gtk/empathy-new-account-dialog.h	    |  2 +-
 libempathy-gtk/empathy-new-call-dialog.c	    | 12 +++----
 libempathy-gtk/empathy-new-message-dialog.c	    | 10 +++---
 libempathy-gtk/empathy-notify-manager.c	    |  8 ++---
 libempathy-gtk/empathy-notify-manager.h	    |  2 +-
 libempathy-gtk/empathy-password-dialog.c	    |  2 +-
 libempathy-gtk/empathy-password-dialog.h	    |  4 +--
 libempathy-gtk/empathy-presence-chooser.c	    |  8 ++---
 libempathy-gtk/empathy-protocol-chooser.c	    |  6 ++--
 libempathy-gtk/empathy-protocol-chooser.h	    |  2 +-
 libempathy-gtk/empathy-roster-contact.c	    |  6 ++--
 libempathy-gtk/empathy-roster-model-manager.c	    |  2 +-
 libempathy-gtk/empathy-roster-model-manager.h	    |  2 +-
 libempathy-gtk/empathy-roster-view.c		    |  8 ++---
 libempathy-gtk/empathy-roster-view.h		    |  6 ++--
 libempathy-gtk/empathy-search-bar.c		    |  2 +-
 libempathy-gtk/empathy-share-my-desktop.c	    |  2 +-
 libempathy-gtk/empathy-share-my-desktop.h	    |  2 +-
 libempathy-gtk/empathy-smiley-manager.c	    |  2 +-
 libempathy-gtk/empathy-sound-manager.c		    |  6 ++--
 libempathy-gtk/empathy-spell.c			    |  4 +--
 libempathy-gtk/empathy-status-preset-dialog.c	    |  6 ++--
 libempathy-gtk/empathy-subscription-dialog.c	    |  4 +--
 libempathy-gtk/empathy-theme-adium.c		    |  8 ++---
 libempathy-gtk/empathy-theme-adium.h		    |  2 +-
 libempathy-gtk/empathy-theme-manager.c		    |  4 +--
 libempathy-gtk/empathy-tls-dialog.c		    |  4 +--
 libempathy-gtk/empathy-ui-utils.c		    |  6 ++--
 libempathy-gtk/empathy-ui-utils.h		    |  4 +--
 libempathy-gtk/empathy-user-info.c		    |  6 ++--
 libempathy/Makefile.am				    |  2 +-
 libempathy/cheese-camera-device-monitor.c	    |  2 +-
 libempathy/empathy-account-settings.c		    |  2 +-
 libempathy/empathy-chatroom.h			    |  2 +-
 libempathy/empathy-connection-managers.c	    |  2 +-
 libempathy/empathy-pkg-kit.c			    |  2 +-
 libempathy/empathy-request-util.c		    |  2 +-
 libempathy/empathy-server-sasl-handler.c	    |  2 +-
 libempathy/empathy-utils.c			    |  2 +-
 nautilus-sendto-plugin/empathy-nautilus-sendto.c   | 22 ++++++------
 src/empathy-accounts-common.c			    |  4 +--
 src/empathy-accounts-dialog.c			    | 16 ++++-----
 src/empathy-accounts.c				    |  6 ++--
 src/empathy-audio-sink.c			    |  2 +-
 src/empathy-audio-src.c			    |  4 +--
 src/empathy-audio-utils.c			    |  4 +--
 src/empathy-auth-client.c			    | 18 +++++-----
 src/empathy-call-factory.c			    |  6 ++--
 src/empathy-call-handler.c			    |  6 ++--
 src/empathy-call-handler.h			    |  2 +-
 src/empathy-call-observer.c			    |  6 ++--
 src/empathy-call-window-fullscreen.c		    |  4 +--
 src/empathy-call-window.c			    | 24 ++++++-------
 src/empathy-call.c				    |  4 +--
 src/empathy-camera-menu.c			    |  6 ++--
 src/empathy-chat-manager.c			    | 12 +++----
 src/empathy-chat-manager.h			    |  2 +-
 src/empathy-chat-window.c			    | 28 +++++++--------
 src/empathy-chat-window.h			    |  2 +-
 src/empathy-chat.c				    |  8 ++---
 src/empathy-chatrooms-window.c			    |  8 ++---
 src/empathy-debug-window.c			    |  8 ++---
 src/empathy-debugger.c				    |  2 +-
 src/empathy-event-manager.c			    | 26 +++++++-------
 src/empathy-event-manager.h			    |  2 +-
 src/empathy-ft-manager.c			    |  8 ++---
 src/empathy-ft-manager.h			    |  2 +-
 src/empathy-import-dialog.c			    |  4 +--
 src/empathy-import-dialog.h			    |  2 +-
 src/empathy-import-pidgin.c			    |  4 +--
 src/empathy-import-utils.c			    |  4 +--
 src/empathy-import-widget.c			    |  6 ++--
 src/empathy-import-widget.h			    |  2 +-
 src/empathy-invite-participant-dialog.c	    |  4 +--
 src/empathy-mic-menu.c				    |  2 +-
 src/empathy-mic-monitor.c			    |  4 +--
 src/empathy-new-chatroom-dialog.c		    | 12 +++----
 src/empathy-notifications-approver.c		    |  6 ++--
 src/empathy-preferences.c			    | 14 ++++----
 src/empathy-roster-window.c			    | 42
 +++++++++++-----------
 src/empathy-sanity-cleaning.c			    | 10 +++---
 src/empathy-status-icon.c			    | 14 ++++----
 src/empathy-video-src.c			    |  2 +-
 src/empathy.c					    | 24 ++++++-------
 tests/empathy-chatroom-manager-test.c		    |  2 +-
 tests/empathy-chatroom-test.c			    |  2 +-
 tests/empathy-irc-network-manager-test.c	    |  2 +-
 tests/empathy-irc-network-test.c		    |  2 +-
 tests/empathy-irc-server-test.c		    |  2 +-
 tests/empathy-live-search-test.c		    |  4 +--
 tests/empathy-parser-test.c			    |  4 +--
 tests/empathy-tls-test.c			    |  2 +-
 tests/interactive/empathy-logs.c		    |  8 ++---
 tests/interactive/test-empathy-account-chooser.c   |  4 +--
 tests/interactive/test-empathy-calendar-button.c   |  2 +-
 .../test-empathy-contact-blocking-dialog.c	    |  6 ++--
 tests/interactive/test-empathy-dual-roster-view.c  |  8 ++---
 tests/interactive/test-empathy-presence-chooser.c  |  6 ++--
 tests/interactive/test-empathy-protocol-chooser.c  |  4 +--
 .../test-empathy-roster-model-aggregator.c	    |  8 ++---
 tests/interactive/test-empathy-roster-view.c	    |  8 ++---
 .../test-empathy-status-preset-dialog.c	    |  6 ++--
 tests/test-helper.c				    |  2 +-
 tests/test-irc-helper.h			    |  6 ++--
 .../empathy-accounts-plugin-widget.c		    |  2 +-
 .../account-plugins/empathy-accounts-plugin.c	    |  4 +--
 .../app-plugin/empathy-app-plugin-widget.c	    |  4 +--
 .../cc-plugins/app-plugin/empathy-app-plugin.c     |  2 +-
 158 files changed, 448 insertions(+), 448 deletions(-)

commit f9ba3c0721715bb8d6dbf4315188e4397134ee6b
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Tue Mar 26 15:13:53 2013 +0100

    utils: Drop the file-based empathy_xml_validate()

    After embedding all the DTDs with GResource the file-based
    empathy_xml_validate() is no longer needed, replaced by
    empathy_xml_validate_from_resource().

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

 libempathy/empathy-utils.c | 35 -----------------------------------
 libempathy/empathy-utils.h |  2 --
 2 files changed, 37 deletions(-)

commit 3992967e7a3015a48b5db9c7e652105abe38856e
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Tue Mar 26 13:09:29 2013 +0100

    Embed DTDs for XML validation as GResources

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

 libempathy/.gitignore			  |  1 +
 libempathy/Makefile.am			  | 18 ++++++++++++++----
 libempathy/empathy-chatroom-manager.c	  |  4 ++--
 libempathy/empathy-contact-groups.c	  |  4 ++--
 libempathy/empathy-dtd.gresource.xml	  | 10 ++++++++++
 libempathy/empathy-irc-network-manager.c |  4 ++--
 libempathy/empathy-status-presets.c	  |  4 ++--
 7 files changed, 33 insertions(+), 12 deletions(-)

commit 4299f29ac941292054b4e004aac51e1b143a386a
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Tue Mar 26 13:00:17 2013 +0100

    utils: Add empathy_xml_validate_from_resource()

    Validate against dtd stored in a GResource.

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

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

commit a169a5c76e983532b4a0699bfc39cd510768a923
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Fri Mar 22 16:39:22 2013 +0100

    account-widget: Embed .ui files with GResource

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

 libempathy-gtk/.gitignore			    |  1 +
 libempathy-gtk/Makefile.am			    | 25 ++++++++---
 libempathy-gtk/empathy-account-widget-irc.c	    |  4 +-
 libempathy-gtk/empathy-account-widget-sip.c	    |  4 +-
 libempathy-gtk/empathy-account-widget.c	    | 48
 +++++++++-------------
 .../empathy-account-widgets.gresource.xml	    | 16 ++++++++
 libempathy-gtk/empathy-irc-network-dialog.c	    |  6 +--
 libempathy-gtk/empathy-ui-utils.h		    |  2 +
 8 files changed, 64 insertions(+), 42 deletions(-)

commit 788d278853ee3ac061f84b611a3290d5adc31577
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Fri Mar 22 13:36:30 2013 +0100

    ui-utils: Add empathy_builder_get_resource()

    Add the empathy_builder_get_file() companion to load UI elements from
    embedded resources.

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

 libempathy-gtk/empathy-ui-utils.c | 45
 ++++++++++++++++++++++++++++++++++-----
 libempathy-gtk/empathy-ui-utils.h |  3 +++
 2 files changed, 43 insertions(+), 5 deletions(-)

commit a53e07b1c85f2ea24a0ee3adb43a6e400c1c4ccc
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Fri Mar 29 14:01:18 2013 +0100

    Fix breakage introduced in previous commit with Cheese enabled

    Oops. I failed to test commit 66e393b7 with the Cheese support enabled
    and I deleted an header too much.

 libempathy-gtk/empathy-avatar-chooser.c | 1 +
 1 file changed, 1 insertion(+)

commit 66e393b7b8632ca69b4e4c81801c521d79713b78
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Wed Mar 27 14:35:32 2013 +0100

    Drop unused/redundant header inclusions

    With the help of the script posted at
    http://stackoverflow.com/a/7135530
    and some manual fixes, drop the unused or redundant #include
    directives.

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

 libempathy-gtk/empathy-account-chooser.c		|  5 -----
 libempathy-gtk/empathy-account-widget-irc.c		| 12 ------------
 libempathy-gtk/empathy-account-widget-sip.c		|  9 ---------
 libempathy-gtk/empathy-account-widget.c		|  7 -------
 libempathy-gtk/empathy-avatar-chooser.c		|  6 ------
 libempathy-gtk/empathy-avatar-chooser.h		|  3 +--
 libempathy-gtk/empathy-avatar-image.c			|  3 ---
 libempathy-gtk/empathy-avatar-image.h			|  2 --
 libempathy-gtk/empathy-bad-password-dialog.c		|  1 -
 libempathy-gtk/empathy-bad-password-dialog.h		|  2 --
 libempathy-gtk/empathy-base-password-dialog.h		|  5 +----
 libempathy-gtk/empathy-calendar-button.c		|  2 --
 libempathy-gtk/empathy-call-utils.c			|  2 --
 libempathy-gtk/empathy-cell-renderer-activatable.c	|  2 --
 libempathy-gtk/empathy-cell-renderer-expander.c	|  2 --
 libempathy-gtk/empathy-cell-renderer-text.c		|  2 --
 libempathy-gtk/empathy-chat.c				|  9 ---------
 libempathy-gtk/empathy-chat.h				|  1 -
 libempathy-gtk/empathy-contact-chooser.c		|  3 ---
 libempathy-gtk/empathy-contact-chooser.h		|  5 +----
 libempathy-gtk/empathy-contact-search-dialog.c		|  2 --
 libempathy-gtk/empathy-contact-widget.c		| 11 -----------
 libempathy-gtk/empathy-contactinfo-utils.c		|  3 ---
 libempathy-gtk/empathy-geometry.c			|  3 ---
 libempathy-gtk/empathy-groups-widget.c			|  9 ---------
 libempathy-gtk/empathy-individual-dialogs.c		|  9 ---------
 libempathy-gtk/empathy-individual-edit-dialog.c	|  9 ---------
 libempathy-gtk/empathy-individual-information-dialog.c |  9 ---------
 libempathy-gtk/empathy-individual-menu.c		|  9 ---------
 libempathy-gtk/empathy-individual-store-channel.c	| 14
 --------------
 libempathy-gtk/empathy-individual-store-manager.c	| 17
 -----------------
 libempathy-gtk/empathy-individual-store.c		| 10 ----------
 libempathy-gtk/empathy-individual-view.c		| 13 -------------
 libempathy-gtk/empathy-individual-view.h		|  2 --
 libempathy-gtk/empathy-individual-widget.c		| 10 ----------
 libempathy-gtk/empathy-individual-widget.h		|  2 --
 libempathy-gtk/empathy-irc-network-chooser-dialog.c	|  6 ------
 libempathy-gtk/empathy-irc-network-chooser.c		|  8 --------
 libempathy-gtk/empathy-irc-network-dialog.c		|  6 ------
 libempathy-gtk/empathy-live-search.c			|  4 ----
 libempathy-gtk/empathy-location-manager.c		| 11 -----------
 libempathy-gtk/empathy-log-window.c			| 11 -----------
 libempathy-gtk/empathy-new-call-dialog.c		|  8 --------
 libempathy-gtk/empathy-new-message-dialog.c		|  8 --------
 libempathy-gtk/empathy-notify-manager.c		|  4 ----
 libempathy-gtk/empathy-password-dialog.c		|  1 -
 libempathy-gtk/empathy-password-dialog.h		|  2 --
 libempathy-gtk/empathy-plist.c				|  1 -
 libempathy-gtk/empathy-presence-chooser.c		|  8 --------
 libempathy-gtk/empathy-protocol-chooser.c		|  4 ----
 libempathy-gtk/empathy-roster-contact.c		|  2 --
 libempathy-gtk/empathy-roster-model-aggregator.c	|  2 --
 libempathy-gtk/empathy-roster-view.c			|  2 --
 libempathy-gtk/empathy-search-bar.c			|  5 -----
 libempathy-gtk/empathy-share-my-desktop.c		|  5 -----
 libempathy-gtk/empathy-smiley-manager.c		|  2 --
 libempathy-gtk/empathy-sound-manager.c			|  2 --
 libempathy-gtk/empathy-spell.c				|  3 ---
 libempathy-gtk/empathy-status-preset-dialog.c		|  1 -
 libempathy-gtk/empathy-string-parser.c			|  2 --
 libempathy-gtk/empathy-theme-adium.c			|  7 -------
 libempathy-gtk/empathy-theme-manager.c			|  5 -----
 libempathy-gtk/empathy-tls-dialog.c			|  3 ---
 libempathy-gtk/empathy-ui-utils.c			|  7 -------
 libempathy-gtk/totem-subtitle-encoding.c		|  1 -
 libempathy/cheese-camera-device-monitor.c		|  1 -
 libempathy/empathy-account-settings.c			|  3 ---
 libempathy/empathy-camera-monitor.c			|  5 -----
 libempathy/empathy-chatroom-manager.c			|  6 ------
 libempathy/empathy-chatroom.c				|  4 ----
 libempathy/empathy-client-factory.h			|  1 -
 libempathy/empathy-connection-aggregator.c		|  4 ----
 libempathy/empathy-connection-managers.c		|  3 ---
 libempathy/empathy-contact-groups.c			|  8 --------
 libempathy/empathy-contact.c				| 11 -----------
 libempathy/empathy-debug.c				|  9 ---------
 libempathy/empathy-ft-factory.c			|  5 -----
 libempathy/empathy-ft-handler.c			|  1 -
 libempathy/empathy-goa-auth-handler.c			|  1 -
 libempathy/empathy-individual-manager.c		|  9 ---------
 libempathy/empathy-irc-network-manager.c		|  5 +----
 libempathy/empathy-irc-network.c			|  6 ------
 libempathy/empathy-irc-server.c			|  6 ------
 libempathy/empathy-keyring.c				|  2 --
 libempathy/empathy-message.c				|  3 +--
 libempathy/empathy-message.h				|  1 -
 libempathy/empathy-presence-manager.c			|  5 -----
 libempathy/empathy-request-util.c			|  6 ------
 libempathy/empathy-sasl-mechanisms.c			|  1 -
 libempathy/empathy-server-sasl-handler.c		|  2 --
 libempathy/empathy-status-presets.c			|  8 --------
 libempathy/empathy-time.c				|  3 ---
 libempathy/empathy-tls-verifier.c			|  3 ---
 libempathy/empathy-tp-chat.c				|  5 -----
 libempathy/empathy-utils.c				| 11 -----------
 libempathy/empathy-utils.h				|  2 --
 src/empathy-about-dialog.c				|  3 ---
 src/empathy-accounts-common.c				| 10 ----------
 src/empathy-accounts-dialog.c				| 14
 --------------
 src/empathy-accounts.c					|  9 ---------
 src/empathy-audio-sink.c				|  7 -------
 src/empathy-audio-src.c				|  4 ----
 src/empathy-auth-client.c				|  9 ---------
 src/empathy-call-factory.c				|  6 ------
 src/empathy-call-handler.c				|  5 -----
 src/empathy-call-observer.c				|  8 --------
 src/empathy-call-window-fullscreen.c			|  2 --
 src/empathy-call-window.c				| 18
 ------------------
 src/empathy-call.c					|  7 -------
 src/empathy-camera-menu.c				|  2 --
 src/empathy-chat-manager.c				|  2 --
 src/empathy-chat-window.c				|  8 --------
 src/empathy-chat.c					|  2 --
 src/empathy-chatrooms-window.c				|  6 ------
 src/empathy-debug-window.c				| 10 ----------
 src/empathy-debugger.c					|  2 --
 src/empathy-event-manager.c				|  6 ------
 src/empathy-ft-manager.c				|  5 -----
 src/empathy-import-dialog.c				|  6 ------
 src/empathy-import-pidgin.c				| 10 ----------
 src/empathy-import-widget.c				|  4 ----
 src/empathy-invite-participant-dialog.c		|  3 ---
 src/empathy-mic-menu.c					|  2 --
 src/empathy-mic-monitor.c				|  3 ---
 src/empathy-new-chatroom-dialog.c			|  8 --------
 src/empathy-notifications-approver.c			|  4 ----
 src/empathy-preferences.c				|  7 -------
 src/empathy-roster-window.c				| 13 -------------
 src/empathy-rounded-actor.c				|  3 ---
 src/empathy-rounded-rectangle.c			|  2 --
 src/empathy-rounded-texture.c				|  3 ---
 src/empathy-sanity-cleaning.c				|  4 ----
 src/empathy-status-icon.c				| 13 -------------
 src/empathy-video-src.c				|  3 ---
 src/empathy.c						| 17
 -----------------
 135 files changed, 5 insertions(+), 731 deletions(-)

commit 4aa8651880d7ef554914e231a6de4651dd41acca
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Wed Mar 27 15:42:27 2013 +0100

    Consistently use `#include "config.h"` everywhere

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

 libempathy-gtk/empathy-account-widget.c		| 2 +-
 libempathy-gtk/empathy-bad-password-dialog.c		| 2 +-
 libempathy-gtk/empathy-base-password-dialog.c		| 2 +-
 libempathy-gtk/empathy-cell-renderer-activatable.c	| 2 +-
 libempathy-gtk/empathy-chat.c				| 2 +-
 libempathy-gtk/empathy-contact-widget.c		| 2 +-
 libempathy-gtk/empathy-contactinfo-utils.c		| 2 +-
 libempathy-gtk/empathy-dialpad-widget.c		| 2 +-
 libempathy-gtk/empathy-groups-widget.c			| 2 +-
 libempathy-gtk/empathy-individual-dialogs.c		| 2 +-
 libempathy-gtk/empathy-individual-edit-dialog.c	| 2 +-
 libempathy-gtk/empathy-individual-information-dialog.c | 2 +-
 libempathy-gtk/empathy-individual-widget.c		| 2 +-
 libempathy-gtk/empathy-live-search.c			| 2 +-
 libempathy-gtk/empathy-new-call-dialog.c		| 2 +-
 libempathy-gtk/empathy-new-message-dialog.c		| 2 +-
 libempathy-gtk/empathy-notify-manager.c		| 2 +-
 libempathy-gtk/empathy-password-dialog.c		| 2 +-
 libempathy-gtk/empathy-protocol-chooser.c		| 2 +-
 libempathy-gtk/empathy-smiley-manager.c		| 2 +-
 libempathy-gtk/empathy-sound-manager.c			| 2 +-
 libempathy-gtk/empathy-string-parser.c			| 2 +-
 libempathy-gtk/empathy-tls-dialog.c			| 2 +-
 libempathy-gtk/empathy-ui-utils.c			| 2 +-
 libempathy/cheese-camera-device-monitor.c		| 2 +-
 libempathy/empathy-auth-factory.c			| 2 +-
 libempathy/empathy-camera-monitor.c			| 2 +-
 libempathy/empathy-client-factory.c			| 2 +-
 libempathy/empathy-connection-aggregator.c		| 2 +-
 libempathy/empathy-individual-manager.c		| 2 +-
 libempathy/empathy-irc-network-manager.c		| 2 +-
 libempathy/empathy-irc-network.c			| 2 +-
 libempathy/empathy-irc-server.c			| 2 +-
 libempathy/empathy-request-util.c			| 2 +-
 libempathy/empathy-tls-verifier.c			| 2 +-
 libempathy/empathy-tp-chat.c				| 2 +-
 src/empathy-about-dialog.c				| 2 +-
 src/empathy-accounts-common.c				| 2 +-
 src/empathy-accounts-dialog.c				| 2 +-
 src/empathy-accounts.c					| 2 +-
 src/empathy-audio-sink.c				| 2 +-
 src/empathy-auth-client.c				| 2 +-
 src/empathy-call-observer.c				| 2 +-
 src/empathy-call.c					| 2 +-
 src/empathy-camera-menu.c				| 2 +-
 src/empathy-chat-window.c				| 2 +-
 src/empathy-chat.c					| 2 +-
 src/empathy-chatrooms-window.c				| 2 +-
 src/empathy-debugger.c					| 2 +-
 src/empathy-event-manager.c				| 2 +-
 src/empathy-import-dialog.c				| 2 +-
 src/empathy-import-pidgin.c				| 2 +-
 src/empathy-import-widget.c				| 2 +-
 src/empathy-mic-menu.c					| 2 +-
 src/empathy-mic-monitor.c				| 2 +-
 src/empathy-new-chatroom-dialog.c			| 2 +-
 src/empathy-notifications-approver.c			| 2 +-
 src/empathy-preferences.c				| 2 +-
 src/empathy-roster-window.c				| 2 +-
 src/empathy-status-icon.c				| 2 +-
 src/empathy.c						| 2 +-
 61 files changed, 61 insertions(+), 61 deletions(-)

commit 22e67d00902d4ded9ceea8fbc0f9b168c47a3f2e
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Fri Mar 22 16:40:54 2013 +0100

    goa-mc-plugin: Fix deprecation warnings

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

 goa-mc-plugin/mcp-account-manager-goa.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

commit cab341424920cfa3820c764be359ea5ed8cc2f79
Author: Ville-Pekka Vainio <vpvainio@iki.fi>
Date:	Tue Mar 26 21:19:36 2013 +0200

    Finnish translation update by Jiri Grönroos

 po/fi.po | 73
 +++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 40 insertions(+), 33 deletions(-)

commit fb6a56224900931eb93f8f4c833e349a66f09af7
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date:	Tue Mar 26 18:14:56 2013 +0000

    Updated British English translation

 po/en_GB.po | 562
 ++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 320 insertions(+), 242 deletions(-)

commit 292e97bd11ee81ab0c49415ff2e5fa87be32e557
Author: Daniel Korostil <ted.korostiled@gmail.com>
Date:	Tue Mar 26 15:55:00 2013 +0200

    Update uk translation

 po/uk.po | 605
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 340 insertions(+), 265 deletions(-)

commit cb634c48932bf86009e6a3ae3f3055b726eabc9d
Author: Shankar Prasad <svenkate@redhat.com>
Date:	Mon Mar 25 23:02:57 2013 +0530

    Updated kn translations

 po/kn.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4f9ead25d34aba3b2ec1404e37671611d5ce2f6b
Author: Shankar Prasad <svenkate@redhat.com>
Date:	Mon Mar 25 23:00:50 2013 +0530

    Updated kn translations

 po/kn.po | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

commit 53e9f803640606fc382b1417d93f5b34a6711d42
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 25 17:30:08 2013 +0100

    release.py: update last_tag_pattern

 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0fe326654394df53cdaac16ad0a559c7d6bb9ed4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 25 17:29:58 2013 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 22c47836a962d21eb81fedbf22ed0864265ebceb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 25 17:16:34 2013 +0100

    3.8.0

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

commit 027ca123b11bcc99f1b1874b497fdeddee6d9b65
Author: Krishnababu Krothapalli <kkrothap@redhat.com>
Date:	Mon Mar 25 15:00:04 2013 +0530

    Updated Telugu Translations

 po/te.po | 424
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 249 insertions(+), 175 deletions(-)

commit 0a5893a168187211fff21940d5ced3a459a43a31
Author: Sweta Kothari <swkothar@redhat.com>
Date:	Mon Mar 25 11:19:39 2013 +0530

    Updated gujarati file

 po/gu.po | 505
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 291 insertions(+), 214 deletions(-)

commit 988d109a4587cb76fb982c836b2f604401a195c8
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Sun Mar 24 19:38:00 2013 +0100

    Fix translations of keywords in .desktop files

 po/el.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 96e42758e829a46528603a51c9b88a9814ad6bc0
Author: Alexandre Franke <alexandre.franke@gmail.com>
Date:	Sun Mar 24 12:20:07 2013 +0100

    Update French translation

 help/fr/fr.po | 158
 ++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 133 insertions(+), 25 deletions(-)

commit 0e9dea4a878ad2b8b482c19a838cd73818ea993d
Author: Ville-Pekka Vainio <vpvainio@iki.fi>
Date:	Sat Mar 23 19:33:16 2013 +0200

    Finnish translation update by Jiri Grönroos

 po/fi.po | 1011
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 522 insertions(+), 489 deletions(-)

commit 8aeffb4bfef6f8ef33b59039a53a4e0f0ef14008
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	Sat Mar 23 16:18:00 2013 +0100

    Updated Slovenian translation

 po/sl.po | 638
 ++++++++++++++++++++++-----------------------------------------
 1 file changed, 221 insertions(+), 417 deletions(-)

commit 433dcbe3867eee739fbcfbcd39055d866bae8230
Author: Sandeep Sheshrao Shedmake <sshedmak@redhat.com>
Date:	Sat Mar 23 10:48:16 2013 +0530

    Updated Marathi Translations

 po/mr.po | 546
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 310 insertions(+), 236 deletions(-)

commit 3f639c9e3c8c0e9b91207b380fac2d8a737e9d3f
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Fri Mar 22 16:35:46 2013 +0400

    Updated Russian translation

 po/ru.po | 1190
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 733 insertions(+), 457 deletions(-)

commit 73d7ed5eb362e6e79d731e335aad3de37e9199d7
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Thu Mar 21 10:17:49 2013 +0100

    Updated Hungarian documentation translation

 help/hu/hu.po | 336
 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 163 insertions(+), 173 deletions(-)

commit bd86560c72f2b1972d2324ee65e66dbc4bc4be87
Author: Rajesh Ranjan <rranjan@redhat.com>
Date:	Thu Mar 21 12:41:15 2013 +0530

    hindi translation

 po/hi.po | 425
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 248 insertions(+), 177 deletions(-)

commit 87f20a55d39966bc565844c8933f885d196ddf1c
Author: Pavol Klačanský <pavol@klacansky.com>
Date:	Wed Mar 20 21:22:50 2013 +0100

    Updated slovak translation

 po/sk.po | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

commit 8779dcb446b4cd327f684be16e9da92fc008a68d
Author: Arash Mousavi <mousavi.arash@gmail.com>
Date:	Wed Mar 20 22:46:52 2013 +0330

    L10N: Updated Persian Translation

 po/fa.po | 418
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 248 insertions(+), 170 deletions(-)

commit a8ce1e4d0a8b4b9ea878b86b04a220d921aaeff5
Author: Dr.T.Vasudevan <drtvasudevan@gmail.com>
Date:	Wed Mar 20 16:59:18 2013 +0530

    Updated Tamil translation

 po/ta.po | 2448
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1347 insertions(+), 1101 deletions(-)

commit a6705e732edfb52b2414b5e879715d1eee81b671
Author: ManojKumar Giri <mgiri@redhat.com>
Date:	Wed Mar 20 16:39:46 2013 +0530

    Updated Odia Translation.

 po/or.po | 501
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 291 insertions(+), 210 deletions(-)

commit c38dfe3594792b6439c770cea1db096d792e93e5
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Wed Mar 20 11:55:56 2013 +0100

    gitignore: Hide autogenerated resource files from git

 src/.gitignore | 2 ++
 1 file changed, 2 insertions(+)

commit 3261141cc546288fa8a3405038a2e809c9759785
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 20 11:42:05 2013 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 144c5b0358cd19ac00653081989c0fb87f35572b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 20 11:34:37 2013 +0100

    3.7.92

 NEWS	      | 31 +++++++++++++++++++++++++++++++
 configure.ac |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)

commit 431a47f452e94988624c1722242fbb09fae08c2b
Author: Victor Ibragimov <victor.ibragimov@gmail.com>
Date:	Tue Mar 19 20:45:57 2013 +0100

    [l10n] Added Tadjik translation

 po/LINGUAS |	 1 +
 po/tg.po   | 4412
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 4413 insertions(+)

commit 1ddcf5f6762b7c9195134ddb59707c951678adbd
Author: Pavol Klačanský <pavol@klacansky.com>
Date:	Mon Mar 18 20:52:14 2013 +0100

    Updated slovak translation

 po/sk.po | 116
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 55 insertions(+), 61 deletions(-)

commit b5e32eae194c605da2fe792c2b262d885995f29a
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:	Sun Mar 17 19:53:18 2013 +0100

    [l10n] Updated Catalan (Valencian) translation

 po/ca@valencia.po | 599
 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 334 insertions(+), 265 deletions(-)

commit 22326271c76ca114a338acbef6ec12ae626e95a9
Author: Changwoo Ryu <cwryu@debian.org>
Date:	Sun Mar 17 00:56:44 2013 +0900

    Updated Korean translation

 po/ko.po | 431
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 248 insertions(+), 183 deletions(-)

commit 8d0b661c544650ddd96477693d902d0431b257f9
Author: Duarte Loreto <happyguy_pt@hotmail.com>
Date:	Thu Mar 14 23:29:48 2013 +0000

    Updated Portuguese translation and converted to New Spelling (Novo AO)

 po/pt.po | 811
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 439 insertions(+), 372 deletions(-)

commit 4e62d516e5b2e71b5a276120cc93f4efdb01d1e4
Author: Alexandre Franke <alexandre.franke@gmail.com>
Date:	Thu Mar 14 16:39:59 2013 +0100

    Update French translation

 po/fr.po | 461
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 268 insertions(+), 193 deletions(-)

commit 7dbb5fa93477aa5446e5ae01d26af716d320f5f4
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Mar 13 15:02:19 2013 +0100

    Fix link issue when UOA is enabled

    src/empathy-sanity-cleaning.c uses libaccounts-glib directly, so we
    have to pass UOA build flags.

 src/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

commit 0ec0c9df698a23124480af847048835252f83177
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Mar 13 15:01:33 2013 +0100

    Bump required Folks version to 0.9.0

    We depend on libgee 0.8 so we have to ensure that we build with a
    folks that uses libgee 0.8 as well.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5231e24958bc5748dfdd17c17fa4d01a7859001b
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	Wed Mar 13 13:05:29 2013 +0200

    [l10n] Updated Estonian translation

 po/et.po | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

commit 89f2bc8547d0018779d122820ba5ee1f94ddcc9f
Author: KennethNielsen <k.nielsen81@gmail.com>
Date:	Tue Mar 12 23:34:04 2013 +0100

    Updated Danish translation

 po/da.po | 429
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 231 insertions(+), 198 deletions(-)

commit 7f9043fbe37d458a86615bef27b6fb6202395402
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Tue Mar 12 18:46:54 2013 +0100

    [l10n] Updated Italian translation.

 po/it.po | 274
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 134 insertions(+), 140 deletions(-)

commit 657d8a71f015a9ff53a81578df47d328fce35cb0
Author: Andika Triwidada <andika@gmail.com>
Date:	Tue Mar 12 11:57:59 2013 +0700

    Updated Indonesian translation

 po/id.po | 417
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 227 insertions(+), 190 deletions(-)

commit d92045f4f26989efa3690af3c7cd8fd0698fdb45
Author: Gil Forcada <gforcada@gnome.org>
Date:	Mon Mar 11 23:06:20 2013 +0100

    [l10n] Updated Catalan translation

 po/ca.po | 591
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 330 insertions(+), 261 deletions(-)

commit 675246b6e9edc3bb940ba73e1050eae08d53308f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 11 16:54:45 2013 +0100

    irc-network-chooser-dialog: break live search references cycle

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

 libempathy-gtk/empathy-irc-network-chooser-dialog.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit de9e3bab4f3cf6fc2eaacd78c1bb91b62ceefeed
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 11 16:50:46 2013 +0100

    irc-network-chooser-dialog: disconnect live search signals in dispose

    The 'destroyed' signal is called to late, we have to disconnect
    those signals
    before destroying the live search object.

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

 .../empathy-irc-network-chooser-dialog.c	    | 24
 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

commit 34fc9df7c2d660ff29250e25ca3441f571863146
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 11 16:46:57 2013 +0100

    live_search_unmap: check if priv->hook_widget is not NULL

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

 libempathy-gtk/empathy-live-search.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 6549ab3005c67b222f1f9d244cb9f7d551b3e325
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 11 15:19:41 2013 +0100

    explicitely depends on cogl

    We use cogl directly in some empathy-call files.

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

 configure.ac | 1 +
 1 file changed, 1 insertion(+)

commit 2954a620271e3eca04da06af60d825d13339542a
Author: Shankar Prasad <svenkate@redhat.com>
Date:	Mon Mar 11 16:34:51 2013 +0530

    Updated kn translations

 po/kn.po | 287
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 146 insertions(+), 141 deletions(-)

commit ffd825437c28ac1d1abfa8bb59f23b6f24c818f2
Author: Shankar Prasad <svenkate@redhat.com>
Date:	Mon Mar 11 15:07:57 2013 +0530

    Updated kn translations

 po/kn.po | 383
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 200 insertions(+), 183 deletions(-)

commit 745894a915fc855de26c0cdce52919956b68e811
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Sun Mar 10 15:57:27 2013 +0100

    Updated Hungarian translation by Péter Bojtos <ptr at ulx dot hu>

 po/hu.po | 676
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 391 insertions(+), 285 deletions(-)

commit 3850ec0640600d3794eaa7e0b2a2872d751031d0
Author: Dimitris Spingos <dmtrs32@gmail.com>
Date:	Sun Mar 10 06:16:35 2013 +0200

    Updated Greek translation

 help/el/el.po | 169
 +++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 145 insertions(+), 24 deletions(-)

commit ac60ced9fed081db7ba2418c7cd0f2bc1c8d0b84
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Thu Mar 7 17:00:00 2013 +0300

    Updated Belarusian translation.

 po/be.po | 455
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 263 insertions(+), 192 deletions(-)

commit 8862581359222f3409a722f581c249f812c6b29a
Author: Rafael Ferreira <rafael.f.f1@gmail.com>
Date:	Tue Mar 5 10:30:18 2013 -0300

    Updated Brazilian Portuguese translation

 po/pt_BR.po | 582
 ++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 327 insertions(+), 255 deletions(-)

commit b7ba76814170ab50bc28a555ee62cadc357f461e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 4 17:33:56 2013 +0100

    prepare 3.7.91

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

commit 052cb1b3666f7fe7968e5521aef10d441f66ccf8
Author: Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>
Date:	Sun Mar 3 17:34:17 2013 +0100

    Updated German help translation

 help/de/de.po | 154
 ++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 127 insertions(+), 27 deletions(-)

commit e86f95f642d466be900263c34b584fcd60a3adc5
Author: A S Alam <aalam@users.sf.net>
Date:	Wed Feb 27 08:25:13 2013 +0530

    Punjabi: Translation updated (aalam)

 po/pa.po | 158
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 81 insertions(+), 77 deletions(-)

commit 77479e3ae75518a4a59c0e07d6bd368a9a074227
Author: Gheyret Kenji <gheyret@gmail.com>
Date:	Mon Feb 25 18:34:17 2013 +0900

    Updated Uyghur translation

    Signed-off-by: Gheyret Kenji <gheyret@gmail.com>

 po/ug.po | 54 +++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

commit 1d2be339581f046202ff4f961079bcbd23970e5f
Author: Dimitris Spingos <dmtrs32@gmail.com>
Date:	Sun Feb 24 18:39:34 2013 +0200

    Updated Greek translation

 po/el.po | 493
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 254 insertions(+), 239 deletions(-)

commit 24a1484480e7234e605e5e36a774c233162c260a
Author: Adam Matoušek <adamatousek@gmail.com>
Date:	Fri Feb 22 21:26:48 2013 +0100

    Updated Czech translation

 po/cs.po | 462
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 266 insertions(+), 196 deletions(-)

commit 723d51836dcf3cc23d9cdfffb29cb3335996c58f
Author: A S Alam <aalam@users.sf.net>
Date:	Fri Feb 22 15:02:34 2013 +0000

    Punjabi: Translation updated (aalam)

 po/pa.po | 418
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 242 insertions(+), 176 deletions(-)

commit 7826ac56c8ecb1cd8531bb02a2f0df870128a9a6
Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
Date:	Wed Feb 20 12:22:10 2013 +0200

    Updated Latvian translation

 po/lv.po | 580
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 323 insertions(+), 257 deletions(-)

commit 786d82790cc499a2f7f785051f62def2a6206b26
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 19 14:45:00 2013 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 68f744576ca4e8d6a4eea14039ffed4e33adc8da
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 19 14:39:14 2013 +0100

    prepare 3.7.90

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

commit 28df2ffe0a5239675deef8cd9624f4cebc08bc32
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 19 11:59:59 2013 +0100

    Revert "Go back to libgee 0.6.x"

    This reverts commit 670aec4ba8b16fbf35afdf65b65c1904872286dc.

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

 configure.ac				    |  2 +-
 libempathy-gtk/empathy-individual-menu.c   |  4 ++--
 libempathy-gtk/empathy-individual-widget.c | 10 ++++------
 libempathy/empathy-contact.c		    |  2 +-
 libempathy/empathy-utils.c		    |  2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

commit ab25c881f881f8ef612be720868594ef32e5f148
Author: Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>
Date:	Sun Feb 17 20:13:07 2013 +0100

    [l10n]Updated German translation

 po/de.po | 365
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 193 insertions(+), 172 deletions(-)

commit 55492f8ca6863fed4fb6a46c545fe85764dcbc84
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Sun Feb 17 14:42:35 2013 +0100

    Updated Polish translation

 po/pl.po | 340
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 167 insertions(+), 173 deletions(-)

commit 6f2c2c90f44f624bd2b7f352da1bc09312c136f2
Author: Pavol Klačanský <pavol@klacansky.com>
Date:	Sat Feb 16 12:27:56 2013 +0100

    Updated slovak translation

 po/sk.po | 922
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 446 insertions(+), 476 deletions(-)

commit c9b4851f03bbcf06b3e103286de22e87b659b967
Author: Daniel Martinez <dmartinez@src.gnome.org>
Date:	Thu Feb 14 20:19:52 2013 +0100

    Updated Aragonese translation

 po/an.po | 1509
 +++++++++++++++++++-------------------------------------------
 1 file changed, 458 insertions(+), 1051 deletions(-)

commit 5fa225e87096cde52e8769fbf637911fd3f73970
Author: Gheyret Kenji <gheyret@gmail.com>
Date:	Wed Feb 13 20:16:30 2013 +0900

    Updated Uyghur translation

    Signed-off-by: Gheyret Kenji <gheyret@gmail.com>

 po/ug.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit f7fa059de2c8e82b906b56e756725b9e5523cf39
Author: Gheyret Kenji <gheyret@gmail.com>
Date:	Sat Feb 9 09:36:41 2013 +0900

    Updated Uyghur translation

    Signed-off-by: Gheyret Kenji <gheyret@gmail.com>

 po/ug.po | 171
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 80 insertions(+), 91 deletions(-)

commit 83add78f2c14a083a8f3c1196382c11750be0251
Author: Stef Walter <stefw@gnome.org>
Date:	Wed Feb 6 09:03:15 2013 +0100

    tests: Fix empathy-tls-test

     * Create new certificates
     * Add a make target for rebuilding the certificates in the future

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

 tests/Makefile.am			      |   4 +-
 tests/certificates/Makefile.am		      |  24 +++++++++++-
 tests/certificates/cert-openssl.conf	      |  16 ++++++++
 tests/certificates/certificate-authority.cer | Bin 0 -> 466 bytes
 tests/certificates/collabora-ca.cer	      | Bin 1536 -> 0 bytes
 tests/certificates/dhansak-collabora.cer     | Bin 1200 -> 0 bytes
 tests/certificates/server-cert.cer	      | Bin 0 -> 448 bytes
 tests/empathy-tls-test.c		      |  54
 +++++++++++++--------------
 8 files changed, 67 insertions(+), 31 deletions(-)

commit 04f9f5866a77ffe6a944a1b1e59b2f277bb87a9e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 5 10:17:12 2013 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d4d66c6945a57e3509d35b7c78491277ba8fac0e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 5 10:11:40 2013 +0100

    tests: disable empathy-tls-test

    The test is currently broken because
    tests/certificates/dhansak-collabora.cer
    expired. I opened bgo#693190 to fix it.

 tests/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 54244ca8601102f932803247e599f7e8d10a81cb
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Feb 4 17:46:37 2013 +0100

    Updated Spanish translation

 help/es/es.po | 61
 +++++++++++++++++++++++++++--------------------------------
 1 file changed, 28 insertions(+), 33 deletions(-)

commit c4c5b8964584338dcdf218138db3c395b18d5fd5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 4 11:58:10 2013 +0100

    Prepare 3.7.5

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

commit 4c55d1c1f94961f90c6c7f42cac29b4065c95104
Author: Sindhu S <sindhus@live.in>
Date:	Sun Feb 3 17:53:22 2013 +0530

    Help: Fixed installation link.

    Used new mallard syntax for installation link of telepathy-idle

 help/C/irc-manage.page | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

commit 1676e7e092822a3c813fd553455064a01a66ca09
Author: Anish A <aneesh.nl@gmail.com>
Date:	Sat Feb 2 21:10:16 2013 +0400

    Updated Malayalam Localization

 po/ml.po | 899
 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 417 insertions(+), 482 deletions(-)

commit 049bc6abbdb6a6f6801da400250bffc954065c60
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Thu Jan 31 13:13:05 2013 +0100

    Updated Basque language

 po/eu.po | 4739
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 2393 insertions(+), 2346 deletions(-)

commit 635cb6404ebb542b4780e688444a7a6d7f30c09d
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Mon Jan 28 09:51:53 2013 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 599
 ++++++++++++++++++++++++++++++++---------------------------
 po/zh_TW.po | 603
 +++++++++++++++++++++++++++++++++---------------------------
 2 files changed, 664 insertions(+), 538 deletions(-)

commit 02a03438ffb23d728a07bdc7cfacdb6abddbc35a
Merge: e02bd4d 8fd2851
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 24 15:14:25 2013 +0100

    Merge branch 'gnome-3-6'

commit 8fd28512046a9505e31705c9440623a63d719ab4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 24 15:08:31 2013 +0100

    chatroom-manager: save file when only the 'favorite' prop is changed

    Needed to save favorite changes from empathy-chat as it only
    changes this
    property.

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

 libempathy/empathy-chatroom-manager.c | 2 ++
 1 file changed, 2 insertions(+)

commit e02bd4d24d0dbbc138e9e8f6cba07fdf332caaed
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Mon Jan 21 16:41:05 2013 +0100

    Bump the telepathy-logger dependency to 0.8.0

    We are using TplLogWalker.

    Fixes: https://bugzilla.gnome.org/639877

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fba3739d9dccb9ccaa99d5ad8d07c5264ebbdeb2
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Mon Jul 9 17:45:01 2012 +0200

    empathy-chat: show pending messages only for the first set of logs

    Fixes: https://bugzilla.gnome.org/639877

 libempathy-gtk/empathy-chat.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 027ccda384645f67a2d209d023c5d324d7f15715
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Thu Jul 5 16:41:46 2012 +0200

    empathy-chat: load logs as the user scrolls up or resizes the dialog

    This requires the TplLogWalker API to iterate over the logs.

    Fixes: https://bugzilla.gnome.org/639877

 libempathy-gtk/empathy-chat.c | 218
 +++++++++++++++++++++++++++++++++---------
 1 file changed, 173 insertions(+), 45 deletions(-)

commit c9f927a6713d687df5db0edcea8f278ddc414dac
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Wed Jul 4 16:03:42 2012 +0200

    theme-adium: add empathy_theme_adium_prepend_message

    ... and refactor the empathy_theme_adium_append_message code path so
    that the common parts can be shared.

    Fixes: https://bugzilla.gnome.org/639877

 libempathy-gtk/empathy-theme-adium.c | 165
 +++++++++++++++++++++++++++--------
 libempathy-gtk/empathy-theme-adium.h |   4 +
 2 files changed, 135 insertions(+), 34 deletions(-)

commit 3197deed2e55d252ecaf4740ec61416977f9f87e
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Wed Jul 4 15:13:24 2012 +0200

    empathy-chat: load and register the JavaScript resource

    Fixes: https://bugzilla.gnome.org/639877

 src/empathy-chat.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 4ccbecd15680fd76ac5ebf1b8da82bffc8f68ca0
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Wed Jul 4 15:12:15 2012 +0200

    empathy-chat: add some JavaScript to prepend messages

    Fixes: https://bugzilla.gnome.org/639877

 configure.ac			|  3 ++
 src/Makefile.am		| 26 +++++++++++-
 src/empathy-chat.gresource.xml |  6 +++
 src/empathy-chat.js		| 92
 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 126 insertions(+), 1 deletion(-)

commit fc577ecee431fdfc91617b0cd7f6df39e575b006
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Fri Jul 6 14:34:31 2012 +0200

    boxes theme: fix whitespace

 .../Boxes.AdiumMessageStyle/Contents/Resources/Incoming/Content.html  |
 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit cd39a335d60c29ad27fc9237dbc3ecd1745a00cb
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Fri Jul 6 14:32:59 2012 +0200

    adium themes: support prepend

    This is done by providing a #prepend similar to the #insert mandated
    by the
    Adium spec.

    NB: #prepend is an extension of the Adium spec.

    Fixes: https://bugzilla.gnome.org/639877

 .../Boxes.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
 | 1 +
 .../Boxes.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html
 | 1 +
 data/themes/Classic.AdiumMessageStyle/Contents/Resources/Content.html
 | 1 +
 .../Contents/Resources/Incoming/Content.html
 | 1 +
 .../Contents/Resources/Incoming/NextContent.html
 | 1 +
 5 files changed, 5 insertions(+)

commit 01ded59d27c694d05b815afa1bb6d2002afb2170
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Fri Jan 18 10:26:37 2013 +0100

    Updated Serbian translation

 po/sr.po	| 475
 +++++++++++++++++++++++++++++++++------------------------
 po/sr@latin.po | 475
 +++++++++++++++++++++++++++++++++------------------------
 2 files changed, 552 insertions(+), 398 deletions(-)

commit c07759a04ee766766ac043f6d296210a785043f5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 16 09:15:53 2013 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e2138716de168a43abe43608417720fc1d7dc138
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 16 09:02:38 2013 +0100

    prepare 3.7.4

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

commit b5be743912a828d44439693a7c5da2d8fafba7ca
Merge: e08ec07 c3716f8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 16 09:03:28 2013 +0100

    Merge branch 'gnome-3-6'

    Conflicts:
	NEWS
	configure.ac

commit e08ec076dbf22f4f4bcdaf4ec11ccb4debc2c713
Author: Gheyret Kenji <gheyret@gmail.com>
Date:	Sun Jan 13 16:59:15 2013 +0900

    Updated Uyghur translation

    Signed-off-by: Gheyret Kenji <gheyret@gmail.com>

 po/ug.po | 478
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 241 insertions(+), 237 deletions(-)

commit f1a50a0892369873ab466387b51682e7ff703b03
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Sat Jan 12 21:32:41 2013 +0100

    Updated Slovenian translation

 po/sl.po | 854
 +++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 533 insertions(+), 321 deletions(-)

commit 02db084adde59fc94129ebd7ea5c2c24fad7c07a
Author: Alberto Mardegan <alberto.mardegan@canonical.com>
Date:	Thu Jan 10 12:20:12 2013 +0100

    UOA: Use the new libaccounts-glib APIs

    The APIs based on GValue are now deprecated.

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

 configure.ac					    |  2 +-
 .../empathy-accounts-plugin-widget.c		    | 22 ++++----
 .../mc-plugin/mcp-account-manager-uoa.c	    | 59
 ++++++++++------------
 3 files changed, 39 insertions(+), 44 deletions(-)

commit cfef33e79d3d01b5a407381267bd5f481ceca340
Author: Alberto Mardegan <alberto.mardegan@canonical.com>
Date:	Wed Jan 9 12:42:41 2013 +0100

    UOA: share a common configuration plugin

    The latest libaccounts-glib and libaccount-plugin libraries add
    support
    for using the same binary plugin for different providers.
    This means that bug 683415 is no longer valid, and that all the
    provider-specific plugins can now be removed.

    Fixes bug #691418

 .../cc-plugins/account-plugins/Makefile.am	    | 171 +---------------
 .../account-plugins/empathy-accounts-plugin-aim.c  |  46 -----
 .../account-plugins/empathy-accounts-plugin-aim.h  |  75 -------
 .../empathy-accounts-plugin-gadugadu.c		    |  46 -----
 .../empathy-accounts-plugin-gadugadu.h		    |  75 -------
 .../empathy-accounts-plugin-groupwise.c	    |  46 -----
 .../empathy-accounts-plugin-groupwise.h	    |  75 -------
 .../account-plugins/empathy-accounts-plugin-icq.c  |  46 -----
 .../account-plugins/empathy-accounts-plugin-icq.h  |  75 -------
 .../account-plugins/empathy-accounts-plugin-irc.c  |  46 -----
 .../account-plugins/empathy-accounts-plugin-irc.h  |  75 -------
 .../empathy-accounts-plugin-jabber.c		    |  46 -----
 .../empathy-accounts-plugin-jabber.h		    |  75 -------
 .../empathy-accounts-plugin-local-xmpp.c	    |  46 -----
 .../empathy-accounts-plugin-local-xmpp.h	    |  75 -------
 .../account-plugins/empathy-accounts-plugin-mxit.c |  46 -----
 .../account-plugins/empathy-accounts-plugin-mxit.h |  75 -------
 .../empathy-accounts-plugin-myspace.c		    |  46 -----
 .../empathy-accounts-plugin-myspace.h		    |  75 -------
 .../empathy-accounts-plugin-sametime.c		    |  46 -----
 .../empathy-accounts-plugin-sametime.h		    |  75 -------
 .../account-plugins/empathy-accounts-plugin-sip.c  |  46 -----
 .../account-plugins/empathy-accounts-plugin-sip.h  |  75 -------
 .../empathy-accounts-plugin-yahoo.c		    |  46 -----
 .../empathy-accounts-plugin-yahoo.h		    |  75 -------
 .../empathy-accounts-plugin-yahoojp.c		    |  46 -----
 .../empathy-accounts-plugin-yahoojp.h		    |  75 -------
 .../empathy-accounts-plugin-zephyr.c		    |  46 -----
 .../empathy-accounts-plugin-zephyr.h		    |  75 -------
 .../account-plugins/empathy-accounts-plugin.c	    |	6 +
 .../account-plugins/empathy-accounts-plugin.h	    |	2 +
 .../cc-plugins/generate-plugins.py		    | 224
 +--------------------
 .../cc-plugins/providers/aim.provider		    |	1 +
 .../cc-plugins/providers/gadugadu.provider	    |	1 +
 .../cc-plugins/providers/groupwise.provider	    |	1 +
 .../cc-plugins/providers/icq.provider		    |	1 +
 .../cc-plugins/providers/irc.provider		    |	1 +
 .../cc-plugins/providers/jabber.provider	    |	1 +
 .../cc-plugins/providers/local-xmpp.provider	    |	1 +
 .../cc-plugins/providers/mxit.provider		    |	1 +
 .../cc-plugins/providers/myspace.provider	    |	1 +
 .../cc-plugins/providers/sametime.provider	    |	1 +
 .../cc-plugins/providers/sip.provider		    |	1 +
 .../cc-plugins/providers/yahoo.provider	    |	1 +
 .../cc-plugins/providers/yahoojp.provider	    |	1 +
 .../cc-plugins/providers/zephyr.provider	    |	1 +
 46 files changed, 29 insertions(+), 2082 deletions(-)

commit 7035c0ab139dcabac395fc2798af04db4d89f884
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 26 15:49:45 2012 +0100

    call-window: use the 'emblem-system-symbolic' icon for the camera
    popup button

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

 src/empathy-call-window.c | 43
 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

commit c3716f8a8add2a6fbebef81b05281d777c8369ba
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 9 12:09:13 2013 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9d54c02581f1b01d7dc90156b68dc6704c6258f8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 9 11:13:37 2013 +0100

    prepare 3.6.3

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

commit d626e269cd10cce37a1ca54ff7474ae6aee16df4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 28 14:29:40 2012 +0100

    extensions: fix parallel build

    Based on a similar fix from Debarshi Ray:
    f1ab42c0c5332e47b33ecf905afd7fd6c2a344e8

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

 extensions/Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 796b0b439794ca55b7c4114787f80f830ad0e598
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Fri Nov 30 19:29:13 2012 +0100

    Make parallel builds work

    There is no need to execute glib-ginterface-gen.py twice because it
    generates both the .c and .h files in one shot. Therefore, merely
    having one of them (say the .c) depend on the other (say the .h) is
    enough.

    Moreover, running it twice breaks parallel builds because one
    glib-ginterface-gen.py process steps on the other.

    Based on a suggestion from Ryan Lortie.

    Fixes: https://bugzilla.gnome.org/688132

 extensions/Makefile.am | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit 658d6dc1dbc27e7f780c0e0f8859a663321bf213
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 8 15:05:42 2013 +0100

    irc-network-chooser-dialog: use GNOME 3 +/- buttons

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

 .../empathy-irc-network-chooser-dialog.c	    | 64
 ++++++++++++++++++----
 1 file changed, 54 insertions(+), 10 deletions(-)

commit 5dd66017b88e4a0d248ff75e26f12c45a959a7fa
Merge: 7fd0b32 d95a09b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 8 12:38:01 2013 +0100

    Merge branch 'gnome-3-6'

commit d95a09bded20a2cccf0847f4663fd075536399ca
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 8 12:31:43 2013 +0100

    tp-chat: prepare CONNECTED on the TpConnection first

    We have to make sure that tp_connection_get_self_contact() won't
    return NULL.

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

 libempathy/empathy-tp-chat.c | 58
 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 48 insertions(+), 10 deletions(-)

commit 620122e5b41b4ae529ffcdb927b6b4898d98b5f3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 8 10:39:11 2013 +0100

    account-settings: early return if SASL earlier

    We should update the URI schemes and service even if the account
    uses SASL, so
    it has to be done *before* the early return.

    I did not hit this bug before as the only CM on which we use URI
    schemes
    (rakia) was not implementing SASL channel when I implemented this
    feature.

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

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

commit 273ef9afeabc1de111d4b890dccb3e9153c8c3b1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 7 14:23:14 2013 +0100

    roster-window: ellipsize infobar title

    This avoid to increase the width of the roster window when displaying
    the
    error.

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

 src/empathy-roster-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 7fd0b32b8fb6ad3fe29c46ed2afe2bdd25d6687e
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Mon Jan 7 14:31:48 2013 +0100

    [l10n] Updated Italian translation.

 po/it.po | 454
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 267 insertions(+), 187 deletions(-)

commit 31ec75a03a132770268cf02d98f2b477747bb54f
Merge: 16973fd 1e7449f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 7 14:08:27 2013 +0100

    Merge branch 'gnome-3-6'

    Conflicts:
	po/kn.po
	po/ta.po

commit 1e7449f5a14e2f031389808206c9991f65d3ade7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 4 16:08:39 2013 +0100

    log-window: escape the body of the message

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

 libempathy-gtk/empathy-log-window.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit 16973fd1a14657eebf1cb39dd3f912db59a2fa77
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Mon Jan 7 11:30:31 2013 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 150
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 87 insertions(+), 63 deletions(-)

commit 0914fcf221a2d17f5c5042f4c3e69754b2f2bec4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 4 14:17:51 2013 +0100

    roster-window: start live search on Ctrl+f

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

commit 746d67ea0f47aa128308d471bbf5f0472a2a0707
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 4 13:58:16 2013 +0100

    remove 'Search for contacts' accelerator

    It was impossible to type 'F' in our status message because of it.

    Shift+F is not a very common accelerator and there is no way to
    discover it
    any more (accelerators are not displayed in Shell's menu).
    Searching for contacts isn't something you are supposed to do every
    day so not
    having an accelerator isn't that bad anyway.

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

 src/empathy-roster-window-menubar.ui | 1 -
 1 file changed, 1 deletion(-)

commit 8969c8bd635ad34ff8d44f2894e31c44a00e20b9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 4 11:49:39 2013 +0100

    call-window: set a bigger default size

    Set the same size as the default chat-window size.

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

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

commit 403ebcfcc6bcf95b1ef914de48ac5509c284b150
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 4 11:28:17 2013 +0100

    sync tools/ with telepathy-glib

    This should allow Empathy to be build with Python 3.

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

 tools/c-constants-gen.py	     | 12 +++----
 tools/glib-client-gen.py	     | 18 ++++-------
 tools/glib-client-marshaller-gen.py | 20 ++++++------
 tools/glib-errors-check-gen.py      | 62
 ++++++++++++++++++-------------------
 tools/glib-errors-str-gen.py	     | 14 +++------
 tools/glib-ginterface-gen.py	     | 22 +++++--------
 tools/glib-gtypes-generator.py      | 14 ++++-----
 tools/glib-interfaces-gen.py	     | 14 ++++-----
 tools/gobject-foo.py		     |	2 +-
 tools/libglibcodegen.py	     |	4 +--
 tools/libtpcodegen.py		     | 22 ++++++++++++-
 tools/make-version-script.py	     | 32 +++++++++----------
 tools/xincludator.py		     | 13 ++++++--
 13 files changed, 129 insertions(+), 120 deletions(-)

commit 0aa79adae47a074f0fd59762eec0c133ca48ae2a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 4 10:01:00 2013 +0100

    implement %messageDirection% in default themes

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

 .../Contents/Resources/Incoming/Content.html			   | 2 +-
 .../Contents/Resources/Incoming/NextContent.html		   | 2 +-
 .../Classic.AdiumMessageStyle/Contents/Resources/Content.html	   | 2 +-
 .../Contents/Resources/Incoming/Content.html			   | 2 +-
 .../Contents/Resources/Incoming/NextContent.html		   |
 8 +++++---
 5 files changed, 9 insertions(+), 7 deletions(-)

commit 0238337186d7bf8b82869f53a9d27e7d407beaf6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 4 09:33:29 2013 +0100

    theme-adium: implement %messageDirection%

    This seems to work fine with the Stockholm which implement this
    keyword.

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

 libempathy-gtk/empathy-theme-adium.c | 41
 ++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 9 deletions(-)

commit 1f58b2c7809a6489c069aff8b1b9d1e114bc3f2c
Author: Gheyret Kenji <gheyret@gmail.com>
Date:	Fri Jan 4 16:46:52 2013 +0900

    Updated Uyghur translation

    Signed-off-by: Gheyret Kenji <gheyret@gmail.com>

 po/ug.po | 3889
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1980 insertions(+), 1909 deletions(-)

commit 55ce28ebe490bc803dd524970ebb187402bb6031
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Thu Jan 3 11:42:13 2013 +0100

    Recognize both handheld and phone clienttypes as mobile devices

    Empathy currently displays a phone icon for clients which indicate
    that
    they're phones. However some mobile clients use the "handheld" client
    type instead (e.g. Xabber on android devices).

    While changing things around, i've also refactored the code a bit to
    ensure that the determination will stay consistent in the various
    location if it's changed in future.

 libempathy-gtk/empathy-cell-renderer-text.c |	4 ++--
 libempathy-gtk/empathy-individual-widget.c  |	4 +---
 libempathy-gtk/empathy-roster-contact.c     | 20 ++++----------------
 libempathy/empathy-utils.c		     | 14 ++++++++++++++
 libempathy/empathy-utils.h		     |	3 +++
 src/empathy-chat-window.c		     |	4 ++--
 6 files changed, 26 insertions(+), 23 deletions(-)

commit 05c170e3de251f2161e9ff5bb1eac4785cdc91da
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 3 13:11:01 2013 +0100

    empathy.desktop: set X-GNOME-UsesNotifications

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

 data/empathy.desktop.in.in | 1 +
 1 file changed, 1 insertion(+)

commit e7072d88a143a1f7b659bc67eaf0e7b540b41200
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 3 13:06:54 2013 +0100

    notification: set the "desktop-entry" hint

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

 libempathy-gtk/empathy-notify-manager.c | 4 ++++
 libempathy-gtk/empathy-notify-manager.h | 1 +
 2 files changed, 5 insertions(+)

commit 12b23410bd90309789d3f3b5206f0cde015c31b0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 3 13:04:38 2013 +0100

    factor out empathy_notify_manager_create_notification()

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

 libempathy-gtk/empathy-notify-manager.c | 12 ++++++++++++
 libempathy-gtk/empathy-notify-manager.h |  7 +++++++
 src/empathy-call-observer.c		 |  3 ++-
 src/empathy-chat-window.c		 |  4 +++-
 src/empathy-notifications-approver.c	 |  4 ++--
 5 files changed, 26 insertions(+), 4 deletions(-)

commit 079d54dd90b551a5ca520a244fc93933d13d942d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 3 13:01:03 2013 +0100

    notifications: no need to set NOTIFY_EXPIRES_DEFAULT

    That's the default value.

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

 src/empathy-chat-window.c	      | 2 --
 src/empathy-notifications-approver.c | 3 ---
 2 files changed, 5 deletions(-)

commit 8d0eb500144999ede2897bb0dd3248b0aa3399ec
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 2 11:29:58 2013 +0100

    call: pass the proper flag to gtk_application_inhibit()

    We have to use '|' to combine flags, not '&'...

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

commit d462005a1704b8d5342b7972217eceb33019dc43
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 2 11:18:46 2013 +0100

    configure.ac: fix typo

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4e394ed0c42790879cbb7a5004f8c9a85ee1f713
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 2 11:18:13 2013 +0100

    Check tp-fs version when building with GStreamer 0.10

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit aadf9377c8ba043f84239801441d49538ce2f14c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 28 14:29:40 2012 +0100

    extensions: fix parallel build

    Based on a similar fix from Debarshi Ray:
    f1ab42c0c5332e47b33ecf905afd7fd6c2a344e8

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

 extensions/Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 585cc6978244869893638ff4558c461d7c0ee8e9
Author: Aurimas Černius <aurisc4@gmail.com>
Date:	Tue Jan 1 18:32:04 2013 +0200

    Updated Lithuanian translation

 po/lt.po | 938
 ++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 413 insertions(+), 525 deletions(-)

commit f7d8fa9f923ad77d113fb039d64b6401558daaed
Author: Gil Forcada <gforcada@gnome.org>
Date:	Mon Dec 31 18:53:34 2012 +0100

    [l10n] Updated Catalan documentation

 help/ca/ca.po | 65
 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 32 insertions(+), 33 deletions(-)

commit 5c1a47a64974c42aad23ce7dbcc863edc471e606
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sun Dec 30 20:49:44 2012 +0100

    Updated Galician translations

 po/gl.po | 90
 ++++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 56 insertions(+), 34 deletions(-)

commit b4a06665e8bad2ac329dee896e37f0ddb4b8cd9e
Author: Nilamdyuti Goswami <ngoswami@redhat.com>
Date:	Thu Dec 27 20:55:15 2012 +0530

    Assamese translation updated

 po/as.po | 146
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 84 insertions(+), 62 deletions(-)

commit c49cc8b5f45f071b9b484c2fd7b30259d8bb2bd9
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Wed Dec 26 19:57:54 2012 +0100

    Updated Polish translation

 po/pl.po | 78
 ++++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 51 insertions(+), 27 deletions(-)

commit a49ccd1a6bc0ef56f94aef8abe890217a5526583
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Wed Dec 26 20:05:32 2012 +0200

    Updated Hebrew translation.

 po/he.po | 127
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 74 insertions(+), 53 deletions(-)

commit b3ab97d23625f6febd97d9c4459e2939bcbbd7ff
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 26 12:06:38 2012 +0100

    roster-window: prevent adding contact if not supported by CM

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

 src/empathy-roster-window.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

commit 7e28ffdb6b89919f840f8e81a53b5cc06f724899
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Dec 26 12:22:09 2012 +0100

    Updated Spanish translation

 po/es.po | 62
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 37 insertions(+), 25 deletions(-)

commit 1b89570f069a4e5b47b895486d9dbe6ff04613e1
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Dec 26 12:20:55 2012 +0100

    Updated Spanish translation

 po/es.po | 1057
 --------------------------------------------------------------
 1 file changed, 1057 deletions(-)

commit 3a3ba90ea6d20e152f83ef74c2184d9feeb0fd32
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Dec 26 11:58:51 2012 +0100

    Updated Spanish translation

 po/es.po | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

commit 3c5a3f177c017e68503c8cff90552e5d1ab20a7c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 26 11:15:03 2012 +0100

    roster-window: add 'Add Contact...' button when relevant

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

 src/empathy-roster-window.c  | 16 +++++++++++++++-
 src/empathy-roster-window.ui | 26 ++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

commit e9426542a9268d052d622c6f1645707d392f55cb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 26 11:05:12 2012 +0100

    roster-window: add a 'Show offline button" when relevant

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

 src/empathy-roster-window.c  | 28 +++++++++++++++++++++++++++-
 src/empathy-roster-window.ui | 26 ++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)

commit 3f757018829e1b2d025c38efd3f98017f368cd86
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 26 11:04:11 2012 +0100

    roster-window: display a specific message if there is no offline
    contact either

    Displaying "No online contacts" while we are actually displaying
    all the
    contacts is miss leading.

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

 src/empathy-roster-window.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit 184b73e4e79b426a72eaf4d27b411014313c8e89
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 26 10:06:44 2012 +0100

    POTFILES.in: add empathy-roster-contact.c

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit 5f307734a736a3af6d0eda6c2ed71527097d8707
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 14 15:35:55 2012 +0200

    build with TP_DISABLE_SINGLE_INCLUDE

 configure.ac | 1 +
 1 file changed, 1 insertion(+)

commit a7fd459c93f6224069d954c5a99a37eefcea1df0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 26 09:59:49 2012 +0100

    bump telepathy-farstream and logger deps

    Those are the versions which started using
    TP_DISABLE_SINGLE_INCLUDE. We need
    them so can safely turn on this option in Empathy as well.

 configure.ac | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 968b7430566d7fd877bbc5bcbcb894261fbdab70
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 19 13:42:06 2012 +0200

    theme-adium: use EMPATHY_WEBKIT_MENU_INSPECT

    We are now always using our own context menu even when the inspect
    menu item is
    displayed.

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

 libempathy-gtk/empathy-theme-adium.c | 62
 +++++++-----------------------------
 1 file changed, 11 insertions(+), 51 deletions(-)

commit 9db3e4d18cc032bf1246caf80115af291d672bf5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 19 13:41:47 2012 +0200

    add EMPATHY_WEBKIT_MENU_INSPECT flag

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

 libempathy-gtk/empathy-webkit-utils.c | 20 ++++++++++++++++++++
 libempathy-gtk/empathy-webkit-utils.h |  1 +
 2 files changed, 21 insertions(+)

commit c4d4989d12cf0854167e8881e8077bece0c91161
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 19 13:21:39 2012 +0200

    factor out empathy_webkit_show_inspector()

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

 libempathy-gtk/empathy-theme-adium.c  |  7 +------
 libempathy-gtk/empathy-webkit-utils.c | 12 ++++++++++++
 libempathy-gtk/empathy-webkit-utils.h |  2 ++
 3 files changed, 15 insertions(+), 6 deletions(-)

commit 5c9fcab82a633d6a627b033ceb954547da7257d2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 19 12:29:01 2012 +0200

    theme-adium: use WebKitWebView::context-menu signal

    That's now the proper way to implement our custom context menu.

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

 libempathy-gtk/empathy-theme-adium.c | 49
 ++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 22 deletions(-)

commit da413d0d090eee58b7bf5da5d4418da283cca45e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 19 11:26:15 2012 +0200

    depend on WebKitGtk+ 1.9.1

    Needed for the WebKitWebView::context-menu signal.

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

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 48945587ec63dd727d355f615c54a835d0a51c82
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 19 12:20:13 2012 +0200

    export empathy_webkit_create_context_menu()

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

 libempathy-gtk/empathy-webkit-utils.c | 2 +-
 libempathy-gtk/empathy-webkit-utils.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

commit ea8cf1e945653b18a866aae586b88446b3899399
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 19 11:58:57 2012 +0200

    factor out empathy_webkit_create_context_menu()

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

 libempathy-gtk/empathy-webkit-utils.c | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

commit 8ad4b14d78dc19c513ca82d95390e8adf58b6b1a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 19 11:50:01 2012 +0200

    empathy-webkit-util: coding style fixes

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

 libempathy-gtk/empathy-webkit-utils.c | 22 +++++++++++-----------
 libempathy-gtk/empathy-webkit-utils.h | 10 +++++++---
 2 files changed, 18 insertions(+), 14 deletions(-)

commit 9c654275d44e7ad9a1ef8d49fc9d02bcb5a171fe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 29 13:55:08 2012 +0100

    roster-contact: prefix status msg in case of error

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

 libempathy-gtk/empathy-roster-contact.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

commit a12c04c8c13170113be43761c326cdb6c6942aad
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Mon Dec 24 19:54:16 2012 +0100

    Updated Galician translations

 po/gl.po | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

commit 4b7ce8565a3b6c9e4e32a3dfac8e496af1e0c279
Author: Dimitris Spingos <dmtrs32@gmail.com>
Date:	Sun Dec 23 19:11:39 2012 +0200

    Updated Greek translation

 po/el.po | 370
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 214 insertions(+), 156 deletions(-)

commit 65a04f59ca8d144bb5fb13a0284d4bea7e856bf8
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Fri Dec 21 16:39:13 2012 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 62
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 34 insertions(+), 28 deletions(-)

commit 6e5f4fd9babaa10cd797e40e35601d5225b9ca82
Author: Hendrik Knackstedt <hendrik.knackstedt@t-online.de>
Date:	Thu Dec 20 14:14:36 2012 +0100

    Updated German translation

 po/de.po | 312
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 183 insertions(+), 129 deletions(-)

commit 3b0c0b90e76e2e5ec08d065f7b3c00c4de6c1622
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	Wed Dec 19 15:41:50 2012 +0200

    [l10n] Updated Estonian translation

 po/et.po | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit 6f67ea8269d04baa83fd2fd047af82039702ed9f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 18 09:51:19 2012 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 65c220b6ceb8906e6f6afb536063fe412dbf28d0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 18 09:36:23 2012 +0100

    Prepare 3.7.3

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

commit 119d0ba59b9a89034462d6791d8d78afc8b0a981
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Sun Dec 16 04:27:51 2012 +0100

    Updated Polish translation

 po/pl.po | 343
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 198 insertions(+), 145 deletions(-)

commit a6f5c35e7b6b2e8a7d6a1f63f00b9adc01997889
Author: Dr.T.Vasudevan <drtvasudevan@gmail.com>
Date:	Sun Dec 9 12:45:23 2012 +0530

    Updated Tamil translation

 po/ta.po | 2231
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1229 insertions(+), 1002 deletions(-)

commit 4e24c14b1aaa4adb2e0f18bc683ac553ea9d0d03
Author: ManojKumar Giri <mgiri@redhat.com>
Date:	Mon Dec 3 16:39:32 2012 +0530

    Updated Odia Translation with FUEL implementation.

 po/or.po | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

commit e7d81430408f6c6972888ad10e70d4b87834b886
Author: ManojKumar Giri <mgiri@redhat.com>
Date:	Mon Dec 3 16:38:55 2012 +0530

    Updated Odia Translation with FUEL implementation.

 po/or.po | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

commit 7ca75d89682c041bd880707f8fac24829f9db52d
Author: Frédéric Péters <fpeters@0d.be>
Date:	Mon Dec 3 11:03:40 2012 +0100

    themes: improve readability of classic theme

 data/themes/Classic.AdiumMessageStyle/Contents/Resources/main.css |
 5 +++++
 1 file changed, 5 insertions(+)

commit 9a0cb09e79e145621fd2dd03eab979e7e4899550
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Sun Dec 2 19:31:26 2012 +0100

    Updated Spanish translation

 help/es/es.po | 140
 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 126 insertions(+), 14 deletions(-)

commit c43eea2af4d1412e18ad58cef1dd6904e90840e8
Author: Aruna <aruna.evam@gmail.com>
Date:	Wed Nov 28 14:09:48 2012 +0530

    Added an Overview help page to Empathy, bug 604975

    Created an overview page which briefs a new user on IM and adds a
    few pictures.

 help/C/figures/conf_overview.png  | Bin 0 -> 605142 bytes
 help/C/figures/croom_overview.png | Bin 0 -> 397448 bytes
 help/C/figures/video_overview.png | Bin 0 -> 221887 bytes
 help/C/overview.page		   |  59
 ++++++++++++++++++++++++++++++++++++++
 help/Makefile.am		   |   6 +++-
 5 files changed, 64 insertions(+), 1 deletion(-)

commit f1ab42c0c5332e47b33ecf905afd7fd6c2a344e8
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Fri Nov 30 19:29:13 2012 +0100

    Make parallel builds work

    There is no need to execute glib-ginterface-gen.py twice because it
    generates both the .c and .h files in one shot. Therefore, merely
    having one of them (say the .c) depend on the other (say the .h) is
    enough.

    Moreover, running it twice breaks parallel builds because one
    glib-ginterface-gen.py process steps on the other.

    Based on a suggestion from Ryan Lortie.

    Fixes: https://bugzilla.gnome.org/688132

 extensions/Makefile.am | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit 20119b254b286ee19320687bebd9483cbb5cdb29
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 29 11:57:41 2012 +0100

    set notifications-focus to true by default

    By default most users wants to know if they are highlighted in a
    chat room.

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

 data/org.gnome.Empathy.gschema.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a89694c6ae1a7b28552c0db8d6a240970b6d1e28
Author: Ryan Lortie <desrt@desrt.ca>
Date:	Wed Nov 28 08:18:58 2012 -0500

    More geocode-glib porting work

    Fix a couple of small details missed by the last commit so that things
    compile again.

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

commit 173e4151ca7b04e6d4a04714efc296dae854d1e8
Author: Krishnababu Krothapalli <kkrothap@redhat.com>
Date:	Wed Nov 28 15:15:15 2012 +0530

    Updated Telugu Translations

 po/te.po | 226
 +++++++++++++++++++++++++--------------------------------------
 1 file changed, 88 insertions(+), 138 deletions(-)

commit 0e83aaed266c7b438c9b8d80213f7660f78c755f
Author: Bastien Nocera <hadess@hadess.net>
Date:	Sun Nov 25 22:30:50 2012 +0100

    Port EmpathyContact to geocode-glib >= 0.99.1

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

 configure.ac		      |  3 ++-
 libempathy/empathy-contact.c | 25 ++++++++++++++-----------
 2 files changed, 16 insertions(+), 12 deletions(-)

commit 4d7aaa9588b85033e7b4fe88fc3939ed0713daa5
Author: Ani Peter <apeter@redhat.com>
Date:	Tue Nov 27 15:36:44 2012 +0530

    Updated Malayalam translations

 po/ml.po | 153
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 77 insertions(+), 76 deletions(-)

commit 6afec09cc7b2abfd5fd196a3e0e24292d4216b4e
Author: Ani Peter <apeter@redhat.com>
Date:	Tue Nov 27 15:36:12 2012 +0530

    Updated Malayalam translations

 po/ml.po | 153
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 77 insertions(+), 76 deletions(-)

commit 771598c130be39e4a6884d5d4fe057f10d02e60b
Author: Ani Peter <apeter@redhat.com>
Date:	Tue Nov 27 15:31:26 2012 +0530

    Updated Malayalam translations

 po/ml.po | 576
 ++++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 381 insertions(+), 195 deletions(-)

commit f0b8d317d854c4166fdfeb1984ab861e3be460f7
Author: Ani Peter <apeter@redhat.com>
Date:	Tue Nov 27 15:31:01 2012 +0530

    Updated Malayalam translations

 po/ml.po | 576
 ++++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 381 insertions(+), 195 deletions(-)

commit 45eadc1eaadfa86b9771f3c26dfaee0d7a05e56c
Author: Gabriele Giacone <1o5g4r8o@gmail.com>
Date:	Sat Nov 24 19:01:00 2012 +0000

    add some protocolname-displayname

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

 libempathy/empathy-utils.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit bb46360d0da2582688f99a44bff3a51a9a0ec2a6
Author: Rajesh Ranjan <rranjan@redhat.com>
Date:	Fri Nov 23 13:41:24 2012 +0530

    hindi translation update

 po/hi.po | 174
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 90 insertions(+), 84 deletions(-)

commit 7a259033f3ebac7fd489f73c3cfa2e5037d1e385
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Thu Nov 22 18:01:32 2012 +0100

    Updated Galician translations

 po/gl.po | 325
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 184 insertions(+), 141 deletions(-)

commit 7eba962eb41bee4298778a3c2eb64d6c1710a5b5
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Thu Nov 22 18:03:21 2012 +0400

    Fixed Russian translation

 po/ru.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit fe210b2bb45bf0cf6a30164bf98084103fce2b8f
Author: Nilamdyuti Goswami <ngoswami@redhat.com>
Date:	Thu Nov 22 17:26:35 2012 +0530

    Assamese translation updated

 po/as.po | 574
 ++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 350 insertions(+), 224 deletions(-)

commit e33aa12238dde5ca6ce0f17d53c5d33be3bafd82
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 22 10:06:09 2012 +0100

    release.py: update last_tag_pattern

 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7bf5c4cc27591b4c0f2cce4046a34cae9e9ee2c2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 22 10:05:57 2012 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8433c1d25c38161501f160a67516191a120a31e4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 22 09:58:27 2012 +0100

    prepare 3.7.2

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

commit 22c51f171e1644e0a9f64a0d3c4ee027aa9a1eb6
Merge: 356ab07 8272468
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 22 09:37:57 2012 +0100

    Merge branch 'gnome-3-6'

    Conflicts:
	configure.ac
	po/da.po
	po/et.po
	po/kn.po
	po/mr.po
	po/nb.po
	po/sk.po

commit 356ab07267fb30aae5a71cd4c17d10044d86ecf4
Author: Shankar Prasad <svenkate@redhat.com>
Date:	Wed Nov 21 16:03:10 2012 +0530

    Updated kn translation

 po/kn.po | 362
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 211 insertions(+), 151 deletions(-)

commit 68748b079908614ae9c1976b7fc2fa350df55772
Author: Shankar Prasad <svenkate@redhat.com>
Date:	Wed Nov 21 16:02:03 2012 +0530

    Updated kn translation

 po/kn.po | 292
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 174 insertions(+), 118 deletions(-)

commit f7bf5c03d5ceadf66abccb68b13028c2654467a6
Author: Pavol Klačanský <pavol@klacansky.com>
Date:	Tue Nov 20 21:08:43 2012 +0100

    Updated slovak translation

 po/sk.po | 6125
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 3197 insertions(+), 2928 deletions(-)

commit ab2f7ac3b11e9f31df1feb1f0fb4bc8b4e8c82e0
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Tue Nov 20 15:49:34 2012 +0100

    Updated Spanish translation

 po/es.po | 129
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 73 insertions(+), 56 deletions(-)

commit 8c67184e7a4f3bacb468fce199bc0016c93a05e2
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Tue Nov 20 11:18:36 2012 +0400

    Fixed some errors in Russian translation

 po/ru.po | 644
 ++++++++++++++++++++++-----------------------------------------
 1 file changed, 219 insertions(+), 425 deletions(-)

commit 5fb2a85dfee37616878bc2f8ac49edf5f5532643
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:	Thu Nov 15 17:24:43 2012 +0530

    updated Tamil translation

 po/ta.po | 354
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 202 insertions(+), 152 deletions(-)

commit 8272468f01ba232565a518bdd7c8893eca751495
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 13 17:06:00 2012 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9ba4ab702ebf55397a99c8cbfe19f1ab60376b95
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 13 16:59:42 2012 +0100

    prepare 3.6.2

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

commit be985e63f4e15768633eedfff8cbb732c1a1868d
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Mon Nov 5 22:40:50 2012 +0100

    auth-client: Support X-TELEPATHY-PASSWORD for GOA accounts

    If a provider supports more than one authentication mechanism (eg.,
    Google), we prefer OAuth2.

    Fixes: https://bugzilla.gnome.org/687690

 libempathy/empathy-goa-auth-handler.c | 67
 +++++++++++++++++++++++++++++------
 1 file changed, 57 insertions(+), 10 deletions(-)

commit 46aaeb66354585be83d35693750072b7c6fd5494
Author: Giovanni Campagna <gcampagna@src.gnome.org>
Date:	Sun Oct 28 13:25:07 2012 +0100

    Implement Google OAUTH2 authentication for GOA accounts

    GOA recently switched to OAuth2 for Google accounts, so we
    can use its credentials to access Google Talk without a password.

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

 libempathy/empathy-goa-auth-handler.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 4b23c92bc0f7f30e5dc1f4b34ea1eeb759953f63
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Thu Nov 8 23:28:48 2012 +0100

    camera-menu: Show the menu only if there is more than one camera

    Fixes: https://bugzilla.gnome.org/687449

 src/empathy-camera-menu.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 118515887ac5f1017cddd1ce41cf2c964b3665f0
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Thu Nov 8 14:51:04 2012 +0100

    empathy-call: Handle yanking out of current video input

    If the current video input is yanked out, we continue the call with
    only audio and desensitize the camera menu. Once the call is over we
    sensitize it again and continue.

    Fixes: https://bugzilla.gnome.org/687928

 src/empathy-call-window.c |  8 ++++++++
 src/empathy-camera-menu.c | 24 ++++++++++++++++++++----
 src/empathy-camera-menu.h |  3 +++
 3 files changed, 31 insertions(+), 4 deletions(-)

commit d84aede9b551389a5fa39bdba55779a6c6f66f6e
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Mon Nov 5 22:40:50 2012 +0100

    auth-client: Support X-TELEPATHY-PASSWORD for GOA accounts

    If a provider supports more than one authentication mechanism (eg.,
    Google), we prefer OAuth2.

    Fixes: https://bugzilla.gnome.org/687690

 libempathy/empathy-goa-auth-handler.c | 67
 +++++++++++++++++++++++++++++------
 1 file changed, 57 insertions(+), 10 deletions(-)

commit fdb8845d0b1bb476cc82bc1efc2214015e3a3730
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Thu Nov 8 23:28:48 2012 +0100

    camera-menu: Show the menu only if there is more than one camera

    Fixes: https://bugzilla.gnome.org/687449

 src/empathy-camera-menu.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 34b5179278427a9654d1743d91091a5a2d6400aa
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Thu Nov 8 14:51:04 2012 +0100

    empathy-call: Handle yanking out of current video input

    If the current video input is yanked out, we continue the call with
    only audio and desensitize the camera menu. Once the call is over we
    sensitize it again and continue.

    Fixes: https://bugzilla.gnome.org/687928

 src/empathy-call-window.c |  8 ++++++++
 src/empathy-camera-menu.c | 24 ++++++++++++++++++++----
 src/empathy-camera-menu.h |  3 +++
 3 files changed, 31 insertions(+), 4 deletions(-)

commit 26d065a98a9dab0c204f3d375f5d232585523fd2
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Nov 9 12:04:46 2012 +0200

    Updated Hebrew translation.

 po/he.po | 886
 ++++++++++++++++++++++++++-------------------------------------
 1 file changed, 360 insertions(+), 526 deletions(-)

commit 9c420d4b9866fd640aba77eebdd97c123d7ab727
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Thu Nov 8 21:36:23 2012 +0100

    Updated Slovenian translation

 po/sl.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 547efabcc71b16044e7776d41262c0f66aaf6eb1
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Tue Nov 6 15:31:06 2012 +0100

    auth-client: Don't unref properties before creating the certificate

    Fixes: https://bugzilla.gnome.org/687762

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

commit 52f97bc929ee335b5cfe0640ba800fcc828ced8b
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Tue Nov 6 15:31:06 2012 +0100

    auth-client: Don't unref properties before creating the certificate

    Fixes: https://bugzilla.gnome.org/687762

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

commit 70df59ba28465361b2b514922c32781cf45f6342
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Mon Nov 5 17:44:49 2012 +0100

    Fix a string

 src/empathy-debug-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9d6472283b8b21ae7787130359f364846f58d021
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Mon Nov 5 20:36:36 2012 +0100

    Updated Slovenian translation

 po/sl.po | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 538827f5bed75c5d8a2411f0f9d0c8184cd48eb5
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Mon Nov 5 17:41:23 2012 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 804
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 432 insertions(+), 372 deletions(-)

commit 6a8989306491951d36aeaf82d38923ebf24dbe00
Author: Rafael Ferreira <rafael.f.f1@gmail.com>
Date:	Mon Nov 5 11:02:34 2012 -0200

    Updated Brazilian Portuguese Translation

 po/pt_BR.po | 174
 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 90 insertions(+), 84 deletions(-)

commit 689b1f77659a0c61aa55570833b0e3960c3d9ed8
Author: Matthias Clasen <mclasen@redhat.com>
Date:	Fri Oct 26 22:27:40 2012 -0400

    Add keywords to the desktop file

    This makes gnome-shell search more pleasant and useful.
    https://bugzilla.gnome.org/show_bug.cgi?id=686969

 data/empathy.desktop.in.in | 1 +
 1 file changed, 1 insertion(+)

commit f22d9f56d72aa16e3c6a64b6d6065a0fc8123688
Author: A S Alam <aalam@users.sf.net>
Date:	Sun Nov 4 09:52:44 2012 +0530

    update Punjabi Translation for package

 po/pa.po | 175
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 88 insertions(+), 87 deletions(-)

commit 701f0b070b2f69333a31d7695f51f35a0a64e08f
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Fri Nov 2 22:23:35 2012 +0100

    Updated Slovenian translation

 po/sl.po | 118
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 61 insertions(+), 57 deletions(-)

commit 0bd9b3a86a71b21a9acd215c59e0e8e9108704d5
Author: Giovanni Campagna <gcampagna@src.gnome.org>
Date:	Sun Oct 28 13:25:07 2012 +0100

    Implement Google OAUTH2 authentication for GOA accounts

    GOA recently switched to OAuth2 for Google accounts, so we
    can use its credentials to access Google Talk without a password.

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

 libempathy/empathy-goa-auth-handler.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 24296efe62fd601dbff4ad92726d2fa6ded17e8c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 28 10:42:44 2012 +0200

    empathy-call: inhibit when we are in a call

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

 src/empathy-call.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

commit b42c4d7fe379f92ee007381422d2e66f5de88a91
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 28 10:33:04 2012 +0200

    call-window: add 'inhibit' signal

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

 src/empathy-call-window.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit 2b6e3c804d6cc4ed79160b2dc631bbb5ba08a0e2
Author: Michael Wood <michael.g.wood@intel.com>
Date:	Thu Nov 1 11:46:12 2012 +0000

    accounts-dialog: subdialog window should not resizeable

    This means that when the expanded for advanced option is opened/closed
    the
    dialog maintains the correct size.

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

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

commit c96b3f7e3b037f15e90386ef29299c9c48975bfa
Author: Michael Wood <michael.g.wood@intel.com>
Date:	Thu Nov 1 17:16:25 2012 +0000

    irc-network-dialog: Don't allow window resizing

    Resizing causes blank space issues with the dialog.

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

 libempathy-gtk/empathy-irc-network-dialog.c | 2 ++
 1 file changed, 2 insertions(+)

commit 1ab4ef4318e16e1f94c8e6e66b167aa7bd3c69e7
Author: Michael Wood <michael.g.wood@intel.com>
Date:	Thu Nov 1 17:14:33 2012 +0000

    irc-network-dialog: Make sure the port GtkSpinButton gets enough space

    Column expanding was causing the port cell to be eclipsed by the port
    spin +/- buttons.

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

 libempathy-gtk/empathy-irc-network-dialog.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 7bbe80602c0bb7d3c4562f89af287e42d8478b65
Author: Michael Wood <michael.g.wood@intel.com>
Date:	Thu Nov 1 17:13:12 2012 +0000

    irc-network-chooser-dialog: Attach dialog to parent window

    This avoid losing the window and the window order.

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

 libempathy-gtk/empathy-irc-network-chooser-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 92f31503bd1c61b4ac831329254fe64f8e5f1c5d
Author: Shankar Prasad <svenkate@redhat.com>
Date:	Thu Nov 1 14:57:47 2012 +0530

    Updated kn translation

 po/kn.po | 172
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 88 insertions(+), 84 deletions(-)

commit e701e1e8f6881ec4b162f18257322aea3023efac
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Oct 29 14:36:04 2012 +0100

    Fix build with gst 0.10

    In gstreamer 0.10 gst_debug_bin_to_dot_file() does not exists, it is
    called _gst_debug_bin_to_dot_file(). However in both 0.10 and 1.0
    there is GST_DEBUG_BIN_TO_DOT_FILE() macro that is no-op if gst is
    not build with --gst-enable-gst-debug.

 src/empathy-call-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5be490424430b0ab1425ac25f344a95b4b2d08c8
Author: Seán de Búrca <leftmostcat@gmail.com>
Date:	Sun Oct 28 14:29:03 2012 -0600

    Updated Irish translation.

 po/ga.po | 4437
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 2139 insertions(+), 2298 deletions(-)

commit 09072894ae72442ba05484fbfcdc172ae7fc74de
Author: Seán de Búrca <leftmostcat@gmail.com>
Date:	Sun Oct 28 14:29:03 2012 -0600

    Updated Irish translation.

 po/ga.po | 4437
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 2139 insertions(+), 2298 deletions(-)

commit 75c64d6d98fe79751ca3c28aa3a883110eb920c4
Author: Andika Triwidada <andika@gmail.com>
Date:	Sat Oct 27 15:26:20 2012 +0700

    Updated Indonesian translation

 po/id.po | 309
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 177 insertions(+), 132 deletions(-)

commit bc80426c2dfbd313cdd7aec4468f3cbea1575ad2
Author: Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>
Date:	Fri Oct 26 08:30:40 2012 +0200

    [l10n] Updated German translation

 po/de.po | 283
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 150 insertions(+), 133 deletions(-)

commit 9eafd8e94965a236b96e34d13c1d9e29dea3f71a
Author: Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>
Date:	Fri Oct 26 08:30:40 2012 +0200

    [l10n] Updated German translation

 po/de.po | 283
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 150 insertions(+), 133 deletions(-)

commit ecfd903ea124cb35dbf9226131bceee5e77e9cde
Author: Sweta Kothari <swkothar@redhat.com>
Date:	Thu Oct 25 12:14:07 2012 +0530

    Updated gujarati file

 po/gu.po | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

commit d64da892104a84e79b68a9adbb7ba5691752c3e2
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	Mon Oct 22 22:33:04 2012 +0300

    [l10n] Updated Estonian translation

 po/et.po | 49 +++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 45 insertions(+), 4 deletions(-)

commit 30137a2a24dd1baee0662234db493f30cbb1f02f
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	Mon Oct 22 22:03:54 2012 +0300

    [l10n] Updated Estonian translation

 po/et.po | 46 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 2 deletions(-)

commit 900792d819a0c85984ea4e36eb1ea7fc626492bc
Author: ManojKumar Giri <mgiri@redhat.com>
Date:	Mon Oct 22 18:41:04 2012 +0530

    Updated Odia Translation.

 po/or.po | 908
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 434 insertions(+), 474 deletions(-)

commit ae68582193e0d4f49153fd426d5a9eb33d8e0d39
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Thu Oct 18 10:55:48 2012 +0200

    empathy-call: Free the FsElementAddedNotifiers on
    fs-conference-removed

    Fixes: https://bugzilla.gnome.org/686314

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

commit 9a7ebcfed29a8bdb46c5d9a2032b14cc67e7ffdf
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Thu Oct 18 10:42:36 2012 +0200

    empathy-call: Clean up the TfChannel before resetting the pipeline

    Fixes: https://bugzilla.gnome.org/686311

 src/empathy-call-handler.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

commit 82ea0b627e52ea10dbd4645fe4d5b1978e5e7dde
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Thu Oct 18 10:55:48 2012 +0200

    empathy-call: Free the FsElementAddedNotifiers on
    fs-conference-removed

    Fixes: https://bugzilla.gnome.org/686314

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

commit 5085eb78ac957826779a699b19761eeb484002c9
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Thu Oct 18 10:42:36 2012 +0200

    empathy-call: Clean up the TfChannel before resetting the pipeline

    Fixes: https://bugzilla.gnome.org/686311

 src/empathy-call-handler.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

commit cfc22fd4c69dd22590f592cd5486e5b517b39e9d
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Thu Oct 18 08:13:29 2012 +0200

    Updated Slovenian translation

 po/sl.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 322d449c1a0f204535cb05551de625430f43bce5
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Oct 17 18:26:15 2012 +0200

    Updated Spanish translation

 po/es.po | 327
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 185 insertions(+), 142 deletions(-)

commit faa25d791a038e534f2cace133444c93460c8aad
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 17 14:18:06 2012 +0200

    debug-window: fix typo

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

 src/empathy-debug-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ced43d0b8450eceda0ac1fbc84ac176c075d87f3
Author: Arash Mousavi <mousavi.arash@gmail.com>
Date:	Wed Oct 17 11:22:03 2012 +0330

    L10N: Updated Persian translation

 po/fa.po | 768
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 362 insertions(+), 406 deletions(-)

commit c76c58bfb2f77a14b417cedcedb7f59028db4304
Author: Arash Mousavi <mousavi.arash@gmail.com>
Date:	Wed Oct 17 11:20:43 2012 +0330

    L10N: Updated Persian translation

 po/fa.po | 768
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 362 insertions(+), 406 deletions(-)

commit 1c3d9901298128fe33f1d5db92920ee11f61ce65
Author: Andreas N <gedemiti at gmail dot com>
Date:	Tue Oct 16 20:51:37 2012 +0200

    Updated Norwegian Nynorsk translation (sync with Ubuntu)

 po/nn.po | 4590
 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 3046 insertions(+), 1544 deletions(-)

commit 2d43e6cace5adfb0d50ec2943856c7a6b7a6cee2
Author: Andreas N <gedemiti at gmail dot com>
Date:	Tue Oct 16 20:51:37 2012 +0200

    Updated Norwegian Nynorsk translation (sync with Ubuntu)

 po/nn.po | 4590
 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 3046 insertions(+), 1544 deletions(-)

commit 932e98f9698022cbcb8508377a69e779f0b60c9f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 15 17:37:05 2012 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2733d55a3098365e2f8d614fbfe46971d7555f77
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 15 17:21:17 2012 +0200

    prepare 3.6.1

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

commit 73f27edf1d4a87e58df9bcb8436f87fa60fb84e0
Author: Ask H. Larsen <asklarsen@gmail.com>
Date:	Mon Oct 15 06:31:43 2012 +0200

    Updated Danish translation

 po/da.po | 715
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 361 insertions(+), 354 deletions(-)

commit 89c5598641cf0c5b30e1e92662aedd423ffab2c3
Author: Ask H. Larsen <asklarsen@gmail.com>
Date:	Mon Oct 15 06:31:27 2012 +0200

    Updated Danish translation

 po/da.po | 795
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 419 insertions(+), 376 deletions(-)

commit 25018baa142e099e103f53ba02e2e11fb0cffcca
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Sun Oct 14 15:48:40 2012 +0200

    Updated Slovenian translation

 po/sl.po | 168
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 88 insertions(+), 80 deletions(-)

commit b6a119c9cbc83301b4ff3d75ecddad586a5c02a4
Author: Pavol Klačanský <pavol@klacansky.com>
Date:	Sat Oct 13 23:46:08 2012 +0200

    Updated slovak translation

 po/sk.po | 5196
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 2327 insertions(+), 2869 deletions(-)

commit 7b4a2a4aac78429e79b75a632bc0fcb996fc153d
Author: Pavol Klačanský <pavol@klacansky.com>
Date:	Sat Oct 13 23:45:16 2012 +0200

    Get back old file

 po/sk.po | 6028
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 3285 insertions(+), 2743 deletions(-)

commit 2686f708d67dad4e4754326203d29cfb7e81b130
Author: Pavol Klačanský <pavol@klacansky.com>
Date:	Sat Oct 13 23:40:22 2012 +0200

    Updated slovak translation

 po/sk.po | 5196
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 2327 insertions(+), 2869 deletions(-)

commit ce5eb1915abd2c63aae7f5a9ec4fe48ee8bb1cd0
Author: Changwoo Ryu <cwryu@debian.org>
Date:	Sat Oct 13 18:35:05 2012 +0900

    Updated Korean translation

 po/ko.po | 163
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 86 insertions(+), 77 deletions(-)

commit 23f7c86de10b2a1b103d93250e58f2e599194c7f
Author: Changwoo Ryu <cwryu@debian.org>
Date:	Sat Oct 13 18:35:05 2012 +0900

    Updated Korean translation

 po/ko.po | 163
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 86 insertions(+), 77 deletions(-)

commit 1efbbb23de703ce6fb3a510b0f6beae1bd70be2c
Author: Sandeep Sheshrao Shedmake <sshedmak@redhat.com>
Date:	Sat Oct 13 05:33:13 2012 +0530

    Updated Marathi Translations

 po/mr.po | 170
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 88 insertions(+), 82 deletions(-)

commit 0248cb93fc135aa23b8fdffb93acb6d9d7f0d301
Author: Sandeep Sheshrao Shedmake <sshedmak@redhat.com>
Date:	Sat Oct 13 05:18:40 2012 +0530

    Updated Marathi Translations

 po/mr.po | 170
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 88 insertions(+), 82 deletions(-)

commit 3a903f645b58ccbf79899924ddb5a88d54bfd0e6
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date:	Fri Oct 12 18:59:43 2012 +0100

    Updated British English translation

 po/en_GB.po | 171
 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 88 insertions(+), 83 deletions(-)

commit d18bfcec90486c2bc87ef4d99b94a70416e1659a
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date:	Fri Oct 12 18:59:43 2012 +0100

    Updated British English translation

 po/en_GB.po | 171
 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 88 insertions(+), 83 deletions(-)

commit a29c066e150768ad65fcf63ce5445e7240b41067
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Wed Oct 10 15:54:15 2012 +0200

    empathy-call: Add a debug option to dump the GStreamer pipeline

    Fixes: https://bugzilla.gnome.org/685888

 src/empathy-call-window.c  | 63
 ++++++++++++++++++++++++++++++++++++++++++++--
 src/empathy-call-window.ui | 17 ++++++++++++-
 src/empathy-call.c	    |  2 ++
 3 files changed, 79 insertions(+), 3 deletions(-)

commit 7a637b813b21eb62c2213a0afbaf468d4ba13e4e
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Fri Oct 12 00:25:05 2012 +0200

    Updated Norwegian bokmål translation.

 po/nb.po | 715
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 362 insertions(+), 353 deletions(-)

commit 956b705f5a34bbdc58aa65891ccf671722c70163
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 9 12:44:35 2012 +0200

    turn EmpathyChatWindow to a GtkWindow subclass

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

 src/empathy-chat-window.c  | 76
 ++++++++++++++++++++++++----------------------
 src/empathy-chat-window.h  |  4 +--
 src/empathy-chat-window.ui | 28 ++++++-----------
 3 files changed, 52 insertions(+), 56 deletions(-)

commit 027c0ef1eb6f03343e39cbd3132fcdce84d0800a
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Wed Oct 10 09:30:53 2012 +0200

    Updated Slovenian translation

 po/sl.po | 176
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 100 insertions(+), 76 deletions(-)

commit c98ab50d33e38d9c131e126e6d7f857388faf47b
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Fri Sep 7 13:55:59 2012 +0200

    EmpathyRosterWindow: Add UOA specific error infobar

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

 src/empathy-roster-window.c | 59
 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

commit 8df9026631e8cf6b65782d2dca718ea69c9ea87b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 29 10:50:39 2012 +0200

    debug-window: add infobar telling user about privacy

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

 src/empathy-debug-window.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

commit dfa8373a400011c04ceb8a2e0f7ab3cdf6717885
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 9 16:12:09 2012 +0200

    start dev of 3.7.x

 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 45b05c6bf482df4dc4a2868c49baeedcf5fa2242
Author: Theppitak Karoonboonyanan <thep@linux.thai.net>
Date:	Tue Oct 9 19:55:32 2012 +0700

    Updated Thai translation

 po/th.po | 64
 +++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 35 insertions(+), 29 deletions(-)

commit f1c461eb4d5423fccc176fd433046aadb218ab2b
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Mon Oct 8 22:52:50 2012 +0200

    Use better wording in Hungarian translation

 po/hu.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit be230652506643734f9c43bda8aaf2205f91b84d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 8 14:43:42 2012 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f2698cada180c65344c2be223823ed1d340bbcf8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 8 14:35:46 2012 +0200

    prepare 3.6.0.3

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

commit e3e1b92843738ae7ac82ef19da214cc6a7083ace
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Oct 8 14:28:22 2012 +0200

    UOA mc plugin: Fix build errors

 ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c | 10
 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 3dd0c5d687be8936829fa704f0909601ae1b033d
Author: Sweta Kothari <swkothar@redhat.com>
Date:	Mon Oct 8 16:16:31 2012 +0530

    Updated gujarati file

 po/gu.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 38d3100901bf601d4a015fad40fbc72bace7dc43
Author: Sweta Kothari <swkothar@redhat.com>
Date:	Mon Oct 8 16:13:36 2012 +0530

    Updated gujarati file

 po/gu.po | 240
 +++++++++++++++++++++++----------------------------------------
 1 file changed, 86 insertions(+), 154 deletions(-)

commit cb5dc5dd166abb39fce526cea5b97b6d218b1fc7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 8 11:45:07 2012 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d67bba0abef5b9292ebe98172e585bfee6d31ce6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 8 11:38:39 2012 +0200

    prepare 3.6.0.2

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

commit 1f9d768687c91fb89be8ed73a2300038cfb38ede
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Sun Oct 7 19:31:10 2012 +0200

    Fix planet gnome theme when using a non-default font

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

 .../Contents/Resources/Incoming/Content.html	      | 18
 ++++++++++--------
 .../Contents/Resources/main.css		      | 20
 +++++++++++++-------
 2 files changed, 23 insertions(+), 15 deletions(-)

commit 7cd89efd0e2a7257298d8305d397469a53e63461
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Sun Oct 7 15:46:17 2012 +0200

    Don't set the DefaultFont{Size,Family} in the themes

    For Adium themes Empathy prefers using the default font settings in a
    theme above the system font settings. So lets not set default
    fonts for
    the builtin themes, so these will follow the system instead.

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

 data/themes/Boxes.AdiumMessageStyle/Contents/Info.plist       | 6 ------
 data/themes/Classic.AdiumMessageStyle/Contents/Info.plist     | 6 ------
 data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Info.plist | 6 ------
 3 files changed, 18 deletions(-)

commit 63c548da561529db7d69251ff8ba089d0b73938a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 5 13:28:04 2012 +0200

    deal if ag_manager_new_for_service_type() returns NULL

    Looks like it may happen because of Ubuntu's apparmor policy. We
    can't do much
    in this case but best to not crash MC at least.

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

 .../mc-plugin/mcp-account-manager-uoa.c	       | 19
 +++++++++++++++++++
 1 file changed, 19 insertions(+)

commit 537ac5a986ea5b3959ae42f5b87145451a81b9b3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 5 15:09:29 2012 +0200

    roster-window: fix event_activated_cb callback signature

    We receive the EmpathyEvent as the second signal argument, no as
    user_data
    pointer (which is 'self').

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

 src/empathy-roster-window.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 9ad6ad6ddfed99c88567a29407cd481ac4cce9f4
Author: Pavel Vasin <rat4vier@gmail.com>
Date:	Sun Oct 7 14:00:52 2012 +0400

    empathy-spell: fix string leak

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

 libempathy-gtk/empathy-spell.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f36171ef13831fbf2e7df7087e5899e05a37f2b2
Author: Pavel Vasin <rat4vier@gmail.com>
Date:	Sun Oct 7 13:56:42 2012 +0400

    theme-manager: fix GList leak

    g_hash_table_get_values() returns newly allocated list and it was lost

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

 libempathy-gtk/empathy-theme-manager.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 3ca6b8a0f122833556e500c0dd0cfb3227180fa1
Author: Pavel Vasin <rat4vier@gmail.com>
Date:	Sun Oct 7 13:47:08 2012 +0400

    empathy_theme_manager_dup_theme_name_from_path(): fix mem leaks

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

 libempathy-gtk/empathy-theme-manager.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit b46b9e3ec8dd67359b1e1b2b20678f6c322d41b3
Author: Pavel Vasin <rat4vier@gmail.com>
Date:	Sun Oct 7 13:36:23 2012 +0400

    contact-search-dialog: fix GtkSizeGroup leak

    GtkSizeGroup objects are referenced by each widget in the size group,
    so once you have added all widgets to a GtkSizeGroup, you can drop the
    initial reference to the size group with g_object_unref().

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

 libempathy-gtk/empathy-contact-search-dialog.c | 1 +
 1 file changed, 1 insertion(+)

commit 59ea9e4abe4525b86615f404d4f493e9e4752a35
Author: Pavel Vasin <rat4vier@gmail.com>
Date:	Sun Oct 7 13:34:51 2012 +0400

    individual-menu: fix another GeeIterator leak

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

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

commit f5486dce8dbb842ad9edfcd89db6573f9f308ab8
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Sun Oct 7 11:21:00 2012 +0200

    [nst] Link against libempathy

    As the nautilus-sendto-plugin uses functions from libempathy it should
    link directly against it otherwise the build fails when using
    -Wl,--as-needed:

    .libs/empathy-nautilus-sendto.o: In function
    `dup_contact_from_individual':
    /tmp/buildd/empathy-3.6.0.1/nautilus-sendto-plugin/empathy-nautilus-sendto.c:73:
    undefined reference to `empathy_contact_dup_best_for_action'
    /tmp/buildd/empathy-3.6.0.1/nautilus-sendto-plugin/empathy-nautilus-sendto.c:78:
    undefined reference to `empathy_contact_can_do_action'

 nautilus-sendto-plugin/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d847e6b17a357fed2a9ed7f2008a99ea522c73d7
Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
Date:	Sun Oct 7 11:30:55 2012 +0300

    Updated Latvian translation

 po/lv.po | 145
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 76 insertions(+), 69 deletions(-)

commit cf7f96c7fb819c510ea6b7570077ecf7c60c59e4
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Oct 5 10:59:57 2012 +0200

    Updated Hebrew tranlation.

 po/he.po | 602
 ++++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 404 insertions(+), 198 deletions(-)

commit 74c12fef91f67d8f68943e3b985b02c5f168818b
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Fri Oct 5 05:13:55 2012 +0200

    Minor fixes

 po/ar.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 0d9f46c89deb311548d8b5879f005db662ee3a2a
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Thu Oct 4 15:40:37 2012 +0200

    Typos

 po/ar.po | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit f112ae55a694b4130f985ec92f4edad990a80042
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Thu Oct 4 15:29:10 2012 +0200

    Updated Arabic translation

 po/ar.po | 165
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 81 insertions(+), 84 deletions(-)

commit 8f3848c56c2592ee9aedce4766a2a032add9ebfe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 4 15:05:54 2012 +0200

    remove empathy-av old service and client files

    They are not used since a while.

 data/.gitignore				     |	1 -
 data/Empathy.AudioVideo.client			     | 21
 ---------------------
 ...p.Telepathy.Client.Empathy.AudioVideo.service.in |	3 ---
 3 files changed, 25 deletions(-)

commit 29970745de26fa75c90672df74fb574300524dea
Author: Alexandre Franke <alexandre.franke@gmail.com>
Date:	Thu Oct 4 12:46:20 2012 +0200

    Update French translation

 po/fr.po | 53 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 22 deletions(-)

commit ae155f9e69e9db87bbd78f4d149223b15667ad3a
Author: Khoem Sokhem <khoemsokhem@khmeros.info>
Date:	Wed Oct 3 17:45:07 2012 +0200

    [l10n] Added Khmer translation

 po/LINGUAS |	 1 +
 po/km.po   | 4723
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 4724 insertions(+)

commit 6d81ab8897e71e4476a45864c20ec7584732d3d2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 3 16:38:49 2012 +0200

    print a warning if pulsesrc is missing

 src/empathy-audio-src.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit b8c1f913ff156003f147c1a68ca28b8145f01e99
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date:	Wed Oct 3 18:40:55 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 702
 ++++++++++++++++++++++++++++++------------------------------
 po/zh_TW.po | 702
 ++++++++++++++++++++++++++++++------------------------------
 2 files changed, 710 insertions(+), 694 deletions(-)

commit 68f3bd3c25d18226d69a36320e098630bd5607fe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 3 12:21:17 2012 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b7da83a8160b59aa6375449c42f21d4ed9987d85
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 3 12:12:58 2012 +0200

    prepare 3.6.0.1

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

commit 5206421264c993ab34599c63b3744e4a7f9e075a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 28 08:38:14 2012 +0200

    chat-manager: cache the individual mgr

    We want to keep it alive during the whole lifetime of empathy-chat.

 src/empathy-chat-manager.c | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

commit 257011e356f9f293e5df5032159b9e79cf70d9d6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 28 08:37:26 2012 +0200

    chat-window: expose the individual mgr as a property

 src/empathy-chat-window.c | 39 +++++++++++++++++++++++++++++++++++++++
 src/empathy-chat-window.h |  3 +++
 2 files changed, 42 insertions(+)

commit 22eab320c9669b7c6307bf202ca661e12ff8de57
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 27 12:39:44 2012 +0200

    chat-window: update the contact menu when folks is loaded

 src/empathy-chat-window.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit 11e0514f64c70770393f22b410c9e23153c132b3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 27 12:31:06 2012 +0200

    chat-window: load the individual mgr when the chat window is
    focused out

    Dirty hack to cope with Folks being slow as hell and blocking the
    main loop
    while preparing.

 src/empathy-chat-window.c | 46
 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 11 deletions(-)

commit 197e45140f3d79cca9bb3290b094a7055de24f74
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 27 12:22:04 2012 +0200

    move the individual mgr reference to empathy-chat-window

    The chat window is the one actually using the manager so it makes
    sense to
    move it there. It's a singleton so the same instance will be shared
    between
    windows anyway.

 src/empathy-chat-window.c | 20 +++++++++++++++-----
 src/empathy-chat.c	   | 14 --------------
 2 files changed, 15 insertions(+), 19 deletions(-)

commit d96f93b08a28fb0e19d035255c709bc09cdc5c7d
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:	Wed Oct 3 00:50:34 2012 +0200

    [l10n] Updated Catalan (Valencian) translation

 po/ca@valencia.po | 136
 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 71 insertions(+), 65 deletions(-)

commit 74006567183f3781fbf68715558f4fd7c3e95534
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Tue Oct 2 23:40:34 2012 +0200

    Updated Hungarian translation

 po/hu.po | 135
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 72 insertions(+), 63 deletions(-)

commit 35c4220f495a85db3d32df86d0a62a1039cdc915
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 2 14:59:55 2012 +0200

    roster-view: add some delay before actually starting the live search

    This avoid stacking a bunch of useless searches while user is typing
    as we
    can't stop the old search before starting the new one.

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

 libempathy-gtk/empathy-roster-view.c | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

commit ee2b89a5cbd5b5837488c7334a259bc356eccdc4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 2 13:47:27 2012 +0200

    cope with the top_group_members list being changed while iterating
    over it

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

 libempathy-gtk/empathy-roster-model-manager.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

commit f72a036cce9ff7ce9d1e96f7c72e42e83c8c4452
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 2 13:31:10 2012 +0200

    individual-manager: make sure the individual stays alive when
    removing it

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

 libempathy/empathy-individual-manager.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 33b5753dab14d6f387fdb0346aac5c0998489477
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 2 10:44:17 2012 +0200

    roster-model-manager: factor out
    {add_to,remove_from}_top_group_members()

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

 libempathy-gtk/empathy-roster-model-manager.c | 37
 +++++++++++++++++----------
 1 file changed, 23 insertions(+), 14 deletions(-)

commit 06dd24d2acae7b49fd72869fd265eb1144a32dc0
Author: Tom Tryfonidis <tomtryf@gmail.com>
Date:	Tue Oct 2 10:06:51 2012 +0300

    Updated Greek translation

 po/el.po | 69
 ++++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 39 insertions(+), 30 deletions(-)

commit 8964b3199d0415434948860c8ff78664aa40ae94
Author: Alexander Shopov <ash@kambanaria.org>
Date:	Tue Oct 2 05:36:25 2012 +0300

    Updated Bulgarian translation

 po/bg.po | 133
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 71 insertions(+), 62 deletions(-)

commit c9b12540e124f441c00d6b9e4be5d8b9d2a0fce1
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Mon Oct 1 15:13:23 2012 +0200

    Updated Galician translations

 po/gl.po | 87
 ++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 43 insertions(+), 44 deletions(-)

commit ce49ad3e5a688ac22e52b1817123b44d82354f04
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Sun Sep 30 13:06:35 2012 +0200

    Updated Spanish translation

 po/es.po | 74
 +++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 40 insertions(+), 34 deletions(-)

commit e8f7c8963ebd17819bf5ff291bd1423c3407fb3d
Author: Žygimantas Beručka <uid0@akl.lt>
Date:	Sun Sep 30 12:16:23 2012 +0300

    Updated Lithuanian translation

 po/lt.po | 695
 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 439 insertions(+), 256 deletions(-)

commit 5903fadcf9b61f8eb689343ccad27a72c5589504
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Sat Sep 29 19:52:48 2012 +0200

    Updated Serbian translation

 po/sr.po	| 55
 ++++++++++++++++++++++++++++++++-----------------------
 po/sr@latin.po | 55
 ++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 64 insertions(+), 46 deletions(-)

commit 7973dbc6eabb60c0618cf4fe83ebfdd784af852c
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Sat Sep 29 18:15:12 2012 +0300

    Updated Belarusian translation.

 po/be.po | 53 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 22 deletions(-)

commit bab2f093d6053a62736697021c16f937f1349cf1
Author: Daniel Martinez Cucalon <dmartinez@src.gnome.org>
Date:	Sat Sep 29 00:29:32 2012 +0200

    Updated Aragonese translation

 po/an.po | 3797
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1889 insertions(+), 1908 deletions(-)

commit adaa54917e24c04119eff75fa5fac7d8feb8805f
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Sep 28 16:44:36 2012 +0200

    Updated Hebrew translation.

 po/he.po | 211
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 109 insertions(+), 102 deletions(-)

commit 3657e2642f635deca2e10695bba0dd8894613d68
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 28 12:05:33 2012 +0200

    individual_menu_add_personas(): restore the persona.individual after
    creating single_individual

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

 libempathy-gtk/empathy-individual-menu.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 837375ce5a897ede2f219957eb9b9b4a4eaee6c8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 27 12:48:30 2012 +0200

    empathy_chat_window_present_chat: return the window presenting
    the chat

 src/empathy-chat-window.c | 9 +++++----
 src/empathy-chat-window.h | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

commit 863beae29119b3a230511c6968b245ae747f4181
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 27 12:39:17 2012 +0200

    No need to pass twice the same param to
    chat_window_contact_menu_update()

 src/empathy-chat-window.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit 61c27ce3a19ab2b74ca1e0ef9ca058c10457f98f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 27 11:57:20 2012 +0200

    document when/how Folks is used in empathy-chat

 src/empathy-chat.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 0ab3bd0797578847fe4f4967a3526333cb4a4e61
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 27 14:27:58 2012 +0200

    make sure that chat_window_contact_menu_update is not called
    recursively

    Calling empathy_chat_get_contact_menu() may have as a side effect
    to call
    empathy_contact_set_persona() which will fire a 'notify' signal and
    so trigger
    another mennu update. There is no point doing a second one, and
    creating a
    second menu, so best to avoid recursive calls.

 src/empathy-chat-window.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 3fd6aa7dcc3a209e4e0795b932efcf4cc1688e90
Author: Duarte Loreto <happyguy_pt@hotmail.com>
Date:	Fri Sep 28 07:45:21 2012 +0100

    Updated Portuguese translation

 po/pt.po | 54 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 24 deletions(-)

commit 13720e3d2bf9bddf8ca64f37e55f664855c0d282
Author: Gil Forcada <gforcada@gnome.org>
Date:	Fri Sep 28 00:02:09 2012 +0200

    [l10n] Minor update to Catalan translation

 po/ca.po | 54 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 24 deletions(-)

commit b008f24359395bf1985311a73e862310295658eb
Author: Aurimas Černius <aurisc4@gmail.com>
Date:	Thu Sep 27 22:24:35 2012 +0300

    Updated Lithuanian translation

 po/lt.po | 210
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 110 insertions(+), 100 deletions(-)

commit fb160b06764647e12689c7396dd397cf22181a1a
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Thu Sep 27 15:05:21 2012 +0200

    Updated Polish translation

 po/pl.po | 53 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 22 deletions(-)

commit c8405ee3cf36bfa86314b8691d1bffc1c606fc80
Author: Andika Triwidada <andika@gmail.com>
Date:	Thu Sep 27 19:38:07 2012 +0700

    Updated Indonesian translation

 po/id.po | 54 ++++++++++++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 22 deletions(-)

commit 86f46dd468ac8bfc17e2faf8bf28e5e35a3dee11
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Thu Sep 27 16:36:34 2012 +0400

    Updated Russian translation

 po/ru.po | 55 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 23 deletions(-)

commit b9a083bf9217f1f8f8b60c02ef105560ef464a1a
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Thu Sep 27 12:48:18 2012 +0200

    Updated Galician translations

 po/gl.po | 57 ++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 25 deletions(-)

commit fe2dcda548c0e72844368646eaf9c6b7dd54df1d
Author: Marek Černocký <marek@manet.cz>
Date:	Thu Sep 27 12:47:37 2012 +0200

    Updated Czech translation

 po/cs.po | 51 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 21 deletions(-)

commit 723aad75523566b6e6e0a71a80d7421435bfda08
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Thu Sep 27 12:36:53 2012 +0200

    [l10n] Updated Italian translation.

 po/it.po | 53 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 22 deletions(-)

commit 568ed2e039a63ebaabe34cd4bf3aae4db6122568
Author: Nilamdyuti Goswami <nilamdyuti@gmail.com>
Date:	Thu Sep 27 14:50:53 2012 +0530

    Assamese translation updated

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

commit d74fd79d1e8f0c9ae69d9a22871eaa27661ac257
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Thu Sep 27 10:34:24 2012 +0200

    Updated Slovenian translation

 po/sl.po | 55 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

commit bcd83492be60b9d8244501dcf4d9213ac52653c0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 27 10:14:18 2012 +0200

    POTFILES.in: add empathy-roster-model.h

    Some translated strings have been moved to this file but we forgot
    to include
    it in POTFILES.in. This is not a string break as those strings
    were not
    translated before.

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit 5a2ab98b57182804fa6a04c21a9cb9fcbc79bf09
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 25 15:32:19 2012 +0200

    server-tls-handler: fix the variant type when fetching
    ServerCertificate

    g_variant_lookup() fails if we don't specificy that this string is
    secretly an
    object path.

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

 libempathy/empathy-server-tls-handler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5bfe5733ac4e743ec7c025a3c9f6551739e334d5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 21 10:13:07 2012 +0200

    Say in the status message when the call has been terminated

    This is not a string freeze break as this string is already used in
    a bunch of
    place in this file.

    We could probably improve the phrasing a little bit but that's too
    late for
    this cycle.

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

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

commit b2bd57b5277f6a03d252f0abdb45bdd4fecdb8b4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 21 10:06:32 2012 +0200

    call_state is a CallState enum

 src/empathy-call-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b399609daf362b99ba73c10e91b3309d663f71d6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 24 10:38:05 2012 +0200

    tp-chat: set Private and InviteOnly props on conference channels

    Only the person invited are suppose to join these channels so
    tweak their
    settings to make them more secure.

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

 libempathy/empathy-tp-chat.c | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

commit d848cdc6f54c985f2f146387ccc7d3925eebedd7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 25 09:25:00 2012 +0200

    update last_tag_pattern

 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c2c8291941b19bd16a2875e7786599ac59f3392c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 25 09:24:38 2012 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3c2383ed3b0c0820f093dd18c2ef6a174e9f763c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 25 09:23:23 2012 +0200

    fix ubuntu-online-accounts/Makefile.am

 ubuntu-online-accounts/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 801e620269e59a70c738115d0d94342edc77fa8e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 25 09:14:32 2012 +0200

    prepare 3.6.0

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

commit f202a9ceb6f06ddbfc021e4623fba0a9c17cec79
Author: Jiro Matsuzawa <jmatsuzawa@gnome.org>
Date:	Tue Sep 25 00:32:57 2012 +0900

    [l10n] Update Japanese translation

 po/ja.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit b72a9876f7074930453755de459d429225915407
Author: Antonio Fernandes C. Neto <fernandesn@gnome.org>
Date:	Mon Sep 24 11:53:00 2012 -0300

    Updated Brazilian Portuguese Translation

 po/pt_BR.po | 53 +++++++++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 24 deletions(-)

commit 45aeea95d1e4dbf371941ef81161eb331e351ea9
Author: Sweta Kothari <swkothar@redhat.com>
Date:	Mon Sep 24 16:14:10 2012 +0530

    Updated gujarati file

 po/gu.po | 137
 ++++++++++++++++++++++-----------------------------------------
 1 file changed, 47 insertions(+), 90 deletions(-)

commit 5660ad63976e214fa1f0e9a881a2ffdc41ac2342
Author: Tom Tryfonidis <tomtryf@gmail.com>
Date:	Mon Sep 24 13:29:29 2012 +0300

    Updated Greek help translation

 help/el/el.po | 154
 +++-------------------------------------------------------
 1 file changed, 7 insertions(+), 147 deletions(-)

commit 0a51f4213583abb7dced1cd9754e1a42f7408ebb
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	Mon Sep 24 10:55:28 2012 +0300

    [l10n] Updated Estonian translation

 po/et.po | 1674
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 784 insertions(+), 890 deletions(-)

commit d292833af18c0f4d0ce498e4f8c5973155314bd1
Author: Noriko Mizumoto <noriko@fedoraproject.org>
Date:	Mon Sep 24 11:59:45 2012 +0900

    [l10n] Update Japanese translation

 po/ja.po | 1042
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 469 insertions(+), 573 deletions(-)

commit 992f8e102844992fd5755f6db76a61072d42364a
Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
Date:	Sun Sep 23 15:52:16 2012 +0300

    Updated Latvian translation

 po/lv.po | 57 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

commit 81e38f43399ebc9a451bb267d08d5e06a8f4476d
Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
Date:	Sun Sep 23 15:51:16 2012 +0300

    Updated Latvian translation

 po/lv.po | 3849
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1903 insertions(+), 1946 deletions(-)

commit a776c3ffbbcbbecfe40571783e0ebad618e67c91
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	Sun Sep 23 12:44:06 2012 +0200

    [l10n] Updated German translation

 po/de.po | 768
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 381 insertions(+), 387 deletions(-)

commit 86b016a07b26f25f5cdb2420334952a3da93044e
Author: Alexander Shopov <ash@kambanaria.org>
Date:	Sun Sep 23 12:37:15 2012 +0300

    Updated Bulgarian translation

 po/bg.po | 3681
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 1730 insertions(+), 1951 deletions(-)

commit 6fc5e2c075cb40e0760f42f6ef77f6873ee69287
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:	Sun Sep 23 01:08:20 2012 +0200

    [l10n]Updated Catalan (Valencian) translation

 po/ca@valencia.po | 3756
 ++++++++++++++++++++++++++---------------------------
 1 file changed, 1845 insertions(+), 1911 deletions(-)

commit 83058c027ab85ebe63bc2f871ff8de4067911f3f
Author: Gil Forcada <gforcada@gnome.org>
Date:	Sun Sep 23 01:08:11 2012 +0200

    [l10n] Added Catalan translation

 po/ca.po | 3828
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1889 insertions(+), 1939 deletions(-)

commit a8936928a4096398fdefbd8803a42dcc931cb94c
Author: Ani Peter <apeter@redhat.com>
Date:	Sun Sep 23 02:53:54 2012 +0530

    Updated Malayalam file

 po/ml.po | 1876
 ++++++++++++++++----------------------------------------------
 1 file changed, 464 insertions(+), 1412 deletions(-)

commit ebfea186ffbcb71e1c335d45a3cee4a13a7c9c06
Author: Cheng Lu <chenglu1990@gmail.com>
Date:	Sat Sep 22 15:03:00 2012 +0300

    update Simplified Chinese (zh_CN) translation

 po/zh_CN.po | 3702
 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 1830 insertions(+), 1872 deletions(-)

commit b253001b2ea10585010bb0a3c9c97c20b8b546b7
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Sat Sep 22 15:03:00 2012 +0300

    Updated Hebrew translation.

 po/he.po | 735
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 368 insertions(+), 367 deletions(-)

commit 82954cb535da26e450d108962d9d0fefdd957a89
Author: Changwoo Ryu <cwryu@debian.org>
Date:	Sat Sep 22 18:42:11 2012 +0900

    Updated Korean translation

 po/ko.po | 757
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 391 insertions(+), 366 deletions(-)

commit 52fc60de014ffa780c3fc3e7f4b2e796f0ec4960
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Sat Sep 22 12:55:30 2012 +0400

    Updated Russian translation

 po/ru.po | 698
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 351 insertions(+), 347 deletions(-)

commit 735b17ad34d9d4b9d7291bec94e6d25208473296
Author: Aurimas Černius <aurisc4@gmail.com>
Date:	Fri Sep 21 20:43:59 2012 +0300

    Updated Lithuanian translation

 po/lt.po | 749
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 376 insertions(+), 373 deletions(-)

commit c09b60270ed8d60c9fdf83893fd138071e25af28
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Fri Sep 21 20:07:32 2012 +0300

    Updated Belarusian translation.

 po/be.po | 698
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 350 insertions(+), 348 deletions(-)

commit a41c285de41f1bde781937de6644869eaa372190
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 21 10:54:52 2012 +0200

    actually unmute the microphone when restarting the call

    That's what this code was always meant to do but some idiot named
    Guillaume
    changed it and introduced this regression in
    74d098cd8894f72321237e120267a5ec3f188b3f when using the
    audio-input-microphone-muted-symbolic icon.

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

 src/empathy-call-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5ebf61c09f2ede0017b91421d411c5fdeed77688
Author: Daniel Korostil <ted.korostiled@gmail.com>
Date:	Fri Sep 21 10:27:36 2012 +0300

    Uploaded Ukranian

 po/uk.po | 2656
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1329 insertions(+), 1327 deletions(-)

commit 25c6dfd249873bb165a9050950937fa0ea545101
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 20 15:01:27 2012 +0200

    migrate_account_to_uoa: actually iterate over the supersedes array

    I'm not a fan of pointer arithmetic, it's clearer to iterate using
    an index.

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

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

commit ddcf0a2ff6368fbfba7b163a1c00929d3fca65eb
Author: Duarte Loreto <happyguy_pt@hotmail.com>
Date:	Thu Sep 20 22:06:47 2012 +0100

    Updated Portuguese translation

 po/pt.po | 685
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 343 insertions(+), 342 deletions(-)

commit 53beff0436513adb61ca0ffdbace310049cf9b11
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Thu Sep 20 20:47:15 2012 +0200

    Updated Serbian translation

 po/sr.po	| 699
 +++++++++++++++++++++++++++++----------------------------
 po/sr@latin.po | 699
 +++++++++++++++++++++++++++++----------------------------
 2 files changed, 702 insertions(+), 696 deletions(-)

commit 704d362b435cdb8e853ace5b159a9d6cbcdbff11
Author: Chris Leonard <cjl@laptop.org>
Date:	Thu Sep 20 09:54:32 2012 +0100

    Updated British English translation

 po/en_GB.po | 53 +++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

commit c1d1ac2f72c0caccdecafbdcf29112e1292f6b68
Author: Krishnababu Krothapalli <kkrothap@redhat.com>
Date:	Thu Sep 20 15:57:21 2012 +0530

    Updated Telugu Translations

 po/te.po | 3730
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1902 insertions(+), 1828 deletions(-)

commit 6238a9176e58964363c962aaa66670e06721c17a
Author: Sandeep Sheshrao Shedmake <sshedmak@redhat.com>
Date:	Thu Sep 20 15:16:32 2012 +0530

    Updated Marathi Translations

 po/mr.po | 702
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 351 insertions(+), 351 deletions(-)

commit 86bd1377559de3de50681b0f82b4a439958b2870
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Thu Sep 20 10:26:44 2012 +0200

    Use funnel instead of fsfunnel for gstreamer 1.0

 src/empathy-call-window.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit 0444944a1ba4a06f2d55fd02429e7f377a7c2264
Author: Tom Tryfonidis <tomtryf@gmail.com>
Date:	Thu Sep 20 11:16:46 2012 +0300

    Updated Greek translation

 po/el.po | 704
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 354 insertions(+), 350 deletions(-)

commit fc3c79637fe06f1f5202f52b2fc71d8ca8860b8e
Author: Rajesh Ranjan <rranjan@redhat.com>
Date:	Thu Sep 20 13:04:10 2012 +0530

    hindi updated file by Chandan Kumar

 po/hi.po | 784
 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 363 insertions(+), 421 deletions(-)

commit 5e973163315050d00f8183af0cab9b77806cd8c9
Author: ManojKumar Giri <mgiri@redhat.com>
Date:	Thu Sep 20 12:57:26 2012 +0530

    Updated translation for Odia.

 po/or.po | 4104
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 1941 insertions(+), 2163 deletions(-)

commit dd81fc4ea75b379cb9a0823543257cc0004a2ae6
Author: Alexandre Franke <alexandre.franke@gmail.com>
Date:	Thu Sep 20 09:02:45 2012 +0200

    Update French translation

 po/fr.po | 696
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 350 insertions(+), 346 deletions(-)

commit 64b29bd2170ce72fdcd3e6b37412d575b919e2b5
Author: Ani Peter <apeter@redhat.com>
Date:	Thu Sep 20 12:19:46 2012 +0530

    Updated Malayalam file

 po/ml.po | 2 --
 1 file changed, 2 deletions(-)

commit 3195f481fcd64ca9babbd86ab18e9308442cac68
Author: Ani Peter <apeter@redhat.com>
Date:	Thu Sep 20 12:18:07 2012 +0530

    Updated Malayalam file

 po/ml.po | 4493
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 2205 insertions(+), 2288 deletions(-)

commit 2ce0c0dd08a91200007cf879b8c9b1093d8e6387
Author: Shankar Prasad <svenkate@redhat.com>
Date:	Wed Sep 19 23:46:42 2012 +0530

    Updated kn translation

 po/kn.po | 819
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 391 insertions(+), 428 deletions(-)

commit 62dd08eeb5d061cece0bc9d4c3d91236a72c5bff
Author: Sweta Kothari <swkothar@redhat.com>
Date:	Wed Sep 19 23:11:34 2012 +0530

    Updated gujarati file

 po/gu.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 887ac180222f926b2d44d2e12f1be598f7d6f583
Author: Sweta Kothari <swkothar@redhat.com>
Date:	Wed Sep 19 23:08:58 2012 +0530

    Updated gujarati file

 po/gu.po | 1327
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 588 insertions(+), 739 deletions(-)

commit 9263fe0c4b580ec5566ef03d08911fd94c7929cc
Author: Ibrahim Saed <ibraheem5000@gmail.com>
Date:	Wed Sep 19 18:24:24 2012 +0100

    Updated Arabic translation

 po/ar.po | 783
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 377 insertions(+), 406 deletions(-)

commit 1d5b63a62d1c7e9e7619ece79c79bf35c1b4848c
Author: A S Alam <aalam@users.sf.net>
Date:	Wed Sep 19 20:15:00 2012 +0530

    update Punjabi Translation

 po/pa.po | 2901
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 1424 insertions(+), 1477 deletions(-)

commit bcd98cb466723f9e1fe83f2fbb9be5df45305b8d
Author: Theppitak Karoonboonyanan <thep@linux.thai.net>
Date:	Wed Sep 19 18:41:21 2012 +0700

    Updated Thai translation

 po/th.po | 5228
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 2706 insertions(+), 2522 deletions(-)

commit 46242cd92eef55f8fec783afeda108e921cab709
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:	Wed Sep 19 16:48:38 2012 +0530

    updated Tamil translation

 po/ta.po | 699
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 350 insertions(+), 349 deletions(-)

commit 64f3aba3e25de86a41b60eb9582b823df54e0101
Author: Marek Černocký <marek@manet.cz>
Date:	Wed Sep 19 13:13:20 2012 +0200

    Updated Czech translation

 po/cs.po | 694
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 349 insertions(+), 345 deletions(-)

commit de363e1ce73a3ac9e0aca4b683b839f2145dd7dc
Author: Andika Triwidada <andika@gmail.com>
Date:	Wed Sep 19 10:33:05 2012 +0700

    Updated Indonesian translation

 po/id.po | 698
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 351 insertions(+), 347 deletions(-)

commit 27f844bf0f16b797ff55522e2579fdd5efa676cc
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Wed Sep 19 02:55:21 2012 +0200

    Updated Galician translations

 po/gl.po | 703
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 352 insertions(+), 351 deletions(-)

commit 4d3e77111d4deda70d5fc21499411ece63e1fa55
Author: Nilamdyuti Goswami <nilamdyuti@gmail.com>
Date:	Tue Sep 18 21:12:02 2012 +0530

    Assamese translation updated

 po/as.po | 701
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 351 insertions(+), 350 deletions(-)

commit 5955d4d33d76204250664dc27b122eec27a14ee3
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Tue Sep 18 16:34:44 2012 +0200

    Updated Spanish translation

 po/es.po | 708
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 355 insertions(+), 353 deletions(-)

commit 9d3c68d43afad602e350546e85eb2e9fc8344044
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Tue Sep 18 15:40:41 2012 +0200

    Updated Polish translation

 po/pl.po | 698
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 351 insertions(+), 347 deletions(-)

commit 7500dcab35365412c68061f3d4e3383e5f3a2bfa
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Tue Sep 18 13:59:08 2012 +0200

    [l10n] Updated Italian translation.

 po/it.po | 694
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 349 insertions(+), 345 deletions(-)

commit 5eecd337111f00f7d7478e6b7b835fc227e5a615
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Tue Sep 18 13:56:03 2012 +0200

    Updated Hungarian translation

 po/hu.po | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 65b24714c1f949edc15c64b2ee360b0964bb1611
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Tue Sep 18 13:52:27 2012 +0200

    Updated Slovenian translation

 po/sl.po | 746
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 373 insertions(+), 373 deletions(-)

commit 21b37ba8098f014b7aa427498f4d540405c26a33
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 18 13:47:08 2012 +0200

    empathy.application.in: fix <translations> markup

 ubuntu-online-accounts/empathy.application.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 204f1ee341184779fa1fc677faf066e693dd94cb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 18 12:20:10 2012 +0200

    generate empathy.application from empathy.application.in

    This allow us to mark the description key as translatable.

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

 po/POTFILES.in				       |  1 +
 ubuntu-online-accounts/.gitignore	       |  1 +
 ubuntu-online-accounts/Makefile.am	       |  5 +++++
 ubuntu-online-accounts/empathy.application    | 10 ----------
 ubuntu-online-accounts/empathy.application.in | 11 +++++++++++
 5 files changed, 18 insertions(+), 10 deletions(-)

commit a4b61004fb7245f6f68dd195085f3ec075a1468d
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Mon Sep 17 23:03:59 2012 +0200

    Updated Hungarian translation

 po/hu.po | 1257
 +++++++++++++++++++-------------------------------------------
 1 file changed, 390 insertions(+), 867 deletions(-)

commit c8f63925690a8705793eb67eaa79f3bf71087654
Author: Rafael Ferreira <rafael.f.f1@gmail.com>
Date:	Mon Sep 17 16:36:56 2012 -0400

    Updated translation for Brazilian Portuguese.

 po/pt_BR.po | 704
 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 351 insertions(+), 353 deletions(-)

commit 70a157b38ef8e2ab661f944259929e78ed8eafe3
Author: Chris Leonard <cjl@laptop.org>
Date:	Mon Sep 17 20:56:41 2012 +0100

    Update British English translation

 po/en_GB.po | 712
 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 362 insertions(+), 350 deletions(-)

commit 4a4b3a60fec811d3bb295f9614c7df3275d541ed
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 17 16:09:17 2012 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c06c6fc339db453d2d20adf389e5902e0900df5e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 17 16:01:57 2012 +0200

    glib-signals-marshal-gen.py is not needed any more

 extensions/Makefile.am		   | 14 ----------
 extensions/extensions-cli.c	   |  1 -
 extensions/extensions.c	   |  1 -
 tools/glib-signals-marshal-gen.py | 55
 ---------------------------------------
 4 files changed, 71 deletions(-)

commit b8430db01b7e258303722a2173bd95112e0fce18
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 17 15:52:46 2012 +0200

    prepare 3.5.92

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

commit 0f8b525b8972aba4cce8bd03e22e55b07bfd857c
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Sep 17 14:18:40 2012 +0200

    Updated Spanish translation

 help/es/es.po | 99
 +++++------------------------------------------------------
 1 file changed, 7 insertions(+), 92 deletions(-)

commit 7385adac679f641133b2f14dfda4fa91540cdcaf
Author: Rajesh Ranjan <rranjan@redhat.com>
Date:	Mon Sep 17 16:34:10 2012 +0530

    hindi update

 po/hi.po | 3773
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1943 insertions(+), 1830 deletions(-)

commit 32c55a5a343a808c6774c4d277a190867b11d365
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 17 12:55:12 2012 +0200

    set custom selection color in default themes

    Ensure that we actually see the text being selected.

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

 data/themes/Boxes.AdiumMessageStyle/Contents/Resources/main.css       |
 4 ++++
 data/themes/Classic.AdiumMessageStyle/Contents/Resources/main.css     |
 4 ++++
 data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/main.css |
 4 ++++
 3 files changed, 12 insertions(+)

commit 8750c21d6838bd83065f735470fb96de867ed31f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 17 10:26:43 2012 +0200

    sync tools/* with tp-glib master

    Fix extensions/Makefile.am to build with the new tools.

 extensions/Makefile.am		     |	3 +-
 tools/Makefile.am		     | 19 ++++-----
 tools/c-constants-gen.py	     | 37 ++++++++++------
 tools/check-c-style.sh		     |	7 ---
 tools/check-coding-style.mk	     |	2 +-
 tools/check-whitespace.sh	     |	6 ---
 tools/glib-client-gen.py	     | 85
 ++++++++++++++++++++++++++++---------
 tools/glib-client-marshaller-gen.py |	3 +-
 tools/glib-errors-str-gen.py	     |	7 +--
 tools/glib-ginterface-gen.py	     | 47 +++++++++++++-------
 tools/glib-gtypes-generator.py      | 28 +++++++-----
 tools/glib-interfaces-gen.py	     | 22 +++++++---
 tools/lcov.am			     |	6 ++-
 tools/libtpcodegen.py		     | 14 +++++-
 tools/make-release-mail.py	     | 16 ++++++-
 tools/make-version-script.py	     |	7 ++-
 tools/manager-file.py		     | 18 ++++++--
 tools/telepathy.am		     | 70 +++++++++++++++++++++++++++---
 tools/with-session-bus.sh	     |	2 +
 19 files changed, 288 insertions(+), 111 deletions(-)

commit f9a38137925ff6f712afe21961614a1efb3b35ea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 14 15:52:54 2012 +0200

    include telepathy-glib.h

    tp-glib 1.0 will enforce to only include telepathy-glib.h so best
    doing it to
    reduce the delta with the future stable branch.

 extensions/extensions.h				| 2 +-
 goa-mc-plugin/mcp-account-manager-goa.c		| 2 +-
 libempathy-gtk/empathy-account-chooser.c		| 3 ---
 libempathy-gtk/empathy-account-widget-sip.c		| 2 +-
 libempathy-gtk/empathy-account-widget.c		| 5 +----
 libempathy-gtk/empathy-chat.c				| 3 +--
 libempathy-gtk/empathy-contact-chooser.h		| 2 +-
 libempathy-gtk/empathy-contact-widget.c		| 4 +---
 libempathy-gtk/empathy-contactinfo-utils.c		| 2 --
 libempathy-gtk/empathy-contactinfo-utils.h		| 2 +-
 libempathy-gtk/empathy-groups-widget.c			| 2 +-
 libempathy-gtk/empathy-individual-dialogs.c		| 2 +-
 libempathy-gtk/empathy-individual-edit-dialog.c	| 2 +-
 libempathy-gtk/empathy-individual-information-dialog.c | 2 +-
 libempathy-gtk/empathy-individual-menu.c		| 2 +-
 libempathy-gtk/empathy-individual-store-channel.c	| 2 +-
 libempathy-gtk/empathy-individual-store-manager.c	| 2 +-
 libempathy-gtk/empathy-individual-store.c		| 2 +-
 libempathy-gtk/empathy-individual-view.c		| 3 +--
 libempathy-gtk/empathy-individual-widget.c		| 2 +-
 libempathy-gtk/empathy-location-manager.c		| 3 +--
 libempathy-gtk/empathy-log-window.h			| 2 +-
 libempathy-gtk/empathy-new-call-dialog.c		| 2 +-
 libempathy-gtk/empathy-new-message-dialog.c		| 2 +-
 libempathy-gtk/empathy-notify-manager.c		| 2 +-
 libempathy-gtk/empathy-plist.c				| 3 +--
 libempathy-gtk/empathy-presence-chooser.c		| 3 +--
 libempathy-gtk/empathy-protocol-chooser.c		| 2 --
 libempathy-gtk/empathy-protocol-chooser.h		| 2 +-
 libempathy-gtk/empathy-roster-contact.c		| 2 +-
 libempathy-gtk/empathy-share-my-desktop.c		| 6 +-----
 libempathy-gtk/empathy-theme-adium.c			| 3 +--
 libempathy-gtk/empathy-theme-manager.c			| 3 +--
 libempathy-gtk/empathy-tls-dialog.c			| 2 +-
 libempathy-gtk/empathy-ui-utils.c			| 2 +-
 libempathy/empathy-account-settings.c			| 5 -----
 libempathy/empathy-account-settings.h			| 3 +--
 libempathy/empathy-auth-factory.c			| 2 --
 libempathy/empathy-auth-factory.h			| 2 +-
 libempathy/empathy-camera-monitor.c			| 2 +-
 libempathy/empathy-chatroom-manager.c			| 5 -----
 libempathy/empathy-chatroom-manager.h			| 2 +-
 libempathy/empathy-chatroom.c				| 1 -
 libempathy/empathy-chatroom.h				| 2 +-
 libempathy/empathy-connection-aggregator.c		| 2 --
 libempathy/empathy-connection-aggregator.h		| 2 +-
 libempathy/empathy-connection-managers.c		| 3 ---
 libempathy/empathy-connection-managers.h		| 2 +-
 libempathy/empathy-contact.c				| 4 ----
 libempathy/empathy-contact.h				| 3 +--
 libempathy/empathy-debug.c				| 3 ---
 libempathy/empathy-debug.h				| 2 +-
 libempathy/empathy-ft-handler.c			| 4 ----
 libempathy/empathy-ft-handler.h			| 2 +-
 libempathy/empathy-individual-manager.c		| 4 ----
 libempathy/empathy-irc-network.c			| 2 +-
 libempathy/empathy-irc-server.c			| 2 +-
 libempathy/empathy-keyring.h				| 2 +-
 libempathy/empathy-message.c				| 4 ----
 libempathy/empathy-message.h				| 2 +-
 libempathy/empathy-presence-manager.c			| 4 ----
 libempathy/empathy-presence-manager.h			| 3 +--
 libempathy/empathy-request-util.c			| 2 --
 libempathy/empathy-request-util.h			| 2 +-
 libempathy/empathy-server-sasl-handler.c		| 2 --
 libempathy/empathy-server-sasl-handler.h		| 3 +--
 libempathy/empathy-status-presets.c			| 2 --
 libempathy/empathy-status-presets.h			| 2 +-
 libempathy/empathy-tp-chat.c				| 2 --
 libempathy/empathy-tp-chat.h				| 3 +--
 libempathy/empathy-utils.c				| 6 ------
 libempathy/empathy-utils.h				| 2 +-
 nautilus-sendto-plugin/empathy-nautilus-sendto.c	| 2 +-
 src/empathy-accounts-common.c				| 3 +--
 src/empathy-accounts-dialog.c				| 4 +---
 src/empathy-accounts-dialog.h				| 2 +-
 src/empathy-accounts.c					| 4 +---
 src/empathy-auth-client.c				| 2 +-
 src/empathy-call-factory.c				| 5 +----
 src/empathy-call-handler.c				| 4 +---
 src/empathy-call-window.c				| 3 +--
 src/empathy-call.c					| 2 --
 src/empathy-chat-window.c				| 2 --
 src/empathy-chat-window.h				| 2 +-
 src/empathy-chat.c					| 2 --
 src/empathy-debug-window.c				| 6 +-----
 src/empathy-event-manager.c				| 5 +----
 src/empathy-import-dialog.c				| 2 +-
 src/empathy-import-pidgin.c				| 3 +--
 src/empathy-import-utils.c				| 2 --
 src/empathy-import-utils.h				| 2 +-
 src/empathy-import-widget.c				| 3 +--
 src/empathy-invite-participant-dialog.h		| 2 +-
 src/empathy-preferences.c				| 3 +--
 src/empathy-roster-window.c				| 3 +--
 src/empathy-status-icon.c				| 3 +--
 src/empathy.c						| 7 +------
 tests/empathy-chatroom-manager-test.c			| 3 +--
 tests/empathy-parser-test.c				| 2 +-
 tests/test-helper.h					| 2 +-
 100 files changed, 76 insertions(+), 196 deletions(-)

commit 55a2318eeb584a744d478d8745ac9fc60c0d4787
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	Sun Sep 16 17:20:12 2012 +0200

    [l10n] Updated German translation

 po/de.po | 6016
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 2759 insertions(+), 3257 deletions(-)

commit 739b34ebd3c71cdd18c47dec47d66dbef52d1543
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date:	Sun Sep 16 14:50:07 2012 +0200

    Updated Danish translation

 po/da.po | 3727
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1838 insertions(+), 1889 deletions(-)

commit 890ee50eb73ddbc3b90b985a086c18a186c3e172
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Sun Sep 16 13:15:24 2012 +0200

    Updated Spanish translation

 po/es.po | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

commit 5f185ce72ee018acdc7dfe822d9ea04c28304613
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Sat Sep 15 20:53:35 2012 +0400

    Updated Russian translation

 po/ru.po | 72
 +++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 35 insertions(+), 37 deletions(-)

commit 445206b3f3f9bed7ab3579a213c9ddf65c5bce5c
Author: Tom Tryfonidis <tomtryf@gmail.com>
Date:	Thu Sep 13 13:27:47 2012 +0300

    Updated Greek help translation

 help/el/el.po | 2617
 ++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 1948 insertions(+), 669 deletions(-)

commit 9bce1c2065013af4b99fd224f2c0bd35fd77ff25
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 12 15:14:11 2012 +0200

    individual-menu: fix GeeIterator leak

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

 libempathy-gtk/empathy-individual-menu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 61a7bd361e4b849c023e960782beea19dabeeb28
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 12 15:07:55 2012 +0200

    empathy-contact: fix priv->logged_alias leak

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

 libempathy/empathy-contact.c | 1 +
 1 file changed, 1 insertion(+)

commit cb3a9fd4ae3bf0f74dabdfdd973898592a5f4244
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 12 15:06:28 2012 +0200

    theme-adium: free the result of g_strsplit with g_strfreev

    Freeing with g_free() doesn't free the content of the array.

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

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

commit e90a360038e2428eb6b7090746bd32542eacf203
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 12 15:06:09 2012 +0200

    theme-adium: fix priv->variant leak

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

 libempathy-gtk/empathy-theme-adium.c | 2 ++
 1 file changed, 2 insertions(+)

commit 5845fcbe57199c9995130384f657148a7d818028
Author: Ville-Pekka Vainio <vpvainio@iki.fi>
Date:	Wed Sep 12 22:28:26 2012 +0300

    Finnish translation update by Jiri Grönroos

 po/fi.po | 3786
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1904 insertions(+), 1882 deletions(-)

commit 5b016f5e77c07a88cff8a204bbeabf640b610a14
Author: Daniel Korostil <ted.korostiled@gmail.com>
Date:	Wed Sep 12 20:44:11 2012 +0300

    uk update

 po/uk.po | 4472
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 2219 insertions(+), 2253 deletions(-)

commit d21ed99112b41ef4cb5d9664d57872de7535039a
Author: Ibrahim Saed <ibraheem5000@gmail.com>
Date:	Wed Sep 12 15:30:59 2012 +0100

    Updated Arabic translation

 po/ar.po | 3488
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1742 insertions(+), 1746 deletions(-)

commit 279310f16efdd4f39764d2ad71ad71de7f8629a1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 1 12:37:11 2012 +0200

    accounts-dialog: add icons cache

    Saves us from loading the same icons from the disk again and again.

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

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

commit 813d73b98ee89780dc8be751b8a4a00b33e9639b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 1 12:12:48 2012 +0200

    accounts-dialog: set pixbuf on the cell rather than the icon-name

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

 src/empathy-accounts-dialog.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

commit 0e956cfcf66b23bd359c4fefbabd7288c1d2bd5d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 12 14:42:40 2012 +0200

    rename empathy_roster_model_get_groups_for_individual() to _dup_

    It matches tp-glib naming convention now that the returned list is
    (transfer
    full).

 libempathy-gtk/empathy-roster-model-aggregator.c | 6 +++---
 libempathy-gtk/empathy-roster-model-manager.c	  | 6 +++---
 libempathy-gtk/empathy-roster-model.c		  | 8 ++++----
 libempathy-gtk/empathy-roster-model.h		  | 4 ++--
 libempathy-gtk/empathy-roster-view.c		  | 4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

commit 616f55e491686779b760b0726f237f13f36ccdbb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 12 13:12:51 2012 +0200

    empathy_roster_model_get_groups_for_individual: return a (transfer
    full) list

    gee_iterator_get() returns a new string, so we have to pass its
    ownership to
    the list to not leak it.

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

 libempathy-gtk/empathy-roster-model-manager.c | 4 ++--
 libempathy-gtk/empathy-roster-model.c	       | 2 +-
 libempathy-gtk/empathy-roster-view.c	       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

commit 6fbef3adb95ac8bd28ea1f7a81b40a06f993e061
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 12 13:07:33 2012 +0200

    connection-aggregator: fix contacts array leak

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

 libempathy/empathy-connection-aggregator.c | 1 +
 1 file changed, 1 insertion(+)

commit 0dea719d7f81bd79e89e8bc92e65b12b9caf06a5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 12 12:25:24 2012 +0200

    filter_groups: don't leak the widgets list

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

 libempathy-gtk/empathy-roster-view.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit b8863f14395f0e9e3201dd8bd2ffee938e7a50c9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 19 10:41:23 2012 +0200

    roster-window: unprepare the individual manager before destroying
    the roster

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

 src/empathy-roster-window.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

commit c338d01cc24c9e64789615fffa38d0b266543c65
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 19 10:40:00 2012 +0200

    add empathy_individual_manager_unprepare_async()

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

 libempathy/empathy-individual-manager.c | 48
 +++++++++++++++++++++++++++++++++
 libempathy/empathy-individual-manager.h | 10 +++++++
 2 files changed, 58 insertions(+)

commit 484ddd3345d262dc7f2884e9825369d05758858a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 12 11:48:37 2012 +0200

    depend on Folks 0.7.3

    Needed for IndividualAggregator.unprepare()

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c2942d6fbbceae66540cc7b49ff3b39e87e7b3b2
Author: Olivier Crête <olivier.crete@collabora.com>
Date:	Tue Sep 11 18:09:07 2012 -0400

    There is no gstreamer-interfaces in 1.0, they are in audio/video

 configure.ac		  | 3 +++
 src/empathy-audio-sink.c | 4 ++++
 src/empathy-audio-src.c  | 4 ++++
 3 files changed, 11 insertions(+)

commit 873b2ab2ce7dc26cb72e99ffafb0140c8a662fef
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 12 10:48:11 2012 +0200

    empathy_roster_window_init: don't call set_notebook_page()

    We should wait for the AM to be prepared (which is done in this
    function)
    before calling set_notebook_page() as it calls
    empathy_account_manager_get_accounts_connected() which relies on
    the AM being
    prepared.

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

 src/empathy-roster-window.c | 2 --
 1 file changed, 2 deletions(-)

commit 5676e2a343460465e4439449e4d6d834f21ccdbd
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Sep 12 10:42:30 2012 +0200

    UOA mc plugin: Don't crash if auth failure is removed on an unknown
    IM service

 ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit e9e42e26b106c9ae053c1d1c5edda4ee8751ca42
Author: Sandeep Sheshrao Shedmake <sshedmak@redhat.com>
Date:	Wed Sep 12 12:58:45 2012 +0530

    Updated Marathi Translations

 po/mr.po | 300
 ++++++++++++++++++---------------------------------------------
 1 file changed, 83 insertions(+), 217 deletions(-)

commit a968d70baa0f0b7cc4a9888010ae609e53f715e4
Author: Nilamdyuti Goswami <nilamdyuti@gmail.com>
Date:	Tue Sep 11 20:08:01 2012 +0530

    Assamese translation updated

 po/as.po | 60
 ++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 26 deletions(-)

commit ec601502710c9aef38d4b38a1f3cf6f37794d013
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 11 14:45:20 2012 +0200

    use tp_connection_dup_contact_info_supported_fields()

    tp_connection_get_contact_info_supported_fields() has been deprecated

 libempathy-gtk/empathy-user-info.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2aab470c76e4c0b383b3ac6140796314883c3cc6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 11 14:42:51 2012 +0200

    use tp_contact_dup_contact_info()

    tp_contact_get_contact_info() has been deprecated.

 libempathy-gtk/empathy-individual-widget.c | 4 ++--
 libempathy-gtk/empathy-user-info.c	    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 8fe7c7a2348dcfc1f7833eb84264e9437d5795e8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 11 14:10:22 2012 +0200

    use tp_channel_dup_immutable_properties()

    tp_channel_borrow_immutable_properties() has been deprecated.

 libempathy/empathy-sasl-mechanisms.c	  | 19 +++++++++++------
 libempathy/empathy-server-sasl-handler.c | 15 ++++++-------
 libempathy/empathy-server-tls-handler.c  | 36
 ++++++++++++++++----------------
 3 files changed, 39 insertions(+), 31 deletions(-)

commit 9a0c691c865b369438ef789638f33fd21aab0551
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 11 14:34:12 2012 +0200

    sasl-handler: factor out channel_has_may_save_response()

 libempathy/empathy-server-sasl-handler.c | 48
 ++++++++++++++++----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

commit 8be106a4c0b7ae2ddfe91b796669488db8e38c1f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 11 14:03:58 2012 +0200

    event-manager: use empathy_sasl_channel_supports_mechanism()

    There is no point re-implementing it.

 src/empathy-event-manager.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

commit 6b5d8ab2badd9aee642a45b1c49e9aad265d201f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 11 12:43:34 2012 +0200

    use tp_channel_get_connection()

    tp_channel_get_connection() has been deprecated.

 libempathy-gtk/empathy-chat.c		 | 8 ++++----
 libempathy/empathy-tp-chat.c		 | 4 ++--
 src/empathy-call-window.c		 | 4 ++--
 src/empathy-chat-window.c		 | 4 ++--
 src/empathy-invite-participant-dialog.c | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

commit 5ff09cda5bad6b821509876c0fac51c667318602
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 11 12:41:37 2012 +0200

    use tp_text_channel_dup_pending_messages()

    tp_text_channel_get_pending_messages() has been deprecated.

 libempathy/empathy-tp-chat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 6a5b51b273fc447c7611675b97268fc99216d430
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 11 12:35:26 2012 +0200

    use tp_account_manager_dup_valid_accounts()

    tp_account_manager_get_valid_accounts() has been deprecated.

    Fix an accounts list leak in empathy-sanity-cleaning.

 libempathy-gtk/empathy-account-chooser.c		      |  4 ++--
 libempathy-gtk/empathy-chat.c				      |  4 ++--
 libempathy-gtk/empathy-contact-blocking-dialog.c	      |  4 ++--
 libempathy-gtk/empathy-contact-chooser.c		      |  4 ++--
 libempathy-gtk/empathy-individual-menu.c		      |  4 ++--
 libempathy-gtk/empathy-local-xmpp-assistant-widget.c	      |  4 ++--
 libempathy-gtk/empathy-location-manager.c		      |
 8 ++++----
 libempathy-gtk/empathy-log-window.c			      |  4 ++--
 libempathy-gtk/empathy-presence-chooser.c		      |  4 ++--
 libempathy/empathy-connection-aggregator.c		      |  4 ++--
 libempathy/empathy-presence-manager.c			      |  4 ++--
 libempathy/empathy-utils.c				      |  4 ++--
 src/empathy-accounts-common.c				      |
 8 ++++----
 src/empathy-accounts-dialog.c				      |  4 ++--
 src/empathy-accounts.c					      |  4 ++--
 src/empathy-debug-window.c				      |  4 ++--
 src/empathy-import-widget.c				      |  4 ++--
 src/empathy-roster-window.c				      |
 9 +++++----
 src/empathy-sanity-cleaning.c				      | 12
 +++++++-----
 src/empathy-status-icon.c				      |  4 ++--
 src/empathy.c						      |  4 ++--
 .../account-plugins/empathy-accounts-plugin-widget.c	      |  4 ++--
 .../cc-plugins/app-plugin/empathy-app-plugin-widget.c	      |  4 ++--
 23 files changed, 58 insertions(+), 55 deletions(-)

commit 57b261b8329e12d1ffcc46e7ecfbeca2caa8fb4b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 11 15:10:16 2012 +0200

    Depend on telepathy-glib 0.19.9

    We are going to use the new version of some deprecated API.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e4d1085846020f3522f94e1cb075b7d9417b9cea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 10 11:14:22 2012 +0200

    roster-view: clear the view when disposing

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

 libempathy-gtk/empathy-roster-view.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

commit 3ef4a79d48375e55d0ea8baafa992971c2982885
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Mon Sep 10 19:08:23 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 90
 +++++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 90
 +++++++++++++++++++++++++++++++++----------------------------
 2 files changed, 98 insertions(+), 82 deletions(-)

commit 5e261fc672d2ebea64557d3f463912aabce5eadf
Author: Duarte Loreto <happyguy_pt@hotmail.com>
Date:	Mon Sep 10 07:51:27 2012 +0100

    Updated Portuguese translation

 po/pt.po | 83
 +++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 46 insertions(+), 37 deletions(-)

commit 64b2cbabefed6aa22f84517796564590ca2b349a
Author: Changwoo Ryu <cwryu@debian.org>
Date:	Sun Sep 9 18:58:51 2012 +0900

    Updated Korean translation

 po/ko.po | 3506
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 1642 insertions(+), 1864 deletions(-)

commit 7a7c53bee3643d9c2e2388b10cf9297e79757285
Author: Marek Černocký <marek@manet.cz>
Date:	Sun Sep 9 08:48:35 2012 +0200

    Updated Czech translation

 po/cs.po | 3506
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 1640 insertions(+), 1866 deletions(-)

commit 6dfad0c86be4442d909277f6e5b169da917012e1
Author: Tom Tryfonidis <tomtryf@gmail.com>
Date:	Sat Sep 8 12:13:47 2012 +0300

    Updated Greek translation

 po/el.po | 64
 ++++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 36 insertions(+), 28 deletions(-)

commit cd29a8e1afb8abd9d86805d5b7111fb4b42ed319
Author: Aurimas Černius <aurisc4@gmail.com>
Date:	Fri Sep 7 20:17:10 2012 +0300

    Updated Lithuanian translation

 po/lt.po | 66
 +++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 36 insertions(+), 30 deletions(-)

commit 375ea86f58d55d90aa2e01056e8063a5374563d0
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Fri Sep 7 17:54:48 2012 +0300

    Updated Belarusian translation.

 po/be.po | 2503
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1249 insertions(+), 1254 deletions(-)

commit cc0f468d7ca45b3207ce4acac796ab7ed761c353
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 7 15:14:18 2012 +0200

    remove release flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit eedff27a0cd54a7d394d46f47e95ed4d4bdb4c05
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Sep 7 16:03:44 2012 +0300

    Updated Hebrew translation.

 po/he.po | 92
 +++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 50 insertions(+), 42 deletions(-)

commit 40113ff660a2f9e602d908d271421496adf271ff
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 7 14:47:11 2012 +0200

    prepare 3.5.91.1

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

commit aedb262e0da4423805b3e2285019f6a9342d5135
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 7 14:31:58 2012 +0200

    add a FIXME about the initial value of the 'remember' checkbox

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

commit 0c4079edb20dc99d17dc8e2b212f3fca7841357b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 7 14:25:57 2012 +0200

    account-settings: always save the password into the password storage

    This ensures that the password is stored with the proper 'remember'
    value.

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

commit 689c34ab5fec2ad965e934a532b6fca4008c06ef
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 7 12:18:17 2012 +0200

    consider account widget has changed if the remember checkbox is
    changed

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

 libempathy-gtk/empathy-account-widget.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

commit 39505b161f8034a1377488492e063db08ce54f2d
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Fri Sep 7 12:57:37 2012 +0200

    EmpathyRosterWindow: refactor error infobar code

 data/empathy.css	     |	 8 ++
 src/empathy-roster-window.c | 299
 ++++++++++++++------------------------------
 2 files changed, 105 insertions(+), 202 deletions(-)

commit 744fa348bf3f157b95af77446ff2b4440554bf2e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 7 11:07:57 2012 +0200

    accounts_dialog_update_settings: fix if no account is selected

    The logic changed if no account is selected as new account are now
    added using
    a separated dialog. So if no account is selected we can certainly
    add a new
    account but not remove anything.

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

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

commit c786f765510f4796153f23b7c6cd549e1d6a2a6c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 7 10:56:11 2012 +0200

    ll-xmpp-assistant: deal with the im-local-xmpp not being found

    For some reason my test user can't find it; best to not raise warnings
    in this
    case.

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

 libempathy-gtk/empathy-local-xmpp-assistant-widget.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit bda7803e256668ef173342429c4e55de8cae1456
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 5 11:58:35 2012 +0200

    mcp-account-manager-uoa: reconnect accounts when they are not failing
    any more

    We want to automatically reconnect failing accounts when user
    refreshed the
    credentials.

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

 .../mc-plugin/mcp-account-manager-uoa.c	    | 37
 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)

commit 714036edd7111165600338c9b1de72c247926764
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 7 09:14:57 2012 +0200

    Depend on mission-control 5.13.1

    Needed for the new reconnect plugin API.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2aca51f0e02313124ac3ddfe7c7ab3bb0060c3de
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 5 11:33:21 2012 +0200

    webcredentials-monitor: track failures

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

 .../mc-plugin/empathy-webcredentials-monitor.c     | 143
 +++++++++++++++++++--
 .../mc-plugin/empathy-webcredentials-monitor.h     |	8 +-
 2 files changed, 142 insertions(+), 9 deletions(-)

commit 15813f2b1708d9ec01e593a2f19ca4e5592e8052
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 5 10:47:41 2012 +0200

    webcredentials-monitor: get a proxy on the D-Bus object

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

 .../mc-plugin/empathy-webcredentials-monitor.c     | 44
 +++++++++++++++++++++-
 1 file changed, 42 insertions(+), 2 deletions(-)

commit be4231bfd2bd06d23a2ddf9c5910444eb2541f5d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 5 09:44:45 2012 +0200

    add empathy-webcredentials-monitor

    Just the skeleton so far.

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

 ubuntu-online-accounts/mc-plugin/Makefile.am	    |	1 +
 .../mc-plugin/empathy-webcredentials-monitor.c     | 116
 +++++++++++++++++++++
 .../mc-plugin/empathy-webcredentials-monitor.h     |  53 ++++++++++
 3 files changed, 170 insertions(+)

commit febd3c5c52a1bc275dea77d86b3bab20594ad4ec
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Thu Sep 6 23:16:02 2012 +0200

    [l10n] Updated Italian translation.

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

commit 190353cd2cb2ba0566598e6bf6332f7294a13182
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Thu Sep 6 22:17:38 2012 +0200

    [l10n] Updated Italian translation.

 po/it.po | 69
 +++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 38 insertions(+), 31 deletions(-)

commit 0797d2389eebf27970c8664243d5895ebf93667f
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Thu Sep 6 20:51:36 2012 +0200

    Updated Slovenian translation

 po/sl.po | 496
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 238 insertions(+), 258 deletions(-)

commit 0762876afc5ad7eec23696179f28d9bafb196563
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Thu Sep 6 18:22:38 2012 +0200

    Updated Spanish translation

 po/es.po | 74
 +++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 41 insertions(+), 33 deletions(-)

commit 8af24addff899127fc433e0e4233cd568bd2ab1c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 6 16:25:23 2012 +0200

    roster-window: display loading page when reconnecting accounts

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

 src/empathy-roster-window.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

commit f6a74bbbfd94d2bb6eef27e7e2b5f5cb45927371
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 6 16:15:59 2012 +0200

    roster-window: inline hide/show_contacts_loading in
    set_notebook_page()

    It's cleaner to have all the logic deciding which page to display in
    set_notebook_page().

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

 src/empathy-roster-window.c | 40 +++++++++++++++-------------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

commit 80ccb990d65628a31694edc94dcc2cb1511f5d9d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 6 15:48:33 2012 +0200

    roster-window: update the roster page when the most available
    presence changes

    Fix a race between all the contacts being removed, and so the roster
    being empty, and the presence notification.

 src/empathy-roster-window.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 96020e16337fe47fe35d88db9fb2503bc213b86e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 6 15:41:47 2012 +0200

    actually display the 'go online' button

    I added this flag exactly for this and then forgot to use it...

 src/empathy-roster-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6be8487c6325e206fa9741d6c91a4c2420169e1b
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Sep 5 20:14:41 2012 -0400

    Don't show "Topic: " in tooltips if there is none

    I think I made this regress when I made Empathy understand the new
    Subject interface.

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

 src/empathy-chat-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f81f33ec7dbecdb94f4d7a032ab852ecf9593cb2
Author: Fábio Nogueira <fnogueira@gnome.org>
Date:	Thu Sep 6 09:09:33 2012 -0400

    Updated Brazilian Portuguese translation.

 po/pt_BR.po | 3717
 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 1846 insertions(+), 1871 deletions(-)

commit a61ed79e43f7ad337f542861544dd553cbe07640
Author: Og B. Maciel <ogmaciel@gnome.org>
Date:	Thu Sep 6 09:08:17 2012 -0400

    Fixed path to accounts-plugin-widget.c file.

 po/POTFILES.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ce780de356a0b60d0e7058019397510018b092bd
Author: Arash Mousavi <mousavi.arash@gmail.com>
Date:	Thu Sep 6 17:02:34 2012 +0430

    l10n: Updated Persian translation

 po/fa.po | 4021
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 2112 insertions(+), 1909 deletions(-)

commit d001dd2ca3436cae899456994230b22e1c6ec6c7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 6 10:12:44 2012 +0200

    UOA account plugins: move shared code to a shared lib

    Avoid to redefine existing symbols when different plugins are loaded.

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

 .../cc-plugins/account-plugins/Makefile.am	    | 129
 +++++++--------------
 .../cc-plugins/generate-plugins.py		    |  25 +++-
 2 files changed, 64 insertions(+), 90 deletions(-)

commit b73b93e7cfb16579ef6ec18ef01acdac2c6c24f3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 6 09:49:10 2012 +0200

    Move account plugins to their own dir

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

 configure.ac					    |	1 +
 ubuntu-online-accounts/cc-plugins/Makefile.am	    | 228 +----------
 .../cc-plugins/account-plugins/Makefile.am	    | 225 +++++++++++
 .../account-plugins/empathy-accounts-plugin-aim.c  |  46 +++
 .../account-plugins/empathy-accounts-plugin-aim.h  |  75 ++++
 .../empathy-accounts-plugin-gadugadu.c		    |  46 +++
 .../empathy-accounts-plugin-gadugadu.h		    |  75 ++++
 .../empathy-accounts-plugin-groupwise.c	    |  46 +++
 .../empathy-accounts-plugin-groupwise.h	    |  75 ++++
 .../account-plugins/empathy-accounts-plugin-icq.c  |  46 +++
 .../account-plugins/empathy-accounts-plugin-icq.h  |  75 ++++
 .../account-plugins/empathy-accounts-plugin-irc.c  |  46 +++
 .../account-plugins/empathy-accounts-plugin-irc.h  |  75 ++++
 .../empathy-accounts-plugin-jabber.c		    |  46 +++
 .../empathy-accounts-plugin-jabber.h		    |  75 ++++
 .../empathy-accounts-plugin-local-xmpp.c	    |  46 +++
 .../empathy-accounts-plugin-local-xmpp.h	    |  75 ++++
 .../account-plugins/empathy-accounts-plugin-mxit.c |  46 +++
 .../account-plugins/empathy-accounts-plugin-mxit.h |  75 ++++
 .../empathy-accounts-plugin-myspace.c		    |  46 +++
 .../empathy-accounts-plugin-myspace.h		    |  75 ++++
 .../empathy-accounts-plugin-sametime.c		    |  46 +++
 .../empathy-accounts-plugin-sametime.h		    |  75 ++++
 .../account-plugins/empathy-accounts-plugin-sip.c  |  46 +++
 .../account-plugins/empathy-accounts-plugin-sip.h  |  75 ++++
 .../empathy-accounts-plugin-widget.c		    | 431
 +++++++++++++++++++++
 .../empathy-accounts-plugin-widget.h		    |  76 ++++
 .../empathy-accounts-plugin-yahoo.c		    |  46 +++
 .../empathy-accounts-plugin-yahoo.h		    |  75 ++++
 .../empathy-accounts-plugin-yahoojp.c		    |  46 +++
 .../empathy-accounts-plugin-yahoojp.h		    |  75 ++++
 .../empathy-accounts-plugin-zephyr.c		    |  46 +++
 .../empathy-accounts-plugin-zephyr.h		    |  75 ++++
 .../account-plugins/empathy-accounts-plugin.c	    | 125 ++++++
 .../account-plugins/empathy-accounts-plugin.h	    |  69 ++++
 .../cc-plugins/empathy-accounts-plugin-aim.c	    |  46 ---
 .../cc-plugins/empathy-accounts-plugin-aim.h	    |  75 ----
 .../cc-plugins/empathy-accounts-plugin-gadugadu.c  |  46 ---
 .../cc-plugins/empathy-accounts-plugin-gadugadu.h  |  75 ----
 .../cc-plugins/empathy-accounts-plugin-groupwise.c |  46 ---
 .../cc-plugins/empathy-accounts-plugin-groupwise.h |  75 ----
 .../cc-plugins/empathy-accounts-plugin-icq.c	    |  46 ---
 .../cc-plugins/empathy-accounts-plugin-icq.h	    |  75 ----
 .../cc-plugins/empathy-accounts-plugin-irc.c	    |  46 ---
 .../cc-plugins/empathy-accounts-plugin-irc.h	    |  75 ----
 .../cc-plugins/empathy-accounts-plugin-jabber.c    |  46 ---
 .../cc-plugins/empathy-accounts-plugin-jabber.h    |  75 ----
 .../empathy-accounts-plugin-local-xmpp.c	    |  46 ---
 .../empathy-accounts-plugin-local-xmpp.h	    |  75 ----
 .../cc-plugins/empathy-accounts-plugin-mxit.c	    |  46 ---
 .../cc-plugins/empathy-accounts-plugin-mxit.h	    |  75 ----
 .../cc-plugins/empathy-accounts-plugin-myspace.c   |  46 ---
 .../cc-plugins/empathy-accounts-plugin-myspace.h   |  75 ----
 .../cc-plugins/empathy-accounts-plugin-sametime.c  |  46 ---
 .../cc-plugins/empathy-accounts-plugin-sametime.h  |  75 ----
 .../cc-plugins/empathy-accounts-plugin-sip.c	    |  46 ---
 .../cc-plugins/empathy-accounts-plugin-sip.h	    |  75 ----
 .../cc-plugins/empathy-accounts-plugin-widget.c    | 431
 ---------------------
 .../cc-plugins/empathy-accounts-plugin-widget.h    |  76 ----
 .../cc-plugins/empathy-accounts-plugin-yahoo.c     |  46 ---
 .../cc-plugins/empathy-accounts-plugin-yahoo.h     |  75 ----
 .../cc-plugins/empathy-accounts-plugin-yahoojp.c   |  46 ---
 .../cc-plugins/empathy-accounts-plugin-yahoojp.h   |  75 ----
 .../cc-plugins/empathy-accounts-plugin-zephyr.c    |  46 ---
 .../cc-plugins/empathy-accounts-plugin-zephyr.h    |  75 ----
 .../cc-plugins/empathy-accounts-plugin.c	    | 125 ------
 .../cc-plugins/empathy-accounts-plugin.h	    |  69 ----
 .../cc-plugins/generate-plugins.py		    |  33 +-
 68 files changed, 2637 insertions(+), 2640 deletions(-)

commit 006b27d7f0c5dd6efeee83e2c7bb21a60a7a138e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 5 15:59:26 2012 +0200

    Generate one GType per UOA protocol plugin

    Each plugin now has its own GType inheriting from
    EmpathyAccountsPlugin which
    is cleaner.

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

 ubuntu-online-accounts/cc-plugins/Makefile.am	    |  28 ++++
 .../cc-plugins/empathy-accounts-plugin-aim.c	    |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-aim.h	    |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-gadugadu.c  |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-gadugadu.h  |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-groupwise.c |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-groupwise.h |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-icq.c	    |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-icq.h	    |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-irc.c	    |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-irc.h	    |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-jabber.c    |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-jabber.h    |  75 ++++++++++
 .../empathy-accounts-plugin-local-xmpp.c	    |  46 ++++++
 .../empathy-accounts-plugin-local-xmpp.h	    |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-mxit.c	    |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-mxit.h	    |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-myspace.c   |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-myspace.h   |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-sametime.c  |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-sametime.h  |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-sip.c	    |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-sip.h	    |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-yahoo.c     |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-yahoo.h     |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-yahoojp.c   |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-yahoojp.h   |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-zephyr.c    |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-zephyr.h    |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin.c	    |	6 -
 .../cc-plugins/empathy-accounts-plugin.h	    |	2 -
 .../cc-plugins/generate-plugins.py		    | 159
 ++++++++++++++++++++-
 32 files changed, 1880 insertions(+), 9 deletions(-)

commit a49a0e8b08ff8ad164304f0600b90178b0ff44c6
Author: Andika Triwidada <andika@gmail.com>
Date:	Thu Sep 6 15:45:36 2012 +0700

    Updated Indonesian translation

 po/id.po | 59 ++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 25 deletions(-)

commit 05f557bd0ff44bdece4bb0b2f25e86ccb693e35d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 6 10:01:18 2012 +0200

    update tests/interactive/.gitignore

 tests/interactive/.gitignore | 2 ++
 1 file changed, 2 insertions(+)

commit 720b107aa539f8e39d5ab57d4b9fcbf013f6d501
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Wed Sep 5 19:35:57 2012 +0200

    Updated Polish translation

 po/pl.po | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

commit 5249fdf07c03b0e9bc873ace2a66a7b861fd41c2
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:	Wed Sep 5 21:35:13 2012 +0530

    updated Tamil translation

 po/ta.po | 45 ++++++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 19 deletions(-)

commit 7bbdfa8b65593f667e9ef72178469e78cba52638
Author: Alexandre Franke <alexandre.franke@gmail.com>
Date:	Wed Sep 5 15:56:32 2012 +0200

    Update French translation

 po/fr.po | 3024
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1505 insertions(+), 1519 deletions(-)

commit 52028717069c3fdd56e4228882819b31bf678c32
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Wed Sep 5 12:42:05 2012 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 58 +++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 25 deletions(-)

commit 293da11af4379e0b1ccf2a16a3bb05ad59375122
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Wed Sep 5 11:53:28 2012 +0200

    Updated Serbian translation

 po/sr.po	| 120
 ++++++++++++++++++++++++++++++++-------------------------
 po/sr@latin.po | 120
 ++++++++++++++++++++++++++++++++-------------------------
 2 files changed, 134 insertions(+), 106 deletions(-)

commit 5f06612af11571b8bdf69f2150a3746a9b7cf94a
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Wed Sep 5 10:32:15 2012 +0200

    Updated Galician translations

 po/gl.po | 51 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

commit 33f34abc1f83821cb55cfa1a8f4e3e136974bd1f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 4 15:04:25 2012 +0200

    roster-window: display a button to go online

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

 src/empathy-roster-window.c  | 22 ++++++++++++++++++++++
 src/empathy-roster-window.ui | 26 ++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

commit 34789c7c8447174ec0881e2abbf029ae34a37c99
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 4 14:39:02 2012 +0200

    display_page_message: use a flag instead of booleans

    More scalable.

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

 src/empathy-roster-window.c | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

commit e52959e0abfcfa322bf3e0e7587e62f1d49d8699
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 4 14:34:10 2012 +0200

    roster-window: display a specific message when we are offline

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

 src/empathy-roster-window.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 20a856d61a04345ceb91919dc965ae19522da10b
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date:	Tue Sep 4 11:54:05 2012 +0100

    Updated British English translation

 po/en_GB.po | 3707
 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 1822 insertions(+), 1885 deletions(-)

commit 3f326c718659425fd2570ef0a2aba3fcefa7731c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 4 11:22:09 2012 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c91daed0f7eed69b0df2f40963ce623c0821a8a9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 4 11:07:51 2012 +0200

    prepare 3.5.91

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

commit f6ad0c3b5b0ffcf6c89430a684c32b130f8e3ec1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 4 10:11:04 2012 +0200

    roster-view: compare groups using strcmp

    Groups are added to the list in another file (the model) so the
    string will
    have another address than the one in the view.

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

 libempathy-gtk/empathy-roster-view.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 6d5797f1c816826e4d1e398f7cc0503db1e993fb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 30 10:10:38 2012 +0200

    roster-view: don't display offline not favorite top contacts

    We just want to always display the favorites offline contacts in
    the top
    contact section.

    One may say that we are kinda breaking the model group abstraction,
    which is
    probably true. Ideally we may want to have a roster view subclass
    implementing
    the top contact logic but life is too short.

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

 libempathy-gtk/empathy-roster-view.c | 44
 +++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

commit 53c73e017555fc7bd64359d794817502ef774f87
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 30 11:18:59 2012 +0200

    model-manager: connect on the "favourites-changed" signal

    That's a proper signal, not a property change.

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

 libempathy-gtk/empathy-roster-model-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d36621324adf861967ffcf233791d97d224a21d3
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Tue Sep 4 09:22:25 2012 +0200

    Updated Hungarian translation

 po/hu.po | 437
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 209 insertions(+), 228 deletions(-)

commit d25442bccc9b9d143fe92f2506f6d84499ece829
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 3 17:09:55 2012 +0200

    roster-view: clear_view: start by cleaning our internal hash tables

    Removing and destroying the widgets contained in the view will call
    empathy_roster_view_remove(). This function may use some of the
    internal hash
    tables which now contain destroyed object.

    It's safer to clean the internal hash tables first as we are about
    to destroy
    their content anyway.

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

 libempathy-gtk/empathy-roster-view.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 979f90a0425dec607d58008fc8ba8a5966179807
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 3 14:49:46 2012 +0200

    chat_window_new_message_cb: early return when handling outgoing msg

    There is no need to continue processing a message (unread count, play
    incoming message sound) if it's an outgoing one.

    Fix a bug where we use to play to ougoing sound *and* the incoming
    sound when
    sending a message.

 src/empathy-chat-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 02ff7d33ac6453ea61c2f998710d40044b1539e9
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Sep 3 13:54:06 2012 +0200

    In the gst 0.10 case, link the volume element to capsfilter

 src/empathy-audio-src.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit c40cc8f6d6510b66f774c70097e0d19ee933f783
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Sep 3 13:33:13 2012 +0200

    Fix AC_ARG_ENABLE usage

 configure.ac | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 907cf465256f578642e63a1c00a80c6955d7549b
Author: Tom Tryfonidis <tomtryf@gmail.com>
Date:	Mon Sep 3 13:14:16 2012 +0300

    Updated Greek translation

 po/el.po | 99
 +++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 51 insertions(+), 48 deletions(-)

commit d641d0d903b9847864acae4a47aa948131aa50b0
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Sun Aug 26 19:23:06 2012 +0200

    Port to gstreamer 1.0

 configure.ac		   | 55
 ++++++++++++++++++++++++++++++++++++-----------
 src/Makefile.am	   |  2 +-
 src/empathy-audio-sink.c  | 19 ++++++++++++++++
 src/empathy-audio-src.c   | 39 ++++++++++++++++++---------------
 src/empathy-call-window.c | 32 +++++++++++++++++++++++++++
 src/empathy-video-src.c   | 34 +++++++++++++++++++++++++++++
 6 files changed, 151 insertions(+), 30 deletions(-)

commit 0af7f92b16f1d1b3527463906936fa0ea602ad57
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 31 11:40:38 2012 +0200

    Just check for cheese-gtk

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d9687df7eb5a4e98282a51461152c154c219e2c1
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:	Sun Sep 2 12:03:14 2012 +0530

    updated Tamil translation

 po/ta.po | 4032
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1989 insertions(+), 2043 deletions(-)

commit 1df9b785d0a45e59eeed4a61b9665877e43e4ed6
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Sat Sep 1 22:07:14 2012 +0200

    Updated Polish translation

 po/pl.po | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

commit 0e2a232f2ed90f04a2245c5241e471c865f756ae
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 31 10:30:12 2012 +0200

    roster-view: check_if_empty(): check groups as well

    The roster is empty if there is no group displayed as well. We don't
    want to
    display an empty message just because the user collapsed all his
    groups.

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

 libempathy-gtk/empathy-roster-view.c | 39
 +++++++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

commit 1ff28ec682cd537f7626e1fac53457139301b64f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 31 10:07:57 2012 +0200

    roster-view: factor out check_if_empty()

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

 libempathy-gtk/empathy-roster-view.c | 32
 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

commit 2957c34ec79bc2585435d99e43f6bfb048025285
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Mon Aug 27 09:03:34 2012 +0200

    emapthy-call: Camera toggle button isn't a GtkToggleToolButton

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

commit c82b599fc2b9bc38fa1d4476ae43b3f75987c624
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Thu Aug 30 14:21:47 2012 +0200

    Updated Galician translations

 po/gl.po | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

commit 52d535121a9cbeebd182c144a984122c5973a7db
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 30 14:11:20 2012 +0200

    roster-view: remember state expanded status of groups

    Pretty simple actually, that's a simple port of the logic from
    empathy-individual-view.

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

 libempathy-gtk/empathy-roster-view.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit c11c1cb31e7b46f89de4fd41f9d75f2731c5ded0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 30 12:06:42 2012 +0200

    roster-view: make sure the same contact isn't added twice to the
    same group

    Calling empathy_roster_model_get_groups_for_individual() in
    individual_added
    may have the side effect for folks to discover the contact's groups
    and so
    fire a bunch of signals leading us to add the contact in the group.
    Then we look for his groups in individual_added() and re-add him
    a second
    time.

    Fix this by making sure we won't add the same contact twice to the
    same group.

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

 libempathy-gtk/empathy-roster-view.c | 3 +++
 1 file changed, 3 insertions(+)

commit 07b33c748d2227f6932afbcc1dc44a404354ec83
Author: Duarte Loreto <happyguy_pt@hotmail.com>
Date:	Wed Aug 29 19:51:07 2012 +0100

    Updated Portuguese translation

 po/pt.po | 3743
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1850 insertions(+), 1893 deletions(-)

commit 5f46f971707112e712ea0b7e2f64cdd89d4074dc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 29 15:50:35 2012 +0200

    roster-model-manager: always remove removed individual from the
    top group

    If the individual has been removed from the manager we should always
    remove it
    from the top group members, even if he's still eligible for this
    group.

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

 libempathy-gtk/empathy-roster-model-manager.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 9ab11de8216bfe2d68d3ddb1ab62c4f586d7efd2
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Sun Aug 26 19:11:11 2012 +0200

    Remove the level and rms measurements

    The UI hasn't used the RMS and peak values from the input source for a
    while, so lets remove it.

 src/empathy-audio-src.c | 154
 +-----------------------------------------------
 1 file changed, 2 insertions(+), 152 deletions(-)

commit 03d0826e2278ee3d29a6214b12ba6ee7d48e0c7c
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Sun Aug 26 16:23:14 2012 +0200

    Remove gst dependency from libempathy

    libempathy only used gstreamer api directly from the camera monitor,
    which simply uses it for its debug infrastructure.. Use the standard
    empathy debug infrastruction instead so we can drop the gstreamer
    dependency.

 configure.ac				   |  4 ++--
 libempathy/cheese-camera-device-monitor.c | 29
 ++++++++++++-----------------
 libempathy/cheese-camera-device-monitor.h |  1 -
 libempathy/empathy-debug.c		   |  1 +
 libempathy/empathy-debug.h		   |  1 +
 5 files changed, 16 insertions(+), 20 deletions(-)

commit 6e3ea627e70266d8c3739300e900a5b7bc0763bc
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Sun Aug 26 16:20:56 2012 +0200

    Remove libempathy-gtk dependency on gstreamer

    libempathy-gtk uses gstreamer directly only for one utility function
    used by empathy-call. Split this one out into a call specific utility
    file.

 libempathy-gtk/empathy-call-utils.c | 35 --------------------
 libempathy-gtk/empathy-call-utils.h |	5 ---
 src/Makefile.am		     |	2 ++
 src/empathy-audio-sink.c	     |	6 ++--
 src/empathy-audio-src.c	     |	6 ++--
 src/empathy-audio-utils.c	     | 65
 +++++++++++++++++++++++++++++++++++++
 src/empathy-audio-utils.h	     | 33 +++++++++++++++++++
 7 files changed, 106 insertions(+), 46 deletions(-)

commit f7ab6457995133ccd3fd32ce028c6c8cb1e68322
Author: Aurimas Černius <aurisc4@gmail.com>
Date:	Tue Aug 28 23:17:51 2012 +0300

    Updated Lithuanian translation

 po/lt.po | 3275
 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 1412 insertions(+), 1863 deletions(-)

commit b29e58bc864acce8dd43f7fdf2133540865f8211
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Mon Aug 20 17:11:18 2012 +0200

    Updated egg-list-box version

 libempathy-gtk/egg-list-box | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d15a73b05766b8a446c5f00a8e8a76efd671a797
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 28 13:07:28 2012 +0200

    sanity_ctx_ref() is only used by UOA code atm

 src/empathy-sanity-cleaning.c | 2 ++
 1 file changed, 2 insertions(+)

commit a4d45d9997e9c55a75f147cab51184a500640ca1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 28 10:56:11 2012 +0200

    keep our reference on the global ctx until the account has been
    removed

    This ensures that the proccess stays running until we are actually
    done.

 src/empathy-sanity-cleaning.c | 44
 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

commit 838610a7545aca9f8209fef864153f0404fc7309
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 28 10:53:42 2012 +0200

    Remove the old account even if we fail to create the new one

    There is no point keeping a ghost account around.

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

commit 2db1f1f4e345c20b92c3914551cbd8c7a0f79676
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 28 10:50:54 2012 +0200

    uoa_migration_done: free data once we're done with it

 src/empathy-sanity-cleaning.c | 2 ++
 1 file changed, 2 insertions(+)

commit c020298d0898da9f6ba17ab5e1dd3bdd68b74b2c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 28 10:19:00 2012 +0200

    uoa-migration: delete account if plugin is missing

    Best to have to re-create an account than having a ghost account
    staying
    around.

 src/empathy-sanity-cleaning.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

commit 2f87cddf8c0bec795fa06cc4ce5f15e5c755748a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 27 16:41:13 2012 +0200

    auth-client: wait for the migration code to be done before starting
    the timer

 src/empathy-auth-client.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

commit bc717ec969a0e02477208304d50872344744dbae
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 27 16:38:30 2012 +0200

    Turn migration code to an async function

 src/empathy-auth-client.c     |   2 +-
 src/empathy-sanity-cleaning.c | 112
 +++++++++++++++++++++++++++++++++++++-----
 src/empathy-sanity-cleaning.h |   8 ++-
 3 files changed, 107 insertions(+), 15 deletions(-)

commit 79ea3b4ad24160ad2d0a32b24adcd4fb526f9eca
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 27 14:22:37 2012 +0200

    try installing missing account-plugin-*

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

 src/empathy-sanity-cleaning.c | 91
 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

commit 7c6cb4b3b6cf3cfe6379b9d3a0f4a8e80fbebdd9
Author: Nilamdyuti Goswami <nilamdyuti@gmail.com>
Date:	Mon Aug 27 23:09:12 2012 +0530

    Implemented FUEL entries to Assamese translation

 po/as.po | 70
 ++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

commit b0e67cf7d5d45acdb396b929134beb05202c7731
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 27 15:58:13 2012 +0200

    factor out migrate_account_to_uoa()

 src/empathy-sanity-cleaning.c | 118
 ++++++++++++++++++++++--------------------
 1 file changed, 63 insertions(+), 55 deletions(-)

commit 02b2080bc1e3d75f5b88bfe22ce353bfe26f9a04
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 27 15:00:45 2012 +0200

    pkg-kit: use an 'infinite' timeout when calling InstallPackageNames

    This method can takes quiet a while before returning (if user has
    to enter his
    admin password for example).

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

 libempathy/empathy-pkg-kit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4cdf0b0dd73333716166579699030b227bb57ace
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Fri Aug 24 14:35:16 2012 +0200

    UOA auth: Request password if no credentials have ever be stored

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

 libempathy/empathy-uoa-auth-handler.c | 83
 +++++++++++++++++++++++++++--------
 1 file changed, 65 insertions(+), 18 deletions(-)

commit 401f5f48e9b26628c7df8f1d97336cebbab870c0
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Thu Aug 23 15:03:51 2012 +0200

    UOA auth: handle the password mechanism as well

    Since password is stored in SSO now, we can use the same code path
    than other accounts.

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

 libempathy/empathy-uoa-auth-handler.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

commit 26aa1b3654cab66d91e0ada194be547e790a847b
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Thu Aug 23 15:02:10 2012 +0200

    UOA auth: Wait for callback when requesting password

    signon_auth_session_process() does not keep its own ref on the session
    object, so freeing the AuthContext before callback cancels the call.

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

 libempathy/empathy-uoa-auth-handler.c | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

commit fb84a9d544c27f11c3c91efdad8adc4096471a79
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Thu Aug 23 14:57:52 2012 +0200

    UOA auth: Move more code into auth_context_new()

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

 libempathy/empathy-uoa-auth-handler.c | 72
 ++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 35 deletions(-)

commit 9ce89862ae5bead69519f3238794ffbf3988dcf9
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Thu Aug 23 15:01:16 2012 +0200

    UOA auth: factor out auth_context_done()

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

 libempathy/empathy-uoa-auth-handler.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

commit c8a0a072d122b86306e47044bf36553c74baf9df
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Aug 22 16:45:04 2012 +0200

    UOA auth: rename QueryInforData to AuthContext

    This data is not used only to for the query_info call anymore,
    so better have a more generic name.

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

 libempathy/empathy-uoa-auth-handler.c | 88
 +++++++++++++++++------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

commit 51507f03677306f35097e10c1e81d57961d05388
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Aug 22 13:28:32 2012 +0200

    Move X-TELEPATHY-PASSWORD mechanism code into
    empathy-sasl-mechanisms.c

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

 libempathy/empathy-sasl-mechanisms.c	  |  35 ++++++++++
 libempathy/empathy-sasl-mechanisms.h	  |   6 ++
 libempathy/empathy-server-sasl-handler.c | 106
 ++++++++-----------------------
 3 files changed, 67 insertions(+), 80 deletions(-)

commit d183765f18a915d889f4b6c6fc6a7f1692522809
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Thu Aug 9 10:38:13 2012 +0200

    UOA: Store password into signond instead of gnome-keyring

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

 libempathy/empathy-keyring.c | 409
 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 409 insertions(+)

commit c3933b7972672e533c33cf9f401a1dea83ba1368
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Fri Aug 24 13:13:07 2012 +0200

    UOA: Use an AgManager singleton

    This is especially useful in empathy-keyring where it would reload
    all accounts each time we set a password.

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

 libempathy/Makefile.am				    |  2 +
 libempathy/empathy-uoa-auth-handler.c		    |  7 ++--
 libempathy/empathy-uoa-utils.c			    | 49
 ++++++++++++++++++++++
 libempathy/empathy-uoa-utils.h			    | 35 ++++++++++++++++
 .../cc-plugins/empathy-accounts-plugin.c	    |  7 +++-
 5 files changed, 95 insertions(+), 5 deletions(-)

commit 1b787a9f326fa5d4224f1a0fe7be56f455b2eedd
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Aug 22 19:23:41 2012 +0200

    UOA: Set password auth mechanism/method on generic IM services

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

 ubuntu-online-accounts/cc-plugins/generate-plugins.py		  | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/aim-im.service	  | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/gadugadu-im.service   | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/groupwise-im.service  | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/icq-im.service	  | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/irc-im.service	  | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/jabber-im.service	  | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/local-xmpp-im.service | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/mxit-im.service	  | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/myspace-im.service	  | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/sametime-im.service   | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/sip-im.service	  | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/yahoo-im.service	  | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/yahoojp-im.service	  | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/zephyr-im.service	  | 4 ++++
 15 files changed, 60 insertions(+)

commit 4f0673c142e6529b6aaa0022b8463fa67b2ff060
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Fri Aug 24 10:14:43 2012 +0200

    Remember password at least until session restart

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

 libempathy-gtk/empathy-account-widget.c  | 14 ++++----------
 libempathy/empathy-account-settings.c	  | 16 ++++++++++++++--
 libempathy/empathy-account-settings.h	  |  4 ++++
 libempathy/empathy-keyring.c		  |  5 ++++-
 libempathy/empathy-keyring.h		  |  2 +-
 libempathy/empathy-server-sasl-handler.c | 12 ++++--------
 6 files changed, 31 insertions(+), 22 deletions(-)

commit 4ef8dd58943034270f935f081e290e7540a792f9
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Aug 27 14:43:55 2012 +0200

    UOA: Migrate passwords to SSO

 src/empathy-sanity-cleaning.c | 112
 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 98 insertions(+), 14 deletions(-)

commit d3b83e5c737e8c700db880434a9a529dbfd20c8d
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date:	Mon Aug 27 18:19:36 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 2631
 +++++++++++++++++++++++++++++-----------------------------
 po/zh_TW.po | 2637
 +++++++++++++++++++++++++++++------------------------------
 2 files changed, 2617 insertions(+), 2651 deletions(-)

commit bdcd41b29068e30479c448a56cb76ea28ab160ce
Author: Nilamdyuti Goswami <nilamdyuti@gmail.com>
Date:	Sun Aug 26 22:10:58 2012 +0530

    Assamese translation updated

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

commit ad284ad39cacbb6d1af56167e448f835640a0a3d
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Sun Aug 26 10:20:53 2012 +0300

    Updated Hebrew translation.

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

commit e9e419b59ee9639516827239975449e7b95ed7bd
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Sun Aug 26 00:24:59 2012 +0400

    Updated Russian translation

 po/ru.po | 3536
 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 1534 insertions(+), 2002 deletions(-)

commit 3f7d6d6aaa61376b19b2cd73ba7a81af2c62ab71
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Fri Aug 24 16:16:53 2012 +0200

    [l10n] Updated Italian translation.

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

commit 5d48b9b3ee3c24095d7ecc1a102a8e0b4bbbc862
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Thu Aug 23 00:16:59 2012 +0200

    Updated Polish translation

 po/pl.po | 3639
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 1702 insertions(+), 1937 deletions(-)

commit 793497ef17da9a0d9b6c5d95fb62826787e46a14
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Aug 22 15:02:12 2012 +0200

    UOA: Changing enable state of MC account should not modify per-service
    state

    ag_account_set_enabled() is not global enable state, we have to
    ensure that
    selected service is NULL before that.

 ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c | 3 +++
 1 file changed, 3 insertions(+)

commit 82f3ed08b45446a8fcf258a0d2202c18defdcf8f
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Wed Aug 22 10:42:54 2012 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 417
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 196 insertions(+), 221 deletions(-)

commit 19d7727547d4b4cfcb2ac4468e08692e3b50def9
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:	Wed Aug 22 14:17:19 2012 +0700

    Updated Vietnamese translation

 po/vi.po | 165
 +++++++++++++++++++++++----------------------------------------
 1 file changed, 61 insertions(+), 104 deletions(-)

commit 17568394a41935c8f6f5c5a2d51f82a4d050441c
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:	Wed Aug 22 14:07:47 2012 +0700

    po/vi: imported from Damned Lies

 po/vi.po | 3767
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1881 insertions(+), 1886 deletions(-)

commit 03a3caf8fe17f17f335a4dd694b3b4b4826d7dbe
Author: Andika Triwidada <andika@gmail.com>
Date:	Tue Aug 21 15:07:25 2012 +0700

    Updated Indonesian translation

 po/id.po | 458
 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 214 insertions(+), 244 deletions(-)

commit 0506c711929eeb3d507ac08695b81b1f5944b66e
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Aug 20 20:03:20 2012 +0200

    Updated Spanish translation

 po/es.po | 89
 ++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 45 insertions(+), 44 deletions(-)

commit d790d2d8c593fc7452b6eff800ef72699fdd1afa
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Aug 20 18:31:33 2012 +0200

    Fix missing names in NEWS

    Sorry Laurent... :-)

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

commit a99a2616cec829c2daf36f51f29847995ec23a4b
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Aug 20 18:22:23 2012 +0200

    remove release flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3d626e4feadaf6cf3b967a9dc1cf7d7c8b058af2
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Aug 20 18:09:27 2012 +0200

    Prepare 3.5.90

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

commit 3c848eaf85eed142872b55fa8cdcc48523562518
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Aug 20 18:01:17 2012 +0200

    Change default to not show offline contacts

    According to Aday it does not scale with new roster view, and we now
    display a msg when no contacts are displayed.

 data/org.gnome.Empathy.gschema.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 547c7e8d49b1e7a6ce0c77fc2b002c64f02fb1d5
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Aug 20 17:58:13 2012 +0200

    EmpathyRosterWindow: Show message when there is no online accounts

    See https://bugzilla.gnome.org/show_bug.cgi?id=656097#c20

 src/empathy-roster-window.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

commit bad888152af7f4920001f41ffe069ae56d913dc7
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Aug 20 17:20:02 2012 +0200

    UOA auth handler: Inform SSO when access token didn't work

 libempathy/empathy-sasl-mechanisms.c  |  1 +
 libempathy/empathy-uoa-auth-handler.c | 68
 ++++++++++++++++++++++-------------
 2 files changed, 45 insertions(+), 24 deletions(-)

commit 1bca289287498a3b4b091b074e2ad954dec6b9d2
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Aug 20 13:23:23 2012 +0200

    Telepathy service is "google-talk" not "google"

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

 ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c | 13
 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

commit fea5bd16c2ccd4a20ae43afbfa218227c7d0ef51
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Mon Aug 20 13:33:52 2012 +0200

    [l10n] Updated Italian translation.

 po/it.po | 4892
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 2189 insertions(+), 2703 deletions(-)

commit 01cad38fb3649a649999fa5544debb4ba653ec22
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Thu Aug 16 23:39:36 2012 +0200

    Updated Galician translations

 po/gl.po | 214
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 109 insertions(+), 105 deletions(-)

commit e15e002b7371f1491507f984fe0e119b09094250
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Aug 6 15:04:48 2012 +0200

    migrate existing TP accounts to libaccounts

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

 src/empathy-sanity-cleaning.c | 111
 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 110 insertions(+), 1 deletion(-)

commit 92ab370c49411dede5d52f402220cc4bb0bd2e68
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 3 14:51:40 2012 +0200

    accounts-dialog: invoke the UOA panel if needed

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

 src/empathy-accounts-dialog.c | 91
 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

commit 1a3c57d235bd751c4e120266cd3f24ad6afd7a8a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 3 14:25:25 2012 +0200

    use empathy_launch_external_app() to launch gnome-contacts

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

 .../empathy-individual-information-dialog.c	    | 62
 +++++++---------------
 1 file changed, 18 insertions(+), 44 deletions(-)

commit dd60d75a6811d1a728c290b45de343c84e298a6d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 3 14:12:00 2012 +0200

    empathy_launch_external_app: allow to pass arguments

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

 libempathy-gtk/empathy-ui-utils.c | 33 +++++++++++++++++++--
 libempathy-gtk/empathy-ui-utils.h |  1 +
 src/empathy-accounts-dialog.c	   | 61
 ++++-----------------------------------
 3 files changed, 38 insertions(+), 57 deletions(-)

commit f4fc6c6be76bb4cdfb4ebda9ca7de6758f2f18d1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 3 14:00:48 2012 +0200

    factor out empathy_launch_external_app()

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

 libempathy-gtk/empathy-ui-utils.c | 48
 +++++++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-ui-utils.h |  3 +++
 src/empathy-accounts-dialog.c	   | 20 ++--------------
 3 files changed, 53 insertions(+), 18 deletions(-)

commit 1f872789f7cba0934744071fa85ad6bd7c35abdc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 3 13:35:17 2012 +0200

    start_external_app: fix critical warning message

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

 src/empathy-accounts-dialog.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit eb43103198994a09a2f6b4a0508b1c0484e951f2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 2 16:42:47 2012 +0200

    factor out launch_empathy_accounts()

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

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

commit 77ea9d56fb15dfd6edb1554ba31c42a7789d62d1
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Thu Aug 9 14:10:59 2012 +0200

    Use TpWeakRef when user_data of an async call is a widget

    Keeping a ref on widgets is not enough to keep it alive, because
    gtk_widget_destroy will run destroy even if there are still refs.

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

 libempathy-gtk/empathy-avatar-chooser.c		     | 13
 ++++++++-----
 .../cc-plugins/app-plugin/empathy-app-plugin-widget.c	     | 12
 ++++++++++--
 .../cc-plugins/empathy-accounts-plugin-widget.c	     | 12
 ++++++++++--
 3 files changed, 28 insertions(+), 9 deletions(-)

commit d2b704165e9bf015400b72e95d443a67ebc3060e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 9 14:12:17 2012 +0200

    accounts-plugin-widget: only use the simple account widget when
    creating account

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

 ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.c |
 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 392042f185ccca47df3e7cfd545141de2d322879
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Tue Aug 14 15:30:49 2012 +0200

    "gck/pkcs11.h" is deprecated, must use p11-kit/pkcs11.h now

 tests/mock-pkcs11.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2b6205d456525794c83d17db73b1312287032f0e
Author: Shankar Prasad <svenkate@redhat.com>
Date:	Mon Aug 13 14:10:58 2012 +0530

    Updated kn translation

 po/kn.po | 3946
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 1919 insertions(+), 2027 deletions(-)

commit a5346f80e2d9b5f2fac7909e3688a6ae69d823a8
Merge: 53257c1 91186e9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 10 17:23:52 2012 +0200

    Merge remote-tracking branch 'burton/aggregator'

commit 91186e9bfcc4dc46d329f18ff0533a6bfff97a65
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Fri Aug 10 15:51:47 2012 +0200

    model-aggregator test app filters on avatar presence

 tests/interactive/test-empathy-roster-model-aggregator.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 53257c1959bb7575cf72868e5ce798f5984d62d8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 10 15:28:30 2012 +0200

    UOA plugins: link on libempathy as well

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

 ubuntu-online-accounts/cc-plugins/Makefile.am		  | 14
 ++++++++++++++
 ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am |  1 +
 ubuntu-online-accounts/cc-plugins/generate-plugins.py	  |  1 +
 3 files changed, 16 insertions(+)

commit 8ace92204ecc0e898ad7286deeb702238b47a8be
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Thu Aug 9 10:54:06 2012 +0200

    Connected notify on individuals to refilter if needed

 libempathy-gtk/empathy-roster-model-aggregator.c | 67
 +++++++++++++++++++-----
 1 file changed, 54 insertions(+), 13 deletions(-)

commit 36bc95461bf7d6e25a04fb759348e1003588f43e
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Aug 10 15:40:05 2012 +0300

    Updated Hebrew translation.

 po/he.po | 403
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 190 insertions(+), 213 deletions(-)

commit ea38a432ab8e04d155e2d612afcff44c956ad25e
Author: Sandeep Sheshrao Shedmake <sshedmak@redhat.com>
Date:	Fri Aug 10 17:18:36 2012 +0530

    Updated Marathi Translations

 po/mr.po | 5620
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 3211 insertions(+), 2409 deletions(-)

commit ecdeb95cfa385ab0f8b7595a676dc22aecc7a49e
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Thu Aug 9 08:44:19 2012 +0200

    Added filtering function to model-aggregator

 libempathy-gtk/empathy-roster-model-aggregator.c   | 47
 ++++++++++++++++++++--
 libempathy-gtk/empathy-roster-model-aggregator.h   | 15 ++++++-
 .../test-empathy-roster-model-aggregator.c	    | 11 ++++-
 3 files changed, 66 insertions(+), 7 deletions(-)

commit 20931fb9fe11ca2b5e1510d14acbd1ea4c886ae5
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Wed Aug 8 15:15:47 2012 +0200

    New test app test-empathy-roster-model-aggregator.c

 tests/interactive/Makefile.am			    |	4 +-
 .../test-empathy-roster-model-aggregator.c	    | 151
 +++++++++++++++++++++
 2 files changed, 154 insertions(+), 1 deletion(-)

commit 9282dff7d3ec6f4ba33a2b91fc4d415463503d9a
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Wed Aug 8 15:15:14 2012 +0200

    Implemented _get_groups_for_individual

 libempathy-gtk/empathy-roster-model-aggregator.c | 26
 ++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

commit 9e5365a93f34c68bb3fa4ca41f10ed37b5ded262
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Wed Aug 8 14:46:12 2012 +0200

    New GHashTable individuals and _get_individuals implementation

 libempathy-gtk/empathy-roster-model-aggregator.c | 77
 ++++++++++++++++++++++--
 1 file changed, 71 insertions(+), 6 deletions(-)

commit c2d9e976cd89f923c01eaf3801ff57d85889a57f
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Wed Aug 8 12:29:11 2012 +0200

    Connected the aggregator to individuals-changed signal

 libempathy-gtk/empathy-roster-model-aggregator.c | 39
 ++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

commit 2a819c16c9ecd02c929156be39fa1c994cc907e2
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Wed Aug 8 11:18:38 2012 +0200

    Added new aggregator property in EmpathyRosterModelAggregator

 libempathy-gtk/empathy-roster-model-aggregator.c | 48
 ++++++++++++++++++++----
 libempathy-gtk/empathy-roster-model-aggregator.h |  6 +++
 2 files changed, 47 insertions(+), 7 deletions(-)

commit f7ba567b17c1d0d0cdc5d04e0bca4d2368be75fa
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Wed Aug 8 11:07:20 2012 +0200

    EmpathyRosterModelAggregator implements EmpathyRosterModel iface

 libempathy-gtk/empathy-roster-model-aggregator.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

commit dd5645c7493ef3abf7787797b576d1ca64f7845f
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Wed Aug 8 10:43:13 2012 +0200

    Coding style fixups

 libempathy-gtk/empathy-roster-model-aggregator.c | 3 ++-
 libempathy-gtk/empathy-roster-model-aggregator.h | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

commit c906321a8a61cf8d7a980dd088a751399bc2de7f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 8 10:37:07 2012 +0200

    add empathy-roster-model-aggregator

 libempathy-gtk/Makefile.am			  |   2 +
 libempathy-gtk/empathy-roster-model-aggregator.c | 165
 +++++++++++++++++++++++
 libempathy-gtk/empathy-roster-model-aggregator.h |  74 ++++++++++
 3 files changed, 241 insertions(+)

commit 20f50d596fa827b6d9852c8dc7bc0e8e8ca0af1d
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Wed Aug 8 23:23:10 2012 +0200

    Updated Serbian translation

 po/sr.po	| 5112
 +++++++++++++++++++++++++-------------------------------
 po/sr@latin.po | 5112
 +++++++++++++++++++++++++-------------------------------
 2 files changed, 4530 insertions(+), 5694 deletions(-)

commit 5d374811d9ed9d33fa88301dae51dc2e3368224d
Author: Nilamdyuti Goswami <nilamdyuti@gmail.com>
Date:	Wed Aug 8 21:47:50 2012 +0530

    Assamese translation updated

 po/as.po | 3611
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1780 insertions(+), 1831 deletions(-)

commit a96d4b07c725e0532507d688bc548fa007bb2312
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 8 12:10:57 2012 +0200

    keyring: fix format issue

 libempathy/empathy-keyring.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8ad196691413c2b40c525ad3a7335495b7102de3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 8 12:05:06 2012 +0200

    improve SASL debug output

 libempathy/empathy-sasl-mechanisms.c  | 4 ++++
 libempathy/empathy-uoa-auth-handler.c | 2 ++
 2 files changed, 6 insertions(+)

commit 7b5a073c39fbd8ed38cceb54ecb8f7d60dd45878
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Tue Aug 7 16:44:14 2012 +0200

    Removed now useless _get_top_individuals function in the model

 libempathy-gtk/empathy-roster-model-manager.c |  9 ---------
 libempathy-gtk/empathy-roster-model.c	       | 21 ---------------------
 libempathy-gtk/empathy-roster-model.h	       |  5 -----
 3 files changed, 35 deletions(-)

commit 44472802c9c232f7ab6639af2e0a88b090016671
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Tue Aug 7 16:28:21 2012 +0200

    Moved _contact_in_top from the model to the view

    empathy-roster-model and empathy-roster-model-manager: removed
    _contact_in_top
    empathy-roster-view: added new function contact_in_top and modified
    functions to use it

 libempathy-gtk/empathy-roster-model-manager.c | 15 -------
 libempathy-gtk/empathy-roster-model.c	       | 25 ------------
 libempathy-gtk/empathy-roster-model.h	       |  5 ---
 libempathy-gtk/empathy-roster-view.c	       | 56
 ++++++++++++++++++---------
 4 files changed, 38 insertions(+), 63 deletions(-)

commit 5ff0b2f71b6516b399deb732bfe0124e32a8a7bf
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Tue Aug 7 11:01:13 2012 +0200

    Added top_group_members list in model, view relying on it

    empathy-roster-model: no longer emits top-individuals and
    favourites-changed signals
    empathy-roster-model-manager: new top_group_members GList with filling
    function. _contact_in_top uses top_group_members. top_group_members
    is modified when top-individuals and
    favourites-changed signals are caught.
    empathy-roster-view: no longer catches top-individuals or
    favourites-changed signals from the model

 libempathy-gtk/empathy-roster-model-manager.c | 125
 +++++++++++++++++++----
 libempathy-gtk/empathy-roster-model.c	       |  34 ------
 libempathy-gtk/empathy-roster-model.h	       |   7 --
 libempathy-gtk/empathy-roster-view.c	       | 142
 +-------------------------
 4 files changed, 110 insertions(+), 198 deletions(-)

commit e50bbed1c0ea00a62e22bd2ace2427fef4d65ada
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 7 12:09:29 2012 +0200

    remove empathy-accounts.desktop

    Now that we have desktop wide UI to configure accounts (GNOME/Ubuntu
    Online
    Accounts) it doesn't make much sense to expose empathy-accounts as
    a separated
    application.

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

 configure.ac			     |	1 -
 data/.gitignore		     |	2 --
 data/Makefile.am		     |	1 -
 data/empathy-accounts.desktop.in.in | 14 --------------
 po/POTFILES.in			     |	1 -
 po/POTFILES.skip		     |	1 -
 6 files changed, 20 deletions(-)

commit 3bf2022584d5c52b5959387fb519ffc50b44ff0e
Author: Tom Tryfonidis <tomtryf@gmail.com>
Date:	Mon Aug 6 19:13:48 2012 +0300

    Updated Greek translation

 po/el.po | 2867
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 1543 insertions(+), 1324 deletions(-)

commit 7ed629df04d0284da65a82424c8ae0f8d661fddc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 6 16:54:54 2012 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3335eeeb1e9c96bf566498e3206f41e70b81e9a6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 6 16:47:47 2012 +0200

    fix typo in ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am

 ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 78cf933ba03eaa12cf69dd0f684c32b4f648b251
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 6 16:34:45 2012 +0200

    prepare 3.5.5

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

commit 173c39daafca8f712462abc7bbde64a1c269d4a0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 6 16:27:27 2012 +0200

    Depend on telepathy-glib 0.19.6

    Needed for tp_account_manager_can_set_default()

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 542d2b972846a8ef2f2465393f2e3dfd54472697
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 6 16:01:43 2012 +0200

    accounts-plugin-widget: keep a ref on the 'Done' button

 ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.c |
 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 10fa43636c077e1d201e43756516be76a210c2aa
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Mon Aug 6 10:24:19 2012 +0200

    Coding style fixups

 libempathy-gtk/empathy-roster-model-manager.c | 6 ++++--
 libempathy-gtk/empathy-roster-model-manager.h | 3 ++-
 libempathy-gtk/empathy-roster-model.c	       | 6 ++++--
 libempathy-gtk/empathy-roster-model.h	       | 3 ++-
 4 files changed, 12 insertions(+), 6 deletions(-)

commit 2280a10c6084618eb66647d05e3ee800c411c843
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Mon Aug 6 10:19:40 2012 +0200

    Changed some "Return value:" for "Returns:" in gtk-doc annotations

 libempathy-gtk/empathy-roster-model.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2d3fbe98ec0477190f3b7fa7ef23c99eed01045a
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Sat Aug 4 15:42:33 2012 +0200

    Moved the #define'd groups names from view to model

    empathy-roster-model: Added the groups names definitions
    empathy-roster-model-manager: Adapted functions to the new groups
    names
    empathy-roster-view: removed the groups names definitions and adapted
    functions to the new groups names

 libempathy-gtk/empathy-roster-model-manager.c |  5 ++---
 libempathy-gtk/empathy-roster-model.h	       |  4 ++++
 libempathy-gtk/empathy-roster-view.c	       | 30
 +++++++++++++--------------
 libempathy-gtk/empathy-roster-view.h	       |  4 ----
 4 files changed, 21 insertions(+), 22 deletions(-)

commit af7910a9af2984973be248b769d74f09e84822d4
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Sat Aug 4 15:29:46 2012 +0200

    Moved contact_in_top and contact_is_favourite from view to model

    empathy-roster-model: new function _contact_in_top
    empathy-roster-model-manager: implemented _contact_in_top, new
    function contact_is_favourite
    empathy-roster-view: removed contact_in_top and contact_is_favourite
    functions, now calling model's _contact_in_top instead

 libempathy-gtk/empathy-roster-model-manager.c | 32 +++++++++++++++++++++
 libempathy-gtk/empathy-roster-model.c	       | 25 ++++++++++++++++
 libempathy-gtk/empathy-roster-model.h	       |  7 +++++
 libempathy-gtk/empathy-roster-view.c	       | 41
 ++++-----------------------
 4 files changed, 70 insertions(+), 35 deletions(-)

commit b3c361fdca7f6a0bb2a63e676cd0a5d488261127
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Sat Aug 4 14:38:25 2012 +0200

    Removed the manager from the view, relying only on the model

 libempathy-gtk/empathy-roster-view.c		   | 31
 ++---------------------
 libempathy-gtk/empathy-roster-view.h		   |  7 +----
 nautilus-sendto-plugin/empathy-nautilus-sendto.c  |  6 ++---
 src/empathy-roster-window.c			   |  3 +--
 tests/interactive/test-empathy-dual-roster-view.c |  3 +--
 tests/interactive/test-empathy-roster-view.c	   |  2 +-
 6 files changed, 9 insertions(+), 43 deletions(-)

commit 765db7cfd0a0aa7aea9f0f717a7762ad79e14ef9
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Sat Aug 4 13:33:14 2012 +0200

    roster-model now catches notify::favourites-changed

    empathy-roster-model: catches notify::favourites-changed and emits
    favourites-changed
    empathy-roster-model-manager: implemented this
    empathy-roster-view: now catches favourites-changed from the model

 libempathy-gtk/empathy-roster-model-manager.c | 12 ++++++++++++
 libempathy-gtk/empathy-roster-model.c	       | 19 +++++++++++++++++++
 libempathy-gtk/empathy-roster-model.h	       |  4 ++++
 libempathy-gtk/empathy-roster-view.c	       |  4 ++--
 4 files changed, 37 insertions(+), 2 deletions(-)

commit f54a06dcc9682df323ff98bd8e776bf75da950b0
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Sat Aug 4 13:19:44 2012 +0200

    roster-model now catches notify::top-individuals

    empathy-roster-model: catches notify::top-individuals and emits
    top-individuals-changed
    empathy-roster-model-manager: implemented this
    empathy-roster-view: now catches top-individuals-changed from
    the model

 libempathy-gtk/empathy-roster-model-manager.c | 11 +++++++++++
 libempathy-gtk/empathy-roster-model.c	       | 14 ++++++++++++++
 libempathy-gtk/empathy-roster-model.h	       |  3 +++
 libempathy-gtk/empathy-roster-view.c	       |  5 ++---
 4 files changed, 30 insertions(+), 3 deletions(-)

commit 93da7465f929f0cb950adb76e7b645f5ff23f1ad
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Sat Aug 4 12:30:08 2012 +0200

    Added new function _get_top_individuals in the model

    empathy-roster-model: new function _get_top_individuals
    empathy-roster-model-manager: implemented _get_top_individuals
    empathy-roster-view: uses the roster-model's _get_top_individuals
    instead of the individual-manager's

 libempathy-gtk/empathy-roster-model-manager.c |  9 +++++++++
 libempathy-gtk/empathy-roster-model.c	       | 21 +++++++++++++++++++++
 libempathy-gtk/empathy-roster-model.h	       |  3 +++
 libempathy-gtk/empathy-roster-view.c	       |  7 +++----
 4 files changed, 36 insertions(+), 4 deletions(-)

commit e0542a641adc30e04255b1eb561bbcd6e0b17da2
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Sat Aug 4 12:12:30 2012 +0200

    Documented public functions in empathy-roster-model

 libempathy-gtk/empathy-roster-model.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit d4b4fb539cc29750527836b87590ff9e215d0b9d
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Fri Aug 3 15:24:26 2012 +0200

    Added test-empathy-dual-roster-view

 tests/interactive/Makefile.am			   |   4 +-
 tests/interactive/test-empathy-dual-roster-view.c | 155
 ++++++++++++++++++++++
 2 files changed, 158 insertions(+), 1 deletion(-)

commit bcbff1934277eeb5f282810784cbddb50222161b
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Sat Aug 4 12:22:07 2012 +0200

    Coding style fixup in empathy-roster-model-manager.c

 libempathy-gtk/empathy-roster-model-manager.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 119351a936be47a235b9fd0d7cce1b73fb8e289e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 2 15:48:38 2012 +0200

    Rely on the empathy factory rather than 're-preparing' the AM

    tp_account_manager_prepare_all_async() seems to be a bad idea so,
    instead,
    let's just rely the empathy factory and set it as default.
    This makes the code much more symetric with empathy-accounts and
    shouldn't
    prepare that much useless features as we are not going to prepare
    the contact
    list anyway.

 .../app-plugin/empathy-app-plugin-widget.c	      | 20
 ++------------------
 .../cc-plugins/app-plugin/empathy-app-plugin.c       | 15 +++++++++++++++
 .../cc-plugins/empathy-accounts-plugin-widget.c      | 10 +++-------
 .../cc-plugins/empathy-accounts-plugin.c	      | 16
 ++++++++++++++++
 4 files changed, 36 insertions(+), 25 deletions(-)

commit 44982406d7bc6317a7674d21f830ad50ab4f3810
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 2 14:46:25 2012 +0200

    client-factory: add TP_ACCOUNT_FEATURE_STORAGE

    Needed for the Ubuntu Online Accounts plugins.

 libempathy/empathy-client-factory.c | 3 +++
 1 file changed, 3 insertions(+)

commit 3de9dd6a3d2b66049de6ad60c197f548ecd8a1f6
Author: Stef Walter <stefw@gnome.org>
Date:	Fri Jul 13 17:33:12 2012 +0200

    Migrate from libgnome-keyring to libsecret

     * See: https://live.gnome.org/GnomeGoals/LibsecretMigration

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

 configure.ac		      |   4 +-
 libempathy/empathy-keyring.c | 157
 +++++++++++++++----------------------------
 2 files changed, 56 insertions(+), 105 deletions(-)

commit e3228e2389734b25c41e01fb178c69f205216b0e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 3 10:58:36 2012 +0200

    GOA: set param-extra-certificate-identities for Windows live accounts

    Windows live provides a cert for '*.gateway.messenger.live.com'
    instead of 'messenger.live.com'. It's not great from them but best
    to accept
    it than confuse users.

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

 goa-mc-plugin/mcp-account-manager-goa.c | 2 ++
 1 file changed, 2 insertions(+)

commit 7f5ca9dc728bd94a24f89e63a0931af6c382641a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 3 09:36:51 2012 +0200

    goa-auth-handler: pass the data pointer to auth_cb

    We are supposed to use it in this callback, if only to free it,
    so we should
    really pass it as user_data.

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

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

commit 7c54415fc4b9d9751ce2bcadcbd5e53d511ab42c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 3 09:28:49 2012 +0200

    goa-auth-handler: factor out auth_data_new()

    We already have the _free() function and it makes easier to track the
    lifecycle of the struct.

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

 libempathy/empathy-goa-auth-handler.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

commit 144d0a506e65e57b9a8486af3834067209e5be05
Author: Jiro Matsuzawa <jmatsuzawa@gnome.org>
Date:	Thu Aug 2 11:57:12 2012 +0900

    [l10n] Update Japanese translation

    Modify the About label

 po/ja.po | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 5c1ff60ee03e050fe7e1d824ec91dd63cc47613b
Author: Jiro Matsuzawa <jmatsuzawa@gnome.org>
Date:	Thu Aug 2 11:55:43 2012 +0900

    [l10n] Update Japanese translation

    Merge latest pot

 po/ja.po | 3991
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 1896 insertions(+), 2095 deletions(-)

commit ea43058c150696aa414ca231cb751953b12cf9d7
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Tue Jul 31 01:54:41 2012 +0200

    Updated Galician translations

 po/gl.po | 390
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 185 insertions(+), 205 deletions(-)

commit a2fd257fb38682ee339ea855c81206297a7a697b
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Jul 30 16:53:00 2012 +0200

    Updated Spanish translation

 po/es.po | 402
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 191 insertions(+), 211 deletions(-)

commit 5daa04253d2760fcea31a1dc8dda53a212e5b614
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Jul 30 09:03:37 2012 +0200

    libraries and plugins must be using gi18n-lib.h

 goa-mc-plugin/mcp-account-manager-goa.c  | 2 --
 libempathy-gtk/empathy-call-utils.c	  | 2 +-
 libempathy-gtk/empathy-contact-chooser.c | 2 +-
 libempathy-gtk/empathy-webkit-utils.c	  | 2 +-
 libempathy/empathy-ft-handler.c	  | 2 +-
 libempathy/empathy-time.c		  | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)

commit 37dcd4e5a120fd481a04443af2a0f3ffed8ea084
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Sun Jul 29 13:24:57 2012 +0200

    EmpathyContactWidget: remove all remaining flags

    It can now be used only in one scenario: add a new contact dialog

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

 libempathy-gtk/empathy-contact-widget.c     | 158
 +++++++++-------------------
 libempathy-gtk/empathy-contact-widget.h     |	31 +-----
 libempathy-gtk/empathy-individual-dialogs.c |	 6 +-
 3 files changed, 52 insertions(+), 143 deletions(-)

commit bbffdd1e25000b5883adbf788b471efd7ff6af01
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Sun Jul 29 13:19:13 2012 +0200

    EmpathyContactWidget: remove unused flags and dead code

    This widget is used only to add a new contact, all its flexibility
    isn't needed anymore.

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

 libempathy-gtk/empathy-contact-widget.c | 964
 +-------------------------------
 libempathy-gtk/empathy-contact-widget.h |   7 -
 2 files changed, 10 insertions(+), 961 deletions(-)

commit 3d28da17726e7c53e9e2912422f9f1e1fc9b7268
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Thu Jul 26 16:05:21 2012 +0200

    UOA cc plugin: Support editing existing accounts

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

 .../cc-plugins/empathy-accounts-plugin-widget.c    | 89
 ++++++++++++++++++----
 1 file changed, 75 insertions(+), 14 deletions(-)

commit b3a5be48436877d8cf89569b6724db2a5eb45cb5
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Thu Jul 26 14:46:07 2012 +0200

    add empathy-app-plugin-widget

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

 po/POTFILES.in					    |	1 +
 .../cc-plugins/app-plugin/Makefile.am		    |	4 +-
 .../app-plugin/empathy-app-plugin-widget.c	    | 320
 +++++++++++++++++++++
 .../app-plugin/empathy-app-plugin-widget.h	    |  76 +++++
 .../cc-plugins/app-plugin/empathy-app-plugin.c     |  21 +-
 5 files changed, 419 insertions(+), 3 deletions(-)

commit 671a16046a634beefc524bc24a2e7eebdee480a5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 23 11:15:57 2012 +0200

    add empathy-app-plugin

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

 configure.ac					    |  8 +++
 ubuntu-online-accounts/cc-plugins/Makefile.am	    |  2 +-
 .../cc-plugins/app-plugin/Makefile.am		    | 23 +++++++
 .../cc-plugins/app-plugin/empathy-app-plugin.c     | 52 +++++++++++++++
 .../cc-plugins/app-plugin/empathy-app-plugin.h     | 73
 ++++++++++++++++++++++
 .../cc-plugins/generate-plugins.py		    |  2 +-
 6 files changed, 158 insertions(+), 2 deletions(-)

commit 89800f161fb162f30aa4d13d3cb9707b553442fa
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Jul 25 18:20:58 2012 +0200

    UOA accounts plugin widget: tweak styling of the info bar

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

 .../cc-plugins/empathy-accounts-plugin-widget.c    | 42
 ++++++++++++++++------
 1 file changed, 31 insertions(+), 11 deletions(-)

commit 8a684ae6d355e2e266333fb69cd1828d1b9befe0
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Thu Jul 26 14:42:19 2012 +0200

    UOA: fix empathy.application XML indentation

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

 ubuntu-online-accounts/empathy.application | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit d4f586e48a04d1b0cf1346c42cba944bfd28a25f
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Sat Jul 28 13:49:18 2012 +0200

    EmpathAccountsDialog: user the new EmpathyUserInfo widget

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

 src/empathy-accounts-dialog.c | 99
 ++++++++++---------------------------------
 1 file changed, 22 insertions(+), 77 deletions(-)

commit ddc1102cb2226a8d68658e483a3b1b0e49a0d33d
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Sat Jul 28 13:47:22 2012 +0200

    EmpathyUserInfo: New widget to edit personal information

    This is a much simplified version of EmpathyContactWidget

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

 libempathy-gtk/Makefile.am	    |	2 +
 libempathy-gtk/empathy-user-info.c | 742
 +++++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-user-info.h |  76 ++++
 po/POTFILES.in			    |	1 +
 4 files changed, 821 insertions(+)

commit 458a5908af2e98b9ac8abe7263720d0fbac6efcd
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Sat Jul 28 13:37:11 2012 +0200

    EmpathyCalendarButton: Make it work without gtk_widget_show_all

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

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

commit d869f072f8ae91f3f1f2dffb207d7f96fbb0ce1c
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Fri Jul 27 15:20:16 2012 +0200

    EmpathyAvatarChooser: rebase on TpAccount API

    It can now edit the avatar of a TpAccount passed at construct time.
    The image is taken from the TpAccount directly instead of asking
    the user to set one. This is much more self contained code.

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

 libempathy-gtk/empathy-avatar-chooser.c | 417
 +++++++++++++++++---------------
 libempathy-gtk/empathy-avatar-chooser.h |  18 +-
 2 files changed, 235 insertions(+), 200 deletions(-)

commit 9c9fcb09c9dd2523fc53858d84b44eb19fd1a7bf
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Fri Jul 27 15:16:40 2012 +0200

    EmpathyContactWidget: Stop using EmpathyAvatarChooser

    Changing avatar is only used for editing user's information, and
    it will soon be replaced by a dedicated widget.

    This is done to make easier to change EmpathyAvatarChooser's API
    before
    introducing the new widget.

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

 libempathy-gtk/empathy-contact-widget.c | 109
 +-------------------------------
 libempathy-gtk/empathy-contact-widget.h |   3 -
 src/empathy-accounts-dialog.c		 |   6 --
 3 files changed, 1 insertion(+), 117 deletions(-)

commit 4b23cccc6b57759cc17ca493e1153b71f1636c07
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Mon Jul 30 02:45:11 2012 +0200

    Updated Galician translations

 po/gl.po | 2315
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1159 insertions(+), 1156 deletions(-)

commit fbac295f5fbe88225a63191a90fb75a468a37e6d
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Sun Jul 29 14:34:38 2012 +0200

    Updated Slovenian translation

 po/sl.po | 3245
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1607 insertions(+), 1638 deletions(-)

commit 0b5c3879651ab419d116f8727d0b01d4e992c9c8
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Sat Jul 28 18:00:31 2012 +0200

    Updated Hungarian translation

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

commit a281ab982c7f9e6fb685be6ff93dfdb8d0c50d2a
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Sat Jul 28 17:44:28 2012 +0200

    Updated Hungarian translation by Bence Lukacs <lukacs.bence1 at
    gmail dot com>

 po/hu.po | 3308
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1646 insertions(+), 1662 deletions(-)

commit 2a74160a8665c8cca96e1be0211f176d3d4ce1a7
Author: Andika Triwidada <andika@gmail.com>
Date:	Sat Jul 28 19:20:45 2012 +0700

    Updated Indonesian translation

 po/id.po | 3634
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 1781 insertions(+), 1853 deletions(-)

commit 26c0b2e838503006b2d167bf9a24c3509d0bb2b4
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Jul 27 11:32:03 2012 +0200

    Updated Spanish translation

 po/es.po | 2127
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1064 insertions(+), 1063 deletions(-)

commit b082402a4caee3947217a5b16320245d642425d5
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Jul 25 10:05:20 2012 +0200

    Accounts dialog: use external app for readonly UOA accounts

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

 src/empathy-accounts-dialog.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 1fd4799efc2579d109deeb4215afd1b6c3d1e838
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Jul 25 09:35:59 2012 +0200

    UOA mc-plugin: CANNOT_SET_PARAMETERS depends on account's settings

    A special key has been added in .service files of online accounts
    telling its args should be considered readonly. Generic accounts
    (e.g. AIM)
    can still be modified.

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

 .../mc-plugin/mcp-account-manager-uoa.c	    | 24
 ++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

commit a31a050ccad58fda65c076f370c756c1479a644e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 24 15:31:22 2012 +0200

    factor out start_from_desktop_file()

 src/empathy-accounts-dialog.c | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

commit d6ed1db06563305c839f193251af050cd8fc8111
Author: Sweta Kothari <swkothar@redhat.com>
Date:	Thu Jul 26 15:49:03 2012 +0530

    Updated Gujarati Translations

 po/gu.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit dd8a60e1ba0dfb46972fddc4c0bdd6e7fb4b9813
Author: Sweta Kothari <swkothar@redhat.com>
Date:	Thu Jul 26 14:35:43 2012 +0530

    Updated Gujarati Translations

 po/gu.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 256f5d0ce289f91ad29923ba053bceacbcb8f2a2
Author: Sweta Kothari <swkothar@redhat.com>
Date:	Thu Jul 26 14:32:12 2012 +0530

    Updated Gujarati Translations

 po/gu.po | 3620
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1787 insertions(+), 1833 deletions(-)

commit 60a9031085ca8ae6d24874076312ccd002c15bb5
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Thu Jul 26 10:30:50 2012 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 2096
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1047 insertions(+), 1049 deletions(-)

commit 6c9c9551c2c997492827433d7bf5f87817528cc1
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Tue Jul 24 22:31:28 2012 +0300

    Updated Hebrew translation.

 po/he.po | 2103
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1052 insertions(+), 1051 deletions(-)

commit 0a3c6d0decbf4452429c2e066d01ce046266fa28
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Tue Jul 24 20:19:31 2012 +0200

    Updated POTFILES.in

 po/POTFILES.in | 66
 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 34 insertions(+), 32 deletions(-)

commit fe0858964f946119e8f985271ab680c5ab4bd667
Author: Tom Tryfonidis <tomtryf@gmail.com>
Date:	Tue Jul 24 18:25:31 2012 +0300

    Updated Greek translation

 po/el.po | 504
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 254 insertions(+), 250 deletions(-)

commit 4cafd4593de5b47d133f8c5437f0c22c67a820c1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 24 11:14:17 2012 +0200

    accounts-plugin-widget: set the right icon name

    We don't want Empathy to use the default icon name.

 ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.c |
 3 +++
 1 file changed, 3 insertions(+)

commit 05661398f75603bf09a8e7042a3ba8e056a9217f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 18 15:44:31 2012 +0200

    account-plugins: implement delete

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

 .../cc-plugins/empathy-accounts-plugin.c	    | 30
 +++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

commit 3d004d7ebe17b0a139ef38cbd4e5631940210b78
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 18 12:48:46 2012 +0200

    Generate plugins for most protocols

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

 ubuntu-online-accounts/cc-plugins/Makefile.am	    | 158
 ++++++++++++++++++++-
 .../cc-plugins/generate-plugins.py		    |  13 ++
 .../cc-plugins/providers/Makefile.am		    |  15 +-
 .../cc-plugins/providers/aim.provider		    |	7 +
 .../cc-plugins/providers/gadugadu.provider	    |	7 +
 .../cc-plugins/providers/groupwise.provider	    |	7 +
 .../cc-plugins/providers/icq.provider		    |	7 +
 .../cc-plugins/providers/irc.provider		    |	7 +
 .../cc-plugins/providers/local-xmpp.provider	    |	7 +
 .../cc-plugins/providers/mxit.provider		    |	7 +
 .../cc-plugins/providers/myspace.provider	    |	7 +
 .../cc-plugins/providers/sametime.provider	    |	7 +
 .../cc-plugins/providers/sip.provider		    |	7 +
 .../cc-plugins/providers/yahoo.provider	    |	7 +
 .../cc-plugins/providers/yahoojp.provider	    |	7 +
 .../cc-plugins/providers/zephyr.provider	    |	7 +
 .../cc-plugins/services/Makefile.am		    |  15 +-
 .../cc-plugins/services/aim-im.service		    |  18 +++
 .../cc-plugins/services/gadugadu-im.service	    |  18 +++
 .../cc-plugins/services/groupwise-im.service	    |  18 +++
 .../cc-plugins/services/icq-im.service		    |  18 +++
 .../cc-plugins/services/irc-im.service		    |  18 +++
 .../cc-plugins/services/local-xmpp-im.service	    |  18 +++
 .../cc-plugins/services/mxit-im.service	    |  18 +++
 .../cc-plugins/services/myspace-im.service	    |  18 +++
 .../cc-plugins/services/sametime-im.service	    |  18 +++
 .../cc-plugins/services/sip-im.service		    |  18 +++
 .../cc-plugins/services/yahoo-im.service	    |  18 +++
 .../cc-plugins/services/yahoojp-im.service	    |  18 +++
 .../cc-plugins/services/zephyr-im.service	    |  18 +++
 30 files changed, 523 insertions(+), 3 deletions(-)

commit e296ad8a3b6dd5049caa9ea6b739a34d9d16dea6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 18 11:37:04 2012 +0200

    add generate-plugins.py

    Handy script to generate all the boilerplates for each protocol we are
    supporting.

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

 ubuntu-online-accounts/cc-plugins/Makefile.am	    |	2 +
 .../cc-plugins/generate-plugins.py		    | 167
 +++++++++++++++++++++
 .../cc-plugins/providers/Makefile.am		    |	2 +
 .../cc-plugins/providers/jabber.provider	    |	2 +
 .../cc-plugins/services/Makefile.am		    |	2 +
 .../cc-plugins/services/jabber-im.service	    |	2 +
 6 files changed, 177 insertions(+)

commit 32cbd280f3a2ec826f4d4ae76c99765218014c36
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 18 10:12:24 2012 +0200

    Add jabber provider, service and plugin

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

 ubuntu-online-accounts/cc-plugins/Makefile.am		  | 11 +++++++++++
 ubuntu-online-accounts/cc-plugins/providers/Makefile.am  |  1 +
 .../cc-plugins/providers/jabber.provider		  |  5 +++++
 ubuntu-online-accounts/cc-plugins/services/Makefile.am   |  1 +
 .../cc-plugins/services/jabber-im.service		  | 16
 ++++++++++++++++
 5 files changed, 34 insertions(+)

commit ef6264b648b0ef50f25753cffc64c515494721e7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 13 15:18:39 2012 +0200

    account-plugin-widget: display the top bar and account widget

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

 .../cc-plugins/empathy-accounts-plugin-widget.c    | 197
 ++++++++++++++++++++-
 .../cc-plugins/empathy-accounts-plugin.c	    |  17 +-
 2 files changed, 209 insertions(+), 5 deletions(-)

commit 70ea840bfec883f883b748e937e28f68d9f0870f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 18 10:11:39 2012 +0200

    Hook cc-plugins to the build system

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

 configure.ac						 |  3 +++
 ubuntu-online-accounts/Makefile.am			 |  2 +-
 ubuntu-online-accounts/cc-plugins/Makefile.am		 | 16
 ++++++++++++++++
 ubuntu-online-accounts/cc-plugins/providers/Makefile.am |  6 ++++++
 ubuntu-online-accounts/cc-plugins/services/Makefile.am  |  6 ++++++
 5 files changed, 32 insertions(+), 1 deletion(-)

commit bc953560bc9db4818874cddd855c5d06241994df
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 13 12:32:36 2012 +0200

    add empathy-account-plugin

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

 .../cc-plugins/empathy-accounts-plugin.c	    | 69
 +++++++++++++++++++++
 .../cc-plugins/empathy-accounts-plugin.h	    | 71
 ++++++++++++++++++++++
 2 files changed, 140 insertions(+)

commit e0edcddf9c31b788844b294aa94b7cd181c6662f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 13 12:21:00 2012 +0200

    add account-plugin-widget

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

 .../cc-plugins/empathy-accounts-plugin-widget.c    | 145
 +++++++++++++++++++++
 .../cc-plugins/empathy-accounts-plugin-widget.h    |  76 +++++++++++
 2 files changed, 221 insertions(+)

commit 03e6158d3cfb683e4c837de9c2d54cfe8cb4515a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 24 16:14:03 2012 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c8b9556a479bf866ef5c76ed175350bf489c7494
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 24 16:07:53 2012 +0200

    add empathy.application to EXTRA_DIST

 ubuntu-online-accounts/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

commit c15b53055ffceebdb4737df52bbf07fa5ee8f519
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 24 09:47:30 2012 +0200

    prepare 3.5.4.1

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

commit 2bacc6bed19b1a8b28f9fcdb4b40a4a273e8b98c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 19 11:38:34 2012 +0200

    add empathy.application

 configure.ac				    |  8 ++++++++
 ubuntu-online-accounts/Makefile.am	    |  3 +++
 ubuntu-online-accounts/empathy.application | 12 ++++++++++++
 3 files changed, 23 insertions(+)

commit f253f50e656142d48b7feecf2678fa12cc9bf2db
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Sun Jul 8 13:54:08 2012 +0200

    empathy-roster-model-manager: added xmpp-local contacts support
    empathy-roster-view: removed xmpp-local contacts support

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

 libempathy-gtk/empathy-roster-model-manager.c | 33
 +++++++++++++++++++++++++++
 libempathy-gtk/empathy-roster-view.c	       | 25 --------------------
 2 files changed, 33 insertions(+), 25 deletions(-)

commit f7200ee068d8f959608521737872254f20c5ee55
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Wed Jul 4 15:29:41 2012 +0200

    empathy-roster-model: New virtual method _get_groups_for_individual
    empathy-roster-model-manager: implemented _get_groups_for_individual
    empathy-roster-view.c: using _get_groups_for_individual

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

 libempathy-gtk/empathy-roster-model-manager.c | 27
 ++++++++++++++++++++++++---
 libempathy-gtk/empathy-roster-model.c	       | 14 ++++++++++++++
 libempathy-gtk/empathy-roster-model.h	       |  5 +++++
 libempathy-gtk/empathy-roster-view.c	       | 22 ++++++++--------------
 4 files changed, 51 insertions(+), 17 deletions(-)

commit 5e102f002d353aceb687f92499635b86a0ba2d9b
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Wed Jul 4 14:59:48 2012 +0200

    empathy-roster-model, empathy-roster-model-manager: Now deals with
    groups-changed signal empathy-roster-view.c: now uses roster-model's
    groups-changed signal

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

 libempathy-gtk/empathy-roster-model-manager.c | 15 +++++++++++++++
 libempathy-gtk/empathy-roster-model.c	       | 20 ++++++++++++++++++++
 libempathy-gtk/empathy-roster-model.h	       |  5 +++++
 libempathy-gtk/empathy-roster-view.c	       |  6 +++---
 4 files changed, 43 insertions(+), 3 deletions(-)

commit 136088b2686da8dc9fca4e3b77faad28e1a873d1
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Jul 23 15:43:19 2012 +0200

    Fix distcheck when doing parallel build

    This makes sure the icones are done (un)installing before
    regenerating the icon cache.

 data/icons/Makefile.am | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 4d3c3a8e211febcbbd71ce451c7eb9cd67eecd85
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Jul 23 15:27:20 2012 +0200

    Do not install MC plugins into MC's prefix

    MC and Empathy could be installed in different prefixes

 configure.ac | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

commit 670aec4ba8b16fbf35afdf65b65c1904872286dc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 23 15:15:20 2012 +0200

    Go back to libgee 0.6.x

    It's not clear if 0.8 will be released for GNOME 3.6 so the release
    team
    prefers to stick with 0.6 for now.

    And yeah, gee-1.0 is the 0.6.x series and gee-0.8 the 0.7.x, nice work
    guys...

    Revert "gee_iterator_first is no more in libgee 0.8"
    This reverts commit 24d30e15b34b654eff96f4a358801290ebe09ec0.

    Revert "libempathy: Port empathy to libgee 0.8."
    This reverts commit d563fa078b2a13b3c06b1de626105e0510568e57.

 configure.ac				    |  2 +-
 libempathy-gtk/empathy-individual-menu.c   |  4 ++--
 libempathy-gtk/empathy-individual-widget.c | 10 ++++++----
 libempathy/empathy-contact.c		    |  2 +-
 libempathy/empathy-utils.c		    |  2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

commit fa8970d7304e81821dd0b1ed6a6704add1904af9
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Jul 16 14:15:45 2012 +0200

    Add Ubuntu Online Accounts auth handler

 configure.ac			       |   2 +
 libempathy/Makefile.am		       |  15 ++
 libempathy/empathy-auth-factory.c     |  56 +++++++
 libempathy/empathy-uoa-auth-handler.c | 299
 ++++++++++++++++++++++++++++++++++
 libempathy/empathy-uoa-auth-handler.h |  72 ++++++++
 5 files changed, 444 insertions(+)

commit f32e5ba5af1dfa3a0ceb4fde6e96b31a74b195c5
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Tue Jul 17 19:50:05 2012 +0200

    UOA mc-plugin: Actually implement it

 configure.ac					    |	3 +-
 .../mc-plugin/mcp-account-manager-uoa.c	    | 611
 ++++++++++++++++++++-
 2 files changed, 597 insertions(+), 17 deletions(-)

commit 2f1114d3c1138af06a06ac32af6f55fc10a556f5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 17 17:30:10 2012 +0200

    Make sure we define MISSION_CONTROL_PLUGINS_DIR when building with UOA

 configure.ac | 7 +++++++
 1 file changed, 7 insertions(+)

commit bd30ca4a72d7a44655df45cc2384280e63ada502
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 17 17:24:51 2012 +0200

    configure.ac: export a bunch of variables from UOA pc files

 configure.ac | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

commit fb37d92e195871b3e5a485d513bf6a7618a8eb60
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Jul 16 14:51:51 2012 +0200

    Add skeleton of an MC plugin to import Ubuntu Online Accounts

 Makefile.am					    |	7 +-
 configure.ac					    |	9 ++
 ubuntu-online-accounts/Makefile.am		    |	2 +
 ubuntu-online-accounts/mc-plugin/Makefile.am	    |  19 +++
 .../mc-plugin/mcp-account-manager-uoa.c	    | 160
 +++++++++++++++++++++
 .../mc-plugin/mcp-account-manager-uoa.h	    |  68 +++++++++
 .../mc-plugin/mission-control-plugin.c		    |  47 ++++++
 7 files changed, 311 insertions(+), 1 deletion(-)

commit 8671084e03f71a709b12ba6e813ae77f62cc0732
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 12 15:01:39 2012 +0200

    configure: detect if Ubuntu Online Accounts dep is present

 configure.ac | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

commit 1e02bad1344fa4ddc750c95ce6cc135145a1c548
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 23 14:09:11 2012 +0200

    coding style fixes

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

commit 18ded7a66d2b4ee00d5d36ecc7154566c83dce69
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Wed Jul 4 14:06:51 2012 +0200

    empathy-roster-model-manager: deal with members-changed signals
    empathy-roster-view: use empathy-roster-model-manager signals

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

 libempathy-gtk/empathy-roster-model-manager.c | 26 ++++++++++++++++++++
 libempathy-gtk/empathy-roster-view.c	       | 35
 +++++++++++----------------
 2 files changed, 40 insertions(+), 21 deletions(-)

commit 87511314e60d6a9c67caaed5d5fd2e3f2f3657c8
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Wed Jul 4 11:59:15 2012 +0200

    empathy-roster-view: start using empathy-roster-model

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

 libempathy-gtk/empathy-roster-view.c		  | 27
 +++++++++++++++++++++---
 libempathy-gtk/empathy-roster-view.h		  |  4 +++-
 nautilus-sendto-plugin/empathy-nautilus-sendto.c | 10 +++++++--
 src/empathy-roster-window.c			  | 10 ++++++++-
 tests/interactive/test-empathy-roster-view.c	  |  8 ++++++-
 5 files changed, 51 insertions(+), 8 deletions(-)

commit 3ba0b1109440fc6b1bd7f196c14aa5fe44ff1884
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Wed Jul 4 11:41:05 2012 +0200

    empathy-roster-model-manager.c: implement
    empathy_roster_model_manager_get_individuals ()

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

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

 libempathy-gtk/empathy-roster-model-manager.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit 2a6cc7b7710e6be6416365320a3417f360583af3
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Wed Jul 4 10:54:13 2012 +0200

    empathy-roster-model-manager: Pass an EmpathyIndividualManager to
    EmpathyRosterModelManager

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

 libempathy-gtk/empathy-roster-model-manager.c | 36
 +++++++++++++++++++++------
 libempathy-gtk/empathy-roster-model-manager.h |  4 ++-
 2 files changed, 31 insertions(+), 9 deletions(-)

commit 2e9ea0fb13d570edeca7161d827d8041298c2134
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 4 09:43:05 2012 +0200

    roster-model: add API to track individuals

 libempathy-gtk/empathy-roster-model.c | 55
 +++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-roster-model.h | 14 +++++++++
 2 files changed, 69 insertions(+)

commit d23e7ebee52c513b98b0b7382a41005c3b084efc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 3 15:49:50 2012 +0200

    add empathy-roster-model-manager

 libempathy-gtk/Makefile.am		       |   2 +
 libempathy-gtk/empathy-roster-model-manager.c | 155
 ++++++++++++++++++++++++++
 libempathy-gtk/empathy-roster-model-manager.h |  73 ++++++++++++
 3 files changed, 230 insertions(+)

commit 0cba1e794967d71172d0d2438fc5ea9f872a52f0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 3 15:22:20 2012 +0200

    add empathy-roster-model

 libempathy-gtk/Makefile.am	       |  2 ++
 libempathy-gtk/empathy-roster-model.c | 29 ++++++++++++++++++
 libempathy-gtk/empathy-roster-model.h | 57
 +++++++++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+)

commit b0d6063cf84f1b75d4d1a72f80d2fbe3c900050b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 18 11:03:18 2012 +0200

    add empathy_account_settings_set_storage_provider()

 libempathy/empathy-account-settings.c | 18 ++++++++++++++++++
 libempathy/empathy-account-settings.h |  4 ++++
 2 files changed, 22 insertions(+)

commit 1678eb893efcf00191f3d4c224c2d07c80c093cd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 19 12:39:02 2012 +0200

    Depend on tp-glib 0.19;4

    Needed for tp_account_request_set_storage_provider()

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 34be847fcab2d5f920abf0d109abfbca884f08a7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 18 10:53:46 2012 +0200

    export empathy_account_widget_apply_and_log_in()

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

commit 4c6862e4448b4cb20ca5ab8d6f189adf95214cf9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 19 10:07:43 2012 +0200

    Check for libgee dep

    We are using it directly so should depend on it.

 configure.ac | 1 +
 1 file changed, 1 insertion(+)

commit 24d30e15b34b654eff96f4a358801290ebe09ec0
Author: Alban Browaeys <prahal@yahoo.com>
Date:	Tue Jul 17 07:37:25 2012 +0200

    gee_iterator_first is no more in libgee 0.8

    With folks depending upon libgee-0.8 brealage in empathy arise,
    that is gee_iterator_first is not available.

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

 libempathy-gtk/empathy-individual-menu.c   |  4 ++--
 libempathy-gtk/empathy-individual-widget.c | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

commit d563fa078b2a13b3c06b1de626105e0510568e57
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:	Wed Jul 18 11:31:04 2012 -0600

    libempathy: Port empathy to libgee 0.8.

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

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

commit b98648af1d450203cd1a59ac45155e93f2216b19
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Wed Jul 18 13:50:46 2012 +0200

    Implement Google X-OAUTH2 SASL mechanism

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

 libempathy/empathy-sasl-mechanisms.c | 38
 ++++++++++++++++++++++++++++++++++++
 libempathy/empathy-sasl-mechanisms.h |  7 +++++++
 2 files changed, 45 insertions(+)

commit 2e74f7c0c092d4930fe690085d76a6fbd7d27e29
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Fri Jul 13 12:05:38 2012 +0200

    Move SASL mechanism implementations into its own file

    We could have other account providers than GOA requiring
    this SASL code.

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

 libempathy/Makefile.am		       |   2 +
 libempathy/empathy-auth-factory.c     |   1 +
 libempathy/empathy-goa-auth-handler.c | 171 +++++---------------
 libempathy/empathy-goa-auth-handler.h |   2 +-
 libempathy/empathy-sasl-mechanisms.c  | 293
 ++++++++++++++++++++++++++++++++++
 libempathy/empathy-sasl-mechanisms.h  |  57 +++++++
 libempathy/empathy-utils.c	       |  15 --
 libempathy/empathy-utils.h	       |   3 -
 8 files changed, 393 insertions(+), 151 deletions(-)

commit 4c7c9410f125620408089ee95a20bd750b055e48
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 17 16:14:47 2012 +0200

    empathy: use tp_account_manager_enable_restart()

    If for some reason MC crashes we should restart it right away. Ideally
    this
    should be done by the Shell (#680099) but it's good to have in
    Empathy as
    well.

 src/empathy.c | 2 ++
 1 file changed, 2 insertions(+)

commit 7e7732cf98ba9f60eb95a857178b82a8772cd403
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 17 15:04:13 2012 +0200

    remove MC password migration code

    We are shipping this since a bunch of releases so all passwords
    should be
    migrated since a while.
    Furthemore, it may cause issues when the password has been updated
    in Empathy
    but not MC.

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

 libempathy/empathy-account-settings.c | 76
 -----------------------------------
 1 file changed, 76 deletions(-)

commit 8d706a1e765e6bc74ecf7b3855df3fd03b92f62c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 12 11:24:44 2012 +0200

    Turn libempathy-gtk to a public lib

    We use "-release" versioning as it's not meant to be used out of
    Empathy's
    tree.

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

 libempathy-gtk/Makefile.am | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 81f91f746010d5b12697818b4f1f9f792ef27320
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 12 11:24:44 2012 +0200

    Turn libempathy to a public lib

    We use "-release" versioning as it's not meant to be used out of
    Empathy's
    tree.

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

 libempathy/Makefile.am | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

commit 25b009d1f6a98f230c99f7b0c960c5df1f7d5cde
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 17 14:46:39 2012 +0200

    tp-chat: prepare the Password feature if needed

 libempathy/empathy-tp-chat.c | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

commit 36c8a8859e9c22d797be6e70164e84e9dfeb7cf6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 17 13:47:03 2012 +0200

    Revert "tp-chat:requires TP_CHANNEL_FEATURE_PASSWORD"

    This reverts commit 33ad5c340ed97da141c3182051502043a710e92f.

    This is not the right way to fix this bug. If the channel doesn't
    implement
    the Password iface (like in a 1-1 chat) our own tp-chat feature
    is never
    prepared.

 libempathy/empathy-tp-chat.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit a507ac419e482b94c2dd4d0c7ddd3cc67116b6e1
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Fri Jul 13 17:10:50 2012 +0200

    Display the Top Contacts group name above the top contacts even if
    all of them are offline

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

 libempathy-gtk/empathy-roster-view.c | 40
 ++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

commit 33ad5c340ed97da141c3182051502043a710e92f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 17 11:15:14 2012 +0200

    tp-chat:requires TP_CHANNEL_FEATURE_PASSWORD

    check_almost_ready() relies on the password feature to be prepared
    so we
    should make sure that tp-glib prepares it for us before starting
    to prepare
    our own feature.

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

 libempathy/empathy-tp-chat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 7adae1d67fe988e53c85426bbd382da1699260c7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 16 17:15:37 2012 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2b7946a29c9d2f38f829e29eb8c452765b1c562e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 16 16:59:35 2012 +0200

    prepare 3.5.4

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

commit 15e2a556e3e5c9efadc3153223d17d4cab8597e1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 16 15:28:40 2012 +0200

    Display GOA_PKG_ERRORS if deps are missing

 configure.ac | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 17466e4859d78642ba7f8319a4875cc29c4ca0ba
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Jul 16 14:18:47 2012 +0200

    Fix build warning: A string format is required

 libempathy-gtk/empathy-subscription-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0751b2d498a4fedde128f9a55bcb89d859794ee3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 16 11:10:57 2012 +0200

    Use new tp_account_* getters

 libempathy-gtk/empathy-individual-store.c	      | 4 ++--
 libempathy-gtk/empathy-local-xmpp-assistant-widget.c | 2 +-
 libempathy-gtk/empathy-theme-adium.c		      | 4 ++--
 libempathy/empathy-account-settings.c		      | 4 ++--
 libempathy/empathy-contact.c			      | 4 ++--
 src/empathy-accounts-common.c			      | 2 +-
 src/empathy-accounts-dialog.c			      | 4 ++--
 src/empathy-debug-window.c			      | 4 ++--
 src/empathy-new-chatroom-dialog.c		      | 4 ++--
 src/empathy-roster-window.c			      | 4 ++--
 src/empathy-sanity-cleaning.c			      | 2 +-
 11 files changed, 19 insertions(+), 19 deletions(-)

commit 25c022091cf9527a80db041e554e8ec35b131bf2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 16 11:10:19 2012 +0200

    preferences: use the factory to create the TpAccount

    tp_account_new() has been deprecated.

 src/empathy-preferences.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit cf41b427508a00295ebbac0d05fbc744f44f8c6a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 16 11:10:00 2012 +0200

    Depend on tp-glib 0.19.3

    Needed to fix deprecation warnings.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit dd7154f04328775592b0d3206ccc05e83a47ae25
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Sun Jul 15 14:42:22 2012 +0300

    Updated Belarusian translation.

 po/be.po | 1055
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 491 insertions(+), 564 deletions(-)

commit fe6e6539e31484f8a4c5ec8b762c1964f59f9ffd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 11 15:30:29 2012 +0200

    chat-window: use self->priv pattern

 src/empathy-chat-window.c | 877
 ++++++++++++++++++++--------------------------
 src/empathy-chat-window.h |   3 +-
 2 files changed, 373 insertions(+), 507 deletions(-)

commit b1d3fec398564d8f4e46daa9e43ec3ccb25805fd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 11 13:54:46 2012 +0200

    chat-window: port to new coding styles

 src/empathy-chat-window.c | 4364
 +++++++++++++++++++++++----------------------
 src/empathy-chat-window.h |   59 +-
 2 files changed, 2265 insertions(+), 2158 deletions(-)

commit cdd2887a1d29b6e8a4489980991dc5283e7065d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 11 11:50:45 2012 +0200

    new-chatroom-dialog: set default response

    We want to activate the dialog when user hits 'Enter' so he joins
    the room
    right away.

 src/empathy-new-chatroom-dialog.c | 2 ++
 1 file changed, 2 insertions(+)

commit 363703bb5b66dfa167b1f90670fd582678dc2a35
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 11 11:02:48 2012 +0200

    remove empathy-contact-dialogs

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

 libempathy-gtk/Makefile.am		   |   3 -
 libempathy-gtk/empathy-contact-dialogs.c  | 234
 ------------------------------
 libempathy-gtk/empathy-contact-dialogs.h  |  39 -----
 libempathy-gtk/empathy-contact-dialogs.ui | 121 ---------------
 po/POTFILES.in				   |   2 -
 5 files changed, 399 deletions(-)

commit 1d63b3b7f03ec1508329894ab25113749a8a1403
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 11 11:31:46 2012 +0200

    remove useless includes

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

 libempathy-gtk/empathy-subscription-dialog.c | 1 -
 src/empathy-chat-window.c		      | 1 -
 src/empathy-roster-window.c		      | 1 -
 3 files changed, 3 deletions(-)

commit 791b7e8b3d1f67314170bbd743cb253385d937d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 11 11:30:09 2012 +0200

    individual-menu: use the individual version of the add dialog

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

 libempathy-gtk/empathy-individual-menu.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 15b0acdc8cec7794f1112b243b2fadd3baf6a707
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 11 10:47:24 2012 +0200

    log-window: use empathy_display_individual_info()

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

 libempathy-gtk/empathy-log-window.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit 634a85b3d20ef79e77069ef93e4c9a6f45a12cf8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 11 10:47:24 2012 +0200

    contact-search-dialog: use empathy_display_individual_info()

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

 libempathy-gtk/empathy-contact-search-dialog.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit 3878f8cca1e145e30932823c4ea6d0de1ad4462c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 11 10:47:24 2012 +0200

    chat: use empathy_display_individual_info()

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

 libempathy-gtk/empathy-chat.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

commit 60e19a5cd6acce9af9b19d013eb396f12ea42abe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 10 16:03:17 2012 +0200

    factor out empathy_display_individual_info()

    It didn't want to put more misc stuffs to ui-utils so used this file.

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

 .../empathy-individual-information-dialog.c	    | 138
 +++++++++++++++++++++
 .../empathy-individual-information-dialog.h	    |	2 +
 libempathy-gtk/empathy-individual-menu.c	    | 128
 +------------------
 3 files changed, 141 insertions(+), 127 deletions(-)

commit 4ded9c80ba7a602cdf7bedc52e6cff57f507f943
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Tue Jul 10 22:52:37 2012 +0300

    Updated Hebrew translation.

 po/he.po | 976
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 487 insertions(+), 489 deletions(-)

commit 181d9742d1159b33dcd5c126cb8593b2e77e0e74
Author: Žygimantas Beručka <uid0@akl.lt>
Date:	Tue Jul 10 19:03:20 2012 +0300

    Updated Lithuanian translation

 po/lt.po | 2972
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 1579 insertions(+), 1393 deletions(-)

commit 84304062b65b80e20da92939da03e38c6232b87b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 1 12:12:48 2012 +0200

    protocol-chooser: set pixbuf on the cell rather than the icon-name

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

 libempathy-gtk/empathy-protocol-chooser.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

commit 4757fce1713fc77538106c26493ba1255617b5cf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 9 12:13:28 2012 +0200

    roster-view: export special group names

    Needed to special case the DnD code.

 libempathy-gtk/empathy-roster-view.c | 37
 ++++++++++++++++++------------------
 libempathy-gtk/empathy-roster-view.h |  4 ++++
 2 files changed, 22 insertions(+), 19 deletions(-)

commit 690d4bb2fb9ec033299a057483019253f859fecb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 5 15:53:47 2012 +0200

    roster-view: add empathy_roster_view_get_group_at_y()

 libempathy-gtk/empathy-roster-view.c | 19 +++++++++++++++++++
 libempathy-gtk/empathy-roster-view.h |  4 ++++
 2 files changed, 23 insertions(+)

commit 276d529fb837238cba3f1f51ba47ec4ec45d90b9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 5 15:52:58 2012 +0200

    add empathy_roster_contact_get_avatar_pixbuf()

 libempathy-gtk/empathy-roster-contact.c | 6 ++++++
 libempathy-gtk/empathy-roster-contact.h | 3 +++
 2 files changed, 9 insertions(+)

commit 20c864a24dce1b0f2781ea1cbbf75ce3d8c34495
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 9 10:11:57 2012 +0200

    call-window: use gdk_keyval_to_unicode()

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

 src/empathy-call-window.c | 79
 +++++++++++++----------------------------------
 1 file changed, 22 insertions(+), 57 deletions(-)

commit cc26255d60d53c56e42dffd8094d028d7cde112f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 6 15:04:55 2012 +0200

    dialpad-widget: use EmpathyDialpadButton

    This will be needed if we want to stop using GtkButton in order to
    keep the
    key pressed while the keyboard key is.

    Anyway, it's good to have regardeless as that makes the code cleaner.

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

 libempathy-gtk/empathy-dialpad-button.c | 26 +++++++++++++++
 libempathy-gtk/empathy-dialpad-widget.c | 57
 ++++++++++-----------------------
 2 files changed, 43 insertions(+), 40 deletions(-)

commit 086cd424968bc5c4ef97f3b715bd26fd2a46e9ec
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 6 14:39:20 2012 +0200

    add empathy-dialpad-button

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

 libempathy-gtk/Makefile.am		 |   2 +
 libempathy-gtk/empathy-dialpad-button.c | 202
 ++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-dialpad-button.h |  85 ++++++++++++++
 3 files changed, 289 insertions(+)

commit ada7b68f30ab88a3f142bf82cac790b98743ef23
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 6 14:29:48 2012 +0200

    call-window: allow user to enter dtmf events using his keyboard

    Ideally we should stop sending the DTMF event when the key is released
    but we
    can't easily do that in Gtk+; we'll have to write our own widget.
    I'm going to give it a shot but this is already a nice improvement
    so we
    shouldn't block on it.

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

 src/empathy-call-window.c | 63
 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

commit 761ef25a05361cdc8ec484e12898b3aedda94fe5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 6 14:29:25 2012 +0200

    add empathy_dialpad_widget_press_key()

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

 libempathy-gtk/empathy-dialpad-widget.c | 18 ++++++++++++++++++
 libempathy-gtk/empathy-dialpad-widget.h |  3 +++
 2 files changed, 21 insertions(+)

commit 7a2248d5a003ca685116076abb898857a8b40a60
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 6 14:28:32 2012 +0200

    dialpad-widget: store buttons in a hash table

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

 libempathy-gtk/empathy-dialpad-widget.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

commit 1eb83c95020a883d01dca4dd09d1cf3e242866c1
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Mon Jul 9 09:40:09 2012 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 938
 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 432 insertions(+), 506 deletions(-)

commit 1c664bed2c3ab4ed1d2763eb80675949a6ff4ca1
Author: A S Alam <aalam@users.sf.net>
Date:	Mon Jul 9 07:10:46 2012 +0530

    Update Punjabi Translation

 po/pa.po | 2531
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1274 insertions(+), 1257 deletions(-)

commit fd3fd34d534510b5a96b7559c0743e9efddb73c2
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Jul 6 12:24:15 2012 +0200

    Updated Spanish translation

 po/es.po | 115
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 62 insertions(+), 53 deletions(-)

commit 20a4ffc16a3eaf4ea5859ccd3d2f8c1d364441aa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 29 14:35:45 2012 +0200

    individual-widget: don't display unknown presence

    Best to to not show anything than showing we don't know.

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

 libempathy-gtk/empathy-individual-widget.c | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

commit 7615fb3d04356ebb2155a8e335db6eb995dac66d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 29 14:25:39 2012 +0200

    inline block_contact_dialog_show() into subscription-dialog.c

    It's only used there now.

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

 libempathy-gtk/empathy-contact-dialogs.c     | 73
 ---------------------------
 libempathy-gtk/empathy-contact-dialogs.h     |  4 --
 libempathy-gtk/empathy-subscription-dialog.c | 74
 +++++++++++++++++++++++++++-
 3 files changed, 73 insertions(+), 78 deletions(-)

commit 001cd2ec66845de212ecb58c71a8f38e68834bfe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 29 14:21:32 2012 +0200

    remove empathy_subscription_dialog_show()

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

 libempathy-gtk/empathy-contact-dialogs.c | 135
 -------------------------------
 libempathy-gtk/empathy-contact-dialogs.h |   3 -
 2 files changed, 138 deletions(-)

commit b020c790f9d30e23c34bc5a7fec1a4de4c2aa528
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 29 14:18:13 2012 +0200

    event-manager: use EmpathySubscriptionDialog

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

 src/empathy-event-manager.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

commit 875ec0d10b3042d2c40a7d0f288653adbdc281bf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 29 12:39:32 2012 +0200

    add empathy-subscription-dialog

    This is copied from the similar dialog in empathy-account-dialogs.c
    which I'm
    about to remove.

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

 libempathy-gtk/Makefile.am		      |   2 +
 libempathy-gtk/empathy-subscription-dialog.c | 288
 +++++++++++++++++++++++++++
 libempathy-gtk/empathy-subscription-dialog.h |  75 +++++++
 po/POTFILES.in				      |   1 +
 4 files changed, 366 insertions(+)

commit 408c581426ea8df05cc2b1c1663aa8405334f2ac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 4 15:44:43 2012 +0200

    empathy_adium_path_is_valid: check if the directory has the right
    format

    The Adium spec explicitely says that the root directory of the
    theme should
    end with ".AdiumMessageStyle".

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

 libempathy-gtk/empathy-theme-adium.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit 4e532114814f39740a5695c35fc02b465bbce2e1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 4 14:11:09 2012 +0200

    roster-contact: force the size of the avatar

    This ensures that all the contacts are nicely aligned even if they
    have a
    smaller avatar.

 libempathy-gtk/empathy-roster-contact.c | 2 ++
 1 file changed, 2 insertions(+)

commit d3c53c44780da382ed2bf17fbcff9d71b234e48d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 4 14:10:20 2012 +0200

    pixbuf_avatar_from_individual_closure_new: use the g_slice allocator

    We are likely to allocate a bunch of those so best to use the g_slice
    allocator.

 libempathy-gtk/empathy-ui-utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit a86f21ab5cf567281f3e22bfd4409bbfbbcf78e4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 4 13:45:52 2012 +0200

    avatar_icon_load_cb: use gdk_pixbuf_new_from_stream_at_scale()

    Make all this code much simpler.

 libempathy-gtk/empathy-ui-utils.c | 139
 +++++++-------------------------------
 1 file changed, 26 insertions(+), 113 deletions(-)

commit 3cc222d662bc96186bbd19fa75e44ac98e54cbb1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 4 13:45:11 2012 +0200

    ui-utils: factor out pixbuf_round_corners()

 libempathy-gtk/empathy-ui-utils.c | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

commit 2f6643d36031df340dc5b154be579d13bc0de58e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 4 12:51:00 2012 +0200

    ui-utils: remove unused public functions

 libempathy-gtk/empathy-ui-utils.c | 687
 +-------------------------------------
 libempathy-gtk/empathy-ui-utils.h |  19 --
 2 files changed, 7 insertions(+), 699 deletions(-)

commit 1b476eb4eb43f694bf8e2065b7d8f227af8d66ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 4 12:19:43 2012 +0200

    ui-utils: port to TP coding style

    Half of this file was already using the new style.

 libempathy-gtk/empathy-ui-utils.c | 3055
 +++++++++++++++++++------------------
 libempathy-gtk/empathy-ui-utils.h |  175 +--
 2 files changed, 1646 insertions(+), 1584 deletions(-)

commit 0c7c2343adf444cdbaf937ac088f9ccc2057a6cc
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Jul 4 10:10:29 2012 +0200

    boxes theme: style actions like before

 .../Contents/Resources/Incoming/Content.html	    |  2 +-
 .../Contents/Resources/Incoming/NextContent.html   |  2 +-
 .../Contents/Resources/main.css		    | 25
 ++++++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

commit 76028ac5745e8990968d24e7e4fa564d3521ff11
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Jul 4 09:52:23 2012 +0200

    classic theme: style action lines like before

 .../Contents/Resources/main.css		    | 22
 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

commit a21e213029f9d31b260d53d453fbbafebfeafe68
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Jul 4 09:40:23 2012 +0200

    classic theme: more colour updates

 data/themes/Classic.AdiumMessageStyle/Contents/Resources/main.css |
 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit edfe8cf52156f2957155f110880f619d337d13e5
Author: Tom Tryfonidis <tomtryf@gmail.com>
Date:	Wed Jul 4 03:00:15 2012 +0300

    Updated Greek translations

 help/el/el.po | 3878
 +++++++++++++++++++++++++++++++--------------------------
 po/el.po      |  305 +++--
 2 files changed, 2226 insertions(+), 1957 deletions(-)

commit e5ef72f1a021f01946245641eae2a8e031d79d90
Author: Frédéric Péters <fpeters@0d.be>
Date:	Tue Jul 3 12:43:58 2012 +0200

    classic theme: update with colours from the old theme

    part of https://bugzilla.gnome.org/show_bug.cgi?id=679321

 data/themes/Classic.AdiumMessageStyle/Contents/Resources/main.css |
 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 388c2bb5df92f6f3725755756d8e084b7a6fdbda
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Jul 2 17:28:42 2012 +0200

    Updated Spanish translation

 po/es.po | 430
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 212 insertions(+), 218 deletions(-)

commit 7bba30aceaa023f04a59398697c65fc93dd8e55d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 2 15:52:33 2012 +0200

    remove empathy-chat-view

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

 libempathy-gtk/Makefile.am	    |	2 -
 libempathy-gtk/empathy-chat-view.c | 275
 -------------------------------------
 libempathy-gtk/empathy-chat-view.h | 128 -----------------
 3 files changed, 405 deletions(-)

commit 4b2e73040c8373a61e578382d79022a4fa57a3ef
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 2 15:54:58 2012 +0200

    remove useless chat-view.h includes

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

 libempathy-gtk/empathy-log-window.c | 1 -
 libempathy-gtk/empathy-ui-utils.h   | 2 --
 2 files changed, 3 deletions(-)

commit 87f41f93a0c79b428e0eff6f9f843fce005b82ae
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 2 15:40:16 2012 +0200

    Stop using EmpathyChatView

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

 libempathy-gtk/empathy-chat.c		|  66 +++++++--------
 libempathy-gtk/empathy-chat.h		|   4 +-
 libempathy-gtk/empathy-search-bar.c	|  18 ++--
 libempathy-gtk/empathy-search-bar.h	|   4 +-
 libempathy-gtk/empathy-theme-adium.c	| 146
 ++++++++++++---------------------
 libempathy-gtk/empathy-theme-adium.h	|  56 ++++++++++++-
 libempathy-gtk/empathy-theme-manager.c |   5 +-
 libempathy-gtk/empathy-theme-manager.h |   4 +-
 libempathy-gtk/empathy-webkit-utils.c	|   3 +-
 src/empathy-chat-window.c		|   2 +-
 src/empathy-preferences.c		|   8 +-
 11 files changed, 165 insertions(+), 151 deletions(-)

commit 7f2b924f50433a6240bb8feaf95b423cb6124b12
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 2 15:21:30 2012 +0200

    theme-adium use self->priv pattern

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

 libempathy-gtk/empathy-theme-adium.c | 334
 ++++++++++++++++-------------------
 libempathy-gtk/empathy-theme-adium.h |   4 +-
 2 files changed, 160 insertions(+), 178 deletions(-)

commit 254c6ef0192ee7bc70530987a5e359cb4a04148c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 2 15:09:00 2012 +0200

    theme-adium: port to new coding styles

    Some part of this file was already using the new style so best to stay
    coherent.

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

 libempathy-gtk/empathy-theme-adium.c | 3219
 ++++++++++++++++++----------------
 libempathy-gtk/empathy-theme-adium.h |   88 +-
 2 files changed, 1721 insertions(+), 1586 deletions(-)

commit 234fbbca44a1726a1f150ada54690b1bcf9c010f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 2 14:40:43 2012 +0200

    remove empathy-chat-text-view

    In Adium we trust.

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

 libempathy-gtk/Makefile.am		 |    2 -
 libempathy-gtk/empathy-chat-text-view.c | 1485
 -------------------------------
 libempathy-gtk/empathy-chat-text-view.h |   88 --
 libempathy-gtk/empathy-theme-manager.c  |    1 -
 po/POTFILES.in				 |    1 -
 5 files changed, 1577 deletions(-)

commit ddb848bbfc956f79171ea141ce6dba6eea484aa7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 2 14:08:01 2012 +0200

    theme-manager: don't leak info is 2 themes have the same name

 libempathy-gtk/empathy-theme-manager.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 82b5dbb25241135989406c6514e0b84184606645
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 2 14:07:29 2012 +0200

    Depend on GLib 2.33.3

    Needed for g_list_copy_deep()

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

commit 284ff75925b329b0443338660480d392f53501e1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 2 14:06:58 2012 +0200

    upgrade_chat_theme_settings: use
    empathy_theme_manager_dup_theme_name_from_path()

 src/empathy-sanity-cleaning.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

commit 2b8d7ebbdd40b55b72248c11600cd782d4ac7ab1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 2 14:06:03 2012 +0200

    raise a DEBUG instead of WARNING if we can't find the theme

 libempathy-gtk/empathy-theme-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 38ad4dab9cd3d88a2f05fa7e1a37c74e3d361304
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 2 13:50:48 2012 +0200

    no need to call empathy_theme_manager_find_theme() twice

 libempathy-gtk/empathy-theme-manager.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

commit 9ea865f2b1e420d2a908cd0ac80e0c5d38a7ac4d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 2 13:24:03 2012 +0200

    List themes from EMPATHY_SRCDIR as well

 libempathy-gtk/empathy-theme-manager.c | 57
 +++++++++++++++++++++++++++-------
 1 file changed, 45 insertions(+), 12 deletions(-)

commit 9958d658c1c3eb7a4bd81a15a85d5d7658b4d85b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 2 13:00:59 2012 +0200

    change default value of 'theme' key to 'Classic'

    That's the name of the Adium version.

 data/org.gnome.Empathy.gschema.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9b222761cc9995a09f37b7537a12e4955b586323
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 2 12:58:56 2012 +0200

    Store the theme name in the 'theme' gsettings key

    The 'adium-path' key is now deprecated as we lookup the theme path
    from its
    name.

 data/org.gnome.Empathy.gschema.xml	|  2 +-
 libempathy-gtk/empathy-theme-manager.c | 47
 +++++++++++++++-------------------
 src/empathy-preferences.c		| 46
 +++++++++++++++++----------------
 src/empathy-sanity-cleaning.c		| 47
 +++++++++++++++++++++++++---------
 4 files changed, 80 insertions(+), 62 deletions(-)

commit 5e112661cca767870225936428515a82b2f6f82c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 2 12:57:36 2012 +0200

    add empathy_theme_manager_dup_theme_name_from_path()

 libempathy-gtk/empathy-theme-manager.c | 20 ++++++++++++++++++++
 libempathy-gtk/empathy-theme-manager.h |  2 ++
 2 files changed, 22 insertions(+)

commit 74895e8b815cbed7a041fcbc8e3234ae6df102ae
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 2 11:22:29 2012 +0200

    theme-manager: use self->priv pattern

 libempathy-gtk/empathy-theme-manager.c | 118
 +++++++++++++++------------------
 libempathy-gtk/empathy-theme-manager.h |   3 +-
 2 files changed, 55 insertions(+), 66 deletions(-)

commit 6c5c16265b6a862e3903e051cc251dab3c82d20d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 2 11:13:52 2012 +0200

    theme-manager: port to new coding style

 libempathy-gtk/empathy-theme-manager.c | 524
 +++++++++++++++++----------------
 libempathy-gtk/empathy-theme-manager.h |  53 ++--
 2 files changed, 308 insertions(+), 269 deletions(-)

commit 193da58c9a4d7f6fc9ecb17b1d09c3a8fff56cdd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 2 10:52:46 2012 +0200

    theme-manager: remove useless code

    None of this is still used.

 libempathy-gtk/empathy-theme-manager.c | 16 ----------------
 libempathy-gtk/empathy-theme-manager.h |  1 -
 2 files changed, 17 deletions(-)

commit 2daf6b4066dbde6fdcaa3aee6d85d67f3353bfac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 2 10:32:01 2012 +0200

    move theme migration code to sanity-cleaning.c

    That's where this kind of code is meant to be.

 libempathy-gtk/empathy-theme-manager.c | 40 -----------------------------
 src/empathy-sanity-cleaning.c		| 46
 +++++++++++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 41 deletions(-)

commit fa00d369ea01b464f62a7835e8f61d65f94bc29f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Jun 29 14:14:45 2012 +1000

    theme-manager: we can now look up themes in the path

 libempathy-gtk/empathy-theme-manager.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

commit 518d54667e1934f0e339e3368d77cfc953a34314
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Jun 29 14:12:14 2012 +1000

    theme-manager: make it possible to look up theme by name

 libempathy-gtk/empathy-theme-adium.c	|  3 ++
 libempathy-gtk/empathy-theme-manager.c | 67
 +++++++++++++++++++++++++++++++++-
 libempathy-gtk/empathy-theme-manager.h |  1 +
 3 files changed, 69 insertions(+), 2 deletions(-)

commit f433b0821c24fc7382bd289f2246b7b1e2039106
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Jun 25 15:15:48 2012 +1000

    Remove old themes from POTFILES.in

 po/POTFILES.in | 2 --
 1 file changed, 2 deletions(-)

commit 2bdbb3de1b5fda8f230ad144e8248472321920f1
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Jun 22 17:53:02 2012 +1000

    theme-manager: automatically migrate from legacy themes to Adium
    themes

    Because Adium themes are saved by path (urgh), adding a legacy theme
    called 'gnome' which can be used to set the default theme.

 libempathy-gtk/empathy-theme-manager.c | 47
 ++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

commit 4a3ff2e68eb3c17488f9a12587b7e9eb95a51645
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Jun 21 13:04:19 2012 +1000

    Bring back 'theme' key

    We need it for migrating the settings to Adium-only

 data/org.gnome.Empathy.gschema.xml | 5 +++++
 libempathy/empathy-gsettings.h     | 1 +
 2 files changed, 6 insertions(+)

commit 10fc10c0be71a31064298776b7d1abc412157dc8
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Jun 20 20:14:39 2012 +1000

    theme-manager: clean up memory releasing

 libempathy-gtk/empathy-theme-manager.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit a743a48fa1d0f21882d6274f157310614182a431
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Jun 20 20:14:26 2012 +1000

    Rename 'Classic WK' to 'Classic'

 data/themes/Classic.AdiumMessageStyle/Contents/Info.plist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c7d5d6d78773d9e7cd933b326e7566a072b655d9
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Jun 20 19:42:22 2012 +1000

    Remove legacy themes code

 data/org.gnome.Empathy.gschema.xml	|   5 -
 libempathy-gtk/Makefile.am		|   4 -
 libempathy-gtk/empathy-theme-boxes.c	| 426
 ---------------------------------
 libempathy-gtk/empathy-theme-boxes.h	|  61 -----
 libempathy-gtk/empathy-theme-irc.c	| 143 -----------
 libempathy-gtk/empathy-theme-irc.h	|  62 -----
 libempathy-gtk/empathy-theme-manager.c | 374
 +----------------------------
 libempathy/empathy-gsettings.h		|   1 -
 src/empathy-preferences.c		|  56 +----
 9 files changed, 13 insertions(+), 1119 deletions(-)

commit 7f6f5faf1a3ac7109b690d33555c54db05a692fe
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Jun 18 14:31:14 2012 +1000

    Add Planet GNOME chat theme

 data/themes/Makefile.am			    |  13 +++
 .../Contents/Info.plist			    |  41 ++++++++
 .../Contents/Resources/Images/corners.png	    | Bin 0 -> 806 bytes
 .../Contents/Resources/Images/horizontal.png	    | Bin 0 -> 280 bytes
 .../Contents/Resources/Images/nipple.png	    | Bin 0 -> 528 bytes
 .../Contents/Resources/Images/vertical.png	    | Bin 0 -> 151 bytes
 .../Contents/Resources/Incoming/Content.html	    |  19 ++++
 .../Contents/Resources/Incoming/NextContent.html   |	4 +
 .../Contents/Resources/Status.html		    |	5 +
 .../Contents/Resources/main.css		    | 108
 +++++++++++++++++++++
 10 files changed, 190 insertions(+)

commit 3a8ab7a8bba633232ea9c335f8698ded5f763c17
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Jun 18 11:07:41 2012 +1000

    Add 'Classic' theme

    Currently called 'Classic WK' until the old theme is removed.

 .../Classic.AdiumMessageStyle/Contents/Info.plist  | 41
 ++++++++++++++++++++++
 .../Contents/Resources/Content.html		    |  5 +++
 .../Contents/Resources/Status.html		    |  5 +++
 .../Contents/Resources/main.css		    | 31 ++++++++++++++++
 data/themes/Makefile.am			    | 10 +++++-
 5 files changed, 91 insertions(+), 1 deletion(-)

commit 7aaacb249dd73f815c028ce0b5a3ec5ca783f69b
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Jun 18 10:46:02 2012 +1000

    Install Boxes theme

    Uninstall needs work. Why is Automake so bad with directories?

 configure.ac		 |  1 +
 data/Makefile.am	 |  2 +-
 data/themes/Makefile.am | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

commit b4228fb1ec2180ae7e7df789df0287c67958c9ec
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Sun Jun 17 16:40:16 2012 +1000

    Add Boxes as an Adium theme with variants Clean, Simple and Blue

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

 .../Boxes.AdiumMessageStyle/Contents/Info.plist    | 41 ++++++++++++++++
 .../Contents/Resources/Incoming/Content.html	    | 11 +++++
 .../Contents/Resources/Incoming/NextContent.html   |  4 ++
 .../Contents/Resources/Status.html		    |  5 ++
 .../Contents/Resources/Variants/Blue.css	    |  9 ++++
 .../Contents/Resources/Variants/Clean.css	    |  5 ++
 .../Contents/Resources/Variants/Simple.css	    |  6 +++
 .../Contents/Resources/main.css		    | 55
 ++++++++++++++++++++++
 8 files changed, 136 insertions(+)

commit 04d6f19f37961b2c6b866559eeae7cdad1068e16
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Sat Jun 30 22:56:24 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 2419
 ++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 2441
 +++++++++++++++++++++++++++++++----------------------------
 2 files changed, 2553 insertions(+), 2307 deletions(-)

commit a711c1e353bc84a0e97652fb22d39e34bd729f4e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 28 11:07:37 2012 +0200

    accounts-dialog: don't show the avatar button if avatars are not
    supported

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

 src/empathy-accounts-dialog.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

commit 847a2ea867f4006e75ee26ba16cc96ba6b26a5ed
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Jun 27 10:43:21 2012 +0100

    Boxes theme: implement set_show_avatars

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

 libempathy-gtk/empathy-theme-boxes.c | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

commit db4d1607aa0ee6988399f99efc09bed5e7133dc8
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Jun 27 10:42:56 2012 +0100

    Adium themes: implement set_show_avatars()

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

 libempathy-gtk/empathy-theme-adium.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

commit 13a16f024f65bdfd899298d0278e0166ca781e7e
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Jun 27 10:40:52 2012 +0100

    EmpathyChat: tell view to show/hide avatars based on connection
    interfaces

    I believe that by the time we get here the EmpathyTpChat's
    TpConnection
    should be prepared enough to know its interfaces? It seems to be in my
    brief testing.

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

 libempathy-gtk/empathy-chat.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit 36dc0639473930ac596bdbf08f6ea0a6a8471f7c
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Jun 27 10:29:16 2012 +0100

    EmpathyChatView: add vfunc for showing/hiding avatars

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

 libempathy-gtk/empathy-chat-view.c | 20 ++++++++++++++++++++
 libempathy-gtk/empathy-chat-view.h |  4 ++++
 2 files changed, 24 insertions(+)

commit 539cd8f46f384fd209f6f87aa1e1add2d8197436
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Mon Jun 25 16:31:00 2012 +0200

    empathy-nautilus-sendto now uses a RosterView instead of
    EmpathyContactChooser

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

 nautilus-sendto-plugin/empathy-nautilus-sendto.c | 56
 +++++++++++++++++-------
 1 file changed, 40 insertions(+), 16 deletions(-)

commit dfa4c7069189ead061488b3057fd56f86f6d89a2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 27 16:05:02 2012 +0200

    factor out empathy_chat_copy()

    Much easier to understand its logic that way.

 libempathy-gtk/empathy-chat.c | 95
 ++++++++++++++++++++++++++-----------------
 1 file changed, 58 insertions(+), 37 deletions(-)

commit a4f0fc24f06f82f4792836e8e37c5d9d97e92f07
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 27 15:37:08 2012 +0200

    build nautilus-sendto plugin with ERROR_CFLAGS

 nautilus-sendto-plugin/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit c3c7502b206eb550c08e8a9271a4087d855038df
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 27 11:05:18 2012 +0200

    tp-chat: stop setting the TpAccount during construction

    It doesn't have to be a property any more, we can just get it from the
    TpConnection when we need it.

    Should fix a race crash when the TpAccount of the TpConnection is
    not set yet;
    see fdo#51444.

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

 libempathy/empathy-client-factory.c |	6 +----
 libempathy/empathy-tp-chat.c	     | 46
 ++++++++-----------------------------
 libempathy/empathy-tp-chat.h	     |	1 -
 3 files changed, 10 insertions(+), 43 deletions(-)

commit 81a65a9ab520396d5ba6eb4085b4ab653bec547c
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Wed Jun 27 11:23:11 2012 +0200

    Added new function to get selected individual

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

 libempathy-gtk/empathy-roster-view.c | 13 +++++++++++++
 libempathy-gtk/empathy-roster-view.h |  2 ++
 2 files changed, 15 insertions(+)

commit 81a7652d19e8921b233f53f21cd14655a567bab4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 26 09:22:15 2012 +0200

    egg-list-box: update to master

 libempathy-gtk/egg-list-box | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e4f305a86101b8f03a561a2ae4057a1eed386685
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Jun 26 10:08:51 2012 +0100

    Strip %senderPrefix% in Adium themes

    %senderPrefix% is not documented on
    <http://trac.adium.im/wiki/CreatingMessageStyles> but it's used in
    minimal_mod, the theme I use, in the tooltips for each speaker's name.
    Based on <http://hg.adium.im/adium/rev/b586b027de42>, it's supposed to
    be the IRC mode character (@, +, whatever). We don't have that
    information, so just get rid of it.

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

 libempathy-gtk/empathy-theme-adium.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit e321ce903efb091607161093ec490a8e22129059
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 22 10:07:59 2012 +0200

    roster-window: allow to send files using DnD

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

 src/empathy-roster-window.c | 170
 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 170 insertions(+)

commit 3a0dc8812d6c720499e34882b499f1cd9447c57c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 22 09:40:15 2012 +0200

    roster-view: export empathy_roster_view_get_individual_at_y()

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

 libempathy-gtk/empathy-roster-view.c | 31 ++++++++++++++++++++++++-------
 libempathy-gtk/empathy-roster-view.h |  5 +++++
 2 files changed, 29 insertions(+), 7 deletions(-)

commit 9b18c84ccde2ff7231baddab7dd53403fc4df2d9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 21 12:42:52 2012 +0200

    ft-factory: ensure that the factory stays alive while
    empathy_ft_handler_new_outgoing() is running

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

 libempathy/empathy-ft-factory.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 8d84c1728f9b1e5e41a281b6e8b1ee12020e18b0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 25 15:16:07 2012 +0200

    chat-window: disable file transfer DnD

    It's not supported at the moment.

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

 src/empathy-chat-window.c | 2 ++
 1 file changed, 2 insertions(+)

commit 13d6036bb4dd8adb673bd82a591fe1bbc449ca96
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 25 15:08:56 2012 +0200

    don't display 'Send file' menu item in empathy-chat

    We only support requesting FT channel in the same process as the
    FT handler.

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

 libempathy-gtk/empathy-individual-menu.c | 20 +++++++++++++-------
 libempathy-gtk/empathy-individual-menu.h |  1 +
 src/empathy-roster-window.c		  |  3 ++-
 3 files changed, 16 insertions(+), 8 deletions(-)

commit e5342c2b0a781f5ba46060bf56829fb6d308663d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 26 09:47:56 2012 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cd175ba82376f368eca422abef56c41dbf6e60c7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 26 09:37:54 2012 +0200

    prepare 3.5.3

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

commit 95cd25e0c38705b3b315ab420766c99a558ef232
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 26 09:22:15 2012 +0200

    egg-list-box: update to master

 libempathy-gtk/egg-list-box | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit aa33d4625373bb4a2287c0b25f96462e2a3908e8
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Mon Jun 25 00:03:24 2012 +0200

    Updated Galician translations

 po/gl.po | 752
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 371 insertions(+), 381 deletions(-)

commit ce34277281fa2ca20bd5f7e9722765bb1d3944a8
Author: Tom Tryfonidis <tomtryf@gmail.com>
Date:	Fri Jun 22 13:54:35 2012 +0300

    Updated Greek translation

 po/el.po | 1181
 +++++++++++++++++++++++++-------------------------------------
 1 file changed, 471 insertions(+), 710 deletions(-)

commit 22be0c89b17bdcb6d741bdbb2093e25506b29353
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	Fri Jun 22 09:31:06 2012 +0200

    Updated Slovenian translation

 po/sl.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit d3d7a1fe65c052e9187b4603171198aa373f4d0b
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Tue Jun 19 16:20:29 2012 +0200

    Create and use People Nearby group

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

 libempathy-gtk/empathy-roster-view.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

commit 333e6efdcfc018ee6db2db27e7c05ede30974a11
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 19 16:38:40 2012 +0200

    coding style fixes

 libempathy-gtk/empathy-roster-view.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 1deafc0cb7df9ace28a4a4652d2ce7fc9acde116
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 19 16:04:44 2012 +0200

    widget-irc: don't check 'username' using a regexp

    It's an optional parameter so can be not set.

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

 libempathy-gtk/empathy-account-widget.c | 11 -----------
 1 file changed, 11 deletions(-)

commit 86bbf6fce421a5ded5065c39f28849045392a402
Author: Laurent Contzen <lcontzen@gmail.com>
Date:	Tue Jun 19 14:44:17 2012 +0200

    If group is UNGROUPED, display at the bottom of the roster

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

 libempathy-gtk/empathy-roster-view.c | 5 +++++
 1 file changed, 5 insertions(+)

commit b7d71d0633ae264acb5b3070d0f318b356f6cabc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 19 11:43:08 2012 +0200

    roster-view: add_to_displayed: no need to try refiltering groups in
    non group mode

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

 libempathy-gtk/empathy-roster-view.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 947941331f01e77ce83baa623e4a15b081d8cd1a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 19 11:40:19 2012 +0200

    roster-view: add_to_displayed: get the proper EmpathyRosterGroup
    object

    The contacts hash table is a group-name => EmpathyRosterContact
    mapping. We
    need to use the self->priv->roster_groups hash to get the
    EmpathyRosterGroup
    object which is the one we want to refilter.

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

 libempathy-gtk/empathy-roster-view.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit c977e894c549b8bb146e23dd5ce88509a30c96cd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 18 13:15:17 2012 +0200

    roster-view: use a signal instead of a cb to handle individual
    tooltips

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

 libempathy-gtk/empathy-roster-view.c	      | 29
 ++++++++++------------------
 libempathy-gtk/empathy-roster-view.h	      | 11 -----------
 src/empathy-roster-window.c		      |  9 ++++-----
 tests/interactive/test-empathy-roster-view.c |  7 ++++---
 4 files changed, 18 insertions(+), 38 deletions(-)

commit aac60300edfcb929acca9e4fc59cdb5803eecc30
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 18 12:17:33 2012 +0200

    roster-window: display individual tooltips

    I re-used the same code as in EmpathyIndividualView.

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

 src/empathy-roster-window.c | 50
 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

commit 5a535ee7a9d488a608e7934839fa989b804f9577
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 18 11:26:48 2012 +0200

    empathy_roster_view_query_tooltip: set the tooltip next to the
    right child

    This ensures that the tooltip is always displayed next to the
    correct row.

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

 libempathy-gtk/empathy-roster-view.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

commit 43a7d1f1143b857de2ebcccd19286cca8495788b
Author: Seif Lotfy <seif@lotfy.com>
Date:	Mon Jun 18 12:46:37 2012 +0200

    Add heuristic to calculate individuals popularity

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

 libempathy/empathy-individual-manager.c | 44
 +++++++++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 5 deletions(-)

commit 5292eef36b1cd080a7b3f3694fb1628ab74b7b64
Author: Seif Lotfy <seif@lotfy.com>
Date:	Sun Jun 17 00:14:17 2012 +0200

    Show Popular contacts in the "Top Contacts" group

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

 libempathy-gtk/empathy-roster-view.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 8bcfaf8f90a53ea4cd5fd92937aab8d313e373cb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 18 10:58:36 2012 +0200

    roster-view: select the child when firing the popup menu

    It's a bit weird to have the popup being open without knowing for
    sure which
    contact it's referring to.

 libempathy-gtk/empathy-roster-view.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 00a6f4588e7c564ff5a4a0a5aa6650775532f701
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 14 11:36:46 2012 +0200

    individual-manager: document that individuals_pop ref its content

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

 libempathy/empathy-individual-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 35dfc34fc41a8150b9d66d3bbbbc7414e9cb3699
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 14 11:30:18 2012 +0200

    individual-manager: document individual_notify_im_interaction_count()

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

 libempathy/empathy-individual-manager.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 7a5547dfa849ca3df4be23e83643c91d9069cabf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 14 11:01:13 2012 +0200

    Revert "individual-manager: comment out interaction code"

    This reverts commit 7f8fe5091b7a980133c0c3d1285cb718f8772142.

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

 libempathy/empathy-individual-manager.c | 9 ---------
 1 file changed, 9 deletions(-)

commit 4356553d231eba93e566913f926387213cb88036
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 18 10:30:50 2012 +0200

    depends on Folks 0.7.1

    Needed for the interaction count API.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 74d098cd8894f72321237e120267a5ec3f188b3f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 15 16:59:27 2012 +0200

    Use audio-input-microphone-muted-symbolic when the mic is muted

    It's clearer that way.

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

 libempathy-gtk/empathy-images.h |  2 ++
 src/empathy-call-window.c	 | 39
 +++++++++++++++++++++++++++++----------
 src/empathy-call-window.ui	 |  3 +--
 3 files changed, 32 insertions(+), 12 deletions(-)

commit 22e50a5e325426d739ce11a63d1772b85285ecc8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 15 16:59:05 2012 +0200

    add empathy_audio_src_set_mute()

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

 src/empathy-audio-src.c | 9 +++++++++
 src/empathy-audio-src.h | 3 +++
 2 files changed, 12 insertions(+)

commit f7278051ee030397abb43a4e652b870865789d17
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Jun 15 14:12:05 2012 +0200

    Updated Spanish translation

 po/es.po | 755
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 357 insertions(+), 398 deletions(-)

commit 9ef2bba7ca3fe048cc637b64613e8a574f516dc7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 13 09:59:13 2012 +0200

    Don't show groups by default

    The new design is less groups oriented. Users can easly get them
    back using
    the preferences dialog.

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

 data/org.gnome.Empathy.gschema.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 52189008475461e67cc43d9fb6eef7eeea5d3529
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 13 09:57:43 2012 +0200

    preferences: add UI to show/hide groups

    I'm about to change the default to not show groups, so users should
    have an
    easy way to get them back.
    I just removed a bunch of options from the preferences dialog so at
    the end it
    will still be simpler than it used to be.

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

 src/empathy-preferences.c  |  2 ++
 src/empathy-preferences.ui | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

commit a27a6f8621c1f054c39e0ee1c0b8334434b10c97
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 13 09:45:28 2012 +0200

    remove deprecated gsettings keys

    Those are not supported by the new roster UI and so can be removed.

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

 data/empathy.convert		    |  7 ----
 data/org.gnome.Empathy.gschema.xml | 26 -------------
 libempathy/empathy-gsettings.h     |  6 ---
 src/empathy-preferences.c	    | 45 -----------------------
 src/empathy-preferences.ui	    | 75
 --------------------------------------
 5 files changed, 159 deletions(-)

commit 368556a6bd473f1faab34b44e6dba224f88361ac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 13 09:51:03 2012 +0200

    roster-window: remove unused gsettings_contacts

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

 data/org.gnome.Empathy.gschema.xml | 1 -
 src/empathy-roster-window.c	    | 3 ---
 2 files changed, 4 deletions(-)

commit a3c513e5555aaaf91b4d2a5acb56c30b725c99e0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 11 12:23:03 2012 +0200

    roster-window: display events in the view

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

 src/empathy-roster-window.c | 295
 ++++----------------------------------------
 1 file changed, 24 insertions(+), 271 deletions(-)

commit 97242a76f0f603cff5e94a6be58055d3f4f7799a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 8 13:36:48 2012 +0200

    roster-window: display messages when roster is empty

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

 src/empathy-roster-window.c | 81
 +++++++++++++++------------------------------
 1 file changed, 27 insertions(+), 54 deletions(-)

commit 0d2c82ec91f099b62fcefea2c202e0bd3e140935
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 8 11:21:03 2012 +0200

    roster-window: hook activate and popup menu

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

 src/empathy-roster-window.c | 68
 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

commit 8ed21376bf242ae50628306a05d7dc3c78eadee5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 8 09:06:43 2012 +0200

    roster-window: use EmpathyRosterView

    Lot of features have been disabled/commented out. I'll re-introduce
    them
    progressively.

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

 src/empathy-roster-window.c | 91
 ++++++++++++++++-----------------------------
 1 file changed, 32 insertions(+), 59 deletions(-)

commit c352f9677a26fd46f688e3e4f1126f7bc1071925
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 7 15:41:00 2012 +0200

    roster-window: use tp_g_signal_connect_object()

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

 src/empathy-roster-window.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

commit 094e0583ad0361dd0981e5b9bf238a20e66248a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 14 17:42:28 2012 +0200

    roster-view: display the favorite icon for the 'top' group

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

 libempathy-gtk/empathy-roster-group.c | 45
 +++++++++++++++++++++++++++++++++--
 libempathy-gtk/empathy-roster-group.h |  3 ++-
 libempathy-gtk/empathy-roster-view.c  |  5 +++-
 3 files changed, 49 insertions(+), 4 deletions(-)

commit a1e8643f99402718f85c96d087cf212fd8f1c6d4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 14 15:50:15 2012 +0200

    roster-view: display favorite contacts at the top of the roster
    as well

    I renamed the group to 'Top Contacts' but I'm open to a better
    suggestion.

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

 libempathy-gtk/empathy-roster-view.c | 69
 +++++++++++++++++++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)

commit bed1c1b27c5ccb6d35be8ef2b2bb6b4fa8f24f24
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 14 15:42:53 2012 +0200

    roster-view: sort top contacts alphabetically

    We just want them to be on top but they should be sorted
    alphabetically
    together, not by popularity. This makes the 'top' contacts more
    stable.

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

 libempathy-gtk/empathy-roster-view.c | 44
 ++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

commit 7f8fe5091b7a980133c0c3d1285cb718f8772142
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 14 10:01:53 2012 +0200

    individual-manager: comment out interaction code

    I accidentally pushed this code to master. I'll revert this patch
    once the
    code has been reviewed and Folks 0.7.1 released.

 libempathy/empathy-individual-manager.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit 6cd010a8c3bbca11bf5989c9928f8f75a48ad5d4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 14 09:26:12 2012 +0200

    s/Ungroupped/Ungrouped

 libempathy-gtk/empathy-roster-view.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 674890e965f49fe00b3cc7365ce6d860583d0c88
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 12 14:26:29 2012 +0200

    roster-view: store all the children in EmpathyRosterGroup, not only
    the displayed one

    When checking if a contact is already in the 'top' list, we don't
    care if it's
    actually displayed or not.

    This makes the whole code more logic as only storing the displayed
    widgets in
    EmpathyRosterGroup was a bit weird.

 libempathy-gtk/empathy-roster-view.c | 101
 ++++++++++++++++++++++++-----------
 1 file changed, 69 insertions(+), 32 deletions(-)

commit b6912edc8b09d2478065ff95c1b55561a41ff4c5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 12 14:11:32 2012 +0200

    roster-view: factor out contact_should_be_displayed()

 libempathy-gtk/empathy-roster-view.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

commit f56ae9de2c19ee8d739b07909834816aa14ac6a1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 11 12:22:43 2012 +0200

    roster-view: add API to display events

 libempathy-gtk/empathy-roster-view.c | 226
 +++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-roster-view.h |   8 ++
 src/empathy-event-manager.h	      |   1 +
 3 files changed, 235 insertions(+)

commit 4726282c4b6985a0b34e77b7b7955bcad233cf50
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 11 12:17:43 2012 +0200

    add empathy_roster_contact_set_event_icon()

    Will be used to display events in the contact list.

 libempathy-gtk/empathy-roster-contact.c | 22 +++++++++++++++++++++-
 libempathy-gtk/empathy-roster-contact.h |  3 +++
 2 files changed, 24 insertions(+), 1 deletion(-)

commit 7ce8a9a175f90a8e214eb80a36aaa57fddcacb52
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 8 13:29:14 2012 +0200

    add empathy_roster_view_is_searching()

    Copied from empathy_individual_view_is_searching()

 libempathy-gtk/empathy-roster-view.c | 7 +++++++
 libempathy-gtk/empathy-roster-view.h | 2 ++
 2 files changed, 9 insertions(+)

commit ab756d6ee9c60b803d8b7785cbc507b6a96580bf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 8 13:12:35 2012 +0200

    roster-view: add 'empty' property

 libempathy-gtk/empathy-roster-view.c	      | 80
 +++++++++++++++++++++++++++-
 libempathy-gtk/empathy-roster-view.h	      |  2 +
 tests/interactive/test-empathy-roster-view.c | 13 +++++
 3 files changed, 94 insertions(+), 1 deletion(-)

commit 4e7a495826259c861506acfe87a376b51d450643
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 4 16:13:37 2012 +0200

    roster-contact: some sizing fixes

    - Don't force a minimal size
    - Ellipsize the labels so they don't enlarge the window
    - Make sure the label is always aligned on the left (needed when
    it's wrapped)

 libempathy-gtk/empathy-roster-contact.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 32e517b2bc225ad56de043e79278374994c099ad
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 4 14:57:03 2012 +0200

    add API for individual tooltips

 libempathy-gtk/empathy-roster-view.c	      | 41
 ++++++++++++++++++++++++++++
 libempathy-gtk/empathy-roster-view.h	      | 11 ++++++++
 tests/interactive/test-empathy-roster-view.c | 16 +++++++++++
 3 files changed, 68 insertions(+)

commit a96c2a5c0ac5133ab8b7a14fab0f2857cead162d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 1 15:00:35 2012 +0200

    Add popup-individual-menu signal

 libempathy-gtk/empathy-roster-view.c	      | 73
 ++++++++++++++++++++++++++++
 tests/interactive/test-empathy-roster-view.c | 30 ++++++++++++
 2 files changed, 103 insertions(+)

commit 785ce2292d3b61afd25099fd87eb3b7fbf4f4270
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 1 13:25:42 2012 +0200

    add a signal when a contact is activated

 libempathy-gtk/empathy-roster-view.c	      | 40
 +++++++++++++++++++++++++---
 tests/interactive/test-empathy-roster-view.c | 14 ++++++++++
 2 files changed, 51 insertions(+), 3 deletions(-)

commit 525000e6fe4dee72ebc327286d37b9d3260eab7b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 31 16:13:39 2012 +0200

    roster-contact: reduce border padding

 libempathy-gtk/empathy-roster-contact.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 2d31c2266c07a945fa07b566277eb350e5ba1e2c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 31 08:26:36 2012 +0200

    Display top contacts on the top of the roster

 libempathy-gtk/empathy-roster-view.c | 131
 +++++++++++++++++++++++++++++++++++
 1 file changed, 131 insertions(+)

commit 70a6130bdebf7a44753294f6363f905a5298ba3e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 29 15:30:37 2012 +0200

    roster-view: add live search support

 libempathy-gtk/empathy-roster-view.c	      | 101
 +++++++++++++++++++++++++--
 libempathy-gtk/empathy-roster-view.h	      |   5 ++
 tests/interactive/test-empathy-roster-view.c |  13 +++-
 3 files changed, 113 insertions(+), 6 deletions(-)

commit 2216d828732d19a32e99a485d829504bfff7d224
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 28 15:28:59 2012 +0200

    roster-view: add EmpathyRosterGroup and sort contacts accordingly

    The GtkExpander doesn't contain the contacts as its children because
    the view
    needs to be have full control of which rows as displayed (for live
    search for
    example). So instead we trick the view sort function to display
    the contact
    associated with the group at the right position.

    Also, we need to keep the structure flat to not break keyboard
    navigation
    inside the widget.

 libempathy-gtk/empathy-roster-view.c | 256
 +++++++++++++++++++++++++++++++++--
 1 file changed, 244 insertions(+), 12 deletions(-)

commit 043d63caaf16e09c291f0dcd28068e0efbf97bdb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 28 14:22:50 2012 +0200

    add empathy-roster-group

 libempathy-gtk/Makefile.am	       |   2 +
 libempathy-gtk/empathy-roster-group.c | 196
 ++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-roster-group.h |  62 +++++++++++
 libempathy-gtk/empathy-roster-view.c  |   3 +
 4 files changed, 263 insertions(+)

commit b7e72c53ffe6a02482b57e5ee565881b313e4d43
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 25 15:35:31 2012 +0200

    roster-view: add one EmpathyRosterContact per group

 libempathy-gtk/empathy-roster-view.c | 130
 +++++++++++++++++++++++++++++++----
 1 file changed, 117 insertions(+), 13 deletions(-)

commit dd84cb92422f8c74e8ba2b1f66bb3ddc789a78fa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 25 15:35:11 2012 +0200

    roster-contact: add group property

 libempathy-gtk/empathy-roster-contact.c | 29
 +++++++++++++++++++++++++++--
 libempathy-gtk/empathy-roster-contact.h |  5 ++++-
 libempathy-gtk/empathy-roster-view.c	 |  2 +-
 3 files changed, 32 insertions(+), 4 deletions(-)

commit ad12e6ef47f56a291e9cc46496a5f27620701242
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 25 15:21:46 2012 +0200

    roster-view: allow to store more than one widget per Individual

    With groups we may have more than once the same individual in
    the list.

 libempathy-gtk/empathy-roster-view.c | 32
 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

commit cdb76a5ad9845785bc29fe67533201489f2adbea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 25 14:57:14 2012 +0200

    factor out add_roster_contact()

 libempathy-gtk/empathy-roster-view.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

commit 19d8f63a98e9ecd1ef4af765f72ef3769e735bb9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 25 14:53:24 2012 +0200

    roster-view: rename some variables

    Match the new name of EmpathyRosterContact.

 libempathy-gtk/empathy-roster-view.c | 48
 ++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

commit 6aef9eda7957ac651f21b6a54efac85ad71e7d3c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 25 13:32:38 2012 +0200

    rename EmpathyRosterItem to EmpathyRosterContact

 libempathy-gtk/Makefile.am		 |   4 +-
 libempathy-gtk/empathy-roster-contact.c | 452
 ++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-roster-contact.h |  58 ++++
 libempathy-gtk/empathy-roster-item.c	 | 452
 --------------------------------
 libempathy-gtk/empathy-roster-item.h	 |  58 ----
 libempathy-gtk/empathy-roster-view.c	 |  18 +-
 6 files changed, 521 insertions(+), 521 deletions(-)

commit 2434369020f74d732a8b8fac431ad35081b57bf5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 25 13:28:46 2012 +0200

    test-empathy-roster-view: add --groups option

 tests/interactive/test-empathy-roster-view.c | 3 +++
 1 file changed, 3 insertions(+)

commit cfeb597b9cafbf61b950a0a3a76daff7ccf03f90
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 25 13:25:15 2012 +0200

    roster-view: add 'show-groups' property

    Not implemented yet.

 libempathy-gtk/empathy-roster-view.c | 38
 ++++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-roster-view.h |  3 +++
 2 files changed, 41 insertions(+)

commit 9b6edadbcbf706fe6d856d84e1631aaa74669625
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 25 14:36:55 2012 +0200

    factor out populate_view()

 libempathy-gtk/empathy-roster-view.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

commit 4d1d36ed1fef6f6e374d0a6c7a961c4c7bbfe980
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 25 12:40:49 2012 +0200

    roster-view: resort when the alias is changed

 libempathy-gtk/empathy-roster-view.c | 4 ++++
 1 file changed, 4 insertions(+)

commit b8e35bdb2c7e11b37947754afdaef3cd05a68c13
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 25 12:40:19 2012 +0200

    roster-item: add 'alias' property

    We need to know when the alias is changed to resort the view.

 libempathy-gtk/empathy-roster-item.c | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

commit 8f36eb3772ad0aca0a88e5181b22ec44430d1c64
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 25 11:21:01 2012 +0200

    test-empathy-roster-view: add option to display offline contacts

 tests/interactive/test-empathy-roster-view.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

commit ec9056604f24cd9811aaa2010be91eb32985efa1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 24 16:24:32 2012 +0200

    Filter out offline contacts

 libempathy-gtk/empathy-roster-view.c | 55
 ++++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-roster-view.h |  3 ++
 2 files changed, 58 insertions(+)

commit 2f9c2d7e591b876ac6c52953b687308b8aa06fe6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 24 16:24:13 2012 +0200

    roster-item: track if individual is online or not

    We cache the online status as we want to refresh the contact list
    only when
    the contact becomes online/offline, not each time his presence
    changes.

 libempathy-gtk/empathy-roster-item.c | 59
 ++++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-roster-item.h |  2 ++
 2 files changed, 61 insertions(+)

commit 1a11cdd2f0e8ee312d0857db9a12da416f0adce9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 24 15:49:06 2012 +0200

    roster-item: add padding around the main box

 libempathy-gtk/empathy-roster-item.c | 20 ++++++++++++++------
 libempathy-gtk/empathy-roster-item.h |  4 ++--
 2 files changed, 16 insertions(+), 8 deletions(-)

commit f25c42cb2412ceb7d0c5374fc8ce4918c01a6a53
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 21 09:49:26 2012 +0200

    set separators between contacts

 libempathy-gtk/empathy-roster-view.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

commit 80766fff0ac533ddfa01d609aa89e44b6f4dfe78
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 22 14:37:27 2012 +0200

    display phone icon if needed

 libempathy-gtk/empathy-roster-item.c | 57
 +++++++++++++++++++++++++++++++-----
 1 file changed, 50 insertions(+), 7 deletions(-)

commit 84f1e91d7dbfb27b07a76c057ecba36717c927b5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 21 16:13:21 2012 +0200

    set dim-label style class on the presence message label

 libempathy-gtk/empathy-roster-item.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 902f0c33eda521800d562e47575ff966ee87b56b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 21 16:02:39 2012 +0200

    Center the alias if no presence message is displayed

 libempathy-gtk/empathy-roster-item.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

commit c0a7480104a667565782b0740ac9f48a94832488
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 17 14:58:16 2012 +0200

    roster-item: display the contact presence icon

 libempathy-gtk/empathy-roster-item.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

commit 184e9a705cd0932e06d3acba778b285a0a3c2063
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 17 14:58:16 2012 +0200

    roster-item: display the contact alias

 libempathy-gtk/empathy-roster-item.c | 65
 ++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

commit 2a65dce4efc5a484b4956d12f3576b0aeb81eba5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 17 14:35:51 2012 +0200

    roster-item: display the contact avatar

 libempathy-gtk/empathy-roster-item.c | 67
 ++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

commit a61311603e6670de140584ee8dd70aeea078cc38
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 17 13:50:20 2012 +0200

    roster-view: sort items

 libempathy-gtk/empathy-roster-view.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit 1d5260ad9bd4a36c234878133b63d46fea173c45
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 17 13:37:16 2012 +0200

    roster-view: populate with EmpathyRosterItem

 libempathy-gtk/empathy-roster-view.c | 83
 +++++++++++++++++++++++++++++++++++-
 1 file changed, 82 insertions(+), 1 deletion(-)

commit 121fcf568ee102ca50aa5bf3ca12d6c0045f05e3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 17 11:51:53 2012 +0200

    add empathy-roster-item

 libempathy-gtk/Makefile.am	      |   2 +
 libempathy-gtk/empathy-roster-item.c | 149
 +++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-roster-item.h |  56 +++++++++++++
 3 files changed, 207 insertions(+)

commit ea95d2c328587a287cd3854683967f097241c063
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 11 15:30:10 2012 +0200

    add test-empathy-roster-view

 tests/interactive/.gitignore		      |  1 +
 tests/interactive/Makefile.am		      |  4 ++-
 tests/interactive/test-empathy-roster-view.c | 43
 ++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)

commit 44ca1d97c09703fd2738b6169d36aea69280dbb2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 11 15:21:02 2012 +0200

    create roster-view skeleton

 libempathy-gtk/Makefile.am	      |   2 +
 libempathy-gtk/empathy-roster-view.c | 147
 +++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-roster-view.h |  58 ++++++++++++++
 3 files changed, 207 insertions(+)

commit a4314139d588a7bee5e7c7da31a3b865b5b9b1e8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 16 16:22:30 2012 +0200

    Add egg-list-box as a submodule

 .gitmodules		     |	3 +++
 autogen.sh		     | 12 ++++++++++++
 configure.ac		     | 10 ++++++++++
 libempathy-gtk/Makefile.am  |	4 ++++
 libempathy-gtk/egg-list-box |	1 +
 5 files changed, 30 insertions(+)

commit c85ceea55eef6e764d62c7b1cf1e536e60b67451
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 30 14:36:21 2012 +0200

    individual-manager: keep track of most popular contacts

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

 libempathy/empathy-individual-manager.c | 178
 ++++++++++++++++++++++++++++++++
 libempathy/empathy-individual-manager.h |   3 +
 2 files changed, 181 insertions(+)

commit ad74b5ae98407d3c97a0b157971c859cdaf138eb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 13 15:31:06 2012 +0200

    empathy_client_factory_dup_contact_features: request groups and
    client-types

    Empathy prepares the AM before preparing folks, so when folks set
    its features
    on the factory, all TpContact are already created and so won't
    be upgraded.

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

 libempathy/empathy-client-factory.c | 2 ++
 1 file changed, 2 insertions(+)

commit bf2e1948cfb765262b48bd76bcaa0f61d9745f85
Author: Tom Tryfonidis <tomtryf@gmail.com>
Date:	Mon Jun 11 18:17:38 2012 +0300

    Updated Greek translation

 po/el.po | 4554
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 2505 insertions(+), 2049 deletions(-)

commit 6008508aaf8c30a3824a7cbdd54b32ead192e1f7
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Mon Jun 11 17:17:55 2012 +0300

    Updated Belarusian translation.

 po/be.po | 2040
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 949 insertions(+), 1091 deletions(-)

commit 5abf3947a89fb3bf14b54d6479a593238056d6c1
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Fri Jun 8 16:41:08 2012 +0200

    empathy-chat: abort chat_log_filter if object was destroyed

    Fixes: https://bugzilla.gnome.org/677641

 libempathy-gtk/empathy-chat.c | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

commit 6446a3804c4d39c6be79da91ee116dfab536f23e
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Thu Jun 7 19:33:05 2012 +0200

    empathy-chat: abort got_filtered_messages_cb if object was destroyed

    Fixes: https://bugzilla.gnome.org/677641

 libempathy-gtk/empathy-chat.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

commit 5ab3e5d5d54b8212a5edb7d2e72889a01cdd122b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 8 14:09:58 2012 +0200

    roster-window: remove old GActionEntry

    Those have been removed from menubar.ui when implementing the
    new menu.

 src/empathy-roster-window.c | 21 ---------------------
 1 file changed, 21 deletions(-)

commit 6275c48f6ca11c9b31240fdfbfe2e508b6628f7e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 8 10:48:50 2012 +0200

    move 'Remove' item code to individual-menu

    There is no reason to not have it implemented like all the other
    menu items.

    Furtermore, having the logic in individual-menu.c will make it easier
    to use
    from the new roster view.

 libempathy-gtk/empathy-individual-menu.c | 205
 +++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-individual-menu.h |   1 +
 libempathy-gtk/empathy-individual-view.c | 205
 +------------------------------
 src/empathy-roster-window.c		  |   3 +-
 4 files changed, 210 insertions(+), 204 deletions(-)

commit 2c6d8d25592d553254f7a110b53f59bbde5b916b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 7 14:34:22 2012 +0200

    remove libebook support

    It's API just changed and it's not really useful anymore as
    gnome-about-me has
    been removed.

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

 configure.ac					    | 13 ----
 libempathy-gtk/Makefile.am			    |  2 -
 .../empathy-local-xmpp-assistant-widget.c	    | 73
 +---------------------
 src/Makefile.am				    |  2 -
 tests/interactive/Makefile.am			    |  4 +-
 5 files changed, 3 insertions(+), 91 deletions(-)

commit 0c54e7a181b440ef53509aa84c92e586c3d04499
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 7 12:01:35 2012 +0200

    Build with TP_SEAL_ENABLE

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

 configure.ac | 1 +
 1 file changed, 1 insertion(+)

commit 9910d4e79c06173c87c44c2a58ababa4e8334412
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 7 11:55:39 2012 +0200

    empathy_account_settings_migrate_password_cb: use the vardict API

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

 libempathy/empathy-account-settings.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

commit 4da4893bd535d6e122f99300e2f5152d40723bbc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 7 11:50:14 2012 +0200

    account-settings: always use GVariant to store parameters

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

 libempathy-gtk/empathy-account-widget-irc.c  |  23 ++-
 libempathy-gtk/empathy-account-widget.c      |  65 ++++--
 libempathy-gtk/empathy-irc-network-chooser.c |   5 +-
 libempathy-gtk/empathy-new-account-dialog.c  |   8 +-
 libempathy/empathy-account-settings.c	      | 299
 ++++++++++++++-------------
 libempathy/empathy-account-settings.h	      |   8 +-
 6 files changed, 220 insertions(+), 188 deletions(-)

commit 9d8d7a2e4f9cd772fe69dae15c4c21728e974df3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 7 09:59:52 2012 +0200

    remove empathy_account_settings_set_* functions

    They don't buy us much so let's just pass the GVariant directly.

    Fix some string leaks in empathy-account-widget-irc.c as well.

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

 libempathy-gtk/empathy-account-widget-irc.c	    |  29 +++---
 libempathy-gtk/empathy-account-widget.c	    |  36 +++----
 libempathy-gtk/empathy-irc-network-chooser.c	    |  12 ++-
 .../empathy-local-xmpp-assistant-widget.c	    |  16 ++--
 libempathy-gtk/empathy-protocol-chooser.c	    |  29 +++---
 libempathy/empathy-account-settings.c		    | 104
 ++-------------------
 libempathy/empathy-account-settings.h		    |  18 +---
 7 files changed, 74 insertions(+), 170 deletions(-)

commit d51deb6864802a780f7d013dda5bb3c715768bfc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 7 09:46:23 2012 +0200

    accounts-settings: store parameters as GVariant

    This patch introduces a GValue leak. I'm going to fix it when
    switching the
    rest of this code to GVariant but I prefer to keep patches smaller.

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

 libempathy-gtk/empathy-protocol-chooser.c |  6 +-
 libempathy/empathy-account-settings.c	   | 94
 ++++++++++++++++++++++---------
 libempathy/empathy-account-settings.h	   |  3 +-
 3 files changed, 73 insertions(+), 30 deletions(-)

commit 18de9f76fa8ec188b5805a8b2c78aa8bbd80f4f6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 6 14:22:35 2012 +0200

    make empathy_account_settings_get() static

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

 libempathy/empathy-account-settings.c | 6 +++++-
 libempathy/empathy-account-settings.h | 3 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

commit f39236c18404ea048293067012d6504757198362
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 6 13:58:53 2012 +0200

    account-settings: use TpConnectionManager accessors

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

 libempathy/empathy-account-settings.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 543b740d588715174fcc69a18e90c741d13e3ee1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 6 13:55:54 2012 +0200

    import-utils: use TpConnectionManager accessors

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

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

commit 56b41e384f973cb85d786e04fa1f651c1e41ee1e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 6 13:51:15 2012 +0200

    account-widget: use TpConnectionManager accessors

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

 libempathy-gtk/empathy-account-widget.c | 39
 +++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 17 deletions(-)

commit eb601e969efde80a83c0ce0bf9518f08968b263b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 6 13:50:21 2012 +0200

    connection-managers: use TpConnectionManager accessor

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

 libempathy/empathy-connection-managers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9bccca3b9ade5045a607ab97e90f30813fabede6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 6 13:49:57 2012 +0200

    tp-chat: use TpProxy accessors

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

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

commit c9a2ff7e6958751484c0080ccc7184df7ba7d4c3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 6 13:49:33 2012 +0200

    remove unused proxy hash and equal functions

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

 libempathy/empathy-utils.c | 30 ------------------------------
 libempathy/empathy-utils.h |  3 ---
 2 files changed, 33 deletions(-)

commit 77ffbf2320b3bb35a86072814ffe02ec97463ba4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 6 13:49:07 2012 +0200

    protocol-chooser: use TpConnectionManagerProtocol accessors

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

 libempathy-gtk/empathy-protocol-chooser.c | 54
 ++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 22 deletions(-)

commit c35eab8bf895464a281ada93b4a12494f2631280
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 8 11:27:25 2012 +0200

    use TpAccountRequest

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

 libempathy/empathy-account-settings.c | 91
 +++++++++++------------------------
 1 file changed, 28 insertions(+), 63 deletions(-)

commit 460e6c2e35357e4df5379f5f76378d6833c7c34b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 8 11:14:24 2012 +0200

    Add GVariant converters from tp-glib

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

 libempathy/empathy-utils.c | 29 +++++++++++++++++++++++++++++
 libempathy/empathy-utils.h |  6 ++++++
 2 files changed, 35 insertions(+)

commit 2c910137428ef53609e25a142c5295746074493e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 6 16:48:57 2012 +0200

    Depend on tp-glib 0.19.1

    Needed for TpAccountRequest.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3ac64629dd8e6f52eafbb9eb76d41350d3c6bdd4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 5 15:34:03 2012 +0200

    import-pidgin: use TpProtocol

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

 src/empathy-import-pidgin.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 899be9904bd53eb37bee357f22ecdb434f1e28b0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 5 15:33:46 2012 +0200

    protocol-chooser: use TpProtocol

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

 libempathy-gtk/empathy-protocol-chooser.c | 19 ++++++++++---------
 libempathy-gtk/empathy-protocol-chooser.h |  4 ++--
 2 files changed, 12 insertions(+), 11 deletions(-)

commit 0e095b8af9cd07ae32823f73b889fdbfb47d6f2a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 5 15:16:18 2012 +0200

    use tp_list_connection_managers_async()

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

 libempathy/empathy-connection-managers.c | 48
 ++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 18 deletions(-)

commit 505305a0bc8f02ca770014682f0794b8c9353aef
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 5 15:00:44 2012 +0200

    account-settings: use TpProtocol's API to get TpConnectionManagerParam

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

 libempathy-gtk/empathy-account-widget.c |  9 +++++---
 libempathy/empathy-account-settings.c	 | 39
 ++++++++-------------------------
 libempathy/empathy-account-settings.h	 |  2 +-
 3 files changed, 16 insertions(+), 34 deletions(-)

commit c92e84c8b183d3fd5b18427d58a827b4bb865435
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 5 14:59:15 2012 +0200

    accounts_widget_generic_setup: continue iterating when treating
    optional param in simple mode

    We may have more non-optional parameters later.

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

 libempathy-gtk/empathy-account-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit daf7a5ba63b13dca8cd93c84ba39f722a3713b9b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 5 14:28:47 2012 +0200

    empathy_account_settings_check_readyness: use the existing TpProtocol
    to list params

    No need to request another one.

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

 libempathy/empathy-account-settings.c | 46
 ++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

commit ef7ff08c2013a8c1a564bde2c16d0e20414f93c4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 5 13:45:45 2012 +0200

    empathy_account_settings_get_tp_protocol: return a TpProtocol

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

 libempathy-gtk/empathy-account-widget.c | 4 ++--
 libempathy/empathy-account-settings.c	 | 4 ++--
 libempathy/empathy-account-settings.h	 | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

commit d19116af7de4cc76530bd83a1e5034fbd2cd34d6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 6 10:49:58 2012 +0200

    account-widget-jabber.ui: remove n-{rows,columns} properties

    Not valid in a GtkGrid.

 libempathy-gtk/empathy-account-widget-jabber.ui | 2 --
 1 file changed, 2 deletions(-)

commit 677341a5b6952d31b02f3be7c34918d413ba6db8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 5 16:00:44 2012 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3a336862a3ea92f19bfc92d7cebe4787044980cd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 5 15:49:53 2012 +0200

    add css_DATA to EXTRA_DIST and DISTCLEANFILES

 data/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

commit c221197779fdaa77d2b0546702f02c7be6719a95
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 5 15:41:49 2012 +0200

    prepare 3.5.2

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

commit 9a95d0dc9227b76dba0c9a0c52ee80e4a70ab213
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Tue Jun 5 11:48:00 2012 +0200

    Updated French translation

 po/fr.po | 2058
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 959 insertions(+), 1099 deletions(-)

commit 213c011e801827daefab7bef64e0e70ba7f1d78e
Merge: c217f84 047c6ff
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 5 09:31:04 2012 +0200

    Merge branch 'gnome-3-4'

commit 047c6ffac32caebc3d4929ecd2fec8a55da6796a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 5 09:30:23 2012 +0200

    tls_dialog_response_cb: say if we are supposed to remember the cert
    or not

    Will make debugging easier.

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

commit c217f84732cad84541389dc2d317992cf0199d18
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Mon Jun 4 17:27:14 2012 +0400

    Updated Russian translation

 po/ru.po | 174
 +++++++++++++++++++++++----------------------------------------
 1 file changed, 64 insertions(+), 110 deletions(-)

commit 2c6a500a9187f5d80de4b9c5d320ecc171658da7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 4 14:17:59 2012 +0200

    live-search: handle the 'Menu' key as a navigation one

    Fix opening the popup menu from the 'Menu' key in the treeview.

 libempathy-gtk/empathy-live-search.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit a474d3e479596d21dc685354d62c90e0adc6dd83
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Mon Jun 4 16:13:28 2012 +0400

    Updated Russian translation

 po/ru.po | 2789
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1550 insertions(+), 1239 deletions(-)

commit e1f08e59638e1df92cf55cb83cc5009d6c4f2587
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Sun Jun 3 05:45:20 2012 +0530

    Remove unused field hash from EmpathyContact

 libempathy/empathy-contact.c | 1 -
 1 file changed, 1 deletion(-)

commit 1453386a3b3766aa7a781b05b8416ee3791dbc89
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Sat Jun 2 12:55:13 2012 +0300

    Updated Hebrew translation.

 po/he.po | 437
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 228 insertions(+), 209 deletions(-)

commit a034ef0b4160ddaecafcf341e8c6dba9c59fcf13
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Jun 1 17:23:04 2012 +1000

    Don't erase schema in DISTCLEAN

    Oops

 data/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

commit a402dd47a9f68e483806981b0b8feeb0cec44951
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri May 25 13:31:29 2012 -0400

    call-window: use a linked style for the OSD toolbar buttons

    Pack the camera/volume/mic buttons in a GtkBox, so they get linked
    together by the theme.
    Also, use symbolic icons for the buttons in the toolbar, in GNOME 3
    style.

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

 src/empathy-call-window.c  | 24 +++++++++---------
 src/empathy-call-window.ui | 63
 ++++++++++++++++++++++++++++++----------------
 2 files changed, 53 insertions(+), 34 deletions(-)

commit a018456af6a36b1cb2b8b7b66825f40ac200dcd3
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri May 25 13:29:42 2012 -0400

    call-window: use GTK_STYLE_CLASS_OSD for the floating toolbar

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

 src/empathy-call-window.c | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

commit 56f4a515192564db4d06bbea8b724e530c8f2ab9
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed May 30 17:48:17 2012 +0200

    Updated Spanish translation

 po/es.po | 585
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 311 insertions(+), 274 deletions(-)

commit 484d44c5dba8b7f4ca17e34e622e066475aafed7
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Wed May 30 16:40:15 2012 +0200

    Updated Galician translations

 po/gl.po | 497
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 259 insertions(+), 238 deletions(-)

commit 7fcbe6b44035e505941e3ee3db5cfc7cadf8748a
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Wed May 30 13:09:21 2012 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 527
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 270 insertions(+), 257 deletions(-)

commit 9eceb4013b4c2d799c876f1efc043ab462538258
Merge: 43383be b7a0aba
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 30 10:52:10 2012 +1000

    Merge branch 'ui-work-672043'

commit 43383bec9be58220863824f14f35dea72922b0f1
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Tue May 29 17:00:29 2012 +0530

    Disconnect all aggregator signal handlers on disposing
    EmpathyIndividualManager

 libempathy/empathy-individual-manager.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

commit 6722d80f683accae86977fc538069889f6f1918a
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Tue May 29 13:22:16 2012 +0530

    The comment should have been removed with the contact manager

 src/empathy-roster-window.c | 4 ----
 1 file changed, 4 deletions(-)

commit b7a0aba3e792edcbd753b721aa9600f56b95a754
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue May 29 17:21:33 2012 +1000

    account-widget: support for account widget generic

 libempathy-gtk/empathy-account-widget-generic.ui | 74
 +++++++++++++++++++++---
 libempathy-gtk/empathy-account-widget.c	  |  6 +-
 2 files changed, 71 insertions(+), 9 deletions(-)

commit 767d3af6d44bf7264ac47b4e7a6353733226e939
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 25 14:28:16 2012 +1000

    account-widget: msn, icq, groupwise

 libempathy-gtk/empathy-account-widget-groupwise.ui | 28 ++++++++++++-----
 libempathy-gtk/empathy-account-widget-icq.ui	    | 35
 +++++++++++++++-------
 libempathy-gtk/empathy-account-widget-msn.ui	    | 28 ++++++++++++-----
 3 files changed, 65 insertions(+), 26 deletions(-)

commit 7c6f5992f1f5c2b9b1c97a48870d28c7a770a42d
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 25 13:32:45 2012 +1000

    account-widget-aim: remove colons, dim labels, fix packing

 libempathy-gtk/empathy-account-widget-aim.ui | 34
 +++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 8 deletions(-)

commit 8554ba733582072359ad14ab543b7f9db256b973
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 25 13:06:08 2012 +1000

    account-widget-local-xmpp: remove colons, dim labels

 .../empathy-account-widget-local-xmpp.ui	    | 42
 +++++++++++++++-------
 1 file changed, 30 insertions(+), 12 deletions(-)

commit 3f5dd97736c34c40cbb1cf762869aa3901dc24a1
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 23 17:11:05 2012 +1000

    account-widget-irc: remove colons

    The advanced settings for IRC look different to XMPP/SIP. They should
    probably be changed to be contained within a scrolled window/viewport
    for consistency.

 libempathy-gtk/empathy-account-widget-irc.ui | 61
 ++++++++++++++++++++--------
 1 file changed, 43 insertions(+), 18 deletions(-)

commit ae0e6127a2844bbac26f7b229f93ce702cb7e6fc
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 23 16:23:35 2012 +1000

    account-widget-sip: remove colons, clean up padding

 libempathy-gtk/empathy-account-widget-sip.ui | 38
 ++++++++++++++++------------
 1 file changed, 22 insertions(+), 16 deletions(-)

commit eb1d26c374afade8d4e7065a70d81dc6ff0a410d
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 23 16:06:32 2012 +1000

    account-widget-jabber: remove colons, clean up advanced section

    Don't dim labels in viewport, grey on white looks wrong.

 libempathy-gtk/empathy-account-widget-jabber.ui | 407
 +++++++++++++-----------
 1 file changed, 223 insertions(+), 184 deletions(-)

commit 75c7d2ee8af7ba6e301286d09b3b4a2255cdaf21
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 23 14:04:13 2012 +1000

    accounts-dialog: tweak padding

 src/empathy-accounts-dialog.ui | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit c3bc27cdb1d299bef40b22d5b741e8fdc862eb41
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue May 22 15:28:20 2012 +1000

    contact-widget: remove colons and dim labels, move avatar to LHS

    Make widget look like mockup.

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

 configure.ac				    |	2 +-
 libempathy-gtk/empathy-contact-widget.c    | 116 +++++------
 libempathy-gtk/empathy-contact-widget.ui   | 313
 +++++++++++++++++++----------
 libempathy-gtk/empathy-contactinfo-utils.c |	4 +-
 4 files changed, 262 insertions(+), 173 deletions(-)

commit 5c5aed18fd1d54352fb835b10693bc69b0a13d5c
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Mon May 28 18:14:04 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 2657
 ++++++++++++++++++++++++++++------------------------------
 po/zh_TW.po | 2668
 ++++++++++++++++++++++++++++-------------------------------
 2 files changed, 2523 insertions(+), 2802 deletions(-)

commit b014019bb9303a17c5ca4d10ef25f3d60f71dab2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 22 14:54:56 2012 +0200

    factor out empathy_individual_get_client_types()

 libempathy-gtk/empathy-individual-store.c | 46
 ++-----------------------------
 libempathy/empathy-utils.c		   | 42
 ++++++++++++++++++++++++++++
 libempathy/empathy-utils.h		   |  3 ++
 3 files changed, 47 insertions(+), 44 deletions(-)

commit 7e5f89c6fb56ee812d4b90f02c0289b9e77bd0ae
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri May 25 10:48:44 2012 +0300

    Updated Hebrew translation.

 po/he.po | 2978
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 1462 insertions(+), 1516 deletions(-)

commit 0ae70fecdc9cb69219ebafe6983bdddc14967569
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 25 09:34:42 2012 +0200

    use the symbolic close icon in the tab close button

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

commit 92114b41642489ed58079ba0fe0cbb456f5e6e38
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 25 09:32:32 2012 +0200

    Define a style class for the tab close button

    Seems that's the proper way to do it.

 data/empathy.css	   | 2 +-
 src/empathy-chat-window.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

commit a8587cf10bf7004c97fa2f7143c191e67b4eaf08
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 24 12:39:35 2012 +0200

    remove GeditCloseButton

 src/Makefile.am	  |  2 --
 src/gedit-close-button.c | 61
 ------------------------------------------------
 src/gedit-close-button.h | 60
 -----------------------------------------------
 3 files changed, 123 deletions(-)

commit 7a0d00bb00ead77b5d932ac0bdbdd6d5851f293f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 24 12:38:31 2012 +0200

    chat-window: stop using GeditCloseButton

    The CSS magic is done automatically now.

 src/empathy-chat-window.c | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

commit b428a3009df0ea065b26991e87eb5759499c85a0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 24 12:19:12 2012 +0200

    gedit-close-button: move CSS bits to empathy.css

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

 data/empathy.css	     |	8 ++++++++
 src/empathy-auth-client.c   |	2 +-
 src/empathy-call-window.c   |	2 +-
 src/empathy-chat-window.c   |	2 +-
 src/empathy-debug-window.c  |	2 +-
 src/empathy-roster-window.c |	2 +-
 src/gedit-close-button.c    | 21 +--------------------
 7 files changed, 14 insertions(+), 25 deletions(-)

commit bf821168dfb8c2e835cdf57a1c313841ee0dd763
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 24 12:06:36 2012 +0200

    Load the CSS in all empathy-* binaries

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

 src/empathy-auth-client.c   | 3 +++
 src/empathy-call-window.c   | 2 ++
 src/empathy-chat-window.c   | 2 ++
 src/empathy-debug-window.c  | 2 ++
 src/empathy-roster-window.c | 2 ++
 5 files changed, 11 insertions(+)

commit d62ff957e10bdfb92b99608310ae9b96676ea4fa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 24 11:47:02 2012 +0200

    Add empathy.css and helper code to use it

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

 data/Makefile.am		   |  5 +++++
 data/empathy.css		   |  0
 libempathy-gtk/empathy-ui-utils.c | 33 +++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-ui-utils.h |  2 ++
 4 files changed, 40 insertions(+)

commit dd56cdf3f64b50ada5db0ef6960519bc19815327
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 23 15:33:30 2012 +0200

    accounts-dialog: don't crash if the account is connecting

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

 src/empathy-accounts-dialog.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit 2ddd3df3a2764f78874d67f6a0ccc023a3c004de
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 23 14:07:24 2012 +0200

    roster-window: re-hook the show-groups gsettings key

    It has been accidentally removed during the recent settings clean up.

 src/empathy-roster-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit beeae4882070a075750b11b378d9c81e04adc86f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 21 15:41:44 2012 +0200

    audio-src: mutex is now on the stack

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

commit 05649508bf21c519402a049ba5be367430eb58d5
Merge: 26b9e04 bf32eb7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 21 15:24:26 2012 +0200

    Merge branch 'gnome-3-4'

    Conflicts:
	NEWS
	configure.ac
	src/empathy-audio-src.c

commit bf32eb7eb97820578b4f878e57ca9105fc7f5147
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 21 14:20:20 2012 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 71cab9b191860ec1208cc4b144be9409e16f780a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 21 14:04:48 2012 +0200

    Prepare 3.4.2.1

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

commit a7feeae6d2028daa75a36e4a0f992877faabf1d9
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Mon May 21 13:52:34 2012 +0200

    call: Initialize the timer early

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

commit 108b3fa233660bdd0e88ac2d4642a75efa8f1eb7
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Mon May 21 13:44:06 2012 +0200

    audiosrc: Don't use stream volumes properties if the src doesn't
    support them

 src/empathy-audio-src.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

commit d524cc36152688f8475f14eb2bfd17bcb1e34b3f
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Mon May 21 12:16:49 2012 +0200

    call: Keep the toolbar around if muted

    It's not uncommon for people to forget that the put a call on mute,
    causing awkward situation while trying to talk while muted. To
    prevent this, keep the toolbar showhing while muted as a reminder.

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

commit 9f1691878cc95951039eb2d7a47b6462569da299
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Mon May 21 11:55:25 2012 +0200

    audio input: Switch to stream volumes

    Newer gstreamer & pulseaudio support the stream volume interface for
    input as well. Prefer this over using the mixer interface as it's
    both simpler and actually does as intended. Besides that the
    mixer interface is buggy and seems to not correctly adjust the
    current input device if the source was switch to a non-default input.

    As an extra put in a volume element to locally enforce the current
    mute
    state. This ensure that whatever happens, if the UI says mute, the
    stream is guaranteed to be muted. This prevents awkward situations if
    the source element doesn't support stream volumes or the notification
    is buggy (like with current pulsesrc in releases).

 src/empathy-audio-src.c | 214
 ++++++++++++++++--------------------------------
 1 file changed, 72 insertions(+), 142 deletions(-)

commit 246b14f2722e6aac0c9744e49edd70594846f004
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Mon May 21 10:48:53 2012 +0200

    call: Adjust the preview rectangle colors

    As our default background is now black the non-highlighted previews
    get hard to see. Change the rectangle colors to white for the
    highlighted version and a darkened white for the non-highlighted.

 src/empathy-call-window.c | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

commit 4f2d28ecffbd3b5f77b81539fba0f7ce66618ed9
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Mon May 21 10:31:57 2012 +0200

    Call: Let the floating toolbar be above the preview

    The call window has previews in the four corners, before the lower
    ones were packed in a way that they would appear above the floating
    toolbar which looks strange when the floating toolbar disappears.

    Instead allow the lower preview to be below the floating toolbar so
    they're evenly spread out.

 src/empathy-call-window.c | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

commit 0343d38411f58086366190100521c6a847985c13
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Mon May 21 10:00:21 2012 +0200

    Keep some margin for the preview and the floating toolbar

    Now that the video box is flush against the sides add some extra
    margin
    for the things floating inside.

 src/empathy-call-window.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 1fa90edcd725ae7ac78a3caed904b3e382e25560
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Sun May 20 21:31:13 2012 +0200

    call: Make the remote video background black

    Mimic totem in making the background for our video output black by
    default and without extra borders. It does look nicer.

 src/empathy-call-window.c | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

commit 7e7a60c59f7e07612cdbc5e547dbb9a1151834ab
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Sun May 20 19:59:29 2012 +0200

    Call window: Ellipsize alias and status

    If the user alias is too long both the hangup and the dialpad buttons
    get pushed into a drop-down menu. Even worse when the alias doesn't
    fit,
    it just isn't shown at all anymore.

    Given the username is already printed in the title and the user
    tends to
    know who they're calling with, ellipsizing the alias isn't an issue.
    Which has the nice side-effect of keeping the hangup and dialpad
    buttons
    on the toolbar in all cases like they should be.

    Unfortunately as pango doesn't ellipsize if it still has enough height
    left to put more lines in. So put the alias and status in seperate
    labels in a vbox which isn't set to fill.

 src/empathy-call-window.c  | 22 +++++++++++++--------
 src/empathy-call-window.ui | 48
 ++++++++++++++++++++++------------------------
 2 files changed, 37 insertions(+), 33 deletions(-)

commit 6b19934b9a237b648f36b0da943bde046b6488c0
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Sun May 20 13:07:57 2012 +0200

    Don't put the status in the header if the user has none

 src/empathy-call-window.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 26b9e04f1c40888bba66bcaace30d9f0feac45fc
Merge: 19d2ee5 2b26304
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 21 11:18:19 2012 +0200

    Merge branch 'gnome-3-4'

    Conflicts:
	NEWS
	configure.ac
	src/empathy-accounts.c

commit 2b263049bd152504227c9ade7e7b6e17cbc95f11
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 21 10:55:46 2012 +0200

    empathy-accounts: init cheese-gtk if needed

    The avatar chooser, which is not used by empathy-accounts, may use
    Cheese to
    take a photo.

    cheese_gtk_init() has been added during the 3.4 cycle so I bumped
    the dep to
    3.4.0 as that's the version I have tested it with it. It's an
    optionnal dep
    anyway so...

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

 configure.ac		|  2 +-
 src/Makefile.am	|  5 +++++
 src/empathy-accounts.c | 11 +++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

commit 87524d43add5732091025b0f76661c09a06bb116
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 21 10:47:00 2012 +0200

    configure.ac: set cheese version in CHEESE_GTK_REQUIRED

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

 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 19d2ee5fe81b850c8300dca6583e9c49bf6f7afd
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sun May 20 18:11:40 2012 +0200

    Updated Galician translations

 po/gl.po | 113
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 56 insertions(+), 57 deletions(-)

commit fc44b9eab9ca84ff24e7129ee29463d005f6b304
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Sat May 19 20:30:57 2012 +0200

    Call: Fix floating toolbar

    Empathy needed to mark the toolbar actor as reactive otherwise
    it won't
    be reactive to events (doh)...

    And empathy needed to stop calling
    gdk_disable_multi_device().. Empathy
    used to do this because it has to be called before GTK+ is initialized
    and clutter-gtk only called after GTK+ was initialized by other
    function
    in empathy. Unfortunately since clutter-gtk 1.1.2 instead of ensuring
    event actually work with clutter-gtk calling this function will
    actually
    break event handle (great fun!)..

    Oh and also bump the clutter-gtk requirement to 1.1.2 to ensure we get
    the right behaviour for events..

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

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

commit 001e077b3575d2525bb7354d78e0e25837db73e7
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Sat May 19 20:30:57 2012 +0200

    Call: Fix floating toolbar

    Empathy needed to mark the toolbar actor as reactive otherwise
    it won't
    be reactive to events (doh)...

    And empathy needed to stop calling
    gdk_disable_multi_device().. Empathy
    used to do this because it has to be called before GTK+ is initialized
    and clutter-gtk only called after GTK+ was initialized by other
    function
    in empathy. Unfortunately since clutter-gtk 1.1.2 instead of ensuring
    event actually work with clutter-gtk calling this function will
    actually
    break event handle (great fun!)..

    Oh and also bump the clutter-gtk requirement to 1.1.2 to ensure we get
    the right behaviour for events..

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

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

commit 17f2b276376f3de95d90f988d54e815e13b19be1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 14 10:55:19 2012 +0200

    individual-store: add missing folks.h include

 libempathy-gtk/empathy-individual-store.h | 1 +
 1 file changed, 1 insertion(+)

commit 403f2a944834ca65ece0654fd202f78d8feb96cf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 14 13:53:57 2012 +0200

    Use the symbolic version of the avatar-default icon

    That's the one used by Contacts so best to stay coherent

 libempathy-gtk/empathy-images.h | 2 +-
 src/empathy-roster-window.ui	 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 7c6776e18861020fb6d4a70ecb61672eaf3904b9
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Wed May 16 17:39:21 2012 +0200

    Updated POTFILES.in

 po/POTFILES.in | 2 --
 1 file changed, 2 deletions(-)

commit 83f0c13e333dea2c4e510d9eb2e2befbd5ee0be3
Merge: 28f72e5 0fd15cb
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 16 20:51:19 2012 +1000

    Merge branch 'misc'

commit 28f72e5ebeac6cb1a8e1e01f6c7ec3fd641cb6b8
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed May 16 12:30:48 2012 +0200

    Updated Spanish translation

 po/es.po | 741
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 380 insertions(+), 361 deletions(-)

commit 0fd15cbdf2f7c33f4841f8347fbc990a6beb8c36
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 16 16:52:12 2012 +1000

    Remove dead map view component

 src/Makefile.am	     |	14 --
 src/empathy-map-view.c      | 556
 --------------------------------------------
 src/empathy-map-view.h      |	56 -----
 src/empathy-map-view.ui     |	89 -------
 src/empathy-roster-window.c |	12 -
 5 files changed, 727 deletions(-)

commit 72661bb34ca27c9b93ed93a765833cfbd1ee6e23
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 16 15:55:07 2012 +1000

    Readd Ctrl-H accelerator

 src/empathy-roster-window.c | 17 +++++++++++++++++
 src/empathy.c		     |	4 ++++
 2 files changed, 21 insertions(+)

commit 34c7e098b02a3feaddc3b0fbcf6d23aa05fa4175
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Tue May 15 23:49:48 2012 +0200

    Updated Galician translations

 po/gl.po | 737
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 377 insertions(+), 360 deletions(-)

commit d33ec00def8237991d1f8934fd10a196affc33b1
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Tue May 15 16:18:30 2012 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 1313
 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 576 insertions(+), 737 deletions(-)

commit 3a4b25be8c95f7c609b51606e6fd863184268153
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 15 13:42:53 2012 +0200

    Authentification → Authentication

    So yeah, Authentification is actually not an English word...

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

 libempathy-gtk/empathy-bad-password-dialog.c | 2 +-
 src/empathy-auth-client.c		      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit fe79be103841148f53994cd5b4c5d2a8cd6322b4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 11 10:46:18 2012 +0200

    Warn on tp-glib 0.20 deprecations

    Best to catch them sooner than later.

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

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 66aa8b1d3e13799b2644082dc9104774bf5c6710
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 10 14:05:04 2012 +0200

    remove tp-contact-factory

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

 libempathy/Makefile.am			 |   2 -
 libempathy/empathy-tp-contact-factory.c | 202
 --------------------------------
 libempathy/empathy-tp-contact-factory.h |  53 ---------
 3 files changed, 257 deletions(-)

commit 885ab0e9215ad92067b5a29fe10537c58ef6bdd4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 10 12:25:39 2012 +0200

    remove unused tp-contact-factory includes

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

 libempathy-gtk/empathy-contact-dialogs.c    | 1 -
 libempathy-gtk/empathy-new-call-dialog.c    | 1 -
 libempathy-gtk/empathy-new-message-dialog.c | 1 -
 libempathy/empathy-ft-handler.c	     | 1 -
 libempathy/empathy-utils.c		     | 1 -
 src/empathy-accounts-dialog.c		     | 1 -
 src/empathy-call-factory.c		     | 1 -
 src/empathy-call-handler.c		     | 1 -
 src/empathy-call-window.c		     | 1 -
 src/empathy-chat-window.c		     | 1 -
 src/empathy-roster-window.c		     | 1 -
 11 files changed, 11 deletions(-)

commit 4180f9c6cb1cb97e22e8c5ca54ba1c04111f6198
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 10 12:25:21 2012 +0200

    contact-widget: use empathy_client_factory_dup_contact_by_id_async()

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

 libempathy-gtk/empathy-contact-widget.c | 35
 ++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

commit 7cd2e3923c1d000a9c88d9951dea9ef5772b6e0c
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue May 15 21:01:40 2012 +1000

    Readd Ctrl-J for Join Room

 src/empathy-roster-window-menubar.ui | 1 +
 1 file changed, 1 insertion(+)

commit 1a87e45750ec8b6c3c6bc0d61f9103f2717edd03
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue May 15 20:59:19 2012 +1000

    Don't mark actions/accels as translatable

    This is what happens when you convert files with XSLT, kids.

 src/empathy-roster-window-menubar.ui | 46
 ++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

commit e5fdd1857863050f0fc66a6adb29c7e907b3f472
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue May 15 15:22:21 2012 +1000

    Tweak account balance display

 src/empathy-roster-window.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

commit d6a77965c34454700cad87a556745f9a2ace7231
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue May 15 14:11:26 2012 +1000

    Use (non-)starred-symbolic for presence chooser

    This makes it look somewhat more visually up to date with Help etc.
    However this makes the use of STOCK_OK out of place (what to replace
    this with?).

 libempathy-gtk/empathy-presence-chooser.c | 53
 +++----------------------------
 1 file changed, 4 insertions(+), 49 deletions(-)

commit f58d68ddddf15dfe4e0d49af86e2add3c606316e
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue May 15 17:14:48 2012 +1000

    Remove contact list size radiobuttons from preferences

 src/empathy-preferences.c  |  4 ---
 src/empathy-preferences.ui | 89
 ----------------------------------------------
 2 files changed, 93 deletions(-)

commit f1225d5e0ca93beef95c12392f1c154499463d9c
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue May 15 13:42:42 2012 +1000

    Add preference to show account balances

    Set this 'true' by default.

 data/org.gnome.Empathy.gschema.xml |  2 +-
 libempathy/empathy-gsettings.h     |  1 +
 src/empathy-preferences.c	    |  2 ++
 src/empathy-preferences.ui	    | 32 ++++++++++++++++++++++++--------
 4 files changed, 28 insertions(+), 9 deletions(-)

commit 78f9deb1eb4d01a3e320fe5019f6766a0404448c
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue May 15 13:27:29 2012 +1000

    Refactor app menu as per design decision

 src/empathy-roster-window-menubar.ui | 107
 +++++++++++++++++------------------
 src/empathy-roster-window.c	      |   2 +-
 2 files changed, 52 insertions(+), 57 deletions(-)

commit a51af40f723c6929a461b9af26eaa10b4b714c84
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue May 15 12:16:45 2012 +1000

    Remove menu button, have only app menu

 src/empathy-roster-window.c | 101
 ++++++--------------------------------------
 src/empathy-roster-window.h |	 2 +
 src/empathy.c		     |	18 ++------
 3 files changed, 17 insertions(+), 104 deletions(-)

commit 06d7e54c62318a502d9e726bdbda16caeaf898e6
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 11 12:54:04 2012 +1000

    preferences: move some items from Behaviour into Chat

 src/empathy-preferences.ui | 158
 +++++++++++++++++++++++----------------------
 1 file changed, 81 insertions(+), 77 deletions(-)

commit 230d722d4ec8b4bc5e59819a1a6799cc52ec8414
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 11 12:50:13 2012 +1000

    preferences: add options removed from View into preferences

 src/empathy-preferences.c  |  50 ++++++++++
 src/empathy-preferences.ui | 239
 ++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 284 insertions(+), 5 deletions(-)

commit 36bde0ca705740414897af5f59cc4cc3e4153df3
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 11 10:53:57 2012 +1000

    Remove dead object from .ui file

 src/empathy-preferences.ui | 5 -----
 1 file changed, 5 deletions(-)

commit 253648a448b24997d2e6108a7eb04ae72e89857d
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 11 09:29:12 2012 +1000

    preferences: remove a lot of bind-and-forget widgets from priv struct

    Cleans up the code and makes it much less work to add new preferences.

 src/empathy-preferences.c | 282
 ++++++++++++++--------------------------------
 1 file changed, 86 insertions(+), 196 deletions(-)

commit ac28a82e406e8e601161c495815b6639bca9bdd7
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu May 10 12:16:27 2012 +1000

    Remove dead code

 src/empathy-roster-window.c | 59
 +--------------------------------------------
 1 file changed, 1 insertion(+), 58 deletions(-)

commit 80ff5951e64b49d04e7973c9c5f215a4e213575d
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu May 10 11:41:52 2012 +1000

    Rework balance display to be in-roster only

 src/empathy-roster-window.c | 302
 +++++---------------------------------------
 1 file changed, 33 insertions(+), 269 deletions(-)

commit f0831e149c9ea3727793c0a412f2ca6e8f1b5bba
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 9 17:06:41 2012 +1000

    Mark the options for the sort-criterion enum

 data/org.gnome.Empathy.gschema.xml | 4 ++++
 1 file changed, 4 insertions(+)

commit afdc41ecc17ec2f002ea39527353d528dd41b28b
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 9 17:02:46 2012 +1000

    Remove all old view menu handling code with GSettings bindings

 src/empathy-roster-window.c | 272
 +++-----------------------------------------
 1 file changed, 15 insertions(+), 257 deletions(-)

commit 7c2acbdf93266e68a9694a54393afabcd534dfaf
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 9 16:28:06 2012 +1000

    Add the app menu using the same model as the menu button

 src/empathy-roster-window.c | 10 ++++++++++
 src/empathy.c		     | 15 +++++++++++++++
 2 files changed, 25 insertions(+)

commit babfb17b4e9de333ed8ae6378828e7ac0ddbd25c
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 9 15:26:00 2012 +1000

    Change the roster menu to a flat menu structure

 src/empathy-roster-window-menubar.ui | 91
 ++++++------------------------------
 1 file changed, 14 insertions(+), 77 deletions(-)

commit d16e5a6fad21f5bec939b6d54813da83a42b50fd
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 9 15:24:57 2012 +1000

    Move the menu to a button ala Web

 src/empathy-roster-window.c  | 214
 ++++++++++++++++++++++---------------------
 src/empathy-roster-window.ui |   8 +-
 2 files changed, 115 insertions(+), 107 deletions(-)

commit 5ab040341e11bb1922de57553a94c8d620c768e5
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 9 15:18:52 2012 +1000

    Remove view history action

    It doesn't make sense to have this anyway. You can still have
    history even
    though you have no accounts configured.

 src/empathy-roster-window.c | 14 --------------
 1 file changed, 14 deletions(-)

commit a216699baa8c74eefb17f5e45ba46a94b407bd52
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue May 8 15:08:07 2012 +1000

    Port roster-window-menubar.ui to current GMenu builder XML format

    The docs are wrong, surprise!

 src/empathy-roster-window-menubar.ui | 169
 ++++++++++++++++++++++++++++-------
 1 file changed, 135 insertions(+), 34 deletions(-)

commit 8110b2fd8f9cb1375869ad5df5a483d64a4a74dd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 10 17:17:43 2012 +0100

    roster-window: migrate menu bar to GtkBuilder

    Rebased-by: Danielle Madeley <danielle.madeley@collabora.co.uk>

 src/empathy-roster-window-menubar.ui | 359 +++---------------
 src/empathy-roster-window.c	      | 706
 ++++++++++++++++++++++-------------
 2 files changed, 517 insertions(+), 548 deletions(-)

commit 9ca45ec3003e83b1f054bfc1f1ecf5c820c6eeca
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 10 14:31:33 2012 +0100

    EmpathyMainWindow: inherit from GtkApplicationWindow

    That's recommended for a better GNOME 3 integration.

 src/empathy-roster-window.c | 8 +++++---
 src/empathy-roster-window.h | 6 +++---
 src/empathy.c		     | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

commit dc9eca230ab16dad1cb3462bebcd23f7101668df
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 10 11:25:44 2012 +0100

    stop passing the main window to empathy_sound_manager_play()

    I'm about to add an extra argument to the main window constructor
    so it's not
    convenient to, in theory, being able to create it from the event
    manager.
    Passing a widget wasn't doing anything anyway and this code is not
    even used
    when running the Shell so...

    Rebased-by: Danielle Madeley <danielle.madeley@collabora.co.uk>

 src/empathy-event-manager.c | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

commit 5085baa1cf801e19d9a3425129da754e094eb80c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 10 14:55:39 2012 +0200

    turn EmpathyContactWidget to be a proper GtkWidget

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

 libempathy-gtk/empathy-contact-widget.c | 808
 ++++++++++++++++----------------
 libempathy-gtk/empathy-contact-widget.h |  41 ++
 2 files changed, 443 insertions(+), 406 deletions(-)

commit 90bea18ba8c6b585f483aa902d66d08972d982dd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 14 13:40:08 2012 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9238d69859b4d56477a898ea966c54d3f388a289
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 14 13:30:33 2012 +0200

    prepare 3.4.2

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

commit bf6dffc184ccc08ec6bf38c4a59898d137375097
Merge: 9dff9ef 815e572
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 11 14:06:59 2012 +0200

    Merge branch 'gnome-3-4'

commit 815e5728059c269de3c0a19612a7fc3077957390
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 11 14:03:43 2012 +0200

    account-widget-irc: Quit label should be in the first column

 libempathy-gtk/empathy-account-widget-irc.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9dff9efa4a2d03634a4f2186c05a7e42a886d619
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 11 13:17:30 2012 +0200

    coding style fix

 src/empathy-new-chatroom-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ed2c1e4f8ba8918ed147a7933a8fb8205ae8c4d5
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Fri May 11 11:28:40 2012 +0200

    Updated Galician translations

 po/gl.po | 1084
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 513 insertions(+), 571 deletions(-)

commit 58ddad6643cb9995a55f721ccc64c87d01a6f93a
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri May 11 10:59:02 2012 +0200

    Updated Spanish translation

 po/es.po | 142
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 72 insertions(+), 70 deletions(-)

commit 7b02ae3c3a6aee6c02f050e5fd8a31c0c454a467
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 11 10:23:25 2012 +0200

    contact-blocking-dialog: use tp_connection_dup_contact_by_id_async()

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

 libempathy-gtk/empathy-contact-blocking-dialog.c | 59
 ++++++++++++------------
 1 file changed, 30 insertions(+), 29 deletions(-)

commit 3f172c2a512373ab479602a833400778ade8d4d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 11 09:57:36 2012 +0200

    contact: use tp_connection_dup_contact_by_id_async()

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

 libempathy/empathy-contact.c | 43
 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

commit 439ca2f1853454d22ac54eac4c56ac3ee1740f79
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 11 09:50:24 2012 +0200

    contact-chooser: use empathy_client_factory_dup_contact_by_id_async()

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

 libempathy-gtk/empathy-contact-chooser.c | 62
 +++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 25 deletions(-)

commit ca8b366a8c48cd74aa7b39ff6f58c08ba0f9aacd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 10 16:23:51 2012 +0200

    chat: use empathy_client_factory_dup_contact_by_id_async()

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

 libempathy-gtk/empathy-chat.c | 95
 +++++++++++++++----------------------------
 1 file changed, 33 insertions(+), 62 deletions(-)

commit 27be4b94abb1b2c9311f54d3f4daff88bc07ca08
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 10 15:47:30 2012 +0200

    tp-chat: use tp_text_channel_get_chat_state()

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

 libempathy/empathy-tp-chat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9c18d540a2361801b32d67d5afa9c150f376148d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 10 15:47:03 2012 +0200

    client-factory: request TP_TEXT_CHANNEL_FEATURE_CHAT_STATES

    TP_CHANNEL_FEATURE_CHAT_STATES has been deprecated.

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

 libempathy/empathy-client-factory.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3632d3913eaf533f9100f7d02b1d2068f00d1b63
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 10 12:00:08 2012 +0200

    tp-chat: remove chat-state-changed-empathy signal

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

 libempathy/empathy-tp-chat.c | 58
 --------------------------------------------
 1 file changed, 58 deletions(-)

commit 2d4e2fbb72426b3e9c542e67da8fb0bba0d31435
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 10 11:59:17 2012 +0200

    chat: use contact-chat-state-changed signal

    Now that we have a signal giving us a prepared TpContact there is
    no need to
    use the empathy variant as we can easily create the EmpathyContact
    directly.

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

 libempathy-gtk/empathy-chat.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

commit d6cf60f939a2d40eb5eeb0aba65588f9e444b838
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Thu May 10 14:24:41 2012 +0200

    Updated Spanish translation

 po/es.po | 61
 +++++++++++++++++++++++++++++--------------------------------
 1 file changed, 29 insertions(+), 32 deletions(-)

commit 2c899b3453accca2dfedcd900cd76e7ac4255b17
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 10 10:41:00 2012 +0200

    remove empathy-tp-roomlist

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

 libempathy/Makefile.am		  |   2 -
 libempathy/empathy-tp-roomlist.c | 524
 ---------------------------------------
 libempathy/empathy-tp-roomlist.h |  59 -----
 3 files changed, 585 deletions(-)

commit daad3ffce158a58f2c53e2502bb179b30392b7ec
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 26 14:54:44 2012 +0200

    new-chatroom-dialog: use TpRoomList

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

 src/empathy-new-chatroom-dialog.c | 179
 ++++++++++++++++----------------------
 1 file changed, 76 insertions(+), 103 deletions(-)

commit 4934dd5eeaa4c130350dd4dbb84859d09a27246b
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Thu May 10 11:59:17 2012 +0200

    Updated Spanish translation

 po/es.po | 912
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 427 insertions(+), 485 deletions(-)

commit cf9caca6cbd7ccdfbbe3cfd94c66adc40d4fd342
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 10 11:36:27 2012 +0200

    contact-search-dialog: use
    empathy_client_factory_dup_contact_by_id_async()

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

 libempathy-gtk/empathy-contact-search-dialog.c | 79
 ++++++++++++++++----------
 1 file changed, 50 insertions(+), 29 deletions(-)

commit 1b678e4f3f233e852dded51c069e8859e16aa3d5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 10 11:31:14 2012 +0200

    add empathy_client_factory_dup_contact_by_id_async()

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

 libempathy/empathy-client-factory.c | 64
 +++++++++++++++++++++++++++++++++++++
 libempathy/empathy-client-factory.h | 15 +++++++++
 2 files changed, 79 insertions(+)

commit 746b5f4f72a6b9403ea7bd2e71a6b6cf815efc8a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 10 10:33:20 2012 +0200

    remove invisible_char from ui files

    We should use Gtk+'s default and those widgets don't use it any way.

 libempathy-gtk/empathy-account-widget-irc.ui	   | 6 ------
 libempathy-gtk/empathy-contact-blocking-dialog.ui | 1 -
 src/empathy-new-chatroom-dialog.ui		   | 2 --
 3 files changed, 9 deletions(-)

commit 7842711bccaa0952eb11f13b9078f26260c5e8c0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 26 12:08:38 2012 +0200

    Turn EmpathyNewChatroomDialog to a GtkDialog sub-class

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

 src/empathy-new-chatroom-dialog.c  | 476
 +++++++++++++++++++++----------------
 src/empathy-new-chatroom-dialog.h  |  51 +++-
 src/empathy-new-chatroom-dialog.ui | 422 ++++++++++++++------------------
 3 files changed, 491 insertions(+), 458 deletions(-)

commit 98c9a19291744ca7e62ad470ef1f012761b58830
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 26 11:19:27 2012 +0200

    chatroom-dialog: re-order some functions

    Let's just get rid of all these stupid prototypes.

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

 src/empathy-new-chatroom-dialog.c | 656
 +++++++++++++++++---------------------
 1 file changed, 300 insertions(+), 356 deletions(-)

commit 3d4484b2968f1ed4e16b763b6ccda97636f10ab8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 26 11:08:49 2012 +0200

    new-chatroom-dialog: port to TP coding style

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

 src/empathy-new-chatroom-dialog.c | 1279
 +++++++++++++++++++------------------
 src/empathy-new-chatroom-dialog.h |	3 +-
 2 files changed, 642 insertions(+), 640 deletions(-)

commit 1b585fb209271d89f192d4a4adbef66c9ff19b95
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 25 11:16:52 2012 +0200

    Use tp_capabilities_get_channel_classes_variant()

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

 libempathy/empathy-tp-chat.c | 44
 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

commit 095cb1798bd4214653a85133de8fc577d23c268b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 18 15:39:45 2012 +0200

    Stop generating Certificate API

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

 extensions/Authentication_TLS_Certificate.xml | 305
 --------------------------
 extensions/Makefile.am			       |   1 -
 extensions/misc.xml			       |   1 -
 3 files changed, 307 deletions(-)

commit ae1fc6a29df872a65e293a17d821124e69f0985e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 18 15:04:14 2012 +0200

    remove empathy-tls-certificate

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

 libempathy/Makefile.am		      |   2 -
 libempathy/empathy-tls-certificate.c | 432
 -----------------------------------
 libempathy/empathy-tls-certificate.h |  93 --------
 3 files changed, 527 deletions(-)

commit 00cc78476a3926f64b531be08ff96dc817e63367
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 18 15:25:27 2012 +0200

    Use TpTpTLSCertificate

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

 libempathy-gtk/empathy-tls-dialog.c	 | 46 ++++++++++++-------------
 libempathy-gtk/empathy-tls-dialog.h	 |  8 ++---
 libempathy/empathy-server-tls-handler.c | 31 +++++++----------
 libempathy/empathy-server-tls-handler.h |  6 ++--
 libempathy/empathy-tls-verifier.c	 | 61
 ++++++++++++++++-----------------
 libempathy/empathy-tls-verifier.h	 |  8 ++---
 src/empathy-auth-client.c		 | 24 +++++++------
 tests/empathy-tls-test.c		 | 57
 +++++++++++++++---------------
 8 files changed, 114 insertions(+), 127 deletions(-)

commit 049ba20e4c1579faaf999089a4a97674e3816a50
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 10 17:04:45 2012 +0200

    use tp_capabilities_supports_sms()

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

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

commit a9e5357278f2320098e07dd97bcbffd192e83a38
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 16 13:37:59 2012 +0200

    Stop generating Debug API

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

 extensions/Debug.xml	| 165
 -------------------------------------------------
 extensions/Makefile.am |   1 -
 extensions/misc.xml	|   1 -
 3 files changed, 167 deletions(-)

commit 08ab2c822a8e732206f6c5579f9f6b51ce217567
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 16 11:34:06 2012 +0200

    Store the TpDebugMessage in the model

    Makes things easier and saves us from dupping the info.

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

 src/empathy-debug-window.c | 265
 ++++++++++++++++++++++-----------------------
 1 file changed, 131 insertions(+), 134 deletions(-)

commit 60e7f9f68bbcb287e8df3aac35a0ee5b5cf01b94
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 16 11:56:45 2012 +0200

    merge store_filter_foreach () and copy_model_foreach ()

    They were basically the same function. The only difference was that
    one was
    assuming to receive an empty string during the first iteration while
    the other
    was coping with it being NULL.

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

 src/empathy-debug-window.c | 75
 +++++++++-------------------------------------
 1 file changed, 14 insertions(+), 61 deletions(-)

commit bb58c649539336ca1081ffff0fef14f3b632be36
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 16 10:44:36 2012 +0200

    debug-window: use TpDebugClient

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

 src/empathy-debug-window.c | 159
 +++++++++++++++++++++++++--------------------
 1 file changed, 89 insertions(+), 70 deletions(-)

commit cad76982e06dff27a7f19840384061e3e92b70be
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 16 10:10:14 2012 +0200

    empathy-debugger: use self->priv pattern

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

 src/empathy-debug-window.c | 542
 ++++++++++++++++++++++-----------------------
 src/empathy-debug-window.h |	3 +-
 2 files changed, 267 insertions(+), 278 deletions(-)

commit 77e0eed9fb363177cbd54a2659105c4e6a288c8d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 16 09:39:42 2012 +0200

    debug_window_dispose: use g_clear_object()

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

 src/empathy-debug-window.c | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

commit 6e1feb9fafe3f46f8a0a5c0ffa11dea0a4a07d15
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 10 09:46:15 2012 +0200

    Depend on tp-glib 0.19.0

    We are going to use its new API (TpDebugClient, TpTLSCertificate,
    etc).

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

commit 3e8ad073e4434f8dea27c29def12f1548d5d7b86
Merge: 085365f aa2c67b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 9 14:02:13 2012 +0200

    Merge branch 'gnome-3-4'

    Conflicts:
	configure.ac
	libempathy/empathy-tp-chat.c
	src/empathy-event-manager.c
	src/empathy-streamed-media-window.c
	src/empathy-video-widget.c

commit aa2c67bebc8dee3d6f53abf8267090d1b68cd098
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 9 13:58:26 2012 +0200

    Use tp-glib version checking macros

    Will make sure we don't accidentally use new API in stable branch.

    Depend on tp-glib 0.18.0 while we are on it as any distro shipping
    3.4 should
    use this version any way.

 configure.ac | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 5cdb08a0601008eb6fa3402d7a34406e358ccdf7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 7 11:10:17 2012 +0200

    Use TP_ERROR instead of TP_ERRORS

    The latter has been deprecated in tp-glib master.

 libempathy-gtk/empathy-chat.c			  | 4 ++--
 libempathy-gtk/empathy-contact-blocking-dialog.c | 2 +-
 libempathy/empathy-tp-chat.c			  | 2 +-
 libempathy/empathy-tp-contact-factory.c	  | 2 +-
 src/empathy-call-factory.c			  | 2 +-
 src/empathy-call-observer.c			  | 2 +-
 src/empathy-event-manager.c			  | 8 ++++----
 7 files changed, 11 insertions(+), 11 deletions(-)

commit 085365f20953fae1fb95d0272677273e3840e98f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 8 13:50:03 2012 +0200

    new-account-dialog: rely on the EmpathyAccountWidget::close signal

    User of the dialog should wait for the widget to be completely
    done before
    destroying it.

    Change the 'success' dialog response to GTK_RESPONSE_APPLY to stay
    coherent
    with the response type received from EmpathyAccountWidget.

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

 libempathy-gtk/empathy-new-account-dialog.c | 23 ++++++-----------------
 src/empathy-accounts-dialog.c		     |	2 +-
 2 files changed, 7 insertions(+), 18 deletions(-)

commit 852af596dcc11e104a5565e953240af2f83b4cc2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 8 13:46:48 2012 +0200

    account-widget: delay 'close' signal if enabling the account

    The whole point of this signal is to tell to user when it can be
    destroyed, so
    we shouldn't fire it if we are still pending on an async call.

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

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

commit d3e20304bf68216c268e2c7db0a2a081b8d3a197
Author: Olivier Crête <olivier.crete@collabora.com>
Date:	Mon May 7 18:52:42 2012 -0400

    video-widget: Remove as it is now unused

    It was only used by empathy-av. Move the #defines to call-window where
    they are used.

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

 src/Makefile.am	    |	2 -
 src/empathy-call-window.c  |  11 +-
 src/empathy-video-widget.c | 513
 ---------------------------------------------
 src/empathy-video-widget.h |  72 -------
 4 files changed, 6 insertions(+), 592 deletions(-)

commit 4723b7016072a1cd4f41dfddcf990d97d68def36
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 8 10:37:34 2012 +0200

    call-observer: use tp_channel_get_target_contact()

 src/empathy-call-observer.c | 36 ++++--------------------------------
 1 file changed, 4 insertions(+), 32 deletions(-)

commit d86e51de57197b0f0ce77fac46fc113713aa9033
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 4 14:53:34 2012 +0200

    Turn EmpathyAccountWidget to a proper GtkWidget

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

 libempathy-gtk/empathy-account-widget-irc.c	    |  10 +-
 libempathy-gtk/empathy-account-widget-irc.h	    |	6 +-
 libempathy-gtk/empathy-account-widget-private.h    |	2 -
 libempathy-gtk/empathy-account-widget-sip.c	    |	4 +-
 libempathy-gtk/empathy-account-widget-sip.h	    |	2 +-
 libempathy-gtk/empathy-account-widget.c	    | 156
 +++++++++++----------
 libempathy-gtk/empathy-account-widget.h	    |	6 +-
 .../empathy-local-xmpp-assistant-widget.c	    |  17 +--
 libempathy-gtk/empathy-new-account-dialog.c	    |  30 ++--
 src/empathy-accounts-dialog.c			    |  52 +++----
 10 files changed, 139 insertions(+), 146 deletions(-)

commit 09ac300a093ffe494cbea40bd5c3e2bca74aee4f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 7 13:56:40 2012 +0200

    approve_ft_channel: stop using the contact factory

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

 src/empathy-event-manager.c | 57
 ++++++++++++++++-----------------------------
 1 file changed, 20 insertions(+), 37 deletions(-)

commit 89c1b2f6eae4b0a01debe8096140f55c7836df70
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 7 13:56:40 2012 +0200

    approve_call_channel: stop using the contact factory

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

 src/empathy-event-manager.c | 112
 +++++++++++++++++++-------------------------
 1 file changed, 47 insertions(+), 65 deletions(-)

commit aaf3c94bd09a836df63b01054b41bd3e09982439
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 7 12:18:31 2012 +0200

    event-manager: factor out approve_channel_*() functions

    This approve function is way to big, let's split it.

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

 src/empathy-event-manager.c | 235
 ++++++++++++++++++++++++++------------------
 1 file changed, 141 insertions(+), 94 deletions(-)

commit 50241f767ad46c4433864205a67410452a092c0b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 7 13:39:21 2012 +0200

    tp-chat: stop using the contact factory when building message

    Messages are now synchronously proccessed so we don't have to keep
    an internal
    queue of messages being prepared.
    We also need to complete the preparation of the EmpathyTpChat feature
    in idle
    as it's now prepared synchronously as well.

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

 libempathy/empathy-tp-chat.c | 75
 +++++++-------------------------------------
 1 file changed, 12 insertions(+), 63 deletions(-)

commit 5673bdb1c772ec6bb3b8c1257afbca0d06762681
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 7 12:00:27 2012 +0200

    ft-handler: create EmpathyContact from TpContact

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

 libempathy/empathy-ft-handler.c | 37
 +++++--------------------------------
 1 file changed, 5 insertions(+), 32 deletions(-)

commit c33d6ea84ba4a11c63f840b659d0568b3a0331d8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 7 11:54:54 2012 +0200

    tp-contact-factory: remove unused methods

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

 libempathy/empathy-tp-contact-factory.c | 145
 --------------------------------
 libempathy/empathy-tp-contact-factory.h |  32 -------
 2 files changed, 177 deletions(-)

commit 689ad874fb13b6485e7f7c3a1c93bfb8e50b34e9
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon May 7 22:31:44 2012 +0200

    Add fallback server for WLM

 goa-mc-plugin/mcp-account-manager-goa.c | 1 +
 1 file changed, 1 insertion(+)

commit 9b8c6a150ac947fed91166505d6b198b0a073f77
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon May 7 22:31:44 2012 +0200

    Add fallback server for WLM

 goa-mc-plugin/mcp-account-manager-goa.c | 1 +
 1 file changed, 1 insertion(+)

commit 4a1c6a72d6899c5af90a51fb8d6ae27298d7742e
Author: Javier Jardón <jjardon@gnome.org>
Date:	Tue May 8 14:57:08 2012 +0900

    Use gst_object_ref_sink()

    Instead call both gst_object_ref() and gst_object_sink()

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

 src/empathy-call-window.c  | 9 +++------
 src/empathy-video-widget.c | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

commit 9bc69fec76fb62000791b0b383ba15b508a7d7b6
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Sat Mar 31 23:37:53 2012 +0200

    goa-mc-plugin: support enabling or disabling accounts

    Bumped the required version of GOA to 3.5.0.

    Fixes: https://bugzilla.gnome.org/673263

 configure.ac				 |  2 +-
 goa-mc-plugin/mcp-account-manager-goa.c | 34
 +++++++++++++++++++++++----------
 2 files changed, 25 insertions(+), 11 deletions(-)

commit d0193ecc58b6eab69b4c4d3c9667c50bfc033b49
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 7 11:10:17 2012 +0200

    Use TP_ERROR instead of TP_ERRORS

    The latter has been deprecated in tp-glib master.

 libempathy-gtk/empathy-chat.c			  | 4 ++--
 libempathy-gtk/empathy-contact-blocking-dialog.c | 2 +-
 libempathy/empathy-tp-chat.c			  | 2 +-
 libempathy/empathy-tp-contact-factory.c	  | 2 +-
 src/empathy-call-factory.c			  | 2 +-
 src/empathy-call-observer.c			  | 2 +-
 src/empathy-event-manager.c			  | 8 ++++----
 7 files changed, 11 insertions(+), 11 deletions(-)

commit 69f31706a888ba65374c15c61489a3d6db0b0752
Author: Javier Jardón <jjardon@gnome.org>
Date:	Mon May 7 17:11:29 2012 +0900

    Use gst_object_ref_sink()

    Instead call both gst_object_ref() and gst_object_sink()

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

 src/empathy-call-window.c	     | 9 +++------
 src/empathy-streamed-media-window.c | 9 +++------
 src/empathy-video-widget.c	     | 3 +--
 3 files changed, 7 insertions(+), 14 deletions(-)

commit 9923159863e58051f64cc7a60b3fa16184526db8
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Wed May 2 22:31:41 2012 +0300

    Fix localization of --help outputs and application names

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

 src/empathy-accounts.c | 3 ++-
 src/empathy-call.c	| 3 ++-
 src/empathy-chat.c	| 1 +
 src/empathy-debugger.c | 4 ++--
 src/empathy.c		| 3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

commit 5deac54272ed93cf9811af2dc79658b21bb8c705
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 3 11:30:49 2012 +0200

    accounts-dialog: stop using tp_connection_get_self_handle()

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

 src/empathy-accounts-dialog.c | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

commit e73848da5a3c8c3ab71aab36c0fbb9d7f20141d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 3 11:30:49 2012 +0200

    contact-widget: stop using tp_connection_get_self_handle()

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

 libempathy-gtk/empathy-contact-widget.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit 51bea3323498986ac13df3d99157c2b8db83484a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 3 11:21:11 2012 +0200

    contact: compare TpContact objects rather than handles

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

 libempathy/empathy-contact.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

commit 12c633ddc23c83b660b33b841c420d410e580a59
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 3 11:21:11 2012 +0200

    invite-participant-dialog: compare TpContact objects rather than
    handles

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

 src/empathy-invite-participant-dialog.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit 6fa54e003930d9c0f3fe64a5e799b2f2c55c0fef
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 3 11:14:45 2012 +0200

    tp-chat:stop using the handle of members

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

 libempathy/empathy-tp-chat.c | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

commit a296925676f10385929fee162610d49f1caff373
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 3 11:02:39 2012 +0200

    empathy_tp_chat_is_invited: return a TpContact for the inviter

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

 libempathy/empathy-tp-chat.c | 14 ++++----------
 libempathy/empathy-tp-chat.h |  2 +-
 src/empathy-event-manager.c  | 35 +++++------------------------------
 3 files changed, 10 insertions(+), 41 deletions(-)

commit 7faf1b0fef56fd7a22af9ce4216f0eeedfffac26
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 2 11:42:59 2012 +0200

    event-manager: use new channel group API

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

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

commit eaaad920b112ab16d445ac8c2ef29c5d742a5809
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 2 15:45:44 2012 +0200

    invite-participant-dialog: stop using
    tp_channel_group_get_handle_owner()

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

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

commit 5d02797e83cfe2779b2c9ddb25b63131cb9b281b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 2 11:42:59 2012 +0200

    tp-chat: use new channel group API to track members

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

 libempathy/empathy-tp-chat.c | 191
 +++++++++++++------------------------------
 1 file changed, 55 insertions(+), 136 deletions(-)

commit 9173fd2111ceb3ed736515396398c64aa64deee9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 2 11:42:59 2012 +0200

    tp_chat_prepare_ready_async: use new channel group API

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

 libempathy/empathy-tp-chat.c | 62
 ++++++++++++--------------------------------
 1 file changed, 16 insertions(+), 46 deletions(-)

commit 73b1e75262d87d78602b6c8cc6c9bec8aa875f0b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 2 11:28:43 2012 +0200

    empathy_tp_chat_is_invited: use new channel group API

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

 libempathy/empathy-tp-chat.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

commit f6cca8274e3cce4821d93b9bbdb456a864a7b7dc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 2 10:52:06 2012 +0200

    individual-store-channel: stop preparing TP_CHANNEL_FEATURE_CONTACTS

    The factory does it for us now.

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

 libempathy-gtk/empathy-individual-store-channel.c | 31
 ++++-------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

commit b7f5aed23c4253145811b7759f8ea8ed120903a1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 2 10:50:14 2012 +0200

    client-factory: prepare TP_CHANNEL_FEATURE_CONTACTS

    We are about to use the channel-contacts API so best to make sure
    they will
    work.

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

 libempathy/empathy-client-factory.c | 3 +++
 1 file changed, 3 insertions(+)

commit 4e5ccb224018c01ba381259cbfe9c54e78082d3f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 1 12:58:52 2012 +0200

    remove empathy_tp_chat_join()

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

 libempathy/empathy-tp-chat.c | 32 --------------------------------
 libempathy/empathy-tp-chat.h |  1 -
 2 files changed, 33 deletions(-)

commit ce0e19ff736d76b8064a006f8b8bf4c1baabda1b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 1 12:55:49 2012 +0200

    chat-manager: use tp_channel_join_async()

    It's basically the same as empathy_tp_chat_join()

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

 src/empathy-chat-manager.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

commit af568dcb51fab67c77f5540cc8351be3fe9809cc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 2 16:03:32 2012 +0200

    Revert "Revert "remove EMPATHY_AV_BUS_NAME*""

    This reverts commit afb9276b8a497e7b9275fb53abafd0cdb18d55fc.

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

 libempathy/empathy-request-util.h | 3 ---
 1 file changed, 3 deletions(-)

commit 59ec941bf710736869384acf3cfe137a6d1180a9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 2 16:03:11 2012 +0200

    Revert "Revert "Stop requesting StreamedMedia channels""

    This reverts commit 758b4250e767d9e952b8c0ea4db7d93df192a0c0.

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

 libempathy-gtk/empathy-call-utils.c | 74
 +++----------------------------------
 libempathy-gtk/empathy-call-utils.h |	4 --
 2 files changed, 5 insertions(+), 73 deletions(-)

commit 2d19fc2f3bc163cf742469185d61e667b2dcd084
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 2 16:01:24 2012 +0200

    remove empathy-av

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

 configure.ac					|   19 -
 data/Makefile.am				|   13 -
 libempathy-gtk/empathy-call-utils.c		|   31 +-
 libempathy/Makefile.am				|    2 -
 libempathy/empathy-tp-streamed-media.c		|  856 -------
 libempathy/empathy-tp-streamed-media.h		|  113 -
 po/POTFILES.in					|    4 -
 src/Makefile.am				|   33 -
 src/empathy-av.c				|  169 --
 src/empathy-streamed-media-factory.c		|  270 --
 src/empathy-streamed-media-factory.h		|   69 -
 src/empathy-streamed-media-handler.c		|  921 -------
 src/empathy-streamed-media-handler.h		|  106 -
 src/empathy-streamed-media-window-fullscreen.c |  309 ---
 src/empathy-streamed-media-window-fullscreen.h |   77 -
 src/empathy-streamed-media-window.c		| 3203
 ------------------------
 src/empathy-streamed-media-window.h		|   65 -
 src/empathy-streamed-media-window.ui		|  861 -------
 src/ev-sidebar.c				|  351 ---
 src/ev-sidebar.h				|   76 -
 20 files changed, 14 insertions(+), 7534 deletions(-)

commit 5a6db15dbaaa9f3aa902d5ae2299bdb5ee83a9d8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 2 16:18:18 2012 +0200

    Stop approving StreamedMedia channels

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

 src/empathy-event-manager.c	      | 86
 +-----------------------------------
 src/empathy-event-manager.h	      |  1 -
 src/empathy-notifications-approver.c |  9 ----
 3 files changed, 2 insertions(+), 94 deletions(-)

commit d3ea58c51fd403f0d5e4913193095f3890423fb9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 2 15:59:25 2012 +0200

    Revert "DISTCHECK_CONFIGURE_FLAGS add --enable-empathy-av"

    This reverts commit bd55c7dec76d6c95d294ee60da616b7fe51d181a.

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

 Makefile.am | 1 -
 1 file changed, 1 deletion(-)

commit 55b19d4afad4a05e4e90ab4e4a57bbb1e2734d21
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 26 13:42:03 2012 +0200

    tp-chat: add the 'members-changed' signal

    It uses to be implemented by the EmpathyContactList interface which
    has been
    removed.

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

 libempathy/empathy-tp-chat.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

commit e889f1ac2825527fdc80cf22926817e3992d7421
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 26 13:42:03 2012 +0200

    tp-chat: add the 'member-renamed' signal

    It uses to be implemented by the EmpathyContactList interface which
    has been
    removed.

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

 libempathy/empathy-tp-chat.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

commit 01dbc394d6249e2517850e38fdc805d1a8eddaa8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 30 17:37:06 2012 +0200

    remove released flag and update release.py

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

commit 8b66333ace95cb356140b2c31f4b8d9f83a69162
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 30 17:21:34 2012 +0200

    Prepare 3.5.1

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

commit c182c4dc507b2b6c9a79bf93d31aa52925b0908a
Merge: 4115e48 36f10a0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 30 17:11:11 2012 +0200

    Merge branch 'gnome-3-4'

commit 4115e48c310707ef52d683ea6dae14518bd5ea27
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Mon Apr 30 10:17:11 2012 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 239
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 122 insertions(+), 117 deletions(-)

commit d7d7fe528295ca08e1da2efbd07d42b9f5a4e965
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 23 16:45:13 2012 +0200

    POTFILES.in: set type gsettings

 po/POTFILES.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9f2b7eb8484ed134431a526b651dbf1627da6342
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 23 14:17:49 2012 +0200

    Stop generating gschema from .in file

    intltool now supports translating gschema files properly so we don't
    need to
    do this crack any more.

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

 configure.ac			       |   2 +-
 data/.gitignore		       |   1 -
 data/Makefile.am		       |   8 +-
 data/org.gnome.Empathy.gschema.xml    | 303
 ++++++++++++++++++++++++++++++++++
 data/org.gnome.Empathy.gschema.xml.in | 302
 ---------------------------------
 po/POTFILES.in			       |   2 +-
 6 files changed, 307 insertions(+), 311 deletions(-)

commit d710f1ef048c2eb98d6cb93186947c966d82ad58
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 23 15:00:58 2012 +0200

    add tests/certificates/Makefile.am

    certificates needs to be in EXTRA_DIST so empathy-tls-test passes when
    distchecking.

 configure.ac			| 1 +
 tests/Makefile.am		| 2 +-
 tests/certificates/Makefile.am | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

commit a808e2c70febb9cc8e80cc17cad8fe17a78070a8
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Sat Apr 21 13:01:01 2012 +0200

    Updated Slovenian translation

 po/sl.po | 966
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 493 insertions(+), 473 deletions(-)

commit 91cbaef3f9b5d111d76fb68e786c33059355fd8c
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Fri Apr 20 15:32:06 2012 +0200

    Updated Galician translations

 po/gl.po | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

commit 0304b597824e1a37640fc17ec378b5a382c56aa6
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Apr 20 14:29:54 2012 +0200

    Updated Spanish translation

 po/es.po | 510
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 257 insertions(+), 253 deletions(-)

commit 4551d97be43ff1bee62c4a8ff68887ce8c083e26
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 20 11:39:24 2012 +0200

    strip the new group name

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

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

commit b5063fd8122ca1f5fcfbd93b7d495554d900f7f5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 5 14:35:27 2012 +0200

    live-search: don't forward shift keys

    Not doing so cancel any group renaming operation.

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

 libempathy-gtk/empathy-live-search.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 5405e5fc520318e12ed6a252cef37a2bb281928b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 13 09:55:28 2012 +0100

    individual-view: add menu item to rename groups

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

 libempathy-gtk/empathy-individual-view.c | 117
 +++++++++++++++++++++++++------
 1 file changed, 97 insertions(+), 20 deletions(-)

commit 69f4cb22dcefd39cadcbe274b1896b06a3eadc15
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 13 14:19:28 2012 +0100

    add empathy_connection_aggregator_rename_group()

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

 libempathy/empathy-connection-aggregator.c | 41
 ++++++++++++++++++++++++++++++
 libempathy/empathy-connection-aggregator.h |  5 ++++
 2 files changed, 46 insertions(+)

commit eb6f86cc365f373851b52a11e06578374d0af9d2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 20 10:03:48 2012 +0200

    roster-window: set a default height

    600 seems to be a decent default height and that's already the one
    we use for
    the log viewer window.

    We continue relying on Gtk+ to pick the best width as there is no
    point making
    the window wider as long as all the menus are displayed.

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

 src/empathy-roster-window.c | 1 +
 1 file changed, 1 insertion(+)

commit fed480fa086cba30816a5345499ceeb00ddd6d6c
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Thu Apr 19 19:36:21 2012 +0200

    Updated Galician translations

 po/gl.po | 486
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 249 insertions(+), 237 deletions(-)

commit b0de75186e8e529e427aae231b334a3e40e5bffd
Author: Stef Walter <stefw@gnome.org>
Date:	Thu Apr 19 07:56:49 2012 +0200

    tls-test: Use a proper PKCS#11 mock module for testing

     * In empathy-tls-test.c use a proper PKCS#11 mock module,
       which we can place certificate anchors and pinned certificates in.
     * Fix EmpathyTlsVerifier to check for server trust assertions
       not client ones, this was a bug highlighted by fixing tests.

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

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

 libempathy/empathy-tls-verifier.c		  |    4 +-
 tests/Makefile.am				  |    4 +-
 tests/certificates/collabora-ca.cer		  |  Bin 0 -> 1536 bytes
 tests/certificates/collabora-ca/collabora-ca.cer |  Bin 1536 -> 0 bytes
 tests/empathy-tls-test.c			  |  157 ++-
 tests/mock-pkcs11.c				  | 1351
 ++++++++++++++++++++++
 tests/mock-pkcs11.h				  |  352 ++++++
 7 files changed, 1823 insertions(+), 45 deletions(-)

commit 7c25066261498dd98fb6bd1260ffe12f2fb5b7ce
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 18 14:20:24 2012 +0200

    add tests to noinst_PROGRAMS

    Make sure tests are always build. This is how tp-glib is handling
    its tests as
    well.

 tests/Makefile.am | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 6f1ad230e5666eb30d4952cb84d7d49852ae4705
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 19 13:21:11 2012 +0100

    Hook tests on 'make check' instead of 'make test'

    This is how it's supposed to be done and so has the nice side
    effect of
    actually using TESTS_ENVIRONMENT and so fix tests if EMPATHY_SRCDIR
    is not
    defined.

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

 tests/Makefile.am | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit 5cec6527d47562cc0e8fee9e525ed7fa2e3f680b
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Wed Apr 18 19:58:31 2012 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 664
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 338 insertions(+), 326 deletions(-)

commit abdcbd53e414579e5de04d631daa8e59ce5eacf3
Author: Sasi Bhushan <sasi@swecha.net>
Date:	Tue Apr 17 18:26:17 2012 +0530

    Updated Telugu Translation

 po/te.po | 487
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 249 insertions(+), 238 deletions(-)

commit a60725383b6507841098dfde1da6ad082cae37ef
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	Mon Apr 16 22:24:19 2012 +0200

    Updated Slovenian translation

 po/sl.po | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

commit 281935bdac21efcf0fbf6c41c16b93ea4b48279f
Author: Daniel Martinez Cucalon <dmartinez@src.gnome.org>
Date:	Mon Apr 16 20:20:16 2012 +0200

    Updated Aragonese translation

 po/an.po | 4416
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 2488 insertions(+), 1928 deletions(-)

commit 36f10a0030d0292111db9ca0b7c7b135f9738ab5
Author: Daniel Martinez Cucalon <dmartinez@src.gnome.org>
Date:	Mon Apr 16 20:20:16 2012 +0200

    Updated Aragonese translation

 po/an.po | 4416
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 2488 insertions(+), 1928 deletions(-)

commit 6094f6b6b5c56f50ffa65849537b310615498c1b
Merge: a26a516 a04eca8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 16 14:00:41 2012 +0200

    Merge branch 'gnome-3-4'

    Conflicts:
	configure.ac
	po/sk.po
	po/zh_CN.po

commit a04eca8be3870bf8934a8360977d2cc6d275d2d6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 16 13:57:58 2012 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6f8d309d3ec49ced1323c3c223945f8bcae77045
Author: Pavol Klačanský <pavol@klacansky.com>
Date:	Mon Apr 16 13:57:39 2012 +0200

    Updated Slovak translation

 po/sk.po | 4240
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 2244 insertions(+), 1996 deletions(-)

commit a26a5165bde37fad6db712cc96304c4b74ba732d
Author: Pavol Klačanský <pavol@klacansky.com>
Date:	Mon Apr 16 13:56:06 2012 +0200

    Updated Slovak translation

 po/sk.po | 4316
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 2310 insertions(+), 2006 deletions(-)

commit 4e3af8361f42c765f3faf1e0499363144edb0cbb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 16 13:47:40 2012 +0200

    prepare 3.4.1

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

commit 8cd58dffc5009cc31c266d9a06137aad66f27f3f
Author: Ibrahim Saed <ibraheem5000@gmail.com>
Date:	Sat Apr 14 19:30:05 2012 +0100

    Small fixes to the Arabic translation

 po/ar.po | 418
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 212 insertions(+), 206 deletions(-)

commit f21a356c1f53fa8a737cfd3b979168817b22d933
Author: Ibrahim Saed <ibraheem5000@gmail.com>
Date:	Sat Apr 14 19:30:05 2012 +0100

    Small fixes to the Arabic translation

 po/ar.po | 418
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 212 insertions(+), 206 deletions(-)

commit 02d5aa9aa297fb1b1a1f4df38a38b508ae8d682d
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Sun Apr 15 16:02:44 2012 +0200

    Updated French doc translation

 help/fr/figures/empathy-main-window.png |  Bin 44444 -> 48810 bytes
 help/fr/fr.po				 | 3838
 ++++++++++++++++++++++++++-----
 2 files changed, 3234 insertions(+), 604 deletions(-)

commit 43d82a9496aa9a26e2f22d72475ee020367c20cd
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Sun Apr 15 16:02:44 2012 +0200

    Updated French doc translation

 help/fr/figures/empathy-main-window.png |  Bin 44444 -> 48810 bytes
 help/fr/fr.po				 | 3838
 ++++++++++++++++++++++++++-----
 2 files changed, 3234 insertions(+), 604 deletions(-)

commit 0b1f53328b9472c8eb33aeb7c726d8e138a50ea2
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Apr 13 01:02:07 2012 +0300

    Updated Hebrew translation.

 po/he.po | 740
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 376 insertions(+), 364 deletions(-)

commit 10feff6bb7001774559776f4fc7bdb68eb5e7353
Author: Automatic Mirroring <aronmalache@gmail.com>
Date:	Wed Apr 11 16:40:21 2012 +0000

    [l10n] Fix a bug in zh_CN translation.

 po/zh_CN.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b0bb6ffdb903b2a69c6eefde1b70d3e75ce78f92
Author: Automatic Mirroring <aronmalache@gmail.com>
Date:	Wed Apr 11 16:39:25 2012 +0000

    [l10n] Fix a bug in zh_CN translation.

 po/zh_CN.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit bb1cf54832b5c3b29744407de9189cd63af9c3c2
Merge: b8e7e16 25a167b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 11 11:09:08 2012 +0200

    Merge branch 'gnome-3-4'

    Conflicts:
	po/ca@valencia.po

commit 25a167b368cfa169810f4fc6c8d4b9c6adba8aef
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 11 11:01:11 2012 +0200

    Don't display anything when being re-invoked in hidden mode

    Hidden is disabled by default, so if Empathy is re-invoked with
    --hidden
    explicitely passed, we shouldn't bring back the contact list or
    any UI.

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

 src/empathy.c | 7 -------
 1 file changed, 7 deletions(-)

commit b8e7e162b685196577a7fc7fd4b56c173e76c40e
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:	Tue Apr 10 23:32:13 2012 +0200

    [l10n]Updated Catalan (Valencian) translation

 po/ca@valencia.po | 969
 +++++++++++++++++++++++++++---------------------------
 1 file changed, 491 insertions(+), 478 deletions(-)

commit 0da8569890680d1dea72ed1016864f4cd158fa1e
Author: Jordi Serratosa <jordis@softcatala.cat>
Date:	Tue Apr 10 23:31:39 2012 +0200

    [l10n] Fixes on Catalan translation

 po/ca.po | 540
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 269 insertions(+), 271 deletions(-)

commit 0cdaf3780a36e74025a9ff995abd1c90c400e184
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:	Tue Apr 10 23:31:46 2012 +0200

    [l10n]Updated Catalan (Valencian) translation

 po/ca@valencia.po | 690
 +++++++++++++++++++++++++++---------------------------
 1 file changed, 344 insertions(+), 346 deletions(-)

commit 40b26269c35b24fe941e1e0922f70dbe144172a2
Author: Jordi Serratosa <jordis@softcatala.cat>
Date:	Tue Apr 10 23:31:39 2012 +0200

    [l10n] Fixes on Catalan translation

 po/ca.po | 540
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 269 insertions(+), 271 deletions(-)

commit f83db2fac6476f8c7c2cdce15a7a92e254160eac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 10 16:18:29 2012 +0200

    Use more tp_capabilities_ methods

    Makes code easier and would allow us to stop using a GValueArray
    once we'll
    have API to check if SMS are supported.

    This may break StreamedMedia only CM but we are not going to support
    those in
    3.5 anyway.

 libempathy/empathy-contact.c | 76
 +++++++++++---------------------------------
 1 file changed, 18 insertions(+), 58 deletions(-)

commit 10373cfb78514a08c611ef144592024e25fe157f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 10 16:18:02 2012 +0200

    Depends on tp-glib 0.17.6

    Needed for tp_capabilities_supports_audio_video_call()

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9251b78d69de71343adc0a0612e6c42189412eb9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 10 15:50:52 2012 +0200

    remove empathy_plist_parse_array()

    It's not used by the Adium code and uses a GValueArray which is
    deprecated.

 libempathy-gtk/empathy-plist.c | 29 -----------------------------
 1 file changed, 29 deletions(-)

commit 29c177e550a8102dd9ea3b60d81af64cb038823b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 10 14:34:51 2012 +0200

    individual-manager: remove (un)linking API

    Empathy now relies on gnome-contacts to link contacts.

 libempathy/empathy-individual-manager.c | 69
 ---------------------------------
 libempathy/empathy-individual-manager.h |  7 ----
 2 files changed, 76 deletions(-)

commit 18c0caddada1abd3c4707a1a3ae9478a7ebe7829
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 10 13:28:05 2012 +0200

    remove empathy-contact-list

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

 libempathy/Makefile.am		   |   2 -
 libempathy/empathy-contact-list.c | 214
 --------------------------------------
 libempathy/empathy-contact-list.h |  92 ----------------
 3 files changed, 308 deletions(-)

commit a5dd2701945ee0e9a836154285a456a3cb3de93a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 10 13:28:30 2012 +0200

    remove useless empathy-contact-list.h includes

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

 libempathy-gtk/empathy-chat.c		  | 1 -
 libempathy-gtk/empathy-contact-widget.c  | 1 -
 libempathy-gtk/empathy-individual-menu.c | 1 -
 src/empathy-chat-window.c		  | 1 -
 src/empathy-invite-participant-dialog.c  | 1 -
 src/empathy-roster-window.c		  | 1 -
 6 files changed, 6 deletions(-)

commit c3a3fdbca5129984d875b217d8204531ccf900ab
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 10 13:15:07 2012 +0200

    implement empathy_tp_chat_get_members as a method on TpChat

    That means EmpathyTpChat doesn't have to implement the
    EmpathyContactList
    interface any more.

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

 libempathy-gtk/empathy-chat.c		 |  2 +-
 libempathy/empathy-tp-chat.c		 | 20 +++-----------------
 libempathy/empathy-tp-chat.h		 |  2 ++
 src/empathy-invite-participant-dialog.c |  3 +--
 4 files changed, 7 insertions(+), 20 deletions(-)

commit 869f0b954dc31895406b3766cd432d0029afbb5b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 10 13:20:53 2012 +0200

    remove unused tp_chat_remove

    empathy_contact_list_remove() is not used any more.

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

 libempathy/empathy-tp-chat.c | 18 ------------------
 1 file changed, 18 deletions(-)

commit b659326acbfa02dab74fd88511673af0ddea81e6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 10 13:15:07 2012 +0200

    implement empathy_tp_chat_add as a method on TpChat

    We want to get rid of the EmpathyContactList interface.

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

 libempathy-gtk/empathy-individual-menu.c | 3 +--
 libempathy/empathy-tp-chat.c		  | 7 ++-----
 libempathy/empathy-tp-chat.h		  | 4 ++++
 src/empathy-chat-window.c		  | 5 ++---
 4 files changed, 9 insertions(+), 10 deletions(-)

commit 8e3b02e82557fd35059bc939fab25122cea78be5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 10 13:05:57 2012 +0200

    tp-chat: use self->priv directly

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

 libempathy/empathy-tp-chat.c | 39 +++++++++++++--------------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

commit 6ed0e77e1d08b8d55f2c40056c4b8b7891e491e8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 10 12:51:10 2012 +0200

    tp-chat: port to Telepathy coding style

    I'm so tired of hacking in this file using the old style.

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

 libempathy/empathy-tp-chat.c | 2279
 +++++++++++++++++++++---------------------
 libempathy/empathy-tp-chat.h |   94 +-
 2 files changed, 1207 insertions(+), 1166 deletions(-)

commit 9bd7007ff2880767195bfd79646902700c2e53a2
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Sun Apr 8 13:22:05 2012 +0200

    Updated Spanish translation

 po/es.po | 582
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 298 insertions(+), 284 deletions(-)

commit aa1bcc7697a16b0d4c550a83fe58340f3f07e91f
Author: Chandan Kumar <chandankumar.093047@gmail.com>
Date:	Sun Apr 8 14:48:54 2012 +0530

    Updated HINDI translation

 po/hi.po | 543
 +++++++++++++++++++++++++++------------------------------------
 1 file changed, 228 insertions(+), 315 deletions(-)

commit 20519346264bd3dae1627b1e369438e43661f8d9
Author: Tiffany Antopolski <tiffany.antopolski@gmail.com>
Date:	Sun Apr 8 04:58:47 2012 -0400

    po: fixed problems in en_CA.po

    This fixes bug #673669

 po/en_CA.po | 1535
 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 807 insertions(+), 728 deletions(-)

commit 44a3d5a083bcc4ea34f668feba9d918ec3fc64e6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 6 09:56:35 2012 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ff7a5a1efe769532579f3d1f05c0482980fc6295
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 6 09:45:41 2012 +0200

    prepare 3.4.0.2

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

commit bd55c7dec76d6c95d294ee60da616b7fe51d181a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 6 09:42:10 2012 +0200

    DISTCHECK_CONFIGURE_FLAGS add --enable-empathy-av

    Make sure we'll ship empathy-av files in the tarball

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

 Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit 85e3defb0a9c38bf0689254d8c2240eeb5733659
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 5 15:58:46 2012 +0200

    roster-window: Bring back log entry in individual context menu

    Looks like it has been accidentally removed.

 src/empathy-roster-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 2c3892eb9f27b2c8dc8832402ceb06053f36b987
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 25 15:23:30 2011 +0200

    Allocate GMutex on the stack

    g_mutex_new() has been deprecated in GLib 2.31.

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

 src/empathy-audio-sink.c	     | 26 +++++++++---------
 src/empathy-audio-src.c	     | 55
 +++++++++++++++++++------------------
 src/empathy-call-window.c	     | 18 ++++++------
 src/empathy-streamed-media-window.c | 18 ++++++------
 src/empathy-video-widget.c	     | 14 +++++-----
 5 files changed, 66 insertions(+), 65 deletions(-)

commit ee2e583ba62e7bc1b6765a8115a78a4a74818d61
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 25 15:30:05 2011 +0200

    stop using g_thread_init

    It has been deprecated in GLib 2.31.

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

 src/empathy-accounts.c		  | 1 -
 src/empathy-auth-client.c	  | 2 --
 src/empathy-av.c		  | 3 ---
 src/empathy-call.c		  | 3 ---
 src/empathy-chat.c		  | 3 ---
 src/empathy-debugger.c		  | 1 -
 src/empathy.c			  | 1 -
 tests/interactive/empathy-logs.c | 1 -
 8 files changed, 15 deletions(-)

commit 884989d0837b2fa11905650ab098cd26c970edd7
Merge: ee4b8cc c5df89d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 5 15:25:55 2012 +0200

    Merge branch 'gnome-3-4'

commit c5df89dcd6132acda4e3d52ab56dc9072990b391
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 5 15:25:37 2012 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ee4b8cc8d7db207588b33d1762d7e205f7820ca5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 5 13:37:42 2012 +0200

    configure.ac: remove connectivity libs checks

 configure.ac | 56
 --------------------------------------------------------
 1 file changed, 56 deletions(-)

commit 384fcd8f440f8d167ff46c5055e31410ade7ec6c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 28 10:32:11 2012 +0200

    remove EmpathyConnectivity

 libempathy/Makefile.am		   |   2 -
 libempathy/empathy-connectivity.c | 435
 --------------------------------------
 libempathy/empathy-connectivity.h |  71 -------
 3 files changed, 508 deletions(-)

commit 16947e6677f6a9adf08746912d36b090a4a2ef4d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 28 10:28:24 2012 +0200

    stop instantiating EmpathyConnectivity

 src/empathy.c | 22 ----------------------
 1 file changed, 22 deletions(-)

commit 0c787fdf8c043331b4857c6bf3ec08936467e42b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 28 10:26:39 2012 +0200

    accounts-dialog: use GNetworkMonitor

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

commit ca2423f0a3e6954ac551d5073fae7c5c944c828f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 28 10:26:39 2012 +0200

    presence-chooser: use GNetworkMonitor

 libempathy-gtk/empathy-presence-chooser.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

commit 4322574cde666404adbe8512616d20b54e19426a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 28 09:59:06 2012 +0200

    Depend on GLib 2.32

    Needed for GNetworkMonitor

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

commit beae7d25b600079c3f71c7dcc35cfa0f3e6d34fc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 5 13:44:30 2012 +0200

    Remove Meego specific code

    It's not used any more by Intel.

 configure.ac				 | 33
 -----------------------------
 libempathy-gtk/empathy-account-widget.c |  5 -----
 src/empathy-accounts-dialog.c		 | 37
 ---------------------------------
 3 files changed, 75 deletions(-)

commit cf118e67c08e1d50b456a7127b0c879740d30e85
Merge: f86e7b5 beb1e9f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 5 13:31:59 2012 +0200

    Merge branch 'gnome-3-4'

commit beb1e9f725a34f63bbd88744ff92ad6a596574e0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 5 11:02:31 2012 +0200

    Prepare 3.4.0.1

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

commit 7843d9f5621b1489a60cb982513ad39e38926fde
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 4 15:17:03 2012 +0200

    check if salut settings are valid instead of assume they are not

    If we manage to fetch all the info from EDS the account is ready
    to connect
    and so the 'Connect' button should be sensitive right away.

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

 src/empathy-accounts-dialog.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit bba730492873951c0e8b58c25ebfc6128b02e8a9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 4 15:15:35 2012 +0200

    add empathy_local_xmpp_assistant_widget_is_valid()

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

 libempathy-gtk/empathy-local-xmpp-assistant-widget.c | 7 +++++++
 libempathy-gtk/empathy-local-xmpp-assistant-widget.h | 3 +++
 2 files changed, 10 insertions(+)

commit b6d66bc4223175a058575b90f5b5bce4ad279980
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 4 14:35:47 2012 +0200

    empathy-nautilus-sendto: use the Empathy icon

    The first field of NstPluginInfo is the id of the icon of the plugin.

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

 nautilus-sendto-plugin/empathy-nautilus-sendto.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a0a0f0bc14b965c2063891242f435be3ac6296a4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 4 11:55:14 2012 +0200

    include logger single header

 libempathy-gtk/empathy-chat.c	     | 3 +--
 libempathy-gtk/empathy-log-window.c | 1 -
 libempathy/empathy-contact.c	     | 2 --
 libempathy/empathy-contact.h	     | 2 +-
 libempathy/empathy-message.c	     | 5 -----
 libempathy/empathy-message.h	     | 2 +-
 src/empathy.c			     | 2 +-
 7 files changed, 4 insertions(+), 13 deletions(-)

commit f86e7b5be4d7721f7f0bf3a9a7a140109486c48b
Merge: 52961fb 4f6083d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 4 11:43:20 2012 +0200

    Merge branch 'gnome-3-4'

commit 4f6083d07fa7b9dbba458e75e6563b4c77a4bf85
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 4 11:23:29 2012 +0200

    macros checking are *_MAX_ALLOWED

 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 0662d66db7bf28f275d4c535a49cd5ec1689d291
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 4 11:36:20 2012 +0200

    Depend on Clutter 1.10

    Needed for clutter_actor_set_margin_* which is already used.

    Shell 3.4 depends of this version as well so that won't be an
    issue for
    distribution shipping GNOME 3.4.

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

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

commit 52961fbbf502b79be4e913d81f3c6718c4a15d59
Author: Laurent <lcontzen@gmail.com>
Date:	Tue Apr 3 09:31:39 2012 +0200

    Tooltip text marked as translatable

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

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

commit 4b95ad17bf3d3e4e0bf78ecdb10435e64bd416b8
Merge: f11ad07 be2a0aa
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Apr 3 17:04:53 2012 +1000

    Merge branch 'gnome-3-4'

commit be2a0aa278149a082511bb3f4814f5850c970ce4
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Apr 3 16:32:13 2012 +1000

    Bump required tp-logger version

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ffd92c745b62faa628b17c8642f97ee596d933e1
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Apr 3 10:41:54 2012 +1000

    Logger support for calls is no longer optional

 configure.ac			     | 35
 -----------------------------------
 libempathy-gtk/empathy-log-window.c | 22 ++++------------------
 libempathy/empathy-message.c	     |	6 +-----
 3 files changed, 5 insertions(+), 58 deletions(-)

commit 86ba5be5fa9a044fbcce6618ac6cd6dd7bdf3482
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Apr 3 10:35:09 2012 +1000

    TplCallEndReason ceased to exist on March 28

 libempathy-gtk/empathy-log-window.c | 11 ++++++-----
 libempathy/empathy-message.c	     |	2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

commit f11ad07acca7b180723aa70c8ffa00aba5b361c1
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Mon Apr 2 16:35:18 2012 +0200

    Updated Galician translations

 po/gl.po | 523
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 264 insertions(+), 259 deletions(-)

commit c7fe1256d9b8690cfd5400af5469586a96094129
Author: Arash Mousavi <amousavi@src.gnome.org>
Date:	Mon Apr 2 18:33:20 2012 +0430

    Updated Persian Translations

 po/fa.po | 826
 ++++++++++++++++++++-------------------------------------------
 1 file changed, 263 insertions(+), 563 deletions(-)

commit 6eb12efbdadf6fe5d12ed789abcf246402b8bc50
Author: Sasi Bhushan <sasi@swecha.net>
Date:	Mon Apr 2 17:57:41 2012 +0530

    Updated Telugu Translation

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

commit 4851668926c7fcba3efe189869998e0d37f20d12
Author: Laurent <lcontzen@gmail.com>
Date:	Sun Apr 1 12:46:21 2012 +0200

    Added support for local IP address and port in SIP account settings
    widget.

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

 libempathy-gtk/empathy-account-widget-sip.c  |  2 +
 libempathy-gtk/empathy-account-widget-sip.ui | 59
 ++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)

commit 381af2aaaa02a905d16c57d294c0cf36073ae802
Author: Sasi Bhushan <sasi@swecha.net>
Date:	Mon Apr 2 16:32:09 2012 +0530

    Updated Telugu Translation

 po/te.po | 279
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 139 insertions(+), 140 deletions(-)

commit 812ecb86b9e0378f4fb0c1a59d663d067e35d136
Author: Laurent <lcontzen@gmail.com>
Date:	Mon Apr 2 11:21:38 2012 +0200

    Tooltip is more usefull when editing status. Fixup

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

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

commit 02ff77d1d5f3545dae75e91fe776930b941e7b08
Merge: 7e7a112 0d03cd1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 2 11:08:17 2012 +0200

    Merge branch 'gnome-3-4'

commit 0d03cd1f3b1d50824db84490ce6fe80e49e5f6b9
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Sat Mar 31 23:08:27 2012 +0200

    goa-mc-plugin: fix variable name

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

 goa-mc-plugin/mcp-account-manager-goa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 12134c4cb2b0b59e01dbbe8932340fb1383a3047
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 2 11:01:18 2012 +0200

    mcp-account-manager-goa: g_key_file_get_keys() expects a gsize

 goa-mc-plugin/mcp-account-manager-goa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fdf86339c44094f4e115283312dcd3f209a9f72b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 2 10:51:43 2012 +0200

    mcp-account-manager-goa: fix shadow variable warnings

 goa-mc-plugin/mcp-account-manager-goa.c | 34
 ++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

commit 99d9177da27ddc4c4aaf5d40a6eae5b458084536
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 2 10:51:43 2012 +0200

    mcp-account-manager-goa: remove unused variables

 goa-mc-plugin/mcp-account-manager-goa.c | 4 ----
 1 file changed, 4 deletions(-)

commit 10791a1b9d93c2870bf8b0a630092b7190f24a5f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 2 10:46:56 2012 +0200

    goa-mc-plugin: build with ERROR_CFLAGS

 goa-mc-plugin/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 7e7a112250b3b22190f8e50f5e34d2cafb60da49
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 30 14:37:27 2012 +0200

    account-dialog: add 'Rename' item to the context menu

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

 src/empathy-accounts-dialog.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

commit bd198afab778a63e7f5d1bbc58419fea06255733
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 30 14:37:09 2012 +0200

    accounts-dialog: keep a pointer on the text renderer

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

 src/empathy-accounts-dialog.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

commit 34d921f36ef396aa81cf6491d932fe51c2a23283
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 30 13:38:21 2012 +0200

    replace Enable/Disable menu items by a check item

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

 src/empathy-accounts-dialog.c | 52
 +++++++++++++------------------------------
 1 file changed, 15 insertions(+), 37 deletions(-)

commit e511539f836d06b5ca05ffabccbce4e432f6b0c7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 28 15:56:28 2012 +0200

    remove empathy_individual_manager_lookup_by_contact()

 libempathy/empathy-individual-manager.c | 52
 ---------------------------------
 libempathy/empathy-individual-manager.h |  4 ---
 2 files changed, 56 deletions(-)

commit 7b79bb85f4ff7693ba24c8a94cdcfd9889b567bd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 28 15:54:45 2012 +0200

    use tpf_persona_dup_for_contact() instead of lookup_by_contact()

    No need to iterate over all the individuals any more.

 libempathy/empathy-utils.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

commit a26b2e0ceff25839270eb5e4b7bfea58ee13ca6f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 28 15:54:17 2012 +0200

    factor out create_individual_from_persona()

 libempathy/empathy-utils.c | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

commit 851f9eea18a264e4f38964720c1368df25300980
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 2 09:28:33 2012 +0200

    Start dev of 3.5

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0c8bf3e4677711439151332937218a3ec71fb39b
Author: Mako N <mako@pasero.net>
Date:	Mon Apr 2 13:10:25 2012 +0900

    [l10n] Update Japanese translation

 help/ja/ja.po | 360
 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 177 insertions(+), 183 deletions(-)

commit 57ca76d73764a6da6c2fd3315fcfa5c16e0b0449
Author: Mako N <mako@pasero.net>
Date:	Mon Apr 2 12:33:43 2012 +0900

    [l10n] Update Japanese translation

 po/ja.po | 288
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 142 insertions(+), 146 deletions(-)

commit 2b16531225ab327275fb180bd83d68a1d4b940fc
Author: Arash Mousavi <amousavi@src.gnome.org>
Date:	Sat Mar 31 15:50:25 2012 +0430

    Updated Persian Translations

 po/fa.po | 4016
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 2122 insertions(+), 1894 deletions(-)

commit 896c18ae0752d945b4826ac5fe636023c27759d6
Author: Andika Triwidada <andika@gmail.com>
Date:	Sat Mar 31 18:15:24 2012 +0700

    [l10n] Updated Indonesian translation

 po/id.po | 3793
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1933 insertions(+), 1860 deletions(-)

commit 92f20f66fc7248364b8df8654ddc933476fb5548
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Mar 29 12:08:40 2012 -0400

    call-window: raise the overlay actor instead of individual actors

    Or the actors will be raised relative to their box, but not
    relative to
    the whole scene.

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

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

commit aa9ae0fbeaa5dc9949e66f5a48b8a611dca0699f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 30 14:00:15 2012 +0200

    use enable_and_connect_account() when enabling an account from
    the menu

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

 src/empathy-accounts-dialog.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 073f8a015a1222455d2d55451c2f246e1dbafcc0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 30 13:59:50 2012 +0200

    factor out enable_and_connect_account()

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

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

commit 02453f3777fb24c7f20ef4d839845c8c16e2e3c1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 30 13:56:01 2012 +0200

    accounts-dialog: no need to connect the account if we are disabling it

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

 src/empathy-accounts-dialog.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

commit a787e76bd5803c0f5821c93cf5203c2c03d45001
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 30 13:44:13 2012 +0200

    accounts_dialog_enable_account_cb: use the usual async cb pattern

    No semantic change.

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

 src/empathy-accounts-dialog.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

commit d1576b8556b86b7eb0ade9c80e2747cfeb44f0c3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 30 13:08:31 2012 +0200

    empathy-accounts: disable 'Enable' menu entry if not supported

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

 src/empathy-accounts-dialog.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

commit a3c14d3f22f4f1a07cf72e3200ac5f1f3b4c843d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 30 12:47:30 2012 +0200

    factor out account_can_be_enabled()

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

 src/empathy-accounts-dialog.c | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

commit e4be0d293f072f7b79720057aced81d8005bf0b2
Author: Changwoo Ryu <cwryu@debian.org>
Date:	Fri Mar 30 03:59:41 2012 +0900

    Updated Korean translation

 po/ko.po | 81
 ++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 40 insertions(+), 41 deletions(-)

commit 481a81f4845ba1ebfe426c5da7c4117a22b77934
Author: Ibrahim Saed <ibraheem5000@gmail.com>
Date:	Thu Mar 29 14:36:46 2012 +0100

    Updated Arabic translation

 po/ar.po | 1224
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 667 insertions(+), 557 deletions(-)

commit b112ea2692ac284cbe3f75ea6e3bbd4b0f9d232f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 29 15:12:10 2012 +0200

    ev-sidebar: use gtk_list_store_insert_with_values()

 src/ev-sidebar.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 813daa2a8e1e5c46afbf01c12d5c989ae74efa34
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 29 15:12:10 2012 +0200

    preferences: use gtk_list_store_insert_with_values()

 src/empathy-preferences.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 07e7bd3fc715b1d6a35cb160abdf2ccc1ea595fa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 29 15:12:10 2012 +0200

    new-chatroom-dialog: use gtk_list_store_insert_with_values()

 src/empathy-new-chatroom-dialog.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 297eb577229dd46d1ed26255908c9802b5267372
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 29 15:12:10 2012 +0200

    import-widget: use gtk_list_store_insert_with_values()

 src/empathy-import-widget.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 2736d7a4010eb83102e4e455a1133487d2612bd4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 29 15:12:10 2012 +0200

    chatrooms-window: use gtk_list_store_insert_with_values()

 src/empathy-chatrooms-window.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 30e1511b7d5ea2e98c948e6a8ffffef937544d6e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 29 15:12:10 2012 +0200

    groups-widget: use gtk_list_store_insert_with_values()

 libempathy-gtk/empathy-groups-widget.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit 97089275ffec48d3da9d585a5389c0893a21fc46
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 29 15:12:10 2012 +0200

    contact-search-dialog: use gtk_list_store_insert_with_values()

 libempathy-gtk/empathy-contact-search-dialog.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 39cc5827bfe5dc0280e0b8a720459b04e613b802
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 29 15:12:10 2012 +0200

    account-widget-sip: use gtk_list_store_insert_with_values()

 libempathy-gtk/empathy-account-widget-sip.c | 33
 ++++++++++++++---------------
 1 file changed, 16 insertions(+), 17 deletions(-)

commit 889cbf11540c152be0e1c2d63758e5da8bd10a5f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 29 14:35:11 2012 +0200

    accounts-dialog: use gtk_list_store_insert_with_values()

    Prevent a crash when using a11y as GTK+ may want to look at the
    content of the
    row as soon it's added. See the bug for details.

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

 src/empathy-accounts-dialog.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

commit 9af483fa1412dcabc982f1908b23c979039f211c
Author: ManojKumar Giri <mgiri@redhat.com>
Date:	Thu Mar 29 14:21:49 2012 +0530

    Updated Odia Translation

 po/or.po | 296
 +++++++++++++++++++++++++--------------------------------------
 1 file changed, 119 insertions(+), 177 deletions(-)

commit 2749949ae7029e05f0f840f9b76507877963ec3d
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Thu Mar 29 09:32:47 2012 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 482
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 244 insertions(+), 238 deletions(-)

commit 158508faf8e61ea2ebeed35cc250f064f4597aee
Author: ManojKumar Giri <mgiri@redhat.com>
Date:	Wed Mar 28 21:15:02 2012 +0530

    Updated Odia Translation

 po/or.po | 1135
 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 496 insertions(+), 639 deletions(-)

commit ba3ffc72a2b424eaa79a94e6a2390b0b5858b867
Merge: 98724db ed85fe7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 28 13:48:38 2012 +0200

    Merge remote-tracking branch 'wjt/652800-661731-notifications'

commit 98724dbfa33099bba07ba8951950a14303e763cc
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Sun Mar 25 13:17:53 2012 +0200

    streamed-media-window: don't leak the element name

    Fixes: https://bugzilla.gnome.org/672796

 src/empathy-streamed-media-window.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit a452a7cfaee6fc192c455410b4e3ea6443162ea3
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Sun Mar 25 12:57:52 2012 +0200

    call-window: don't leak the element name

    Fixes: https://bugzilla.gnome.org/672796

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

commit ed85fe70b223a778b5d7bdca6b4fe8d5ac327959
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Mar 28 10:39:51 2012 +0100

    Move category name constants to #defines

    This is kind of overkill to avoid me typoing the two names used in
    empathy-chat-window.c, but, hey.

 libempathy-gtk/empathy-notify-manager.h | 15 ++++++++++++++
 src/empathy-chat-window.c		 |  4 ++--
 src/empathy-event-manager.h		 |  1 +
 src/empathy-notifications-approver.c	 | 35
 +++++++++++++++------------------
 4 files changed, 34 insertions(+), 21 deletions(-)

commit 9420ba8ea42efb6d5e1e044d68cc1ba571120314
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Mar 28 10:06:14 2012 +0100

    Show MUC highlight notifications in Gnome Shell

    Gnome Shell filters out notifications from Empathy whose category is
    something the Shell shows its own notification for. However, we
    previously used the im.received category for notifications about being
    highlighted in a MUC, as well as for incoming 1-1 IM
    notifications. The
    Shell filters these out these notifications, because it shows its own
    1-1 notifications, but it doesn't show MUC highlight notifications.

    So this patch sets a different category on notifications from chat
    rooms, which makes them show up in Gnome Shell. I'm prefixing the
    category with x-empathy, following the comment above
    get_category_for_event_type in empathy-notifications-approver.c.

    This shouldn't confuse other notification daemons, unless they
    were also
    filtering out im.received but also showed their own highlight
    notifications (which I find unlikely).

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

 src/empathy-chat-window.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit 8ec865b790b07375792a3a6f7c485e1cfcb83253
Author: ManojKumar Giri <mgiri@redhat.com>
Date:	Wed Mar 28 13:45:00 2012 +0530

    Updated Odia Translation

 po/or.po | 6291
 +++++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 4431 insertions(+), 1860 deletions(-)

commit efc40fcec397ee8dee57cd7de43279792f941380
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Mar 27 10:05:58 2012 -0400

    trivial: fix a GCC build warning

 nautilus-sendto-plugin/empathy-nautilus-sendto.c | 1 -
 1 file changed, 1 deletion(-)

commit d9765b15543ac5160a103227452b3cd84fbd143f
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Mar 22 16:36:45 2012 -0400

    call-window: factor out some common code

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

 src/empathy-call-window.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

commit 3873c839159fefbe9001338d6f162b610e4f4284
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Mar 22 16:30:34 2012 -0400

    call-window: don't use EmpathyRoundedActor for the floating toolbar

    Make this a real toolbar, and add a CSS provider to set the correct
    border radius.
    In the future, GTK and Adwaita will support an 'OSD' style class that
    takes care of this automatically, but right now we have add these few
    lines of code.

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

 src/empathy-call-window.c  | 20 ++++++++++++++++++--
 src/empathy-call-window.ui | 36 +++++++-----------------------------
 2 files changed, 25 insertions(+), 31 deletions(-)

commit d9c6227d30e2eb6521421c01f03749e8a4c576e9
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Mar 22 18:25:41 2012 -0400

    call-window: use a ClutterBoxLayout to separate previews/toolbar

    It's way easier to use a ClutterBoxLayout to ensure the preview
    rectangles and the floating toolbar don't overlap.
    This way, we can get rid of some complicated manual UI layouting code
    and just a margin to set the bottom spacing for the floating toolbar.
    Also, this makes the code not dependent on a hardcoded toolbar size
    anymore.

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

 src/empathy-call-window.c | 196
 ++++++++++++++++------------------------------
 1 file changed, 68 insertions(+), 128 deletions(-)

commit 60e0705dd14aff39fc24bb84ba862b7d19e265a6
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Mar 22 16:45:58 2012 -0400

    call-window: fix incorrect comment

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

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

commit 81f4651c54df81345644dd7fb2d88ca7bec8350c
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Mar 22 13:17:33 2012 -0400

    call-window: use colors from the theme for placeholders

    Use color shades from the color theme for preview placeholders,
    instead
    of hardcoding black/red.

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

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

commit 8df3bd2167cc3b0944f07c2843cdce26f81eb7ba
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Mar 22 13:16:33 2012 -0400

    rounded-rectangle: cairo_set_source_rgba() takes [0..1] arguments

    And not [0..255] integers.

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

 src/empathy-rounded-rectangle.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

commit 768f6759733762149f35618f6dfb166d56c9cc6e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 27 14:30:54 2012 +0200

    log-window: use gtk_list_store_insert_with_values()

 libempathy-gtk/empathy-log-window.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit 2a832a3135c17e437ee49420a9738a712c9f9ef6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 27 14:18:01 2012 +0200

    factor out add_event_to_store()

 libempathy-gtk/empathy-log-window.c | 91
 ++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 52 deletions(-)

commit 85bf02f460934eed3ad39bf830c70331a3c76ecc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 27 14:03:07 2012 +0200

    log-window: factor out add_date_if_needed()

    Free a leak as 'text' wasn't freed in the first case.

 libempathy-gtk/empathy-log-window.c | 65
 +++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

commit 5ef40a9e35ff8c558d423e1bb5b48d6554f72f31
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 27 10:28:11 2012 +0200

    import-widget: request the preferred height of the treeview

    We should try to display as much rows as possible.

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

 src/empathy-import-dialog.ui |  3 +--
 src/empathy-import-widget.c  | 10 ++++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

commit 900cbf83e3373abb5143dda986c1a1bced308948
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 27 10:26:58 2012 +0200

    import-widget: don't manually prepare the account manager

    empathy-accounts already does it for us.

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

 src/empathy-import-widget.c | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

commit eb8eb7616bc94544e15da3b81e37b61f26ae45ce
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 27 10:38:15 2012 +0200

    help/.gitignore: use a generic ignore rule

 help/.gitignore | 37 ++-----------------------------------
 1 file changed, 2 insertions(+), 35 deletions(-)

commit a9de9eaf698956ce9810873c2de9c3b9e65b9e52
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Tue Mar 27 10:26:30 2012 +0200

    Updated Basque language

 po/eu.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit b7adc5cf8112de34aad353943f18b541821fdd3d
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Tue Mar 27 10:16:50 2012 +0200

    Updated Basque language

 po/eu.po | 643
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 339 insertions(+), 304 deletions(-)

commit 2142e96c767bcde71255197d8de264303c7dfe26
Author: Changwoo Ryu <cwryu@debian.org>
Date:	Tue Mar 27 01:23:14 2012 +0900

    Updated Korean translation

 po/ko.po | 505
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 271 insertions(+), 234 deletions(-)

commit f4e8098552512199ab2a1f6009e8cd6d15baa11d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 26 15:48:51 2012 +0200

    release.py: update last_tag_pattern

 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 48bc69f502a335a8f69bb37994f719e3483bc3cb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 26 15:48:31 2012 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0fa3313e524628e6f661db96afda26021928da36
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 26 15:39:08 2012 +0200

    prepare 3.4.0

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

commit f03270905ff76dddd6704bdc8fd0282bd582a051
Author: Shaun McCance <shaunm@gnome.org>
Date:	Fri Mar 23 21:16:16 2012 -0400

    Use the correct help: URI syntax

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

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

commit 3a31d6154f64a12f9e10badce48b4d3312a5ec27
Author: Rajesh Ranjan <rranjan@redhat.com>
Date:	Mon Mar 26 14:50:46 2012 +0530

    hindi translation by Chandan Kumar

 po/hi.po | 4847
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 2392 insertions(+), 2455 deletions(-)

commit 4582242a19ae48c64fd2168c0292bc6a4cb42f77
Author: Reşat SABIQ <tilde.birlik@gmail.com>
Date:	Mon Mar 26 03:04:32 2012 -0500

    Updated Crimean Tatar (Crimean Turkish) translation

 po/crh.po | 4123
 ++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 2686 insertions(+), 1437 deletions(-)

commit 1454a06e8110fb41559e5a2f91f50e2b2bb8d4a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 26 09:28:22 2012 +0200

    contact_widget_contact_update: check if widget_avatar is a chooser

    information->widget_avatar can actually be a EmpathyAvatarImage when
    displaying a read only widget.

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

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

commit fe6c5a51bad8f0e4619254eb7c1d7e40a436acd8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 23 11:56:52 2012 +0100

    Update avatar chooser's account if EMPATHY_CONTACT_WIDGET_EDIT_ACCOUNT
    is not set

    We can't rely on the account chooser to do it so we have to do
    it manually.

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

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

commit 1668f347aa125864384deee91b74cc85be781941
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 23 11:55:34 2012 +0100

    contact_widget_contact_update: change 'if else' block to a 'if'
    block inside the 'else'

    No semantic change.

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

 libempathy-gtk/empathy-contact-widget.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

commit 51924be1d13bdcd2379059c0725eb8b92e3b50da
Author: Sasi Bhushan <sasi@swecha.net>
Date:	Sun Mar 25 17:02:36 2012 +0530

    Added Telugu help Translations

 help/Makefile.am |    2 +-
 help/te/te.po	  | 2757
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 2758 insertions(+), 1 deletion(-)

commit 89e8d84d1e7c2414a5a2cc9728a92ddea13ec88e
Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:	Sun Mar 25 14:17:29 2012 +0300

    Updated Latvian translation.

 po/lv.po | 454
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 231 insertions(+), 223 deletions(-)

commit d482be48255efc54bbaaca87a43b92dd64c85dca
Author: Jiro Matsuzawa <jmatsuzawa@src.gnome.org>
Date:	Sun Mar 25 17:27:11 2012 +0900

    Updated Japanese translation.

 po/ja.po | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit b3c8cef72b443cf18f1e954d6d7d1dcfe4f06985
Author: Mako N <mako@pasero.net>
Date:	Sun Mar 25 14:42:33 2012 +0900

    [l10n] Add Japanese translation

 help/Makefile.am |    2 +-
 help/ja/ja.po	  | 3425
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 3426 insertions(+), 1 deletion(-)

commit cd7dbc8e8715264ac7be9a8f916c842cac4650db
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Sun Mar 25 06:41:21 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 727
 +++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 729
 ++++++++++++++++++++++++++++++++----------------------------
 2 files changed, 774 insertions(+), 682 deletions(-)

commit 8fd4104e6c43cb873da5950c9be5b1c9099dd9cf
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	Sat Mar 24 20:18:28 2012 +0100

    [l10n] Updated German translation

 po/de.po | 3933
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 2048 insertions(+), 1885 deletions(-)

commit 4e15af93dc643779b32b6a9989c24f8caa776a1c
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Sat Mar 24 19:30:14 2012 +0200

    Updated Hebrew translation.

 po/he.po | 731
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 387 insertions(+), 344 deletions(-)

commit 0fd5995a431de2efc2b097828dcf18306de1459b
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Sat Mar 24 20:16:09 2012 +0300

    Updated Belarusian translation.

 po/be.po | 760
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 399 insertions(+), 361 deletions(-)

commit 3b4b9f2c205024078b4247716647057386b54413
Author: Mako N <mako@pasero.net>
Date:	Sun Mar 25 01:32:30 2012 +0900

    [l10n] Update Japanese translation

 po/ja.po | 1626
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 849 insertions(+), 777 deletions(-)

commit 3f3ace3a82235fa00ae866b25f447ebc53b1d76d
Author: Sasi Bhushan Boddepalli <sasi@swecha.net>
Date:	Sat Mar 24 15:03:54 2012 +0530

    Updated Telugu Translation

 po/te.po | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

commit 1c514ab32389e1be0793a792d52c4b336dbcd7e9
Author: Sasi Bhushan <sasi@swecha.net>
Date:	Sat Mar 24 13:14:32 2012 +0530

    Updated Telugu translation

 po/te.po | 416
 ++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 187 insertions(+), 229 deletions(-)

commit 137159d72a15df838d07db9f479faa2bb029e12d
Author: Duarte Loreto <happyguy_pt@hotmail.com>
Date:	Sat Mar 24 00:37:02 2012 +0000

    Updated Portuguese translation

 po/pt.po | 4137
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 2206 insertions(+), 1931 deletions(-)

commit 3fdba50cd020a4c26133a534e59aebe2ecd2ec64
Author: Timo Jyrinki <timo@debian.org>
Date:	Fri Mar 23 10:51:38 2012 +0200

    Updated Finnish translation by Jiri Grönroos

 po/fi.po | 1279
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 795 insertions(+), 484 deletions(-)

commit 67102f084b88b294df72e8899f21fe457b2d5ee8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 22 11:30:27 2012 +0100

    roster-window: check which page to display once Folks has finished
    loading

    We should still display the 'no account' page if none is configured or
    enabled.

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

 src/empathy-roster-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 311b718f10b3cf14c7c00da6b6f44e647131f3b3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 22 10:09:34 2012 +0100

    Use help:empathy to open the help

    Looks like the new doc infra uses "help" rather than "ghelp".

    https://bugzilla.gnome.org/show_bug.cgi?id=672596

 libempathy-gtk/empathy-ui-utils.c | 2 +-
 src/empathy-accounts-dialog.c	   | 2 +-
 src/empathy-call-window.c	   | 2 +-
 src/empathy-chat-window.c	   | 2 +-
 src/empathy-roster-window.c	   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

commit 605f872bdc6cc6a1d9534c98054df66e8b6fc964
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 22 10:43:51 2012 +0100

    add translator comment for the sanity-cleaning-number key

    https://bugzilla.gnome.org/show_bug.cgi?id=672608

 data/org.gnome.Empathy.gschema.xml.in | 1 +
 1 file changed, 1 insertion(+)

commit 77f0cc320bf9e0582c3e94bc956e62dfac546db0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 22 09:23:19 2012 +0100

    debug-window: no need to translate the '%s' format

    https://bugzilla.gnome.org/show_bug.cgi?id=672608

 src/empathy-debug-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 26ce92a5591569d70aa96a868f4abfba58fcb7eb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 22 09:22:10 2012 +0100

    account-widget-irc: add translators comment on up/down tooltips

    https://bugzilla.gnome.org/show_bug.cgi?id=672608

 libempathy-gtk/empathy-account-widget-irc.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 3eb4d3b45652d94a25ae696ea3de3377540bf870
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date:	Thu Mar 22 08:46:48 2012 +0100

    Updated Danish translation

 po/da.po | 2584
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1333 insertions(+), 1251 deletions(-)

commit 8c52ddc54b394b38c358d1ae53f2d51dd4105b49
Author: Sweta Kothari <swkothar@redhat.com>
Date:	Thu Mar 22 13:11:42 2012 +0530

    Updated Gujarati Translations

 po/gu.po | 4490
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 2754 insertions(+), 1736 deletions(-)

commit d02681b0e30681593ed54d9faa15826e531b165f
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:	Thu Mar 22 09:12:17 2012 +0700

    Updated Vietnamese translation

 po/vi.po | 243
 +++++++++++++++++++++++++++------------------------------------
 1 file changed, 105 insertions(+), 138 deletions(-)

commit c2125d923836e5e0f13869e2bc99afe86ac36cd5
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:	Thu Mar 22 08:49:38 2012 +0700

    po/vi: import from Damned Lies

 po/vi.po | 4165
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 2252 insertions(+), 1913 deletions(-)

commit b9a7bc3c27fe1421d8d2cc5fffad259336692ae0
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Mar 20 19:00:16 2012 -0400

    accounts-dialog: set a column spacing for the GtkInfoBar grid

    So that the banner is not packed even when the window is at its
    minimum
    size.

    https://bugzilla.gnome.org/show_bug.cgi?id=672504

 src/empathy-accounts-dialog.c | 1 +
 1 file changed, 1 insertion(+)

commit f7dbe93e8270f92795c3079c0b9fcf55082924df
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Mar 20 18:51:54 2012 -0400

    account-widget: set shadow_type=in for advanced scrolled windows

    https://bugzilla.gnome.org/show_bug.cgi?id=672508

 libempathy-gtk/empathy-account-widget-generic.ui | 1 +
 libempathy-gtk/empathy-account-widget-jabber.ui  | 1 +
 libempathy-gtk/empathy-account-widget-sip.ui	  | 1 +
 3 files changed, 3 insertions(+)

commit 34830a9929774d008ec66d1f394497f5ceb900d9
Author: Sasi Bhushan <sasi@swecha.net>
Date:	Wed Mar 21 11:33:16 2012 +0530

    Updated Telugu Translations

 po/te.po | 4158
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 2219 insertions(+), 1939 deletions(-)

commit f39f8a99c3de882a213239a8be4d88c927c14a71
Author: Antonio Fernandes C. Neto <fernandesn@gnome.org>
Date:	Tue Mar 20 02:39:58 2012 -0300

    Updated Brazilian Portuguese translation

 po/pt_BR.po | 281
 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 150 insertions(+), 131 deletions(-)

commit 44684423b656426d814f68a5b0c288ec379cffc0
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Tue Mar 20 21:05:21 2012 +0100

    Updated French translation

 po/fr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 386e0c66657ceb0c0ab2a7d28b7c6482441be9ad
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Tue Mar 20 21:03:49 2012 +0100

    Updated French translation

 po/fr.po | 3971
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 2001 insertions(+), 1970 deletions(-)

commit b42e0a99bb0fea86b0588b42f25d9b7d8d936a10
Author: Automatic Mirroring <aronmalache@gmail.com>
Date:	Tue Mar 20 17:16:04 2012 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

commit 7a49019a75447edb605ffdd5b59d332048682f67
Author: EL8LatSPQ <el8latspq@hotmail.com>
Date:	Tue Mar 20 21:09:08 2012 +0800

    update Simplified Chinese (zh_CN) translation

 po/zh_CN.po | 772
 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 414 insertions(+), 358 deletions(-)

commit d000b82777c055043cc651520a19ed689ae00026
Author: A S Alam <aalam@users.sf.net>
Date:	Tue Mar 20 18:33:36 2012 +0530

    update Punjabi Translation

 po/pa.po | 183
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 96 insertions(+), 87 deletions(-)

commit 5fadaacef38fb75039bb201dc132f71b1ac41267
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 20 10:38:51 2012 +0100

    prepare 3.3.92

 NEWS	      | 68
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 70 insertions(+), 2 deletions(-)

commit 16fa66a69f9348696b8183d44bf54c459934e049
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 20 10:31:23 2012 +0100

    actually check the required clutter-gtk version

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ebc4ffcf20337b12648b83095303b64e2ab6f18a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 20 10:30:31 2012 +0100

    Depend on a specific version of clutter-gst

    Needed as we use the traditionnal gst construction API.

 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 66cea9232193f1cf17515f417d9bdd7e3b4fd10e
Author: Shankar Prasad <svenkate@redhat.com>
Date:	Mon Mar 19 23:51:06 2012 +0530

    Updated Kannada Translation

 po/kn.po | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

commit 211dad649a8528b1d78bdeba54fde9f77d3a4ae7
Author: Shankar Prasad <svenkate@redhat.com>
Date:	Mon Mar 19 18:34:28 2012 +0530

    Updated Kannada Translation

 po/kn.po | 265
 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 122 insertions(+), 143 deletions(-)

commit 7ea4cf785df8bb2c357a8d888c7e65957448591b
Author: Praveen Arimbrathodiyil <pravi.a@gmail.com>
Date:	Mon Mar 19 17:27:50 2012 +0530

    Malayalam translation updated by Sadiq and me

 po/ml.po | 5605
 ++++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 3959 insertions(+), 1646 deletions(-)

commit 726013aa7758b993c9f1452d6ab67f5dccabbf7e
Author: Shankar Prasad <svenkate@redhat.com>
Date:	Mon Mar 19 11:48:00 2012 +0530

    Updated Kannada Translation

 po/kn.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit fc3bdb0ea14615f957fd32c921a390e20446e4d4
Author: Shankar Prasad <svenkate@redhat.com>
Date:	Mon Mar 19 01:14:28 2012 +0530

    Updated Kannada Translation

 po/kn.po | 4750
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 2799 insertions(+), 1951 deletions(-)

commit f6fb907ad5ccbc8036dee9c43c978304d4e6c5eb
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Mar 18 18:43:31 2012 +0100

    [l10n] Updated Italian translation

 po/it.po | 227
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 123 insertions(+), 104 deletions(-)

commit cfc59e899ce3603ed2bd5bfcfaec70b531ad4f8b
Author: Alexander Shopov <ash@kambanaria.org>
Date:	Sun Mar 18 19:11:30 2012 +0200

    Updated Bulgarian translation

 po/bg.po | 267
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 145 insertions(+), 122 deletions(-)

commit 7e8c4ed165c17b6de36f1d840c24688024ee870b
Author: Aurimas Černius <aurisc4@gmail.com>
Date:	Sun Mar 18 17:12:02 2012 +0200

    Updated Lithuanian translation

 po/lt.po | 3438
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1711 insertions(+), 1727 deletions(-)

commit 9f292637de36778a1656e569b9c255b9db577629
Author: Daniel Korostil <ted.korostiled@gmail.com>
Date:	Sun Mar 18 17:05:21 2012 +0200

    Uploaded Ukranian

 po/uk.po | 324
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 180 insertions(+), 144 deletions(-)

commit 8d27b20e3dd818f88e51a3e7823c96aa6bbb8ff8
Author: Marek Černocký <marek@manet.cz>
Date:	Sun Mar 18 14:33:34 2012 +0100

    Updated Czech translation

 po/cs.po | 3182
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1596 insertions(+), 1586 deletions(-)

commit d9945826a187868bbf3072eabcf24d344b29ec8b
Author: Daniel Nylander <po@danielnylander.se>
Date:	Sun Mar 18 10:56:31 2012 +0100

    Updated Swedish translation

 po/sv.po | 1062
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 564 insertions(+), 498 deletions(-)

commit ad1ab6b512ef38d392e05fd95438f516cf5a0e7f
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	Sun Mar 18 10:44:25 2012 +0200

    [l10n] Updated Estonian translation

 po/et.po | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 27efe11cd1f125b4f13f13bf0e08d6030e81852d
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Sat Mar 17 20:47:49 2012 +0100

    Updated Serbian translation

 po/sr.po	| 183
 ++++++++++++++++++++++++++++++---------------------------
 po/sr@latin.po | 183
 ++++++++++++++++++++++++++++++---------------------------
 2 files changed, 194 insertions(+), 172 deletions(-)

commit dd941fc9590e4d4ab2cfb80c69845fb4846142a1
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sat Mar 17 15:15:14 2012 +0100

    Updated Galician translations

 po/gl.po | 162
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 85 insertions(+), 77 deletions(-)

commit 31974087ad5d3051b5855105c28c0d8126174439
Author: Yuri Kozlov <yuray@komyakino.ru>
Date:	Sat Mar 17 13:03:08 2012 +0400

    Updated Russian translation

 po/ru.po | 572
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 303 insertions(+), 269 deletions(-)

commit 57991594e6abe93d26ddfb9eff1e3c6a4e5edcc1
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:	Sat Mar 17 00:18:10 2012 +0100

    [l10n]Updated Catalan (Valencian) translation

 po/ca@valencia.po | 144
 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 76 insertions(+), 68 deletions(-)

commit 87b430cfdc5854183d69dc0f63a9091e9ef0c616
Author: Gil Forcada <gforcada@gnome.org>
Date:	Sat Mar 17 00:18:02 2012 +0100

    [l10n] Updated Catalan translation

 po/ca.po | 144
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 76 insertions(+), 68 deletions(-)

commit fd4cf1d6ba6fd53c2e1e159a8c5fe85fb091b7e0
Author: Wouter Bolsterlee <wbolster@gnome.org>
Date:	Fri Mar 16 22:57:51 2012 +0100

    Updated Dutch translation

 po/nl.po | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

commit b3c655f10c39a6c48bf47d5cfa030280c811d557
Author: Hannie Dumoleyn <hannie@ubuntu-nl.org>
Date:	Fri Mar 16 22:54:01 2012 +0100

    Updated Dutch translation

 po/nl.po | 3386
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1772 insertions(+), 1614 deletions(-)

commit 0124b88b3b36092fffbb6f03fc7a57b4e736c801
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Fri Mar 16 16:12:32 2012 +0100

    Updated Hungarian translation

 po/hu.po | 820
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 410 insertions(+), 410 deletions(-)

commit a95cdbaead3cb54c965d72d74553030ce50172a6
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Fri Mar 16 15:27:12 2012 +0100

    Updated Polish translation

 po/pl.po | 162
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 85 insertions(+), 77 deletions(-)

commit 0bd98e510c9197c16f957c527f5aa1260b92b139
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date:	Fri Mar 16 14:19:28 2012 +0000

    Updated British English translation

 po/en_GB.po | 302
 +++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 168 insertions(+), 134 deletions(-)

commit e09bb98026164813af1a6ce797d381da2dfda32c
Author: Nilamdyuti Goswami <nilamdyuti@gmail.com>
Date:	Fri Mar 16 19:33:19 2012 +0530

    Assamese translation updated

 po/as.po | 167
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 89 insertions(+), 78 deletions(-)

commit dd3c8341b710192f6ab392baf1f7476af9222364
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Fri Mar 16 14:58:22 2012 +0100

    Updated Slovenian translation

 po/sl.po | 166
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 87 insertions(+), 79 deletions(-)

commit 9c920b354384865357088a49e8a749652e814085
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Mar 16 14:14:13 2012 +0100

    Updated Spanish translation

 po/es.po | 167
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 89 insertions(+), 78 deletions(-)

commit 9b093bcdc27390cd78fefc88bf436850a57bce47
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 16 12:43:42 2012 +0100

    Bump Gtk+ dep

    Needed for GTK_STYLE_CLASS_LINKED

 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 7b12eea87d880aa47f7fac77c1a0c0c23cd91330
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Wed Mar 14 17:00:10 2012 +0100

    Fix crash on hangup with no video

    Insufficient refcount on priv->video_preview_sink caused segfaults
    when accessing freed data.

    https://bugzilla.gnome.org/show_bug.cgi?id=672063

 src/empathy-call-window.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 0ff55aa0c6da02366bad86469d431b2b09963170
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 16 11:44:50 2012 +0100

    POTFILES.in: add empathy-calendar-button.c

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit 1e03889e1c6994166f73e83d531103ed5f02ae55
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Thu Mar 15 12:41:11 2012 +0100

    Don't restart a call if one already in progress

    Fixes the crash when calling someone while being already in a call
    with the same contact.

    https://bugzilla.gnome.org/show_bug.cgi?id=671931

 src/empathy-call-window.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

commit ee98d8feb897a7151542cc3998a7e73c86ef86a7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 14 12:17:18 2012 +0100

    contact-widget: right align contact info fields

    https://bugzilla.gnome.org/show_bug.cgi?id=672037

 libempathy-gtk/empathy-contact-widget.c  |  2 +-
 libempathy-gtk/empathy-contact-widget.ui | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

commit 98648871225823cf7ddc11a746185fe9007d6936
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 14 11:57:12 2012 +0100

    contact-widget: don't display the account when editing our info

    All these flags are making this code pretty messy. Hopefully we'll
    move and
    clean it when implementing the new design next cycle.

    https://bugzilla.gnome.org/show_bug.cgi?id=672036

 libempathy-gtk/empathy-contact-widget.c  | 20 +++++++++++++++-----
 libempathy-gtk/empathy-contact-widget.h  |  1 +
 libempathy-gtk/empathy-contact-widget.ui |  2 +-
 src/empathy-accounts-dialog.c		  |  3 ++-
 4 files changed, 19 insertions(+), 7 deletions(-)

commit ede1523b824fef2f72b8d60f4efdf78a4fc4a768
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 14 10:56:49 2012 +0100

    Don't display parameters if Parameters_Exact is not Set

    There is no point cluttering the UI with it as we don't allow user
    to choose
    which param he wants to set.

    https://bugzilla.gnome.org/show_bug.cgi?id=671983

 libempathy-gtk/empathy-contact-widget.c    | 8 ++++++--
 libempathy-gtk/empathy-contactinfo-utils.c | 8 ++++++--
 libempathy-gtk/empathy-contactinfo-utils.h | 3 ++-
 libempathy-gtk/empathy-individual-widget.c | 2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

commit ee6ab13d16db6426e81d7eb00e5bb97cf1f89e2c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 13 17:32:02 2012 +0100

    contact-widget: use EmpathyCalendarButton

    https://bugzilla.gnome.org/show_bug.cgi?id=671981

 libempathy-gtk/empathy-contact-widget.c | 41
 ++++++++++++++-------------------
 1 file changed, 17 insertions(+), 24 deletions(-)

commit f0154b61b01a8cfe1db948126d64508880116fa4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 13 16:08:00 2012 +0100

    add EmpathyCalendarButton

    https://bugzilla.gnome.org/show_bug.cgi?id=671981

 libempathy-gtk/Makefile.am			  |   2 +
 libempathy-gtk/empathy-calendar-button.c	  | 273
 +++++++++++++++++++++++
 libempathy-gtk/empathy-calendar-button.h	  |  68 ++++++
 tests/interactive/.gitignore			  |   1 +
 tests/interactive/Makefile.am			  |   4 +-
 tests/interactive/test-empathy-calendar-button.c |  72 ++++++
 6 files changed, 419 insertions(+), 1 deletion(-)

commit 706a49f918e7ae2b0cd8acef45b7cde21f625571
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	Fri Mar 16 09:57:15 2012 +0200

    [l10n] Updated Estonian translation

 po/et.po | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

commit c15498269c22d28996edb42465e9f1e9fddd4da4
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:	Thu Mar 15 23:40:36 2012 +0100

    [l10n]Updated Catalan (Valencian) translation

 po/ca@valencia.po | 4149
 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 2193 insertions(+), 1956 deletions(-)

commit 31c1fff166de7ecd48586327c8adbffc682f15e4
Author: Gil Forcada <gforcada@gnome.org>
Date:	Thu Mar 15 23:40:27 2012 +0100

    [l10n]Updated Catalan translation

 po/ca.po | 4137
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 2193 insertions(+), 1944 deletions(-)

commit 1146d93912bb4374bf2b391e71584bcef1da3df6
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Tue Mar 13 15:55:08 2012 +0100

    Disconnect when a call is ENDED

    If for some unspecified reason a call go to the TP_CALL_STATE_ENDED
    state, reinitialize the call window.

    https://bugzilla.gnome.org/show_bug.cgi?id=671931

 src/empathy-call-window.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit f17b4a2962cdc74a3fc2e410b5885ae96e3ed4e4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 15 16:02:27 2012 +0100

    reload the account widget when connection is (dis)connected

    https://bugzilla.gnome.org/show_bug.cgi?id=671035

 src/empathy-accounts-dialog.c | 45
 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

commit a3c10ee7b1801aa50293bf85bf845f5110005bf1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 15 16:03:20 2012 +0100

    create_dialog_content: check if the TpConnection is still valid

    tp_connection_get_contacts_by_handle() will raise a warning if the
    TpConnection has been invalidated.

    https://bugzilla.gnome.org/show_bug.cgi?id=671035

 src/empathy-accounts-dialog.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 500ef8529e04b2e1606f35d9c0697ef96423a828
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 15 14:55:39 2012 +0100

    factor out account_is_selected()

    https://bugzilla.gnome.org/show_bug.cgi?id=671035

 src/empathy-accounts-dialog.c | 43
 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

commit c8deddf06929e68ef34b6354aa10cf5c04dbd137
Author: A S Alam <aalam@users.sf.net>
Date:	Thu Mar 15 19:55:57 2012 +0530

    update Punjabi Translation

 po/pa.po | 5926
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 5224 insertions(+), 702 deletions(-)

commit ea03eda8350a4245d2a04c76041e4c2d3e7efc29
Author: Nilamdyuti Goswami <nilamdyuti@gmail.com>
Date:	Thu Mar 15 18:15:41 2012 +0530

    Assamese translation updated

 po/as.po | 154
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 83 insertions(+), 71 deletions(-)

commit 95e7ebd8986b338167c76f51bf6f4b16d43f5123
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Thu Mar 15 11:07:52 2012 +0100

    Updated Serbian translation

 po/sr.po	| 154
 +++++++++++++++++++++++++++++++--------------------------
 po/sr@latin.po | 154
 +++++++++++++++++++++++++++++++--------------------------
 2 files changed, 166 insertions(+), 142 deletions(-)

commit fa3199f694e274e3d9e33406699a78a62858a97b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 15 10:38:00 2012 +0100

    sanity-cleaning: set fallback-servers on Facebook accounts

    https://bugzilla.gnome.org/show_bug.cgi?id=672120

 src/empathy-sanity-cleaning.c | 43
 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

commit 94520441d0d22f6fc8361770f66c1a1ac27e011c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 15 10:25:24 2012 +0100

    Set chat.facebook.com:443 as fallback server

    Some nasty firewalls block the port 5222, Facebook servers allow
    connection to
    the port 443 as a fallback in this case.

    https://bugzilla.gnome.org/show_bug.cgi?id=672120

 goa-mc-plugin/mcp-account-manager-goa.c   | 2 ++
 libempathy-gtk/empathy-protocol-chooser.c | 6 ++++++
 2 files changed, 8 insertions(+)

commit fe2da138c66af8521013de1c7f4aa97053b87456
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 15 10:19:58 2012 +0100

    goa plugin: set chat.facebook.com as 'server' param

    chat.facebook.com doesn't have a _xmpp-client._tcp SRV record.

    https://bugzilla.gnome.org/show_bug.cgi?id=672120

 goa-mc-plugin/mcp-account-manager-goa.c | 1 +
 1 file changed, 1 insertion(+)

commit 5678b2eb5d18da99bc03bc4c57c93b726c164dc9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 15 08:52:19 2012 +0100

    Free the GError in Geoclue callbacks

 libempathy-gtk/empathy-location-manager.c | 4 ++++
 1 file changed, 4 insertions(+)

commit d6edab79ba1b0f8037f6c42e92ef98b0cdaaa843
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 14 15:42:05 2012 +0100

    location-manager: use geoclue_master_client_create_address_async()

    https://bugzilla.gnome.org/show_bug.cgi?id=671994

 libempathy-gtk/empathy-location-manager.c | 37
 ++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 13 deletions(-)

commit 3c6503936ec6703ef4c421d4ef3f30d140c4e114
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 14 15:42:05 2012 +0100

    location-manager: use geoclue_master_client_create_position_async()

    https://bugzilla.gnome.org/show_bug.cgi?id=671994

 libempathy-gtk/empathy-location-manager.c | 34
 +++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 11 deletions(-)

commit 8eb401d562b29f195d68ca04e3dfbf8adc501846
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 14 15:42:05 2012 +0100

    location-manager: use geoclue_master_client_set_requirements_async()

    https://bugzilla.gnome.org/show_bug.cgi?id=671994

 libempathy-gtk/empathy-location-manager.c | 71
 +++++++++++++++++++------------
 1 file changed, 44 insertions(+), 27 deletions(-)

commit 4bfb1d6bf59735b088e3daae5158203454fd23ba
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 14 15:42:05 2012 +0100

    location-manager: use geoclue_master_create_client_async()

    https://bugzilla.gnome.org/show_bug.cgi?id=671994

 libempathy-gtk/empathy-location-manager.c | 39
 +++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 12 deletions(-)

commit f2d951772c8d1d00b7159dc8942c7593c476f29b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 14 15:41:41 2012 +0100

    Bump geoclue dep

    We need 0.12 for the shiny new async API.

    https://bugzilla.gnome.org/show_bug.cgi?id=671994

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ad01157648d24f0786bc6d5fcfe08e46916f4408
Author: A S Alam <aalam@users.sf.net>
Date:	Thu Mar 15 06:18:52 2012 +0530

    update Punjabi Translation

 po/pa.po | 5861
 ++++++++------------------------------------------------------
 1 file changed, 700 insertions(+), 5161 deletions(-)

commit 29b80fa63b1f4a2a0418586bbbdada96f3913f3f
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Wed Mar 14 23:07:27 2012 +0100

    Updated Galician translations

 po/gl.po | 198
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 112 insertions(+), 86 deletions(-)

commit 1d4e4c81844c1fc65de9c68bfa702bc937d3d757
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Wed Mar 14 21:07:39 2012 +0100

    Updated Polish translation

 po/pl.po | 60
 +++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 25 deletions(-)

commit a3bc06446bc5a93c6ad3b01516cb3e909aa59790
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Mar 14 17:27:58 2012 +0100

    Updated Spanish translation

 po/es.po | 154
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 83 insertions(+), 71 deletions(-)

commit 49bef087c18f60b0eeb2b188fec1b3503d548a98
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Wed Mar 14 15:38:25 2012 +0100

    Updated Slovenian translation

 po/sl.po | 156
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 84 insertions(+), 72 deletions(-)

commit df7155a95c3733054547a49701c684852522536a
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Wed Mar 14 10:10:22 2012 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 117
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 68 insertions(+), 49 deletions(-)

commit c8576fca2f6b4100d4101e9cdb983a53079c9457
Merge: bda7e5e e72f870
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 14 10:04:54 2012 +0100

    Merge remote-tracking branch 'em/trivia'

commit bda7e5e1bed8c021630ec869caeea083deeb95ad
Merge: c236099 df99b53
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Mar 14 09:11:17 2012 +1100

    Merge remote-tracking branch 'gulic/buttons-668464'

commit c2360999002db462ce466277ab821ad075737db8
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Tue Mar 13 21:47:12 2012 +0100

    [l10n] Updated Italian translation

 po/it.po | 2796
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1527 insertions(+), 1269 deletions(-)

commit 6cbad880f894748e6defa9c9b9eecc7087e34472
Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:	Tue Mar 13 22:31:51 2012 +0200

    Updated Latvian translation.

 po/lv.po | 3101
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1566 insertions(+), 1535 deletions(-)

commit e72f870d393812797c1543d47b53611532284944
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Tue Mar 13 16:57:27 2012 +0100

    Fix GST_PLUGIN_LOADING_WHITELIST in HACKING

    Empathy *needs* the Farstream Gstreamer elements and also cutting
    out gst-plugins-[bad|ugly] is not a good idea as they contain many
    useful codecs.

 HACKING | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ec81f8f8d2151d59cf686a72edd6fd132f2a0077
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Tue Mar 13 15:36:22 2012 +0100

    Updated Polish translation

 po/pl.po | 53 +++++++++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 24 deletions(-)

commit 3a6dcf0a014a93d5881d8ae97b7bf86633ac36ce
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	Tue Mar 13 14:04:06 2012 +0200

    [l10n] Updated Estonian translation

 po/et.po | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

commit f6539f8868bb40842ffe018662112e236b72fd24
Merge: 8daec65 a1461f4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 13 11:31:50 2012 +0100

    Merge remote-tracking branch 'em/trivia'

commit a1461f4f6185a2a17f6e5e80924107fc9fc4bded
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Tue Mar 13 10:59:48 2012 +0100

    Explain how to load custom GStreamer plugins

 HACKING | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit 8daec6589cf7dbd0be2c4f6548234d48d0f5b44a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 12 15:23:30 2012 +0100

    individual-menu: only use 'gnome-contacts' with individuals from Folks

    https://bugzilla.gnome.org/show_bug.cgi?id=671884

 libempathy-gtk/empathy-individual-menu.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

commit 46c6f5229b55a9ce274fc9f420f30d217a946541
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 12 15:28:58 2012 +0100

    Revert "remove empathy-individual-information-dialog"

    This reverts commit 8c56829f3fa97640abf47ced7d39aa618fffe07f.

    https://bugzilla.gnome.org/show_bug.cgi?id=671884

 libempathy-gtk/Makefile.am			    |	2 +
 .../empathy-individual-information-dialog.c	    | 318
 +++++++++++++++++++++
 .../empathy-individual-information-dialog.h	    |  60 ++++
 po/POTFILES.in					    |	1 +
 4 files changed, 381 insertions(+)

commit 6b4e3ef8409dd58d635d94bb3a2c462b93be1ef7
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Tue Mar 13 08:44:46 2012 +0100

    Updated Serbian translation

 po/sr.po	| 273
 ++++++++++++++++++++++++++++++---------------------------
 po/sr@latin.po | 273
 ++++++++++++++++++++++++++++++---------------------------
 2 files changed, 288 insertions(+), 258 deletions(-)

commit df99b53de13a365945909d3f0cafda0b22aa1974
Author: Jovanka Gulicoska <jovanka.gulicoska@gmail.com>
Date:	Tue Mar 13 04:12:16 2012 +0100

    Toolbar and Treeview merged

 libempathy-gtk/empathy-account-widget-irc.ui | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

commit 21e022e89b42df19f71bfe48fd4aa641fee20bf6
Author: Jovanka Gulicoska <jovanka.gulicoska@gmail.com>
Date:	Wed Jan 25 04:42:02 2012 +0100

    Remove size group from Blocked Contacts dialog

 libempathy-gtk/empathy-contact-blocking-dialog.ui | 6 ------
 1 file changed, 6 deletions(-)

commit 3bb706a822811e9faef775d4e8fc9c0cc9c5d650
Author: Jovanka Gulicoska <jovanka.gulicoska@gmail.com>
Date:	Fri Jan 27 17:16:23 2012 +0100

    Server field expanded

 libempathy-gtk/empathy-irc-network-dialog.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 9f6c17e462e1c9d2c2833c1c863d7619997f5fc6
Author: Djavan Fagundes <djavanf@gnome.org>
Date:	Fri Mar 9 11:06:49 2012 -0300

    Updated Brazilian Portuguese translation by Antonio Fernandes C. Neto
    <fernandesn@gnome.org> and myself

 po/pt_BR.po | 2548
 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 1264 insertions(+), 1284 deletions(-)

commit 94c6c87586e1f9c495dc73f3df3144e28cef3dcd
Author: Alexander Shopov <ash@kambanaria.org>
Date:	Mon Mar 12 20:26:08 2012 +0200

    Updated Bulgarian translation

 po/bg.po | 312
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 163 insertions(+), 149 deletions(-)

commit b98c27f582b1e7b4c875407a79a7e442df27e74a
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Mon Mar 12 18:26:21 2012 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 611
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 320 insertions(+), 291 deletions(-)

commit 0b6c6760f9470b80a919d1f6ff8d59af5a5b3f1b
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Mon Mar 12 17:04:43 2012 +0100

    Updated Polish translation

 po/pl.po | 61
 +++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 37 insertions(+), 24 deletions(-)

commit 8ea14343d9ff802d5db7f9d082993da8a94df20f
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Mon Mar 12 17:00:18 2012 +0100

    Updated POTFILES.in

 po/POTFILES.in | 1 -
 1 file changed, 1 deletion(-)

commit 6f1875780e1e1b62cdca1251e1dc32ec74a01886
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Mon Mar 12 15:26:41 2012 +0100

    Updated Slovenian translation

 po/sl.po | 48 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 17 deletions(-)

commit 0528641e7369746002fa9aaf46307bb213e7bb9b
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Mar 12 14:17:45 2012 +0100

    Updated Spanish translation

 po/es.po | 273
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 144 insertions(+), 129 deletions(-)

commit f09a916859988f6a45ec5fc21ef7534ebaf2a31c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 12 13:52:38 2012 +0100

    remove empathy-tp-contact-list

 libempathy-gtk/empathy-contact-blocking-dialog.c |    2 -
 libempathy/Makefile.am				  |    2 -
 libempathy/empathy-tp-contact-list.c		  | 1226
 ----------------------
 libempathy/empathy-tp-contact-list.h		  |   59 --
 4 files changed, 1289 deletions(-)

commit 19f191b4975baa7e284e2aca56abb9d123f4ef37
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 12 13:52:06 2012 +0100

    connection-managers: stop using tp_connection_manager_is_ready()

    It has been deprecated.

 libempathy/empathy-connection-managers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b0a1fc13b338363066e0ad257e214144be59a76a
Author: Nilamdyuti Goswami <nilamdyuti@gmail.com>
Date:	Mon Mar 12 18:15:29 2012 +0530

    Assamese translation completed

 po/as.po | 366
 ++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 162 insertions(+), 204 deletions(-)

commit 889e9be8f513d2b8b7124b628013d7f3f0d5cdd4
Author: Emanuele Aina <em@nerd.ocracy.org>
Date:	Fri Mar 9 16:52:11 2012 +0100

    Avoid clipping buttons in the call window

    Also try to set a transparent background on the GtkBin inside
    GtkClutteActors, but for some reason it's not working here.

    https://bugzilla.gnome.org/show_bug.cgi?id=671718

 src/empathy-call-window.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

commit 1413b47d30284825bc81ed606c458a5fa60f830f
Merge: afcd810 6fe60c8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 12 13:02:18 2012 +0100

    Merge remote-tracking branch 'em/fix-highlight-roundedness-671720'

commit afcd81098a2134d1421844ebf37a9ba90e1193bf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 12 12:56:32 2012 +0100

    early return if accounts_dialog_model_get_selected_settings()
    returns NULL

    It can happen, typically if no account is currently selected.

    https://bugzilla.gnome.org/show_bug.cgi?id=671790

 src/empathy-accounts-dialog.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 6fe60c87090fe013d7b803eb82a3ddb9568eccb9
Author: Emanuele Aina <em@nerd.ocracy.org>
Date:	Fri Mar 9 08:58:16 2012 +0100

    Match the preview highlight roundedness with the video

    https://bugzilla.gnome.org/show_bug.cgi?id=671720

 src/empathy-call-window.c	 | 35 +++++++++++++++++++----------------
 src/empathy-rounded-actor.c	 | 11 ++++-------
 src/empathy-rounded-actor.h	 |  5 +----
 src/empathy-rounded-rectangle.c | 29 +++++++++++++++++------------
 src/empathy-rounded-rectangle.h |  5 +++--
 5 files changed, 44 insertions(+), 41 deletions(-)

commit 532a1f7c653866c50589d37fb20b13e1f71738cf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 9 09:21:40 2012 +0100

    rounded-rectangle: use the 'draw' signal

    Looks like that's the right way to do it since Clutter 1.8

    https://bugzilla.gnome.org/show_bug.cgi?id=669673

 configure.ac			 |  6 +++---
 src/empathy-rounded-rectangle.c | 29 ++++++++++++++++++++---------
 2 files changed, 23 insertions(+), 12 deletions(-)

commit 48370f1bead25fff25e3694f4e87d0b33068fdb3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 7 11:04:18 2012 +0100

    Make use of new Clutter macros to check API we are using

    https://bugzilla.gnome.org/show_bug.cgi?id=669673

 configure.ac | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 75a991eddf0106916146c30756274bbbd03c5904
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Mon Mar 12 10:35:20 2012 +0100

    Mark strings for
    translation. https://bugzilla.gnome.org/show_bug.cgi?id=671875

 libempathy/empathy-keyring.c | 8 +++++---
 po/POTFILES.in		      | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

commit 460fd88a38686b49c374830e0c066dee452cec50
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 12 11:05:40 2012 +0100

    add missing config.h in tests

 tests/empathy-live-search-test.c | 2 ++
 tests/empathy-parser-test.c	  | 2 ++
 2 files changed, 4 insertions(+)

commit 53b7ccf3705522992f3283e38caf12285f06d5d5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 12 11:05:15 2012 +0100

    update help/.gitignore

 help/.gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 7a7dfce6fd9e46b3a33aff4639407e586fe80a23
Author: Timo Jyrinki <timo@debian.org>
Date:	Mon Mar 12 10:56:45 2012 +0200

    Finnish translation update from
    http://l10n.laxstrom.name/wiki/Gnome_3.4 translation sprint

 po/fi.po | 4161
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1883 insertions(+), 2278 deletions(-)

commit 10f0454af05160f833d9dd8725bc52afc6d75619
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Mar 12 09:39:34 2012 +0100

    Revert dependency on champlain 0.14 to 0.12

    As there is likely no 0.14 for gnome 3.4 and there isn't actually any
    real change in 0.14 revert to checking for 0.12

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 96b027be0450a7e30173c45b44f81e62662fcf14
Author: Sjoerd Simons <sjoerd@luon.net>
Date:	Sun Mar 11 23:47:59 2012 +0100

    Don't use both AM_GNU_GETTEXT and IT_PROG_INTLTOOL

    When using IT_PROG_INTLTOOL using the gettect automake macros isn't
    necessary. To make matters worse, when mixing the marcos both try to
    generate po/Makefile.in.in. Recent versions of intltool detect when
    gettext won and bails when building.

 configure.ac | 3 ---
 1 file changed, 3 deletions(-)

commit 8b88ebc132dc9c026d3beb377a20616c8ec81021
Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:	Mon Mar 12 00:21:54 2012 +0200

    Updated Latvian translation.

 po/lv.po | 198
 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 92 insertions(+), 106 deletions(-)

commit 6e8d8160c7995b390dbfbe28261261084df95154
Author: Viesturs Ružāns <viesty@exs.lv>
Date:	Mon Mar 12 00:20:10 2012 +0200

    Updated Latvian translation for help.

 help/lv/lv.po | 5135
 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 2679 insertions(+), 2456 deletions(-)

commit 44c8e3aab4045961418bc626a00b013327918ea3
Author: Viesturs Ružāns <viesty@exs.lv>
Date:	Mon Mar 12 00:02:46 2012 +0200

    Added Latvian translation for help.

 help/Makefile.am |    2 +-
 help/lv/lv.po	  | 3358
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 3359 insertions(+), 1 deletion(-)

commit 5c4cd0ce78ee384d1eadd092a536b62d028315bb
Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:	Sun Mar 11 23:58:31 2012 +0200

    Updated Latvian translation.

 po/lv.po | 2240
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 1254 insertions(+), 986 deletions(-)

commit 45908411f226ad86c66549681fe4128b89c46550
Author: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>
Date:	Sun Mar 11 11:30:10 2012 +0100

    Updated Esperanto translation

 po/eo.po | 3942
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1981 insertions(+), 1961 deletions(-)

commit d8818a99a3e46a891da2bbe90c05039b732efb2b
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Sat Mar 10 23:07:01 2012 +0100

    Updated Serbian translation

 po/sr.po	| 766
 +++++++++++++++++++++++++++++++--------------------------
 po/sr@latin.po | 766
 +++++++++++++++++++++++++++++++--------------------------
 2 files changed, 846 insertions(+), 686 deletions(-)

commit 0a63acaf42e205aa2447f1aadb4d4d49b0de4f0d
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Sat Mar 10 18:29:11 2012 +0100

    Updated Polish translation

 po/pl.po | 3825
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1909 insertions(+), 1916 deletions(-)

commit d35a38e25484c452bc05d71d7ffd0f0b60b48715
Author: Seong-ho Cho <darkcircle.0426@gmail.com>
Date:	Sat Mar 10 16:50:46 2012 +0900

    Updated Korean translation

 po/ko.po | 3738
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1860 insertions(+), 1878 deletions(-)

commit ab869dcdf44d8c2f4f54884149d7dd71531b3028
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	Fri Mar 9 18:18:11 2012 +0200

    [l10n] Updated Estonian translation

 po/et.po | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

commit 10990e3efb856060a6893a77d3b15790ca08f286
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date:	Fri Mar 9 13:44:36 2012 +0000

    Updated British English translation

 po/en_GB.po | 4029
 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 2127 insertions(+), 1902 deletions(-)

commit b6b101f9cc8a355b8df4d1e469840d1002207da7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 9 10:46:04 2012 +0100

    individual-store-manager: always display individual's alias in
    debug messages

    It's much more useful that just the ID.

 libempathy-gtk/empathy-individual-store-manager.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

commit 018480bfd25b57c8136e5b6825937e8051a2cded
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 9 10:37:14 2012 +0100

    individual_personas_changed_cb: remove debug message

    The individual manager already sends the exact same debugging message.

 libempathy-gtk/empathy-individual-store.c | 3 ---
 1 file changed, 3 deletions(-)

commit 054ec3b5a0cd588a577d36a62be0aa251707aaa6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 9 10:34:16 2012 +0100

    Don't flood logs when individials don't have avatars

 libempathy-gtk/empathy-individual-store.c | 12 +++++++++---
 libempathy-gtk/empathy-ui-utils.c	   |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

commit 5127a611e09af16d0cf435e659d0448e2791c494
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 9 10:23:51 2012 +0100

    Remove flooding debug messages

    Those messages flood the debug window and never helped me finding
    any bug.

 libempathy-gtk/empathy-individual-store.c | 25 -------------------------
 libempathy-gtk/empathy-individual-view.c  |  2 --
 2 files changed, 27 deletions(-)

commit 1dc974bb9620f95d5c3c758f54a97f3c68263aee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 7 15:59:17 2012 +0100

    video-widget: don't set priv->sink_pad twice

    The first value was never used and overrided a few lines below.

    https://bugzilla.gnome.org/show_bug.cgi?id=670745

 src/empathy-video-widget.c | 2 --
 1 file changed, 2 deletions(-)

commit 2ca7e0fd3e98e4813e2dba5090577759a66542fa
Author: Emanuele Aina <em@nerd.ocracy.org>
Date:	Thu Mar 8 14:40:54 2012 +0100

    Don't clip overflowing border when drawing rounded rectangles

    https://bugzilla.gnome.org/show_bug.cgi?id=671644

 src/empathy-call-window.c	 |  2 +-
 src/empathy-rounded-rectangle.c | 30 ++++++++++++++++++++++--------
 2 files changed, 23 insertions(+), 9 deletions(-)

commit 06206fe711b721c6f33af4d4914c76cac540eda6
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	Thu Mar 8 21:15:11 2012 +0100

    Updated Slovenian translation

 help/sl/sl.po | 3564
 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 1829 insertions(+), 1735 deletions(-)

commit 66fabbc19bc51155ca293ad560c8fecbc8addf14
Author: Daniel Korostil <ted.korostiled@gmail.com>
Date:	Thu Mar 8 21:39:06 2012 +0200

    Uploaded Ukranian

 po/uk.po | 3520
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1823 insertions(+), 1697 deletions(-)

commit 33376e5075b4fb099dee8ec6bf4f7a1c81741b82
Author: Nilamdyuti Goswami <nilamdyuti@gmail.com>
Date:	Thu Mar 8 18:54:40 2012 +0530

    Assamese translation completed

 po/as.po | 4146
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 2212 insertions(+), 1934 deletions(-)

commit 66055e1a24adf38251805022bcf3509ccc5a757a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 19 12:59:55 2010 +0200

    empathy_gtk_init: add local copy of icons to the search path (#616159)

 libempathy-gtk/empathy-ui-utils.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 80eac7fd3c665f7960f07f9a8aaddbff8f4f9467
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Mon Apr 19 12:59:16 2010 +0200

    "Build" a local copy of the icons to be used from sources

    https://bugzilla.gnome.org/show_bug.cgi?id=616159

 data/.gitignore	|  1 +
 data/icons/Makefile.am | 30 ++++++++++++++++++++++++++++++
 data/icons/utils.mk	| 11 +++++++++++
 3 files changed, 42 insertions(+)

commit 4c1b102df95e07a4469bbfb38fbc8ef190458a79
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Wed Mar 7 23:27:09 2012 +0300

    Updated Belarusian translation.

 po/be.po | 209
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 110 insertions(+), 99 deletions(-)

commit 9033309c2615aa476d201c045993537cc02f1433
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Wed Mar 7 18:38:11 2012 +0100

    Updated Slovenian translation

 po/sl.po | 816
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 446 insertions(+), 370 deletions(-)

commit 4950a02c1207ff975abc4540c572264446a90888
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Wed Mar 7 18:21:36 2012 +0400

    Updated Russian translation

 po/ru.po | 700
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 388 insertions(+), 312 deletions(-)

commit 593355dd0dda4f3aeceee12f5608bdff3682d392
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Mar 7 13:02:15 2012 +0000

    MUC: make F9 toggle the contact list sidebar

    This is by analogy to F9 toggling the sidebar in Nautilus.

    https://bugzilla.gnome.org/show_bug.cgi?id=671547

 src/empathy-chat-window.ui | 1 +
 1 file changed, 1 insertion(+)

commit 2820631e39f9c26b96b01422865c162cd2fc087f
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Wed Mar 7 12:52:15 2012 +0100

    Updated Galician translations

 po/gl.po | 439
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 226 insertions(+), 213 deletions(-)

commit 74fcb7a804d072361051faaa884ef6071edea65a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 7 11:04:18 2012 +0100

    Make use of new GLib macros to check API we are using

 configure.ac		       | 10 ++++------
 libempathy-gtk/empathy-chat.c |  3 ++-
 2 files changed, 6 insertions(+), 7 deletions(-)

commit 608d11794fbf61068c5b02954b4732f84c39449a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 7 11:04:28 2012 +0100

    add missing config.h includes

 libempathy/empathy-connection-managers.c | 1 +
 libempathy/empathy-ft-handler.c	  | 2 ++
 libempathy/empathy-presence-manager.c	  | 4 ++--
 libempathy/empathy-server-sasl-handler.c | 2 ++
 libempathy/empathy-server-tls-handler.c  | 2 ++
 src/empathy-call-factory.c		  | 1 +
 src/empathy-call-handler.c		  | 1 +
 src/empathy-streamed-media-factory.c	  | 1 +
 src/empathy-streamed-media-handler.c	  | 1 +
 src/empathy-video-src.c		  | 1 +
 10 files changed, 14 insertions(+), 2 deletions(-)

commit e96e1ffc1f42d3b9e1c8d79884eb679737c758d9
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Mar 7 11:34:09 2012 +0100

    Updated Spanish translation

 po/es.po | 772
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 426 insertions(+), 346 deletions(-)

commit 489447bafb230e4a2c11460377ec255ede27713e
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Wed Mar 7 11:29:09 2012 +0100

    Updated Basque language

 po/eu.po | 260
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 135 insertions(+), 125 deletions(-)

commit 75b8c79344484b3c16ec1a009ff7863f8535b850
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 7 11:04:18 2012 +0100

    Make use of new GTK+ macros to check API we are using

 configure.ac | 4 ++++
 1 file changed, 4 insertions(+)

commit cb5ec84a12bceba7c558fcc1c23570856ed0c4ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 7 11:04:28 2012 +0100

    add missing config.h includes

 libempathy-gtk/empathy-contact-chooser.c  | 2 ++
 libempathy-gtk/empathy-share-my-desktop.c | 2 ++
 src/empathy-chat-manager.c		   | 2 ++
 src/empathy-invite-participant-dialog.c   | 2 ++
 4 files changed, 8 insertions(+)

commit a0e4dc265dc0917ec0cfc637a425327e12623dff
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 7 10:51:06 2012 +0100

    stop using gtk_vscale_new_with_range()

    gtk_scale_new_with_range() has been introduced in GTK+ 3.0 so
    we're good.

 src/empathy-streamed-media-window.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit aa30262a8fb267ffc655f6a1a990a0be3367629e
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Wed Mar 7 10:19:11 2012 +0100

    Updated Hungarian translation

 po/hu.po | 4155
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 2232 insertions(+), 1923 deletions(-)

commit db7a43152a7e72f347fc2c43e00f21af0b362009
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Tue Mar 6 15:35:52 2012 +0100

    Updated Hungarian help translation

 help/hu/hu.po | 5348
 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 2814 insertions(+), 2534 deletions(-)

commit 1657e19e77ab528de69b2a31dcfb069cc92329b8
Author: Alexander Shopov <ash@kambanaria.org>
Date:	Wed Mar 7 07:11:28 2012 +0200

    Updated Bulgarian translation

 po/bg.po | 703
 ++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 427 insertions(+), 276 deletions(-)

commit edd67f53312b48cfec2e471cad911c88ae3a99a2
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Tue Mar 6 22:01:25 2012 +0100

    Updated Galician translations

 po/gl.po | 968
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 516 insertions(+), 452 deletions(-)

commit abc62610c0aba83f1f0d507f1322b85623b91c84
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 6 16:38:43 2012 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9403397dda262e4ca17170537c33987ab305c127
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 6 16:29:33 2012 +0100

    prepare 3.3.91

 NEWS	      | 17 +++++++++++++++++
 configure.ac |  6 +++---
 2 files changed, 20 insertions(+), 3 deletions(-)

commit 27adcb4435db170420010f9dc94f2d6febed74e5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 6 15:28:56 2012 +0100

    sanity-cleaning: fix xmpp accounts having a negative priority

    https://bugzilla.gnome.org/show_bug.cgi?id=671452

 src/empathy-sanity-cleaning.c | 64
 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

commit c69625323288a119356bb6627c00f21a74f32f24
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 6 15:08:03 2012 +0100

    Add magic to automatically run tasks when empathy-auth-client
    is started

    empathy-auth-client is the best place to do such tasks as it will
    be run even
    if using only the Shell without Empathy's UI.

    https://bugzilla.gnome.org/show_bug.cgi?id=671452

 data/org.gnome.Empathy.gschema.xml.in |  5 ++
 libempathy/empathy-gsettings.h        |  1 +
 src/Makefile.am		       |  1 +
 src/empathy-auth-client.c	       |  3 ++
 src/empathy-sanity-cleaning.c	       | 89
 +++++++++++++++++++++++++++++++++++
 src/empathy-sanity-cleaning.h	       | 27 +++++++++++
 6 files changed, 126 insertions(+)

commit aeab15ec37370f3c3aa8b4e1a4aec480109a6803
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date:	Tue Mar 6 00:04:51 2012 +0100

    Run from the source directory without installing

    Use the tools/empathy-env wrapper to set an appropriate environment
    and launch the compiled programs without installing them.

    https://bugzilla.gnome.org/show_bug.cgi?id=671447

 HACKING	      | 8 ++++----
 data/.gitignore      | 1 +
 data/Makefile.am     | 8 ++++++++
 tools/.gitignore     | 1 +
 tools/Makefile.am    | 7 ++++++-
 tools/empathy-env.in | 9 +++++++++
 6 files changed, 29 insertions(+), 5 deletions(-)

commit 912a95b7ceb56e16854fa09af9c31cb33b6303ca
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Tue Mar 6 13:06:32 2012 +0100

    Show date in local timezone instead of UTC

    Fixes: https://bugzilla.gnome.org/661515

 libempathy-gtk/empathy-chat-text-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1b141efdf1f662cb87a733afe402b1b3efaf07d6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 5 18:50:24 2012 +0100

    'ice-udp' capability is now 'ice' in Call1

 data/Empathy.Call.client   | 2 +-
 src/empathy-call-factory.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 2974d41801a79040d172ff165ee4ad7894bcec09
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 5 18:49:49 2012 +0100

    advertise Call1 audio/video capabilities

 data/Empathy.Call.client   | 2 ++
 src/empathy-call-factory.c | 2 ++
 2 files changed, 4 insertions(+)

commit cc78967fb896019100e951550df244429e41ca78
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 5 18:47:41 2012 +0100

    call-factory: set Call1 capabilities

 src/empathy-call-factory.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 802b0a8393044c9d8773b3632a599aea37194162
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Mon Mar 5 21:23:35 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1355
 +++++++++++++++++++++++++++++-----------------------------
 po/zh_TW.po | 1375
 ++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 1384 insertions(+), 1346 deletions(-)

commit 09f38d2c6cfb75b07f7144441d2044221a92c2ae
Author: YunQiang Su <yqsu@src.gnome.org>
Date:	Mon Mar 5 17:50:58 2012 +0800

    update Simplified Chinese (zh_CN) translation

 po/zh_CN.po | 770
 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 393 insertions(+), 377 deletions(-)

commit 9cc2697564646035f9584ca9ea2e2d0a3ba77afd
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Sun Mar 4 10:59:30 2012 +0300

    Updated Belarusian translation.

 po/be.po | 489
 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 313 insertions(+), 176 deletions(-)

commit 2e78f335f00aa0ec5867f0b2c39ab60b5aa80ac6
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Sat Mar 3 18:46:03 2012 +0100

    Updated Basque language

 po/eu.po | 2681
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1458 insertions(+), 1223 deletions(-)

commit d35b8e660ef2414e4c343cd90d8ee7371f41f0ff
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Mar 2 14:14:58 2012 +0200

    Updated Hebrew translation.

 po/he.po | 425
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 225 insertions(+), 200 deletions(-)

commit 3e86b9990bbd10a628b2efe5963abe7d4e7708db
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	Fri Mar 2 13:52:42 2012 +0200

    [l10n] Updated Estonian translation

 po/et.po | 256
 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 165 insertions(+), 91 deletions(-)

commit 0cb51e3433491ef68cbaf3054d519b0e576682e4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 2 12:58:04 2012 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 71b003449ed9203ca6e12df0d80c2e5efdfe8d3b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 2 12:11:41 2012 +0100

    prepare 3.3.90.2

 NEWS	      | 32 ++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 34 insertions(+), 2 deletions(-)

commit 29973effee9abb05f78b8da5e3258194abc2c461
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 2 11:44:19 2012 +0100

    add some info to HACKING

 HACKING | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

commit 2ba0e02b8c7a180b1785ef85baab66b0f16db964
Merge: fe6c1d0 c144943
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 2 11:34:47 2012 +0100

    Merge branch 'empathy-av-ocrete'

commit fe6c1d00ad01701353fd1f5a85ade27ace898b53
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 2 11:34:29 2012 +0100

    git ignore help/*/*.stamp

 help/.gitignore | 1 +
 1 file changed, 1 insertion(+)

commit c144943be6f1e0255a6309d6559183a9101e10cd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 2 10:59:59 2012 +0100

    empathy-call doesn't need ev-sidebar

 src/Makefile.am | 2 --
 1 file changed, 2 deletions(-)

commit 9c5568e53b09615bee4d516fd8ea29341383fbf7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 2 10:50:09 2012 +0100

    Revert "Stop approve StreamedMedia channels"

    This reverts commit c7dd14aef20e429135fba7c7a53a8d507b9579a3.

 src/empathy-event-manager.c	      | 86
 +++++++++++++++++++++++++++++++++++-
 src/empathy-event-manager.h	      |  1 +
 src/empathy-notifications-approver.c |  9 ++++
 3 files changed, 94 insertions(+), 2 deletions(-)

commit 634c2e8376910b96e584159da43a9e708d3a9573
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 2 10:41:16 2012 +0100

    remove FIXME regarding
    empathy_tp_streamed_media_accept_incoming_call()

    It early returns if the channel is an outgoing one. And it's called
    as a
    result of empathy_streamed_media_handler_start_call() so it's not
    accepted
    automatically.

    We just keep the existing behaviour.

 src/empathy-streamed-media-handler.c | 2 --
 1 file changed, 2 deletions(-)

commit d22ead6ae9fd3d168a49ad6d66acf20f9d27fd4c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 2 10:30:38 2012 +0100

    fix signature of
    empathy_streamed_media_handler_tf_content_src_pad_added_cb

 src/empathy-streamed-media-handler.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit cad6634c35d1ab43f5e547dcf135fb793336e1e9
Author: Ibrahim Saed <ibraheem5000@gmail.com>
Date:	Fri Mar 2 09:06:18 2012 +0100

    Updated Arabic translation

 po/ar.po | 3260
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1604 insertions(+), 1656 deletions(-)

commit 6d7cb3b034a5098cc294262d4338a78b3aeee483
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Thu Mar 1 21:35:36 2012 +0100

    Updated Slovenian translation

 po/sl.po | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

commit 886773a371ac59f3fd039270a90b3e813d02d7cd
Author: Olivier Crête <olivier.crete@collabora.com>
Date:	Thu Mar 1 11:58:23 2012 -0500

    Farstream port of tp-av oops

 src/empathy-streamed-media-handler.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit e35c34e3935d055c6cd5db1c0808f9906488627b
Author: Olivier Crête <olivier.crete@collabora.com>
Date:	Thu Mar 1 11:52:56 2012 -0500

    Port Empathy-av to Telepathy Farstream

 configure.ac			      |   3 +-
 src/empathy-streamed-media-handler.c | 135
 ++++++++++++++++++-----------------
 src/empathy-streamed-media-window.c  |  17 ++---
 3 files changed, 77 insertions(+), 78 deletions(-)

commit 57a7b1ba43133f3f3097d00b89a8d8f7f246ccdb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 28 13:05:43 2012 +0100

    Allow to build with empathy-av

 configure.ac			      | 19 +++++++++++++++++++
 data/Makefile.am		      | 12 ++++++++++--
 libempathy-gtk/empathy-call-utils.c  | 31 +++++++++++++++++--------------
 src/Makefile.am		      |  9 ++++++---
 src/empathy-streamed-media-handler.c |  6 +++---
 src/empathy-streamed-media-handler.h |  2 +-
 src/empathy-streamed-media-window.c  |  8 ++++----
 7 files changed, 60 insertions(+), 27 deletions(-)

commit 758b4250e767d9e952b8c0ea4db7d93df192a0c0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 28 13:03:26 2012 +0100

    Revert "Stop requesting StreamedMedia channels"

    This reverts commit b7f1fab64f9a59221b4d666cd788db4efe855b13.

 libempathy-gtk/empathy-call-utils.c | 74
 ++++++++++++++++++++++++++++++++++---
 1 file changed, 69 insertions(+), 5 deletions(-)

commit 4110a4bc8b8c2a63e94615594eba3b109dcf97e4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 28 12:07:03 2012 +0100

    Revert "Drop empathy-av"

    This reverts commit ba0a893b1d31cdb234bae72845e840a895b9d62a.

    Conflicts:

	src/Makefile.am

 data/Empathy.AudioVideo.client			    |	21 +
 data/Makefile.am				    |	 5 +
 ....Telepathy.Client.Empathy.AudioVideo.service.in |	 3 +
 libempathy/Makefile.am				    |	 2 +
 libempathy/empathy-tp-streamed-media.c		    |  856 ++++++
 libempathy/empathy-tp-streamed-media.h		    |  113 +
 po/POTFILES.in					    |	 4 +
 src/Makefile.am				    |	29 +
 src/empathy-av.c				    |  172 ++
 src/empathy-streamed-media-factory.c		    |  269 ++
 src/empathy-streamed-media-factory.h		    |	69 +
 src/empathy-streamed-media-handler.c		    |  903 ++++++
 src/empathy-streamed-media-handler.h		    |  106 +
 src/empathy-streamed-media-window-fullscreen.c     |  309 ++
 src/empathy-streamed-media-window-fullscreen.h     |	77 +
 src/empathy-streamed-media-window.c		    | 3202
 ++++++++++++++++++++
 src/empathy-streamed-media-window.h		    |	65 +
 src/empathy-streamed-media-window.ui		    |  861 ++++++
 18 files changed, 7066 insertions(+)

commit afb9276b8a497e7b9275fb53abafd0cdb18d55fc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 29 13:21:48 2012 +0100

    Revert "remove EMPATHY_AV_BUS_NAME*"

    This reverts commit f90421fd29108507c722c03e28bc16e4b5baf7c0.

 libempathy/empathy-request-util.h | 3 +++
 1 file changed, 3 insertions(+)

commit 07a964820bf33babbf9345313599b3fcb9d1e97f
Author: Jonh Wendell <jwendell@gnome.org>
Date:	Thu Mar 1 10:10:55 2012 -0300

    Updated Brazilian Portuguese translation

 po/pt_BR.po | 2982
 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1571 insertions(+), 1411 deletions(-)

commit 2a3d601d7a180e6f039d0c21a69ca38029984c93
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 28 12:04:07 2012 +0100

    Revert "remove ev-sidebar"

    This reverts commit 8499da09a2cd61da8c02b34f00112672007d13c8.

    Need for empathy-av

 src/Makefile.am  |   2 +
 src/ev-sidebar.c | 352
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/ev-sidebar.h |  76 ++++++++++++
 3 files changed, 430 insertions(+)

commit e2df2195fbfdf96425e71f0c6bc006d56797879a
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Wed Feb 29 18:58:54 2012 +0530

    Make clear work on All's buffer

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=671061

 src/empathy-debug-window.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit cdc76639a2c2141c0eb1794fe93b787332ef50fb
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Wed Feb 29 20:52:34 2012 +0100

    Updated Slovenian translation

 po/sl.po | 3075
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1529 insertions(+), 1546 deletions(-)

commit 8b11603943c0613cde51e7a27b05e75d2addca98
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 28 16:50:05 2012 +0100

    audio-sink: don't unref subpad

    Part of my commit ed191caba6658b580db78a1802f2c8293e4564fb was wrong.
    subpad is added to the bin so gst_element_add_pad() takes its
    reference.

    https://bugzilla.gnome.org/show_bug.cgi?id=670745

 src/empathy-audio-sink.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit d9f6aebd81c43e6c09376899ed926a94d1cdd5b5
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	Mon Feb 27 12:27:32 2012 +0200

    [l10n] Updated Estonian translation

 po/et.po | 471
 ++++++++++++++++++++++-----------------------------------------
 1 file changed, 162 insertions(+), 309 deletions(-)

commit c9e47d4bd51b0c79917db7e1539b452766ab300c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 24 15:03:38 2012 +0100

    empathy_call_window_content_added_cb: fix pad leak

    https://bugzilla.gnome.org/show_bug.cgi?id=670745

 src/empathy-call-window.c | 2 ++
 1 file changed, 2 insertions(+)

commit ed191caba6658b580db78a1802f2c8293e4564fb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 24 14:55:04 2012 +0100

    audio-sink: fix GstPad leaks

    gst_ghost_pad_new() doesn't take ownership of the target pad so we
    have to
    unref it ourself.

    https://bugzilla.gnome.org/show_bug.cgi?id=670745

 src/empathy-audio-sink.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit e790a2faa4d607cd812d6babe22b0078ba5906d4
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Sun Feb 26 12:55:37 2012 +0300

    Updated Belarusian translation.

 po/be.po | 664
 +++++++++++++++++++++++++++------------------------------------
 1 file changed, 280 insertions(+), 384 deletions(-)

commit 7c8694cf4282d1eb0b17d417be5015b2285e49f5
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Sun Feb 26 13:12:22 2012 +0400

    Updated Russian translation

 po/ru.po | 71
 ++++++++++++++++++++++++++--------------------------------------
 1 file changed, 29 insertions(+), 42 deletions(-)

commit 9d5be9ef43c91fcc9a0c0c38e3db62cb4cf61020
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Sun Feb 26 13:06:05 2012 +0400

    Updated Russian translation

 po/ru.po | 1137
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 546 insertions(+), 591 deletions(-)

commit 115155b5e31390e153f4ff276e3bb2e3176684cd
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:	Sun Feb 26 12:37:00 2012 +0530

    updated Tamil translation

 po/ta.po | 64
 +++++++++++++++++++++++-----------------------------------------
 1 file changed, 23 insertions(+), 41 deletions(-)

commit 13c9f09f14948594ed6d5a97cd581ceb88115345
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:	Sun Feb 26 12:32:40 2012 +0530

    updated Tamil translation

 po/ta.po | 121
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 69 insertions(+), 52 deletions(-)

commit 1cb86d9e288078fffd26eec8f4d32c77128e07de
Author: Gheyret Kenji <gheyret@gmail.com>
Date:	Sun Feb 26 11:36:28 2012 +0900

    Updated uyghur translation

 po/ug.po | 4553
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 2440 insertions(+), 2113 deletions(-)

commit 8e4e6f8612326e0d2b49857afbaeb85454101569
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:	Sat Feb 25 21:10:58 2012 +0530

    updated Tamil translation

 po/ta.po | 2911
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 1535 insertions(+), 1376 deletions(-)

commit 7214e2d95cc4e8bfd728261d6d83ff432317b5c2
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sat Feb 25 15:54:49 2012 +0100

    Updated galician translations for doc

    Signed-off-by: Fran Diéguez <fran.dieguez@mabishu.com>

 help/gl/gl.po | 5216
 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 2713 insertions(+), 2503 deletions(-)

commit a01b16704901431f67a840ce7286d39f3c91ec57
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 24 10:09:25 2012 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f1423f980ff08aa5a9fc57e4b8f2c9b2133e02e7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 24 09:53:05 2012 +0100

    prepare 3.3.90.1

 NEWS	      | 21 +++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 23 insertions(+), 2 deletions(-)

commit 76677223fcc2b22423743d3b2f24192ad4f7915e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 23 16:32:36 2012 +0100

    call-window: don't leak the ClutterState

 src/empathy-call-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 7351fc2f0699c35321cc761eb5bd6584fb99a95a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 24 09:47:51 2012 +0100

    help/it/it.po: fix typo

 help/it/it.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7f549d14aa940b7c8d8c2d4e914ca14dc7147117
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Thu Feb 23 21:53:25 2012 +0100

    Updated Serbian translation

 po/sr.po	| 764
 +++++++++++++++++++++++++++------------------------------
 po/sr@latin.po | 764
 +++++++++++++++++++++++++++------------------------------
 2 files changed, 722 insertions(+), 806 deletions(-)

commit e89ec99e9e0a2a962fe565db6c273899c78a4dbe
Author: A S Alam <aalam@users.sf.net>
Date:	Thu Feb 23 20:58:22 2012 +0530

    update Punjabi Translation

 po/pa.po | 4340
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 2265 insertions(+), 2075 deletions(-)

commit ccb6c7702e9a6c65a46886baafb4ef2acccb2595
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 23 14:39:03 2012 +0100

    call-window: use empathy_call_handler_get_contact()

    I'm sure those bugs are because we were using g_object_get() directly.

 src/empathy-call-window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit bdebda58a42501f6c4c6f8e0692239662827aba1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 23 14:37:11 2012 +0100

    call: don't leak the contact

 src/empathy-call.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f1ec59d5dadee9765977dbacee888f51e3b8a415
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 23 14:33:08 2012 +0100

    add empathy_call_handler_get_contact()

 src/empathy-call-handler.c | 6 ++++++
 src/empathy-call-handler.h | 2 ++
 2 files changed, 8 insertions(+)

commit b87990d88e8a9291908d3be694db267835b5ab40
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 23 14:24:37 2012 +0100

    call-window: don't leak the contact

 src/empathy-call-window.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 354da6284f909aea471e12742a0c4bd6c3f9b470
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 23 14:23:17 2012 +0100

    Don't disconnect the contact_name_changed_cb cb

    tp_g_signal_connect_object() does it for us.

 src/empathy-call-window.c | 2 --
 1 file changed, 2 deletions(-)

commit 34dbeb68c11d8b4477a04ed93fa90aaf2e563fec
Author: Frédéric Péters <fpeters@0d.be>
Date:	Thu Feb 23 15:37:25 2012 +0100

    build: add missing @YELP_HELP_RULES@ stanza for documentation
    build system

 help/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit fd2d90962224d01988217800a51d5055fb5ffbbe
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Thu Feb 23 10:28:53 2012 +0100

    Updated Galician translations

 po/gl.po | 623
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 294 insertions(+), 329 deletions(-)

commit 354671e1521cc3157d44701cbac56b3eb19fb35c
Author: Gert Kulyk <gkulyk@yahoo.de>
Date:	Thu Feb 23 09:38:16 2012 +0100

    Stop using Farsight2 headers

    https://bugzilla.gnome.org/show_bug.cgi?id=670638

 src/empathy-call-handler.h | 2 +-
 src/empathy-call-window.c  | 4 ++--
 src/empathy-video-widget.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

commit 19ab99537ee4f6aaf53ac41fd5337f20ac7c9766
Author: Alexander Shopov <ash@kambanaria.org>
Date:	Thu Feb 23 07:33:19 2012 +0200

    Updated Bulgarian translation

 po/bg.po | 2327
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 1112 insertions(+), 1215 deletions(-)

commit 9198e7f6d9167804b6682129f4e5b7e67f783398
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 22 14:03:25 2012 +0100

    Use champlain 0.14

    That's the version which will be used with GNOME 3.4.

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ee0869ab06ca33e8a19301dc96f5dadf84184972
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 22 14:03:14 2012 +0100

    check gtk_clutter_init() return value

 src/empathy.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit a98707cd8a499d305a45c92448a1f6db29abfeb3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 22 11:09:25 2012 +0100

    empathy-call: no need to call gtk_clutter_init()

    gtk_clutter_get_option_group() already does it for us.

 src/empathy-call.c | 1 -
 1 file changed, 1 deletion(-)

commit 72170494c5b160885f3a9371c7efc57acce4436e
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Tue Feb 21 17:58:17 2012 +0100

    Updated Spanish translation

 po/es.po | 563
 ++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 253 insertions(+), 310 deletions(-)

commit a40e7aa1d2e44a661b62649638f489d9d8344819
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 21 17:01:27 2012 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b7008342d67c47362b8ab55bcdf80b629acca8e3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 21 16:38:34 2012 +0100

    prepare 3.3.90

 NEWS	      | 89
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 +--
 2 files changed, 91 insertions(+), 2 deletions(-)

commit f90421fd29108507c722c03e28bc16e4b5baf7c0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 21 16:24:29 2012 +0100

    remove EMPATHY_AV_BUS_NAME*

 libempathy/empathy-request-util.h | 3 ---
 1 file changed, 3 deletions(-)

commit 313fa40c9b9367af6c7b24cbf840054d4658bfbd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 21 16:24:09 2012 +0100

    stop checking for empathy-av deps

 configure.ac | 6 ------
 1 file changed, 6 deletions(-)

commit 0633575cda1c01e75247da67c0405aabaac3adab
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 21 16:07:39 2012 +0100

    check coding style of all binaries

 src/Makefile.am | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 8499da09a2cd61da8c02b34f00112672007d13c8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 21 16:07:04 2012 +0100

    remove ev-sidebar

    It's not used in empathy-call.

 src/Makefile.am  |   2 -
 src/ev-sidebar.c | 352
 -------------------------------------------------------
 src/ev-sidebar.h |  76 ------------
 3 files changed, 430 deletions(-)

commit 558998c27217a0b92188d0870f8510e86194985b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 21 16:01:56 2012 +0100

    debug-window: coding style fixes

 src/empathy-debug-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b7f1fab64f9a59221b4d666cd788db4efe855b13
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 21 15:19:12 2012 +0100

    Stop requesting StreamedMedia channels

    https://bugzilla.gnome.org/show_bug.cgi?id=629902

 libempathy-gtk/empathy-call-utils.c | 74
 +++----------------------------------
 1 file changed, 5 insertions(+), 69 deletions(-)

commit ba0a893b1d31cdb234bae72845e840a895b9d62a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 21 15:18:45 2012 +0100

    Drop empathy-av

    So long and thanks for all the calling...

    https://bugzilla.gnome.org/show_bug.cgi?id=629902

 data/Empathy.AudioVideo.client			    |	21 -
 data/Makefile.am				    |	 5 -
 ....Telepathy.Client.Empathy.AudioVideo.service.in |	 3 -
 libempathy/Makefile.am				    |	 2 -
 libempathy/empathy-tp-streamed-media.c		    |  856 ------
 libempathy/empathy-tp-streamed-media.h		    |  113 -
 po/POTFILES.in					    |	 4 -
 src/Makefile.am				    |	32 +-
 src/empathy-av.c				    |  172 --
 src/empathy-streamed-media-factory.c		    |  269 --
 src/empathy-streamed-media-factory.h		    |	69 -
 src/empathy-streamed-media-handler.c		    |  903 ------
 src/empathy-streamed-media-handler.h		    |  106 -
 src/empathy-streamed-media-window-fullscreen.c     |  309 --
 src/empathy-streamed-media-window-fullscreen.h     |	77 -
 src/empathy-streamed-media-window.c		    | 3202
 --------------------
 src/empathy-streamed-media-window.h		    |	65 -
 src/empathy-streamed-media-window.ui		    |  861 ------
 18 files changed, 1 insertion(+), 7068 deletions(-)

commit c7dd14aef20e429135fba7c7a53a8d507b9579a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 21 15:46:02 2012 +0100

    Stop approve StreamedMedia channels

    https://bugzilla.gnome.org/show_bug.cgi?id=629902

 src/empathy-event-manager.c	      | 86
 +-----------------------------------
 src/empathy-event-manager.h	      |  1 -
 src/empathy-notifications-approver.c |  9 ----
 3 files changed, 2 insertions(+), 94 deletions(-)

commit b48a8176d050de2d03bed6c5f00b451f3ca5c750
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 21 15:13:17 2012 +0100

    always build empathy-call

    https://bugzilla.gnome.org/show_bug.cgi?id=629902

 configure.ac			     | 42
 ++++++++-----------------------------
 data/Makefile.am		     | 12 ++---------
 libempathy-gtk/empathy-call-utils.c | 35 -------------------------------
 src/Makefile.am		     |	4 ----
 4 files changed, 11 insertions(+), 82 deletions(-)

commit 988a99a9a54a20fff1846275f98a0c3b3c4c3469
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Tue Feb 21 15:05:14 2012 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 355
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 195 insertions(+), 160 deletions(-)

commit dacccf3c68817345bffaeff830f911eceee95cf2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 14 11:21:32 2012 +0100

    try installing telepathy-haze

 src/empathy-accounts-dialog.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

commit e8dae499471d378eae7b0f1bff92b4b0788a0bc7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 16 15:30:08 2011 +0100

    explain why the account has been disabled

    https://bugzilla.gnome.org/show_bug.cgi?id=663829

 src/empathy-accounts-dialog.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

commit f85fa9491bb42a9d01acda493d000cad1a2d1c80
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 16 15:04:46 2011 +0100

    accounts-dialog: hide the switch in butterfly accounts

    MC should migrate butterfly accounts. If it fails (typically
    because Haze
    isn't installed) then it disables the account. There is no point
    allowing user
    to re-enable it as it won't work properly with Empathy any way.

    https://bugzilla.gnome.org/show_bug.cgi?id=663829

 src/empathy-accounts-dialog.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit a5da0a70113dd6bd0abe0df3c353fbaf41a25fae
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 11 10:10:47 2011 +0100

    Use the MSN account widget with Haze

    The parameters supported by the UI have the same names as the
    Butterfly ones
    so no change needed.

    https://bugzilla.gnome.org/show_bug.cgi?id=663829

 libempathy-gtk/empathy-account-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3826d723545ab2ecb4f11dce9e0e1b48275516c3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 11 10:05:49 2011 +0100

    protocol-chooser: stop using Butterfly

    It doesn't implement any modern Telepathy API like ContactList for
    example and
    we now rely on it.

    https://bugzilla.gnome.org/show_bug.cgi?id=663829

 libempathy-gtk/empathy-protocol-chooser.c | 4 ++++
 1 file changed, 4 insertions(+)

commit dc044ffa0a35375738cd79c9508dfa766e2d1953
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Tue Feb 21 14:17:54 2012 +0100

    Updated Spanish translation

 po/es.po | 332
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 175 insertions(+), 157 deletions(-)

commit 109e8dda543685f0ef6be6bc24e76ffce7e8e9f2
Merge: 421b663 efbdd30
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 21 14:11:57 2012 +0100

    Merge remote-tracking branch
    'glassrose/debug-window-send-to-pastebin-button-658724'

commit 421b66326367a0cec07ca233ada0d675078f73bb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 21 12:35:54 2012 +0100

    drag_data_received_individual_id: make sure manager is initialized

 src/empathy-chat-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit babedb4d20c94fcdb12f2318aafccfbf882faef8
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Tue Feb 21 11:46:04 2012 +0100

    Updated Galician translations

 po/gl.po | 248
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 124 insertions(+), 124 deletions(-)

commit abb277867f74af71705f453e0db3f947d85b084a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 21 10:13:44 2012 +0100

    tp_call_channel_add_content_async() now takes the direction

 libempathy-gtk/empathy-call-utils.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit eeaacbd35af795c8a265716721e915fa28aa242c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 21 08:28:51 2012 +0100

    Depend on tp-farstream 0.2.1

    That's the version of the last release.

 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 894b1f315b62499a5d305aff6b937093a20df1a4
Merge: 58574c8 1af2b9b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 21 08:26:19 2012 +0100

    Merge remote-tracking branch 'origin/call1' into master+call

    Conflicts:
	configure.ac
	telepathy-yell

commit 58574c8dc2e5261d8c89b9a6b6fda41687a386ea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 21 08:24:24 2012 +0100

    depend on tp-glib 0.17.5

    Needed for Call1.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit efbdd30a2d83aa2ae03fd2cb678448e8f9ea83f5
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Mon Feb 20 16:48:52 2012 +0530

    License to publish the author's pastebin API developer key in open

 PASTEBIN-API-KEY.txt	    | 110
 +++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-debug-window.c |	3 +-
 2 files changed, 112 insertions(+), 1 deletion(-)

commit 09835d2927a06eab67ece7dc2d1b66f52885024e
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Sun Sep 11 07:29:55 2011 +0530

    "Send to pastebin" button in EmpathyDebugWindow

    For one-click posting of debug data to http://pastebin.com/

    To paste the currently displayed debug data directly to pastebin.
    Makes use of the pastebin API- http://pastebin.com/api
    which can be accessed by pastebin website members.

 src/empathy-debug-window.c | 193
 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 172 insertions(+), 21 deletions(-)

commit cdfc12c542db24dc688cb07c398e34114ec34796
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date:	Mon Feb 20 22:56:13 2012 +0100

    Updated Danish translation

 po/da.po | 2649
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 1418 insertions(+), 1231 deletions(-)

commit d8b81b7f1937c34db50d29f638452eac11cff622
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Mon Feb 20 17:08:36 2012 +0300

    Updated Belarusian translation.

 po/be.po | 348
 ++++++++++++++++++++-------------------------------------------
 1 file changed, 110 insertions(+), 238 deletions(-)

commit 42d9964bab2f5f77189b657ac71c9a40b92ed93d
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Mon Feb 20 10:45:27 2012 +0100

    Updated Serbian translation

 po/sr.po	| 463
 ++++++++++++++++++++++++++++-----------------------------
 po/sr@latin.po | 463
 ++++++++++++++++++++++++++++-----------------------------
 2 files changed, 454 insertions(+), 472 deletions(-)

commit 55c070709b48f3dd0fd13822493e21ffea1f1b75
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sun Feb 19 18:30:14 2012 +0100

    Updated Galician translations

 po/gl.po | 495
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 240 insertions(+), 255 deletions(-)

commit 3eb9c64567a736d411156cfa7019addde2c00596
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sun Feb 19 15:41:02 2012 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 996
 ++++++++++++++++++++++++++-------------------------------------
 1 file changed, 414 insertions(+), 582 deletions(-)

commit bacad5d42811f75a273556c31e46f6dcad47c8ed
Author: Christian Kirbach <Christian.Kirbach@googlemail.com>
Date:	Sun Feb 19 13:20:42 2012 +0100

    [l10n] Updated German doc translation

 help/de/de.po | 5359
 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 2677 insertions(+), 2682 deletions(-)

commit 300660278008b5e51a1fe9555cb717806fa1f0dd
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	Sun Feb 19 12:21:06 2012 +0200

    [l10n] Updated Estonian translation

 po/et.po | 88
 +++++++++++++++++++++-------------------------------------------
 1 file changed, 28 insertions(+), 60 deletions(-)

commit f7d869a05b3f1ac75d164191e6a4595f83f4a7a9
Author: Daniel Nylander <po@danielnylander.se>
Date:	Sun Feb 19 00:56:57 2012 +0100

    Updated Swedish translation

 po/sv.po | 2706
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1390 insertions(+), 1316 deletions(-)

commit e93b1f34fad4b25bf0415db0a764f79514a43f4d
Author: Anas Afif Emad <anas.e87@gmail.com>
Date:	Sat Feb 18 18:42:06 2012 +0100

    Updated Arabic translation

 po/ar.po | 2974
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1911 insertions(+), 1063 deletions(-)

commit b1558cbab31a7c1cbf80a098e15ac94f3f7c7bab
Author: Alexander Shopov <ash@kambanaria.org>
Date:	Sat Feb 18 07:10:06 2012 +0200

    Updated Bulgarian translation

 po/bg.po | 2343
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 1101 insertions(+), 1242 deletions(-)

commit 2ecbbf2d18e9c3783047faa1c734f3287311e4f2
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Feb 17 17:36:05 2012 +0100

    Updated Spanish translation

 help/es/es.po | 5207
 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 2722 insertions(+), 2485 deletions(-)

commit bee8947cf216c4ebc714c11ebb18b254b9a3eeba
Author: Javier Jardón <jjardon@gnome.org>
Date:	Tue Aug 16 17:11:07 2011 +0100

    Use new documentation infraestructure

 .gitignore	  |  1 -
 configure.ac	  |  3 ++-
 help/Makefile.am | 10 ++++------
 m4/.gitignore	  |  1 -
 4 files changed, 6 insertions(+), 9 deletions(-)

commit 9be0890e445a1d8bc28ceeea3bea1703f14cd5eb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 17 15:13:28 2012 +0100

    chat-window: invite contacts using DnD

    https://bugzilla.gnome.org/show_bug.cgi?id=655101

 src/empathy-chat-window.c | 72
 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

commit 4d3120f44e8b77f46d090cd4c9edb6b4036cd3ea
Author: Brian Curtis <bcurtiswx@ubuntu.com>
Date:	Fri Feb 17 14:44:55 2012 +0100

    Patch to change Yes/No to Accept/Reject

    This patch will change the Yes and No in the subscription request
    dialog box
    to Accept and Reject respectively.

    https://bugzilla.gnome.org/show_bug.cgi?id=646654

 libempathy-gtk/empathy-contact-dialogs.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 3ffffaaf8c00e6ddc78e37dd9bfbc5f38365d4db
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 17 14:13:47 2012 +0100

    chat-window: display a phone icon in the tab label

    https://bugzilla.gnome.org/show_bug.cgi?id=664045

 src/empathy-chat-window.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit cc596d0b62855faaaf110ad90bc6d54fdd804464
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Feb 17 15:19:20 2012 +0200

    Updated Hebrew translation.

 po/he.po | 1160
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 610 insertions(+), 550 deletions(-)

commit 51842464fcf1aea50efef64ea711b10063462688
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Feb 17 10:31:45 2012 +0100

    Updated Spanish translation

 po/es.po | 392
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 188 insertions(+), 204 deletions(-)

commit e7f57aeaf4c3433dc48fa953791ae6598b34ae3d
Merge: 299c10e 1a35f58
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 17 10:21:41 2012 +0100

    Merge remote-tracking branch
    'glassrose/add-All-service-selection-in-debug-window'

commit 299c10e3fd1696b5888e3f07336c4a2e64c08f68
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Thu Feb 16 21:29:59 2012 +0100

    Updated POTFILES.in

 po/POTFILES.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 2bfe326976653cd35b6f4af943746df084a9dad2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 18:20:45 2012 +0100

    local-xmpp-assistant-widget: increase row-spacing

 libempathy-gtk/empathy-local-xmpp-assistant-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7cd8231ad035d840ce34569460425d766adfa62e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 15:31:05 2012 +0100

    use the 48x48 version of the local-xmpp icon

    We don't have to scale up the icon any more and it looks good as it.

    https://bugzilla.gnome.org/show_bug.cgi?id=652669

 libempathy-gtk/empathy-local-xmpp-assistant-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cc16ff0eebeeff9ddfe8fdb675471a28eea9f8cb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 15:26:43 2012 +0100

    move the second part of the message at the end of the widget

    I rephrased it as well per Will's suggestion.

    https://bugzilla.gnome.org/show_bug.cgi?id=652669

 .../empathy-local-xmpp-assistant-widget.c	    | 23
 ++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

commit 4e2b90ee32a86004446ec7bf9246916147cbc377
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 15:00:09 2012 +0100

    widget-local-xmpp: expand the entry fields

    We want them to take all the space available.

    https://bugzilla.gnome.org/show_bug.cgi?id=652669

 libempathy-gtk/empathy-account-widget-local-xmpp.ui | 6 ++++++
 1 file changed, 6 insertions(+)

commit 1b0f008d221ade82446926ccf6a5bd1e774b3026
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 14:50:37 2012 +0100

    local-xmpp-assistant-widget: inherit from a GtkGrid

    It simplifies widgets packing.

    https://bugzilla.gnome.org/show_bug.cgi?id=652669

 libempathy-gtk/empathy-local-xmpp-assistant-widget.c | 17
 ++++++-----------
 libempathy-gtk/empathy-local-xmpp-assistant-widget.h |  4 ++--
 2 files changed, 8 insertions(+), 13 deletions(-)

commit 3e85f81e365012a97b426225a4ffcc6156dbfd1b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 14:42:42 2012 +0100

    salut-dialog: use 'Skip' instead of 'Ignore'

    https://bugzilla.gnome.org/show_bug.cgi?id=652669

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 208dcb12e4946d9c710eecdd1f11f0cc8acf8cbc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 12:52:01 2012 +0100

    remove empathy-auto-salut-account-helper

    It was used only by the accounts assistant

    https://bugzilla.gnome.org/show_bug.cgi?id=652669

 src/Makefile.am			 |   2 -
 src/empathy-accounts-common.c		 |   1 -
 src/empathy-accounts.c			 |   1 -
 src/empathy-auto-salut-account-helper.c | 103
 --------------------------------
 src/empathy-auto-salut-account-helper.h |  34 -----------
 tests/interactive/Makefile.am		 |  11 ----
 6 files changed, 152 deletions(-)

commit a266c221f89cf764d6fe954f63ba61658b8d83e4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 12:50:28 2012 +0100

    Remove empathy-account-assistant

    DIE DIE DIE!!!

    https://bugzilla.gnome.org/show_bug.cgi?id=652669

 src/empathy-account-assistant.c		    | 1313
 --------------------
 src/empathy-account-assistant.h		    |	66 -
 tests/interactive/test-empathy-account-assistant.c |	42 -
 3 files changed, 1421 deletions(-)

commit 6fc913d958a7569ce8848797b4d365776cc7af20
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 12:48:05 2012 +0100

    Stop using the accounts assistant

    Its features have been re-implemented in
    empathy-accounts-dialog. Thanks to
    Danielle for this new design.

    https://bugzilla.gnome.org/show_bug.cgi?id=652669

 src/empathy-accounts-common.c | 67
 ++++---------------------------------------
 1 file changed, 5 insertions(+), 62 deletions(-)

commit db8942598423d5dd11ea28cdfb4b2935f1e2a374
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 12:45:22 2012 +0100

    empathy-accounts: remove --assistant option

    It was only used when hacking on the accounts assistant which is
    going away.

    https://bugzilla.gnome.org/show_bug.cgi?id=652669

 src/empathy-accounts-common.c | 3 +--
 src/empathy-accounts-common.h | 1 -
 src/empathy-accounts.c        | 9 ++-------
 3 files changed, 3 insertions(+), 10 deletions(-)

commit 1dc8418d9480d3545151b443b2d43b1861a9d832
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 12:15:22 2012 +0100

    accounts-dialog: suggest to create a salut account

    https://bugzilla.gnome.org/show_bug.cgi?id=652669

 src/empathy-accounts-dialog.c | 70
 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 68 insertions(+), 2 deletions(-)

commit fe9e5a3cac6397054f984a10916378792ce583ca
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 12:14:16 2012 +0100

    Move should_create_salut_account to local-xmpp-assistant-widget

    https://bugzilla.gnome.org/show_bug.cgi?id=652669

 .../empathy-local-xmpp-assistant-widget.c	    | 25
 +++++++++++++++++++++
 .../empathy-local-xmpp-assistant-widget.h	    |  5 +++++
 src/empathy-account-assistant.c		    |  3 ++-
 src/empathy-auto-salut-account-helper.c	    | 26
 ----------------------
 src/empathy-auto-salut-account-helper.h	    |  2 --
 5 files changed, 32 insertions(+), 29 deletions(-)

commit fea6df61fd35261aeebe2a94128d472e284a7280
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 11:56:01 2012 +0100

    add empathy-local-xmpp-assistant-widget

    All of this is duplicated code from empathy-account-assistant and
    empathy-auto-salut-account-helper but those are going away so I
    didn't bother
    refactoring them.

    https://bugzilla.gnome.org/show_bug.cgi?id=652669

 libempathy-gtk/Makefile.am			    |	4 +
 .../empathy-local-xmpp-assistant-widget.c	    | 282
 +++++++++++++++++++++
 .../empathy-local-xmpp-assistant-widget.h	    |  58 +++++
 po/POTFILES.in					    |	1 +
 4 files changed, 345 insertions(+)

commit 692672af8d6a30c6550571a424b4546a0dea98f7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 15 15:28:18 2012 +0100

    accounts-dialog: display the import dialog if there is no account

    This is the first step of merging the accounts-dialog and assistant.

    https://bugzilla.gnome.org/show_bug.cgi?id=652669

 src/empathy-accounts-dialog.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit 49b69761e064aa1b43d6aa01af60bc9f2e536277
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Thu Feb 16 17:28:08 2012 +0100

    Updated Spanish translation

 po/es.po | 150
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 77 insertions(+), 73 deletions(-)

commit 3c51d10155a9bc4500cb3d559fff80cade6ac5b4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 13:01:14 2012 +0100

    accounts-dialog: improve the 'no protocol installed' message

    https://bugzilla.gnome.org/show_bug.cgi?id=670203

 src/empathy-accounts-dialog.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4adfd6f5bf317845bed8b421c284ebb44097b5c5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 15 16:16:18 2012 +0100

    accounts_dialog_add_account: select if that's the first account added

    This ensures we'll select the first imported account.

    https://bugzilla.gnome.org/show_bug.cgi?id=670203

 src/empathy-accounts-dialog.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 55fab807184bdb0d30c43d2de6e91532cfdf8ccf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 15 16:04:49 2012 +0100

    accounts-dialog: move the 'no protocol' message to a different page

    It's cleaner that way

    https://bugzilla.gnome.org/show_bug.cgi?id=670203

 src/empathy-accounts-dialog.c	| 12 +++----
 src/empathy-accounts-dialog.ui | 80
 +++++++++++++++++++++++-------------------
 2 files changed, 48 insertions(+), 44 deletions(-)

commit 7b55432a729422e2eb2cd3b5d2e6d0b8219769db
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 15 15:37:28 2012 +0100

    accounts-dialog: remove hbox_protocol

    It's not used any more since we moved adding account to a separated
    dialog.

    https://bugzilla.gnome.org/show_bug.cgi?id=670203

 src/empathy-accounts-dialog.c	|  4 ----
 src/empathy-accounts-dialog.ui | 25 -------------------------
 2 files changed, 29 deletions(-)

commit ce4c4dc698850f54dfa2409b790b2e1c747a66a6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 15 15:26:33 2012 +0100

    accounts-dialog: don't automatically open the add account

    This legacy code isn't used since a while as the assistant is
    displayed if
    there is no account.

    https://bugzilla.gnome.org/show_bug.cgi?id=670203

 src/empathy-accounts-dialog.c | 9 ---------
 1 file changed, 9 deletions(-)

commit 8586e87ddfa2b09b31aa6fe2f98bede2be4769c5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 12:01:40 2012 +0100

    import-dialog: set a verb on the 'Ok' button

    https://bugzilla.gnome.org/show_bug.cgi?id=670201

 src/empathy-import-dialog.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit bb7c70ed25061844341318d3f96c2b56beefcb5f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 15 15:22:10 2012 +0100

    import-dialog: expand and fill the import widget

    https://bugzilla.gnome.org/show_bug.cgi?id=670201

 src/empathy-import-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9e91ccd4f78115f3a57a1d678ef10f6325aeaa1c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 15 12:43:38 2012 +0100

    Pass EmpathyConnectionManagers to the import widget

    The widget doesn't have to prepare EmpathyConnectionManagers itself
    any more
    and so can populate its treeview right away. By doing so it will
    request a
    more decent size and so the dialog will actually display the
    accounts which
    can be imported without forcing user to resize it.

    https://bugzilla.gnome.org/show_bug.cgi?id=670201

 src/empathy-account-assistant.c |  3 ++-
 src/empathy-accounts-dialog.c	 |  3 ++-
 src/empathy-import-dialog.c	 | 40
 ++++++++++++++++++++++++++++++++-----
 src/empathy-import-dialog.h	 |  5 ++++-
 src/empathy-import-widget.c	 | 44
 +++++++++++++++++++++--------------------
 src/empathy-import-widget.h	 |  5 ++++-
 6 files changed, 70 insertions(+), 30 deletions(-)

commit 540ebef23ea20077e8b5d275c6114ef8bf15e05e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 15 12:05:55 2012 +0100

    factor out display_import_dialog()

    https://bugzilla.gnome.org/show_bug.cgi?id=670201

 src/empathy-accounts-dialog.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

commit 4fe19e7071092a3f886706ab185bf30bff776fce
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 15 11:33:47 2012 +0100

    remove useless include

    https://bugzilla.gnome.org/show_bug.cgi?id=670201

 src/empathy-accounts.c | 1 -
 1 file changed, 1 deletion(-)

commit 9b3306a89a8419217e9c2350d7c32c1a83704eca
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 12:43:28 2012 +0100

    coding style fixes

 libempathy-gtk/empathy-chat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 09c17d1e767b8459ff23158f35f795d16aac6a0b
Author: Wylmer Wang <wantinghard@gmail.com>
Date:	Thu Feb 16 10:06:00 2012 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po | 3109
 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 1588 insertions(+), 1521 deletions(-)

commit 1e6989eb0d805cd27b47e3d705614d1583e30a23
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Thu Feb 16 01:21:04 2012 +0400

    Updated Russian translation

 po/ru.po | 2424
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1263 insertions(+), 1161 deletions(-)

commit 5cee8ed2af554bcf03e04438dd5a47bdedadf677
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Wed Feb 15 21:52:10 2012 +0300

    Updated Belarusian translation.

 po/be.po | 277
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 145 insertions(+), 132 deletions(-)

commit 84e286a84d838896a0dc4e1a1ee9104f8c9dbabb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 10 14:54:19 2012 +0100

    empathy-chat: keep the individual manager alive as a cache

    https://bugzilla.gnome.org/show_bug.cgi?id=669676

 src/empathy-chat.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit fac52e2c170e94ecad67f3087a462baf9ba5f49e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 10 14:53:40 2012 +0100

    empathy-chat: use empathy_ensure_individual_from_tp_contact()

    This ensures we'll pass the right individual ID to gnome-contacts
    when opening
    a meta-contact.

    https://bugzilla.gnome.org/show_bug.cgi?id=669676

 libempathy-gtk/empathy-chat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 54bd693510f9aa2c1791d8ccf51f2b0371c66a3a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 10 14:52:28 2012 +0100

    add empathy_ensure_individual_from_tp_contact()

    https://bugzilla.gnome.org/show_bug.cgi?id=669676

 libempathy/empathy-utils.c | 20 ++++++++++++++++++++
 libempathy/empathy-utils.h |  3 +++
 2 files changed, 23 insertions(+)

commit 894ce49de11658ae2b66907bf609f0e6810acb3e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 10 14:40:28 2012 +0100

    add empathy_individual_manager_lookup_by_contact()

    https://bugzilla.gnome.org/show_bug.cgi?id=669676

 libempathy/empathy-individual-manager.c | 52
 +++++++++++++++++++++++++++++++++
 libempathy/empathy-individual-manager.h |  4 +++
 2 files changed, 56 insertions(+)

commit 5fd8bf412017f07d25459b0efd72c88a420bd50f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 6 15:06:47 2012 +0100

    set the presence message as a tooltip on its label

    So user can still read the full message if it has been ellipsized.

    https://bugzilla.gnome.org/show_bug.cgi?id=663627

 src/empathy-accounts-dialog.c | 3 +++
 1 file changed, 3 insertions(+)

commit be6cefc64d3893274dd907dcc094d6209b54352a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 6 15:03:58 2012 +0100

    accounts-dialog: ellipsize presence message

    Long messages make this dialog looks weird and that's not really
    the point of
    this UI to display it anyway.

    https://bugzilla.gnome.org/show_bug.cgi?id=663627

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d0dd004dda7783348d186cee7a4b344cdb6f5a6c
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Tue Feb 14 22:00:44 2012 +0100

    Updated Galician translations

 po/gl.po | 700
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 357 insertions(+), 343 deletions(-)

commit c2e269778d7e4506dd673fb1cbabe74e69c2c279
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 6 14:16:55 2012 +0100

    Display a spinner while loading contacts from Folks

    https://bugzilla.gnome.org/show_bug.cgi?id=656097

 src/empathy-roster-window.c  | 79
 ++++++++++++++++++++++++++++++++++++--------
 src/empathy-roster-window.ui | 20 +++++++++++
 2 files changed, 85 insertions(+), 14 deletions(-)

commit 6ef0203c6af78e37a6e7de79dd2bae7de870d62d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 3 16:11:47 2012 +0100

    individual-manager: add API to know when contacts have been loaded
    from folks

    https://bugzilla.gnome.org/show_bug.cgi?id=656097

 libempathy/empathy-individual-manager.c | 43
 +++++++++++++++++++++++++++++++++
 libempathy/empathy-individual-manager.h |  3 +++
 2 files changed, 46 insertions(+)

commit 45fea3c1ff003d49510819a9dd713b5d23a18244
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Tue Feb 14 10:33:25 2012 +0100

    Updated Serbian translation

 po/sr.po	| 305
 ++++++++++++++++++++++++++++++---------------------------
 po/sr@latin.po | 305
 ++++++++++++++++++++++++++++++---------------------------
 2 files changed, 316 insertions(+), 294 deletions(-)

commit 311d64031eb43286a1c209a6fc582b897f427733
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Feb 13 17:13:17 2012 +0100

    Updated Spanish translation

 po/es.po | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit e08f36f30007713c60630d735d6b724380c138fa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 13 14:31:09 2012 +0100

    tls-dialog: add accessor on the 'Continue' button

 libempathy-gtk/empathy-tls-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0b36472493f281e5fecead64e7afb38d4cc994f7
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Feb 13 12:43:40 2012 +0100

    Updated Spanish translation

 po/es.po | 290
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 150 insertions(+), 140 deletions(-)

commit f728987ff14494033cde4afa432c58671bf2615c
Author: Patrick F. Allen <pallenpost@gmail.com>
Date:	Sat Feb 11 08:52:14 2012 -0500

    Toggle telling others you are typing to them

    https://bugzilla.gnome.org/show_bug.cgi?id=668985

 data/org.gnome.Empathy.gschema.xml.in |  5 +++++
 libempathy-gtk/empathy-chat.c	       | 16 +++++++++++++++-
 libempathy/empathy-gsettings.h        |  1 +
 3 files changed, 21 insertions(+), 1 deletion(-)

commit 052ad91afd77f267d3ddedc0f32f2378d73f9897
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Sun Feb 12 16:21:41 2012 +0100

    Updated Serbian translation

 po/sr.po	| 212
 ++++++++++++++++++++++++---------------------------------
 po/sr@latin.po | 212
 ++++++++++++++++++++++++---------------------------------
 2 files changed, 180 insertions(+), 244 deletions(-)

commit 43647b4dcac0e383a88f2ad5f9e0b101de2d1831
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Sun Feb 12 11:05:39 2012 +0100

    Updated French doc translation

 help/fr/fr.po | 3858
 ++++++++++-----------------------------------------------
 1 file changed, 632 insertions(+), 3226 deletions(-)

commit b3999ece5197b67edaeb07a2faa814f9cf4a5a79
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Sat Feb 11 22:02:59 2012 +0300

    Updated Belarusian translation.

 po/be.po | 2444
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1242 insertions(+), 1202 deletions(-)

commit a8e8bd5d88bdb4a02bd40ab559bcd62612b63f9c
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Feb 10 17:47:47 2012 +0000

    Don't unhighlight chat tabs when more messages are received

    Travis noticed that if you receive a message in which you are not
    mentioned after one in which you are, the highlight on the chat tab is
    cleared. This turned out to be because the text of the chat tab label
    was set in two different places in empathy-chat-window.c: one which
    takes should_highlight into account, and one which does not.

    This patch makes EmpathyChat keep track of whether it should be
    highlighted (reusing empathy_chat_messages_read(), which is called to
    acknowledge messages as having been seen by the user, to clear the
    flag), and then uses that from one of the label-updating code
    paths and
    deletes the other.

    https://bugzilla.gnome.org/show_bug.cgi?id=669823

 libempathy-gtk/empathy-chat.c | 21 +++++++++++++++++++++
 libempathy-gtk/empathy-chat.h |  2 +-
 src/empathy-chat-window.c     | 39
 +++++++++++----------------------------
 3 files changed, 33 insertions(+), 29 deletions(-)

commit c9c63f5412fbf6f7927c857c7f8f04082abbccde
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 10 12:58:38 2012 +0100

    start_gnome_contacts: make sure individual is valid

 libempathy-gtk/empathy-individual-menu.c | 2 ++
 1 file changed, 2 insertions(+)

commit c9add0b7c2ef61469af3ba77fd6fc03dccd6733a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 10 12:58:20 2012 +0100

    fix individual_info_menu_item_activate_cb signature

 libempathy-gtk/empathy-individual-menu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 91d37340b5b2495cf8eed1f53482aa4e046964ae
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Feb 8 17:48:07 2012 +0000

    ContactInfo: always escape IRC channel names in markup

    For some reason, I chose to escape the channel name for the
    contents of
    the href='' attribute but not in the body of the tag. Thus, channel
    names like "#r&d" made Pango refuse to coöperate.

    https://bugzilla.gnome.org/show_bug.cgi?id=669695

 libempathy-gtk/empathy-contactinfo-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cb1bb584bccd7138fa1b5c27c254d01ca21c472c
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Thu Feb 9 17:29:26 2012 +0100

    Updated Spanish translation

 po/es.po | 158
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 83 insertions(+), 75 deletions(-)

commit 2cdb20a345bc961dcd3dc3fca4e7731486c22aeb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 9 16:02:44 2012 +0100

    empathy-call: call XInitThreads()

 src/empathy-call.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 31debb1f437fc32ebeb389cae1eab92388be6bea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 9 15:29:03 2012 +0100

    stop using clutter_gst_video_sink_new()

    It has been deprecated.

 src/empathy-call-window.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

commit b02e1667ba8c6e2af128ae461de082ea839dff56
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 25 14:44:09 2011 +0100

    Add a gsetting key to show/hide groups

    https://bugzilla.gnome.org/show_bug.cgi?id=627658

 data/org.gnome.Empathy.gschema.xml.in | 5 +++++
 libempathy/empathy-gsettings.h        | 1 +
 src/empathy-roster-window.c	       | 3 +++
 3 files changed, 9 insertions(+)

commit 5c9ffe720041257034f8d85d1ae5298bbdf10492
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 9 12:51:47 2012 +0100

    account-widget-jabber: doesn't allow negative priority

    Setting a negative priority secretly mean "don't send me any message"
    which
    can be very confusing.

    https://bugzilla.gnome.org/show_bug.cgi?id=669712

 libempathy-gtk/empathy-account-widget-jabber.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 53d30bf2e665665de83a13555694371e0142467f
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Thu Feb 9 12:32:06 2012 +0100

    Updated Spanish translation

 po/es.po | 259
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 122 insertions(+), 137 deletions(-)

commit 3a918bcb64fe3dd8b6cc1c6be6f74bd940a32ac4
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Thu Feb 9 11:58:59 2012 +0100

    Updated Serbian translation

 po/sr.po	| 3778
 ++++++++++++++++++++++++++++++--------------------------
 po/sr@latin.po | 3778
 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 4026 insertions(+), 3530 deletions(-)

commit 65f66ac784b3be605d4470b940ec39c0d5b4c41e
Author: Tiffany Antopolski <tiffany.antopolski@gmail.com>
Date:	Wed Feb 8 19:31:32 2012 -0500

    po: Updated en_CA.po

 po/en_CA.po | 5866
 +++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 4103 insertions(+), 1763 deletions(-)

commit 49e6e5ce115d2c6792ad16b56fcb23c0f7a1984f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 8 16:29:19 2012 +0100

    contact-widget: use 'Personal Details' when editing our own info

    https://bugzilla.gnome.org/show_bug.cgi?id=669655

 libempathy-gtk/empathy-contact-widget.c  | 9 +++++++++
 libempathy-gtk/empathy-contact-widget.ui | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

commit df46e07c93dec1d9cb3e3bee9c67f22918f40312
Author: Mako N <mako@pasero.net>
Date:	Thu Feb 9 00:25:00 2012 +0900

    [l10n] Update Japanese translation

 po/ja.po | 4347
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 2188 insertions(+), 2159 deletions(-)

commit 67f7211242e9982cf17f17ac9a5483155941312a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 8 15:12:16 2012 +0100

    Remove unused persona store/view

    https://bugzilla.gnome.org/show_bug.cgi?id=669482

 libempathy-gtk/Makefile.am		|    4 -
 libempathy-gtk/empathy-persona-store.c | 1215
 --------------------------------
 libempathy-gtk/empathy-persona-store.h |  108 ---
 libempathy-gtk/empathy-persona-view.c	|  844 ----------------------
 libempathy-gtk/empathy-persona-view.h	|   87 ---
 5 files changed, 2258 deletions(-)

commit a71aa49346ee9a6ea4c7ceb14850d58824fb36de
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 8 14:52:10 2012 +0100

    remove linking UI

    https://bugzilla.gnome.org/show_bug.cgi?id=669482

 libempathy-gtk/Makefile.am		    |	4 -
 libempathy-gtk/empathy-individual-linker.c | 779
 -----------------------------
 libempathy-gtk/empathy-individual-linker.h |  76 ---
 libempathy-gtk/empathy-linking-dialog.c    | 276 ----------
 libempathy-gtk/empathy-linking-dialog.h    |  66 ---
 po/POTFILES.in				    |	2 -
 6 files changed, 1203 deletions(-)

commit 4bd4dca988dcd4680c9a381ebe7aed881006c556
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 8 14:48:33 2012 +0100

    individual-menu: remove link-contacts-activated signal

    https://bugzilla.gnome.org/show_bug.cgi?id=669482

 libempathy-gtk/empathy-individual-menu.c | 14 --------------
 libempathy-gtk/empathy-individual-view.c | 20 --------------------
 2 files changed, 34 deletions(-)

commit f0ca8ccc9e04507a25812e7d7e4a80500daf9569
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 8 14:42:36 2012 +0100

    Remove 'Link Contact' menu item

    We want to use gnome-contacts and the 'Informations' menu item
    already starts
    it.

    https://bugzilla.gnome.org/show_bug.cgi?id=669482

 libempathy-gtk/empathy-individual-menu.c | 52
 +-------------------------------
 libempathy-gtk/empathy-individual-menu.h |  9 +++---
 src/empathy-roster-window.c		  |  1 -
 3 files changed, 5 insertions(+), 57 deletions(-)

commit 1e10d537d22441f35ad57164e2231835a85698ed
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 8 15:04:55 2012 +0100

    disable clutter deprecation warnings for now

 configure.ac | 3 +++
 1 file changed, 3 insertions(+)

commit a7d8fb33fc1173ee4414d956a12e311ba3ec4c8b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 8 15:04:24 2012 +0100

    add missing config.h

 src/empathy-rounded-actor.c	 | 1 +
 src/empathy-rounded-rectangle.c | 2 ++
 2 files changed, 3 insertions(+)

commit 05f8bd96c6fc3cc62995c24678730b9fcdda9112
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 7 17:12:15 2012 +0100

    Try installing gnome-contacts using PackageKit

    https://bugzilla.gnome.org/show_bug.cgi?id=669578

 libempathy-gtk/empathy-individual-menu.c | 52
 +++++++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 5 deletions(-)

commit 7429c7622ffad91a96df4d729637184c3044fed1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 8 11:57:05 2012 +0100

    add empathy-pkg-kit

    https://bugzilla.gnome.org/show_bug.cgi?id=669578

 libempathy/Makefile.am       |   2 +
 libempathy/empathy-pkg-kit.c | 161
 +++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-pkg-kit.h |  38 ++++++++++
 3 files changed, 201 insertions(+)

commit 1c0fc43564b2e9ca3f8a2052bb1b71e908792817
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 8 12:06:41 2012 +0100

    factor out start_gnome_contacts()

    https://bugzilla.gnome.org/show_bug.cgi?id=669578

 libempathy-gtk/empathy-individual-menu.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 8f3dc843ed74c9b7dac57d3a6ce62b9f148eb791
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 7 15:45:36 2012 +0100

    Factor out show_gnome_contacts_error_dialog()

    https://bugzilla.gnome.org/show_bug.cgi?id=669578

 libempathy-gtk/empathy-individual-menu.c | 33
 ++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

commit eb3bf07c3c1544f03c7c37cbe3fe8ef24ae5143b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 8 13:26:25 2012 +0100

    improve TP_ERROR_STR_ALREADY_CONNECTED displayed error string

    'ressource' is XMPP specific and not clear to most users.

    https://bugzilla.gnome.org/show_bug.cgi?id=632739

 libempathy/empathy-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a62b307ffba7b2b4f241ffeca381fee14f19a7b9
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	Wed Feb 8 11:06:40 2012 +0200

    [l10n] Updated Estonian translation

 po/et.po | 1247
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 657 insertions(+), 590 deletions(-)

commit 803a6c26146c716dcef8b131ac06df0808195d10
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Tue Feb 7 17:57:38 2012 +0100

    Updated Spanish translation

 po/es.po | 1800
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 903 insertions(+), 897 deletions(-)

commit 8c56829f3fa97640abf47ced7d39aa618fffe07f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 7 13:48:03 2012 +0100

    remove empathy-individual-information-dialog

    https://bugzilla.gnome.org/show_bug.cgi?id=669559

 libempathy-gtk/Makefile.am			    |	2 -
 .../empathy-individual-information-dialog.c	    | 318
 ---------------------
 .../empathy-individual-information-dialog.h	    |  60 ----
 po/POTFILES.in					    |	1 -
 4 files changed, 381 deletions(-)

commit 13940bc1a76addecce46f38446b4e39fe330e982
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 7 13:42:00 2012 +0100

    Use gnome-contacts instead of the information dialog

    https://bugzilla.gnome.org/show_bug.cgi?id=669559

 libempathy-gtk/empathy-individual-menu.c | 58
 ++++++++++++++++++++++++++++++--
 1 file changed, 56 insertions(+), 2 deletions(-)

commit bcde40a830ec9ec30aabaf1a188847f0001dbfb4
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	Tue Feb 7 14:55:25 2012 +0100

    [l10n] Updated German doc translation

 help/de/de.po | 519
 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 270 insertions(+), 249 deletions(-)

commit 0dcd0fc2081385dbe020e03a031af65372556c0c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 7 12:54:55 2012 +0100

    add missing config.h

    Need to disable GLib deprecation warnings.

 libempathy/empathy-account-settings.c	| 1 +
 libempathy/empathy-tp-streamed-media.c | 2 ++
 2 files changed, 3 insertions(+)

commit 914b18075a53425c03771e62bdfdf7431f43369f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 7 11:49:55 2012 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 41e5462f27e9c8f983adbb14b0f9450d290744aa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 7 11:31:24 2012 +0100

    Update telepathy-yell

    Needed to disable GLib deprecation warnings.

 telepathy-yell | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5d74a9c3fd712bcaff2c4eb0f189b5b6caa85329
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 6 17:40:58 2012 +0100

    prepare 3.3.5

 NEWS	      | 42 ++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 44 insertions(+), 2 deletions(-)

commit ca78627f4d8a4453baed7786e0868bb6e26356d1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 6 15:40:15 2012 +0100

    individual_menu_add_personas: remove useless variable

 libempathy-gtk/empathy-individual-menu.c | 1 -
 1 file changed, 1 deletion(-)

commit b8e7456de34fde39587b8a9429329b8867b10421
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 6 15:39:46 2012 +0100

    account_widget_generic_format_param_name: make sure param_name is
    not NULL

    This should make the clang analyzer happier.

 libempathy-gtk/empathy-account-widget.c | 2 ++
 1 file changed, 2 insertions(+)

commit 8d3dda852b7eb0e8790812b0e149d40db24dbc41
Author: Ken VanDine <ken.vandine@canonical.com>
Date:	Mon Feb 6 11:46:48 2012 +0100

    Make the default chat window size bigger.

    https://bugzilla.gnome.org/show_bug.cgi?id=612216

 src/empathy-chat-window.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d180bd8984e3d2618266c38c49033d73a24bb15e
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sun Feb 5 23:14:54 2012 +0100

    Updated Galician translations

 po/gl.po | 674
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 382 insertions(+), 292 deletions(-)

commit 48ce94c5c0ac57c263efa78e8c01717e9094ba31
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sat Feb 4 12:35:27 2012 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 84
 ++++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 55 insertions(+), 29 deletions(-)

commit 5585dfa29e70393c4e1c9637eb31c779b1dd55c9
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Sat Feb 4 15:10:15 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 599
 +++++++++++++++++++++++++++++++++--------------------------
 po/zh_TW.po | 602
 ++++++++++++++++++++++++++++++++++--------------------------
 2 files changed, 682 insertions(+), 519 deletions(-)

commit fd46ba065e8c071ac9e5bc6f098410279f3f4971
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Feb 3 16:29:07 2012 +0100

    Updated Spanish translation

 po/es.po | 70
 ++++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 44 insertions(+), 26 deletions(-)

commit 42993a422a490daa5099acbb78ebbfbbbffcea63
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 2 17:00:08 2012 +0100

    display a message if accounts need to be enabled

    https://bugzilla.gnome.org/show_bug.cgi?id=656097

 src/empathy-roster-window.c | 87
 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 83 insertions(+), 4 deletions(-)

commit df8e44cd8c2f09928d31d21540b1de47a1f757f0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 2 15:50:51 2012 +0100

    display a specific message if no account is configured

    https://bugzilla.gnome.org/show_bug.cgi?id=656097

 src/empathy-roster-window.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

commit 808aab1091606abf34fbb67b62026bd442c4c872
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 23 11:19:14 2011 +0200

    add generic contact icon and account settings button to the message
    page

    https://bugzilla.gnome.org/show_bug.cgi?id=656097

 src/empathy-roster-window.c  | 21 +++++++++++++++--
 src/empathy-roster-window.ui | 56
 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 73 insertions(+), 4 deletions(-)

commit c1adae17180cc2b1a0215fadbbfe22c701379e94
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 23 11:08:23 2011 +0200

    make code displaying the 'no match found' page more generic

    https://bugzilla.gnome.org/show_bug.cgi?id=656097

 src/empathy-roster-window.c | 44
 ++++++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 16 deletions(-)

commit fc087adb06df532cc0effaafe5f2d5a6fcb490b6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 3 12:46:48 2012 +0100

    assistant: hide the buttons in the salut widget

    https://bugzilla.gnome.org/show_bug.cgi?id=669300

 src/empathy-account-assistant.c | 2 ++
 1 file changed, 2 insertions(+)

commit 61238cb68b1e22e8ba81de45a51c2fc7057091e1
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Thu Feb 2 20:52:46 2012 +0100

    Updated Slovenian translation

 po/sl.po | 142
 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 91 insertions(+), 51 deletions(-)

commit 8af95ca397daf0b64937db5b9bb895c4e8afea9d
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Thu Feb 2 13:57:36 2012 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 151
 ++++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 100 insertions(+), 51 deletions(-)

commit c0e8af89e07427a4b6ba758fa56d33f72376ea62
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Thu Feb 2 12:23:03 2012 +0100

    Updated Spanish translation

 po/es.po | 69
 ++++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 37 insertions(+), 32 deletions(-)

commit 330028919295ad9d65334383e90b2432cb12e5fd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 23 14:46:24 2012 +0100

    presence-manager: stop watching connectivity changes

    Mission-Control does it for us now (thanks Will!).

    We don't remove empathy-connectivity yet because some Empathy
    components still
    rely on it to display the status of the network. Ideally, this
    could be
    exposed by MC as well (fdo #45126).

    https://bugzilla.gnome.org/show_bug.cgi?id=668498

 libempathy/empathy-presence-manager.c | 70
 ++---------------------------------
 1 file changed, 3 insertions(+), 67 deletions(-)

commit cdfd5215dfa3e7dfe1254f76a5eccf4b4356816d
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Feb 1 14:26:58 2012 +0000

    Chat: show who changed the subject

    https://bugzilla.gnome.org/show_bug.cgi?id=669177

 libempathy-gtk/empathy-chat.c |  9 ++++++++-
 libempathy/empathy-tp-chat.c  | 26 +++++++++++++++++++++++++-
 libempathy/empathy-tp-chat.h  |  1 +
 3 files changed, 34 insertions(+), 2 deletions(-)

commit 0dc2ba9ea63c7d7d7f46b4d4e8b9311dfad823bb
Author: Praveen Illa <mail2ipn@gmail.com>
Date:	Tue Jan 31 20:14:29 2012 +0530

    Updated Telugu Translation

 po/te.po | 2107
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1144 insertions(+), 963 deletions(-)

commit ad34beff9f4f2ff494ec309ac50e8c331670ba67
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Tue Jan 31 13:14:44 2012 +0100

    Updated Spanish translation

 po/es.po | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

commit 4467b84ce9dc2e3b369d3f0d54a2a940b2da9adb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 30 14:08:20 2012 +0100

    preferences: fix phrasing of the EMPATHY_PREFS_SOUNDS_CONTACT_LOGIN

    https://bugzilla.gnome.org/show_bug.cgi?id=666522

 src/empathy-preferences.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6048958136681930af236460e9cb159b5267c4d0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 30 15:47:23 2012 +0100

    individual_view_drag_end: remove the auto scroll

    This ensures that we'll stop scrolling if the DnD operation hasn't
    been
    completed.

    https://bugzilla.gnome.org/show_bug.cgi?id=662916

 libempathy-gtk/empathy-individual-view.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit e0396bbe64cff169221bb527836944aa96f58261
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Jan 30 18:28:30 2012 +0100

    Updated Spanish translation

 po/es.po | 76
 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 63 insertions(+), 13 deletions(-)

commit 0481b358c7a6c4336690961bb284df1370c0b29c
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Mon Jan 30 13:21:47 2012 +0000

    Don't warn before leaving disconnected chatrooms

    https://bugzilla.gnome.org/show_bug.cgi?id=591756

 src/empathy-chat-window.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

commit e59f04dbfc934003a702d3b3d1b9c24984298007
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Aug 21 01:16:48 2009 +0100

    Shorten "Leave chat room" to "Leave room"

    https://bugzilla.gnome.org/show_bug.cgi?id=591756

 src/empathy-chat-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4cdb4a49b73c5f4698e91029d555a21f4b4e55b3
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Aug 14 01:27:19 2009 +0100

    Special-case closing a window with exactly one tab

    The confirmation message when closing a window containing one tab,
    which
    is a chat room, should be identical to the confirmation message when
    closing that tab with ^W.

    https://bugzilla.gnome.org/show_bug.cgi?id=591756

 src/empathy-chat-window.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 745f697021987e296d0f3f52bcb6cfe356502160
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Mon Jan 30 13:19:36 2012 +0000

    Confirm closing windows containing chat rooms.

    Getting the messages to feel right took quite a few iterations. Maybe
    we
    need one more case: when you only have one chat room in a window, and
    nothing else, the message from closing the window should probably
    be the
    same as it would have been if you'd hit ^W.

    https://bugzilla.gnome.org/show_bug.cgi?id=591756

 src/empathy-chat-window.c | 146
 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 115 insertions(+), 31 deletions(-)

commit a6ac0f003a4f9ad6f21d98387cd6cebc72ee492f
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Aug 14 00:00:21 2009 +0100

    Confirm closing chat room tabs

    I often accidentally close tabs with Control-W, and more occasionally
    by
    clicking the [X] by mistake. This is okay for 1-1 conversations (I can
    just reopen them) but is destructive for chat rooms. So let's make the
    user confirm.

    https://bugzilla.gnome.org/show_bug.cgi?id=591756

 src/empathy-chat-window.c | 61
 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 2 deletions(-)

commit 088cc0d11c82359e9c45be8429945445731b765b
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Sat Jan 28 20:29:24 2012 +0100

    Updated Slovenian translation

 po/sl.po | 404
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 212 insertions(+), 192 deletions(-)

commit 11f7e3f371513f9013ddea7ebf518a32b4fe1a29
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sat Jan 28 15:47:34 2012 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 327
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 170 insertions(+), 157 deletions(-)

commit 1a35f5897e424a4e2273f64f428a798e0812f76f
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Thu Jan 26 21:26:00 2012 +0530

    Use gtk_list_store_insert_with_values ()

    Replace all occourances of gtk_list_store_append followed by
    gtk_list_store_set by gtk_list_store_insert_with_values

 src/empathy-debug-window.c | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

commit d5347668b9233feec489d8f1216303325d277ae7
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Thu Nov 10 07:36:16 2011 +0530

    Un-pausing incoming messages should update All's active buffer too

    https://bugzilla.gnome.org/show_bug.cgi?id=592994

 src/empathy-debug-window.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit 4a6fb67d83e54e334d3db5d975f1ff9dbddf6e14
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Fri Dec 2 16:39:36 2011 +0530

    Set window sensitivity

    https://bugzilla.gnome.org/show_bug.cgi?id=592994

 src/empathy-debug-window.c | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

commit c45bf16335ebc05661f200024d3cc4f0ecb7003f
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Fri Dec 2 16:34:29 2011 +0530

    Add incoming messages to All's buffer

    https://bugzilla.gnome.org/show_bug.cgi?id=592994

 src/empathy-debug-window.c | 48
 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 11 deletions(-)

commit 42ee3133a0cd8ba84dc31c3f97aa98d3c6503353
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Thu Dec 1 02:45:20 2011 +0530

    Refresh "All" selection's active-buffer when needed

    Add refresh_all_buffer() and call it  when either any service's
    proxy invalidates or when a service's name_owner_changed is called.
    Initially use it to populate all active buffers.

    https://bugzilla.gnome.org/show_bug.cgi?id=592994

 src/empathy-debug-window.c | 191
 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 157 insertions(+), 34 deletions(-)

commit e758dca58b4f362d35eaaf8f333ea7f20dfd8ecd
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Mon Nov 7 05:06:34 2011 +0530

    Add "All" selection to service_chooser and all_active_buffer to priv

    https://bugzilla.gnome.org/show_bug.cgi?id=592994

 src/empathy-debug-window.c | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

commit 7a6a03aff158ddc47c1f70093b1f903be2d44181
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Tue Nov 8 06:35:06 2011 +0530

    Preparing for adding "All" option to service_chooser

    -Store associations to proxies while creating them
    -Find service_store iter to store useful proxies

    https://bugzilla.gnome.org/show_bug.cgi?id=592994

 src/empathy-debug-window.c | 73
 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 60 insertions(+), 13 deletions(-)

commit d8d059db25a5775cb50cf634b339adaca182d900
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 27 14:35:27 2012 +0100

    auth-client: set keep above on dialogs

    This will avoid to accidentally 'loose' the dialog.

    https://bugzilla.gnome.org/show_bug.cgi?id=643699

 libempathy-gtk/empathy-base-password-dialog.c | 2 ++
 libempathy-gtk/empathy-tls-dialog.c	       | 2 ++
 2 files changed, 4 insertions(+)

commit 6a4d4c05d84d9f6a1188d70bd1af1df163cf3d2e
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Jan 27 15:12:17 2012 +0200

    Updated Hebrew translation.

 po/he.po | 594
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 306 insertions(+), 288 deletions(-)

commit a84d501cc9dd8d0e7e0bc725d215ae2fb1331326
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 27 13:17:21 2012 +0100

    coding style fix

 libempathy-gtk/empathy-chat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8fb729b4dfe74c1c4492d6c0cff1c960f2bdf46d
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Jan 27 12:55:55 2012 +0100

    Updated Spanish translation

 po/es.po | 54 +++++++++++++++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 21 deletions(-)

commit 6b85b98ce0dd1c8edc2ae280be62fc2c291e704f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 27 12:53:01 2012 +0100

    roster_window_connection_items_setup: remove edit_personal_information

    It has been removed from the UI file.

 src/empathy-roster-window.c | 1 -
 1 file changed, 1 deletion(-)

commit 5cadb51ab2f92b5bf13fa7ca228d2f7a9d2fea56
Merge: 2b7e8c33 a8fbf02
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 27 11:14:26 2012 +0100

    Merge remote-tracking branch 'danni/trivia'

commit 1af2b9b657046268d0a44fd2aa588ea281ad1f20
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Fri Jan 20 14:32:43 2012 +0100

    Port DTMF code to new tp-glib API

 src/empathy-call-window.c | 71
 ++++++-----------------------------------------
 1 file changed, 8 insertions(+), 63 deletions(-)

commit a8fbf027f0f8b2c4aa343db7c81f23c49ac4d3e5
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Jan 27 17:28:32 2012 +1100

    preferences: split "Open new chats in separate windows" into a
    radiobutton

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=562462

 src/empathy-preferences.c  |  6 +++---
 src/empathy-preferences.ui | 47
 +++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 43 insertions(+), 10 deletions(-)

commit 12ff2d03486c053a1c8aa2a40d05263d5656a869
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Jan 27 13:28:00 2012 +1100

    individual-store: contacts in Favourite People are not Ungrouped

    Rearrange the code that puts people into groups a bit in a way I think
    makes more sense.

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=668796

 libempathy-gtk/empathy-individual-store.c | 100
 ++++++++++++++++--------------
 1 file changed, 53 insertions(+), 47 deletions(-)

commit 2b7e8c33d6ea5d12d66cceab2719405b01be74bb
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Thu Jan 26 17:13:27 2012 +0100

    Updated Spanish translation

 po/es.po | 235
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 118 insertions(+), 117 deletions(-)

commit 52715c3cb3697474e48d4f73d9d432d6b69871a1
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Mon Nov 7 11:37:44 2011 +0530

    Factor out create_proxy_to_get_messages

    https://bugzilla.gnome.org/show_bug.cgi?id=592994

 src/empathy-debug-window.c | 95
 +++++++++++++++++++++++++++++-----------------
 1 file changed, 60 insertions(+), 35 deletions(-)

commit bb003c5d228051e1a55e401fc024ffd58eeeabb4
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Sat Oct 29 15:11:54 2011 +0530

    Debug window - Use one active buffer and one pause buffer per service

    -Remove cache and store.
    -Add one proxy and and related data per service in service_chooser
    -Add one list store per service in service_chooser to save logs
    -Make the service chooser switch the correct list store to display
    -Free proxy_data before disposing service_store
    -Fix "Clear" operation
    -Fix searching
    -Setting the correct store_filter on switching services
    -Adding COL_PAUSE_BUFFER to service_store
    -Deploy one pause-buffer per proxy

    https://bugzilla.gnome.org/show_bug.cgi?id=592994

 src/empathy-debug-window.c | 575
 ++++++++++++++++++++++++---------------------
 1 file changed, 305 insertions(+), 270 deletions(-)

commit 15333410f2df610792ea546400f841d8e6e8a1d1
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Jan 26 15:03:57 2012 +1100

    empathy-tls-dialog: add a title for screenshots

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=668681

 libempathy-gtk/empathy-tls-dialog.c | 1 +
 1 file changed, 1 insertion(+)

commit 756dbf5a7a658ba472fc63ef6034d2c4d90e3260
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Sep 13 12:55:26 2011 +0100

    Utils: provide a human-readable message for CM crashes

    https://bugzilla.gnome.org/show_bug.cgi?id=658908

    Rebased-By: Danielle Madeley <danielle.madeley@collabora.co.uk>

 libempathy/empathy-utils.c | 4 ++++
 1 file changed, 4 insertions(+)

commit ddd8a9a000833d87260f81c4459063b32e2e14e7
Merge: 6b453cf cb4d749
Author: Will Thompson <will@willthompson.co.uk>
Date:	Wed Jan 25 16:01:32 2012 +0000

    Merge branch 'highlight-regex'

commit cb4d7495d1ed8fabe40e552a4107ce6398814323
Author: Will Thompson <will@willthompson.co.uk>
Date:	Wed Jan 18 17:45:32 2012 +0000

    EmpathyChat: cache highlight regex.

 libempathy-gtk/empathy-chat.c | 62
 +++++++++++++++++++++++++++++++------------
 1 file changed, 45 insertions(+), 17 deletions(-)

commit 6b453cffcd14296f9625eb54af7cb87dc75c9c5f
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Jan 25 16:30:35 2012 +0100

    Updated Spanish translation

 po/es.po | 380
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 191 insertions(+), 189 deletions(-)

commit aebe89309d1e0296a736db5f7c51028ac21c9a71
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 25 15:48:38 2012 +0100

    org.gnome.Empathy.gschema.xml.in: fix sort-criterium's description

    https://bugzilla.gnome.org/show_bug.cgi?id=668663

 data/org.gnome.Empathy.gschema.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7fd14c14a0642b07b3bf7144429e8fc2b806715c
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Wed Jan 25 11:19:31 2012 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 248
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 120 insertions(+), 128 deletions(-)

commit 825666791c56b9050db4339f57474e2df698f891
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 24 12:03:23 2012 +0100

    accounts-dialog: don't add newly created account twice

    It used to be created once in the
    accounts_dialog_account_validity_changed_cb
    callback and once when the new account dialog is done.

    This change is actually good because now accounts are always added
    to the
    model using the same code path.

    https://bugzilla.gnome.org/show_bug.cgi?id=668372

 src/empathy-accounts-dialog.c | 78
 +++++--------------------------------------
 1 file changed, 9 insertions(+), 69 deletions(-)

commit ae60dd208860c732141e5e5ccb89c7aba18ae28c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 24 12:01:52 2012 +0100

    accounts_dialog_get_account_iter: use the COL_ACCOUNT directly

    There is no point using the EmpathyAccountSettings.

    https://bugzilla.gnome.org/show_bug.cgi?id=668372

 src/empathy-accounts-dialog.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit a58af6c844170f7451307f07a43e3416f5694ddf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 24 11:56:39 2012 +0100

    accounts-dialog: no more need to manually prepare TpAccount

    The factory does it for us now.

    https://bugzilla.gnome.org/show_bug.cgi?id=668372

 src/empathy-accounts-dialog.c | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

commit 6de7927ded5e15783b4d9d93233856d9bd373641
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 23 15:27:50 2012 +0100

    don't display 'No topic defined' if topic are not supported

    https://bugzilla.gnome.org/show_bug.cgi?id=668502

 libempathy-gtk/empathy-chat.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit 908b396bdccff3c3056a4616ae43b40d5dead990
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 23 12:29:16 2012 +0100

    IRC network dialog: use the use the right style for the buttons

 libempathy-gtk/empathy-account-widget-irc.ui | 119
 +++++++++++++++------------
 libempathy-gtk/empathy-irc-network-dialog.c  |  11 +++
 2 files changed, 77 insertions(+), 53 deletions(-)

commit 65c7d23af61ed8f6980e8bba4cb8c94c67d75977
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 23 12:05:18 2012 +0100

    status preset dialog: use the right style for the remove button

 libempathy-gtk/empathy-status-preset-dialog.ui | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 353e5e8c9d40a98048cc5e2ac8c8c0af2577457c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 23 12:05:18 2012 +0100

    favorite chatrooms dialog: use the right style for the remove button

 src/empathy-chatrooms-window.ui | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit aba616dfea6dde6e9f66a71a600d90553a04fe90
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 23 12:05:18 2012 +0100

    contact-blocking-dialog: use the right style for the remove button

 libempathy-gtk/empathy-contact-blocking-dialog.ui | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 140d5bcc021f83c8b5057c87764c72c60659c16a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 20 15:31:43 2012 +0100

    contact-widget: merge grid_contact and main_grid_contact

    No point keeping the extra widgets now.

    https://bugzilla.gnome.org/show_bug.cgi?id=666714

 libempathy-gtk/empathy-contact-widget.ui | 122
 +++++++++++++------------------
 1 file changed, 52 insertions(+), 70 deletions(-)

commit 98f5b0523f1d094f8a4e5a9b19931b74fe6b53df
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 20 15:29:36 2012 +0100

    move vbox_avatar to grid_contact

    That way the avatar is no longer miss aligned with the other fields.

    https://bugzilla.gnome.org/show_bug.cgi?id=666714

 libempathy-gtk/empathy-contact-widget.ui | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

commit 34bdfa8eb1ca1c23a72a1ef42217d1a7ec293b68
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 20 15:19:53 2012 +0100

    contact-widget: move hbox_presence to grid_contact

    There is no point keeping this even more complicated that it
    already is.

    https://bugzilla.gnome.org/show_bug.cgi?id=666714

 libempathy-gtk/empathy-contact-widget.ui | 43
 ++++++++++++--------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

commit 579a7926d682456c4f7c808b45b71d92a0362599
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 20 15:05:30 2012 +0100

    empathy-contact-widget: replace hbox_contact by a GtkGrid

    https://bugzilla.gnome.org/show_bug.cgi?id=666714

 libempathy-gtk/empathy-contact-widget.ui | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

commit 493a623ab5712ef7dd37c9e9f0a31ce8aaef7e48
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 20 15:01:51 2012 +0100

    contact-widget: stop storing hbox_contact

    It's not used.

    https://bugzilla.gnome.org/show_bug.cgi?id=666714

 libempathy-gtk/empathy-contact-widget.c | 2 --
 1 file changed, 2 deletions(-)

commit 35bc184f4aceef9a35bd320ef111f93f918e10cc
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Sat Jan 21 21:01:20 2012 +0100

    Updated Slovenian translation

 po/sl.po | 1166
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 580 insertions(+), 586 deletions(-)

commit 3b49ee26b4f7ce628a48fb7516087a8ccb389757
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Sat Jan 21 11:37:46 2012 +0100

    Updated Spanish translation

 help/es/es.po | 138
 ++++++++++++++++++++++++++--------------------------------
 1 file changed, 62 insertions(+), 76 deletions(-)

commit f51be115d8494c8cec57d60c3083e942056e9b4b
Author: Yasumichi Akahoshi <yasumichi@vinelinux.org>
Date:	Sat Jan 21 03:20:05 2012 +0900

    remove an unnecessary adjective

    Signed-off-by: Yasumichi Akahoshi <yasumichi@vinelinux.org>
    Signed-off-by: Milo Casagrande <milo@ubuntu.com>

 help/C/set-custom-status.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2e3a9988f556ae2b3f2ebddbfb439d1dcb8cda72
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 20 13:56:26 2012 +0100

    remove empathy_contact_personal_dialog_show()

 libempathy-gtk/empathy-contact-dialogs.c | 53
 --------------------------------
 libempathy-gtk/empathy-contact-dialogs.h |  1 -
 2 files changed, 54 deletions(-)

commit 37ed9b06e807879e60cc9dbc2fa5b17bc620178b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 20 13:46:08 2012 +0100

    remove 'edit->personnal information' menu

    It's done in empathy-accounts now.

    https://bugzilla.gnome.org/show_bug.cgi?id=668336

 src/empathy-roster-window-menubar.ui | 7 -------
 src/empathy-roster-window.c	      | 8 --------
 2 files changed, 15 deletions(-)

commit 7d6b4795d7a7b6e8a46e84f76b1004c800ef26ca
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 19 17:06:15 2012 +0100

    Use a localized format when displaying times

    Unfortunatelly there is no localized format displaying only the
    hour and
    minutes (bug #668323) so we'll have to use %X for now which also
    display the
    seconds.

    EMPATHY_DATE_FORMAT_DISPLAY_SHORT was already localized so this one
    is fine.

    That also means we don't have to translate those formats any more
    as we'll
    just rely on the system env.

    https://bugzilla.gnome.org/show_bug.cgi?id=608474

 libempathy/empathy-time.h | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

commit 11de29cc7c7b7d6047837b51155b768b0e8f9a4b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 19 15:53:54 2012 +0100

    empathy-time: port to TP coding style

    https://bugzilla.gnome.org/show_bug.cgi?id=608474

 libempathy/empathy-time.c | 155
 ++++++++++++++++++++++++----------------------
 libempathy/empathy-time.h |  11 ++--
 2 files changed, 85 insertions(+), 81 deletions(-)

commit 9221d9bab4675f79370ccb6e675a32f0e0c5a707
Author: Marek Černocký <marek@manet.cz>
Date:	Thu Jan 19 22:22:04 2012 +0100

    Updated Czech translation

 po/cs.po | 1693
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 822 insertions(+), 871 deletions(-)

commit b732f5a86a99d2e778e222af729a1b27321a4476
Author: Tiffany Antopolski <tiffany.antopolski@gmail.com>
Date:	Thu Jan 19 14:17:15 2012 -0500

    help: fixed cause of validation error

    - removed groups element from irc-manage page.
    This element causes the page not to validate.

 help/C/irc-manage.page | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 4640969403212820e9958a9a207c2516927c5607
Author: Yasumichi Akahoshi <yasumichi@vinelinux.org>
Date:	Sun Jan 8 09:42:31 2012 +0900

    update mark to add custom message as a favorite

    Signed-off-by: Yasumichi Akahoshi <yasumichi@vinelinux.org>

    https://bugzilla.gnome.org/show_bug.cgi?id=667467

 help/C/set-custom-status.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 942c3cda8c8c763e22a89682d7d4c9decd40abf1
Author: Yasumichi Akahoshi <yasumichi@vinelinux.org>
Date:	Sat Jan 7 23:34:17 2012 +0900

    Remove about Add New Preset section on the Saved Presets box

    Signed-off-by: Yasumichi Akahoshi <yasumichi@vinelinux.org>

    https://bugzilla.gnome.org/show_bug.cgi?id=667467

 help/C/set-custom-status.page | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

commit 871b0cfc0ac908b58177ab6dd591f595621fc9d2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 19 11:47:06 2012 +0100

    empathy-tls-test: use g_assert_(no_)error()

    https://bugzilla.gnome.org/show_bug.cgi?id=668186

 tests/empathy-tls-test.c | 45
 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

commit 695ff499339de5c99023a227ff022d8a70466436
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 19 11:23:38 2012 +0100

    empathy-irc-network-manager-test: use more specific assertions

    They are more useful for debugging when the test is failing.

    https://bugzilla.gnome.org/show_bug.cgi?id=668186

 tests/empathy-irc-network-manager-test.c | 43
 ++++++++++++++++----------------
 1 file changed, 21 insertions(+), 22 deletions(-)

commit 4280d01cb8eca11f4b076076f112d0b28560a402
Author: Will Thompson <will@willthompson.co.uk>
Date:	Wed Jan 18 17:26:15 2012 +0000

    EmpathyChat: track self contact.

 libempathy-gtk/empathy-chat.c | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

commit 06c82312669b409db53928d6d5fbe21ad3f5569a
Author: Will Thompson <will@willthompson.co.uk>
Date:	Wed Jan 18 16:57:51 2012 +0000

    TpChat: add a :self-contact property.

 libempathy/empathy-tp-chat.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

commit 6d3a71637df970d2cf52d653399b66a213bae502
Author: Will Thompson <will@willthompson.co.uk>
Date:	Wed Jan 18 16:40:16 2012 +0000

    Don't highlight messages in 1-1 chats.

    https://bugzilla.gnome.org/show_bug.cgi?id=576912

 libempathy-gtk/empathy-chat.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 7e3040b5be5fd1e4793ba14c89a380b8e526b499
Author: Will Thompson <will@willthompson.co.uk>
Date:	Wed Jan 18 16:37:17 2012 +0000

    Don't highlight messages the user sent themself

    If a message is outgoing, then why on earth would we check whether it
    mentions our own nick and highlight it?

 libempathy-gtk/empathy-chat.c | 4 ++++
 1 file changed, 4 insertions(+)

commit b12ce233dce1dcd581b34ea9944e36e59f511497
Author: Will Thompson <will@willthompson.co.uk>
Date:	Wed Jan 18 16:31:28 2012 +0000

    Move empathy_message_should_highlight to EmpathyChat

    This will give us a place to cache the GRegex object. (Of course, this
    also depends on monitoring changes to the TpChat's self contact's
    alias,
    and changes to the TpChat's self contact!)

 libempathy-gtk/empathy-chat.c | 74
 +++++++++++++++++++++++++++++++++++++++++--
 libempathy/empathy-message.c  | 70
 ----------------------------------------
 libempathy/empathy-message.h  |  1 -
 3 files changed, 71 insertions(+), 74 deletions(-)

commit be14bbb863d0fc83402f9307e5193175d77e6d0d
Author: Will Thompson <will@willthompson.co.uk>
Date:	Wed Jan 18 16:03:00 2012 +0000

    EmpathyChat: include should_highlight in ::new-message

    This allows EmpathyChatWindow to use this rather than calling
    empathy_message_should_highlight() itself.

 libempathy-gtk/empathy-chat.c | 13 +++++++++++--
 src/empathy-chat-window.c     |  3 ++-
 2 files changed, 13 insertions(+), 3 deletions(-)

commit 3030fa4e082c695fa25b564e513307f3423feaae
Author: Will Thompson <will@willthompson.co.uk>
Date:	Wed Jan 18 15:54:48 2012 +0000

    chat_view_append_message: take a should_highlight argument

    Rather than the EmpathyChatView implementations calling
    empathy_message_should_highlight() themselves, this patch makes
    EmpathyChat take responsibility for doing so.

    The theme preview in Preferences, whether deliberately or otherwise,
    highlights the line in which Juliet mentions Romeo. This behaviour is
    preserved.

 libempathy-gtk/empathy-chat-text-view.c |  6 ++++--
 libempathy-gtk/empathy-chat-text-view.h |  3 ++-
 libempathy-gtk/empathy-chat-view.c	 |  6 ++++--
 libempathy-gtk/empathy-chat-view.h	 |  6 ++++--
 libempathy-gtk/empathy-chat.c		 |  9 ++++++---
 libempathy-gtk/empathy-theme-adium.c	 | 19 ++++++++++++-------
 libempathy-gtk/empathy-theme-boxes.c	 |  3 ++-
 libempathy-gtk/empathy-theme-irc.c	 |  5 +++--
 src/empathy-preferences.c		 | 16 +++++++++-------
 9 files changed, 46 insertions(+), 27 deletions(-)

commit aded85c91fb409bafb06492ddb85aa1224178d4c
Author: Will Thompson <will@willthompson.co.uk>
Date:	Wed Jan 18 15:41:07 2012 +0000

    Use /\b<nickname>\b/ to decide whether to highlight

    The current highlighting code finds the first occurrence of the
    nickname, then checks whether the characters before or after are a
    space, a comma, a colon or a full stop (or the start or end of the
    string). This means that someone saying “no! That's wjt’s
    coffee!”
    didn’t highlight me, because the apostrophe isn't in the
    whitelist. It
    also means that saying “borrow some Sudafed from daf” would not
    highlight daf, since the first match is in the middle of a word.

    We’re trying to check whether the nickname occurs as a complete word
    within the message. The regex metacharacter \b matches word
    boundaries,
    so /\b<nickname>\b/ is what we actually want. It gets the above cases
    right, including Unicode punctuation.

    https://bugzilla.gnome.org/show_bug.cgi?id=591667

 libempathy/empathy-message.c | 67
 ++++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

commit 449c56b28d41ddbb13e8d206b9d1fbabca7e2ec6
Author: Daniel Nylander <po@danielnylander.se>
Date:	Wed Jan 18 12:53:20 2012 +0100

    Updated Swedish translation

 po/sv.po | 1964
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 996 insertions(+), 968 deletions(-)

commit 0c6e567a85e8c42cc182ae82e4924e90656bcfd9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 17 11:12:24 2012 +0100

    account-widget: allow JID such as 'test@localhost'

    Thanks to marc@ttux.net for his help.

    https://bugzilla.gnome.org/show_bug.cgi?id=660856

 libempathy-gtk/empathy-account-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 25a44d2984058a38f54ab6bd68027e524342e34b
Merge: f17363e 5c615ca
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Jan 17 20:10:43 2012 +1100

    Merge branch 'master' into call1

commit 5c615ca9c2ffcff23925c154e36dfeccf416ec30
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Jan 17 14:30:06 2012 +1100

    client-factory: ensure alias, presence, capabilities and avatar
    are prepared

    Sometimes contacts are assumed to have these features prepared,
    but they
    don't always. Ensure they are prepared by the factory.

 libempathy/empathy-client-factory.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

commit 40aba36f8560ebbeae32c29f472576f80adec1e9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 16 15:38:37 2012 +0100

    don't free content of the list returned by
    empathy_connection_aggregator_get_all_groups()

    https://bugzilla.gnome.org/show_bug.cgi?id=667037

 libempathy-gtk/empathy-groups-widget.c     | 2 --
 libempathy/empathy-connection-aggregator.c | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

commit 4da0bbd6898436255b87ffb63fdcf775f56e5a2c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 16 15:12:56 2012 +0100

    empathy_pixbuf_avatar_from_individual_scaled_async: set an error if
    no avatar

    It's fair for the caller to expect the error the be set if the
    _finish()
    function returns NULL.

    https://bugzilla.gnome.org/show_bug.cgi?id=667037

 libempathy-gtk/empathy-ui-utils.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

commit 6e04fce7fe6049e84942dcbd0b91fc44563ba116
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Mon Jan 16 23:11:20 2012 +0100

    Updated Galician translations

 help/gl/gl.po |  496 ++--
 po/gl.po      | 8732
 +++++++++++++++++++++++++++++++++------------------------
 2 files changed, 5259 insertions(+), 3969 deletions(-)

commit 45b7632a02c8f6bd767523267c7301b6dae14d25
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Mon Jan 16 23:07:20 2012 +0100

    Updated Galician translations

 po/gl.po | 8716
 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 3727 insertions(+), 4989 deletions(-)

commit dba450354753a68be5105625af31b64bd9f31d06
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Mon Jan 16 17:07:24 2012 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 2491
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1230 insertions(+), 1261 deletions(-)

commit ff5701188b373415b14aaf3d8166fb91d5b4f878
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 16 16:47:53 2012 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 478c74c916a3c49ed47de530c8b10f2042a4622f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 16 16:29:44 2012 +0100

    prepare 3.3.4

 NEWS	      | 40 ++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 42 insertions(+), 2 deletions(-)

commit 1eef5e7b371f1344300785d2b8a2c048fb7c3e8f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 16 14:44:47 2012 +0100

    individual-view: remove GTK+ workarounds

    They have been properly fixed since a while.

 libempathy-gtk/empathy-individual-view.c | 68
 --------------------------------
 1 file changed, 68 deletions(-)

commit b0919fe6aab968756a0a7feb072fc49764862709
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 16 14:34:55 2012 +0100

    empathy_account_get_error_message: get the reason before displaying it

 libempathy/empathy-utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d59b7870dbd7afd1e63f94d953a35306d7b9909c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 16 14:32:55 2012 +0100

    coding style fix

 libempathy/empathy-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c3c1f1ff6c2425e7a1657b9b45789fcf5e0c163b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 16 11:43:40 2012 +0100

    individual-view: use tp_g_signal_connect_object() to connect the
    destroy sig

    This ensure that we won't call the callback when disposing the widget.

    https://bugzilla.gnome.org/show_bug.cgi?id=667676

 libempathy-gtk/empathy-individual-view.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 22da56b2392a9470f50c1da6b54f8e5aebf7ac4a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 16 10:37:26 2012 +0100

    filter_result_callback_data_new: add some checks

 libempathy-gtk/empathy-account-chooser.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 239bffa02a58062e11e55c0373a233c5939cb4b3
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sun Jan 15 15:46:09 2012 +0100

    Updated Galician translations

 po/gl.po | 3292
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1645 insertions(+), 1647 deletions(-)

commit 7bd2be908e8d44d94166e8ae1f07358869bec879
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Sat Jan 14 20:23:38 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1734
 +++++++++++++++++++++++++++++------------------------------
 po/zh_TW.po | 1734
 +++++++++++++++++++++++++++++------------------------------
 2 files changed, 1730 insertions(+), 1738 deletions(-)

commit 33ac7ba3dc0edfeef85b739c6927cdd1d13cc4db
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	Fri Jan 13 19:08:53 2012 +0100

    Updated Slovenian translation

 help/sl/sl.po | 491
 ++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 288 insertions(+), 203 deletions(-)

commit aae2203f1051c8ce9c8a09516e7cc9b9fcc4da5b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 13 16:25:55 2012 +0100

    account-widget-irc: fix label position in the grid

 libempathy-gtk/empathy-account-widget-irc.ui | 1 +
 1 file changed, 1 insertion(+)

commit b980b235c35a6cd040d539da0f675d83d2356049
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 13 16:03:25 2012 +0100

    be less restrictive regarding the Service format

 libempathy-gtk/empathy-irc-network-chooser.c | 28
 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

commit e1f5315d0733134b9ce40a40c1e8ffe2c4eb78b1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 13 15:41:18 2012 +0100

    irc-network-chooser-dialog: be more NULL-safe

 libempathy-gtk/empathy-irc-network-chooser-dialog.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 362f0f152b4c84e0b0cb7a46ecc4a7386fea1726
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 13 14:57:00 2012 +0100

    irc-network-chooser: set the account service

    https://bugzilla.gnome.org/show_bug.cgi?id=667791

 libempathy-gtk/empathy-irc-network-chooser.c | 35
 ++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

commit 2a7fa12bcf9c0ee5a9ff506bc88af2194990dabc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 13 14:56:41 2012 +0100

    account-settings: allow to change the service

    https://bugzilla.gnome.org/show_bug.cgi?id=667791

 libempathy/empathy-account-settings.c | 44
 +++++++++++++++++++++++++++++++++++
 libempathy/empathy-account-settings.h |  3 +++
 2 files changed, 47 insertions(+)

commit f17363e49737c2ad6bf304d7ed1dd2ccf8ca2b4c
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Jan 13 13:15:46 2012 +1100

    call-handler: also accept outgoing calls immediately

    Outgoing calls are in PENDING_INITIATOR until you accept them, So
    Empathy would never actually start dialing an outgoing call until you
    redialled and it got picked up by the other codepath, which accepts
    immediately.

 src/empathy-call-handler.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

commit ddb4928052ff303f024ea9b69e10064fade790a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 12 12:25:21 2012 +0100

    roster-window: watch for TpAccount:connection changes

    The account being connected isn't longer enough to ensure that its
    TpConnection is defined.

    https://bugzilla.gnome.org/show_bug.cgi?id=667743

 src/empathy-roster-window.c | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

commit 4fcf2a8de21bc613d9cbaafd59fc93c854905a90
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 12 12:19:30 2012 +0100

    roster-window: factor out add_account()

    Also fix a stupid bug where roster_window_account_removed_cb()
    was called on a
    valid account in roster_window_account_validity_changed_cb().

    https://bugzilla.gnome.org/show_bug.cgi?id=667743

 src/empathy-roster-window.c | 52
 ++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

commit ab7a79c4f87cee1ae9811da921c2a03abacec7b5
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Jan 12 16:59:45 2012 +1100

    call-handler: check the state before deferring the accept()

    Xavier's previous patch delayed calling accept() until the channel was
    in the INITIALISED state, however, if the channel is already in the
    INITIALISED state by the time we receive it, we should just accept
    immediately. Otherwise we'll spend our lives waiting for a state
    transition that will never occur.

 src/empathy-call-handler.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 03a2ddbde7bd15e6601f3b3e6bd2b5cc269df498
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Tue Jan 10 15:17:39 2012 +0100

    Wait for call state to be INITIALISED before accepting incoming call

 src/empathy-call-handler.c | 47
 +++++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 21 deletions(-)

commit af4d97822b9055fd8a7670b53b28c7c1f820ec65
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Nov 14 11:23:57 2011 +0100

    Remove tp-yell and use TpCallChannel

 .gitmodules				  |   3 -
 Makefile.am				  |   2 +-
 autogen.sh				  |  13 ---
 configure.ac				  |  15 +--
 data/Empathy.Call.client		  |  16 ++--
 libempathy-gtk/empathy-call-utils.c	  |  89 ++++++++++++++++-
 libempathy-gtk/empathy-call-utils.h	  |   5 +
 libempathy-gtk/empathy-log-window.c	  |   8 +-
 libempathy-gtk/empathy-new-call-dialog.c |   2 -
 libempathy/Makefile.am			  |   2 -
 libempathy/empathy-client-factory.c	  |  35 -------
 libempathy/empathy-contact.c		  |  15 ++-
 src/Makefile.am			  |   2 -
 src/empathy-call-factory.c		  | 112 +++++-----------------
 src/empathy-call-handler.c		  | 160
 +++++--------------------------
 src/empathy-call-handler.h		  |   4 +-
 src/empathy-call-observer.c		  |  12 +--
 src/empathy-call-window.c		  |  63 ++++++------
 src/empathy-call-window.h		  |   2 +-
 src/empathy-call.c			  |   6 +-
 src/empathy-event-manager.c		  |  45 +++++----
 src/empathy-notifications-approver.c	  |  11 +--
 src/empathy.c				  |   3 -
 telepathy-yell				  |   1 -
 24 files changed, 230 insertions(+), 396 deletions(-)

commit 66e1966ee3b3303968997f229f62ada8d7b519ba
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 10 14:10:24 2012 +0100

    roster-window: use self->priv pattern

 src/empathy-roster-window.c | 831
 +++++++++++++++++++++-----------------------
 src/empathy-roster-window.h |	 6 +-
 2 files changed, 390 insertions(+), 447 deletions(-)

commit e98cfa89058ed2484e432496918290dc5327b407
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 10 13:13:31 2012 +0100

    roster-window: port to new coding style

    While I'm modyfing this file, best to do it now.

 src/empathy-roster-window.c | 3718
 ++++++++++++++++++++++---------------------
 src/empathy-roster-window.h |	 16 +-
 2 files changed, 1874 insertions(+), 1860 deletions(-)

commit 937cddcf2bb9ec3039092841553603a60ee496b5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 10 12:27:11 2012 +0100

    rename MainWindow to RosterWindow

    With the process split it doesn't really make sense to continue
    calling it
    'main' window, it's just the roster now.

 po/POTFILES.in			      |    6 +-
 src/Makefile.am		      |    6 +-
 src/empathy-event-manager.c	      |   14 +-
 src/empathy-main-window-menubar.ui   |  308 ----
 src/empathy-main-window.c	      | 2598
 ----------------------------------
 src/empathy-main-window.h	      |   63 -
 src/empathy-main-window.ui	      |  111 --
 src/empathy-roster-window-menubar.ui |  308 ++++
 src/empathy-roster-window.c	      | 2598
 ++++++++++++++++++++++++++++++++++
 src/empathy-roster-window.h	      |   63 +
 src/empathy-roster-window.ui	      |  111 ++
 src/empathy.c			      |   12 +-
 12 files changed, 3099 insertions(+), 3099 deletions(-)

commit abd40a92cc32ddabb8aa9cdcfeb7dac696dd04bf
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:	Mon Jan 9 15:47:36 2012 +0100

    EmpathySoundManager: passing a GtkWidget is optional

 libempathy-gtk/empathy-sound-manager.c | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

commit e321b0ea9020482db3df359b6c4c4a645d6eaf64
Author: Jovanka Gulicoska <jovanka.gulicoska@gmail.com>
Date:	Tue Jan 10 00:12:03 2012 +0100

    Disable join button when protocol irc is selected

 src/empathy-new-chatroom-dialog.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 7d7083dd159bc1209ea8a8ea48f5465fefa078f8
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Mon Jan 9 12:41:53 2012 +0100

    Fix a doubled word in the Hungarian translation

 po/hu.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 8989ff00aa5c66026d781fb4f34624fde3c30d22
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Sat Jan 7 20:04:12 2012 +0400

    Updated Russian translation

 po/ru.po | 828
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 413 insertions(+), 415 deletions(-)

commit b4577db9026c19a1d1eaf3bdfe45a9e41b35698f
Author: Jovanka Gulicoska <jovanka.gulicoska@gmail.com>
Date:	Fri Jan 6 14:01:22 2012 +0100

    added # in join room when irc protocol selected

    https://bugzilla.gnome.org/show_bug.cgi?id=631236

 src/empathy-new-chatroom-dialog.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 0c03c67b2c8cd5190c7c1920ba315ebbfa2285c7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 5 17:12:16 2012 +0100

    contact-chooser: keep a ref on the TpContact we requested

    Kinda hacky but that's the best we can do without major changes
    in Folks.

    https://bugzilla.gnome.org/show_bug.cgi?id=666531

 libempathy-gtk/empathy-contact-chooser.c | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

commit 697acf40e5d3f44ead77fdd51b0aa71a738d1eeb
Author: Hannie Dumoleyn <hannie@ubuntu-nl.org>
Date:	Mon Jan 2 18:11:05 2012 +0100

    [l10n] Updated Dutch translation

 po/nl.po | 2008
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 1069 insertions(+), 939 deletions(-)

commit 93e76b04ce4c16291d212c63c0206e91febe5315
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	Mon Jan 2 17:13:17 2012 +0200

    [l10n] Updated Estonian translation

 po/et.po | 318
 ++++++++++++++++++++-------------------------------------------
 1 file changed, 101 insertions(+), 217 deletions(-)

commit c10fa04e6372908649f17db2009dd77b8267bd3c
Author: Muhammet Kara <muhammet.k@gmail.com>
Date:	Sat Dec 31 14:38:55 2011 +0200

    [l10n]Updated Turkish translation

 po/tr.po | 1708
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 845 insertions(+), 863 deletions(-)

commit 2efd0c20c82c70b782aec00fa5a73ed48bb1fb5c
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Dec 30 10:45:57 2011 +0200

    Updated Hebrew translation.

 po/he.po | 769
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 383 insertions(+), 386 deletions(-)

commit d0e964361b221b9023717ae108ab433316a9e256
Author: Kasia Bondarava <kasia.bondarava@gmail.com>
Date:	Wed Dec 28 23:43:27 2011 +0300

    Updated Belarusian translation.

 po/be.po | 1705
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 841 insertions(+), 864 deletions(-)

commit f89077fe388be21878f3eea779c41cd1b56ad93b
Author: Jovan Naumovski <jovan3.14@gmail.com>
Date:	Sat Dec 24 17:01:56 2011 +0100

    Added Macedonian translation.

 po/mk.po | 5357
 ++++++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 4336 insertions(+), 1021 deletions(-)

commit 3e3f16d2a00f96cd6fd1087f11697a657c228a98
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Dec 23 14:52:14 2011 +0100

    Updated Spanish translation

 po/es.po | 1088
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 540 insertions(+), 548 deletions(-)

commit 27a35799bce6253920f31094813a1dc7b8f8e5e6
Author: Andiswa Mvanyashe <andiswamva@webmail.co.za>
Date:	Fri Dec 23 13:49:47 2011 +0200

    New translatino for Xhosa (xh)

 po/LINGUAS |	 1 +
 po/xh.po   | 4793
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 4794 insertions(+)

commit b8249cef8a797d47b15b6f5d24c4ca8667efeee6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 11 18:27:18 2011 -0400

    individual-widget: display champlain map in tooltips

    https://bugzilla.gnome.org/show_bug.cgi?id=661500

 libempathy-gtk/empathy-individual-widget.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 28e7dfce3fc32da715cb478032393ec0707abc5f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 22 12:58:51 2011 +0100

    Check for champlain 0.12.1

    We don't strictly depend on it but maps in tooltips will crash as
    hell with
    any previous version.

    https://bugzilla.gnome.org/show_bug.cgi?id=661500

 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 3712762752995bca3c88ed9469310c6c4ab75f59
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 11 18:25:53 2011 -0400

    individual_grid_destroy: remove the ChamplainEmbedView from its
    container

    The EmpathyIndividualWidget object is re-used for tooltips so we
    should remove
    the ChamplainEmbedView before trying to add a new one.

    https://bugzilla.gnome.org/show_bug.cgi?id=661500

 libempathy-gtk/empathy-individual-widget.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit 1ea33f5b927b7192a5339be9a377a7b288cd5fee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 22 12:35:31 2011 +0100

    POTFILES.in: add empathy-new-account-dialog.c

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit 15d88648810843c23ac86ff2321828dc35d57f5d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 21 16:30:04 2011 +0100

    accounts-dialog: remove protocol chooser

 src/empathy-accounts-dialog.c | 99
 -------------------------------------------
 1 file changed, 99 deletions(-)

commit d8e5f5d2ec4a2c3582d6764ea388e91ad91a45c6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 21 16:24:56 2011 +0100

    accounts-dialog: use the new account dialog

 src/empathy-accounts-dialog.c | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

commit 9e63d5fc6b9c74eb9a9961640be621ea2ce6c931
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 21 12:19:13 2011 +0100

    add new-account-dialog

    This introduces some code duplication with the assistant but it's
    going to die
    soon anyway.

 libempathy-gtk/Makefile.am		     |	 2 +
 libempathy-gtk/empathy-new-account-dialog.c | 212
 ++++++++++++++++++++++++++++
 libempathy-gtk/empathy-new-account-dialog.h |	59 ++++++++
 3 files changed, 273 insertions(+)

commit cab7c95744e79a978a230a10782d236d9d9c414f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 21 16:19:53 2011 +0100

    account-widget: display the buttons in simple mode as well

    We'll need them when creating the account. Adding a simple function to
    manually hide them in the assistant for now.

 libempathy-gtk/empathy-account-widget.c | 110
 ++++++++++++++++----------------
 libempathy-gtk/empathy-account-widget.h |   2 +
 src/empathy-account-assistant.c	 |   2 +
 3 files changed, 59 insertions(+), 55 deletions(-)

commit 5ee93d665b7d46df8453764a9330e7ac1d5e2242
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 21 15:28:35 2011 +0100

    account_dialog_create_edit_params_dialog: don't connect
    account-created signal

    This signal will never be fired when editing an existing account.

 src/empathy-accounts-dialog.c | 24 ------------------------
 1 file changed, 24 deletions(-)

commit fd982ae92ddb1e9fd66e8a3fead2363f2028477a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 21 11:27:56 2011 +0100

    account-widget: modernize dipose function

 libempathy-gtk/empathy-account-widget.c | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

commit 4eda4ec0acb993986e378b6b9c5f36f88ff193f1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 21 11:25:08 2011 +0100

    account-widget: use the self->priv pattern

    I'm changing this file a lot so while I'm on it...

 libempathy-gtk/empathy-account-widget.c | 609
 +++++++++++++++-----------------
 libempathy-gtk/empathy-account-widget.h |   4 +-
 2 files changed, 287 insertions(+), 326 deletions(-)

commit 487a47c79abbcc6876b9b71b85d7c0923711da39
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 20 14:50:35 2011 +0100

    don't use deprecated GTK+ API

 src/empathy-accounts-dialog.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c6340f58a4d01b70c59d224ece8994e613d0fd47
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 19 14:28:45 2011 +0100

    display the editor on top

 src/empathy-accounts-dialog.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 4ac8b47ea3be8a91f2ccc1c0a49aaa69e4aaed9e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 19 12:39:01 2011 +0100

    properly handle accounts using an external storage

 libempathy-gtk/empathy-account-widget.c | 228
 +++-----------------------------
 src/empathy-accounts-dialog.c		 | 112 +++++++++++++++-
 2 files changed, 129 insertions(+), 211 deletions(-)

commit ea82d4be5876f8adb5d958359019d76b65669841
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 16 16:07:46 2011 +0100

    No need to manually prepare the connection

    tp-glib does it for us now, thanks to the EmpathyClientFactory.

 src/empathy-accounts-dialog.c | 34 +++++++++-------------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

commit 08dfc1a2e4c9dd8e01cab338127c15d6a7ab51de
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 16 15:52:26 2011 +0100

    we can now use the stock close button

    We should use the official accelerator for closing dialog. If
    widget fields
    are also using the 'C' accelerator then they should be fixed.

 libempathy-gtk/empathy-account-widget.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

commit 5d7d9fdcd879d3a6ccf93eb234d38bbb45701fa9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 16 15:44:51 2011 +0100

    remove old comment

    We fire the close signal a bit later in this function

 libempathy-gtk/empathy-account-widget.c | 1 -
 1 file changed, 1 deletion(-)

commit 5f3cc8ffd55be5845410d94d900c4215145bab57
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 16 15:36:25 2011 +0100

    no need to control the cancel button sensitivity any more

    It should also be displayed now as we always want the user to be
    able to close
    the dialog.

 libempathy-gtk/empathy-account-widget.c | 2 --
 1 file changed, 2 deletions(-)

commit 0691f67b1625f98bc403ee1fa84b5da3b862f856
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 16 15:30:03 2011 +0100

    add some padding in the edit conn settings dialog

    Looks better that way.

 src/empathy-accounts-dialog.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit c98ccae7f1b293302018206dfbeae5c461c6cd15
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 16 14:35:38 2011 +0100

    add an accelerator to open the params dialog

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d78c414be20144cc84e697f2ad57600c4620423a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 16 14:31:00 2011 +0100

    pass a second NULL pointer to gtk_dialog_new_with_buttons()

    It makes gcc happier.

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f2b53c32d44e3a670f266f542c571ff345cbfe55
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Jul 15 17:27:34 2011 +1000

    Don't show the presence twice

 libempathy-gtk/empathy-contact-widget.c | 4 +++-
 libempathy-gtk/empathy-contact-widget.h | 1 +
 src/empathy-accounts-dialog.c		 | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

commit 7a41e2170d529039dfa14cdeeae067b916dad3cb
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Jun 24 13:51:33 2011 +0800

    Make it possible to add/remove/edit accounts without it crashing
    everywhere

 src/empathy-accounts-dialog.c | 65
 ++++++++-----------------------------------
 1 file changed, 11 insertions(+), 54 deletions(-)

commit 81ad14a2dbcb5d71ed7befff0c7e2d7516a24dcd
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Jun 21 21:00:07 2011 +0800

    Add a close signal, emitted by both cancel and apply

 libempathy-gtk/empathy-account-widget.c | 14 ++++++++++++++
 src/empathy-accounts-dialog.c		 |  9 ++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

commit 88df5753cb658269ef9609825cd494ac463e0d6d
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Jun 16 17:58:03 2011 +0100

    Begin combining the dialogs

    This is not functional yet, but it does compile and kindof demonstrate
    what's
    going to happen.

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=652670

 libempathy-gtk/empathy-account-widget.c |   5 +-
 src/empathy-accounts-dialog.c		 | 180
 ++++++++++++++++++++++++++++----
 2 files changed, 164 insertions(+), 21 deletions(-)

commit bd4d801363ed6a5457c50d9c8e138c4f0e18f4b9
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Wed Dec 21 14:07:49 2011 +0100

    Updated French doc translation

 help/fr/fr.po | 348
 ++++++++++++++++++++++++++--------------------------------
 1 file changed, 154 insertions(+), 194 deletions(-)

commit 60b49998c25f766c48e15a040128660d3ba17502
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Tue Dec 20 13:18:12 2011 +0100

    Updated Spanish translation

 help/es/es.po | 258
 +++++++++++++++++++++++++++++++---------------------------
 1 file changed, 138 insertions(+), 120 deletions(-)

commit 63ccd06c5f862c1655c83b6f620e015516501439
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Mon Dec 19 22:10:21 2011 +0100

    [help] Reworked the search conversation topic

	* Small work on the previous conversation topic in order
	  to address the new UI. Topic needs to be reviewed.

 help/C/prev-conv.page | 43 ++++++++++++++++---------------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

commit c1efd868352810864c8df225a6ab9fa60a4ab999
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Mon Dec 19 22:09:08 2011 +0100

    [help] Fixed UI reference in the help

	* Fixed UI reference in the add and delete account pages,
	  the button changed with the new Gnome theme

 help/C/add-account.page    | 24 +++++++++++++-----------
 help/C/remove-account.page |  8 ++++----
 2 files changed, 17 insertions(+), 15 deletions(-)

commit 441abec78cd45145319450e90d8e849a2d49f382
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Mon Dec 19 18:14:49 2011 +0100

    Updated Polish translation of help

 help/pl/pl.po | 197
 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 94 insertions(+), 103 deletions(-)

commit baf4ca3e9d60c29cedf1fd5e1b248f8103514831
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 19 17:37:51 2011 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0dea7048b8ace3c52b692f41715906393e3f3bd5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 19 17:30:11 2011 +0100

    coding style fix

 libempathy-gtk/empathy-ui-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 11812b89c0872bdf76030bafacfe1015749c6a91
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 19 17:15:56 2011 +0100

    prepare 3.3.3

 NEWS	      | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 57 insertions(+), 2 deletions(-)

commit a85a11da129679dcc8a6bfc350462fcf1e877f97
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 9 17:16:06 2011 +0100

    empathy_chat_window_present_chat: move to the chat window desktop

    This is more coherent with Shell's 'app is ready' notication which
    moves the
    view to the app desktop rather than moving the app itself.

    https://bugzilla.gnome.org/show_bug.cgi?id=649208

 src/empathy-chat-window.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit e0a06689b716a02927433796dfb1a1cc7b7820e4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 9 17:05:28 2011 +0100

    add empathy_move_to_window_desktop

    https://bugzilla.gnome.org/show_bug.cgi?id=649208

 libempathy-gtk/empathy-ui-utils.c | 117
 ++++++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-ui-utils.h |   3 +
 2 files changed, 120 insertions(+)

commit 28034fa56b5ab329636f1ecc9a2ba400b6fea35f
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Sun Dec 18 20:08:08 2011 +0100

    Updated Spanish translation

 help/es/es.po | 264
 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 133 insertions(+), 131 deletions(-)

commit 77005cc30a87371ab908fdc55cca456caf35b988
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Dec 18 16:34:23 2011 +0100

    [help] Fixed some UI references and typos, fixes bug #653812

	* Fixed the references to the OFF/ON switch

 help/C/change-status.page	    |  9 +++++++--
 help/C/disable-account.page	    |  6 +++---
 help/C/prob-conn-acctdisabled.page |  8 ++++----
 help/C/prob-conn-name.page	    | 13 +++++++------
 help/C/prob-conn-neterror.page     | 31 ++++++++++++++-----------------
 help/C/video-call.page		    | 11 +++++------
 6 files changed, 40 insertions(+), 38 deletions(-)

commit 0f3f488cd6a6116c673dd4d0b04ab62e9e39dbe7
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Fri Dec 16 15:56:17 2011 +0100

    Updated Slovenian translation

 help/sl/sl.po | 59
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 56 insertions(+), 3 deletions(-)

commit 7d22de0340197c4578e4a7e1dd4c4d2e642ba689
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 16 12:52:44 2011 +0100

    import-widget: use the server in IRC account display name

    User generally use the same nick on different servers so just
    displaying the
    nick isn't very useful.

    https://bugzilla.gnome.org/show_bug.cgi?id=654171

 src/empathy-import-widget.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

commit 9d7a9b0feb1f30f891625abeebf571288e2eba4d
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Thu Dec 15 22:21:52 2011 +0100

    [l10n] Updated Italian translation

	* Updated Italian help translation, fixes bug #666261

 help/it/it.po | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

commit 9cb2e8fa1c57ecb889a1160bdcf7b08f4ee6b2b0
Author: Funda Wang <fundawang@gmail.com>
Date:	Thu Dec 15 15:01:06 2011 +0100

    clsing tags (bug#666265)

 help/zh_CN/zh_CN.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 54c3e51405c0af7fc46d1586e24019c6820f8e04
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Wed Dec 14 22:21:39 2011 +0100

    Updated POTFILES.in

 po/POTFILES.in | 1 -
 1 file changed, 1 deletion(-)

commit 9dd688a39a52e8b562364fb0fb230acb395e1202
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 14 15:17:49 2011 +0100

    Stop passing an EmpathyContact to menu_item_new() fonctions

    Best to always use an individual so we don't have 2 code paths
    to maintain.

    https://bugzilla.gnome.org/show_bug.cgi?id=666163

 libempathy-gtk/empathy-individual-menu.c | 206
 +++++++++----------------------
 libempathy-gtk/empathy-individual-menu.h |   6 +-
 libempathy-gtk/empathy-individual-view.c |   4 +-
 3 files changed, 64 insertions(+), 152 deletions(-)

commit cb2e62404041a3fbaf408144a530e5f4216d6aa9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 14 14:40:56 2011 +0100

    individual-menu: export only the methods we need

    No need to export everything. I added prototypes in the C file to
    not have to
    move everything upside down.

    https://bugzilla.gnome.org/show_bug.cgi?id=666163

 libempathy-gtk/empathy-individual-menu.c | 51
 +++++++++++++++++++++++++-------
 libempathy-gtk/empathy-individual-menu.h | 23 +-------------
 2 files changed, 41 insertions(+), 33 deletions(-)

commit 3c136f3efe92a0364ecf21bc0fb62ad66e583d09
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 12 13:03:59 2011 +0100

    remove empathy-contact-manager

    https://bugzilla.gnome.org/show_bug.cgi?id=660547

 libempathy/Makefile.am		      |   2 -
 libempathy/empathy-contact-manager.c | 541
 -----------------------------------
 libempathy/empathy-contact-manager.h |  60 ----
 3 files changed, 603 deletions(-)

commit 78120c07e3588eab58c5abb6ce5627028842049c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 12 13:07:23 2011 +0100

    remove useless includes of empathy-contact-manager.h

    https://bugzilla.gnome.org/show_bug.cgi?id=660547

 libempathy-gtk/empathy-individual-dialogs.c | 1 -
 libempathy-gtk/empathy-new-call-dialog.c    | 1 -
 libempathy-gtk/empathy-new-message-dialog.c | 1 -
 libempathy/empathy-individual-manager.c     | 1 -
 libempathy/empathy-utils.c		     | 1 -
 5 files changed, 5 deletions(-)

commit 42286849ee43d2807f8d4faa5d747b144859e08a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 12 13:06:14 2011 +0100

    main-window: stop instantiating the contact manager

    We don't use it any more.

    https://bugzilla.gnome.org/show_bug.cgi?id=660547

 src/empathy-main-window.c | 5 -----
 1 file changed, 5 deletions(-)

commit 66dbf2d87306d9ee4c5325c1c96628a70d8eac1a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 12 12:57:03 2011 +0100

    remove EMPATHY_CONTACT_WIDGET_EDIT_FAVOURITE

    It's not used any more and this code was the last one using the
    contact
    manager.

    https://bugzilla.gnome.org/show_bug.cgi?id=660547

 libempathy-gtk/empathy-contact-widget.c | 69
 ---------------------------------
 libempathy-gtk/empathy-contact-widget.h |  5 +--
 2 files changed, 2 insertions(+), 72 deletions(-)

commit c7524e25332d8f87115255fb8611b124e4aea4f6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 12 13:00:49 2011 +0100

    remove unused empathy_contact_edit_dialog_show()

    https://bugzilla.gnome.org/show_bug.cgi?id=660547

 libempathy-gtk/empathy-contact-dialogs.c | 60
 --------------------------------
 libempathy-gtk/empathy-contact-dialogs.h |  2 --
 2 files changed, 62 deletions(-)

commit 6fce69d7080341d3064850ceaab52eec531c5e6a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 14 13:04:15 2011 +0100

    Show a contact as blocked if *all* is personas are blocked

    It's clearer that way.

    https://bugzilla.gnome.org/show_bug.cgi?id=665038

 libempathy-gtk/empathy-individual-menu.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit a5bde7ca2676d538c0534b7acaf72ec47005649b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 14 12:54:37 2011 +0100

    individual_menu_add_personas: add the block menu item, if needed

    This allow user to select the personas he wants to block.

    Note that I didn't pass an EmpathyContact as second argument to
    empathy_individiual_block_menu_item_new() as we currently do with most
    item_new() methods. Instead I just craft a new individual containing
    only the
    persona we care about. This approach is much cleaner as we don't
    have to deal
    with 2 different code paths. I filed bug #666163 to do the same
    with the
    existing functions.

    https://bugzilla.gnome.org/show_bug.cgi?id=665038

 libempathy-gtk/empathy-individual-menu.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

commit fe992c09a3401012f17058a7e2571617591729fc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 12 12:54:42 2011 +0100

    remove empathy-contact-menu

    https://bugzilla.gnome.org/show_bug.cgi?id=665038

 libempathy-gtk/Makefile.am	       |   2 -
 libempathy-gtk/empathy-contact-menu.c | 662
 ----------------------------------
 libempathy-gtk/empathy-contact-menu.h |  59 ---
 3 files changed, 723 deletions(-)

commit a162bb98ecb9fc05e6a444f7b9a4c70c90daf65f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 9 17:57:05 2011 +0100

    map-view: use the individual menu

    https://bugzilla.gnome.org/show_bug.cgi?id=665038

 src/empathy-map-view.c | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

commit 4db09641569a416334fd5c93d2c6cbc669848806
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 28 14:09:26 2011 +0100

    chat: use an EmpathyIndividualMenu

    https://bugzilla.gnome.org/show_bug.cgi?id=665038

 libempathy-gtk/empathy-chat.c | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

commit a401d8ed46a4284c140cd44a2cc5cbf53d07e286
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 1 14:27:55 2011 +0100

    add EMPATHY_INDIVIDUAL_FEATURE_BLOCK

    https://bugzilla.gnome.org/show_bug.cgi?id=665038

 libempathy-gtk/empathy-individual-menu.c | 215
 +++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-individual-menu.h |   1 +
 2 files changed, 216 insertions(+)

commit d1aa75b0da95e14969ca72c23b07fd7177d1a0ad
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 1 14:37:08 2011 +0100

    remove EMPATHY_INDIVIDUAL_FEATURE_ALL

    It's a bit fragile, user should say which features he wants.

    https://bugzilla.gnome.org/show_bug.cgi?id=665038

 libempathy-gtk/empathy-individual-menu.h |  1 -
 libempathy-gtk/empathy-individual-view.h |  1 -
 src/empathy-main-window.c		  | 21 +++++++++++++++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

commit 27de0b98c6433d56b7dd4112817c49a1bca7ddce
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 28 14:07:27 2011 +0100

    individual-menu: allow priv->store to be NULL

    We already checks if it's a IndividualStoreChannel before using it
    so that's
    safe.

    https://bugzilla.gnome.org/show_bug.cgi?id=665038

 libempathy-gtk/empathy-individual-menu.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit aa802500fc09133e196a5087867a1743d3911100
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 9 12:31:18 2011 +0100

    empathy_contact_get_persona: use tpf_persona_dup_for_contact()

    We can finally get rid of this horrible code iterating over all the
    individuals. \o/

    https://bugzilla.gnome.org/show_bug.cgi?id=665853

 libempathy/empathy-contact.c | 42
 +++++-------------------------------------
 1 file changed, 5 insertions(+), 37 deletions(-)

commit 844b932834beb6f15d454d14662ca7719bb28981
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 9 10:54:26 2011 +0100

    Deal with empathy_create_individual_from_tp_contact() returning NULL

    Shouldn't really happen in practice but better to be safe than sorry.

    https://bugzilla.gnome.org/show_bug.cgi?id=665853

 libempathy-gtk/empathy-contact-chooser.c	   | 2 ++
 libempathy-gtk/empathy-individual-store-channel.c | 2 ++
 2 files changed, 4 insertions(+)

commit eebfb2b90332782fc3ff79386e9a4808d277337b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 9 10:51:13 2011 +0100

    use tpf_persona_dup_for_contact()

    https://bugzilla.gnome.org/show_bug.cgi?id=665853

 libempathy/empathy-utils.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

commit 7f9f986f3e2600fec111ebbd2302d24eb65c60f7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 14 10:52:03 2011 +0100

    Depend on folks 0.6.6

    We need it for the API to ensure a persona from a TpContact.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 85a96d8d5b886f49b0d73523f5dc46d79a4982d4
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Dec 13 13:19:44 2011 +0100

    empathy-audio-sink.c: include config.h

    Otherwise it warnings on deprecated glib symbols, because we
    defined GLIB_DISABLE_DEPRECATION_WARNINGS in configure.ac

 src/empathy-audio-sink.c | 1 +
 1 file changed, 1 insertion(+)

commit 5d4aca9915e38194a22b27028d99509f09f7c222
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 28 10:17:28 2011 +0200

    get_tp_contact_for_chat: deal with tp_channel_borrow_connection()
    returning NULL

    https://bugzilla.gnome.org/show_bug.cgi?id=662873

 src/empathy-invite-participant-dialog.c | 2 ++
 1 file changed, 2 insertions(+)

commit 34d91c3420c3401cca5a40b9ff481dd3584ac8cb
Author: Daniel Korostil <ted.korostiled@gmail.com>
Date:	Sun Dec 11 20:59:12 2011 +0200

    Uploaded Ukranian

 po/uk.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c19e92c8b348f5009cfd70b4c6c426a286febd6e
Author: Daniel Korostil <ted.korostiled@gmail.com>
Date:	Sun Dec 11 20:57:07 2011 +0200

    Uploaded Ukranian

 po/uk.po | 1649
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 879 insertions(+), 770 deletions(-)

commit 7de5dcc25ebc8d19853edd1a43485a13267466e3
Author: Daniel Korostil <ted.korostiled@gmail.com>
Date:	Sun Dec 11 16:51:44 2011 +0200

    Uploaded Ukranian

 po/uk.po | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 52ad74602ebdc4aa95e313f1852d6556963b4f2c
Author: Daniel Korostil <ted.korostiled@gmail.com>
Date:	Sun Dec 11 16:49:10 2011 +0200

    Uploaded Ukranian

 po/uk.po | 1540
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 847 insertions(+), 693 deletions(-)

commit 2833b7d19491febe4e282259ef2a27bad6b44090
Author: Guanhao Yin <yinguanhao@gmail.com>
Date:	Sat Dec 10 12:14:04 2011 +0000

    Update Simplified Chinese help translation.

 help/zh_CN/zh_CN.po | 838
 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 507 insertions(+), 331 deletions(-)

commit e328bb4f4c5ec64c156159cdf230911303111fb6
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Sat Dec 10 10:49:01 2011 +0200

    Updated Hebrew translation.

 po/he.po | 1275
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 636 insertions(+), 639 deletions(-)

commit 2c785c36c5b8aa4581121f336fc7313da7c2fc92
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 8 09:52:15 2011 +0100

    auth-client: add some more debugging

    I'm trying to understand what's going wrong in bug #665542 and
    having more
    debugging would help.

 libempathy/empathy-keyring.c | 2 +-
 src/empathy-auth-client.c    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

commit e95d1c1f58618c3cfd89232ab2997bbeda215c8a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Dec 7 13:42:40 2011 +0000

    Call: Low the video watchdog timeout to 1 second

    Switch back to the avatar if there was at least one second of not
    receiving any
    new video frames to display.

    With this change the reaction time will be between 1 (best case) and 2
    (worse case) seconds from the point the last frame went into the sync.
    Before it was 5 seconds (best case) and up to 10 seconds (worst case),
    which doesn't make for a very good experience

 src/empathy-call-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1893cd80d606371b3810070f9dea63b14186e9c1
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Dec 7 09:43:59 2011 +0000

    about: Polish the code to generate the license string

 src/empathy-about-dialog.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

commit ae0db917820904a353850d532eb3b638f36cb8c6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 5 15:15:54 2011 +0100

    try requesting a TpContact when creating a contact from the logger

    This is useful when displaying a contact which is not in our roster
    in the
    logger (typically a PSTN number). Having a TpContact allow us to
    call him if
    that's supported by the CM.

    https://bugzilla.gnome.org/show_bug.cgi?id=665592

 libempathy/empathy-contact.c | 49
 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

commit 84fe2ef8b8e152d6a47f42fdd818e84a6e0d48b0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 5 15:15:24 2011 +0100

    log-window: update buttons if contact's caps are updated

    https://bugzilla.gnome.org/show_bug.cgi?id=665592

 libempathy-gtk/empathy-log-window.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

commit b6c4b1de387c53ad115b6422e2009596a5cb6dd0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 5 15:06:19 2011 +0100

    factor out do_update_buttons_sensitivity()

    This fix a bug with button_video_binding not being re-installed when
    a contact
    supporting video was selected. It was only re-installed when using
    the contact
    from the selected event.

    https://bugzilla.gnome.org/show_bug.cgi?id=665592

 libempathy-gtk/empathy-log-window.c | 75
 ++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 34 deletions(-)

commit ddd662f02c504c229fc1910c31785b35855652e3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 5 16:26:41 2011 +0100

    log-window: include empathy-geometry.h

 libempathy-gtk/empathy-log-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 4bb09dac69435530045d91126ef1bc39ede601dc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 22 14:00:37 2011 +0100

    log-window: save window geometry

    https://bugzilla.gnome.org/show_bug.cgi?id=664209

 libempathy-gtk/empathy-log-window.c | 2 ++
 1 file changed, 2 insertions(+)

commit 4aedb19ed5567169c5731def4714dcddd24d8b77
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 2 16:22:37 2011 +0100

    map-view: stop using EmpathyContactManager

    https://bugzilla.gnome.org/show_bug.cgi?id=665403

 src/empathy-map-view.c | 118
 +++++++++++++++++++++++++++----------------------
 1 file changed, 64 insertions(+), 54 deletions(-)

commit 3d60817646e07dbe7ec7ca1e68fa45d5be41dcc2
Author: Vladislav Boboshko <vl.boboshko@gmail.com>
Date:	Sun Dec 4 00:42:51 2011 +0400

    Updated Russian translation

 po/ru.po | 1765
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 906 insertions(+), 859 deletions(-)

commit a9c67f126de7715edfeb49789108878f3d0da784
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 2 15:19:52 2011 +0100

    contact-blocking-dialog: stop using EmpathyContactManager

    https://bugzilla.gnome.org/show_bug.cgi?id=660547

 libempathy-gtk/empathy-contact-blocking-dialog.c   | 28 +++++----------
 .../test-empathy-contact-blocking-dialog.c	    | 42
 ++++++++++++++++++----
 2 files changed, 44 insertions(+), 26 deletions(-)

commit 0fdc28006acf7be50776e237969bc31b38245e32
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 1 11:28:04 2011 +0100

    renamespace CheeseCameraDeviceMonitor

    This ensures empathy will always use our version, even when linking on
    libcheese, and so avoid incompatibliy when libcheese breaks its ABI.

    https://bugzilla.gnome.org/show_bug.cgi?id=665244

 libempathy/cheese-camera-device-monitor.c | 112
 +++++++++++++++---------------
 libempathy/cheese-camera-device-monitor.h |  44 ++++++------
 libempathy/empathy-camera-monitor.c	   |  16 ++---
 3 files changed, 88 insertions(+), 84 deletions(-)

commit af5d0bf3e9b61bff1c4c9b845143c1122b78c093
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Thu Dec 1 18:13:05 2011 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 1227
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 603 insertions(+), 624 deletions(-)

commit b1e73b93c00a06152a52ce5e41f063655e2f5c13
Author: Raluca Elena Podiuc <ralucaelena1985@gmail.com>
Date:	Wed Nov 30 23:12:06 2011 +0200

    camera-monitor: fix memleak in on_camera_added

    https://bugzilla.gnome.org/show_bug.cgi?id=665256

 libempathy/empathy-camera-monitor.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 2d4ca2150069139ab347bddce5a5c9264c1be3b1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 30 15:59:36 2011 +0100

    Properly cast buffer and latency times when setting properties

    This fix a crash on 32 bits system as gcc can't figure out the right
    size of
    the value.

    Thanks to Raluca-Elena Podiuc for her help in debugging this.

    https://bugzilla.gnome.org/show_bug.cgi?id=665171

 src/empathy-audio-sink.c | 5 ++++-
 src/empathy-audio-src.c  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

commit e0469fa0914a13961878ef435c1c275819e04e65
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 30 14:41:30 2011 +0100

    use the individual edit dialog when pressing F2

    We already use it when using the menu so there is no reason to keep
    using the
    old one.

 libempathy-gtk/empathy-individual-view.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

commit 984c03d2e1cd94fc6699d7b627080ed2d73d5466
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 30 12:21:03 2011 +0100

    event-manager: use the conn aggregator instead of the contact mgr

    https://bugzilla.gnome.org/show_bug.cgi?id=660547

 src/empathy-event-manager.c | 135
 +++++++++++++++++++++++++++++++++-----------
 src/empathy.c		     |	 3 +
 2 files changed, 104 insertions(+), 34 deletions(-)

commit 0fe601d9ae8c727a1abbd0d59c3aa7b80cb2b936
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 29 16:55:51 2011 +0100

    connection-aggregator: add API to track contacts

    https://bugzilla.gnome.org/show_bug.cgi?id=660547

 libempathy/empathy-connection-aggregator.c | 71
 ++++++++++++++++++++++++++++++
 libempathy/empathy-connection-aggregator.h |  3 ++
 2 files changed, 74 insertions(+)

commit bc690f37e7b0a49258b505653dd0cb94ffa48056
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 30 12:55:29 2011 +0100

    ui-utils: don't expect that cancellable is not NULL

    cancellable are always optional so this code should be NULL safe.

 libempathy-gtk/empathy-ui-utils.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit bbe74c7f743b9210a905c74864a9b5d33ad48a87
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 29 16:54:01 2011 +0100

    Revert "WIP"

    This reverts commit f1a9c6deaa7f706df73cb4e1195647a2a27177c6.

    Humm I didn't mean to push that, sorry. :\

 libempathy/empathy-connection-aggregator.c | 72
 ------------------------------
 libempathy/empathy-connection-aggregator.h |  3 --
 src/empathy-event-manager.c		    | 34 ++------------
 src/empathy.c				    |  1 -
 4 files changed, 4 insertions(+), 106 deletions(-)

commit a709d4ca6f8249d18d885feaef4f8f2a50a14427
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 29 16:50:14 2011 +0100

    remove trailing space

 libempathy/empathy-connection-aggregator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f1a9c6deaa7f706df73cb4e1195647a2a27177c6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 29 16:48:11 2011 +0100

    WIP

 libempathy/empathy-connection-aggregator.c | 72
 ++++++++++++++++++++++++++++++
 libempathy/empathy-connection-aggregator.h |  3 ++
 src/empathy-event-manager.c		    | 34 ++++++++++++--
 src/empathy.c				    |  1 +
 4 files changed, 106 insertions(+), 4 deletions(-)

commit b5764db7cf39aeaaabc261ece49c57776540a0be
Merge: 67869e5 82b0f40
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 29 15:56:11 2011 +0100

    Merge remote-tracking branch 'jonny/ft'

    Conflicts:
	libempathy/empathy-tp-file.c

commit 67869e50ff885ea10280447edbe6ee22520e26cb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 29 14:16:15 2011 +0100

    remove old school get_all_groups

    https://bugzilla.gnome.org/show_bug.cgi?id=665121

 libempathy/empathy-contact-list.c    | 12 ------------
 libempathy/empathy-contact-list.h    |  2 --
 libempathy/empathy-contact-manager.c | 37
 ------------------------------------
 libempathy/empathy-tp-contact-list.c | 15 ---------------
 4 files changed, 66 deletions(-)

commit 4532530cec308a87223f46cd3724c1868849937f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 29 14:02:40 2011 +0100

    groups-widget: use empathy_connection_aggregator_get_all_groups()

    We have to prepare the contact groups feature and ensure that the
    singleton is
    still alive. The 'empathy' process is the only one allowing user
    to change
    contact groups so we just have to do it there.

    https://bugzilla.gnome.org/show_bug.cgi?id=665121

 libempathy-gtk/empathy-groups-widget.c | 16 ++++++++--------
 src/empathy.c				| 26 ++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 8 deletions(-)

commit 97f3aec6da2eed048d878611667381a773980e59
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 29 14:01:12 2011 +0100

    add empathy_connection_aggregator_get_all_groups()

    https://bugzilla.gnome.org/show_bug.cgi?id=665121

 libempathy/empathy-connection-aggregator.c | 28
 ++++++++++++++++++++++++++++
 libempathy/empathy-connection-aggregator.h |  3 +++
 2 files changed, 31 insertions(+)

commit 057fc319fd536f33353bf307e8124dc8fbdd9040
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 29 12:57:54 2011 +0100

    add EmpathyConnectionAggregator

    It won't do much atm but will be used as a helper dealing with all
    connections.

    https://bugzilla.gnome.org/show_bug.cgi?id=665121

 libempathy/Makefile.am			    |	2 +
 libempathy/empathy-connection-aggregator.c | 190
 +++++++++++++++++++++++++++++
 libempathy/empathy-connection-aggregator.h |  66 ++++++++++
 3 files changed, 258 insertions(+)

commit 09a20a54f5b7384ab93388cb8642dcd8959daf98
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 22 15:42:11 2011 +0100

    don't ignore TP_DELIVERY_STATUS_TEMPORARILY_FAILED delivery report

    We should display an error message as well if not the user will
    assume the
    message has been sent and the spinner keeps spinning.

    https://bugzilla.gnome.org/show_bug.cgi?id=664564

 libempathy/empathy-tp-chat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 9a353a3f7a9a0528161516c544c6375c53d5f3cc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 10 14:15:59 2011 +0100

    add missing empathy-contact-list.h include

    For some reason, gcc starts complaining about this as soon as I remove
    EmpathyContactListFlags from empathy-contact-list.h ?!
    If you have an explanation for this please let me know...

    https://bugzilla.gnome.org/show_bug.cgi?id=663328

 libempathy-gtk/empathy-individual-menu.c | 1 +
 src/empathy-invite-participant-dialog.c  | 1 +
 2 files changed, 2 insertions(+)

commit 1cbe27fc9f7be998703fba83f573906d7da15912
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 8 16:55:15 2011 +0100

    contact-list: remove flags

    https://bugzilla.gnome.org/show_bug.cgi?id=663328

 libempathy/empathy-contact-list.c | 12 ------------
 libempathy/empathy-contact-list.h | 13 -------------
 2 files changed, 25 deletions(-)

commit b528f950eaf4283c54448d303c1acfbfd07d26a5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 8 16:45:47 2011 +0100

    tp-contact-list: remove tp_contact_list_get_flags

    https://bugzilla.gnome.org/show_bug.cgi?id=663328

 libempathy/empathy-tp-contact-list.c | 119
 -----------------------------------
 1 file changed, 119 deletions(-)

commit 79f856c788de8662f09cbfda08434a4081a1f593
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 3 15:29:34 2011 +0100

    remove empathy_contact_manager_get_flags_for_connection()

    https://bugzilla.gnome.org/show_bug.cgi?id=663328

 libempathy/empathy-contact-manager.c | 22 ----------------------
 libempathy/empathy-contact-manager.h |  3 ---
 2 files changed, 25 deletions(-)

commit fb2b5ea4bbbc4ac7a1a1353cb162ec2d4524eb17
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 3 15:21:42 2011 +0100

    contact-menu: stop using
    empathy_contact_manager_get_flags_for_connection()

    https://bugzilla.gnome.org/show_bug.cgi?id=663328

 libempathy-gtk/empathy-contact-menu.c | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

commit c92545819b005cd651f84108fda5cc99af275788
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 28 12:09:23 2011 +0100

    Depend on tp-glib 0.17.3

    We need it for the high level alias API.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b7469325b7c1b9fa6dd8fb7611f2d16060c53439
Author: Brian Pepple <bpepple@fedoraproject.org>
Date:	Sun Nov 27 15:53:20 2011 -0500

    Use current fsf address (#664935)

 COPYING | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit faae0c5818cb5becc62cf6a9d941b0f98c06617a
Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
Date:	Sat Nov 26 22:49:45 2011 +0200

    Updated Romanian translation

 po/ro.po | 2817
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1779 insertions(+), 1038 deletions(-)

commit 103c48ae3cd617ae7378e5efe09d71abb6c4a03a
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Fri Nov 25 21:22:10 2011 +0100

    Updated Slovenian translation

 po/sl.po | 1097
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 548 insertions(+), 549 deletions(-)

commit 4c83647e251eef901c651549f20428440a961d07
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Nov 25 17:24:17 2011 +0100

    Updated Spanish translation

 po/es.po | 1035
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 513 insertions(+), 522 deletions(-)

commit 70025f47f3087f7b5295c4a32648bef9806f7a36
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 25 12:38:26 2011 +0100

    Properly update the 'simple' theme

    We have to call the callback manually to update the theme when
    it's changed.
    Also make sure that style-set signal is only connected once and we
    update the
    theme only if the 'simple' one is used.

    https://bugzilla.gnome.org/show_bug.cgi?id=664795

 libempathy-gtk/empathy-theme-manager.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

commit 3aa77dd47ea6de9f281cbb401816532f83ad5764
Author: Yangtse Su <yangtsesu@gmail.com>
Date:	Fri Nov 25 21:45:35 2011 +0800

    Update Simplified Chinese translation.

 po/zh_CN.po | 1595
 ++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 868 insertions(+), 727 deletions(-)

commit 2be6f5eedc02aec60e2afd747313728c2ccdacd7
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Thu Nov 24 12:49:51 2011 +0100

    Updated POTFILES.in

 po/POTFILES.in | 1 -
 1 file changed, 1 deletion(-)

commit 2bf21e175845e29bc1291f67b568a5ba16ba1e25
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 24 12:49:24 2011 +0100

    remove unused variables

 libempathy-gtk/empathy-individual-store-manager.c | 3 ---
 1 file changed, 3 deletions(-)

commit 4f470e26bafd3d2717b20af5e8846c114a2785d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 8 16:05:15 2011 +0100

    Remove obsolete contact-list-{store,view}

    Hourrah \o/

    https://bugzilla.gnome.org/show_bug.cgi?id=663387

 libempathy-gtk/Makefile.am		     |	  4 -
 libempathy-gtk/empathy-contact-list-store.c | 1779 ----------------------
 libempathy-gtk/empathy-contact-list-store.h |	114 --
 libempathy-gtk/empathy-contact-list-view.c  | 2130
 ---------------------------
 libempathy-gtk/empathy-contact-list-view.h  |	 87 --
 libempathy-gtk/empathy-live-search.h	     |	  2 -
 src/empathy-preferences.c		     |	  1 -
 7 files changed, 4117 deletions(-)

commit 1c51f65b87f5b523e6fdc76b91402936e9599cff
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 8 16:02:19 2011 +0100

    remove EmpathyContactManager's test

    We want to get rid of it any way.

    https://bugzilla.gnome.org/show_bug.cgi?id=663387

 tests/interactive/Makefile.am	     |	2 --
 tests/interactive/contact-manager.c | 43
 -------------------------------------
 2 files changed, 45 deletions(-)

commit bcc23595d5522d4345148bdc1ae05ab016894be1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 7 10:55:39 2011 +0100

    chat: use the individual view/store rather than the contact one

    The great unification !

    EmpathyChat was the last user of the contact store/view, everything
    now use
    the individual ones.

    https://bugzilla.gnome.org/show_bug.cgi?id=663387

 libempathy-gtk/empathy-chat.c | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

commit 70ec5dfc46d6177c74139ad84e6a74f521e8b374
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 22 10:04:40 2011 +0100

    add initial_loading() as a virtual method

    This allows us to remove setup_idle_id as a protected variable.

    https://bugzilla.gnome.org/show_bug.cgi?id=663387

 libempathy-gtk/empathy-individual-store-channel.c | 11 +++++++++++
 libempathy-gtk/empathy-individual-store-manager.c | 23
 ++++++++++++++++++++---
 libempathy-gtk/empathy-individual-store.c	   | 13 +++++--------
 libempathy-gtk/empathy-individual-store.h	   |  4 +---
 4 files changed, 37 insertions(+), 14 deletions(-)

commit f13e0c152b9de168c88f6ebde45c8e35e4df4934
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 22 10:04:40 2011 +0100

    add empathy_individual_store_refresh_individual() as a protected
    method

    This allows us to remove show_active as a protected variable.

    https://bugzilla.gnome.org/show_bug.cgi?id=663387

 libempathy-gtk/empathy-individual-store-manager.c |  7 +------
 libempathy-gtk/empathy-individual-store.c	   | 22
 ++++++++++++++++++----
 libempathy-gtk/empathy-individual-store.h	   |  4 +++-
 3 files changed, 22 insertions(+), 11 deletions(-)

commit 2a03f6ffb41e22d712ed790cdb9aed4a823c1e81
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 8 15:00:30 2011 +0100

    Add individual-store-channel

    This will allow us to use the individual view to display muc members.

    https://bugzilla.gnome.org/show_bug.cgi?id=663387

 libempathy-gtk/Makefile.am			   |   2 +
 libempathy-gtk/empathy-individual-store-channel.c | 330
 ++++++++++++++++++++++
 libempathy-gtk/empathy-individual-store-channel.h |  65 +++++
 3 files changed, 397 insertions(+)

commit cbeb879c831699105fb6943e55caa8bcf72f8eaf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 8 14:06:49 2011 +0100

    add EMPATHY_INDIVIDUAL_FEATURE_ADD_CONTACT

    https://bugzilla.gnome.org/show_bug.cgi?id=663387

 libempathy-gtk/empathy-individual-menu.c | 140
 ++++++++++++++++++++++++++++++-
 libempathy-gtk/empathy-individual-menu.h |  10 ++-
 libempathy-gtk/empathy-individual-view.c |   3 +-
 libempathy/empathy-client-factory.c	  |  21 +++++
 src/empathy-main-window.c		  |   2 +-
 5 files changed, 171 insertions(+), 5 deletions(-)

commit ef0d55ead126f53aa4544877d2df5ab712f00f28
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 4 13:45:38 2011 +0100

    factor out empathy_create_individual_from_tp_contact()

    https://bugzilla.gnome.org/show_bug.cgi?id=663387

 libempathy-gtk/empathy-contact-chooser.c | 23 +++--------------------
 libempathy/empathy-utils.c		  | 32
 ++++++++++++++++++++++++++++++++
 libempathy/empathy-utils.h		  |  3 +++
 3 files changed, 38 insertions(+), 20 deletions(-)

commit edf88058847eb77f8ecc1e5b37fa76e7db9f7ad3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 4 12:15:47 2011 +0100

    Abstract the individual store

    We now have EmpathyIndividualStoreManager which implements the
    store using
    EmpathyIndividualManager as its contact source.

    https://bugzilla.gnome.org/show_bug.cgi?id=663387

 libempathy-gtk/Makefile.am			   |   2 +
 libempathy-gtk/empathy-contact-chooser.c	   |   4 +-
 libempathy-gtk/empathy-individual-linker.c	   |   4 +-
 libempathy-gtk/empathy-individual-store-manager.c | 319
 ++++++++++++++++++++++
 libempathy-gtk/empathy-individual-store-manager.h |  67 +++++
 libempathy-gtk/empathy-individual-store.c	   | 171 +-----------
 libempathy-gtk/empathy-individual-store.h	   |  10 +-
 src/empathy-main-window.c			   |   5 +-
 8 files changed, 403 insertions(+), 179 deletions(-)

commit 0c7f25a8206c918d4a84405b7d1ab8e994c65d0f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 4 11:35:46 2011 +0100

    individual-store: expose some attributes and methods as 'protected'

    This will be needed when abstracting EmpathyIndividualStore.

    https://bugzilla.gnome.org/show_bug.cgi?id=663387

 libempathy-gtk/empathy-individual-store.c | 58
 +++++++++++++++----------------
 libempathy-gtk/empathy-individual-store.h | 16 +++++++++
 2 files changed, 44 insertions(+), 30 deletions(-)

commit 9389308505f9c90ba5a1ce0974ef7d870af7c7e6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 2 14:48:23 2011 +0100

    Allow user to try another password if auth failed

    https://bugzilla.gnome.org/show_bug.cgi?id=661640

 libempathy/empathy-auth-factory.c | 60
 +++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-auth-factory.h |  4 +++
 src/empathy-auth-client.c	   | 36 +++++++++++++++++++++++
 3 files changed, 100 insertions(+)

commit 7f75f25ac7e93e198e23421298b619e6b92992da
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 2 14:41:56 2011 +0100

    add empathy-bad-password-dialog

    https://bugzilla.gnome.org/show_bug.cgi?id=661640

 libempathy-gtk/Makefile.am		      |   2 +
 libempathy-gtk/empathy-bad-password-dialog.c | 192
 +++++++++++++++++++++++++++
 libempathy-gtk/empathy-bad-password-dialog.h |  68 ++++++++++
 po/POTFILES.in				      |   1 +
 4 files changed, 263 insertions(+)

commit e981a1084ec54ecff03ab234a666ce3742f163ae
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 28 15:00:40 2011 +0200

    auth-factory: relay the auth-password-failed signal

    https://bugzilla.gnome.org/show_bug.cgi?id=661640

 libempathy/empathy-auth-factory.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

commit e2df01bf85d384986dce8102c3b6bd704ea6d318
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 28 14:56:58 2011 +0200

    server-sasl-handler: add auth-password-failed signal

    https://bugzilla.gnome.org/show_bug.cgi?id=661640

 libempathy/empathy-server-sasl-handler.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit 80ff6670675cdfa087c92901d8d96c16f40c5613
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 28 16:34:40 2011 +0200

    Abstract EmpathyPasswordDialog to EmpathyBasePasswordDialog

    I'm going to implement a slidely different version of this dialog
    so best to
    re-use as much code as possible.

    https://bugzilla.gnome.org/show_bug.cgi?id=661640

 libempathy-gtk/Makefile.am		       |   2 +
 libempathy-gtk/empathy-base-password-dialog.c | 302
 ++++++++++++++++++++++++++
 libempathy-gtk/empathy-base-password-dialog.h |  71 ++++++
 libempathy-gtk/empathy-password-dialog.c      | 206 +-----------------
 libempathy-gtk/empathy-password-dialog.h      |   6 +-
 po/POTFILES.in				       |   1 +
 6 files changed, 392 insertions(+), 196 deletions(-)

commit adca8bd9665b6455879f2478e51c4bfd53af4d52
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 28 15:27:55 2011 +0200

    password-dialog: use self->priv pattern

    https://bugzilla.gnome.org/show_bug.cgi?id=661640

 libempathy-gtk/empathy-password-dialog.c | 133
 +++++++++++++++----------------
 libempathy-gtk/empathy-password-dialog.h |   3 +-
 2 files changed, 68 insertions(+), 68 deletions(-)

commit f25f43bb57d892d433d5a61e40d100440fd0f222
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 21 13:50:14 2011 +0100

    restart the camera only if it's already running

    Always restarting it will enable the camera in an audio only call.

    https://bugzilla.gnome.org/show_bug.cgi?id=664459

 src/empathy-call-window.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit d15f750dcfb31415cb6d8d39122593863e7fcd37
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 21 11:43:51 2011 +0100

    factor out empathy_call_window_change_webcam()

    https://bugzilla.gnome.org/show_bug.cgi?id=664459

 src/empathy-call-window.c | 13 +++++++++++++
 src/empathy-call-window.h |  3 +++
 src/empathy-camera-menu.c |  4 +---
 3 files changed, 17 insertions(+), 3 deletions(-)

commit 24882e924af2c0d8576970440d92ac5b4eb25bc8
Author: Arun Raghavan <arun.raghavan@collabora.co.uk>
Date:	Mon Nov 21 23:27:08 2011 +0530

    audio-src,audio-sink: Use lower latency values on pulsesrc/pulsesink

    This sets the pulsesink and pulsesrc buffer/latency parameters to be
    lower and more voip-friendly. If the system cannot provide or keep up
    with these values, PulseAudio will automatically try to adapt and
    provide larger values that are achievable.

    https://bugzilla.gnome.org/show_bug.cgi?id=663124

 src/empathy-audio-sink.c | 4 ++++
 src/empathy-audio-src.c  | 3 +++
 2 files changed, 7 insertions(+)

commit 0323eff320bc2152ac45b2675fc7e80b2a354f85
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 21 16:56:01 2011 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 29d03647fd6aaafd9beb07d92c3be98dcd81281b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 7 17:45:28 2011 +0100

    sync gsettings.m4

    Latest version of glib-compile-schemas removed the --uninstall
    option; trying
    to use it break "make distcheck".

 m4/gsettings.m4 | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

commit 853d03fa1a85ba243b6540f2c224dee2ec57a8f8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 21 16:32:43 2011 +0100

    prepare 3.3.2

 NEWS	      | 45 +++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 release.py   |  2 +-
 3 files changed, 48 insertions(+), 3 deletions(-)

commit be896d0dbf713bb7a8abcc317d52b95b4d6623a9
Author: Ken VanDine <ken.vandine@canonical.com>
Date:	Mon Nov 21 14:58:52 2011 +0100

    set_size_request on the video_container to ensure the window has a
    sane minimum size.

    https://bugzilla.gnome.org/show_bug.cgi?id=664313

 src/empathy-call-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit d62de5ec41b47c695b8a5fabba27576cd640837b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 21 11:22:52 2011 +0100

    fix GTK_BOX casts

 libempathy-gtk/empathy-account-widget.c | 2 +-
 src/empathy-account-assistant.c	 | 2 +-
 src/empathy-streamed-media-window.c	 | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

commit 76d770933b31a9a928942dc0782b0cdb23ea7223
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 16 17:07:51 2011 +0100

    use gtk_box_new() instead of gtk_[h,v]box_new()

    https://bugzilla.gnome.org/show_bug.cgi?id=662903

 libempathy-gtk/empathy-account-widget.c	|  6 ++++--
 libempathy-gtk/empathy-chat.c			|  4 ++--
 libempathy-gtk/empathy-contact-dialogs.c	|  2 +-
 libempathy-gtk/empathy-contact-search-dialog.c |  6 +++---
 libempathy-gtk/empathy-contact-widget.c	|  2 +-
 libempathy-gtk/empathy-dialpad-widget.c	|  2 +-
 libempathy-gtk/empathy-groups-widget.c		|  4 ++--
 libempathy-gtk/empathy-individual-linker.c	|  6 +++---
 libempathy-gtk/empathy-individual-widget.c	|  4 ++--
 libempathy-gtk/empathy-log-window.c		|  6 +++---
 libempathy-gtk/empathy-theme-boxes.c		|  2 +-
 src/empathy-account-assistant.c		| 27
 +++++++++++++-------------
 src/empathy-call-window.c			|  7 ++++---
 src/empathy-chat-window.c			|  4 ++--
 src/empathy-debug-window.c			|  2 +-
 src/empathy-import-dialog.c			|  4 ++--
 src/empathy-main-window.c			|  2 +-
 src/empathy-streamed-media-window.c		| 25
 +++++++++++++-----------
 src/ev-sidebar.c				|  8 ++++----
 19 files changed, 65 insertions(+), 58 deletions(-)

commit bd43c34901fbcc8202c3e96246fe77a31a4154db
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 16 16:34:47 2011 +0100

    use gtk_paned_new() instead of gtk_hpaned_new()

    https://bugzilla.gnome.org/show_bug.cgi?id=662903

 libempathy-gtk/empathy-individual-linker.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 211f86a65565eaf3c3f0a9159dffe191298c0ff6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 16 16:32:14 2011 +0100

    use gtk_separator_new() instead of gtk_hseparator_new()

    https://bugzilla.gnome.org/show_bug.cgi?id=662903

 libempathy-gtk/empathy-individual-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8b6c87f1b7da9c0ba239bf3892aec9875a39fd77
Author: Algimantas Margevičius <margevicius.algimantas@gmail.com>
Date:	Fri Nov 18 22:42:12 2011 +0200

    Updated Lithuanian translation

 po/lt.po | 1376
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 713 insertions(+), 663 deletions(-)

commit 746867abcdff470efb15c37582c7a41fc01eae24
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Nov 18 17:02:39 2011 +0000

    Bump telepathy-farstream requirement

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e156b00ebf846c5e3ed8b5bdee693a9740c9faba
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Nov 18 10:48:15 2011 +0000

    AudioSink: Setup the initial properties in the main thread

 src/empathy-audio-sink.c | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

commit be42e8d30bedc020f96bbe719ac3c6620aa59b7e
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Nov 18 10:05:57 2011 +0000

    Call: Bind the output properties from the main thread

    If we bind and sync the output volume from the non-main thread, we end
    up calling gtk and clutter from the non-main thread.. Which leads to
    crashes in OpenGL drivers and potenially kills your cat. Instead
    create
    the audio output when the audio content is added, which happens
    from the
    main thread. The output element is still only added to gstreamer
    pipeline when needed though.

 src/empathy-call-window.c | 84
 ++++++++++++++++++++++++++++-------------------
 1 file changed, 51 insertions(+), 33 deletions(-)

commit 11c9648caf1056dbedf8670ee680ab90d699bb3c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Nov 17 19:45:39 2011 +0000

    Bind the volume button to the volume of the output

 src/empathy-call-window.c | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

commit 080e87039579a2e2155d3ee56c59f57873cd02b6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Nov 17 19:29:21 2011 +0000

    Bind the mic button the sources mute property

 src/empathy-call-window.c | 43
 +++++--------------------------------------
 1 file changed, 5 insertions(+), 38 deletions(-)

commit ad8497cb0edb8e6801e277cecf43b0c2129e6c41
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Nov 17 20:14:01 2011 +0000

    Remove call input volume configuration

    As we rely on pulseaudio there is no point in saving our own volume
    configuration, pulseaudio does that for us. If we do save it, then we
    have no idea which volume to pick after connecting to pulse (the
    one we
    save, the one pulse saved, a random value?).

    On top of that our configuration implementation is plain ugly, the
    level meter didn't work etc. This is all much better configured using
    the gnome-control-center sound panel, which is pretty nice for inputs
    and saves its volume on pulse for us to re-use :)

 data/org.gnome.Empathy.gschema.xml.in |  6 ---
 libempathy/empathy-gsettings.h        |  1 -
 src/empathy-call-window.c	       | 48 --------------------
 src/empathy-preferences.c	       | 30 -------------
 src/empathy-preferences.ui	       | 82
 -----------------------------------
 5 files changed, 167 deletions(-)

commit 94f5ae453c43090c86913e1589d3ffb3873c50e6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Nov 17 19:10:12 2011 +0000

    Add mute support to the audio source

 src/empathy-audio-src.c | 87
 ++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 72 insertions(+), 15 deletions(-)

commit 0cdf4ddeb2d49377d99077afa574962a622035a4
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Nov 17 18:15:55 2011 +0000

    Implement Audiocontrol for the output volume

 src/empathy-call-window.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit e40052870d5566ccc48109ef3f8202c889a06eab
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Nov 17 18:15:09 2011 +0000

    Keep the audio sinks volume property synchronized with the pulse
    volume

 src/empathy-audio-sink.c | 131
 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 92 insertions(+), 39 deletions(-)

commit d4461277da015bdf03e7fdb82b8973d3022c0e59
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Nov 17 16:34:06 2011 +0000

    Implement input audio control

 src/empathy-call-window.c | 50
 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

commit 3db517442865a03c1d303774c9a36fda1d8ea51d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Nov 15 17:57:20 2011 +0100

    Let the audio source control the volume, not a software volume element

    There is no point in amplifying the mic level is it's too low or too
    high as it either doesn't have enough information or it is clipping.
    Instead tell pulsesrc what it should do, so it can adjust the hardware
    volume for us.

    Also listen to changed done by pulsesrc so we can track volume updates
    and feed back the settings properly

 src/empathy-audio-src.c | 218
 +++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 179 insertions(+), 39 deletions(-)

commit 5bb2c1c62a06e682ab48d530cae5f9614a90a75e
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Nov 16 15:31:29 2011 +0100

    Use _unref instead of _free _destroy when possible.unref

    Replace g_(ptr_)array_free (foo, TRUE) and g_hash_table_destroy
    with respectively g_(ptr_)array_unref (foo) and g_hash_table_unref.

    I used this command to generate this patch:
    for f in `find -name "*.c"`; do sed -i $f -re 's/g_ptr_array_free
    \(([^ ,]+), TRUE\)/g_ptr_array_unref \(\1\)/'; done

    See Danielle's blog for explanation of possible bug _free can do:
    http://blogs.gnome.org/danni/2011/11/16/mistakes-with-g_value_set_boxed/

 goa-mc-plugin/mcp-account-manager-goa.c	| 10 +++++-----
 libempathy-gtk/empathy-contact-list-store.c	|  6 +++---
 libempathy-gtk/empathy-contact-search-dialog.c |  2 +-
 libempathy-gtk/empathy-contactinfo-utils.c	|  2 +-
 libempathy-gtk/empathy-individual-linker.c	|  2 +-
 libempathy-gtk/empathy-individual-menu.c	|  2 +-
 libempathy-gtk/empathy-individual-store.c	|  6 +++---
 libempathy-gtk/empathy-individual-view.c	|  2 +-
 libempathy-gtk/empathy-individual-widget.c	|  2 +-
 libempathy-gtk/empathy-notify-manager.c	|  2 +-
 libempathy-gtk/empathy-persona-store.c		|  4 ++--
 libempathy-gtk/empathy-protocol-chooser.c	|  2 +-
 libempathy-gtk/empathy-spell.c			|  2 +-
 libempathy/empathy-account-settings.c		|  6 +++---
 libempathy/empathy-contact-manager.c		|  2 +-
 libempathy/empathy-debug.c			|  2 +-
 libempathy/empathy-ft-handler.c		|  4 ++--
 libempathy/empathy-individual-manager.c	|  4 ++--
 libempathy/empathy-irc-network-manager.c	|  2 +-
 libempathy/empathy-tp-chat.c			|  4 ++--
 libempathy/empathy-tp-contact-list.c		| 20 ++++++++++----------
 libempathy/empathy-tp-file.c			|  2 +-
 libempathy/empathy-tp-roomlist.c		|  2 +-
 libempathy/empathy-tp-streamed-media.c		|  2 +-
 src/empathy-debug-window.c			|  4 ++--
 src/empathy-ft-manager.c			|  2 +-
 src/empathy-import-utils.c			|  2 +-
 src/empathy-main-window.c			|  6 +++---
 src/empathy-map-view.c				|  2 +-
 tests/empathy-chatroom-manager-test.c		|  2 +-
 tests/empathy-tls-test.c			|  4 ++--
 31 files changed, 58 insertions(+), 58 deletions(-)

commit ba6e07cc5a0bf75118c12fd5ebf05e4453a5dc80
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Nov 16 15:31:19 2011 +0100

    Add coding style check for g_hash_table_destroy and g_array_free usage

 tools/check-c-style.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 20772a7c205e54e4b5f28d14e279691459efaf1a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 9 15:20:23 2011 +0100

    individual-view: don't display menu if
    empathy_folks_individual_contains_contact() fails

    The individual menu already asserts that's the case. And there is
    no point
    displaying a menu anyway.

    https://bugzilla.gnome.org/show_bug.cgi?id=663763

 libempathy-gtk/empathy-individual-view.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 9882c0f0f7d25d6bc6d6490df427c9ee6acc7f08
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 9 11:37:38 2011 +0100

    individual-view: add an option to disable uninteresting filtering

    This is needed when being used in a muc.

    https://bugzilla.gnome.org/show_bug.cgi?id=663763

 libempathy-gtk/empathy-individual-view.c | 96
 ++++++++++++++++++++++++--------
 libempathy-gtk/empathy-individual-view.h |  4 ++
 2 files changed, 76 insertions(+), 24 deletions(-)

commit 0366e5107bab62b34028d650242f44b1d4559382
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 10 12:03:50 2011 +0100

    individual-widget: display channels list if available

    This will be needed when using this widget in MUC.

    https://bugzilla.gnome.org/show_bug.cgi?id=663763

 libempathy-gtk/empathy-individual-widget.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

commit caae76cdabb9939989d196cef7f367dcb26c8d44
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 10 11:45:48 2011 +0100

    factor out empathy_contact_info_create_channel_list_label()

    Move it to empathy-contactinfo-utils so we'll be able to re-use it in
    empathy-individual-widget as well.

    https://bugzilla.gnome.org/show_bug.cgi?id=663763

 libempathy-gtk/empathy-contact-widget.c    | 114
 +++++++++--------------------
 libempathy-gtk/empathy-contactinfo-utils.c |  67 +++++++++++++++++
 libempathy-gtk/empathy-contactinfo-utils.h |	6 ++
 3 files changed, 106 insertions(+), 81 deletions(-)

commit 7c3389cdc7276917d23c83b646573b6d9f22cfa7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 10 10:54:04 2011 +0100

    update_weak_contact: use a greater or equal comparaison

    That way we'll pick at least one TpContact if there is only one
    contact in
    the individual and he doesn't have any presence (IRC for example).

    https://bugzilla.gnome.org/show_bug.cgi?id=663763

 libempathy-gtk/empathy-individual-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d722834868ac8a38a0fd08723d2d1274f660650a
Author: Thura Hlaing <trhura@gmail.com>
Date:	Mon Nov 14 22:33:45 2011 +0100

    [l10n]Added Burmese translation

 po/LINGUAS |	 1 +
 po/my.po   | 3764
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 3765 insertions(+)

commit 35b78547264e756030ae905aac30f03ce1e96cf9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 14 12:42:59 2011 +0100

    fix separator leak

    https://bugzilla.gnome.org/show_bug.cgi?id=663873

 libempathy-gtk/empathy-log-window.c | 2 ++
 1 file changed, 2 insertions(+)

commit 4b81e8ff10c3973388cd022e243237cd32262b23
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 14 12:39:58 2011 +0100

    don't leak uri returned by g_file_get_uri()

    God I hate _get functions returning new memory...

    https://bugzilla.gnome.org/show_bug.cgi?id=663873

 libempathy-gtk/empathy-log-window.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit d75899267ec482020f564117f34ca1e8f2965711
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 14 12:19:54 2011 +0100

    fix GDate leaks when getting dates from the model

    https://bugzilla.gnome.org/show_bug.cgi?id=663873

 libempathy-gtk/empathy-log-window.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 45da1ad2170f19eecb8abe6e55ae1be851ddfb18
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 14 12:12:29 2011 +0100

    free GDate leaks when inserting them into the model

    The model copies the date so we should free it afterward.

    https://bugzilla.gnome.org/show_bug.cgi?id=663873

 libempathy-gtk/empathy-log-window.c | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

commit 09e6bf30a2b213e30fcf7c33c316f69dd5fd64f4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 14 12:01:55 2011 +0100

    empathy-logs: prepare the account manager first

    The log viewer assumes it's already prepared.

    https://bugzilla.gnome.org/show_bug.cgi?id=663873

 tests/interactive/empathy-logs.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

commit a12ee9fcdd35a1482b07da932b3af71a7f7d495c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 14 11:59:31 2011 +0100

    empathy-logs: port to TP coding style

    https://bugzilla.gnome.org/show_bug.cgi?id=663873

 tests/interactive/empathy-logs.c | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

commit ed8e51644481f3f9c2fb9059812bee49eabc423a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 14 15:35:51 2011 +0100

    coding style fixes

 libempathy-gtk/empathy-contact-blocking-dialog.c | 2 +-
 libempathy/empathy-contact.c			  | 8 ++++----
 libempathy/empathy-tls-verifier.c		  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

commit 65d16f797d9d3d7c5e46ef46790d13197f21cc9e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 8 16:09:44 2011 +0100

    main-window: use the EmpathyIndividual flavor of some types

    We switched to EmpathyIndividualView a while ago...

    https://bugzilla.gnome.org/show_bug.cgi?id=663387

    https://bugzilla.gnome.org/show_bug.cgi?id=663763

 src/empathy-main-window.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit bd386d11c3080878821aae39e6f3f1c0b9db5222
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 8 16:08:59 2011 +0100

    empathy_individual_store_remove_individual: use
    EMPATHY_INDIVIDUAL_STORE_COL_NAME

    https://bugzilla.gnome.org/show_bug.cgi?id=663387

    https://bugzilla.gnome.org/show_bug.cgi?id=663763

 libempathy-gtk/empathy-individual-store.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c85a4569ce7fed093a214efd7f96ee78b7a2fd18
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 9 11:15:56 2011 +0100

    individual-view: remove explicit boolean comparaisons

    https://bugzilla.gnome.org/show_bug.cgi?id=663387

    https://bugzilla.gnome.org/show_bug.cgi?id=663763

 libempathy-gtk/empathy-individual-view.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit 8a831cca81b2411227ded99eddeab7bc6b1823ac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 4 10:55:43 2011 +0100

    individual-store: use self->priv pattern

    https://bugzilla.gnome.org/show_bug.cgi?id=663387

    https://bugzilla.gnome.org/show_bug.cgi?id=663763

 libempathy-gtk/empathy-individual-store.c | 265
 +++++++++++-------------------
 libempathy-gtk/empathy-individual-store.h |   4 +-
 2 files changed, 100 insertions(+), 169 deletions(-)

commit 0a04322be34dcaecf2490b56f98a332a88947d9a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 10 11:59:42 2011 +0100

    individual-widget: factor out add_row()

    https://bugzilla.gnome.org/show_bug.cgi?id=663763

 libempathy-gtk/empathy-individual-widget.c | 36
 ++++++++++++++++++------------
 1 file changed, 22 insertions(+), 14 deletions(-)

commit e6e284c7dbcc97c007091b937837c94c47876922
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 10 10:02:31 2011 +0100

    details_update_show: skip empty field

    https://bugzilla.gnome.org/show_bug.cgi?id=663763

 libempathy-gtk/empathy-individual-widget.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 54ff7731cdcdcad0e824c3b71fc8d1b427f26f72
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Sat Nov 12 19:10:31 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1279
 ++++++++++++++++++++++++++++++++---------------------------
 po/zh_TW.po | 1279
 ++++++++++++++++++++++++++++++++---------------------------
 2 files changed, 1398 insertions(+), 1160 deletions(-)

commit 249922131eddbd3040a4f1982d4d927b3567dcb9
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	Sat Nov 12 12:55:55 2011 +0200

    [l10n] Updated Estonian translation

 po/et.po | 883
 +++++++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 715 insertions(+), 168 deletions(-)

commit 92e94e644937590a6832f1321b1ce285cae38f86
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Nov 9 19:25:17 2011 +0000

    Don't turn on echo cancellation on the sink if it's for raw
    conferences

    https://bugzilla.gnome.org/show_bug.cgi?id=663842

 libempathy-gtk/empathy-call-utils.c | 11 ++++++++---
 src/empathy-audio-sink.c	     | 19 ++++++++++++++++---
 src/empathy-audio-sink.h	     |	2 ++
 src/empathy-audio-src.c	     |	1 +
 src/empathy-call-handler.c	     |	7 ++-----
 src/empathy-call-window.c	     | 17 ++++++++++++++---
 6 files changed, 43 insertions(+), 14 deletions(-)

commit 8b9ee2a0f048ce6263efe0d0660ed04a53861adf
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Nov 9 19:00:10 2011 +0000

    Don't turn on echo cancellation on the source if it's for raw
    conferences

    https://bugzilla.gnome.org/show_bug.cgi?id=663842

 libempathy-gtk/empathy-call-utils.c |	7 ++++---
 libempathy-gtk/empathy-call-utils.h |	3 ++-
 src/empathy-audio-sink.c	     |	2 +-
 src/empathy-audio-src.c	     | 12 +++++++++---
 src/empathy-audio-src.h	     |	6 ++++++
 src/empathy-call-window.c	     | 25 +++++++++++++++++++++++++
 6 files changed, 47 insertions(+), 8 deletions(-)

commit ffaa3afe49651493d0dcb01eba1b6dcd1134eed1
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Nov 9 16:27:51 2011 +0000

    Call: Signal content-{added/removed} instead of sink-{added/removed}

    Tp-Farstream signals contents, not sinks (like tp-farsight did). So
    lets
    mirror that, which allows us to make better decisions about what
    kind of
    contents we are given

    https://bugzilla.gnome.org/show_bug.cgi?id=663842

 src/empathy-call-handler.c | 37 ++++++++++++++-----------------------
 src/empathy-call-window.c  | 35 ++++++++++++++++++++++-------------
 2 files changed, 36 insertions(+), 36 deletions(-)

commit 8f95b35828bbf37beda060ed25957599e4f50c5f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 10 10:23:08 2011 +0100

    stop using gtk_widget_get_pointer()

    It has been deprecated. I asked on #gtk+ and that seems to be the
    right way to
    do this. See
    http://git.gnome.org/browse/gtk+/commit/?id=2783158f8d9ca69e5a8fc4a903bfbcc3871a1b02

    All these APIs are available since GTK+ 3.0 so we're good.

    https://bugzilla.gnome.org/show_bug.cgi?id=662903

 libempathy-gtk/empathy-chat-text-view.c | 4 +++-
 libempathy-gtk/empathy-chat.c		 | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

commit 19fe264f32b68246b21b0db8eb2694a159b833f2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 10 10:23:08 2011 +0100

    stop using gdk_window_get_pointer()

    It has been deprecated. gdk_window_get_device_position() has been
    added in
    GTK+ 3.0 so we're fine.

    https://bugzilla.gnome.org/show_bug.cgi?id=662903

 libempathy-gtk/empathy-chat-text-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9b50f0ae49e9c99995ed5289eab656aede142c6b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 7 15:44:59 2011 +0100

    doesn't allow to send socket files

    https://bugzilla.gnome.org/show_bug.cgi?id=663563

 libempathy-gtk/empathy-ui-utils.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

commit 82b0f4038f7c257253962080270e5625dd5de152
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Nov 9 10:55:26 2011 +0000

    tp-file: remove EmpathyTpFile

    TpFTChannel!

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/Makefile.am       |   1 -
 libempathy/empathy-tp-file.c | 894
 -------------------------------------------
 libempathy/empathy-tp-file.h | 127 ------
 po/POTFILES.in		      |   1 -
 4 files changed, 1023 deletions(-)

commit 9635473089accaa52a98242964cda0580a7f820d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Nov 9 10:54:03 2011 +0000

    client-factory: stop creating EmpathyTpFile objects

    TpAutomaticClientFactory will create TpFileTransferChannels for us and
    they're, like, way better.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-client-factory.c		  | 6 ------
 libempathy/empathy-ft-factory.c		  | 2 +-
 nautilus-sendto-plugin/empathy-nautilus-sendto.c | 3 +--
 src/empathy-event-manager.c			  | 7 +++----
 src/empathy-ft-manager.c			  | 5 ++---
 5 files changed, 7 insertions(+), 16 deletions(-)

commit 984f97edbd102cfab9ecad00c07cb9ac6474ffc9
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Nov 9 10:49:26 2011 +0000

    ft-handler: start using TpFTChannel instead of EmpathyTpFile

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-ft-factory.c |   2 +-
 libempathy/empathy-ft-handler.c | 244
 +++++++++++++++++++++++++++-------------
 libempathy/empathy-ft-handler.h |  17 ++-
 3 files changed, 179 insertions(+), 84 deletions(-)

commit e525496e170ba7a215c335533e56fbcbe5bbdcc1
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Nov 9 10:36:16 2011 +0000

    libempathy: remove empathy-tp-file from headers

    This is just a little hack so GEnums aren't created for enums in
    empathy-tp-file.h. We'll remove the files in a sec but I want to try
    and avoid breaking bisect.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

commit cec65054ff56209c3e660817830b7586b56a16d0
Author: Arun Raghavan <arun.raghavan@collabora.co.uk>
Date:	Mon Oct 31 18:42:56 2011 +0530

    audio-src: Add a caps filter to select appropriate input format

    Instead of relying on the default caps that the pipeline selects
    (which
    will usually end up being float32 stereo at 44.1kHz), this sets a caps
    filter to select the format we want from pulsesrc -- s16ne mono
    at 32kHz.

    The point of this is to do resampling/conversion as early in the
    pipeline as possible, decreasing the amount of data that needs to be
    carried around and thus improving performance a bit.

 src/empathy-audio-src.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

commit e5f60e1e139a55250004a3683dd7edd780b43a54
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 9 10:01:50 2011 +0100

    empathy_contact_block_menu_item_new: remove unused
    EmpathyContactManager

 libempathy-gtk/empathy-contact-menu.c | 3 ---
 1 file changed, 3 deletions(-)

commit e3a41a931f6d71d7b809326b0e8fde8f3d9a3c9a
Merge: 704b05c 44b063e
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Nov 9 12:19:07 2011 +1100

    Merge branch 'status-icon-663567'

commit 704b05c60943bbb09dcd6d95ba8781431d67978b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 3 15:07:17 2011 +0100

    contact-list-view: use empathy_contact_remove_from_contact_list()

    https://bugzilla.gnome.org/show_bug.cgi?id=663327

 libempathy-gtk/empathy-contact-list-view.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

commit 7457b90af7b993bb34b40abf0cc2e3f605a4efa4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 3 14:08:29 2011 +0100

    notifications-approver: stop using EmpathyContactManager

    https://bugzilla.gnome.org/show_bug.cgi?id=663327

 src/empathy-notifications-approver.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

commit 6104a6ca517210e89d441a44ed720168591c0a4e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 3 14:08:29 2011 +0100

    contact-dialog: stop using EmpathyContactManager

    https://bugzilla.gnome.org/show_bug.cgi?id=663327

 libempathy-gtk/empathy-contact-dialogs.c | 31
 ++++++-------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

commit e1cf171b3d8b349c1f92773130c94337076ca30b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 3 14:54:43 2011 +0100

    add empathy_contact_remove_from_contact_list()

    https://bugzilla.gnome.org/show_bug.cgi?id=663327

 libempathy/empathy-contact.c | 12 ++++++++++++
 libempathy/empathy-contact.h |  2 ++
 2 files changed, 14 insertions(+)

commit a8133af0231b5b7000f6f671215f841d68fb6bb4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 3 14:08:29 2011 +0100

    contact-search-dialog: stop using EmpathyContactManager

    https://bugzilla.gnome.org/show_bug.cgi?id=663327

 libempathy-gtk/empathy-contact-search-dialog.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

commit b018a119c5a7f43eb5a407ed34d90681673c3f78
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 3 14:08:01 2011 +0100

    add empathy_contact_add_to_contact_list()

    https://bugzilla.gnome.org/show_bug.cgi?id=663327

 libempathy/empathy-contact.c | 38 ++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-contact.h |  3 +++
 2 files changed, 41 insertions(+)

commit 63ec3726a865e5ae6b5ed5cdbcee290a3415f707
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 3 15:00:57 2011 +0100

    client-factory: prepare TP_CONNECTION_FEATURE_CONTACT_LIST_PROPERTIES

    https://bugzilla.gnome.org/show_bug.cgi?id=663327

 libempathy/empathy-client-factory.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit a7429bd7acc0359d327c8d0f8042dd536dfc1df2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 2 10:49:01 2011 +0100

    remove old blocking API

    https://bugzilla.gnome.org/show_bug.cgi?id=661805

 libempathy/empathy-contact-list.c    |  24 -------
 libempathy/empathy-contact-list.h    |  18 +-----
 libempathy/empathy-contact-manager.c |  43 -------------
 libempathy/empathy-tp-contact-list.c | 119
 +++--------------------------------
 4 files changed, 8 insertions(+), 196 deletions(-)

commit 6cb1836a97f35a92e9535e08c7eeeee1bb6ea4e1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 2 11:18:50 2011 +0100

    individual dialog: use tp-glib blocking API

    https://bugzilla.gnome.org/show_bug.cgi?id=661805

 libempathy-gtk/empathy-individual-dialogs.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

commit c627b58b275f7b018ddcf4ea59509207a72f3a2e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 2 10:59:06 2011 +0100

    individual-manager: use tp-glib blocking API

    https://bugzilla.gnome.org/show_bug.cgi?id=661805

 libempathy/empathy-individual-manager.c | 42
 +++++++++++++--------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

commit 2c38acc1cf8810730975e61873191223cf840ae4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 2 10:59:06 2011 +0100

    contact-dialogs: use tp-glib blocking API

    https://bugzilla.gnome.org/show_bug.cgi?id=661805

 libempathy-gtk/empathy-contact-dialogs.c | 33
 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

commit 60c5906232a73b8911eac873fa208b681e0b7999
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 2 10:43:19 2011 +0100

    contact-menu: use tp-glib blocking API

    https://bugzilla.gnome.org/show_bug.cgi?id=661805

 libempathy-gtk/empathy-contact-menu.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

commit 6573920f71ab5d40d27e4fb9b68f11fb0271c7b6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 2 11:41:49 2011 +0100

    Revert "Revert "contact-blocking-dialog: use tp-glib high level
    blocking API""

    This reverts commit 40dc4074eeecb15c82d9eacb3fcd54cff7162440.

    We can now depends on it.

 libempathy-gtk/empathy-contact-blocking-dialog.c  | 473
 +++++++---------------
 libempathy-gtk/empathy-contact-blocking-dialog.ui |   4 +-
 libempathy/empathy-client-factory.c		   |   3 +
 3 files changed, 161 insertions(+), 319 deletions(-)

commit 513e354659c7afc6cf2c860d8466a84b22e3d49f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 8 13:22:55 2011 +0100

    depends on tp-glib 0.17.0

    We need it for high level blocking API.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d72e5a01c8bef2bbc3997de259d783ef8d92be4a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 4 13:42:53 2011 +0100

    contact-chooser: fix TpfPersona leak

    We weren't using the persona we just created for some reason.

 libempathy-gtk/empathy-contact-chooser.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 64a173ce325b9ba30079ce5b9f3bbe1615302ecb
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Nov 8 11:17:56 2011 +1100

    Remove dead files codec-preferences and element-preferences

    These are now handled for us by Farsight. Hooray for Farsight.

 configure.ac			      |  2 +-
 data/Makefile.am		      |  6 ----
 data/codec-preferences		      | 50 ------------------------------
 data/element-properties	      | 59
 ------------------------------------
 src/empathy-streamed-media-handler.c | 23 --------------
 src/empathy-streamed-media-window.c  | 24 +++++----------
 6 files changed, 8 insertions(+), 156 deletions(-)

commit 44b063e9cd039d7682da55b214ae8f84ace0ca5d
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Nov 8 09:49:41 2011 +1100

    accounts-dialog: fix box packing issue in infobar

    Expanding the status causes the icon to be placed on the far left
    of the box.
    This regression caused by my work in
    1cd6e8253a3be284b8578fd9ea37016d0197d61b.
    Need an additional hbox and to expand that.

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=663567

 src/empathy-accounts-dialog.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

commit 945df143a94c9c64c925591e09e6dd28c43408ff
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Nov 7 11:37:12 2011 +0000

    call: Fix GstCaps leak

 src/empathy-video-src.c | 1 +
 1 file changed, 1 insertion(+)

commit 4d72a7a6977aadd395f5c96977ab0a1db303cb46
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Nov 7 11:04:14 2011 +0000

    Call: Cope with not having the Channel direclty after startin a call

 src/empathy-call-window.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit 55ab1d4f324ad5e1befa2fe2147f36b9c47aacc1
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Nov 4 18:58:50 2011 +0000

    Use videorate max-rate property

    Using the max-rate property is simpler and less racy, so do that
    instead. Does require (currently unreleased) gst-plugins-base 0.10.36

 src/empathy-video-src.c | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

commit 7577ba45e2046a19caac1b360901669d12e0f3d1
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Nov 4 18:46:24 2011 +0000

    When reset the source remove and re-insert it

    Setting an element to NULL resets various internal values (the clock,
    the base time etc). To make sure everything is reset as expected
    simply
    yank it from the bin and re-insert it (which will reset the values)

 src/empathy-video-src.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

commit ab7098222f1b01f87956331ae7c1e095fbf1c9a5
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Nov 4 18:45:22 2011 +0000

    Drop EOS from the src

 src/empathy-video-src.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit b0438bff889500c7e9704233124fca7c572a7876
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Nov 4 18:44:35 2011 +0000

    Don't go asynchronously to paused

 src/empathy-call-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ae85ed785b30347012be35042da0b37714d13e04
Author: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date:	Mon Jul 11 19:44:42 2011 -0400

    Ignore dynamic framerate if videomaxrate is missing

 src/empathy-video-src.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

commit 32aef7685fde0d06b37e381323dd172d41664c75
Author: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date:	Mon Jul 11 19:45:46 2011 -0400

    Use framerate range instead of fix range

    Using framerate range reduce the chance that changing the framerate
    breaks
    the pipline. We also always set an initial range to support src like
    videotestsrc that does not allow changing framerate dynamically
    and would
    default to a "as fast as possible" mode.

 src/empathy-video-src.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit 6fd0f2618c54d9300cd633c954b69f1d3d6e4197
Author: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date:	Mon Jul 11 17:01:45 2011 -0400

    Reset clock after changing video resolution

    This workaround issue with videotestsrc when the test src does not
    have a
    a clock after going to NULL state while changing resolution.

 src/empathy-video-src.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 21a7183c58bf6ca3bb9b207b400de91a42d5bcd0
Author: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date:	Thu Jul 7 16:19:17 2011 -0400

    Change element state sink to source

 src/empathy-call-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f0f72ca31e1500e7e57d15b817ca0cecf2c9d060
Author: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date:	Thu Jul 7 14:27:30 2011 -0400

    Don't call GTK method from streaming thread

    Also update from deprecated gst_x_overlay_set_xwindow_id() to
    gst_x_overlay_set_window_handle().

 src/empathy-video-widget.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit d41e4f40e98cca99005a344a738e0468ae3b84bf
Author: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date:	Wed Jul 6 18:18:58 2011 -0400

    Hook resolution change support

 src/empathy-call-window.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

commit d341cb5a4ce8555233e879febe765b1d8d6accd8
Author: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date:	Wed Jul 6 18:14:57 2011 -0400

    Let set_send_video do it's job

 src/empathy-call-window.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 8d228611ffed55ab8b4c561a1789296259a342fc
Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
Date:	Tue Jul 19 13:43:44 2011 -0400

    Check and create video_preview outside camera control

 src/empathy-call-window.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 8b9fd6cc4b679d81e5d4ec962dd148c264017881
Author: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date:	Wed Jul 6 18:12:40 2011 -0400

    Add resultion and framerate changing to video src

 src/empathy-video-src.c | 52
 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-video-src.h |  6 ++++++
 2 files changed, 58 insertions(+)

commit dd3a57dfb3466de4207ed5233db504ad20ef54e6
Author: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date:	Wed Jul 6 18:11:28 2011 -0400

    Add framerate and resolution change signal

 src/empathy-call-handler.c | 67
 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

commit af1731d30620e7bd4aaa098af02adc3c71cb30f9
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Nov 7 15:45:40 2011 +1100

    Don't crash when the buffer has length 0

    Unexpectedly, a 0 length buffer causes gdk_pixbuf_loader_write()
    to return
    FALSE without setting @error. Would then segv on error->message.

 libempathy-gtk/empathy-ui-utils.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 7c0dff773920a0796e079d5c79165a12fc7e8ddd
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Nov 7 12:03:50 2011 +1100

    Make GOA optional again

    There is an --disable-goa flag in Empathy's configure, which should
    be able to
    disable GOA, except it had been included as a required
    dependency. This patch
    makes it completely optional again.

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=663442

 configure.ac			   |  7 +++--
 libempathy/Makefile.am		   | 59
 ++++++++++++++++++++++++---------------
 libempathy/empathy-auth-factory.c | 18 +++++++++++-
 3 files changed, 59 insertions(+), 25 deletions(-)

commit d12639558defd8be43dc0c5c43a80f6397900bd5
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Nov 7 12:00:06 2011 +1100

    Add missing AC_MSG_RESULT

 configure.ac | 1 +
 1 file changed, 1 insertion(+)

commit fde5e42fdf37be620bcb5c62ae0755123f08dabc
Merge: dbcdfed c51087c
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Sat Nov 5 12:29:59 2011 +1100

    Merge branch 'ui-fixes'

commit dbcdfedca4108c5643ecfb3303004551a804c5a7
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Fri Nov 4 13:02:49 2011 +0100

    Updated Galician translations

 po/gl.po | 652
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 347 insertions(+), 305 deletions(-)

commit d3e575fd305487eb8a15a66941651325904ba90b
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Oct 27 12:09:59 2011 +0200

    Import Facebook and windows Live GOA accounts

    Implement their auth mechanisms

    Fixes bug #661068 and #652544

 configure.ac				 |   6 +
 goa-mc-plugin/mcp-account-manager-goa.c |  28 +-
 libempathy/Makefile.am			 |   2 +
 libempathy/empathy-auth-factory.c	 |  98 +++++--
 libempathy/empathy-goa-auth-handler.c	 | 436
 ++++++++++++++++++++++++++++++++
 libempathy/empathy-goa-auth-handler.h	 |  72 ++++++
 libempathy/empathy-utils.c		 |  15 ++
 libempathy/empathy-utils.h		 |   3 +
 8 files changed, 631 insertions(+), 29 deletions(-)

commit baeff8af237dd7c4a18d578ed71b3ee87ceb278d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Nov 3 09:12:49 2011 +0100

    Fix crash when opening GOA facebook account settings

    In that case priv->jid_suffix is NULL, so we should not try to call
    remove_jid_suffix().

 libempathy-gtk/empathy-account-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b9aad8c8792dfb03975feaec31bdc90d5157a9d2
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Oct 4 13:09:04 2011 +0200

    empathy-auth-client: use a TpSimpleClientFactory

    This prevent TpBaseClient to create a full TpAccountManager and allow
    us to prepare TP_ACCOUNT_FEATURE_STORAGE feature on accounts

 libempathy/empathy-auth-factory.c | 13 +++----------
 libempathy/empathy-auth-factory.h |  2 +-
 src/empathy-auth-client.c	   | 12 +++++++++++-
 3 files changed, 15 insertions(+), 12 deletions(-)

commit c51087c21e75c3c8309adc042d66cb92906e17d5
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Nov 4 17:16:42 2011 +1100

    dialpad-widget: make grid rows/columns homogeneous

    Buttons should all be the same size.

 libempathy-gtk/empathy-dialpad-widget.c | 2 ++
 1 file changed, 2 insertions(+)

commit b39f8ef08e064d4d61e0720afad4c534c07a7dc8
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Nov 4 17:12:21 2011 +1100

    dialpad-widget: ensure able to show with gtk_widget_show()

    The child widgets of the dialpad-widget weren't being shown, so
    the widget
    required a gtk_widget_show_all() to show up. Unexpected :(

 libempathy-gtk/empathy-dialpad-widget.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 84d946f81001605bc6608e8a0ad5a19eaa88136c
Author: Colin Walters <walters@verbum.org>
Date:	Thu Nov 3 22:58:46 2011 -0400

    tls: Cast argument to gcr_simple_certificate_new to avoid compiler
    warning

    Gcr correctly treats these as unsigned.

 libempathy/empathy-tls-verifier.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3e8b4d35580674c0271de8f12278625de963c9f6
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Nov 2 15:45:40 2011 +0100

    Fix set-but-not-used build warning

 libempathy-gtk/empathy-log-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 40dc4074eeecb15c82d9eacb3fcd54cff7162440
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 2 11:41:11 2011 +0100

    Revert "contact-blocking-dialog: use tp-glib high level blocking API"

    This reverts commit d8153fa21a7beb4229dbba1810eb8544af91db4f.

    I was not supposed to commit that yet; the tp-glib API hasn't been
    released.

 libempathy-gtk/empathy-contact-blocking-dialog.c  | 473
 +++++++++++++++-------
 libempathy-gtk/empathy-contact-blocking-dialog.ui |   4 +-
 libempathy/empathy-client-factory.c		   |   3 -
 3 files changed, 319 insertions(+), 161 deletions(-)

commit d8153fa21a7beb4229dbba1810eb8544af91db4f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 26 17:43:50 2011 +0200

    contact-blocking-dialog: use tp-glib high level blocking API

    https://bugzilla.gnome.org/show_bug.cgi?id=661805

 libempathy-gtk/empathy-contact-blocking-dialog.c  | 473
 +++++++---------------
 libempathy-gtk/empathy-contact-blocking-dialog.ui |   4 +-
 libempathy/empathy-client-factory.c		   |   3 +
 3 files changed, 161 insertions(+), 319 deletions(-)

commit 14b39f587a847e64962eb5aeac486c5a79858c9d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 26 17:23:31 2011 +0200

    contact-blocking-dialog: split COL_* enums

    We have 2 different models having their own set of columns.

    https://bugzilla.gnome.org/show_bug.cgi?id=661805

 libempathy-gtk/empathy-contact-blocking-dialog.c | 36
 ++++++++++++++----------
 1 file changed, 21 insertions(+), 15 deletions(-)

commit 310545726194fdcb967e9edbe83cbd9af5cfd601
Author: Muhammet Kara <muhammet.k@gmail.com>
Date:	Wed Nov 2 12:21:12 2011 +0200

    Updated Turkish translation

 po/tr.po | 544
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 288 insertions(+), 256 deletions(-)

commit ad377871995ca45fc5c10b12e753200d25f8beb3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 1 15:45:06 2011 +0100

    main-window: port to GtkGrid

    https://bugzilla.gnome.org/show_bug.cgi?id=662903

 src/empathy-main-window.c | 60
 ++++++++++++++++++-----------------------------
 1 file changed, 23 insertions(+), 37 deletions(-)

commit 006f4b813d176e487e0f720424a6274ad7d726ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 1 15:45:06 2011 +0100

    individual-widget: port to GtkGrid

    https://bugzilla.gnome.org/show_bug.cgi?id=662903

 libempathy-gtk/empathy-individual-widget.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

commit 2607985f6fb66e14d23d2b87eeba1b225ea3fae9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 1 15:45:06 2011 +0100

    dialpad-widget: port to GtkGrid

    https://bugzilla.gnome.org/show_bug.cgi?id=662903

 libempathy-gtk/empathy-dialpad-widget.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 96144defe29269f9eec1d487effebc1a9ca50f52
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 1 15:45:06 2011 +0100

    contact-widget: port to GtkGrid

    https://bugzilla.gnome.org/show_bug.cgi?id=662903

 libempathy-gtk/empathy-contact-widget.c  | 98
 +++++++++++++++++---------------
 libempathy-gtk/empathy-contact-widget.ui | 40 ++-----------
 2 files changed, 57 insertions(+), 81 deletions(-)

commit b26b85d3bddf2afd23b621a817cd5041c5e2ef17
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 1 13:39:49 2011 +0100

    account-widget-*: port to GtkGrid

    https://bugzilla.gnome.org/show_bug.cgi?id=662903

 libempathy-gtk/empathy-account-widget-aim.ui	    |  36 +------
 libempathy-gtk/empathy-account-widget-generic.ui   |  24 +----
 libempathy-gtk/empathy-account-widget-groupwise.ui |  38 +------
 libempathy-gtk/empathy-account-widget-icq.ui	    |  44 +-------
 libempathy-gtk/empathy-account-widget-irc.ui	    |  43 +-------
 libempathy-gtk/empathy-account-widget-jabber.ui    |  49 ++-------
 .../empathy-account-widget-local-xmpp.ui	    |  46 ++-------
 libempathy-gtk/empathy-account-widget-msn.ui	    |  38 +------
 libempathy-gtk/empathy-account-widget-sip.c	    |  17 ++--
 libempathy-gtk/empathy-account-widget-sip.h	    |	2 +-
 libempathy-gtk/empathy-account-widget-sip.ui	    | 111
 +++++----------------
 libempathy-gtk/empathy-account-widget-yahoo.ui     |  51 ++--------
 libempathy-gtk/empathy-account-widget.c	    | 110
 ++++++++++----------
 13 files changed, 126 insertions(+), 483 deletions(-)

commit 4131d7e70306766e91cefffb02524f2b667d86af
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 1 13:38:33 2011 +0100

    Ignore generated files from pl doc

 help/.gitignore | 2 ++
 1 file changed, 2 insertions(+)

commit 7ca4a26a93558a1288cb7cb997ab7a891cd1eab4
Author: Michael Monreal <michael.monreal+bugs@gmail.com>
Date:	Mon Oct 31 17:59:11 2011 +0100

    Fix for misaligned 16x16 app icon

    The 16x16 app icon that ships with empathy 3.x is missing the
    upper border
    because it is shifted one pixel up. I have rearranged the vector
    image to the
    baseplate and created a fixed 16x16.

    https://bugzilla.gnome.org/show_bug.cgi?id=662995

 data/icons/empathy.svg			   | 5759
 +----------------------------
 data/icons/hicolor_apps_16x16_empathy.png |  Bin 890 -> 905 bytes
 2 files changed, 202 insertions(+), 5557 deletions(-)

commit 01f9ca07f3a9c57ad0959ede7d234f057ae705b2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 28 16:57:34 2011 +0200

    coding style fix

 libempathy-gtk/empathy-account-chooser.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 004fc67145dcea8ea451ac94783d5b537afcae57
Author: Marek Černocký <marek@manet.cz>
Date:	Sun Oct 30 12:16:30 2011 +0100

    Updated Czech translation

 po/cs.po | 1080
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 578 insertions(+), 502 deletions(-)

commit 853116e9ef7aa9a86190f25aa8de2b37d6e74533
Author: Aleksander Łukasiewicz <aleksander@lukasiewicz.net>
Date:	Fri Oct 28 18:45:06 2011 +0200

    Added Polish translation of help

 help/Makefile.am |    2 +-
 help/pl/pl.po	  | 3457
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 3458 insertions(+), 1 deletion(-)

commit 8bb2b53dad076cbc9fc92ab11e11f1ba6fcbfd92
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 26 12:23:45 2011 +0200

    empathy_account_chooser_set_account: select account later if not
    ready yet

    It's stupid to have to ask to any user of this widget to do this
    itself.

    https://bugzilla.gnome.org/show_bug.cgi?id=662604

 libempathy-gtk/empathy-account-chooser.c | 24 +++++++++++++++++++-
 libempathy-gtk/empathy-log-window.c	  | 38
 +++++---------------------------
 2 files changed, 28 insertions(+), 34 deletions(-)

commit 0ae11712afc8dfc1231531fe097ee1debc8b0ece
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 26 12:13:45 2011 +0200

    account-chooser: factor out select_account()

    https://bugzilla.gnome.org/show_bug.cgi?id=662604

 libempathy-gtk/empathy-account-chooser.c | 29
 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

commit 5c4c3ec113984d8ae5a1f68513da64b0eb901841
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 27 16:14:58 2011 +0200

    invite-participant-dialog: don't display treeview if no contact list

    https://bugzilla.gnome.org/show_bug.cgi?id=662843

 src/empathy-invite-participant-dialog.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

commit 9fb03deb660336545d874bc33e35669ce7f57c8d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 27 15:19:24 2011 +0200

    add empathy_contact_chooser_show_tree_view()

    https://bugzilla.gnome.org/show_bug.cgi?id=662843

 libempathy-gtk/empathy-contact-chooser.c | 18 +++++++++++++-----
 libempathy-gtk/empathy-contact-chooser.h |  3 +++
 2 files changed, 16 insertions(+), 5 deletions(-)

commit e10818e57080f0c45797adb407234a07f81d571b
Merge: 3b00a09 1cd6e82
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Oct 28 17:57:16 2011 +1100

    Merge branch 'ui-work'

commit 3b00a09f5d1cdee956c847c664dfde21a20f952b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 24 15:53:34 2011 +0200

    refilter if the TpConnection of a TpAccount is changed

    https://bugzilla.gnome.org/show_bug.cgi?id=662609

 libempathy-gtk/empathy-account-chooser.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit a6d4518c76cf1c78bd954bb2488d6f01868dd337
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 24 15:51:23 2011 +0200

    factor out update_account()

    https://bugzilla.gnome.org/show_bug.cgi?id=662609

 libempathy-gtk/empathy-account-chooser.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

commit 14dba3ce7abd486f9f081a2000b9afe356e98a5f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 24 15:42:06 2011 +0200

    account-chooser: make sure that TP_ACCOUNT_FEATURE_CONNECTION and
    TP_CONNECTION_FEATURE_CAPABILITIES are prepared

    Most filter will need those.

    https://bugzilla.gnome.org/show_bug.cgi?id=662609

 libempathy-gtk/empathy-account-chooser.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit bdecc6238a2bf3ffc94d522da466514b02014fda
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 24 15:27:38 2011 +0200

    log-window: use empathy_account_chooser_refilter()

    It's cleaner than re-setting the same filter function.

    https://bugzilla.gnome.org/show_bug.cgi?id=662609

 libempathy-gtk/empathy-log-window.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 75e36b52f5dbe565aba6fcaf201a8ed1f2557b02
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 24 15:26:26 2011 +0200

    factor out empathy_account_chooser_refilter()

    https://bugzilla.gnome.org/show_bug.cgi?id=662609

 libempathy-gtk/empathy-account-chooser.c | 16 +++++++++++-----
 libempathy-gtk/empathy-account-chooser.h |  2 ++
 2 files changed, 13 insertions(+), 5 deletions(-)

commit e220eb6b5dceb755e7858e465e78a46d555555f2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 24 14:27:15 2011 +0200

    move pre-defined filter at the end of the files

    https://bugzilla.gnome.org/show_bug.cgi?id=662609

 libempathy-gtk/empathy-account-chooser.c | 54
 +++++++++++++++++---------------
 libempathy-gtk/empathy-account-chooser.h |  6 ++--
 2 files changed, 32 insertions(+), 28 deletions(-)

commit 40babd776c588ad4a2d8637d0c3bdd06933f3311
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 24 14:17:26 2011 +0200

    account-chooser: replace finalize by dispose

    It just unref one object so dispose is the best place.

    https://bugzilla.gnome.org/show_bug.cgi?id=662609

 libempathy-gtk/empathy-account-chooser.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 71ae7d49c29a34af419792c8d8c6fb2a9e6b42ba
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 24 14:14:05 2011 +0200

    account-chooser: use tp_g_signal_connect_object()

    https://bugzilla.gnome.org/show_bug.cgi?id=662609

 libempathy-gtk/empathy-account-chooser.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

commit 41a3bfca1e22e54c3982f39c560144bc40ecb92f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 24 14:12:32 2011 +0200

    account-chooser: use self->priv pattern

    https://bugzilla.gnome.org/show_bug.cgi?id=662609

 libempathy-gtk/empathy-account-chooser.c | 111
 +++++++++++--------------------
 libempathy-gtk/empathy-account-chooser.h |   3 +-
 2 files changed, 39 insertions(+), 75 deletions(-)

commit 8498eee7a22eaaaec28d767915d2bdb7333da684
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 24 14:05:13 2011 +0200

    inline account_chooser_setup()

    https://bugzilla.gnome.org/show_bug.cgi?id=662609

 libempathy-gtk/empathy-account-chooser.c | 265
 +++++++++++++++----------------
 1 file changed, 129 insertions(+), 136 deletions(-)

commit 3c80977a6ebe49cff9ec249e475c7da3d4f938b6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 24 14:02:59 2011 +0200

    move down empathy_account_chooser_class_init()

    https://bugzilla.gnome.org/show_bug.cgi?id=662609

 libempathy-gtk/empathy-account-chooser.c | 82
 ++++++++++++++------------------
 1 file changed, 36 insertions(+), 46 deletions(-)

commit f053dfe91cd004f01a20876c51db480b3b2970cd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 24 13:53:40 2011 +0200

    account-chooser: port to new coding style

    I wanted to clean the account chooser a bit but the old coding style
    makes me
    cry...

    It's good to do anyway, especially if we move this widget to a
    telepathy-gtk
    lib at some point.

    https://bugzilla.gnome.org/show_bug.cgi?id=662609

 libempathy-gtk/empathy-account-chooser.c | 1358
 +++++++++++++++---------------
 libempathy-gtk/empathy-account-chooser.h |   97 ++-
 2 files changed, 740 insertions(+), 715 deletions(-)

commit 1cd6e8253a3be284b8578fd9ea37016d0197d61b
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Oct 27 15:48:31 2011 +1100

    accounts-dialog: fix infobar packing issues by porting to GtkGrid

 src/empathy-accounts-dialog.c | 51
 +++++++++++++++----------------------------
 1 file changed, 17 insertions(+), 34 deletions(-)

commit d58f6a2066522cad2028dba9b518a1d7fdfbbc34
Merge: 6678cb7 fcb0e76
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Oct 27 11:49:19 2011 +1100

    Merge branch 'bug-662727'

commit 6678cb7bc2dbd2b57925bdb70da0cb64bad03e2c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 25 17:03:28 2011 +0200

    empathy-debugger: rely on gtk_application_add_window() to manage
    the main loop

    We have to old the application while doing async preparation as the
    app window
    is not created right away.

    https://bugzilla.gnome.org/show_bug.cgi?id=662504

 src/empathy-accounts-common.c | 30 ++++++++++++++++++------------
 src/empathy-accounts-common.h |  2 +-
 src/empathy-accounts.c        | 38 ++++++++++++++++++++++----------------
 3 files changed, 41 insertions(+), 29 deletions(-)

commit cf3a9f53216213720c3551c8e1833fc4eb971fe0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 26 10:02:01 2011 +0200

    empathy-accounts: prepare the AM in app_command_line_cb

    We just need to prepare it in the main instance; there is no point
    doing it
    the other ones as they will just re-invoke the main one and exit.

    https://bugzilla.gnome.org/show_bug.cgi?id=662504

 src/empathy-accounts.c | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

commit 08d8020862035a1d8f4e41a31b10dcde870d8b73
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 26 09:47:20 2011 +0200

    empathy-accounts: re-use existing TpAccount rather than creating a
    new one

    This allows us to detect right away if the account is a valid one
    and we don't
    have to prepare it any more as the AM already did it for us.

    https://bugzilla.gnome.org/show_bug.cgi?id=662504

 src/empathy-accounts.c | 60
 +++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

commit 2a1759c28d088b821fdf0ae7f86cac153fd9d46e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 25 17:03:28 2011 +0200

    empathy-debugger: rely on gtk_application_add_window() to manage
    the main loop

    https://bugzilla.gnome.org/show_bug.cgi?id=662504

 src/empathy-debugger.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 60de5f653d7066698803e4d0a5df4417181abbc2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 25 17:03:28 2011 +0200

    empathy: rely on gtk_application_add_window() to manage the main loop

    We are not supposed to call gtk_main_quit() as we don't use gtk_main()
    any
    more. Instead we add the windows to the GtkApplication which will
    take care of
    exiting when they have been all destroyed.

    https://bugzilla.gnome.org/show_bug.cgi?id=662504

 src/empathy-main-window.c | 2 +-
 src/empathy-status-icon.c | 4 +++-
 src/empathy.c		   | 7 +++----
 3 files changed, 7 insertions(+), 6 deletions(-)

commit fcb0e76deed0527edb5caff02dd0edf785b1f82e
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Oct 26 14:26:11 2011 +1100

    contact-chooser: refilter when the tmp contacts change capabilities

    Making a call to GetContactAttributes only gets the attributes
    currently known
    to the CM. If a contact is unknown, lookups for the attributes are
    then queued
    and signalled when retrieved. When we receive this signal, we
    should refilter
    the contact list.

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=662727

 libempathy-gtk/empathy-contact-chooser.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 6f49a762afc95060f19dc7778b0b588d1e86754b
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Tue Oct 25 21:17:34 2011 +0200

    Updated Slovenian translation

 po/sl.po | 202
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 106 insertions(+), 96 deletions(-)

commit 1fca1d7a7c069284f60116f9370f902d28173ba9
Author: Gil Forcada <gforcada@gnome.org>
Date:	Tue Oct 25 20:59:58 2011 +0200

    [l10n]Updated Catalan documentation

 help/ca/ca.po | 4077
 +++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 3084 insertions(+), 993 deletions(-)

commit f2bb34846e17803a2601f46be59a54ada0406bbc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 25 16:00:33 2011 +0200

    We need to pass a description to AC_DEFINE

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ff6b2947443fef63519a945245c499dc2656bef6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 25 11:42:58 2011 +0200

    use g_format_size instead of g_format_size_for_display

    The latter has been deprecated in GLib 2.31 but g_format_size()
    has been added
    in 2.30 so we can already use it without bumping the dep.

 src/empathy-ft-manager.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit a1e899504c6e19c56c7cdc31186d65b96881b898
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 25 15:10:53 2011 +0200

    use g_unichar_fully_decompose instead of
    g_unicode_canonical_decomposition

    The latter has been deprecated and g_unichar_fully_decompose()
    is already in
    2.30.

 libempathy-gtk/empathy-live-search.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

commit 5ccd14f47a13b5a0d00a48ec85b4c9dab6eb3bc9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 25 11:48:21 2011 +0200

    Disable GLib deprecation warnings for now

 configure.ac | 5 +++++
 1 file changed, 5 insertions(+)

commit 957f3d330db1409d7fd00e283d28878cd2c791ef
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 25 11:44:19 2011 +0200

    Include config.h in a bunch of files

    They use deprecated API (g_mutex_new) but we still want to use it
    for now so
    they need to have GLIB_DISABLE_DEPRECATION_WARNINGS defined.

 src/empathy-audio-src.c	     | 1 +
 src/empathy-call-window.c	     | 1 +
 src/empathy-streamed-media-window.c | 1 +
 src/empathy-video-widget.c	     | 1 +
 4 files changed, 4 insertions(+)

commit 8f4879a519a39a0adcec4d98d586b151d25e053f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 25 11:42:58 2011 +0200

    use g_format_size instead of g_format_size_for_display

    The latter has been deprecated in GLib 2.31 but g_format_size()
    has been added
    in 2.30 so we can already use it without bumping the dep.

 libempathy-gtk/empathy-ui-utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b23a0b7ee30e2847f0b317e2e7b61adcf545a322
Author: Jovanka Gulicoska <jovanka.gulicoska@gmail.com>
Date:	Tue Oct 25 01:23:24 2011 +0200

    [presence-chooser] Set status message as the tooltip

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=640846

    Signed-off-by: Danielle Madeley <danielle.madeley@collabora.co.uk>

 libempathy-gtk/empathy-presence-chooser.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit 766f6b5254ab2a1aa78b311e6d0dd00eca7f7cc7
Author: Christian Kirbach <Christian.Kirbach@googlemail.com>
Date:	Mon Oct 24 23:37:30 2011 +0200

    Updated German translation

 po/de.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b7216cf826ec446a1cdd1e40c4591f872268d021
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 24 17:46:11 2011 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5460947b87a37aee6adb5c489214ec095c914d44
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 24 17:29:05 2011 +0200

    prepare 3.3.1

 NEWS	      | 78
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  6 ++---
 2 files changed, 81 insertions(+), 3 deletions(-)

commit 15a4eec2f156c4f60398a9d842279203f475ed89
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 24 10:31:55 2011 +0200

    theme-adium: escape the name in actions as well

 libempathy-gtk/empathy-theme-adium.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 27831472d751867c3f2ff1f4f26087c75c65776b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 21 14:55:18 2011 +0200

    ensure that contact_list_store_contact_active_cb isn't called after
    the store destruction

    This is an exact port of similar code from empathy-individual-store.

    https://bugzilla.gnome.org/show_bug.cgi?id=662211

 libempathy-gtk/empathy-contact-list-store.c | 43
 +++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 5 deletions(-)

commit d9c10ab6a37590b52b51a310bc1389c426fb7c77
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 21 14:52:02 2011 +0200

    contact_list_store_dispose: unset the timer ids

    https://bugzilla.gnome.org/show_bug.cgi?id=662211

 libempathy-gtk/empathy-contact-list-store.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 802ca8adb59c1e78939d9807611c939d91299403
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Mon Oct 24 09:32:54 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 415
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 222 insertions(+), 193 deletions(-)

commit f6d8e8b60b08d0d6bd56711cf9a392723b81e6e1
Author: Arash Mousavi <amousavi@src.gnome.org>
Date:	Mon Oct 24 01:52:19 2011 +0330

    Updated Persian Translation

 po/fa.po | 559
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 295 insertions(+), 264 deletions(-)

commit 42adb7d65b9861b8470a1e34c324fdb78c42b9db
Author: Gil Forcada <gforcada@gnome.org>
Date:	Sun Oct 23 19:12:11 2011 +0200

    [l10n]Minor fixes to Catalan translation

 po/ca.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f78764aff652fa8385defac9ad0884095a71d744
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Sun Oct 23 20:30:06 2011 +0200

    Updated Spanish translation

 po/es.po | 443
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 242 insertions(+), 201 deletions(-)

commit 2ed288c8a47c3ba31ace103fc9bc12c8d7437c09
Author: Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>
Date:	Sun Oct 23 11:41:00 2011 +0200

    [l10n] Updated German translation

 po/de.po | 1176
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 657 insertions(+), 519 deletions(-)

commit 950220732db07192ae9521e0c63d46acbdbf4550
Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:	Sat Oct 22 19:28:55 2011 +0300

    Updated Latvian translation.

 po/lv.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit cdcd43ddea65ce3153eb1b54e5bfea7976c4d326
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Sat Oct 22 11:50:49 2011 +0200

    Updated Hebrew translation.

 po/he.po | 1660
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 788 insertions(+), 872 deletions(-)

commit 60a28f1712b841606b278cad8f3637b346063a79
Merge: 8977f50 bf6ec91
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Sat Oct 22 08:45:04 2011 +1100

    Merge branch 'balance-errors'

commit 8977f509839ca251cf0bdfd16a9cfb4d66962f02
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Fri Oct 21 21:20:19 2011 +0200

    Updated Slovenian translation

 po/sl.po | 1165
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 636 insertions(+), 529 deletions(-)

commit 80a72edd47d1f42a7428979f02776e1af45859cd
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Fri Oct 21 17:54:23 2011 +0200

    Updated POTFILES.in

 po/POTFILES.in | 1 -
 1 file changed, 1 deletion(-)

commit bf6ec911f61590159f94d424c1a0632c439623f9
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Oct 21 17:21:29 2011 +1100

    display_error: Put 'Close' button on the bottom/end

 src/empathy-call-window.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit a9dbf08ec7036c258cd040efa256740138951753
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Oct 21 17:17:54 2011 +1100

    Include dbus-reason in signal arguments

 src/empathy-call-handler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 13f51b97e97fafb7199a26e7abc171c7a5c40c46
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Oct 14 17:21:16 2011 +1100

    Don't need to prepare balance feature, already prepared by client
    factory

 src/empathy-call-window.c | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

commit 59f4a5e422744f5eda6f1143f297fdb579ecdf23
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Oct 14 17:20:46 2011 +1100

    Inline assignments are icky; free leaked string

 src/empathy-call-window.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 78f01f15a0d1106f4b063af5e71cd9207a2ffe79
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Oct 14 16:48:36 2011 +1100

    'Get Credit' is called 'Top Up' in other parts of the UI

 src/empathy-call-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cac6aa1626dcfe6c3503ee78c863f218c6a26551
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Apr 29 13:05:50 2011 +0100

    Show an infobar if there's not enough credit

    With a button to buy some if desired.

 src/empathy-call-handler.c |	9 +++-
 src/empathy-call-window.c  | 103
 +++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 106 insertions(+), 6 deletions(-)

commit 1cc11526cb28298f79ba6b194abfe24b14b229cd
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Sep 14 11:30:41 2011 +1000

    Add empathy-contactinfo-utils to POTFILES.in

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit 56c72cd7a01d0e52d32ba5a47967c8c6e7fde766
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Apr 14 14:44:49 2011 +1000

    Port contact-widget to contactinfo-utils

    This is a reworking, rather than rebasing of the original patch
    because of
    large changes in the codebase.

 libempathy-gtk/empathy-contact-widget.c    | 156
 ++++++-----------------------
 libempathy-gtk/empathy-contactinfo-utils.c |  33 +++++-
 libempathy-gtk/empathy-contactinfo-utils.h |	1 +
 3 files changed, 58 insertions(+), 132 deletions(-)

commit 558a3d0590e8dbd4f56e8a96dd9b023eb3241541
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Sep 8 13:31:00 2011 +1000

    Incorporate updates from empathy-contact-widget into contactinfo-utils

    Update empathy-individual-widget for these changes. This comes from
    the rebase
    of this branch.

 libempathy-gtk/empathy-contactinfo-utils.c | 74
 ++++++++++++++++++++++++++----
 libempathy-gtk/empathy-contactinfo-utils.h |  4 +-
 libempathy-gtk/empathy-individual-widget.c |  9 ++--
 3 files changed, 72 insertions(+), 15 deletions(-)

commit cf23dd409cc36a8f692bf0db4f28e505da8633f8
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Sep 8 13:11:22 2011 +1000

    Move empathy-contactinfo-utils to libempathy-gtk

    Why do we still have this annoying split?

    Rebasing this work will pull in a dependency on empathy-string-parser,
    which is
    part of libempathy-gtk. Hence the move.

 libempathy-gtk/Makefile.am		    |	2 +
 libempathy-gtk/empathy-contactinfo-utils.c | 185
 +++++++++++++++++++++++++++++
 libempathy-gtk/empathy-contactinfo-utils.h |  41 +++++++
 libempathy-gtk/empathy-individual-widget.c |	2 +-
 libempathy/Makefile.am			    |	2 -
 libempathy/empathy-contactinfo-utils.c     | 185
 -----------------------------
 libempathy/empathy-contactinfo-utils.h     |  41 -------
 7 files changed, 229 insertions(+), 229 deletions(-)

commit 06e665213df9b95a74f317da82a8f9537e2e3c87
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Apr 14 14:44:32 2011 +1000

    Port individual-widget to contactinfo-utils

 libempathy-gtk/empathy-individual-widget.c | 81
 +++++++-----------------------
 1 file changed, 17 insertions(+), 64 deletions(-)

commit e6c2a6706880dad768b5a442d350e6c0d8e0f975
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Apr 14 14:42:29 2011 +1000

    Abstract common contactinfo code into empathy-contactinfo-utils

    This handles things like sorting fields and converting field names
    to human
    readable names.

 libempathy/Makefile.am			|   2 +
 libempathy/empathy-contactinfo-utils.c | 185
 +++++++++++++++++++++++++++++++++
 libempathy/empathy-contactinfo-utils.h |  41 ++++++++
 3 files changed, 228 insertions(+)

commit d4b219993118e76fdf25a609839e1c334e26182f
Merge: ebd34b4 e2bf0b6
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Oct 21 09:32:08 2011 +1100

    Merge branch 'chooser-662250'

commit ebd34b40110d04beb8f6bc6ddb239c5b1d71d41b
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Thu Oct 20 22:40:17 2011 +0300

    Updated Belarusian translation.

 po/be.po | 918
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 484 insertions(+), 434 deletions(-)

commit e2bf0b6f26a6203288b550217a554651feb5c60b
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Oct 20 15:59:54 2011 +1100

    [contact-chooser] Don't reselect the first match if something else
    is selected

    This patch isn't quite the behaviour I want, but I think it's better
    than just
    re-selecting the first entry every time I type something.

 libempathy-gtk/empathy-contact-chooser.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 9cad8740eb8aec46bc896ccbf53bd8d23d632ac5
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Oct 20 15:48:49 2011 +1100

    [contact-chooser] Move the selection up/down without defocusing
    the entry

 libempathy-gtk/empathy-contact-chooser.c | 56
 ++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

commit 1358b8ae4551e659e3a61a7d1dc41b768cab46ea
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Oct 20 15:29:51 2011 +1100

    [contact-chooser] emit 'activate' on 'row-activated' as well

    This means the selection can be activated when the treeview is
    focused.

 libempathy-gtk/empathy-contact-chooser.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit 0051618797445119ec3e8adf8d93da5197777403
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Thu Oct 20 01:06:43 2011 +0200

    Fix an article in the Hungarian help translation

 help/hu/hu.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cac463c56410465da586d911516dfaf5b7e0233d
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Oct 20 09:44:06 2011 +1100

    Swap SMS and Text buttons

    The default action should be on the right.

 libempathy-gtk/empathy-new-message-dialog.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 5c00da64ec53ec3e29648ec366fab6199c922c82
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Oct 20 09:40:36 2011 +1100

    Fix extra buttons in new-call/message dialogs

    This was caused by a missing parameter of gtk_dialog_add_buttons().

 libempathy-gtk/empathy-new-call-dialog.c    | 3 ++-
 libempathy-gtk/empathy-new-message-dialog.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

commit 2e2b3936ad8ee816c8a3495fb2b6806d90e4ce40
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Oct 20 09:34:01 2011 +1100

    Remove contact-selector-dialog

    It's no longer used.

 libempathy-gtk/Makefile.am			   |   3 -
 libempathy-gtk/empathy-contact-selector-dialog.c  | 600
 ----------------------
 libempathy-gtk/empathy-contact-selector-dialog.h  |  96 ----
 libempathy-gtk/empathy-contact-selector-dialog.ui |  52 --
 4 files changed, 751 deletions(-)

commit 969f127739465b0fc6477fa4b376b76a8d377974
Merge: 8e1dfe2 6a57263
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Oct 20 09:19:13 2011 +1100

    Merge branch 'dialpad-widget'

commit 8e1dfe2bb707ec0c57e28d11c3c9e7239feb9ece
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Wed Oct 19 22:29:14 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 94
 +++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 45 insertions(+), 49 deletions(-)

commit 6a57263cdf33fd92ed5207d4f163c8851bb52822
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Oct 19 16:45:04 2011 +1100

    Scroll dialpad entry right as more characters are inserted.

    The user wants to see her most recent history, not what she typed
    in first.

 libempathy-gtk/empathy-dialpad-widget.c | 1 +
 1 file changed, 1 insertion(+)

commit c68091255ef12850aade51ce317292179515377f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Oct 19 16:40:22 2011 +1100

    Move dialpad into a widget of its own

    Let's face it, the whole thing was getting a little unwieldly there
    in the
    UI utils, and if we're going to be using it in more places, let's
    start by
    abstracting it into a widget.

 libempathy-gtk/Makefile.am		 |   2 +
 libempathy-gtk/empathy-dialpad-widget.c | 187
 ++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-dialpad-widget.h |  57 ++++++++++
 libempathy-gtk/empathy-ui-utils.c	 | 102 -----------------
 libempathy-gtk/empathy-ui-utils.h	 |   5 -
 src/empathy-call-window.c		 |  23 +---
 src/empathy-streamed-media-window.c	 |  23 ++--
 7 files changed, 264 insertions(+), 135 deletions(-)

commit 4df0759871f6539af24a5e88650f0c219cd0505a
Author: Muhammet Kara <muhammet.k@gmail.com>
Date:	Tue Oct 18 20:59:21 2011 +0300

    Updated Turkish translation

 po/tr.po | 488
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 289 insertions(+), 199 deletions(-)

commit 739aca418457de752be13721218aaebc74bd9d36
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 18 18:32:52 2011 +0200

    theme_adium_append_message: escape alias before displaying it

    Not doing so can lead to nasty HTML injection from hostile users.

    https://bugzilla.gnome.org/show_bug.cgi?id=662035

 libempathy-gtk/empathy-theme-adium.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 4be40f870291191e95035cd08b8f0733c9af1828
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 18 17:05:33 2011 +0200

    empathy_new_message_dialog_response: initialize contact

 libempathy-gtk/empathy-new-message-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit aee0cfd9ffca932edda7f0aff37b2493df378e7a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 18 17:00:53 2011 +0200

    empathy_new_message_dialog_response: initialize individual

 libempathy-gtk/empathy-new-message-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8a061d3e03847ba3d1669c57bca531328db40e3b
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Tue Oct 18 16:08:47 2011 +0200

    Updated Spanish translation

 po/es.po | 299
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 153 insertions(+), 146 deletions(-)

commit d895fd88a474e9b9643d908c43afcf7f8dd96a93
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 18 11:53:01 2011 +0200

    new-call-dialog: use the self->priv pattern

    https://bugzilla.gnome.org/show_bug.cgi?id=661981

 libempathy-gtk/empathy-new-call-dialog.c | 60
 +++++++++++++++-----------------
 libempathy-gtk/empathy-new-call-dialog.h |  3 ++
 2 files changed, 31 insertions(+), 32 deletions(-)

commit 7e68d5813cd87f22546081e77796acbb00e8e835
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 24 14:31:39 2011 +0200

    new-message-dialog: port to EmpathyContactChooser

    https://bugzilla.gnome.org/show_bug.cgi?id=661981

 libempathy-gtk/empathy-new-message-dialog.c | 255
 +++++++++++++++-------------
 libempathy-gtk/empathy-new-message-dialog.h |	 8 +-
 2 files changed, 137 insertions(+), 126 deletions(-)

commit 625867bfc70a1d852940a6d1ed36971f6e375cff
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 24 14:31:39 2011 +0200

    new-call-dialog: port to EmpathyContactChooser

    Replace the 'send video' checkbox by an extra button

    It's more coherent with the other places where we allow user to
    start calls.
    It also gives better feedback as we can unsensitive this button if the
    selected contact doesn't support video.

    https://bugzilla.gnome.org/show_bug.cgi?id=661981

 libempathy-gtk/empathy-new-call-dialog.c | 214
 +++++++++++++++++--------------
 libempathy-gtk/empathy-new-call-dialog.h |   6 +-
 2 files changed, 121 insertions(+), 99 deletions(-)

commit 588247c8bba25fd9ed087e1f8f06997c5c7534f2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 5 13:13:31 2011 +0200

    factor out empathy_individual_can_audio_video_call()

    Also allow caller to get a ref on the EmpathyContact supporting
    audio/video.

    https://bugzilla.gnome.org/show_bug.cgi?id=661981

 libempathy-gtk/empathy-individual-store.c | 57
 +++---------------------------
 libempathy/empathy-utils.c		   | 58
 +++++++++++++++++++++++++++++++
 libempathy/empathy-utils.h		   |  5 +++
 3 files changed, 67 insertions(+), 53 deletions(-)

commit 5af3f211b66a1278c44ad6815224e00dd26b795a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 5 12:47:54 2011 +0200

    new-call-dialog: fix typo in comment

    https://bugzilla.gnome.org/show_bug.cgi?id=661981

 libempathy-gtk/empathy-new-call-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 90c54d2cfa5ebab8343906cde98845e1186a42d3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 17 14:14:31 2011 +0200

    invite-participant-dialog: activate the dialog when the chooser
    is activated

    https://bugzilla.gnome.org/show_bug.cgi?id=661993

 src/empathy-invite-participant-dialog.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit 061d4ab96a0ebde9665192c3712ca3928ff2c679
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 17 14:10:01 2011 +0200

    contact-chooser: add 'activate' signal

    https://bugzilla.gnome.org/show_bug.cgi?id=661993

 libempathy-gtk/empathy-contact-chooser.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

commit 4444861d7999d6b1326e7f3b26637e9b9335950d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 17 13:37:44 2011 +0200

    contact-chooser: when searching, make sure that the first matching
    item is selected

    So user can just type the phone number of the contact he wants to
    call and hit
    enter.

    https://bugzilla.gnome.org/show_bug.cgi?id=661993

 libempathy-gtk/empathy-contact-chooser.c | 3 +++
 1 file changed, 3 insertions(+)

commit f2c015b36e6676796cfd8b48f1022b1d94fa46bb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 17 13:37:06 2011 +0200

    add empathy_individual_view_select_first()

    https://bugzilla.gnome.org/show_bug.cgi?id=661993

 libempathy-gtk/empathy-individual-view.c | 17 +++++++++++++++++
 libempathy-gtk/empathy-individual-view.h |  2 ++
 2 files changed, 19 insertions(+)

commit 3f68089b0c3a481fa56462efa86858a71d16c260
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Tue Oct 18 07:40:57 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 411
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 240 insertions(+), 171 deletions(-)

commit 69ea02c9d39eafb6b99c54393053587cd925568d
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:	Mon Oct 17 19:51:26 2011 +1100

    Updated Vietnamese translation

 po/vi.po | 78
 +++++++++++++++++++++++++++-------------------------------------
 1 file changed, 33 insertions(+), 45 deletions(-)

commit db182e34418a015d0ac16d09a1db7b2df2dea15a
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:	Mon Oct 17 19:45:34 2011 +1100

    po/vi: import from Damned Lies

 po/vi.po | 1409
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 780 insertions(+), 629 deletions(-)

commit 511e58ac791fc88d439824e0875bb4028b96db50
Author: Luca Ferretti <lferrett@gnome.org>
Date:	Mon Oct 17 10:14:45 2011 +0200

    l10n: updated Italian translation

 po/it.po | 363
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 185 insertions(+), 178 deletions(-)

commit d5b53bc068cb33967d6eb3d0585ee18c66e17ff9
Author: Daniel Nylander <po@danielnylander.se>
Date:	Mon Oct 17 06:35:26 2011 +0200

    Updated Swedish translation

 po/sv.po | 664
 ++++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 482 insertions(+), 182 deletions(-)

commit 3b8e5d553e3e8934f0add0378e67b601533ad428
Author: Changwoo Ryu <cwryu@debian.org>
Date:	Mon Oct 17 03:04:05 2011 +0900

    Updated Korean translation

 po/ko.po | 380
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 195 insertions(+), 185 deletions(-)

commit 938eb570b924bff13dae8949157a961197837d5b
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date:	Sun Oct 16 14:47:21 2011 +0100

    Updated British English translation

 po/en_GB.po | 286
 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 145 insertions(+), 141 deletions(-)

commit 550852489af85ecbc5570ddff26651da8d8c5b63
Author: Fran Dieguez <fran@openhost.es>
Date:	Sat Oct 15 15:36:00 2011 +0200

    Updaged Galician translations

 po/gl.po | 883
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 486 insertions(+), 397 deletions(-)

commit a28808cd0c56e887893618fe8f597a69acbdbde3
Author: Alexander Shopov <ash@kambanaria.org>
Date:	Sat Oct 15 10:05:10 2011 +0300

    Updated Bulgarian translation

 po/bg.po | 758
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 424 insertions(+), 334 deletions(-)

commit fd494d5fdab080dee1efbbbec1a2c0bd4600bd7d
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Fri Oct 14 20:17:25 2011 +0200

    Updated Hungarian translation

 po/hu.po | 377
 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 176 insertions(+), 201 deletions(-)

commit d6763a06f6e45f666bcbec3238688156a9b3cbd0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 14 16:45:34 2011 -0400

    contact-list: remove favourite API

    https://bugzilla.gnome.org/show_bug.cgi?id=661489

 libempathy/empathy-contact-list.c | 41
 ---------------------------------------
 libempathy/empathy-contact-list.h | 16 ---------------
 2 files changed, 57 deletions(-)

commit 960bbbe0782c242601ae28fe8f4bfbf67e96e2f3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 14 16:43:59 2011 -0400

    contact-list-store: stop tracking favourite contacts

    https://bugzilla.gnome.org/show_bug.cgi?id=661489

 libempathy-gtk/empathy-contact-list-store.c | 26
 --------------------------
 1 file changed, 26 deletions(-)

commit 21999bc46228825e289856bd37cb4fdd1afc6131
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 14 15:38:32 2011 -0400

    contact-manager: remove unused favourite code

    https://bugzilla.gnome.org/show_bug.cgi?id=661489

 libempathy/empathy-contact-manager.c | 305
 -----------------------------------
 1 file changed, 305 deletions(-)

commit 9357aef4b6cc3ee6c18f987dd439b11a7a21f20a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 14 15:30:01 2011 -0400

    contact-list-store: remove 'fake group' code

    This store is only used for MUC members which doesn't use these
    fake groups.
    Actually we could drop all the group code but it would probably be
    easier to
    completely rewrite the way we display MUC members.

    https://bugzilla.gnome.org/show_bug.cgi?id=661489

 libempathy-gtk/empathy-contact-list-store.c | 75
 +----------------------------
 libempathy-gtk/empathy-contact-list-store.h |	4 --
 libempathy-gtk/empathy-contact-list-view.c  | 50 -------------------
 po/POTFILES.in				     |	1 -
 4 files changed, 1 insertion(+), 129 deletions(-)

commit 3e2f15590ee0d8e079566e2c6f00c536501c46ea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 14 14:09:23 2011 -0400

    remove unused EMPATHY_CONTACT_FEATURE_FAVOURITE

    https://bugzilla.gnome.org/show_bug.cgi?id=661489

 libempathy-gtk/empathy-contact-menu.c | 50
 +----------------------------------
 libempathy-gtk/empathy-contact-menu.h |  2 --
 2 files changed, 1 insertion(+), 51 deletions(-)

commit 68fa80e30aa1ff0dc97dbd364a2870a1e3ee9b87
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Fri Oct 14 21:35:38 2011 +0200

    [l10n] Updated German translation

 po/de.po | 441
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 218 insertions(+), 223 deletions(-)

commit c10d98040f7653c3155025ebce3ba2209c497d9b
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Fri Oct 14 19:53:09 2011 +0200

    Updated Polish translation

 po/pl.po | 368
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 186 insertions(+), 182 deletions(-)

commit c47fc4bd98b2090e54ab92f9edaa577238229544
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Fri Oct 14 13:25:00 2011 +0200

    Mark a forgotten string for translation.

    https://bugzilla.gnome.org/show_bug.cgi?id=661756

 src/empathy-preferences.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 68fc48674fb98a3a8fa5cdb48fd12742558ad494
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Oct 14 16:22:54 2011 +0100

    adium themes: crash less hard when Template.html is missing

    If Template.html is missing, then you haven't installed Empathy
    properly
    (or set EMPATHY_SRCDIR or whatever in my case). But previously
    we would
    just crash later down this function when passing template_html to
    string_with_format() without checking if it's NULL. This patch makes
    it fail a little less inscrutably.

 libempathy-gtk/empathy-theme-adium.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

commit e52e0efdb97169497a7160280ba1542895442940
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Sep 8 12:17:31 2011 +0100

    TpChat: remove support for old Properties

    Change notification for this is broken in the CMs *anyway*.

 libempathy/empathy-tp-chat.c | 268
 +------------------------------------------
 1 file changed, 5 insertions(+), 263 deletions(-)

commit d95ff84dd94f2ebc8c17d3dda1a7ac8936a9b758
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Sep 8 11:34:36 2011 +0100

    TpChat: Use RoomConfig1 and Subject if available

    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=658542

 libempathy/empathy-tp-chat.c | 143
 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 138 insertions(+), 5 deletions(-)

commit 76950839fca54b79450ab8fbcba6f22dfd5809fd
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Oct 14 15:31:59 2011 +0100

    configure: depend on tp-glib with Subject.

    Actually, a slightly earlier version of telepathy-glib, on the
    unstable
    0.15.x branch, includes Subject, but we may as well depend on
    the stable
    branch: it includes fixes for Empathy bugs.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4e884826ed36617d3579045faae789e6a8744b80
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Sep 8 10:48:03 2011 +0100

    TpChat: track subject and title explicitly.

    This will allow us to also use the new API (and, ultimately, delete
    the Telepathy.Properties code cleanly).

 libempathy/empathy-tp-chat.c | 87
 +++++++++++++++++++-------------------------
 1 file changed, 37 insertions(+), 50 deletions(-)

commit 6a56f4c19ff31722619e5494639884a6a2646967
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Sep 8 08:07:08 2011 +0100

    TpChat: hide guts of Telepathy properties.

    This will make it easier to replace these with new stuff. The funky
    indentation in the callbacks for the subject and title changing is to
    make it clear that I didn't change that code; I'll reindent it in
    another patch.

 libempathy-gtk/empathy-chat.c |  68 +++++++++---------------
 libempathy/empathy-tp-chat.c  | 121
 +++++++++++++++++++++++++++++++++++-------
 libempathy/empathy-tp-chat.h  |  22 +++-----
 3 files changed, 136 insertions(+), 75 deletions(-)

commit 8bd6c6b3fa285cdf99f5a9b09c5c03ccf19ace5d
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Oct 14 10:22:51 2011 +0200

    Updated Spanish translation

 po/es.po | 472
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 274 insertions(+), 198 deletions(-)

commit f8148be971e1b51e43374473ab33e5ac8fd14a40
Merge: fecbf93 832ab62
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Oct 14 15:42:36 2011 +1100

    Merge remote-tracking branch 'pochu/upgrade-software'

commit fecbf935f2b9be2cd6229099334279028fc517f1
Merge: 7b6b8da 16e0d5a
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Oct 14 15:31:16 2011 +1100

    Merge remote-tracking branch 'pochu/error-dialog'

commit 7b6b8da406493311445f6c2470a005a542972693
Merge: 1180b05 2f9a520
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Oct 14 15:27:12 2011 +1100

    Merge remote-tracking branch 'pochu/misc-fixes'

commit 1180b055b932a8f1a1a6b207093e81b412e62da2
Merge: 8b6c644 601297c
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Oct 14 15:21:17 2011 +1100

    Merge branch: 'Add top-up link to chat text when there is insufficient
    credit'

commit 8b6c644661a69599a86a5957bcb559383fb857c1
Author: Damien Lespiau <damien.lespiau@intel.com>
Date:	Thu Oct 13 20:32:39 2011 +0100

    Improve iain sleeping pattern

    The Hypno Koala was making iain wake up in sweat and with his heart
    pounding at unreasonable hours.

    Nobody wants that.

    The Hypno Koala has served his duty and it's now time for retirement.

    Its replacement was designed and drawn by:
      Cyrene Domogalla <cyrene.domogalla@intel.com>

    I've included the source SVG in the commit. To generate icons
    from this
    one, one needs to use the render-icon-theme.py script to generate the
    16x16, 24x24, 32x32 and 48x48 versions, the 22x22 one was generated by
    the generate-png.sh script in data/icons.

    https://bugzilla.gnome.org/show_bug.cgi?id=619186

 data/icons/Makefile.am				    |	  3 +-
 data/icons/hicolor_apps_16x16_im-local-xmpp.png    |	Bin 874 ->
 891 bytes
 data/icons/hicolor_apps_22x22_im-local-xmpp.png    |	Bin 1358 ->
 1293 bytes
 data/icons/hicolor_apps_24x24_im-local-xmpp.png    |	Bin 1505 ->
 1562 bytes
 data/icons/hicolor_apps_32x32_im-local-xmpp.png    |	Bin 2255 ->
 2355 bytes
 data/icons/hicolor_apps_48x48_im-local-xmpp.png    |	Bin 3942 ->
 4188 bytes
 data/icons/hicolor_apps_scalable_im-local-xmpp.svg | 14774
 +++++++++++++++--
 data/icons/local-xmpp.svg			    | 16338
 +++++++++++++++++++
 8 files changed, 29395 insertions(+), 1720 deletions(-)

commit 2af7c4f6a17df25a2f7b7d04e5690df798cae6f4
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Thu Oct 13 15:30:15 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 616
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 298 insertions(+), 318 deletions(-)

commit a7e5b12d576ce30b20914e38903909df128a7f12
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 12 16:53:23 2011 -0400

    Update telepathy-yell

    I just fixed yell to properly connect D-Bus signals when its core
    feature is
    being prepared. This fix empathy-call handling incoming calls which
    used to be
    racy.

 telepathy-yell | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fb4cb6c42c07044d1cdc83e54b39d4df46a7790f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 12 14:27:08 2011 -0400

    contact-blocking-dialog: make debug more useful

    It's not very helpful to not know which Connection/Channel failed.

 libempathy-gtk/empathy-contact-blocking-dialog.c | 33
 +++++++++++++++---------
 1 file changed, 21 insertions(+), 12 deletions(-)

commit e183d9ce5f26991e7a1271b870010d1fb56c56a0
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Oct 12 18:12:53 2011 +0100

    Make sure we have our settings before we want to use them

 src/empathy-call-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 8176b8a7121bf2bcfbc07cd939b266db59c924c6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Oct 12 18:12:05 2011 +0100

    Don't try to access non-existing properties

 src/empathy-audio-src.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

commit 990f61afe75fa02ff525c20094d55d980e5df36f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 11 10:55:03 2011 -0400

    empathy-call: use dark theme

    https://bugzilla.gnome.org/show_bug.cgi?id=661464

 src/empathy-call.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 434aec0c86f6eae4a7f09759d25810dc176bfc49
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 11 17:01:23 2011 -0400

    preferences: don't display variants checkbox if there is no variant

    https://bugzilla.gnome.org/show_bug.cgi?id=660586

 src/empathy-preferences.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

commit e487926900bb21e5f0af642429d37ec8d90f4c3d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 11 16:46:23 2011 -0400

    Use default variant if we can't find any variants

    We use to crash here trying to get the first element of an empty
    GPtrArray.

    https://bugzilla.gnome.org/show_bug.cgi?id=660586

 libempathy-gtk/empathy-theme-adium.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 8b85d88959418fb575696a471b39071845fb79d8
Author: Muhammet Kara <muhammet.k@gmail.com>
Date:	Mon Oct 10 09:15:00 2011 +0300

    Updated Turkish translation

 po/tr.po | 732
 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 335 insertions(+), 397 deletions(-)

commit c97dcfaef40e853cf2865293b3a19ccdc4145cf5
Author: Daniel Nylander <po@danielnylander.se>
Date:	Sun Oct 9 20:43:24 2011 +0200

    Updated Swedish translation

 po/sv.po | 660
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 330 insertions(+), 330 deletions(-)

commit 418fe4066a3e6df52bbc2f9d8b55851225c18f01
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Sun Oct 9 17:14:10 2011 +0200

    Updated POTFILES.in

 po/POTFILES.in | 1 -
 1 file changed, 1 deletion(-)

commit 7c92a3122ed66eb64323bdefda2ab64258f372b9
Author: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>
Date:	Sun Oct 9 08:06:08 2011 +0200

    Updated Esperanto translation

 po/eo.po | 2615
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 1573 insertions(+), 1042 deletions(-)

commit 6bd145c9caf94d18e97bcbc200e36af02718b022
Author: Algimantas Margevičius <gymka@mail.ru>
Date:	Sun Oct 9 00:20:50 2011 +0300

    Updated Lithuanian translation

 po/lt.po | 678
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 341 insertions(+), 337 deletions(-)

commit b62cedf033b9301e03e49f42f31f5ab251eee874
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Sat Oct 8 17:02:37 2011 -0400

    remove empathy-contact-selector

    https://bugzilla.gnome.org/show_bug.cgi?id=629517

 libempathy-gtk/Makefile.am		   |   2 -
 libempathy-gtk/empathy-contact-selector.c | 473
 ------------------------------
 libempathy-gtk/empathy-contact-selector.h |  75 -----
 3 files changed, 550 deletions(-)

commit 4b6b82782e5a085ebc7c7e4f0ae5ab06c959a188
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Sat Oct 8 17:01:30 2011 -0400

    remove empetit

    It used to test EmpathyContactSelector which is going away.

    https://bugzilla.gnome.org/show_bug.cgi?id=629517

 tests/interactive/Makefile.am |  2 --
 tests/interactive/empetit.c   | 69
 -------------------------------------------
 2 files changed, 71 deletions(-)

commit 63dab7ab2d6a65e26c758697e0ab2f7614474c79
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Sat Oct 8 16:59:21 2011 -0400

    nautilus-sendto: use EmpathyContactSelector instead of
    EmpathyContactChooser

    This way we display meta-contacts rather than Telepathy contacts
    and use a
    nice treeview instead of a huge combo box.

    https://bugzilla.gnome.org/show_bug.cgi?id=629517

 nautilus-sendto-plugin/empathy-nautilus-sendto.c | 100
 +++++++++++++++--------
 1 file changed, 67 insertions(+), 33 deletions(-)

commit e143c562674626fe318828f6045b733b14c5714f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Sat Oct 8 16:58:51 2011 -0400

    contact-chooser: add API to hide the search entry

    https://bugzilla.gnome.org/show_bug.cgi?id=629517

 libempathy-gtk/empathy-contact-chooser.c | 17 ++++++++++++-----
 libempathy-gtk/empathy-contact-chooser.h |  3 +++
 2 files changed, 15 insertions(+), 5 deletions(-)

commit b6bb64fe58552e82d4dfcd2be9813b5965ac6989
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Oct 7 10:12:51 2011 +0200

    Updated Spanish translation

 po/es.po | 556
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 282 insertions(+), 274 deletions(-)

commit d047ef4e374405901a6afbfaf8ebe2f179d817fc
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Tue Oct 4 20:12:57 2011 +0200

    Updated French doc translation

 help/fr/figures/empathy-main-window.png | Bin 10959 -> 44444 bytes
 help/fr/figures/empathy-new-account.png | Bin 23132 -> 0 bytes
 help/fr/fr.po				 | 155
 ++++++++++++++++++--------------
 3 files changed, 86 insertions(+), 69 deletions(-)

commit b997d253726c8e95eb836d3385763cf91242706f
Author: Pavol Klačanský <pavol@klacansky.com>
Date:	Sat Oct 1 19:39:34 2011 +0200

    Updated Slovak translation

 po/sk.po | 2827
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 1631 insertions(+), 1196 deletions(-)

commit c7fe998d565bd37ed066e1fee0e7281c7f6117ce
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sat Oct 1 13:08:11 2011 +0200

    Do not should "password required" if X-TELEPATHY-PASSWORD is not
    supported

    Messenger XMPP only supports auth via an access token, no password

 src/empathy-event-manager.c | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

commit 05e20d8450559ccd579dbc5f268804611438e300
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 29 13:56:32 2011 +0200

    individual-widget: use GtkGrid instead of GtkTable

    https://bugzilla.gnome.org/show_bug.cgi?id=660429

 libempathy-gtk/empathy-individual-widget.c  | 18 +++++++++---------
 libempathy-gtk/empathy-individual-widget.ui |	9 +--------
 2 files changed, 10 insertions(+), 17 deletions(-)

commit cd9637c2c95aae1975a9a61aa8b6f56cfa657e50
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 29 13:56:32 2011 +0200

    call-window: use GtkGrid instead of GtkTable

    https://bugzilla.gnome.org/show_bug.cgi?id=660429

 src/empathy-call-window.ui | 90
 ++--------------------------------------------
 1 file changed, 2 insertions(+), 88 deletions(-)

commit 5647bacfca1db9cca09b02534603ecfa6cd8415c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 29 13:56:32 2011 +0200

    streamed-media-window: use GtkGrid instead of GtkTable

    https://bugzilla.gnome.org/show_bug.cgi?id=660429

 src/empathy-streamed-media-window.ui | 90
 +-----------------------------------
 1 file changed, 2 insertions(+), 88 deletions(-)

commit c6bf0e62fef15245abe442b7533002c393c820b2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 29 13:32:36 2011 +0200

    contact-selector-dialog: use GtkGrid instead of GtkTable

    https://bugzilla.gnome.org/show_bug.cgi?id=660429

 libempathy-gtk/empathy-contact-selector-dialog.c  | 10 +++++-----
 libempathy-gtk/empathy-contact-selector-dialog.ui | 23
 +++++++++++------------
 2 files changed, 16 insertions(+), 17 deletions(-)

commit fe0e3674962567c89dc5547d021272c559073210
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 29 13:12:31 2011 +0200

    empathy-contact-selector-dialog.ui: load/save in Glade

    No change.

    https://bugzilla.gnome.org/show_bug.cgi?id=660429

 libempathy-gtk/empathy-contact-selector-dialog.ui | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 724817f46056c2c0479e979059b9365c7cb17fdf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 29 13:32:36 2011 +0200

    new-chatroom-dialog: use GtkGrid instead of GtkTable

    https://bugzilla.gnome.org/show_bug.cgi?id=660429

 src/empathy-new-chatroom-dialog.c  |  8 ++++----
 src/empathy-new-chatroom-dialog.ui | 37
 ++++++++++++++++---------------------
 2 files changed, 20 insertions(+), 25 deletions(-)

commit c4d480f3ee770e64f22c2b4f945a98f3f8c352d0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 29 13:12:31 2011 +0200

    empathy-new-chatroom-dialog.ui: load/save in Glade

    No change.

    https://bugzilla.gnome.org/show_bug.cgi?id=660429

 src/empathy-new-chatroom-dialog.ui | 130
 +++++++++++++++++++++++--------------
 1 file changed, 81 insertions(+), 49 deletions(-)

commit 237a67249bc51c68ea9b437dd434184e8080469b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 29 14:23:22 2011 +0200

    Use new GOA desktop file

    https://bugzilla.gnome.org/show_bug.cgi?id=660449

 libempathy-gtk/empathy-account-widget.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Sep 28 13:41:11 2011 +0200

    Use g_cclosure_marshal_generic for all signals

    No more ugly marshallers \o/

 configure.ac					    |  2 +-
 libempathy-gtk/Makefile.am			    | 21 ---------------
 libempathy-gtk/empathy-account-chooser.c	    |  2 +-
 libempathy-gtk/empathy-account-widget.c	    |  6 ++---
 libempathy-gtk/empathy-avatar-chooser.c	    |  2 +-
 libempathy-gtk/empathy-cell-renderer-activatable.c |  2 +-
 libempathy-gtk/empathy-chat.c			    |  7 +++--
 libempathy-gtk/empathy-contact-chooser.c	    |  2 +-
 libempathy-gtk/empathy-contact-list-view.c	    |  3 +--
 libempathy-gtk/empathy-individual-menu.c	    |  2 +-
 libempathy-gtk/empathy-individual-view.c	    |  5 ++--
 libempathy-gtk/empathy-irc-network-chooser.c	    |  2 +-
 libempathy-gtk/empathy-live-search.c		    |  5 ++--
 libempathy-gtk/empathy-persona-view.c		    |  3 +--
 libempathy-gtk/empathy-theme-manager.c		    |  2 +-
 libempathy/Makefile.am				    | 22 ---------------
 libempathy/cheese-camera-device-monitor.c	    |  5 ++--
 libempathy/empathy-account-settings.c		    |  2 +-
 libempathy/empathy-auth-factory.c		    |  4 +--
 libempathy/empathy-camera-monitor.c		    |  4 +--
 libempathy/empathy-chatroom-manager.c		    |  4 +--
 libempathy/empathy-connection-managers.c	    |  2 +-
 libempathy/empathy-connectivity.c		    |  5 ++--
 libempathy/empathy-contact-list.c		    | 11 ++++----
 libempathy/empathy-contact.c			    |  3 +--
 libempathy/empathy-ft-factory.c		    |  5 ++--
 libempathy/empathy-ft-handler.c		    | 15 +++++------
 libempathy/empathy-individual-manager.c	    |  7 +++--
 libempathy/empathy-irc-network.c		    |  3 +--
 libempathy/empathy-irc-server.c		    |  3 +--
 libempathy/empathy-server-sasl-handler.c	    |  2 +-
 libempathy/empathy-tp-chat.c			    | 11 ++++----
 libempathy/empathy-tp-file.c			    |  1 -
 libempathy/empathy-tp-roomlist.c		    |  6 ++---
 libempathy/empathy-tp-streamed-media.c		    |  5 ++--
 src/Makefile.am				    | 31
 ----------------------
 src/empathy-audio-src.c			    |  5 ++--
 src/empathy-call-factory.c			    |  5 ++--
 src/empathy-call-handler.c			    | 17 ++++++------
 src/empathy-chat-manager.c			    |  4 +--
 src/empathy-event-manager.c			    |  6 ++---
 src/empathy-mic-monitor.c			    |  7 +++--
 src/empathy-streamed-media-factory.c		    |  3 +--
 src/empathy-streamed-media-handler.c		    | 15 +++++------
 src/ev-sidebar.c				    |  4 +--
 45 files changed, 93 insertions(+), 190 deletions(-)

commit 843f210c3bf26f6ecc93f90000e366ebc8296cc3
Author: Aron Xu <aronxu@gnome.org>
Date:	Tue Sep 27 16:19:54 2011 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po | 375
 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 197 insertions(+), 178 deletions(-)

commit caad2d2f4a0cd94004d3abdf44c92243e4b645fc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 27 14:29:51 2011 +0200

    ft-handler: Use TpFileTransferChannel properties

    https://bugzilla.gnome.org/show_bug.cgi?id=658245

 libempathy/empathy-ft-handler.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

commit d3531f4364469ba8dd2840974d55c87712544eda
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 21 16:28:00 2011 +0200

    don't connect on the TransferredBytesChanged D-Bus signal

    https://bugzilla.gnome.org/show_bug.cgi?id=658245

 libempathy/empathy-tp-file.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

commit ef81d18e65bb14cbd98cf07eb9d899f9c628d70e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 21 16:02:36 2011 +0200

    remove empathy_tp_file_is_incoming()

    https://bugzilla.gnome.org/show_bug.cgi?id=658245

 libempathy/empathy-ft-handler.c |  2 +-
 libempathy/empathy-tp-file.c	 | 23 ++---------------------
 libempathy/empathy-tp-file.h	 |  2 --
 3 files changed, 3 insertions(+), 24 deletions(-)

commit a3d1d0df9e007c2d59c03ecaecf19321f60151c1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 21 15:53:44 2011 +0200

    EmpathyTpFile: inherit from TpFileTransferChannel

    https://bugzilla.gnome.org/show_bug.cgi?id=658245

 libempathy/empathy-client-factory.c |	 6 ++
 libempathy/empathy-ft-factory.c     |	12 +--
 libempathy/empathy-ft-handler.c     |	15 ++--
 libempathy/empathy-tp-file.c	     | 150
 ++++++++----------------------------
 libempathy/empathy-tp-file.h	     |	12 ++-
 src/empathy-event-manager.c	     |	 5 +-
 6 files changed, 54 insertions(+), 146 deletions(-)

commit 88fc949d3521c77a8ab9e86f8366f670b940bafb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 27 14:29:02 2011 +0200

    tp-file: chain up constructed

    https://bugzilla.gnome.org/show_bug.cgi?id=658245

 libempathy/empathy-tp-file.c | 2 ++
 1 file changed, 2 insertions(+)

commit a93e738c107fc5b24c5055027c17559200734c23
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 31 14:34:21 2011 +0100

    pass to proper user action time when requesting an outgoing FT

    https://bugzilla.gnome.org/show_bug.cgi?id=658245

 libempathy-gtk/empathy-ui-utils.c		  |  3 ++-
 libempathy/empathy-ft-factory.c		  |  5 +++--
 libempathy/empathy-ft-factory.h		  |  3 ++-
 libempathy/empathy-ft-handler.c		  | 26
 +++++++++++++++++++++---
 libempathy/empathy-ft-handler.h		  |  1 +
 nautilus-sendto-plugin/empathy-nautilus-sendto.c |  2 +-
 6 files changed, 32 insertions(+), 8 deletions(-)

commit 32152c0067fea614d4aabd0a1f0f5bfa65216af1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 19 15:47:47 2011 +0200

    accounts-dialog: remove useless childs

    They don't seem to be used and were raising a Gtk+ warning.

    https://bugzilla.gnome.org/show_bug.cgi?id=659474

 src/empathy-accounts-dialog.ui | 23 -----------------------
 1 file changed, 23 deletions(-)

commit b94efc724261560a27d879f4a8c6102a40d9a3d0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 26 15:55:40 2011 +0200

    always display the accounts dialog if we have to show a specific
    account

    https://bugzilla.gnome.org/show_bug.cgi?id=660124

 src/empathy-accounts-common.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 772c05a2b8704bf314b56887f98b3e7b67cb9b5b
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Mon Sep 26 15:34:36 2011 +0200

    Updated Slovenian translation

 po/sl.po | 210
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 109 insertions(+), 101 deletions(-)

commit 2cfb4484836e0034b2d76557f5b8ebe8fd29df9b
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:	Mon Sep 26 14:34:39 2011 +0200

    [l10n]Updated Catalan (Valencian) translation

 po/ca@valencia.po | 2211
 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 1315 insertions(+), 896 deletions(-)

commit 39e1ecdabfc2aae03a02cf4e70e904e5bd5b04b0
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Sep 23 13:28:32 2011 +0200

    e-account-widget-irc: Use a GtkGrid to fix label wrapping

    https://bugzilla.gnome.org/show_bug.cgi?id=646630

 libempathy-gtk/empathy-account-widget-irc.c  |  4 +-
 libempathy-gtk/empathy-account-widget-irc.ui | 97
 ++++++++++++++--------------
 2 files changed, 49 insertions(+), 52 deletions(-)

commit 07ff682cb420c1ee458f2115d7693d2861f40db6
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Sep 23 11:54:47 2011 +0200

    empathy-account: add a --assistant option to force having assistant

    This makes easier to test it

    https://bugzilla.gnome.org/show_bug.cgi?id=646630

 src/empathy-accounts-common.c |  3 ++-
 src/empathy-accounts-common.h |  1 +
 src/empathy-accounts.c        | 11 ++++++++---
 3 files changed, 11 insertions(+), 4 deletions(-)

commit 175e46dd48b3906e59df36b9faa469565783e28d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Sep 23 11:01:36 2011 +0200

    Wait for the store to be filled before loading events

    https://bugzilla.gnome.org/show_bug.cgi?id=659807

 src/empathy-main-window.c | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

commit 381062d1a807da25f188340cdc81188c43bf0f58
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Sep 23 15:31:58 2011 +0200

    Add /inspector command to show webkit inspector

 libempathy-gtk/empathy-chat.c	      | 13 +++++++++++++
 libempathy-gtk/empathy-theme-adium.c | 14 ++++++++++++++
 libempathy-gtk/empathy-theme-adium.h |  1 +
 3 files changed, 28 insertions(+)

commit 3a459b35bd5b7a29b308d729fe82b203f777b99f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 22 18:26:37 2010 +0200

    remove butterfly-logs-migrated gsettings key

    https://bugzilla.gnome.org/show_bug.cgi?id=612555

 data/empathy.convert		       | 1 -
 data/org.gnome.Empathy.gschema.xml.in | 5 -----
 libempathy/empathy-gsettings.h        | 1 -
 3 files changed, 7 deletions(-)

commit 38e4f668b25cefbdc161f9c17f61a904c67c0c79
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Sep 22 00:14:16 2010 +0100

    all: remove butterfly workarounds (bgo#612555)

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-tp-chat.c	      |  64 ----------
 src/Makefile.am		      |   1 -
 src/empathy-chat-window.c	      |   3 +-
 src/empathy-main-window.c	      |  29 -----
 src/empathy-migrate-butterfly-logs.c | 234
 -----------------------------------
 src/empathy-migrate-butterfly-logs.h |  32 -----
 6 files changed, 1 insertion(+), 362 deletions(-)

commit 2eec8e87f01ecdf6a987314d5b6cea35d47f1ae1
Author: Bernhard Posselt <bernhard.posselt@gmx.at>
Date:	Fri Sep 23 17:12:13 2011 +0200

    added shortcut ctrl + j for joining a new chat

    https://bugzilla.gnome.org/show_bug.cgi?id=659952

 src/empathy-main-window-menubar.ui | 1 +
 1 file changed, 1 insertion(+)

commit 68f361461951462af368b440ea8a945f03774370
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Sep 20 12:25:42 2011 +0100

    CallWindow: drag the video preview smoothly

    https://bugzilla.gnome.org/show_bug.cgi?id=656907

 src/empathy-call-window.c | 78
 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 73 insertions(+), 5 deletions(-)

commit 288a8d8594cb6ac1e3b1c37e58f1b7c21c6d376c
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Sep 21 14:42:21 2011 +0100

    CallWindow: show a spinner when switching cameras

    https://bugzilla.gnome.org/show_bug.cgi?id=656884

 src/empathy-call-window.c | 69
 ++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 62 insertions(+), 7 deletions(-)

commit 6e0b0622f3d9bbf47b7794cd232eab6530a3e909
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Sep 21 14:39:10 2011 +0100

    RoundedActor: allow to set a different round factor

    https://bugzilla.gnome.org/show_bug.cgi?id=656884

 src/empathy-rounded-actor.c | 22 +++++++++++++++++++++-
 src/empathy-rounded-actor.h |	6 ++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

commit c5ab389bc8054c863dd4d611028b63d4acbfa638
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 15 15:26:13 2011 +0200

    streamed-media-window: simplify translator context

    https://bugzilla.gnome.org/show_bug.cgi?id=659144

 src/empathy-streamed-media-window.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 23ecdf691227368b7d914908aeaa6666fd46c890
Author: Juan R. Garcia Blanco <jgblanco.mail@gmail.com>
Date:	Thu Sep 22 09:03:09 2011 +0200

    hide notifications options when in Shell

    https://bugzilla.gnome.org/show_bug.cgi?id=659207

 src/empathy-main-window.c | 74
 ++++++++++++++++++++++++++++++++++++++++++++++-
 src/empathy-main-window.h |  2 ++
 src/empathy-preferences.c | 20 +++++++++++--
 src/empathy-preferences.h |  3 +-
 src/empathy.c		   |  3 ++
 5 files changed, 98 insertions(+), 4 deletions(-)

commit 0a2d4299c996e583867d5028bc247ac86ace4b0b
Author: Juan R. Garcia Blanco <jgblanco.mail@gmail.com>
Date:	Wed Sep 21 11:43:44 2011 +0200

    remember last account

    https://bugzilla.gnome.org/show_bug.cgi?id=574879

 data/org.gnome.Empathy.gschema.xml.in |  5 +++
 libempathy/empathy-gsettings.h        |  1 +
 src/empathy-new-chatroom-dialog.c     | 70
 +++++++++++++++++++++++++++++++++++
 3 files changed, 76 insertions(+)

commit d5094b86de3f91cffa950b9456c418ce4d12fd26
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 26 11:58:40 2011 +0200

    release.py: update last_tag_pattern

 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e13bdb2c17b2915ab29bc74de5a7584aca4fc471
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 20 16:48:35 2011 +0200

    Don't try to request a Call channel if built without Call support

    https://bugzilla.gnome.org/show_bug.cgi?id=659594

 libempathy-gtk/empathy-call-utils.c | 35
 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

commit b6b5e35d96ac4d2bc2cb070d2bb0613992008f5d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 20 16:40:03 2011 +0200

    Factor out call_new_with_streams()

    https://bugzilla.gnome.org/show_bug.cgi?id=659594

 libempathy-gtk/empathy-call-utils.c | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

commit 09ccdc338176ede800dc7891129356e7232eb7d9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 22 14:36:04 2011 +0200

    contact-widget: left align status label

    It's already done that way in individual-widget.

    https://bugzilla.gnome.org/show_bug.cgi?id=659816

 libempathy-gtk/empathy-contact-widget.c | 1 +
 1 file changed, 1 insertion(+)

commit 55ae021ffe4105298ea910958bb3fff0bd359a91
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 26 11:51:46 2011 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 14e27ac3b5c7f66c0d2cf3145cb844ae0fe04827
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 26 11:35:05 2011 +0200

    prepare 3.2.0

 NEWS	      | 37 +++++++++++++++++++++++++++++++++++++
 configure.ac |  6 +++---
 2 files changed, 40 insertions(+), 3 deletions(-)

commit 51a92400e58f0c50d9fb11f73c112dadbb19e846
Author: Petr Kovar <pknbe@volny.cz>
Date:	Mon Sep 26 02:00:43 2011 +0200

    Update Czech translation

 po/cs.po | 340
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 165 insertions(+), 175 deletions(-)

commit 60ae41e9f3cfb8b6c8029355cf43a7c8f5b9f615
Author: Daniel Martinez Cucalon <dmartinez@src.gnome.org>
Date:	Sun Sep 25 23:33:05 2011 +0200

    Updated Aragonese translation

 po/an.po | 1847
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 887 insertions(+), 960 deletions(-)

commit a803e201218f99e23fae5a9e832d77ecddecfb0b
Author: Gil Forcada <gforcada@gnome.org>
Date:	Sun Sep 25 23:22:21 2011 +0200

    [l10n]Updated Catalan translation

 po/ca.po | 2282
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1439 insertions(+), 843 deletions(-)

commit 70f2d7286efd9a2f787da2d52e8951ee3e27c7af
Author: Seán de Búrca <leftmostcat@gmail.com>
Date:	Sun Sep 25 15:15:03 2011 -0600

    Updated Irish translation

 po/ga.po | 4221
 ++++++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 3164 insertions(+), 1057 deletions(-)

commit 9372fe19e6226164996d5b0264cf3ed0a49aef71
Author: Alexander Shopov <ash@kambanaria.org>
Date:	Sun Sep 25 18:01:19 2011 +0300

    Updated Bulgarian translation

 po/bg.po | 300
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 150 insertions(+), 150 deletions(-)

commit 28fabbbc91afd5dc11b90408bde29c5eb1e1965f
Author: Andika Triwidada <andika@gmail.com>
Date:	Sun Sep 25 14:08:28 2011 +0700

    Updated Indonesian translation

 po/id.po | 559
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 304 insertions(+), 255 deletions(-)

commit d06a61319a9381f1fec90c11739cc64385c905d4
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Sun Sep 25 14:32:22 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 357
 ++++++++++++++++++++++++++++++-----------------------------
 po/zh_TW.po | 359
 +++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 367 insertions(+), 349 deletions(-)

commit 5b51448f6f77f32aa9f63a43a9ca65c04624e92d
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Sat Sep 24 16:23:55 2011 +0200

    Updated Basque language

 po/eu.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 7939dd3c80d83658b7e80defe4020f80e3db59f4
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Sat Sep 24 16:22:40 2011 +0200

    Updated Basque language

 po/eu.po | 2292
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1481 insertions(+), 811 deletions(-)

commit 6188c50640417c33ed5a6c939f5aa7ca5c6f692b
Author: Changwoo Ryu <cwryu@debian.org>
Date:	Sat Sep 24 07:31:54 2011 +0900

    Updated Korean translation

 po/ko.po | 2193
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1396 insertions(+), 797 deletions(-)

commit 1e8c8193c24572d664d7db85b4fe8a9990acaaca
Author: Daniel Martinez Cucalon <dmartinez@src.gnome.org>
Date:	Fri Sep 23 18:48:26 2011 +0200

    Updated Aragonese translation

 po/an.po | 2094
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 1302 insertions(+), 792 deletions(-)

commit da60b5a2da186bc0822ae7cd9ff0707f9acf298e
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Sep 23 13:19:47 2011 +0200

    glade: move IRC's expander to the vbox instead of the table

 libempathy-gtk/empathy-account-widget-irc.ui | 298
 +++++++++++++++------------
 1 file changed, 168 insertions(+), 130 deletions(-)

commit 06d4bc3914b8800fb75b9eff3a634652a48c1d6f
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Sep 23 11:50:36 2011 +0200

    Glade: GtkGrid does not have n-rows and n-columns properties as
    GtkTable

    https://bugzilla.gnome.org/show_bug.cgi?id=646630

 libempathy-gtk/empathy-account-widget-jabber.ui | 9 ---------
 1 file changed, 9 deletions(-)

commit 881df08c3ece6a8a439f7fe4bfff027a3ef21ece
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Sep 23 11:54:21 2011 +0200

    Glade: fix sizing in SIP accounts widget

    https://bugzilla.gnome.org/show_bug.cgi?id=646630

 libempathy-gtk/empathy-account-widget-sip.ui | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit eb441ce39e8c2f26c46c37d69e6b5c7df185719c
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Sep 23 07:58:35 2011 +0300

    Updated Hebrew translation.

 po/he.po | 375
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 198 insertions(+), 177 deletions(-)

commit acd487eba116c20d3777b01e2a183691c6f5e8ae
Author: Theppitak Karoonboonyanan <thep@linux.thai.net>
Date:	Fri Sep 23 01:12:18 2011 +0700

    Updated Thai translation.

 po/th.po | 2456
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 1504 insertions(+), 952 deletions(-)

commit 86196dff1d5f90d3733aa2f69f904980119123ee
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Sep 22 14:47:34 2011 +0200

    e-account-widget-jabber: Use GtkGrid instead of GtkTable

    This work around bug #657621

    https://bugzilla.gnome.org/show_bug.cgi?id=646630

 libempathy-gtk/empathy-account-widget-jabber.ui | 126
 +++++++++++++-----------
 1 file changed, 71 insertions(+), 55 deletions(-)

commit de497ec186dd52217ba663700893ef58ac2f5502
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:	Sun Apr 3 11:20:24 2011 -0500

    e-account-widget-jabber: fix sizing issues

    Fix the glade file for sizing issues

    Bug #646630

 libempathy-gtk/empathy-account-widget-jabber.ui | 728
 +++++++++++++-----------
 1 file changed, 381 insertions(+), 347 deletions(-)

commit 1ae8e38a219e02e4f3d9608dc4ad8db2893899f3
Author: Nilamdyuti Goswami <ngoswami@redhat.com>
Date:	Thu Sep 22 15:49:48 2011 +0530

    Updated Assamese Translations:bugzilla#659595

 po/as.po | 184
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 184 insertions(+)

commit 6bcae7084705c518ee58dcc95085e4def8828ba9
Author: Nilamdyuti Goswami <ngoswami@redhat.com>
Date:	Thu Sep 22 12:11:07 2011 +0200

    Update Assamese translation

 po/as.po | 4384
 +++++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 3089 insertions(+), 1295 deletions(-)

commit be81ac3cba1c7778459af048766cc2a3b58c15f2
Author: Hannie Dumoleyn <hannie@ubuntu-nl.org>
Date:	Wed Sep 21 23:37:18 2011 +0200

    Updated Dutch translation by Hannie Dumoleyn

 po/nl.po | 428
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 227 insertions(+), 201 deletions(-)

commit e287d2d02399266719b5ff3af1dc2e544ee93216
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Wed Sep 21 13:14:28 2011 +0200

    Updated Hungarian help translation

 help/hu/hu.po | 389
 +++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 246 insertions(+), 143 deletions(-)

commit e3598826ad6ede2f72fbee91c528e621f6dce926
Merge: f9c3f78 3783932
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Sep 21 08:32:59 2011 +1000

    Merge branch 'crash-659118'

    Freeze exception signed off by Andre Klapper <ak-47@gmx.net> and
    Matthias Clasen <matthias.clasen@gmail.com>

commit f9c3f78251f24515f8c667142d278641b608e260
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Tue Sep 20 21:39:12 2011 +0200

    Updated Serbian translation

 po/sr.po	| 2634
 +++++++++++++++++++++++++++++++++++---------------------
 po/sr@latin.po | 2622
 ++++++++++++++++++++++++++++++++++---------------------
 2 files changed, 3288 insertions(+), 1968 deletions(-)

commit dafc6771e4d4c2f4b0c8355a0e10c2bc1222b216
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Tue Sep 20 13:06:03 2011 +0200

    Updated Slovenian translation

 po/sl.po | 1631
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 915 insertions(+), 716 deletions(-)

commit 378393285bb5de21c4da85b2e64e044faef6f5b6
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Sep 20 16:32:33 2011 +1000

    Don't destroy MainWindow on delete-event, just hide it

    This stops MainWindow being unreferenced, and prevents crashes
    caused by
    things which then try to use it.

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=659118

 src/empathy-main-window.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 1f03b12e756b3751a3a726464c2f254160b0470b
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Mon Sep 19 23:45:30 2011 +0200

    Updated Hungarian translation

 po/hu.po | 1451
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 802 insertions(+), 649 deletions(-)

commit 150f8482a6491090bbb0b48408c81221f791ae86
Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:	Mon Sep 19 22:23:24 2011 +0300

    Updated Latvian translation.

 po/lv.po | 57 ++++++++++++++++++++++++++-------------------------------
 1 file changed, 26 insertions(+), 31 deletions(-)

commit 0d24698c022b0050a6fbcd2803c93b12e8b9756a
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Sat Sep 17 00:48:46 2011 -0400

    log-window: improve icons in the search entry

    There are a few improvements we can make to the search entry icons in
    the log window, which this patch tries to fix.
    - icons in entries are usually symbolic in GNOME 3, so I made
    the icons
      symbolic.
    - I merged the two icons in just one on the right using the
    shell-style,
      i.e. the search icon turns into a clear action once there's
      some text
      typed into the entry (Documents also uses the same style for its
      search entry).

    https://bugzilla.gnome.org/show_bug.cgi?id=659298

 libempathy-gtk/empathy-log-window.c | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

commit 7323ce34c1228d04cfe3503eb818b8fac7fd4a2c
Author: Marek Černocký <marek@manet.cz>
Date:	Mon Sep 19 19:45:07 2011 +0200

    Updated Czech translation

 po/cs.po | 290
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 159 insertions(+), 131 deletions(-)

commit 2162f28a72c3f9ad6c9309fa17952cf85e14b8ac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 19 16:51:33 2011 +0200

    remove release flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9830714434c0b2ff8679de2daa68d3aab6f09cc8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 19 16:38:43 2011 +0200

    coding style fix

 libempathy-gtk/empathy-chat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 768efa64b2986ffe6e394a7f58262f44e6e2fc99
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 19 16:20:30 2011 +0200

    prepare 3.1.92

 NEWS	      | 78
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 80 insertions(+), 2 deletions(-)

commit aaff7e95f9dd66f94a3b85e910b049daf9097a0c
Author: Raul Gutierrez Segales <rgs@collabora.co.uk>
Date:	Mon Sep 19 15:09:57 2011 +0100

    Use always-writeable and writeable-properties for alias and groups

    Folks is in the way of deprecating the
    folks_persona_store_get_can_{alias,group}_personas methods in favour
    of directly checking alias and groups properties via
    folks_persona_store_get_always_writeable_properties and
    folks_persona_get_writeable_properties.

 libempathy-gtk/empathy-individual-menu.c |  5 +-
 libempathy/empathy-utils.c		  | 94
 ++++++++++++++++++++++++++------
 libempathy/empathy-utils.h		  |  6 +-
 3 files changed, 83 insertions(+), 22 deletions(-)

commit ccd55bf7585624f1aab05525444449c44310d642
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Sep 19 15:56:49 2011 +0200

    EmpathyChat: Set slider position after a timeout

    This ensure that the window has resized before setting the position
    because GtkPaned needs to know its size allocation

    https://bugzilla.gnome.org/show_bug.cgi?id=632357

 libempathy-gtk/empathy-chat.c | 45
 ++++++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 16 deletions(-)

commit 4a6debbdd20ae45b7f5653f2374b0980545ba753
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date:	Mon Sep 19 13:13:49 2011 +0100

    Updated British English translation

 po/en_GB.po | 291
 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 156 insertions(+), 135 deletions(-)

commit be57ef773c5d24c921c586eba75cdd73db23223f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 19 13:50:59 2011 +0200

    Don't assume a connected TpAccount always have a TpConnection

    The connection object may not be there yet if tp-glib is still
    preparing its
    features.

    https://bugzilla.gnome.org/show_bug.cgi?id=659439

 src/empathy.c | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

commit 5ca677e8864ed07d51b243beb9f5fd6a111d305e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Sep 19 12:51:55 2011 +0100

    Build fix

 src/empathy-call-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a3086b1cb486653391d90e34539fe9277b4d2d08
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Sep 8 15:17:24 2011 +0100

    CallWindow: unconditionally connect to notify::call-channel

    Since we can get a new call channel if we e.g. hangup and
    then call again.

    https://bugzilla.gnome.org/show_bug.cgi?id=655356

 src/empathy-call-window.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

commit add501b302cc0d35936417997c861ae274f2803d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Sep 8 15:12:24 2011 +0100

    CallWindow: emit tones using MultipleTones

    https://bugzilla.gnome.org/show_bug.cgi?id=655356

 src/empathy-call-window.c | 84
 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 68 insertions(+), 16 deletions(-)

commit e79a44f083fe138ab9e8b1fe04196e19b8a0cce8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 19 12:18:44 2011 +0200

    Use tp_proxy_prepare_async instead of tp_account_prepare_async

 src/empathy-accounts-dialog.c | 4 ++--
 src/empathy-accounts.c        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 6670167794afb834c87fa7bae7286567b7a84cb3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 19 12:18:44 2011 +0200

    Use tp_proxy_prepare_async instead of tp_account_manager_prepare_async

 libempathy-gtk/empathy-account-chooser.c  |  4 ++--
 libempathy-gtk/empathy-account-widget.c   |  4 ++--
 libempathy-gtk/empathy-chat.c		   |  4 ++--
 libempathy-gtk/empathy-location-manager.c |  8 ++++----
 libempathy-gtk/empathy-notify-manager.c   |  4 ++--
 libempathy-gtk/empathy-presence-chooser.c |  4 ++--
 libempathy/empathy-account-settings.c	   |  4 ++--
 libempathy/empathy-chatroom-manager.c	   |  4 ++--
 libempathy/empathy-contact-manager.c	   |  4 ++--
 libempathy/empathy-presence-manager.c	   |  4 ++--
 src/empathy-account-assistant.c	   |  4 ++--
 src/empathy-accounts-dialog.c		   |  4 ++--
 src/empathy-accounts.c			   |  4 ++--
 src/empathy-import-widget.c		   |  4 ++--
 src/empathy-main-window.c		   |  4 ++--
 src/empathy-migrate-butterfly-logs.c	   |  4 ++--
 src/empathy-status-icon.c		   |  4 ++--
 src/empathy.c				   | 10 +++++-----
 18 files changed, 41 insertions(+), 41 deletions(-)

commit e832dfa825bd284600ffa28d2a9180d96c7024a5
Author: Antoine Jacoutot <ajacoutot@openbsd.org>
Date:	Sun Sep 18 12:11:06 2011 +0200

    Sync with the current GSettings schemas install rule from gsettings.m4
    in glib. See #627126 for details.

    This allows to properly install gsettings schemas files on BSDs.

    https://bugzilla.gnome.org/show_bug.cgi?id=659377

 m4/gsettings.m4 | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

commit 8a15d7ddcab9c2379e562e3b72e8ec6b11165d25
Author: Daniel Nylander <po@danielnylander.se>
Date:	Sun Sep 18 19:32:42 2011 +0200

    Updated Swedish translation

 po/sv.po | 181
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 103 insertions(+), 78 deletions(-)

commit 4729fd834d3b2e518d643875e6b6acbe07fdbcfc
Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:	Sun Sep 18 19:13:43 2011 +0300

    Updated Latvian translation.

 po/lv.po | 408
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 215 insertions(+), 193 deletions(-)

commit 887a1089dc8576da06f50bb22a606e3322de2a82
Author: Muhammet Kara <muhammet.k@gmail.com>
Date:	Sun Sep 18 19:00:17 2011 +0300

    Updated Turkish translation

 po/tr.po | 2184
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1428 insertions(+), 756 deletions(-)

commit 57fbdc80bfd439d4865855a23ef21f9e434e2810
Author: Jorge González <aloriel@gmail.com>
Date:	Sun Sep 18 17:04:02 2011 +0200

    Updated Spanish translation

 po/es.po | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

commit 128e39f2775c365aa164b2d87a20fa7280da18d5
Author: Jorge González <aloriel@gmail.com>
Date:	Sun Sep 18 16:55:07 2011 +0200

    Updated Spanish translation

 po/es.po | 167
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 98 insertions(+), 69 deletions(-)

commit cd16ab7ec022f007326588f0d280706b618a3f29
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Sun Sep 18 16:23:51 2011 +0200

    [l10n] Updated German translation

 po/de.po | 794
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 438 insertions(+), 356 deletions(-)

commit ef797ff9eba01210d16047e26563b8270ee02081
Author: Aurimas Černius <aurisc4@gmail.com>
Date:	Sun Sep 18 16:34:26 2011 +0300

    Updated Lithuanian translation

 po/lt.po | 472
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 253 insertions(+), 219 deletions(-)

commit e819cd86bfacfda9ee936436a4c2e0b207dfcbab
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:	Sun Sep 18 13:59:43 2011 +0530

    updated Tamil translation

 po/ta.po | 221
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 110 insertions(+), 111 deletions(-)

commit c1b157527522ce7cf83342182f99d93216273f24
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:	Sun Sep 18 13:55:41 2011 +0530

    updated Tamil translation

 po/ta.po | 80
 ++++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 50 insertions(+), 30 deletions(-)

commit ed7a75cd3de64fe7ceda6fbc97c4b405e4fc7492
Author: Alexander Shopov <ash@kambanaria.org>
Date:	Sun Sep 18 11:00:06 2011 +0300

    Updated Bulgarian translation

 po/bg.po | 158
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 88 insertions(+), 70 deletions(-)

commit 919a3258cf3757a3653676d08c78709e0dae5f38
Author: A S Alam <aalam@users.sf.net>
Date:	Sun Sep 18 08:58:16 2011 +0530

    update Punjabi Translation

 po/pa.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit efc18ab4f5bfdb068c583f21e49dd98d09563163
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Sat Sep 17 23:46:31 2011 +0300

    Updated Belarusian translation (some fixes after manual testing).

 po/be.po | 96
 ++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

commit 3d3f0ec702c9436e6d85d3c509f1840ccd74fd83
Author: A S Alam <aalam@users.sf.net>
Date:	Sun Sep 18 01:03:16 2011 +0530

    Updated Punjabi Translation

 po/pa.po | 303
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 159 insertions(+), 144 deletions(-)

commit ceeb1b6f003db30a3ef9cfd993fcff884c86d49b
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sat Sep 17 11:37:43 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 181
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 103 insertions(+), 78 deletions(-)

commit 79c35acd819667c5558b7479cb9ff80df0f8b154
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Sat Sep 17 12:34:10 2011 +0400

    Updated Russian translation

 po/ru.po | 387
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 212 insertions(+), 175 deletions(-)

commit 9d2f4c4ca7362b7b87a4f38b979c995b68a5352b
Author: Jiro Matsuzawa <jmatsuzawa@src.gnome.org>
Date:	Sat Sep 17 11:48:49 2011 +0900

    Updated Japanese translation

 po/ja.po | 2460
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1596 insertions(+), 864 deletions(-)

commit 27b930e6bdc4331749903a4d6112913660a2c966
Author: Duarte Loreto <happyguy_pt@hotmail.com>
Date:	Sat Sep 17 00:55:19 2011 +0100

    Updated Portuguese translation

 po/pt.po | 2226
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1427 insertions(+), 799 deletions(-)

commit 669606a45907443b82915e41e46d2e3d966cc549
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Fri Sep 16 19:04:46 2011 +0200

    [l10n] Updated Italian translation

 po/it.po | 285
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 153 insertions(+), 132 deletions(-)

commit 1ce2aa6b4cf7d049fd3c51784ff447d608cd1084
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 16 14:23:13 2011 +0200

    avatar-chooser: disable 'take picture' button if there is no camera
    connected

    https://bugzilla.gnome.org/show_bug.cgi?id=652985

 libempathy-gtk/empathy-avatar-chooser.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

commit 49f3411a5c414ec1a6a7cf68de9ef7c8c8cb7938
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 16 14:14:17 2011 +0200

    avatar-chooser: split creation of the file chooser dialog

    https://bugzilla.gnome.org/show_bug.cgi?id=652985

 libempathy-gtk/empathy-avatar-chooser.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

commit 7dc159658c022fdd1bd3f05dfa3bdc8c21b88369
Author: Antonio Fernandes C. Neto <fernandesn@gnome.org>
Date:	Fri Sep 16 08:57:18 2011 -0300

    Updated Brazilian Portuguese translation

 po/pt_BR.po | 160
 ++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 91 insertions(+), 69 deletions(-)

commit 1049880bd7c7176a8e8c22fcab61006aeaf9911f
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date:	Fri Sep 16 13:41:39 2011 +0200

    Updated Danish translation

 po/da.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 3594bf73250ba466307f01eb95db2eed766998f1
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date:	Fri Sep 16 13:39:23 2011 +0200

    Updated Danish translation

 po/da.po | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

commit 7d1903a1479461de3f3322bed4df0913271b5f42
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date:	Fri Sep 16 13:32:55 2011 +0200

    Updated Danish translation

 po/da.po | 2256
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1436 insertions(+), 820 deletions(-)

commit 0fab2d22847ee90c06be84bac9935942e39039b1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 16 10:32:18 2011 +0200

    tp-roomlist: pass self as weak object to
    tp_cli_channel_type_room_list_call_list_rooms

    https://bugzilla.gnome.org/show_bug.cgi?id=658909

 libempathy/empathy-tp-roomlist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e3ac85477f053b98531e1b295c498b41659ab0eb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 16 10:26:42 2011 +0200

    tp-roomlist: ensure that we stay alive during the
    create_and_handle_channel async call

    https://bugzilla.gnome.org/show_bug.cgi?id=658909

 libempathy/empathy-tp-roomlist.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 708aa24958f0e211f8582e3662b149f4ddb1305b
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Thu Sep 15 23:40:06 2011 +0200

    Updated French translation

 po/fr.po | 2253
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1435 insertions(+), 818 deletions(-)

commit 972b917c9e2ddcac86d7b9f7799158f77f5aedbf
Author: Fran Dieguez <fran@openhost.es>
Date:	Thu Sep 15 21:02:33 2011 +0200

    Updated Galician translations

 po/gl.po | 157
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 89 insertions(+), 68 deletions(-)

commit fd0437bd1669e2d1992c2f36884003d60686dca9
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Thu Sep 15 19:25:39 2011 +0300

    Updated Belarusian translation.

 po/be.po | 142
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 81 insertions(+), 61 deletions(-)

commit c74b2a54f8f53dddf5b2c0b6c3ed2427e54b1f90
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Thu Sep 15 15:32:12 2011 +0200

    Updated Polish translation

 po/pl.po | 142
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 81 insertions(+), 61 deletions(-)

commit e3327f1e82fbf9c386bbb0cc07a87d47ad89d6fe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 15 15:13:07 2011 +0200

    log-window: fix translators comment

    https://bugzilla.gnome.org/show_bug.cgi?id=659141

 libempathy-gtk/empathy-log-window.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 63ad9ebf15467a134ab044969faecbf3f4a2a758
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 15 15:06:19 2011 +0200

    log-window: properly translate duration strings

    https://bugzilla.gnome.org/show_bug.cgi?id=659141

 libempathy-gtk/empathy-log-window.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

commit 051beb6158c98cd2aa6c7219fc3c94a7eb3ae7b0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 6 09:26:50 2011 +0200

    Disable contact and contact list search when disconnected

    https://bugzilla.gnome.org/show_bug.cgi?id=655270

 src/empathy-main-window.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 7bd81c09f38bc0d4672e0674b00851be3fce7b39
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date:	Thu Sep 15 18:31:48 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 616
 +++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 619
 ++++++++++++++++++++++++++++++++----------------------------
 2 files changed, 653 insertions(+), 582 deletions(-)

commit 87f3753ef09050949f28ecdc8272579cb9225641
Merge: 4c7ee0a 42ea425
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 15 11:53:46 2011 +0200

    Merge remote-tracking branch 'pochu/call-reuse-windows-580794'

commit 4c7ee0a436cea45e4351e857577ddf944d36b2f3
Author: Alban Crequy <alban.crequy@collabora.co.uk>
Date:	Wed Sep 14 15:40:44 2011 -0400

    Remove unused variables [-Werror=unused-but-set-variable]

    https://bugzilla.gnome.org/show_bug.cgi?id=658650

 libempathy-gtk/empathy-contact-list-store.c | 2 --
 libempathy-gtk/empathy-individual-store.c   | 2 --
 2 files changed, 4 deletions(-)

commit e5eefe62e3fc0d0b9c1df569489ab13f76e00a59
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 13 15:45:19 2011 +0200

    contact-list-store: store GtkTreeIter rather than GtkTreeRowReference
    in the cache

    GtkTreeRowReference keeps a ref on the store introducing a ref cycle.

    https://bugzilla.gnome.org/show_bug.cgi?id=658650

 libempathy-gtk/empathy-contact-list-store.c | 79
 ++++++++---------------------
 1 file changed, 20 insertions(+), 59 deletions(-)

commit 7561e27e705ff2df727a96016f57a60e3d0e0376
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 13 15:45:19 2011 +0200

    individual-store: store GtkTreeIter rather than GtkTreeRowReference
    in the cache

    GtkTreeRowReference keeps a ref on the store introducing a ref cycle.

    https://bugzilla.gnome.org/show_bug.cgi?id=658650

 libempathy-gtk/empathy-individual-store.c | 85
 ++++++++-----------------------
 1 file changed, 21 insertions(+), 64 deletions(-)

commit 0cfae9679043ad56e28677b2333ffbe8a5e7d3df
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 14 12:04:07 2011 +0200

    goa-mc-plugin: do not set the ConnectAutomatically Account property

    GOA accounts should behave like regular TP accounts and so shouldn't
    connect
    automatically.

    https://bugzilla.gnome.org/show_bug.cgi?id=658785

 goa-mc-plugin/mcp-account-manager-goa.c | 1 -
 1 file changed, 1 deletion(-)

commit dc761ca9d13c3f242e06cd4756f3e448a2e3c030
Author: Krasimir Chonov <mk2616@abv.bg>
Date:	Thu Sep 15 08:18:30 2011 +0300

    Updated Bulgarian translation

 po/bg.po | 2156
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1376 insertions(+), 780 deletions(-)

commit 48b1f9b7296429dca020545095f1e370793a0df1
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Wed Sep 14 21:58:55 2011 +0300

    Updated Belarusian translation.

 po/be.po | 277
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 146 insertions(+), 131 deletions(-)

commit 6ac4e08359a3d5c33e2f38dcd0129b5180810bba
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 14 16:43:25 2011 +0200

    sasl-handler: only save password if we manage to connect

    https://bugzilla.gnome.org/show_bug.cgi?id=659053

 libempathy/empathy-server-sasl-handler.c | 56
 +++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 22 deletions(-)

commit ba16c4a15b9977e61461bd9f222104eaa2204ee3
Author: Cosimo Alfarano <cosimo.alfarano@collabora.com>
Date:	Tue Sep 13 14:35:55 2011 +0100

    Update Collabora copyright in About Window

 src/empathy-about-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9219415733151bc6d48d88bacf19cdad647a6c69
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 13 12:17:50 2011 +0200

    GOA plugin: only save parameters from GOA accounts

    We should let MC deal with normal accounts.

    https://bugzilla.gnome.org/show_bug.cgi?id=658895

 goa-mc-plugin/mcp-account-manager-goa.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit b981b3d1a13e22c80c21b61131c4f07053840149
Author: Rajesh Ranjan <rranjan@redhat.com>
Date:	Wed Sep 14 13:26:42 2011 +0530

    hindi update

 po/hi.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ff653a8bf28b71c883881bec14e31defb9d54123
Author: Rajesh Ranjan <rranjan@redhat.com>
Date:	Wed Sep 14 13:25:25 2011 +0530

    hindi update

 po/hi.po | 406
 ++++++++++++++++++++++-----------------------------------------
 1 file changed, 143 insertions(+), 263 deletions(-)

commit a18fc91fb327a2b0c4d37d51b575e18a6f3070f4
Author: Rajesh Ranjan <rranjan@redhat.com>
Date:	Wed Sep 14 11:30:50 2011 +0530

    hindi update

 po/hi.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 715a87d3400b16ffe636b92de1fdd25ec22ea56a
Author: Rajesh Ranjan <rranjan@redhat.com>
Date:	Wed Sep 14 11:29:19 2011 +0530

    hindi update

 po/hi.po | 2751
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 1711 insertions(+), 1040 deletions(-)

commit e84794239a4c2a89b4381fdaf1cb3104d0ad9773
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Tue Sep 13 20:55:49 2011 +0200

    Updated Polish translation

 po/pl.po | 133
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 68 insertions(+), 65 deletions(-)

commit a0ef67f006e0dee00ed1bc6f22323aad2ea3d39d
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:	Tue Sep 13 19:39:12 2011 +0530

    updated Tamil translation

 po/ta.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit aa12b7ccf9887e0901dd8464be1200381e8413b9
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:	Tue Sep 13 19:38:14 2011 +0530

    updated Tamil translation

 po/ta.po | 304
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 164 insertions(+), 140 deletions(-)

commit 40bf91b05f4d3408e195b4a1218de673d6ee7fbf
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 12 16:52:34 2011 -0400

    individual-widget: use GtkGrid instead of GtkTable internally

    EmpathyIndividualWidget (used both in the contact information dialogs
    and in the tooltips) use a GtkTable internally to layout contact
    details.

    GtkTable is being deprecated, and does not correctly support
    width-for-height size negotiation. So, there are cases where we get
    funny overallocations bugs for wrapping GtkLabels; this is especially
    annoying for tooltips, as they tend to grow huge vertically.

    Porting the code to use a better container such as GtkGrid solves the
    bug. This patch does not cover all the use of GtkTable in
    EmpathyIndividualWidget, but enough to fix the tooltip sizing.

    https://bugzilla.gnome.org/show_bug.cgi?id=658857

 libempathy-gtk/empathy-individual-widget.c | 243
 ++++++++++++++---------------
 1 file changed, 118 insertions(+), 125 deletions(-)

commit 0a3f996d2ec2eed860edda7c36a9b6bdbd9d2722
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Sep 9 15:28:42 2011 +0100

    AccountChooser: don't return garbage from _set_account

    Previously, the 'set' field of the stack-allocated 'data' structure
    was
    not initialized. It's explicitly set to TRUE if the account is found,
    but never otherwise set; so if the account is not found, this function
    returned random garbage.

    Reviewed-by: Xavier Claessens <xclaesse@gmail.com>

 libempathy-gtk/empathy-account-chooser.c | 1 +
 1 file changed, 1 insertion(+)

commit 80a217a0b8533f8f936140082b90da793bc1b154
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 13 10:24:48 2011 +0200

    notifications-approver: move translators comment right before
    the string

    Comments have to be on the line just before the string to be picked by
    gettext.

    https://bugzilla.gnome.org/show_bug.cgi?id=658866

 src/empathy-notifications-approver.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 2a856251402a5ed06a5f9853b7b26abfcbf5eb3c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 12 16:58:46 2011 +0200

    theme-adium: ensure we always use the same color when sending messages

    https://bugzilla.gnome.org/show_bug.cgi?id=658821

 libempathy-gtk/empathy-theme-adium.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

commit 36211fc1a6e977c82e1f6467691a499fe6b68410
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 12 16:10:13 2011 +0200

    rename text/{persona,individual}-id as they are not standard

    https://bugzilla.gnome.org/show_bug.cgi?id=648315

 libempathy-gtk/empathy-individual-linker.c | 2 +-
 libempathy-gtk/empathy-individual-view.c   | 8 ++++----
 libempathy-gtk/empathy-persona-view.c	    | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

commit 656e9addef5ab7c5d3dc21fc0c502a15fc94331e
Author: Yinghua Wang <wantinghard@gmail.com>
Date:	Tue Sep 13 12:58:53 2011 +0800

    update Simplified Chinese (zh_CN) translation; fix format

 po/zh_CN.po | 1208
 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 634 insertions(+), 574 deletions(-)

commit dafc0ff233c2d02c607bb6ee67e714ba698319fc
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:	Mon Aug 29 20:43:22 2011 +0100

    individual-manager: Port to the new individuals_changed_detailed
    signal

    Closes: bgo#657746

 configure.ac				 |  2 +-
 libempathy/empathy-individual-manager.c | 35
 ++++++++++++++++++++++++---------
 2 files changed, 27 insertions(+), 10 deletions(-)

commit 03eeddb4c836614b2bf1f935472bd66c98003aa1
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Mon Sep 12 20:50:33 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 256
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 132 insertions(+), 124 deletions(-)

commit e872c255f2145985a0f881d68b247a221338fdb3
Author: Daniel Nylander <po@danielnylander.se>
Date:	Mon Sep 12 17:55:01 2011 +0200

    Updated Swedish translation

 po/sv.po | 292
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 152 insertions(+), 140 deletions(-)

commit 5b8d5406a2096aaa9d84f79c115464eb190d0830
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 12 15:15:07 2011 +0200

    individual-manager: dup the Individual ID instead of borrowing it

    It's not immutable any more so we have to copy the string.

    https://bugzilla.gnome.org/show_bug.cgi?id=658573

 libempathy/empathy-individual-manager.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f0ca128096983de9df36d0fa981a0c3dcdaf5c99
Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:	Mon Sep 12 00:41:08 2011 +0300

    Updated Latvian translation.

 po/lv.po | 1699
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 914 insertions(+), 785 deletions(-)

commit 3b2e8219315d0fd6b108eb12f1be5ae099a2a88f
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sun Sep 11 11:47:52 2011 +0200

    Updated Spanish translation

 po/es.po | 128
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 63 insertions(+), 65 deletions(-)

commit 74063b2c0a809709865a81dfa38915a97f427219
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Sep 10 11:12:19 2011 +0200

    Updated Spanish translation

 po/es.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit aa064bdc58a5a897583367f7234c067f4e634a66
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Sat Sep 10 10:49:12 2011 +0200

    Updated Spanish translation

 po/es.po | 149
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 80 insertions(+), 69 deletions(-)

commit 736ce66f04aec5531ebdc7c8f649f162c4c898d1
Author: Fran Dieguez <fran@openhost.es>
Date:	Sat Sep 10 03:36:36 2011 +0200

    Updated galician translations

 po/gl.po | 262
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 137 insertions(+), 125 deletions(-)

commit 1b9ddda224af418ca0f1de9d9743bc8327efc337
Author: Marek Černocký <marek@manet.cz>
Date:	Fri Sep 9 22:21:30 2011 +0200

    Updated Czech translation

 po/cs.po | 165
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 81 insertions(+), 84 deletions(-)

commit a537a927a4b1af4468c57a9307ca3468a5e52838
Author: Hannie Dumoleyn <hannie@ubuntu-nl.org>
Date:	Fri Sep 9 18:38:57 2011 +0200

    Updated Dutch translation by Hannie Dumoleyn

 po/nl.po | 294
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 156 insertions(+), 138 deletions(-)

commit fefa9b3c72bdbf01277a606816fc15ac53ee780a
Author: A S Alam <aalam@users.sf.net>
Date:	Fri Sep 9 20:06:20 2011 +0530

    update PunjabiTranslation

 po/pa.po | 1127
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 597 insertions(+), 530 deletions(-)

commit 6939a5c3d045b1915d06539f96d758dfa22318e8
Author: Fran Dieguez <fran@openhost.es>
Date:	Fri Sep 9 14:54:49 2011 +0200

    Updated galician translations for docs

 help/gl/gl.po | 4624
 +++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 3492 insertions(+), 1132 deletions(-)

commit a5dfe754e2d7aa6a57f455c9a569c4f185466348
Author: Antonio Fernandes C. Neto <fernandesn@gnome.org>
Date:	Fri Sep 9 08:37:19 2011 -0400

    Updated Brazilian Portuguese translation.

 po/pt_BR.po | 298
 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 160 insertions(+), 138 deletions(-)

commit c785ff79365fb91a41e38458ae6ea5cf02cbaa8f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 9 13:45:31 2011 +0200

    dup_color_balance: check that element currently implements
    GstColorBalance

    https://bugzilla.gnome.org/show_bug.cgi?id=658584

 src/empathy-video-src.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit 890efc4f52b81bf90fb5d130124d68fe071abc3f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 9 13:39:44 2011 +0200

    video-src: factor out dup_color_balance()

    https://bugzilla.gnome.org/show_bug.cgi?id=658584

 src/empathy-video-src.c | 47
 +++++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

commit 3dd675c21527cabb74cd9b4301ea82324e0f17b6
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Sep 9 12:29:35 2011 +0200

    Because we like whales

 libempathy-gtk/empathy-chat.c | 45
 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

commit 56f569b22192230080eb6c20d0d5474fa7e47086
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 9 12:51:33 2011 +0200

    individual_store_remove_individual: ensure that the store stays
    alive during the process

    https://bugzilla.gnome.org/show_bug.cgi?id=658644

 libempathy-gtk/empathy-individual-store.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 683c88254e5488ef7b0d8d0e0fd05f46c41f5914
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 9 12:49:46 2011 +0200

    contact_list_store_remove_contact: ensure that the store stays alive
    during the process

    https://bugzilla.gnome.org/show_bug.cgi?id=658644

 libempathy-gtk/empathy-contact-list-store.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit c4051a34512dd7daeca7f1fa2e84d5d05805601a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Sep 9 11:48:05 2011 +0100

    Require Clutter 1.7 for empathy-call

 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit e8232dec177feb06147149ebb9f16a7de9804351
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Sep 9 13:04:47 2011 +0300

    Updated Hebrew translation.

 po/he.po | 550
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 300 insertions(+), 250 deletions(-)

commit e2d79382597aa0e866694a810b83cdce0ebc593f
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Thu Sep 8 22:33:24 2011 +0200

    [l10n] Updated Italian translation

 po/it.po | 2205
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1398 insertions(+), 807 deletions(-)

commit 188b5e8d6f9896326ed0530fb2294b9b12a215ae
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Thu Sep 8 21:54:07 2011 +0200

    Updated Polish translation

 po/pl.po | 2162
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1370 insertions(+), 792 deletions(-)

commit af574cb3638d7be10b79fdfd86313f5a1428047b
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date:	Thu Sep 8 16:28:01 2011 +0100

    Added British English translation

 po/en_GB.po | 2259
 +++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1420 insertions(+), 839 deletions(-)

commit ad119467cf50c8437a62ba6e6f483eb9032771a9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 8 17:02:44 2011 +0200

    factor out empathy_get_tp_contact_for_individual

 libempathy/empathy-utils.c		 | 38
 +++++++++++++++++++++++++++++++++
 libempathy/empathy-utils.h		 |  3 +++
 src/empathy-invite-participant-dialog.c | 32 +++------------------------
 3 files changed, 44 insertions(+), 29 deletions(-)

commit c8b29cfe85216cc692cc7e95c969e3678c153d72
Merge: 777e9d3 cbb85fe
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Sep 8 13:15:53 2011 +0100

    Merge branch '657335-Preferences-Calls-Tab'

commit 777e9d330ae950e5cc89f757317fde4e96762363
Author: Jussi Kukkonen <jku@linux.intel.com>
Date:	Tue Sep 6 11:50:35 2011 +0300

    log-window: sort "Who" list store alphabetically

    Currently "Who"-list is sorted with "g_strcmp0 (name)" which
    is not what we want (e.g. "Chris" becomes before "bob" because of
    the initial capital letter).

    Start sorting using g_utf8_collate_key().

    https://bugzilla.gnome.org/show_bug.cgi?id=658336

 libempathy-gtk/empathy-log-window.c | 38
 ++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

commit 42ea425116ef9c079fa199039e3ac5ed0bb8e150
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jul 11 12:45:25 2011 +0100

    CallWindow: explain call states

    https://bugzilla.gnome.org/show_bug.cgi?id=580794

 src/empathy-call-window.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 309ca0453965d145bfeec6d9a497330833c76b7b
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Sep 6 12:00:31 2011 +0100

    Resize the hangup button in ::realize

    So that it's not resized many times.

    https://bugzilla.gnome.org/show_bug.cgi?id=580794

 src/empathy-call-window.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 3f30f0aac8ec4f21acb84e4b5b9afa6acd131b99
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Sep 7 13:19:24 2011 +0100

    CallWindow: display a dialog to accept or reject incoming calls

    https://bugzilla.gnome.org/show_bug.cgi?id=580794

 src/empathy-call-window.c | 72
 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 59 insertions(+), 13 deletions(-)

commit ee02c5c89132db72e5cd987cd443cd09202b6f5b
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Sep 7 15:54:29 2011 +0100

    Let the existing call window know about new incoming calls

    https://bugzilla.gnome.org/show_bug.cgi?id=580794

 src/empathy-call-window.c | 62
 +++++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-call.c	   | 38 +++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+)

commit d5136f90339362d53d780700808dc055fc0a7121
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Jul 8 12:46:33 2011 +0100

    Reuse Call windows when possible

    If we have a call window opened for a contact and we get an
    incoming call from the same person, use the existing window
    instead of creating another one.

    Based on a patch from Jonathan Tellier.

    https://bugzilla.gnome.org/show_bug.cgi?id=580794

 src/empathy-call-window.c | 47
 +++++++++++++++++++++++++++++++++++------------
 src/empathy-call-window.h |  6 ++++++
 src/empathy-call.c	   | 43
 +++++++++++++++++++++++++++++++++++++------
 3 files changed, 78 insertions(+), 18 deletions(-)

commit 44731ebba06458462f5c26fed8fd0abab30e7450
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jul 18 17:07:45 2011 +0100

    Make EmpathyCallFactory an approver

    https://bugzilla.gnome.org/show_bug.cgi?id=580794

 src/empathy-call-factory.c | 98
 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)

commit 391bad3cd5545b504fd69563b3bb598320c4957d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jul 18 16:28:36 2011 +0100

    CallFactory: make it a TpBaseClient subclass

    So that we can make it both a handler and an observer at the
    same time.

    https://bugzilla.gnome.org/show_bug.cgi?id=580794

 src/empathy-call-factory.c | 106
 +++++++++++++++------------------------------
 src/empathy-call-factory.h |	5 +--
 2 files changed, 38 insertions(+), 73 deletions(-)

commit 180787f1addccd923d50b45858ba24a0487e98bc
Author: Timo Jyrinki <timo@debian.org>
Date:	Thu Sep 8 13:41:45 2011 +0300

    Update Finnish translation

 po/fi.po | 2969
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1901 insertions(+), 1068 deletions(-)

commit 48ac7cb1cb93bb1e0f94db7160f13da5342aa704
Author: Marek Černocký <marek@manet.cz>
Date:	Thu Sep 8 10:55:28 2011 +0200

    Updated Czech translation

 po/cs.po | 1507
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 821 insertions(+), 686 deletions(-)

commit 77cd4e037d3bc5a91b408d8ed5b22c1cf29718c9
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Thu Sep 8 10:09:08 2011 +0400

    Updated Russian translation

 po/ru.po | 189
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 100 insertions(+), 89 deletions(-)

commit fd43479df7b581f4406054d1573c393523eae320
Author: Xandru Armesto <xandru@softastur.org>
Date:	Wed Sep 7 17:36:13 2011 +0200

    Updated asturian translation

 po/ast.po | 3043
 +++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 2034 insertions(+), 1009 deletions(-)

commit 508b8346cb1f840ddb35a367d4a3d38b7b9271eb
Author: Andika Triwidada <andika@gmail.com>
Date:	Wed Sep 7 20:58:11 2011 +0700

    Updated Indonesian translation

 po/id.po | 1067
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 544 insertions(+), 523 deletions(-)

commit a9eb911ea875ce7e9a1c43fe76ddc77811887a60
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 7 12:05:52 2011 +0200

    update_geocode: don't try to get position if location is empty

    geocode-glib won't be able to much if contact's location dict
    is empty.

 libempathy/empathy-contact.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit ab9ee7fa8f55743968169bdaef7515a7ed52eef8
Author: Fran Dieguez <fran@openhost.es>
Date:	Wed Sep 7 02:34:25 2011 +0200

    Updated galician translations

 po/gl.po | 47 +++++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 18 deletions(-)

commit 2903da2d9daa7ab3bf26eea250a612501594d3d8
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Wed Sep 7 01:40:08 2011 +0300

    Updated Belarusian translation.

 po/be.po | 44 +++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

commit 0cd4f036ea16c9232e5bfd5b25cd5265d9ccd692
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Tue Sep 6 21:53:02 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 102
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 56 insertions(+), 46 deletions(-)

commit c748ade7736f4ff27b912214ba54c0d6ee78162d
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Tue Sep 6 20:56:36 2011 +0200

    [l10n] Updated German doc translation

 help/de/de.po | 917
 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 470 insertions(+), 447 deletions(-)

commit 2365a93233ce5750a0fe3d810ac2d65f602f1564
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Tue Sep 6 20:04:21 2011 +0200

    Updated Spanish translation

 po/es.po | 182
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 97 insertions(+), 85 deletions(-)

commit 4c56f91672941396112202617345b1b0445c29e0
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Sep 6 11:25:26 2011 +0100

    ContactSelector: mark standard action as the default.

    This allows Gtk+ to style the button differently to indicate that it
    will be pressed when the user hits Enter; it also fixes hitting
    enter in
    the New Conversation dialog, which does not consider
    GTK_RESPONSE_ACCEPT
    to be a reasonable response and ignores it. So we get a bug fix and
    better styling in exchange for less code!

    https://bugzilla.gnome.org/show_bug.cgi?id=658343

 libempathy-gtk/empathy-contact-selector-dialog.c | 21
 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

commit 36ef8807996629af42cec57fdb2adf4799b1cba4
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Sep 6 11:06:30 2011 +0100

    IndividualManager: disconnect handler from aggregator

    Previously, the handler for
    FolksIndividualAggregator::individuals-changed was never disconnected;
    thus it could be called after EmpathyIndividualManager dies (if its
    aggregator outlives it), and crash us.

    https://bugzilla.gnome.org/show_bug.cgi?id=658340

 libempathy/empathy-individual-manager.c | 3 +++
 1 file changed, 3 insertions(+)

commit f05b344066594fc4acd07865b70a6865d599c5d6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 6 18:55:34 2011 +0200

    use champlain 0.12

    https://bugzilla.gnome.org/show_bug.cgi?id=658341

 configure.ac | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit 4ed88cebf36575508f7eb7931b9f46b8f661a60e
Author: Alban Browaeys <prahal@yahoo.com>
Date:	Wed Aug 31 15:13:33 2011 +0200

    import: prevent haze to be used for irc

    Prevent haze to be used for irc even if sole connection
    manager to support it.
    Reworked by Guillaume Desmottes <gdesmott@gnome.org> .

    https://bugzilla.gnome.org/show_bug.cgi?id=657818

 src/empathy-import-utils.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 905dec95625ac420b3fc2914b5d365a89e5b70f8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 6 18:18:05 2011 +0200

    individual-store: use Folks directly to watch is-favourite changes

    We already use it to check if a contact is in favourite or not.
    The contact manager should probably be killed at some point any way.

 libempathy-gtk/empathy-individual-store.c | 38
 +++++++++++++++----------------
 1 file changed, 18 insertions(+), 20 deletions(-)

commit cbb85fe9590befd0b020b8dbf77233d32c906e42
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Sep 6 11:49:05 2011 +0100

    Preferences: explain what echo cancellation means

 src/empathy-preferences.ui | 43
 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

commit bb6e00b22a1c7ee318e701d3780338d13be7e9e5
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Tue Sep 6 17:35:53 2011 +0200

    Updated POTFILES.in

 po/POTFILES.in | 1 -
 1 file changed, 1 deletion(-)

commit 0f2e15e0a3e294e47eec19659c0a02582e2198fb
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Sep 6 15:52:34 2011 +0100

    TpChat: don't crash with broken TpProperties implementations

    I forgot to take the Telepathy.Properties interface out of Gabble
    when I
    removed Telepathy.Properties support from it. So Empathy called
    ListProperties() on it anyway: fine, you might think, except the
    callback set priv->had_properties_list to TRUE even if the method
    returned an error. empathy_tp_chat_set_property() and
    empathy_tp_chat_get_property() assume that if
    priv->had_properties_list is
    TRUE, priv->properties is not NULL.

    While I hope that we can delete this code entirely pretty soon,
    getting
    this crash fix in seems like a good idea.

    Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-tp-chat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2f334ccf04bdd42251132b5216859fd9d22ed100
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Aug 25 16:03:37 2011 +0100

    Preferences: reindent .ui file for Theme tab

    There are no XML changes in this commit, just indentation changes.

 src/empathy-preferences.ui | 184
 ++++++++++++++++++++++-----------------------
 1 file changed, 92 insertions(+), 92 deletions(-)

commit 820ebbc7f67288715794f712be7c9f12130b7565
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Aug 25 16:02:14 2011 +0100

    Preferences: remove Appearance label in Themes tab.

    This label doesn't add anything, so I removed it. The indentation is
    weird because I hand-edited the Glade file to show that nothing's
    really
    changed: I'll reindent it in the next patch.

 src/empathy-preferences.ui | 41 +----------------------------------------
 1 file changed, 1 insertion(+), 40 deletions(-)

commit 3db17606a2d9e16abb9bff10233a579852b8559b
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Aug 25 15:40:17 2011 +0100

    Call preferences: add colons to labels

 src/empathy-preferences.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b77af8e37dff739e55a69f85f89fc3031620e1e3
Merge: 64a35d4 5bc58b6
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Sep 6 18:54:03 2011 +1000

    Merge branch 'remove-cc-plugin'

commit 64a35d4c6eddc71236c8883b8b057a48538020b4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 6 10:22:53 2011 +0200

    remove release flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8957b456d91821ff56a559b36066e66546f0dfe3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 6 10:08:34 2011 +0200

    prepare 3.1.91

 NEWS	      | 40 ++++++++++++++++++++++++++++++++++++++++
 configure.ac |  6 +++---
 2 files changed, 43 insertions(+), 3 deletions(-)

commit 0597cf5d537a65542c00f1ec64369d93c2a53209
Author: Arash Mousavi <amousavi@src.gnome.org>
Date:	Tue Sep 6 12:17:43 2011 +0430

    Updated Persian translation

 po/fa.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 0ecc4bae11c7130a57687163bf75a90fe1911121
Author: Arash Mousavi <amousavi@src.gnome.org>
Date:	Tue Sep 6 12:08:47 2011 +0430

    Updated Persian translation

 po/fa.po | 1196
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 616 insertions(+), 580 deletions(-)

commit c1188cc50e7e8e492d1f98f1b73200eb65ba784e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 6 09:23:45 2011 +0200

    build fix

    How did I end up commiting this without the ';'??

 libempathy/empathy-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 68ef0da647171dc544ef4e16859a9519529863c6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 6 09:03:07 2011 +0200

    empathy_contact_dup_from_folks_individual: add a debug msg if no
    contact is found

    In most cases that's probably either an Empathy or Folks issue,
    so it's good
    to have some info to help debugging.

 libempathy/empathy-utils.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 7936496e842742b7e5f1444e3ffdc0ab89e09f50
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 5 16:30:50 2011 +0200

    empathy-accounts.desktop.in.in: remove X-GNOME-Settings-Panel

    We can't integrate with GNOME control center any more.

    https://bugzilla.gnome.org/show_bug.cgi?id=658254

 data/empathy-accounts.desktop.in.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 301f075fbc9ebd1f6330a5ce6ba19fbace3ea80a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 5 16:01:44 2011 +0200

    don't leak the keys returned by g_key_file_get_keys()

 goa-mc-plugin/mcp-account-manager-goa.c | 2 ++
 1 file changed, 2 insertions(+)

commit e49885103b7bd1754511282b05a1b44c13d7289f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 5 15:55:53 2011 +0200

    mcp_account_manager_goa_get: rename 'n' to nkeys

 goa-mc-plugin/mcp-account-manager-goa.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

commit fe369729ae300f341fa250420b1596900da58742
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 2 14:26:46 2011 +0200

    Store variable parameters to a key file

 goa-mc-plugin/mcp-account-manager-goa.c | 131
 ++++++++++++++++++++++++++++++--
 1 file changed, 124 insertions(+), 7 deletions(-)

commit b7c9d3ec599064bee965a017eb6182d56c156e41
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 1 14:03:24 2011 +0200

    watch for chat properties change to detect if Chat has
    enabled/disabled

 goa-mc-plugin/mcp-account-manager-goa.c | 38
 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

commit 08dedb8027eb3947b689ee7c99171406c8e82b47
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 31 16:04:30 2011 +0200

    set TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_ENABLED restriction

    We can't change the 'Chat' switch on the GOA account so user will
    have to use
    GOA to enable/disable the TP account.

 goa-mc-plugin/mcp-account-manager-goa.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 2d217cf1e80cfa1437f9f08e124b0c6f1fbe247c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 31 14:58:08 2011 +0200

    Remove old Facebook code

    Add a TODO for now.

 goa-mc-plugin/mcp-account-manager-goa.c | 46
 +++------------------------------
 1 file changed, 4 insertions(+), 42 deletions(-)

commit 2f5e2d1fdb7220291a75357c6c51ab7000e8b897
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 31 14:54:49 2011 +0200

    watch for Chat feature changes to enable/disable the account

 goa-mc-plugin/mcp-account-manager-goa.c | 41
 +++++++++++++++------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

commit 2278e8e11be7614d15d8c1a081dc49e68e5924eb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 31 14:43:10 2011 +0200

    mcp_account_manager_goa_set: pretend we save everything

    No doing it result in MC saving the keys in accounts.cfg and so
    duplicating
    the account.

 goa-mc-plugin/mcp-account-manager-goa.c | 2 ++
 1 file changed, 2 insertions(+)

commit 5d17340353b68177ec1332e564a13f18fb00105a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 31 14:22:36 2011 +0200

    Enable TP account only if Chat has been turned on in GOA

 goa-mc-plugin/mcp-account-manager-goa.c | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

commit 79df4629d7890f5d3a70e2d66afea1ded744e9d6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 31 14:09:47 2011 +0200

    store the GoaObject rather than the GoaAccount

    We need to keep the GoaObject to check if Chat is enabled on it.

 goa-mc-plugin/mcp-account-manager-goa.c | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

commit eb9d398e95bbb9972df1ac26374da11234a82989
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Jun 29 14:56:49 2011 +0800

    Add params fallback-servers, extra-certificate-identities and
    require-encryption

 goa-mc-plugin/mcp-account-manager-goa.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 18cb1d75f31075ac4ac4ad809d96cab824515387
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Jun 29 14:39:11 2011 +0800

    Document hashtable allocation/reffing

 goa-mc-plugin/mcp-account-manager-goa.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 0b4a5527117a282de064b0ea0a9bc920a1029dae
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Jun 14 18:37:30 2011 +0100

    Track accounts created and destroyed from GOA

 goa-mc-plugin/mcp-account-manager-goa.c | 34
 +++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

commit 56ad8aa9ae095378b17d9bea03dd3f41fab232e2
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Jun 14 18:28:54 2011 +0100

    Support launching GNOME Online Accounts in empathy-accounts

 libempathy-gtk/empathy-account-widget.c | 72
 +++++++++++++++++++++++++++++----
 1 file changed, 65 insertions(+), 7 deletions(-)

commit b2c74dfc9854df75ed63ccc9f8eeda6d3f6fc71b
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Jun 14 17:18:58 2011 +0100

    Initial work on a GNOME Online Accounts Mission Control plugin

 Makefile.am				 |   7 +-
 configure.ac				 |  31 +++
 goa-mc-plugin/Makefile.am		 |  18 ++
 goa-mc-plugin/mcp-account-manager-goa.c | 471
 ++++++++++++++++++++++++++++++++
 goa-mc-plugin/mcp-account-manager-goa.h |  60 ++++
 goa-mc-plugin/mission-control-plugin.c  |  48 ++++
 6 files changed, 634 insertions(+), 1 deletion(-)

commit 2d762527c1291c0a0fedcc2ab153d947b1876435
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Sep 5 23:29:57 2011 +0200

    Updated Spanish translation

 help/es/es.po | 171
 ++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 114 insertions(+), 57 deletions(-)

commit 4d64e1f05887e06f88d9599a24e0b259c1d5838d
Author: Ekaterina Gerasimova <kittykat3756@googlemail.com>
Date:	Mon Sep 5 20:32:57 2011 +0200

    help/share-desktop: Updated and improved wording

    Changed "desktop viewing application" to "desktop sharing application"
    when talking about a VNC server. Simplified language, improved grammar
    and word order.

 help/C/share-desktop.page | 56
 +++++++++++++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 21 deletions(-)

commit aae0b71cf6b97217175111c8af378bcccd05776b
Author: Hannie Dumoleyn <hannie@ubuntu-nl.org>
Date:	Mon Sep 5 20:01:38 2011 +0200

    Updated Dutch translation by Hannie Dumoleyn

 po/nl.po | 585
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 312 insertions(+), 273 deletions(-)

commit 601297c0ea82f38432445a2dc4a211cbdb98e915
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 17 17:49:39 2011 +0100

    EmpathyChat: add a 'Top up' link when there's not enough credit

    This is only added for Adium themes since ChatTextView ones don't
    support markup.

    Conflicts:

	libempathy-gtk/empathy-chat.c

 libempathy-gtk/empathy-chat.c | 50
 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 3 deletions(-)

commit d22e151a1880642b5b4ee06e8566727ddfe9a79c
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 17 16:35:21 2011 +0100

    EmpathyThemeAdium: implement append_event_markup

    Conflicts:

	libempathy-gtk/empathy-theme-adium.c

 libempathy-gtk/empathy-theme-adium.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit 6c8045628c9b9092e80aa0183d0e33798c37d661
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 17 16:34:55 2011 +0100

    Add empathy_chat_view_append_event_markup

    Conflicts:

	libempathy-gtk/empathy-chat-view.c
	libempathy-gtk/empathy-chat-view.h

 libempathy-gtk/empathy-chat-view.c | 16 ++++++++++++++++
 libempathy-gtk/empathy-chat-view.h |  6 ++++++
 2 files changed, 22 insertions(+)

commit 16e0d5a45bb1e11d57c4d5e512f021ebb6d2da12
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed May 25 09:56:23 2011 +0100

    Set a parent for the error dialog

    Conflicts:

	libempathy-gtk/empathy-new-message-dialog.c

 libempathy-gtk/empathy-new-message-dialog.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit 8f1fe631f8046ddeb0bd48d880176ed1f2048be9
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 24 16:28:03 2011 +0100

    NewMessageDialog: show an error if starting the channel fails

    Conflicts:

	libempathy-gtk/empathy-new-message-dialog.c

 libempathy-gtk/empathy-new-message-dialog.c | 79
 ++++++++++++++++++++++++++++-
 1 file changed, 77 insertions(+), 2 deletions(-)

commit b499944f633b2c8b5efd7c19b27399520c46ae66
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 24 16:23:22 2011 +0100

    empathy_dispatcher_chat_with_contact_id(): add optional cb

    Conflicts:

	libempathy-gtk/empathy-individual-menu.c
	libempathy-gtk/empathy-new-message-dialog.c
	libempathy/empathy-dispatcher.c
	libempathy/empathy-dispatcher.h
	src/empathy-chat-manager.c
	src/empathy-chat-window.c

 libempathy-gtk/empathy-chat.c		     |	6 ++++--
 libempathy-gtk/empathy-individual-menu.c    |	3 ++-
 libempathy-gtk/empathy-new-message-dialog.c |	6 ++++--
 libempathy/empathy-auth-factory.c	     |	4 +---
 libempathy/empathy-request-util.c	     | 26
 ++++++++++++++++++--------
 libempathy/empathy-request-util.h	     | 10 +++++++---
 src/empathy-chat-manager.c		     |	6 ++++--
 src/empathy-chat-window.c		     |	4 +++-
 8 files changed, 43 insertions(+), 22 deletions(-)

commit 2f9a520747ceacc89e5d6d923ed0cda8da22b95c
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Jun 3 11:30:07 2011 +0100

    CallWindow: correctly detect outgoing calls

 src/empathy-call-window.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit c6e11eb4767148a799ab565de508886ffa7fa86f
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Apr 15 18:12:59 2011 +0100

    Display an accurate error when not enough credit

 libempathy-gtk/empathy-call-utils.c | 2 ++
 1 file changed, 2 insertions(+)

commit 87842463373ddfbed87fdf27a617f1b35fb35d41
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Mar 22 19:57:25 2011 +0000

    Cope with gtk_icon_theme_lookup_icon returning NULL

 libempathy-gtk/empathy-ui-utils.c | 3 +++
 1 file changed, 3 insertions(+)

commit 832ab62ef5fd25ca11f9739f4caa4cac971fd42b
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Mar 10 16:50:39 2011 +0000

    Display Upgrade Software errors

    https://bugzilla.gnome.org/show_bug.cgi?id=644360

    Conflicts:

	libempathy/empathy-utils.c

 libempathy/empathy-utils.c |	2 +
 src/empathy-main-window.c  | 134
 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 136 insertions(+)

commit e01b2c3f1bbe994b1766709398d53611e30ee0ca
Author: Fran Dieguez <fran@openhost.es>
Date:	Sun Sep 4 18:46:02 2011 +0200

    Updated galician translations

 po/gl.po | 436
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 231 insertions(+), 205 deletions(-)

commit 177093d0b13b58d50094b273cb16d62b8e2bd41b
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Sun Sep 4 18:37:59 2011 +0300

    Updated Belarusian translation.

 po/be.po | 96
 ++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

commit 3db27cec190e8a7d13566d73d6eda04f9d99b5d0
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Sep 3 20:33:48 2011 +0200

    Updated Spanish translation

 help/es/es.po | 42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

commit d2467f4d3b989bb34ef35c16fd7cbdd57edf4161
Author: Shaun McCance <shaunm@gnome.org>
Date:	Sat Sep 3 13:49:07 2011 -0400

    help/irc-manage: Add install link for telepathy-idle

 help/C/irc-manage.page | 6 ++++++
 1 file changed, 6 insertions(+)

commit 22de94f978df78e8b83ad515a6d6c870049b116b
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Sep 1 13:55:38 2011 -0400

    main-window: add back the primary-toolbar hint

    https://bugzilla.gnome.org/show_bug.cgi?id=657956

 src/empathy-main-window.ui | 3 +++
 1 file changed, 3 insertions(+)

commit 55debdac5cb1a3a46a0c6e2bbc052e83f7e57f77
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Sep 1 12:26:29 2011 -0400

    log-window: add the "raised" style class to the account chooser

    So that it raises up from the toolbar below.

    https://bugzilla.gnome.org/show_bug.cgi?id=657954

 libempathy-gtk/empathy-log-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit f329a627ccf45954e06909dde3626fbe535cd440
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Fri Sep 2 20:59:27 2011 +0300

    Updated Belarusian translation.

 po/be.po | 367
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 196 insertions(+), 171 deletions(-)

commit 2ab17b3039eef2c93d6fce4c5bee5f452fa8e8c1
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Sep 2 12:43:29 2011 +0100

    Use format-justify-fill everywhere

    https://bugzilla.gnome.org/show_bug.cgi?id=657843

 libempathy-gtk/empathy-log-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit bc0ec088a254f7432a299ee0b1d4b634d771140e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Sep 1 11:18:08 2011 +0100

    LogWindow: fix toolbar icons

    https://bugzilla.gnome.org/show_bug.cgi?id=657843

 libempathy-gtk/empathy-log-window.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 24bc9e50cd9cdb73f9983e01988834e386f600fb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 1 16:01:37 2011 +0200

    log-window: align the account chooser and search widget

    Center the account chooser and align the search widget to the right
    of the
    toolbar.

    https://bugzilla.gnome.org/show_bug.cgi?id=657842

 libempathy-gtk/empathy-log-window.ui | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

commit 8d3d11d5e3866cf4cfd730af4252c10fdd5783ed
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 30 10:44:02 2011 +0200

    empathy_connection_can_*_personas: check if connection is connected

    https://bugzilla.gnome.org/show_bug.cgi?id=657266

 libempathy/empathy-utils.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 01086a035fcf1b128bd9547219aa00c8768e0118
Author: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Date:	Wed Aug 31 17:28:35 2011 +0100

    Fixes a segfault in empathy-individual-store.c

    When a contact cannot be obtained from an individual, icon_name and
    contact will be NULL, leading to g_hash_table_lookup for a NULL-value,
    segfaulting.

    Although there's probably an underlying error somewhere, the NULL case
    should be handled, being a valid return value for the method;

    https://bugzilla.gnome.org/show_bug.cgi?id=657914

 libempathy-gtk/empathy-individual-store.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 96a577f74ee233951f6b61b0fb8b1bbe70a1e12e
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:	Fri Sep 2 16:04:03 2011 +0530

    Updated Tamil translation

 po/ta.po | 2173
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1383 insertions(+), 790 deletions(-)

commit 5bc58b637fe191eabddef9517e4a810e6f667baa
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Sep 2 12:27:04 2011 +1000

    Remove control centre plugin

    GNOME no longer supports control centre plugins, and it was decided
    at the
    hackfest that empathy-accounts should not appear in the control
    centre.

 configure.ac			 |  41 -------
 src/Makefile.am		 |  31 -----
 src/cc-empathy-accounts-panel.c | 246
 ----------------------------------------
 src/cc-empathy-accounts-panel.h |  55 ---------
 src/empathy-accounts-module.c	 |  40 -------
 5 files changed, 413 deletions(-)

commit b1fcecccc0dc5d4cbbdc67baf00a8bbdce2781d4
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:	Fri Sep 2 05:40:36 2011 +0530

    Updated Tamil translation

 po/ta.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 078a23707194b9a1c21e42591a3a9732d46bb019
Author: Aurimas Černius <aurisc4@gmail.com>
Date:	Thu Sep 1 23:08:32 2011 +0300

    Updated Lithuanian translation

 po/lt.po | 1737
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 906 insertions(+), 831 deletions(-)

commit 9cabc4a14f2ffab0045c5a601e9b5c8eada11b71
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Thu Sep 1 23:41:58 2011 +0400

    Updated Russian translation

 po/ru.po | 401
 ++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 181 insertions(+), 220 deletions(-)

commit f26ba0c5b0883b2fb63c5fa59349540cf2e7f8de
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Aug 22 12:08:46 2011 -0400

    build: fix typo in configure summary

    Geocode support uses geocode-glib, not geoclue.

    https://bugzilla.gnome.org/show_bug.cgi?id=657087

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d3afcd73345ebda8e784df8b81edda8ccc5d7c24
Author: Daniel Nylander <po@danielnylander.se>
Date:	Thu Sep 1 12:47:59 2011 +0200

    Updated Swedish translation

 po/sv.po | 397
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 213 insertions(+), 184 deletions(-)

commit ac7803440e7d05e5e6f688c137ff738b760c261c
Author: Antonio Fernandes C. Neto <fernandesn@gnome.org>
Date:	Wed Aug 31 23:34:18 2011 -0400

    Updated Brazilian Portuguese translation.

 po/pt_BR.po | 385
 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 206 insertions(+), 179 deletions(-)

commit 73e8667395282bda229c900425221ee0f35560ab
Merge: 1da2ae6 e461080
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Sep 1 11:00:08 2011 +1000

    Merge branch 'timezones-656189'

commit 1da2ae694517fc48cb8e49d5a030a8d95554701d
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Wed Aug 31 21:24:27 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 363
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 194 insertions(+), 169 deletions(-)

commit fcd22fbdd8d4545b04e15f3bcb6e4384e7d0ded6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Aug 31 15:14:15 2011 +0100

    Correct grouping in the hostname regexp

    Correctly group our subregexp otherwise hostnames like the following
    won't be recognized due to the way things expand:
      a.com
      example.c-om

 libempathy-gtk/empathy-account-widget.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 022c807d5dee69a54c565051cea62571b29d3ebf
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 31 09:20:28 2011 +0100

    CallWindow: make video buttons unsensitive when video not supported

    If we're calling an audio-only contact, make the camera buttons
    unsensitive.

    https://bugzilla.gnome.org/show_bug.cgi?id=656871

 src/empathy-call-window.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 7da7c9f115124a274a8566a77624338816c641b3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 31 10:24:20 2011 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 21178340691a8b6a5f0963452f8a236f1adf5efc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 31 09:52:58 2011 +0200

    prepare 3.1.90.1

 NEWS	      | 19 +++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

commit 18009c7071732d29dd5a6eba8ef7f6b53c91e4d3
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Aug 31 09:34:12 2011 +0200

    build: use an autoconf macro to get to -lm

 configure.ac		| 3 +++
 libempathy/Makefile.am | 2 +-
 src/Makefile.am	| 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

commit e46108042c88db357d67d82184738f72ad76f4be
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Aug 31 13:13:16 2011 +1000

    Use g_date_time_new_from_unix_local() to read timestamps from logger

    g_date_time_new_from_unix_local() reads a Unix timestamp (which
    is defined
    to be in UTC) and sets the timezone for the GDateTime to be the
    local timezone.
    Thus when we format it, we get times in local time.

    g_date_time_new_from_unix_utc() is not correct, because it sets
    the timezone
    to UTC.

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=656189

 libempathy-gtk/empathy-log-window.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit e4041ce8c3d86e99d747c53012349baa83116d45
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Tue Aug 30 18:59:52 2011 +0200

    Updated Spanish translation

 po/es.po | 269
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 138 insertions(+), 131 deletions(-)

commit 61fd1d957fff26fa3b65c765faf0f7ead346f280
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 30 16:02:53 2011 +0100

    CallWindow: destroy the preview clone when restarting the pipeline

    https://bugzilla.gnome.org/show_bug.cgi?id=656886

 src/empathy-call-window.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

commit dd7043a57b488e1cac84c36fba72dea3d220ea41
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 30 13:25:35 2011 +0200

    Don't update presence on session changes if the Shell is running

    The Shell does it for us.

    https://bugzilla.gnome.org/show_bug.cgi?id=656631

 src/empathy.c | 47 +++++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

commit c079bd6891e308a63f9f920e9cbaf001e993f471
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 30 13:57:01 2011 +0200

    fix typo

 src/empathy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2d1cf80cf8ae0412eaf176c557f78f29ab8d4064
Author: Frédéric Péters <fpeters@0d.be>
Date:	Tue Aug 30 12:54:10 2011 +0200

    build: remove -enumtypes rules

 src/Makefile.am | 18 ------------------
 1 file changed, 18 deletions(-)

commit f1d4849c8003841b7d6aa6b2ed39faf029ac783a
Author: Frédéric Péters <fpeters@0d.be>
Date:	Tue Aug 30 12:53:34 2011 +0200

    build: add -lm where required

 libempathy/Makefile.am | 3 ++-
 src/Makefile.am	| 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit adb1971f4779df5e8b77b8fe7550ec8455aac8c7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 30 12:10:23 2011 +0200

    Don't set presence to offline when Shell is running

    https://bugzilla.gnome.org/show_bug.cgi?id=656632

 src/empathy.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit 5cdfd1e0d6c5df35f07530b9cdcdbd6c74d33247
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 30 10:37:29 2011 +0100

    CallWindow: don't spit unnecessary criticals

    There's no guarantee that an actor has an allocation all the time,
    so gracefully handle the case when it doesn't.

    https://bugzilla.gnome.org/show_bug.cgi?id=656911

 src/empathy-call-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 44f6461a975b9b2e309fae4ff052eb12df99704a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 30 09:00:06 2011 +0100

    Save the video preview position in gsettings

    And place it in the last used position when starting a new call.

    https://bugzilla.gnome.org/show_bug.cgi?id=656889

 data/org.gnome.Empathy.gschema.xml.in | 13 +++++++++++++
 src/empathy-call-window.c	       |  7 +++++++
 2 files changed, 20 insertions(+)

commit cd4cb2693bf0d46201971720cc9c6e4d70fbb8dc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 19 10:58:48 2011 +0100

    don't create the status icon if GNOME Shell is running

    https://bugzilla.gnome.org/show_bug.cgi?id=631944

 src/empathy.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

commit 30f02dbfe4f41a7307f26e125a0dfbe7c830f65d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 29 16:51:57 2011 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fe6a8678e1885b38ad7437436a1e5983aea2a8c7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 29 16:37:22 2011 +0200

    coding style fix

 libempathy-gtk/empathy-contact-list-store.c | 2 +-
 libempathy-gtk/empathy-individual-store.c   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 3101d1f584d3e26eaeb4e75b973010f92cea3823
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 29 16:19:45 2011 +0200

    prepare 3.1.90

 NEWS	      | 39 +++++++++++++++++++++++++++++++++++++++
 configure.ac |  6 +++---
 2 files changed, 42 insertions(+), 3 deletions(-)

commit 980148c26a52fb352ee165d7a46280172b49de96
Merge: d2d6157 be8a050
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 29 15:49:12 2011 +0200

    Merge branch 'account-widget-657616'

commit d2d6157547f7d386fea7721b4391b4d0c2b0d79b
Author: Alban Crequy <alban.crequy@collabora.co.uk>
Date:	Thu Aug 25 16:46:25 2011 +0100

    contact list: optimize loading contacts

    The previous algorithm was O(n^2) with the number of contacts. Each
    contact can
    be in several groups, so when a contact is added or updated, we
    iterated over
    all the contact list to find the rows representing the contact. When
    connecting
    to an account and getting all the contacts, this was too slow.

    The groups are stored in the GtkTreeStore and suffer from the same
    problem: to
    look for a group, it needed to iterate on all contacts.

    The new algorithm maintains a hash from the contact to the list
    of rows
    representing it, and another hash from the group to the row
    representing it.

    On Empathy 2.30.2 when tested on MeeGo with 300 contacts, loading
    the contacts
    is faster: roughly 9 seconds before the patch, 3 seconds after.

    On Empathy 3.1.5, it seems to load in background so I don't know
    how to measure
    the time lost in GtkTreeStore. But before the patch, GProf says 23%
    is lost in
    individual_store_find_contact_foreach(), and after the patch it is
    not visible
    anymore. And "time" says we win 5s of CPU when starting+quitting
    Empathy:

	  Before the patch:	   After the patch:
	  real	  0m23.485s	   real    0m23.460s
	  user	  0m13.805s	   user    0m8.305s
	  sys	  0m0.308s	   sys	   0m0.316s

    https://bugzilla.gnome.org/show_bug.cgi?id=657086

 libempathy-gtk/empathy-contact-list-store.c | 213
 ++++++++++++++--------------
 libempathy-gtk/empathy-individual-store.c   | 201
 ++++++++++++++------------
 2 files changed, 220 insertions(+), 194 deletions(-)

commit be8a050de04263d2a042c3ba00e5021570b7fcf0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 29 15:00:01 2011 +0200

    account-widget-local-xmpp: put all the labels in a GtkSizeGroup

    https://bugzilla.gnome.org/show_bug.cgi?id=657616

 libempathy-gtk/empathy-account-widget-local-xmpp.ui | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 6a818ee5aced7076786ba0a48a8f32b800b9a676
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Mon Aug 29 19:11:50 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1174
 ++++++++++++++++++++++++++++++++---------------------------
 po/zh_TW.po | 1174
 ++++++++++++++++++++++++++++++++---------------------------
 2 files changed, 1258 insertions(+), 1090 deletions(-)

commit 82b0217429316a92c4550d467ebf95d87c88fd7c
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Aug 29 13:04:22 2011 +0200

    Updated Spanish translation

 po/es.po | 83
 ++++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 49 insertions(+), 34 deletions(-)

commit 302ef589503e23da0b38a7c394884ea04d37979b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 29 10:29:18 2011 +0200

    contact-widget: use the day-selected sig to update birthday

    Having to double click on a day to update it was really confusing
    and most
    people (including me!) were just thinking that was not working.

 libempathy-gtk/empathy-contact-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2df03efb4efc73eb7e4209f9eadb10ff6d646a4b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 26 10:59:14 2011 +0200

    Allow to call phone number of contacts

    https://bugzilla.gnome.org/show_bug.cgi?id=650112

 libempathy-gtk/empathy-individual-menu.c | 207
 +++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-individual-menu.h |   3 +-
 libempathy/empathy-client-factory.c	  |   3 +
 3 files changed, 212 insertions(+), 1 deletion(-)

commit 41515259986697a443e892ad31043d2275915eea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 26 14:53:01 2011 +0200

    add EmpathyAccountSelectorDialog

    Dialog asking user to pick an account from a pre-defined list.

    https://bugzilla.gnome.org/show_bug.cgi?id=650112

 libempathy-gtk/Makefile.am			  |   2 +
 libempathy-gtk/empathy-account-selector-dialog.c | 198
 +++++++++++++++++++++++
 libempathy-gtk/empathy-account-selector-dialog.h |  68 ++++++++
 3 files changed, 268 insertions(+)

commit 04f88a3959838b95972664ce99cf24f94be06457
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 26 11:15:11 2011 +0200

    export empathy_account_has_uri_scheme_tel()

    https://bugzilla.gnome.org/show_bug.cgi?id=650112

 libempathy/empathy-account-settings.c | 26 ++++----------------------
 libempathy/empathy-utils.c	       | 19 +++++++++++++++++++
 libempathy/empathy-utils.h	       |  2 ++
 3 files changed, 25 insertions(+), 22 deletions(-)

commit 6dfd7204baa89c6eb3903753f45b7d416a93b112
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 29 11:32:36 2011 +0200

    chatroom_manager_parse_chatroom: check account path is valid

    https://bugzilla.gnome.org/show_bug.cgi?id=657362

 libempathy/empathy-chatroom-manager.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 46369eff9ef4bded8b8215c5900b10cc2fb0069a
Author: Fran Dieguez <fran@openhost.es>
Date:	Sun Aug 28 17:52:27 2011 +0200

    Updated galician translations

 po/gl.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 6e133dea9be47cbd49eaee291bfd41419e431f43
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Sun Aug 28 13:52:41 2011 +0200

    [l10n] Updated German translation

 po/de.po | 1628
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 882 insertions(+), 746 deletions(-)

commit a3d613974a9d702452f3e563b24405c219d22006
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Fri Aug 26 23:51:38 2011 +0400

    Updated Russian translation

 po/ru.po | 2260
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1427 insertions(+), 833 deletions(-)

commit abd933af3052cb371414fa640b3175a2720af91d
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Aug 26 21:24:31 2011 +0200

    Updated Spanish translation

 po/es.po | 112
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 59 insertions(+), 53 deletions(-)

commit 3000a3d49b6f0f8e1f2e364a780b75f01e0d8e6b
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Aug 26 13:48:57 2011 +0100

    Don't leak FDs when loading avatars.

    Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

 libempathy-gtk/empathy-ui-utils.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 7bae092e57e57103fa543d66c0bb11ac3ba4d43d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 26 12:19:08 2011 +0200

    Move the 'Show previous conversation' menu entry

    It used to be right in the middle of actions on the contact.

 libempathy-gtk/empathy-contact-menu.c	  | 14 +++++++-------
 libempathy-gtk/empathy-individual-menu.c | 16 ++++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)

commit 3e1f9c3f49a1b6b3e317d23958b5eaaf77c0b097
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Fri Aug 26 12:07:16 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 61b4787cb8b7037d7fe918bb6f8c231cf362273b
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Thu Aug 25 22:11:40 2011 +0200

    Fix unclear string in avatar chooser

	* Fix an unclear error string in the avatar chooser
	  when saving camera taken image to file.
	  Fixes bug #657166

 libempathy-gtk/empathy-avatar-chooser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fba9b2278337d7fc24446d1e3fb8d580891d9e35
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Thu Aug 25 19:14:14 2011 +0300

    Updated Belarusian translation.

 po/be.po | 4874
 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 3211 insertions(+), 1663 deletions(-)

commit 9dbb101d0ca44d6bff1bee75009fc14e0615aa1a
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Aug 25 16:26:30 2011 +0100

    Configure: produce useful dependency errors

    I discovered that PKG_CHECK_MODULES sets a variable if the
    dependencies
    aren't found containing the message it would have died with if you
    hadn't specified ACTION-IF-NOT-FOUND. So this gives us better output,
    without breaking opportunistically adding Call (etc.) support (as I
    did).

 configure.ac | 48 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 36 insertions(+), 12 deletions(-)

commit f3c4f721b13f08c81ff2c9efe5b0f91c07df6903
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Aug 25 16:17:11 2011 +0100

    Revert "configure: simplify error path in --enable-call"

    This reverts commit a7c8e72c9c4daa5a4830bad4ab6baa500106b3b4. It
    accidentally made not specifying an option equivalent to
    --enable-call.

 configure.ac | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit a7c8e72c9c4daa5a4830bad4ab6baa500106b3b4
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Aug 25 15:20:58 2011 +0100

    configure: simplify error path in --enable-call

    PKG_CHECK_MODULES raises a fatal error if you don't specify an
    ACTION-IF-NOT-FOUND, telling the developer which modules are
    missing. So
    we can simplify the configure script *and* give a more helpful error
    message.

 configure.ac | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit ec7580263da08c3301d44335f001d4914d6854e7
Author: Og B. Maciel <ogmaciel@gnome.org>
Date:	Thu Aug 25 09:13:53 2011 -0400

    Updated Brazilian Portuguese translation.

 po/pt_BR.po | 1124
 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 597 insertions(+), 527 deletions(-)

commit 05175cbebfb7d4dee0b55d24ed46e921b8256e0c
Author: Raluca Elena Podiuc <ralucaelena1985@gmail.com>
Date:	Thu Aug 25 13:02:12 2011 +0300

    src: install empathy-main-window-menubar.ui

    empathy-main-window-menubar.ui was added in this commit:

       1ad15d157971b6550cb11787a03463e891d29364 is the first bad commit
       commit 1ad15d157971b6550cb11787a03463e891d29364
       Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
       Date:   Tue Aug 23 14:08:18 2011 +0200

	  Move main window's UI manager to its own UI file

	  Glade doesn't support GtkUIManager so it was impossible to edit
	  the main window at all because of that.

    But was not marked to be installed.

    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=657271

 src/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit 4cdd02a73bd9f10d6427afc6979371f2207e9073
Author: Fran Dieguez <fran@openhost.es>
Date:	Wed Aug 24 21:18:03 2011 +0200

    Updated Galician translations

 po/gl.po | 709
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 365 insertions(+), 344 deletions(-)

commit 7bc4d0c51423617ef6b41e81ced8471c464d6456
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Aug 24 19:51:34 2011 +0200

    Updated Spanish translation

 po/es.po | 646
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 328 insertions(+), 318 deletions(-)

commit 84e5d3835a98335372a6c058103f8e7d8b46519a
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Wed Aug 24 18:52:00 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

commit 34444b9a90be269af9d7af39ca064741de2123a5
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Aug 24 11:25:11 2011 +0200

    Do not auto-accept publish requests if contact is not subscribed

    Fixes bug #657173

 libempathy/empathy-tp-contact-list.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 96d638486a06118b91086f00d3a6b9d89eb8d445
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 24 13:53:05 2011 +0200

    account-widget-sip: add option to mark account as being able to
    call phones

    https://bugzilla.gnome.org/show_bug.cgi?id=657220

 libempathy-gtk/empathy-account-widget-sip.c  | 22 ++++++++++++++++++++++
 libempathy-gtk/empathy-account-widget-sip.ui | 19 ++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

commit 1363e49db79f64f85b7cdd4fe273896a9228c619
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 24 10:34:56 2011 +0200

    widget-sip: load/save file in Glade

    No change has been done, this is just to keep commits simpler.

    https://bugzilla.gnome.org/show_bug.cgi?id=657220

 libempathy-gtk/empathy-account-widget-sip.ui | 91
 ++++++++++++++++++++++------
 1 file changed, 73 insertions(+), 18 deletions(-)

commit fe4fd76aebe8faea1e7f16215cac005e5017a155
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 24 13:52:23 2011 +0200

    account-widget: add empathy_account_widget_get_settings()

    https://bugzilla.gnome.org/show_bug.cgi?id=657220

 libempathy-gtk/empathy-account-widget.c | 8 ++++++++
 libempathy-gtk/empathy-account-widget.h | 3 +++
 2 files changed, 11 insertions(+)

commit 1ef053f46e31460f8f128621690a967e2ca08fc6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 24 13:51:12 2011 +0200

    account-settings: add API to set 'tel' in the URISchemes property
    of the account

    https://bugzilla.gnome.org/show_bug.cgi?id=657220

 libempathy/empathy-account-settings.c | 65
 +++++++++++++++++++++++++++++++++++
 libempathy/empathy-account-settings.h |  6 ++++
 2 files changed, 71 insertions(+)

commit ff4c2d1b2504826b405d2c6846c0a6087320380d
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Wed Aug 24 16:13:21 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 673
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 340 insertions(+), 333 deletions(-)

commit 4b2400798cf3468196fdc1680d37a8474129df13
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Wed Aug 24 12:12:33 2011 +0300

    Updated Hebrew translation.

 po/he.po | 405
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 211 insertions(+), 194 deletions(-)

commit 0b92f77d8d32ddb96515abe5a1619acb9f55db11
Author: Daniel Nylander <po@danielnylander.se>
Date:	Wed Aug 24 09:15:00 2011 +0200

    Updated Swedish translation

 po/sv.po | 1215
 ++++++++++++++++++++++++++------------------------------------
 1 file changed, 515 insertions(+), 700 deletions(-)

commit 57075092737c287010e1a2435bf1b1c1839101a5
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:	Tue Aug 23 23:42:52 2011 +0100

    libempathy-gtk: Explicitly close the input stream used for reading
    avatars

    Due to a missing unref in GIO, the input stream is leaked by
    GFileIcon, so
    if we rely on its FD being implicitly closed when the stream is
    finalised,
    we'll end up leaking (lots of) file descriptors.

    As well as fixing the unref in GIO (see: bgo#657206), we now
    explicitly
    close the input stream so that even if the stream object is leaked,
    the FD
    isn't.

    Closes: bgo#656682

 libempathy-gtk/empathy-ui-utils.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit 4fd99e6dc16c26656d43296f2b3104dac3f9e45b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 23 15:01:45 2011 +0200

    main-window.ui: load and save the file in Glade

    No change has been made, this is just to reduce the size of diff
    in future
    commits.

 src/empathy-main-window.ui | 164
 +++++++++++++++++++++++----------------------
 1 file changed, 83 insertions(+), 81 deletions(-)

commit 1ad15d157971b6550cb11787a03463e891d29364
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 23 14:08:18 2011 +0200

    Move main window's UI manager to its own UI file

    Glade doesn't support GtkUIManager so it was impossible to edit the
    main window at all
    because of that.

 po/POTFILES.in			    |	1 +
 src/empathy-main-window-menubar.ui | 307
 ++++++++++++++++++++++++++++++++++++
 src/empathy-main-window.c	    |  31 +++-
 src/empathy-main-window.ui	    | 309
 -------------------------------------
 4 files changed, 331 insertions(+), 317 deletions(-)

commit a54170335d7c6246f1606347ed109e682c883927
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 23 15:59:08 2011 +0200

    main-window: remove the throbber tooltip

    Clicking on it doesn't open the accounts dialog any more.

    https://bugzilla.gnome.org/show_bug.cgi?id=657105

 src/empathy-main-window.c | 1 -
 1 file changed, 1 deletion(-)

commit d74b1775e5f237869bdc2177064ea82aa370ac42
Author: Alban Crequy <alban.crequy@collabora.co.uk>
Date:	Tue Aug 23 13:58:21 2011 +0100

    geocode: fix uninitialized variable (-Werror=uninitialized)

 libempathy/empathy-contact.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ec1594416d7fc29c7baeeb10f7645934a9679bb5
Author: Alban Crequy <alban.crequy@collabora.co.uk>
Date:	Mon Aug 22 16:57:52 2011 +0100

    Add a configure option for GProf

    It should help to investigate
    https://bugzilla.gnome.org/show_bug.cgi?id=657086

 configure.ac | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 20a005394616e171ab3c7a974122bfa01df426a2
Merge: 2c55a1a 8854564
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Aug 23 09:31:28 2011 +0100

    Merge branch 'search-bar'

commit 2c55a1ac6432591d45dc396e8353b6840eedb5b8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 23 10:13:53 2011 +0200

    widget-irc: quit message entry shouldn't be invisible

    https://bugzilla.gnome.org/show_bug.cgi?id=657104

 libempathy-gtk/empathy-account-widget-irc.ui | 3 ---
 1 file changed, 3 deletions(-)

commit 266c56fd9d092259c0c58fa9c23afce841bd6779
Author: Wouter Bolsterlee <wbolster@gnome.org>
Date:	Mon Aug 22 22:15:14 2011 +0200

    Updated Dutch translation by Wouter Bolsterlee

 po/nl.po | 305
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 159 insertions(+), 146 deletions(-)

commit 885456479f37aa5aa500361bef33ac3dd746428a
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Mon Aug 22 16:51:01 2011 +0100

    search-bar: shorten labels to just Next & Previous

    The verb, "Find", is already present on the left of the entry.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-search-bar.ui | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 6df8cf14b3b25782ce5437ae0e26e0726da1daa2
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Mon Aug 22 16:50:51 2011 +0100

    search-bar: use smaller icons

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-search-bar.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 64e2c818c7faead9671d959a87d60ce92c082ab1
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Mon Aug 22 16:25:49 2011 +0100

    search-bar: make close button non-important stock gtk-close

    This has the much nicer side-effect that if it gets thrown off the
    side because it doesn't have enough room, the icon and label will be
    shown in the expander.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-search-bar.ui | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 78265c9fd2f7526876c1418b80dda44d96f6c644
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Mon Aug 22 16:25:02 2011 +0100

    search-bar: move close button to RHS

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-search-bar.ui | 33
 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

commit 3be11adb859eb5ec1a2f2a850e8277c73e5aa814
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Aug 22 16:16:20 2011 +0200

    EmpathyChatWindow: Set "im.received" on notification so gnome-shell
    can ignore it

 src/empathy-chat-window.c | 4 ++++
 1 file changed, 4 insertions(+)

commit f60338e75ad72300e1f93ea38ce17284d50d698c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 22 15:11:22 2011 +0200

    contact_set_avatar_from_tp_contact: don't crash if we failed to load
    the avatar

    https://bugzilla.gnome.org/show_bug.cgi?id=656829

 libempathy/empathy-contact.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 4c534b01f55b25442d8399db4a610a3e1982daa9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 22 13:02:42 2011 +0200

    Move live search to top of Contact list

    https://bugzilla.gnome.org/show_bug.cgi?id=656999

 src/empathy-main-window.c  |  5 ++++-
 src/empathy-main-window.ui | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

commit 0e13467ea1c89322c2eab94c230193d5163a4856
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Tue Feb 15 17:28:09 2011 +0200

    Freenode has added 6697 to the list of SSL ports

    The list of servers and port numbers for Freenode are given at:
    http://freenode.net/irc_servers.shtml

    Fixes: https://bugzilla.gnome.org/642385

 libempathy/irc-networks.xml | 1 +
 1 file changed, 1 insertion(+)

commit d1efd59bfbb620fa7531726f6b473880a3c485a7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 22 12:09:19 2011 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9a70028671636681ff16ccb288e3d02fb90b807b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 22 12:04:27 2011 +0200

    add empathy-webkit-utils.c to POTFILES.in

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit 8cd279f2dd43b31409a396549195a4144b54c695
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 22 11:50:35 2011 +0200

    prepare 3.1.5.1

 NEWS	      | 43 +++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 45 insertions(+), 2 deletions(-)

commit 2e4efa578faaebb0ef45606080d3586e8e2e739f
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Mon Jun 27 21:29:31 2011 -0700

    Don't assume that all FolksIndividuals have a corresponding
    EmpathyContact.

    Closes: bgo#653599 - Empathy shouldn't assume all TpfPersonas
    contain a
    valid TpContact

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-individual-store.c | 39
 ++++++++++++++++++-------------
 libempathy-gtk/empathy-individual-view.c  |  3 ++-
 2 files changed, 25 insertions(+), 17 deletions(-)

commit d1d3a49fc919ed734b77a6e94afb2d49109182f2
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Mon Jun 27 14:31:25 2011 -0700

    Don't assume that all TpfPersonas contain valid TpContacts

    Helps: bgo#653599 - Empathy shouldn't assume all TpfPersonas contain a
    valid TpContact

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-individual-dialogs.c |	 3 +
 libempathy-gtk/empathy-individual-menu.c    |	34 +++++----
 libempathy-gtk/empathy-individual-store.c   |	57 +++++++++------
 libempathy-gtk/empathy-individual-widget.c  |	46 ++++++++----
 libempathy-gtk/empathy-persona-store.c      | 106
 +++++++++++++++++-----------
 libempathy-gtk/empathy-persona-view.c	     |	11 ++-
 libempathy/empathy-contact.c		     |	 3 +
 libempathy/empathy-individual-manager.c     |	52 ++++++++------
 libempathy/empathy-utils.c		     |	 7 +-
 9 files changed, 203 insertions(+), 116 deletions(-)

commit 358fab1eb85cecb34ca45f492be2e623ab443a5e
Merge: 64cc7e6 fb1f95d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Aug 22 09:02:54 2011 +0100

    Merge remote-tracking branch 'pochu/preview-position'

commit 64cc7e6fe9b37afbc55fe0c5166132e32ac3f994
Merge: 18f318c 569c338
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Aug 22 09:01:59 2011 +0100

    Merge remote-tracking branch 'pochu/request-message'

commit 18f318c2dc698f416fc9a05587908fa5eb3f96d1
Author: Aron Xu <aronxu@gnome.org>
Date:	Sun Aug 21 15:57:31 2011 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po | 780
 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 400 insertions(+), 380 deletions(-)

commit 569c3381242efcb5bc7966825023e890965c0b62
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jun 8 09:55:08 2011 +0100

    Hide the request message entry if it can't be used

    https://bugzilla.gnome.org/show_bug.cgi?id=656934

 libempathy-gtk/empathy-contact-search-dialog.c | 38
 ++++++++++++++++++++------
 1 file changed, 30 insertions(+), 8 deletions(-)

commit 82600285342927b40d8a7b72f0b559b4b14d01a3
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jun 8 09:54:30 2011 +0100

    EmpathyContactListFlags: add _MESSAGE_ADD flag

    https://bugzilla.gnome.org/show_bug.cgi?id=656934

 libempathy/empathy-contact-list.h    | 1 +
 libempathy/empathy-tp-contact-list.c | 4 ++++
 2 files changed, 5 insertions(+)

commit 138759c101a9dd03db74d082d58c43e252e96217
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jun 6 17:13:32 2011 +0100

    Set the scrolled window shadow type to Etched in

    https://bugzilla.gnome.org/show_bug.cgi?id=656934

 libempathy-gtk/empathy-contact-search-dialog.c | 2 ++
 1 file changed, 2 insertions(+)

commit 6afea914d5c915cde2fc3bf660441d8417ffcede
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jun 1 17:26:36 2011 +0100

    Allow to specify the subscription request message

    https://bugzilla.gnome.org/show_bug.cgi?id=656934

 libempathy-gtk/empathy-contact-search-dialog.c | 37
 +++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

commit fb1f95dfba027a0cb62bf94b77a429c5809f47fc
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Aug 19 20:01:43 2011 +0100

    CallWindow: correctly position the preview when dragging

    https://bugzilla.gnome.org/show_bug.cgi?id=656887

 src/empathy-call-window.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 129f902925f603c163dc66757faf4d22632efe9e
Author: Laurent Bigonville <bigon@bigon.be>
Date:	Fri Aug 19 14:55:25 2011 +0200

    Fix call-event.h detection

    Correctly set the LDFLAGS from EMPATHY_LDFLAGS so AC_CHECK_HEADER can
    find call-event.h

    https://bugzilla.gnome.org/show_bug.cgi?id=656908

 configure.ac | 3 +++
 1 file changed, 3 insertions(+)

commit 376c8299f4c69345fd783b20a8f2f4d8827551bb
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Aug 19 13:01:59 2011 +0100

    CameraMenu: don't change the device if it's the current one

    https://bugzilla.gnome.org/show_bug.cgi?id=656885

 src/empathy-camera-menu.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit 09b8172fb599c1a5dd1971eb4501304915034112
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Aug 19 13:42:54 2011 +0100

    Flip the preview in RoundedTexture->paint()

    We can't flip the preview clone that we're dragging because
    of https://bugzilla.gnome.org/show_bug.cgi?id=656894, so
    directly paint it flipped.

    Partly fixes: https://bugzilla.gnome.org/show_bug.cgi?id=656887

 src/empathy-call-window.c     | 19 -------------------
 src/empathy-rounded-texture.c |  4 ++++
 2 files changed, 4 insertions(+), 19 deletions(-)

commit cf84d9a8617e31a5b0a51ed5d56df661ec8f1ede
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Aug 19 12:16:05 2011 +0100

    CallWindow: make the preview button reactive

    So it reacts to click events. Otherwise the video preview,
    which is reactive, will get all the events.

    https://bugzilla.gnome.org/show_bug.cgi?id=656888

 src/empathy-call-window.c | 1 +
 1 file changed, 1 insertion(+)

commit b9582cf3bee2de40dc4dbb9b73e0c2d998e25875
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 19 12:20:02 2011 +0200

    contact-chooser: use tp_connection_get_account()

    https://bugzilla.gnome.org/show_bug.cgi?id=656866

 libempathy-gtk/empathy-contact-chooser.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

commit 010b9fefd050ad4d4c2627cad084b55573a455a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 19 12:12:22 2011 +0200

    main-window: use tp_connection_get_account()

    https://bugzilla.gnome.org/show_bug.cgi?id=656866

 src/empathy-main-window.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

commit 7684cbad9c0b6f0ac8b9640b1b74e0dafc058e84
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Aug 18 18:14:27 2011 +0100

    Reset all the necessary elements when switching cameras

    https://bugzilla.gnome.org/show_bug.cgi?id=656579

 src/empathy-camera-menu.c | 2 ++
 src/empathy-video-src.c   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

commit 508b2cd4c64f2a1786a5e969bec208cb867ceb5e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Aug 18 18:13:56 2011 +0100

    CallWindow: make empathy_call_window_play_camera() public

    https://bugzilla.gnome.org/show_bug.cgi?id=656579

 src/empathy-call-window.c | 8 ++++----
 src/empathy-call-window.h | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

commit 08af50eabef5f5a18ced797fd2fd967c08a13198
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 17 13:21:40 2011 +0100

    CallWindow: make the rectangles have rounded corners

    https://bugzilla.gnome.org/show_bug.cgi?id=656576

 src/empathy-call-window.c | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

commit c1eb12ebde6572a01744a8120440e630c8920d3a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 17 13:20:29 2011 +0100

    Add a rectangle actor with rounded corners

    This is a ClutterCairoTexture subclass and uses Cairo for
    drawing as Cairo is antialiased while Cogl is not.

    https://bugzilla.gnome.org/show_bug.cgi?id=656576

 src/Makefile.am		 |   2 +
 src/empathy-rounded-rectangle.c | 133
 ++++++++++++++++++++++++++++++++++++++++
 src/empathy-rounded-rectangle.h |  75 ++++++++++++++++++++++
 3 files changed, 210 insertions(+)

commit b11d6d385735ef43450271d7f07604448f751ce2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 17 12:36:13 2011 +0100

    CallWindow: make the info buttons rounded

    https://bugzilla.gnome.org/show_bug.cgi?id=656576

 src/empathy-call-window.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

commit 46958ec5bbd485a9875047c367d32deb8ba0aa54
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 17 12:20:43 2011 +0100

    CallWindow: round the video preview corners

    https://bugzilla.gnome.org/show_bug.cgi?id=656576

 src/empathy-call-window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit df6a08ae4314e831b437a88edd14c4d8e4eb61c4
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 17 12:20:20 2011 +0100

    Add a ClutterTexture subclass with rounded corners

    https://bugzilla.gnome.org/show_bug.cgi?id=656576

 src/Makefile.am	       |  2 ++
 src/empathy-rounded-texture.c | 69
 +++++++++++++++++++++++++++++++++++++++++++
 src/empathy-rounded-texture.h | 63
 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 134 insertions(+)

commit 2a15005b42394c72c7c883aa9beff4f8f87b8e26
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Aug 19 09:55:04 2011 +0100

    CallWindow: don't hide the toolbar when not in a call

    https://bugzilla.gnome.org/show_bug.cgi?id=656566

 src/empathy-call-window.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit 335d9576a93088c11a44de1cdb9c3884a285d95e
Merge: fb56e32 6b35d5c
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Aug 19 17:33:42 2011 +1000

    Merge branch 'trivia'

commit fb56e32dcdc0ad78c59c3d34d500a24c954a6ab0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 18 17:29:56 2011 +0200

    rely on the factory to prepare TP_CONNECTION_FEATURE_BALANCE

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy/empathy-client-factory.c |	3 +++
 src/empathy-main-window.c	     | 36
 ++++++++----------------------------
 2 files changed, 11 insertions(+), 28 deletions(-)

commit 3f96f6d69d75bef18d372c26df40ab3bbd3628fe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 18 17:20:51 2011 +0200

    tp-chat: rely on the factory to prepare
    TP_CONNECTION_FEATURE_CAPABILITIES

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy/empathy-tp-chat.c | 48
 ++++++++++++--------------------------------
 1 file changed, 13 insertions(+), 35 deletions(-)

commit c9b5bba619706d6b1a45654f845e7722870a25df
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 18 17:17:49 2011 +0200

    new-message-dialog: rely on the factory to prepare
    TP_CONNECTION_FEATURE_CAPABILITIES

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy-gtk/empathy-new-message-dialog.c | 55
 ++++++-----------------------
 1 file changed, 11 insertions(+), 44 deletions(-)

commit 686b4e258c29a7adde96606474e81929d62976b1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 18 16:20:44 2011 +0200

    ft-handler: rely on the factory to prepare
    TP_CONNECTION_FEATURE_CAPABILITIES

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy/empathy-ft-handler.c | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

commit 3370401046e7233a98afbe528e9a936fdad18b18
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 18 16:13:10 2011 +0200

    new-call-dialog: rely on the factory to prepare
    TP_CONNECTION_FEATURE_CAPABILITIES

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy-gtk/empathy-new-call-dialog.c | 61
 +++++++++-----------------------
 1 file changed, 17 insertions(+), 44 deletions(-)

commit a87c7313fa5fca97265a533b5613726c5958e9bd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 18 18:07:12 2011 +0200

    individual-widget: rely on the factory to prepare
    TP_CONNECTION_FEATURE_CONTACT_INFO

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy-gtk/empathy-individual-widget.c | 96
 +++++++++++-------------------
 1 file changed, 35 insertions(+), 61 deletions(-)

commit c428f8a475111473ea9a9dc246ca1d2312f41d8c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 18 14:06:14 2011 +0200

    contact-widget: rely on the factory to prepare
    TP_CONNECTION_FEATURE_CONTACT_INFO

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy-gtk/empathy-contact-widget.c | 16 ++++++----------
 libempathy/empathy-client-factory.c	 |  3 +++
 2 files changed, 9 insertions(+), 10 deletions(-)

commit 8b69b96e01c9b11ac779dcce99c21a1aa7fba7a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 18 13:58:53 2011 +0200

    contact-search-dialog: rely on the factory to prepare
    TP_CONNECTION_FEATURE_AVATAR_REQUIREMENTS

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy-gtk/empathy-contact-search-dialog.c | 60
 +++++---------------------
 1 file changed, 10 insertions(+), 50 deletions(-)

commit 7cbbd2ee8253dfd69994d83e0dfe1a63c7ca4fd0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 18 12:29:27 2011 +0200

    avatar-chooser: rely on the factory to prepare
    TP_CONNECTION_FEATURE_AVATAR_REQUIREMENTS

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy-gtk/empathy-avatar-chooser.c | 6 +-----
 libempathy/empathy-client-factory.c	 | 3 +++
 2 files changed, 4 insertions(+), 5 deletions(-)

commit 5a3861854b566ba034bf9ddc2fd581185dcc2ef1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 18 12:28:05 2011 +0200

    account-chooser: rely on the factory to prepare
    TP_CONNECTION_FEATURE_CAPABILITIES,

    Also simplify empathy_account_chooser_filter_supports_chatrooms in the
    process.

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy-gtk/empathy-account-chooser.c | 55
 +++++++-------------------------
 1 file changed, 11 insertions(+), 44 deletions(-)

commit 5f8f65f8c95b7c01138992190b559e00b0790962
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 18 17:42:39 2011 +0200

    ask factory to prepare TP_ACCOUNT_FEATURE_CONNECTION

    So we can rely on the connection returned by
    tp_account_get_connection() to be
    usable right away.

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy/empathy-client-factory.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit 6b35d5c27162fdf750a6d1e193e31e51dfe225dd
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Aug 19 17:26:08 2011 +1000

    [log-window] Change Quit for Close

 libempathy-gtk/empathy-log-window.c  | 6 +++---
 libempathy-gtk/empathy-log-window.ui | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

commit 8cfb78f8251e9cdd663bc92b7cf4e0ce00f0d9e3
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Thu Aug 18 23:42:36 2011 +0300

    Updated Hebrew translation.

 po/he.po | 620
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 320 insertions(+), 300 deletions(-)

commit 19ce5d04599b6425b59aac6ce0ef4850cfdc9059
Author: Hannie Dumoleyn <hannie@ubuntu-nl.org>
Date:	Thu Aug 18 22:37:30 2011 +0200

    Updated Dutch translation by Hannie Dumoleyn

 po/nl.po | 1239
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 692 insertions(+), 547 deletions(-)

commit d7650c7ac5c90a7ad615196a8fcef05cafc7a2d6
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	Thu Aug 18 19:28:15 2011 +0200

    Updated Slovenian translation

 po/sl.po | 46 ++++------------------------------------------
 1 file changed, 4 insertions(+), 42 deletions(-)

commit ddc5879579652ace80965450d98178771a18b210
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Aug 18 12:38:52 2011 +0100

    CallWindow: hide the preview button while dragging it

    https://bugzilla.gnome.org/show_bug.cgi?id=656573

 src/empathy-call-window.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 33dab5dcf04b0f979c91e65373c9a7d89da014b3
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Aug 18 12:34:05 2011 +0100

    CallWindow: hide the preview while dragging it

    We show a clone of it moving through the stage, so there's no
    point in showing the main preview at the same time.

    https://bugzilla.gnome.org/show_bug.cgi?id=656573

 src/empathy-call-window.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 3f60db5fb3b3c80440d381e3a8fc1a52e1da700a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Aug 18 12:02:55 2011 +0100

    CallWindow: flip the dragged preview

    Currently disabled as it doesn't work as expected.

    https://bugzilla.gnome.org/show_bug.cgi?id=656573

 src/empathy-call-window.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit fe5db93073fa90597d86ae9d1500a6abaf49f3ae
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 17 19:03:24 2011 +0100

    CallWindow: make the preview follow the pointer when dragging it

    https://bugzilla.gnome.org/show_bug.cgi?id=656573

 src/empathy-call-window.c | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

commit aba9ae9e811e5cb65745f16450c547362595330c
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Aug 18 16:19:38 2011 +0100

    Don't install Call service files if empathy-call is not built

 data/Makefile.am | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

commit fb90ae1ed068d4f0f0972b886cb8d1f643bf2f9f
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 17 16:28:39 2011 +0100

    mic-monitor: add set_default function

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-mic-monitor.c | 64
 +++++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-mic-monitor.h |  5 ++++
 2 files changed, 69 insertions(+)

commit e5cd9e64870fbca5bc57d205ba4fe9aadb726614
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 17 15:59:29 2011 +0100

    mic-monitor: add get_default function

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-mic-monitor.c | 58
 +++++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-mic-monitor.h |  5 ++++
 2 files changed, 63 insertions(+)

commit a719df5e3df6a31d0e629516cffcdfca9436e5ae
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 17 16:04:30 2011 +0100

    mic-menu: don't show the menu if we can't switch microphones

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-mic-menu.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 9a93b2732802719b6263b1d314252c7df9c62c1a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 17 16:01:01 2011 +0100

    audio-src: make supports_changing_mic public

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-audio-src.c | 2 +-
 src/empathy-audio-src.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

commit cd40005a5e9608fa8e1295b8606788af38100dba
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 17 15:55:32 2011 +0100

    mic-monitor: move the PA-specific stuff from audio-src to here

    Sorry for another big commit.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/Makefile.am	   |   6 +-
 src/empathy-audio-src.c   | 396 +++++---------------------------
 src/empathy-audio-src.h   |  13 --
 src/empathy-mic-menu.c    |  27 ++-
 src/empathy-mic-monitor.c | 566
 ++++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-mic-monitor.h |  80 +++++++
 6 files changed, 724 insertions(+), 364 deletions(-)

commit 956bfcb33c33452f4ce958ae0a7112efb5ccf4a9
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Aug 18 15:56:40 2011 +0100

    chatroom-manager: removed set and unused priv variable

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-chatroom-manager.c | 3 ---
 1 file changed, 3 deletions(-)

commit 9ddd25f8589ae0cd5ec8e09c4c012e4ccac6a416
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 18 11:31:10 2011 +0200

    Port to new tp-glib client factory

    - EmpathyChannelFactory has been changed to EmpathyClientFactory
    and inherit
    from TpAutomaticClientFactory.
    - We now always use the _with_am variant of TpSimple* constructors
    - We define our own factory as default.
    - Replace empathy_get_account_for_connection() by
    tp_connection_get_account()
    - The factory is passed to EmpathyTpChat and TpyCallChannel
    - Use tp_simple_client_factory_ensure_account() instead of
    tp_account_manager_ensure_account().
    - Rely on the factory to prepare connection features.

    This should ensure that all the TpProxy and TpContact objects
    created in
    Empathy are shared and use EmpathyClientFactory.

    https://bugzilla.gnome.org/show_bug.cgi?id=655799

 libempathy-gtk/empathy-contact-list-view.c |  13 ++-
 libempathy-gtk/empathy-log-window.c	    |  17 +--
 libempathy/Makefile.am			    |	4 +-
 libempathy/empathy-channel-factory.c	    | 163
 --------------------------
 libempathy/empathy-channel-factory.h	    |  58 ---------
 libempathy/empathy-chatroom-manager.c	    |  39 +++----
 libempathy/empathy-client-factory.c	    | 181
 +++++++++++++++++++++++++++++
 libempathy/empathy-client-factory.h	    |  56 +++++++++
 libempathy/empathy-contact.c		    |	2 +-
 libempathy/empathy-ft-factory.c	    |  15 +--
 libempathy/empathy-message.c		    |  12 +-
 libempathy/empathy-tp-chat.c		    |	5 +-
 libempathy/empathy-tp-chat.h		    |	4 +-
 libempathy/empathy-utils.c		    |  40 ++-----
 libempathy/empathy-utils.h		    |	2 -
 src/empathy-call-factory.c		    |  22 +---
 src/empathy-call-handler.c		    |	7 --
 src/empathy-call-observer.c		    |  21 +---
 src/empathy-chat-manager.c		    |  29 +----
 src/empathy-chat-window.c		    |  14 ++-
 src/empathy-event-manager.c		    |  30 +----
 src/empathy-streamed-media-factory.c	    |  15 +--
 tests/empathy-chatroom-manager-test.c	    |  10 +-
 23 files changed, 329 insertions(+), 430 deletions(-)

commit 7fbf3e0c200b0a3c5086fdce0cc19afe48c429bb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 18 10:01:54 2011 +0200

    Depend on telepathy-glib 0.15.5

    Needed for new factory API.

    https://bugzilla.gnome.org/show_bug.cgi?id=655799

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c99e88c23e6a55d5ad43aa6d0239ccbfff23e8af
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 18 10:09:58 2011 +0200

    update git ignore with new build system

 .gitignore    |  2 ++
 m4/.gitignore | 30 +++++++++++++++++++++++++++++-
 po/.gitignore |  7 +++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

commit ecf2cb496e3815a0b54270888e0710b20b47ba0d
Author: A S Alam <aalam@users.sf.net>
Date:	Thu Aug 18 06:44:02 2011 +0530

    update translation for Punjabi

 po/pa.po | 1128
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 594 insertions(+), 534 deletions(-)

commit 2021c145e0c5eb6aa9eda91d58d54b13007113ad
Merge: d3e8563 dc7080f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Aug 18 10:10:00 2011 +1000

    Merge branch 'log-window-webview'

commit d3e8563fe9b3d3c0b5ee5f225964b8078e18d1e6
Author: Fran Dieguez <fran@openhost.es>
Date:	Thu Aug 18 02:00:25 2011 +0200

    Updated Galician translations

 help/gl/gl.po | 4319
 +++++++++++++++------------------------------------------
 1 file changed, 1142 insertions(+), 3177 deletions(-)

commit 96174dd10b0fd5f43656d582d5ecb2b4877641a8
Author: Javier Jardón <jjardon@gnome.org>
Date:	Tue Aug 16 17:21:14 2011 +0100

    configure.ac: Generate xz tarballs with ustar format by default

 configure.ac | 6 +++---
 release.py   | 7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

commit 12b920d355e4a8be744cd820dcbf2354f7cd6d49
Author: Javier Jardón <jjardon@gnome.org>
Date:	Tue Aug 16 17:19:04 2011 +0100

    configure.ac: Use upstream gettext instead the glib one

 configure.ac | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 641eee8befe742a34cd872fc1378cce99622fd90
Author: Javier Jardón <jjardon@gnome.org>
Date:	Tue Aug 16 17:18:03 2011 +0100

    build: Update autotools config a bit

    Replace deprecated autoconf macros
    Use new libtool syntax

 Makefile.am  |  2 +-
 configure.ac | 41 ++++++++++++++++++++++++++---------------
 2 files changed, 27 insertions(+), 16 deletions(-)

commit dc7080f5071a9130bbd9288b50f807b41a5f9864
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Aug 17 15:44:22 2011 +1000

    Use context menu utility in log viewer

 libempathy-gtk/empathy-log-window.c | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

commit 1ba7c298c282b4775c29c80214009876e943648d
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Aug 17 15:37:09 2011 +1000

    Factor out WebKit context menu as a utility

 libempathy-gtk/empathy-theme-adium.c  | 121
 +-----------------------------
 libempathy-gtk/empathy-webkit-utils.c | 136
 ++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-webkit-utils.h |   6 ++
 3 files changed, 145 insertions(+), 118 deletions(-)

commit 434e50f056b8f3cb5043bf478f2716d7bc2c4cad
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Aug 17 01:45:28 2011 +0200

    Updated Spanish translation

 po/es.po | 375
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 201 insertions(+), 174 deletions(-)

commit afe59f99f61e73298c7020b4eb36e16152df08e7
Author: Fran Dieguez <fran@openhost.es>
Date:	Tue Aug 16 19:17:27 2011 +0200

    Updated Galician translations

 po/gl.po | 390
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 208 insertions(+), 182 deletions(-)

commit 8e1fa68d047f6e05145815490d37eaaa5c18ec8a
Author: Andika Triwidada <andika@gmail.com>
Date:	Tue Aug 16 21:44:12 2011 +0700

    Updated Indonesian translation

 po/id.po | 2869
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1557 insertions(+), 1312 deletions(-)

commit 04fb4922da622924282b8a6321587b89e1168aaf
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Tue Aug 16 16:40:39 2011 +0200

    Updated Norwegian bokmål translation.

 po/nb.po | 382
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 205 insertions(+), 177 deletions(-)

commit 3b7cad12fe7c90afee27e25b97a748e3195d5e88
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 16 15:26:44 2011 +0100

    CallWindow: move preview rectangles on top of remote video

 src/empathy-call-window.c | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

commit 775cada033b7430eadee1dedbef519c584b1f81b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 16 16:31:50 2011 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 87ccb908bf268d2807fd7680c09725d614264d2c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 16 14:51:05 2011 +0200

    prepare 3.1.5

 NEWS	      | 60
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 62 insertions(+), 2 deletions(-)

commit c4cfe9bec8232e6265c507135fcf94947c485083
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 16 14:50:06 2011 +0200

    coding style fix

 src/empathy-preferences.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c613ffe9a51cd7cf7abe6c412cda534db5fc42a3
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 8 12:11:19 2011 +0100

    CallWindow: add some padding to the dialpad

 src/empathy-call-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e239157c776847fc577662752a5b49cd559b4a38
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 16 12:56:12 2011 +0100

    Use AC_ARG_ENABLE with --enable-*

 configure.ac | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit 31ff17d78a1ab727dad9ed67e4ed6948ff118966
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 16 12:34:19 2011 +0100

    CallWindow: fix typo

    https://bugzilla.gnome.org/show_bug.cgi?id=656571

 src/empathy-call-window.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

commit c469fd154c871be294b4dd1f0ddffacf112ef454
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 16 00:09:13 2011 +0100

    Don't show empathy-call preferences when not building empathy-call

    https://bugzilla.gnome.org/show_bug.cgi?id=656582

 src/empathy-preferences.c  | 9 +++++++++
 src/empathy-preferences.ui | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

commit 897bfbce7f3333362e2dd16bb5e4986aa8fa64cd
Merge: b5f6788 6ac9f42
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Aug 16 12:21:58 2011 +0100

    Merge branch 'blockade'

    https://bugzilla.gnome.org/show_bug.cgi?id=656167

commit b5f6788106bbd8c3e06fef09edb533812114afa7
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 16 01:02:18 2011 +0100

    Get the preview position from preview_pos

    Getting it from the coordinates might fail if the system
    is too slow and gives us bad coordinates.

    https://bugzilla.gnome.org/show_bug.cgi?id=656572

 src/empathy-call-window.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit f513e634f70f65fb5d3cc947ef139a89ac98f4b4
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 16 00:44:46 2011 +0100

    Add some space between the status and the end of the toolbar

    https://bugzilla.gnome.org/show_bug.cgi?id=656571

 src/empathy-call-window.ui | 6 ++++++
 1 file changed, 6 insertions(+)

commit d7c83fa38cb8ce5f60e8fc7a8781ddc1f21a5acc
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 16 00:41:56 2011 +0100

    Display the preview video button in the preview corner

    https://bugzilla.gnome.org/show_bug.cgi?id=656571

 src/empathy-call-window.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit 3a9a3210bbf8e927ef64510d066c035aa60a8a50
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:	Sun Jul 24 17:05:15 2011 +0100

    Bug 655212 — Update for libfolks API changes to AvatarDetails

    Folks' AvatarDetails.avatar is now a GLoadableIcon rather than
    a GFile.
    Closes: bgo#655212

    https://bugzilla.gnome.org/show_bug.cgi?id=655212

 configure.ac			   |   2 +-
 libempathy-gtk/empathy-ui-utils.c | 140
 +++++++++++++++++++++++++++-----------
 2 files changed, 102 insertions(+), 40 deletions(-)

commit ede83c3b09c25b9e08c0aa54d842d844b582e0d8
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Aug 16 16:15:38 2011 +1000

    Allow clicking on a row to select the contact

    Does not currently highlight the row.

 data/empathy-log-window.html	     |	26 ++++++++-
 libempathy-gtk/empathy-log-window.c | 112
 ++++++++++++++++++++++++++----------
 2 files changed, 108 insertions(+), 30 deletions(-)

commit 9d1f95bebe28683a23f56568539ee2c56655b80c
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Aug 16 13:55:56 2011 +1000

    Reimplement scrollToRow

    N.B. This has not been properly tested, because I'm not actually
    sure how to
    exhaust this codepath.

 data/empathy-log-window.html	     | 25 +++++++++++++++++++++++++
 libempathy-gtk/empathy-log-window.c | 37
 +++++++++++++++++++++++--------------
 2 files changed, 48 insertions(+), 14 deletions(-)

commit 6cf57d879945059cd974a3ee6d02d81edff47438
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Aug 16 13:38:23 2011 +1000

    Make WebKit compulsory

    It is now required for the log viewer, furthermore it will be
    required once
    we remove non-adium themes.

 configure.ac				| 28 ++-----------------------
 libempathy-gtk/Makefile.am		| 37
 ++++++++++------------------------
 libempathy-gtk/empathy-log-window.c	|  1 -
 libempathy-gtk/empathy-theme-manager.c | 21 -------------------
 src/Makefile.am			|  5 +----
 src/empathy-preferences.c		|  7 -------
 6 files changed, 14 insertions(+), 85 deletions(-)

commit 4c885dc6363f2eea8a23611a994ce8a88d4675be
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 15 15:19:10 2011 +0200

    audio-sink: check if sink implements the GstStreamVolume interface

 src/empathy-audio-sink.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit f30d87c84aa426407521c619702277de754e4bb5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 15 15:13:27 2011 +0200

    manually build the GstStructure

 libempathy-gtk/empathy-call-utils.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

commit 0294f04c51a60c155e20a4e5210a8ddd69358ba9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 15 14:59:41 2011 +0200

    Get the env variable in create_{src,sink} directly

 src/empathy-audio-sink.c | 7 +++++--
 src/empathy-audio-src.c  | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

commit 5cf00f4b947ee9ff59abb4e0054bb54449cde916
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 15 12:27:22 2011 +0200

    Enable echo cancellation if needed

 libempathy-gtk/empathy-call-utils.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

commit 4121205c56393f8d51d59237adb001c108628365
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 15 12:15:25 2011 +0200

    Add Echo cancellation preference

 data/org.gnome.Empathy.gschema.xml.in |  5 +++++
 libempathy/empathy-gsettings.h        |  1 +
 src/empathy-preferences.c	       |  8 ++++++++
 src/empathy-preferences.ui	       | 13 +++++++++++++
 4 files changed, 27 insertions(+)

commit be5274444c54eb5c529e592d130e362fd1728b4d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 15 11:23:35 2011 +0200

    Use gst_parse_bin_from_description() when EMPATHY_AUDIO_* vars are set

    Also factor out empathy_call_set_stream_properties().

 libempathy-gtk/empathy-call-utils.c | 11 +++++++++
 libempathy-gtk/empathy-call-utils.h |	4 ++++
 src/empathy-audio-sink.c	     | 47
 +++++++++++++++++++++++++------------
 src/empathy-audio-src.c	     | 47
 ++++++++++++++++++++++++++-----------
 4 files changed, 80 insertions(+), 29 deletions(-)

commit 7e9166e6711d15a28bb679a1aeed3223134f2388
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 15 11:04:24 2011 +0200

    Set stream-properties on GStreamer elements to set the media role

 src/empathy-audio-sink.c | 10 ++++++++++
 src/empathy-audio-src.c  |  9 +++++++++
 src/empathy-av.c	  |  1 -
 src/empathy-call.c	  |  1 -
 4 files changed, 19 insertions(+), 2 deletions(-)

commit 8f7a0a9cce1f8e08d4a50cc181d8a11ce3b48ec1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 15 09:44:28 2011 +0200

    Use pulesink as audio sink

    As we did for puslesrc, this can still be overriden with an env
    variable for
    debuging purposes.

    Relying on pulse allows us to remove all the software volume control
    logic.

 src/empathy-audio-sink.c | 245
 ++++++++---------------------------------------
 1 file changed, 40 insertions(+), 205 deletions(-)

commit 80c90eb2c847fe095eca1f741a4cfa772ec388a8
Merge: d6be6c7 aeb15b7
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 15 13:32:40 2011 +0100

    Merge branch 'move-video-preview-656268'

commit d6be6c7eb33dbd96e4c8f72369b9a9816fc23492
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 15 12:07:47 2011 +0100

    CameraMenu: don't crash if there are no cameras

 src/empathy-camera-menu.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 9a592ec3ab386ef2f959fb9737ab85c760c03324
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 15 11:33:25 2011 +0100

    CameraMenu: use empathy_camera_monitor_new()

    We want to get a new object so that we get ::added upon
    construction for all the cameras. With _dup_singleton() we may
    get an existing object, which would have already fired the
    initial set of ::added signals.

 src/empathy-camera-menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 624bbe7ac793e34aa9b0db0122b973eadd218770
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 15 11:29:59 2011 +0100

    CameraMonitor: add empathy_camera_monitor_new()

    Which doesn't return a singleton but a new object.

 libempathy/empathy-camera-monitor.c | 48
 +++++++++++++++++--------------------
 libempathy/empathy-camera-monitor.h |	1 +
 2 files changed, 23 insertions(+), 26 deletions(-)

commit b01f42247694b992c91fefab5c70acdfa3770051
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 15 11:15:40 2011 +0100

    CameraMenu: select the first camera if the last one isn't available

 src/empathy-camera-menu.c | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

commit 64b8693b800d880aee7f16e5b353f239a24e02fa
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 15 11:06:51 2011 +0100

    CameraMonitor: dynamically-allocate the queue

 libempathy/empathy-camera-monitor.c | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

commit 0e00979f11c465a755b9dd29b2247a8f3ec1c51d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 2 12:34:55 2011 +0100

    CallWindow: add a 'Swap camera' item to the preview menu

 src/empathy-call-window.c  | 69
 ++++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-call-window.ui |  8 ++++++
 2 files changed, 77 insertions(+)

commit 25504e2ad3be8e09f12fe9d712be67af11d0c605
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 2 10:01:46 2011 +0100

    CameraMenu: restore the last selected camera on creation

 src/empathy-camera-menu.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 919c1868d7fff7d74ca3fc17f24a6cbaa3e097de
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 2 09:53:23 2011 +0100

    CameraMenu: track changes to the camera key

    And store changes from the menu itself in GSettings.

 src/empathy-camera-menu.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

commit 1c67fe35b022071ff9c5af15a54e8cd495ea3280
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 2 09:52:36 2011 +0100

    Add a GSettings key for the default camera

 data/org.gnome.Empathy.gschema.xml.in | 5 +++++
 libempathy/empathy-gsettings.h        | 1 +
 2 files changed, 6 insertions(+)

commit c9883b1b7038306e88877a4998226412c23ed55c
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 1 17:29:22 2011 +0100

    CallWindow: add a menu to change the camera

    https://bugzilla.gnome.org/show_bug.cgi?id=599167

 src/Makefile.am	    |	2 +
 src/empathy-call-window.c  |  18 ++-
 src/empathy-call-window.h  |	2 +
 src/empathy-call-window.ui |  14 ++
 src/empathy-camera-menu.c  | 331
 +++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-camera-menu.h  |  56 ++++++++
 6 files changed, 417 insertions(+), 6 deletions(-)

commit aed7faf9c81e1ca54398d16988b890322bf09889
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 1 17:27:47 2011 +0100

    VideoSrc: add API to get the input device

 src/empathy-video-src.c | 11 +++++++++++
 src/empathy-video-src.h |  1 +
 2 files changed, 12 insertions(+)

commit 2f459725f01467f9352335024b4b51e02fe73a59
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 1 13:14:09 2011 +0100

    VideoSrc: add API to change the input device

 src/empathy-video-src.c | 13 +++++++++++++
 src/empathy-video-src.h |  3 +++
 2 files changed, 16 insertions(+)

commit 37b150da114880f2af274733ba32580d0a90902f
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 1 12:46:03 2011 +0100

    VideoSrc: use v4l2src instead of gconfvideosrc

 src/empathy-video-src.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9ee3b4ee8188f9ab48823c404f7d138acc517b02
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 1 12:05:46 2011 +0100

    CameraMonitor: add ::added and ::removed signals

 libempathy/empathy-camera-monitor.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

commit 2ea5aa82155ce47ca9a91f5fa1a97b0610a487a3
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 2 11:11:19 2011 +0100

    CameraMonitor: make EmpathyCamera a boxed type

 libempathy/empathy-camera-monitor.c | 9 +++++++++
 libempathy/empathy-camera-monitor.h | 3 +++
 2 files changed, 12 insertions(+)

commit ab58c837e285f16b639444865c47c0bc286ed4e7
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 1 11:58:03 2011 +0100

    CameraMonitor: add API to get all cameras

 libempathy/empathy-camera-monitor.c | 71
 +++++++++++++++++++++++++++++++++++++
 libempathy/empathy-camera-monitor.h |	9 +++++
 2 files changed, 80 insertions(+)

commit aeb15b72319f26a86ab30236013a11e6a611e05c
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 15 12:58:48 2011 +0100

    Don't define the same thing twice

 src/empathy-call-window.c | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

commit f682f5076d65a3cc582493d340f409153503f9fe
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 15 12:56:45 2011 +0100

    CallWindow: add extra bottom margin for the floating toolbar

    Otherwise the rectangles will be on top of the toolbar.

 src/empathy-call-window.c | 46
 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 14 deletions(-)

commit 253837eb32f9fb2ab2b6cd8e60fb8880d04ba016
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Aug 12 16:51:45 2011 +0100

    CallWindow: create the rectangles after the avatar

    As we want them to be on top of the avatar when they're shown.

 src/empathy-call-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 5e685d03af4b3f278236c27420a12302ea76e736
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Aug 12 16:34:28 2011 +0100

    empathy-call: add COGL and Clutter option groups

 src/empathy-call.c | 4 ++++
 1 file changed, 4 insertions(+)

commit f0eb3e344d09a63de219f71df85cbc2c8135cbd8
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 10 11:10:14 2011 +0100

    Use self->priv->preview_pos to determine the preview position

    https://bugzilla.gnome.org/show_bug.cgi?id=656268

 src/empathy-call-window.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 4966277ef79ce962260764ed32408b5c1c73ddb9
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 10 10:37:46 2011 +0100

    Darken the rectangles when starting a drag operation

    So that if we have just dragged it, the rectangle where
    it was before isn't highlighted.

    https://bugzilla.gnome.org/show_bug.cgi?id=656268

 src/empathy-call-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 724eac592d90da4e169adb7b675845650d9d770b
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 10 10:32:09 2011 +0100

    Don't darken the preview when dragging it

    https://bugzilla.gnome.org/show_bug.cgi?id=656268

 src/empathy-call-window.c | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

commit ca2cb730d68620a638ef41d09cd25984e6cb4008
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 10 10:27:10 2011 +0100

    Highlight the preview when hovered

    https://bugzilla.gnome.org/show_bug.cgi?id=656268

 src/empathy-call-window.c | 43
 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

commit c0a10ef3094f82a9d0532e942b0b27d7f34f0201
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 10 10:16:40 2011 +0100

    Factor out empathy_call_window_darken_preview_rectangle

    https://bugzilla.gnome.org/show_bug.cgi?id=656268

 src/empathy-call-window.c | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

commit 30d64de5341a8701ddfd3be24071846de82e121f
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 10 10:14:25 2011 +0100

    Factor out empathy_call_window_get_preview_rectangle

    https://bugzilla.gnome.org/show_bug.cgi?id=656268

 src/empathy-call-window.c | 46
 ++++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)

commit 2848d12da55d0c4c9016d8f355ed9d1343e0f2e7
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 10 10:13:13 2011 +0100

    Move empathy_call_window_get_preview_position around

    https://bugzilla.gnome.org/show_bug.cgi?id=656268

 src/empathy-call-window.c | 84
 +++++++++++++++++++++++------------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

commit 47f4a650200c9692f4b5e480b60f28ab309aecb4
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 9 16:16:13 2011 +0100

    CallWindow: highlight drop zones when hovered

    https://bugzilla.gnome.org/show_bug.cgi?id=656268

 src/empathy-call-window.c | 85
 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)

commit c3b3b11b227dd8add44c83c264b79b8c9168f94d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 9 15:34:44 2011 +0100

    Factor out empathy_call_window_get_preview_position()

    https://bugzilla.gnome.org/show_bug.cgi?id=656268

 src/empathy-call-window.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

commit 9fba3fff14e9628c46f667ca1022e0af46693cb2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 9 14:01:40 2011 +0100

    CallWindow: show drop zones when dragging the preview

    https://bugzilla.gnome.org/show_bug.cgi?id=656268

 src/empathy-call-window.c | 85
 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)

commit 6526ece345726300c7ab0c2b3c46c4bd2795a6ed
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 8 17:54:50 2011 +0100

    CallWindow: allow to move the video preview

    https://bugzilla.gnome.org/show_bug.cgi?id=656268

 src/empathy-call-window.c | 103
 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)

commit e5658d67a38612c727091d7e91f9477333047870
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 8 16:15:05 2011 +0100

    CallWindow: add top and right margin to the preview container

    So that when it's placed on another corner, it still has some
    margin.

    https://bugzilla.gnome.org/show_bug.cgi?id=656268

 src/empathy-call-window.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit c5426c1a22ed0f16bd742bda88fb8a6740f2c9ee
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 9 10:54:16 2011 +0100

    empathy-call: call gdk_disable_multidevice()

    Clutter needs this, and gtk_clutter_init() calls it, but
    g_option_context_parse() initializes GTK+ when parsing
    GTK+ options so it's too late for us then.

    https://bugzilla.gnome.org/show_bug.cgi?id=656268

 src/empathy-call.c | 3 +++
 1 file changed, 3 insertions(+)

commit 6881301b5474f90a297b07aa63156d71171f2621
Merge: 8153737 0bfcc41
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 15 11:55:44 2011 +0100

    Merge branch 'clutter-toolbar'

commit 81537370686d895951625498a7c2b21d854bc384
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Aug 12 17:45:50 2011 +0100

    CallWindow: get the mic volume upon init

    Otherwise it'll be zero and when we unmute the mic, we'll
    set the volume to zero as we won't know the old value.

    https://bugzilla.gnome.org/show_bug.cgi?id=656415

 src/empathy-call-window.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 7660dd99c14c92e097eceade559297b8d569e34d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Aug 12 14:45:50 2011 +0100

    CallWindow: fix toggling the microphone on and off

    We are changing the GSettings key, and also listening to changes
    on it and reacting to them, but we don't want to react to our own
    changes!

    https://bugzilla.gnome.org/show_bug.cgi?id=656415

 src/empathy-call-window.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

commit 8263f671cd8a38e6e0259e50610bca20cab2e19f
Author: Ngô Chin <ndtrung4419@gmail.com>
Date:	Sat Aug 13 09:56:17 2011 +0700

    Updated Vietnamese translation

 po/vi.po | 602
 ++++++++++++++++++++++++++-------------------------------------
 1 file changed, 248 insertions(+), 354 deletions(-)

commit 8280cb539675088f1aff1950c173c6efe41af6cd
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:	Thu Aug 4 09:21:15 2011 +0700

    po/vi.po: import from Damned Lies

 po/vi.po | 2126
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1366 insertions(+), 760 deletions(-)

commit c406ac51c0290f4c35a2037d9f06c14ab485937a
Author: Arash Mousavi <amousavi@src.gnome.org>
Date:	Sat Aug 13 02:45:21 2011 +0430

    Updated Persian translation

 po/fa.po | 2063
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1310 insertions(+), 753 deletions(-)

commit 0bfcc411b56b617a1b80589a7f686e506496b259
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Aug 12 14:32:53 2011 +0100

    Update the constraint when the stage allocation changes

    Instead of when the box does, to avoid a warning.

 src/empathy-call-window.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit 46e0d580594711e418517c2fb355247129b256f2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Aug 12 14:19:01 2011 +0100

    CallWindow: raise the toolbar when showing the preview

    So that one can click the toolbar buttons.

 src/empathy-call-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 6662829273d54e291e90490fdaca8df4e2f6eab7
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Aug 12 13:57:55 2011 +0100

    CallWindow: make the preview margin a define

 src/empathy-call-window.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 1ad217678f139258b4e1e17768afa7738fcd1fdf
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 8 12:27:44 2011 +0100

    Move the video preview up

    So it's not on top of the floating toolbar.

    https://bugzilla.gnome.org/show_bug.cgi?id=656150

 src/empathy-call-window.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 64cc0a8dee6e2cc1543522d42121e3c51bb92979
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 8 10:08:00 2011 +0100

    Make the floating toolbar have rounded corners

    https://bugzilla.gnome.org/show_bug.cgi?id=656150

 src/empathy-call-window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 973617fcf740560ccd6c61bf3d63657d0875191c
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 8 10:03:40 2011 +0100

    Add a GtkClutterActor subclass that clips the corners

    https://bugzilla.gnome.org/show_bug.cgi?id=656150

 src/Makefile.am	     |	4 ++-
 src/empathy-rounded-actor.c | 68
 +++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-rounded-actor.h | 63
 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 134 insertions(+), 1 deletion(-)

commit bb86b135b0a6df4657105d8e78d64b363d4ac292
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jul 28 11:42:47 2011 +0100

    CallWindow: show the toolbar when on fullscreen

    And also hide it after 3s of inactivity.

    https://bugzilla.gnome.org/show_bug.cgi?id=656150

 src/empathy-call-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit b5ff8b1df70a7c9eee4364b7aa2aacd6a3b9ec6a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jul 28 11:29:13 2011 +0100

    CallWindow: hide the toolbar after 3s of inactivity

    https://bugzilla.gnome.org/show_bug.cgi?id=656150

 src/empathy-call-window.c | 66
 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

commit f18a045b7da82147d7b7c5c3c2dc0418b7241160
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Aug 5 10:17:09 2011 +0100

    CallWindow: make the toolbar float inside the window

    https://bugzilla.gnome.org/show_bug.cgi?id=656150

 src/empathy-call-window.c  | 55
 ++++++++++++++++++++++++++++++++++++++++++----
 src/empathy-call-window.ui | 19 ++++++++++------
 2 files changed, 63 insertions(+), 11 deletions(-)

commit 1560313cdfafa660b7400f44217a8741785e3103
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Aug 12 12:21:45 2011 +0200

    Properly check if the backlog flag is set

    The backlog flag should be TRUE or FALSE, so the check for the flag
    should result in either of those two values, not some other non-false
    value

 libempathy/empathy-message.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit d5024011258a052ea3b88e95d0098f3901bb98cc
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Aug 12 08:47:48 2011 +1000

    Style fix

 libempathy-gtk/empathy-log-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 685bb62da9769032c883cebfe7fb5aa2c0e94f83
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Aug 12 08:43:05 2011 +1000

    Remove some commented-out debugging

 data/empathy-log-window.html | 6 ------
 1 file changed, 6 deletions(-)

commit 3dfc7d6b26f17b0b00762b3fe7b509d7be73b30f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Aug 12 08:42:04 2011 +1000

    Remove unused variable

 libempathy-gtk/empathy-log-window.c | 2 --
 1 file changed, 2 deletions(-)

commit 18dca3647b1b179bfc83269934f08a91f5e422df
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Wed Aug 10 15:16:20 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 792
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 422 insertions(+), 370 deletions(-)

commit 257b17688d9a2ca20d24800d34e9d2cda7bab740
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 8 11:34:26 2011 +0100

    LogWindow: don't crash if there are logs from the future

    https://bugzilla.gnome.org/show_bug.cgi?id=656065

 libempathy-gtk/empathy-log-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e9ba3819abea368201c6f8bd90ccfb134fc6e445
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Aug 8 11:58:06 2011 +0100

    CallWindow: don't set the title for multiple participants

    We don't support that yet, the string is wrong, and
    priv->contact can't be NULL anyway.

    https://bugzilla.gnome.org/show_bug.cgi?id=655478

 src/empathy-call-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit dab1360f7fbbec5237a038022671532012cdae92
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	Tue Aug 9 20:16:37 2011 +0200

    Updated Slovenian translation

 help/sl/sl.po | 53 -----------------------------------------------------
 1 file changed, 53 deletions(-)

commit dccd3368d1ee4d4cf4c96628f81ba4bd184e7461
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Aug 9 14:44:04 2011 +1000

    Remove old code

 libempathy-gtk/empathy-log-window.c | 15 ---------------
 1 file changed, 15 deletions(-)

commit a5992fcfddf42b53ef8d6446b824780512f529b9
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Aug 9 14:37:16 2011 +1000

    Set the primary toolbar style

 libempathy-gtk/empathy-log-window.ui | 3 +++
 1 file changed, 3 insertions(+)

commit 14ccd126b65741b4e5f9575cc0ddd6d371d40b9d
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Aug 9 14:32:30 2011 +1000

    Toggle the expander on row double click

 data/empathy-log-window.html | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

commit 14899f2d17dd5943b28fb83e79aa998125159fff
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Aug 9 14:21:35 2011 +1000

    Add icons to the new log viewer

 data/empathy-log-window.html	     | 26 ++++++++++++++++++++++----
 libempathy-gtk/empathy-log-window.c | 22 ++++++++++++++++++++--
 2 files changed, 42 insertions(+), 6 deletions(-)

commit 4133101266b116d34b04a69e9957c0502daf72e8
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Aug 9 14:05:28 2011 +1000

    Add dates to new log viewer

 data/empathy-log-window.html	     | 14 ++++++++++----
 libempathy-gtk/empathy-log-window.c |	9 ++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

commit 356bb4555e3d1eacd8115cb8a8f0c91483055a52
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Aug 9 11:50:33 2011 +1000

    Use the same font-setting utility for empathy-theme-adium

 libempathy-gtk/empathy-theme-adium.c | 77
 +++++++-----------------------------
 1 file changed, 15 insertions(+), 62 deletions(-)

commit a23b86b6a47b06cc9b37cafd892b73229c2d97d3
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Aug 9 11:41:11 2011 +1000

    Use this utility in the log viewer

    It should also be used for the Adium theme, but this also supports
    fonts
    specified in the Adium theme, which we need to support.

 data/empathy-log-window.html	     | 7 +++++--
 libempathy-gtk/empathy-log-window.c | 9 +++++++++
 libempathy/empathy-gsettings.h      | 1 +
 3 files changed, 15 insertions(+), 2 deletions(-)

commit 3b97f8064e775fd770188b4f186da95706e205f8
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Aug 9 11:40:53 2011 +1000

    Utility to set the webkit default font/size from GSettings

 libempathy-gtk/empathy-webkit-utils.c | 73
 +++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-webkit-utils.h |  4 ++
 2 files changed, 77 insertions(+)

commit 6ac9f42fa93a79064c4b69828cc8354114f1b2f0
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Mon Aug 8 23:46:55 2011 +0200

    tests: simplify running blocking dialog

    This is reminiscent of 8f42bd4.

 tests/interactive/test-empathy-contact-blocking-dialog.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

commit 0f7e44ae1ea5a497083dc0982626b7f2cea7d36a
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Mon Aug 8 23:43:42 2011 +0200

    Blocking: don't critical if ContactBlockingCapabilities is missing

    Haze has a deny list, and ostensibly implements ContactBlocking, but
    doesn't really implement that property.  Naughty Haze hackers. They
    should be blocked.

 libempathy/empathy-tp-contact-list.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

commit 5bc1c756d01ac49513534b302238da7558f0d607
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Mon Aug 8 18:06:19 2011 +0200

    Blocking dialog: use a sensible default size

    This is the same area as is used for the custom status dialog's
    scrolled
    window. The content area turns out very slightly smaller, because the
    area includes the tree view's header.

 libempathy-gtk/empathy-contact-blocking-dialog.ui | 2 ++
 1 file changed, 2 insertions(+)

commit 75e1fbc9e330e16c48a835e4f73d468b00c7b5b5
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Mon Aug 8 18:04:47 2011 +0200

    Blocking dialog: Gnome 3-ify Remove button

 libempathy-gtk/empathy-contact-blocking-dialog.c  | 12 +++++++++++-
 libempathy-gtk/empathy-contact-blocking-dialog.ui | 21
 +++++++++++----------
 2 files changed, 22 insertions(+), 11 deletions(-)

commit 5846186ace8c9e513aef0eb5ec9f13a61cdb4424
Author: Daniel Nylander <po@danielnylander.se>
Date:	Mon Aug 8 08:22:55 2011 +0200

    Updated Swedish translation

 po/sv.po | 263
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 139 insertions(+), 124 deletions(-)

commit daae637bdf6ea311c306eefe298e5760e2af22dc
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Aug 8 11:15:06 2011 +1000

    Reimplement log_window_maybe_expand_events()

 data/empathy-log-window.html	     | 19 +++++++++++++++++++
 libempathy-gtk/empathy-log-window.c | 15 ++++++---------
 2 files changed, 25 insertions(+), 9 deletions(-)

commit c6837f3edb97b06d1aff8e4300d58653b9484713
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Aug 8 11:14:49 2011 +1000

    Factor out toggleExpander()

 data/empathy-log-window.html | 43
 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

commit 956d62f58fe91fae0d23073a94817ba49cb67849
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Sun Aug 7 18:33:45 2011 +0200

    Updated Spanish translation

 po/es.po | 233
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 122 insertions(+), 111 deletions(-)

commit 7424ac01d5010aaa101c2b5841daf840b4d0e20c
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Sun Aug 7 13:17:31 2011 +1000

    Remove treeview_events -- make the webview the only viewing component

    Still some commented out code to reimplement.

 libempathy-gtk/empathy-log-window.c  | 166
 ++++++++++++-----------------------
 libempathy-gtk/empathy-log-window.ui |   9 --
 2 files changed, 58 insertions(+), 117 deletions(-)

commit b66006f0aec620e60118442d9a6ba831f8498bf0
Author: Fran Dieguez <fran@openhost.es>
Date:	Sat Aug 6 21:59:56 2011 +0200

    Updated Galician translations

 po/gl.po | 1027
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 555 insertions(+), 472 deletions(-)

commit d288c06f151f808ddad326ba5d85d74e8de76ec0
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Sat Aug 6 15:51:39 2011 +0300

    Updated Hebrew translation.

 po/he.po | 801
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 424 insertions(+), 377 deletions(-)

commit 8e839c45aea812bef072cc3365c58f366adc104e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 5 12:08:20 2011 +0200

    EmpathyContactChooser: remove EmpathyTpChat property

    It's not used any more and a generic widget shouldn't need it.

    https://bugzilla.gnome.org/show_bug.cgi?id=656020

 libempathy-gtk/empathy-contact-chooser.c | 61
 +-------------------------------
 libempathy-gtk/empathy-contact-chooser.h |  2 +-
 src/empathy-invite-participant-dialog.c  |  2 +-
 3 files changed, 3 insertions(+), 62 deletions(-)

commit 508d001793fdcb91dc6305c547a9b2f205acdad1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 5 12:00:31 2011 +0200

    Implement TpContact selection in EmpathyInviteParticipantDialog

    https://bugzilla.gnome.org/show_bug.cgi?id=656020

 libempathy-gtk/empathy-contact-chooser.c | 57
 ++------------------------------
 libempathy-gtk/empathy-contact-chooser.h |  2 +-
 src/empathy-invite-participant-dialog.c  | 12 ++++++-
 3 files changed, 15 insertions(+), 56 deletions(-)

commit 3aa8239213c026f5b09d50669f7a4a65c9906659
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 5 11:57:25 2011 +0200

    Implement filtering logic in EmpathyInviteParticipantDialog

    https://bugzilla.gnome.org/show_bug.cgi?id=656020

 libempathy-gtk/empathy-contact-chooser.c | 67 ++++++++--------------
 libempathy-gtk/empathy-contact-chooser.h | 11 ++++
 src/empathy-invite-participant-dialog.c  | 96
 ++++++++++++++++++++++++++++++++
 3 files changed, 131 insertions(+), 43 deletions(-)

commit 820b5479bd14c6b408a3818f9bc287ad0a3e2fb8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 5 11:32:23 2011 +0200

    Add EmpathyContactChooser

    This is a pure code refactoring from EmpathyInviteParticipantDialog,
    this
    widget is not generic yet.

    https://bugzilla.gnome.org/show_bug.cgi?id=656020

 libempathy-gtk/Makefile.am		  |   2 +
 libempathy-gtk/empathy-contact-chooser.c | 493
 +++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-contact-chooser.h |  55 ++++
 src/empathy-invite-participant-dialog.c  | 410 +++----------------------
 4 files changed, 594 insertions(+), 366 deletions(-)

commit e15b7f70a43898e4978836fdf8efbed0bebeaea4
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Aug 5 14:43:00 2011 +1000

    Replace highlighting of search strings

 libempathy-gtk/empathy-log-window.c | 47
 +++++--------------------------------
 1 file changed, 6 insertions(+), 41 deletions(-)

commit d337ef853cc47ff78fbfa0ac54cf3d795832a2b7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 4 15:38:45 2011 +0200

    Allow to enter an email address as Yahoo ID

    https://bugzilla.gnome.org/show_bug.cgi?id=655959

 libempathy-gtk/empathy-account-widget.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit f9716e53331ccbd0725a14089ad30e9d6c84a463
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Aug 4 09:53:25 2011 +0100

    Make the #defines an static array

 src/Makefile.am	   |  2 ++
 src/empathy-call-window.c |  8 ++++++--
 src/empathy-preferences.c | 40 ++++++++++++++++++++++++++--------------
 src/empathy-preferences.h | 12 ++++--------
 4 files changed, 38 insertions(+), 24 deletions(-)

commit 2e7a0efc837d4b38290dffbd04a1c9d70df64db2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 3 16:49:10 2011 +0100

    Use the new enum everywhere

    And use strings for the --show-preferences argument.

 src/empathy-call-window.c |  4 +++-
 src/empathy-main-window.c |  6 +++---
 src/empathy-main-window.h |  2 +-
 src/empathy-preferences.c | 31 +++++++++++++++++++++++++++----
 src/empathy-preferences.h | 12 +++++++++---
 src/empathy.c		   | 10 +++++-----
 6 files changed, 48 insertions(+), 17 deletions(-)

commit d801233c1f25596c429d75d03ec6282d1b3828e2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 3 16:24:38 2011 +0100

    Preferences: add an enum for all the tabs

 src/empathy-preferences.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit 263c241c69eb0842447899d3097f1c0500b066b0
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 3 15:48:47 2011 +0100

    CallWindow: go to the Calls tab when opening the preferences

    https://bugzilla.gnome.org/show_bug.cgi?id=655884

 src/empathy-call-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0ea5743214b87e35e92b867485d9c5a0f8b5e272
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 3 15:48:18 2011 +0100

    Allow to specify the tab to open in the preferences

    https://bugzilla.gnome.org/show_bug.cgi?id=655884

 src/empathy-main-window.c |  9 +++++++--
 src/empathy-main-window.h |  3 ++-
 src/empathy.c		   | 34 +++++++++++++++++++++++++++++-----
 3 files changed, 38 insertions(+), 8 deletions(-)

commit 07f472213136ac29908a323a9d7612894c7ee5b4
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 3 13:11:03 2011 +0100

    Preferences: add empathy_preferences_show_tab()

    https://bugzilla.gnome.org/show_bug.cgi?id=655884

 src/empathy-preferences.c | 9 +++++++++
 src/empathy-preferences.h | 3 +++
 2 files changed, 12 insertions(+)

commit fd22fd115db8b22a4885402a9cd7c8b846de01ec
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 3 12:47:31 2011 +0100

    CallWindow: show Empathy.Call when opening the debug window

    https://bugzilla.gnome.org/show_bug.cgi?id=655884

 src/empathy-call-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 448ee1db1054f99169b09d357a8da4e5f992af26
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 3 12:45:39 2011 +0100

    empathy-debugger: add a command line option to show a service

    https://bugzilla.gnome.org/show_bug.cgi?id=655884

 src/empathy-debugger.c | 50
 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

commit e58bcfb19122660374ec83f9e06cbc92f97908f4
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 3 12:15:28 2011 +0100

    DebugWindow: add function to change the service to show

    https://bugzilla.gnome.org/show_bug.cgi?id=655884

 src/empathy-debug-window.c | 60
 ++++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-debug-window.h |  3 +++
 2 files changed, 63 insertions(+)

commit 55c0b12101a314d838aa0ba5c6a6d741063c540f
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 3 11:27:00 2011 +0100

    Factor out empathy_launch_program()

    https://bugzilla.gnome.org/show_bug.cgi?id=655884

 libempathy-gtk/empathy-ui-utils.c | 52 ++++++++++++++++++++++++
 libempathy-gtk/empathy-ui-utils.h |  4 ++
 src/empathy-accounts-dialog.c	   | 54 ++++---------------------
 src/empathy-call-window.c	   | 83
 +--------------------------------------
 src/empathy-main-window.c	   | 37 +----------------
 5 files changed, 67 insertions(+), 163 deletions(-)

commit f27e9f59c9b21d4097a805abe24a769446c2351f
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 3 09:12:15 2011 +0100

    CallWindow: add a Settings menu item

    https://bugzilla.gnome.org/show_bug.cgi?id=655884

 src/empathy-call-window.c  | 49
 ++++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-call-window.ui |  8 ++++++++
 2 files changed, 57 insertions(+)

commit 1cffe8f59e31c60f69369f7a636757c3d7fabeca
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Aug 3 08:47:08 2011 +0100

    Add a command line option to Empathy to show the preferences

    https://bugzilla.gnome.org/show_bug.cgi?id=655884

 src/empathy.c | 42 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

commit 4f8ce5f258a290f00fc0ebbf13f5e3db3b0b45bd
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 2 16:40:51 2011 +0100

    MainWindow: add API to show the preferences window

    https://bugzilla.gnome.org/show_bug.cgi?id=655884

 src/empathy-main-window.c | 12 +++++++++---
 src/empathy-main-window.h |  2 ++
 2 files changed, 11 insertions(+), 3 deletions(-)

commit 726b480efacd222976fe99200598b294ff8686b8
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 2 13:26:11 2011 +0100

    CallWindow: add a 'Call log' menu

    https://bugzilla.gnome.org/show_bug.cgi?id=655884

 src/empathy-call-window.c  | 46
 ++++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-call-window.ui |  7 +++++++
 2 files changed, 53 insertions(+)

commit d89a90c582166d20b9a5c165d5784e434fc1de7f
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 2 13:15:57 2011 +0100

    CallWindow: add a Help->About menu

    https://bugzilla.gnome.org/show_bug.cgi?id=655884

 src/Makefile.am	    | 2 ++
 src/empathy-call-window.c  | 9 +++++++++
 src/empathy-call-window.ui | 7 +++++++
 3 files changed, 18 insertions(+)

commit 1132cbda320d086176a0228f3addf5f7288ef080
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 2 13:00:09 2011 +0100

    CallWindow: add a Help->Contents menu

    https://bugzilla.gnome.org/show_bug.cgi?id=655884

 src/empathy-call-window.c  |  8 ++++++++
 src/empathy-call-window.ui | 17 +++++++++++++++++
 2 files changed, 25 insertions(+)

commit 09626bb08d6bcbb5c4ff14ea696282754ab7e93c
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 2 12:45:14 2011 +0100

    CallWindow: remove the hangup menu item

    https://bugzilla.gnome.org/show_bug.cgi?id=655884

 src/empathy-call-window.c  | 1 -
 src/empathy-call-window.ui | 8 --------
 2 files changed, 9 deletions(-)

commit 0404fd4231774bd98607afb1f8cf11f8e20b8a60
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Aug 2 12:44:46 2011 +0100

    CallWindow: move 'Fullscreen' to the Call menu

    https://bugzilla.gnome.org/show_bug.cgi?id=655884

 src/empathy-call-window.ui | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

commit 622e7763577c4757aa0cc76a3b802ca12f727afa
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Jul 26 11:08:04 2011 +0100

    Dialpad: show an entry with the entered numbers

 libempathy-gtk/empathy-ui-utils.c | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

commit b4edfbf863ba2d74cec7fbf7375c53237f20cd84
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Thu Aug 4 09:30:33 2011 +0200

    Updated Spanish translation

 po/es.po | 102
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 55 insertions(+), 47 deletions(-)

commit 79de445e7b21747cbc7893737a5d6756da184274
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Aug 4 12:14:11 2011 +1000

    Support smileys in log viewer

 libempathy-gtk/empathy-log-window.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit 8499ac3767f88cd923551dde06b279337771db04
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jul 28 13:00:07 2011 +0100

    CallWindow: don't close the window when hanging up

    As one may want to redial.

 src/empathy-call-window.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

commit a266ab626d10a421e852043443e3bb37adedba2f
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jul 28 12:29:59 2011 +0100

    CallWindow: show 'Mute' on the statusbar when muted

 src/empathy-call-window.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit f6c3b455a2e98002eeb02bcaf5cd2cf093aa6cc3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 3 15:18:52 2011 +0200

    call-window: use the input-dialpad icon

    Thanks a lot to Jakub Steiner for this awesome icon.

 src/empathy-call-window.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c95ad209dac0f21aed4a0b3943484aab60b98046
Author: Daniel Nylander <po@danielnylander.se>
Date:	Wed Aug 3 08:50:40 2011 +0200

    Updated Swedish translation

 po/sv.po | 84
 +++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 43 insertions(+), 41 deletions(-)

commit ef153cb591ba0965a5bd43ef843657ea4c1313e3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 2 16:15:13 2011 +0200

    empathy_send_file_with_file_chooser: keep on the contact while the
    dialog is running

    It's not safe to assume that the EmpathyContact stays alive.

 libempathy-gtk/empathy-ui-utils.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit d15df005f0a8b8aced44bbe50d941ca5d5344c9c
Author: Alexey Fisher <bug-track@fisher-privat.net>
Date:	Tue Aug 2 13:09:36 2011 +0200

    empathy_server_sasl_handler_class_init: properly initialize the
    dispose function

    https://bugzilla.gnome.org/show_bug.cgi?id=655788

 libempathy/empathy-server-sasl-handler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 33bd53d1d2997bb8bbfbedf3a947ce6ffc25a97d
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Tue Aug 2 01:18:28 2011 +0200

    Updated Hungarian translation by Balázs Meskó <meskobalazs at
    gmail dot com>

 po/hu.po | 927
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 498 insertions(+), 429 deletions(-)

commit 4a863e0eec9a202385b1370d6e68bef47787f3cb
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Aug 2 08:38:03 2011 +1000

    Move signal disconnection earlier to hopefully fix SEGV

    I can't actually reproduce this, but this is possibly the fix.

    (Hopefully) Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=654914

 src/empathy-debug-window.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit f28483d938a0291f167b2e8f53e11c4d2ae3a6ec
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Mon Aug 1 17:41:34 2011 +0100

    preferences: update tab order

    This isn't pretty but I'm not sure if there's a better way of getting
    a specific tab from a GtkNotebook without using its order?

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-preferences.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 400ff52437634aa1b615d4af0b51501bd3a14539
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 1 16:46:25 2011 +0200

    call-window: don't display labels in both toolbars

 src/empathy-call-window.c | 4 ++++
 1 file changed, 4 insertions(+)

commit ca68a00de493734b1580864212c2be9d229d3f80
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 1 14:50:58 2011 +0200

    help/.gitignore: add eu translation of the doc

 help/.gitignore | 2 ++
 1 file changed, 2 insertions(+)

commit 3c937a9ae1919a8d43fc8ed639676535fa09f615
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 1 14:50:04 2011 +0200

    sort help/.gitignore

 help/.gitignore | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

commit 7876debb7bc9b6232817e68f00eb2d7484fd034a
Merge: 4651fb3 e17e618
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Mon Aug 1 13:48:32 2011 +0100

    Merge branch 'change-audio'

    Conflicts:
	src/empathy-call-window.c
	src/empathy-call-window.ui

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

commit 4651fb354e601f34dc9df08f2b506f765e455ead
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 1 13:10:35 2011 +0200

    chat_text_maybe_append_date_and_time: compute the right delta
    between timestamps

    The first argument of g_date_time_difference() should be the older
    timestamp.

    https://bugzilla.gnome.org/show_bug.cgi?id=654958

 libempathy-gtk/empathy-chat-text-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0f84b8fa5a7f061cb5f82ed489e22f15ae2bc7cc
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Aug 1 15:51:23 2011 +1000

    Handle links via external browser

 libempathy-gtk/empathy-log-window.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

commit 7565c39bfa0f118fb513c0af86a5ba0ef7976277
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Aug 1 15:42:43 2011 +1000

    Add expander toggles

 data/empathy-log-window.html	     | 66
 +++++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-log-window.c | 23 +++++++++++++
 2 files changed, 89 insertions(+)

commit 3b86a347cd3e859c427b7e596d949d6ce0094840
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Aug 1 13:05:30 2011 +1000

    Use webkit-utils in LogWindow webview

 libempathy-gtk/empathy-log-window.c | 101
 ++++++++++++++++++++----------------
 1 file changed, 56 insertions(+), 45 deletions(-)

commit e3d0a1862508fad3d16585b0210a2a9328453c2f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Aug 1 13:04:15 2011 +1000

    Abstract WebKit string parsers into empathy-webkit-utils

    This file is currently optionally built, but if the logviewer is
    going to
    depend on WebKit, maybe that's a bad idea? Maybe we should just
    make WebKit
    required (this will probably happen when we require Adium themes in
    the future).

 libempathy-gtk/Makefile.am	       | 13 +++--
 libempathy-gtk/empathy-theme-adium.c  | 69 ++------------------------
 libempathy-gtk/empathy-webkit-utils.c | 91
 +++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-webkit-utils.h | 32 ++++++++++++
 4 files changed, 137 insertions(+), 68 deletions(-)

commit d890a28335477c0e18cd68264467e7be45496388
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Aug 1 12:14:50 2011 +1000

    Copy fix for bug #625745 from empathy-theme-adium

 data/empathy-log-window.html | 5 +++++
 1 file changed, 5 insertions(+)

commit 8d014e2a3b73644a51fa341a036a6df0221bc66d
Author: lainme <lainme993@gmail.com>
Date:	Sun Jul 31 18:11:52 2011 +0000

    Update Simplified Chinese help translation.

 help/zh_CN/zh_CN.po | 816
 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 523 insertions(+), 293 deletions(-)

commit 04c2c076f2108ba9f4ecdb61cfbf1186a615c053
Author: Aron Xu <aronxu@gnome.org>
Date:	Sun Jul 31 18:09:16 2011 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po | 1100
 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 576 insertions(+), 524 deletions(-)

commit 744e20f3c770091c4b6c5162289e8585b3af9474
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	Sat Jul 30 19:15:57 2011 +0200

    Updated Slovenian translation

 help/sl/sl.po | 177
 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 91 insertions(+), 86 deletions(-)

commit d15a9c80aea57d2e0e155e89a8cf00f071c7e196
Author: Abel Motha <sedric@translate.org.za>
Date:	Fri Jul 29 22:37:22 2011 +0200

    Updated translation for Zulu (zu), reviewed by Priscilla Mahlangu

 po/zu.po | 2247
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1424 insertions(+), 823 deletions(-)

commit 8a2f7f90f8e679bc8019745c04ec3bdcbb8ca129
Author: Daniel Korostil <ted.korostiled@gmail.com>
Date:	Fri Jul 29 23:15:41 2011 +0300

    Uploaded Ukranian

 po/uk.po | 2247
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 1305 insertions(+), 942 deletions(-)

commit 491e19da55c5b2ec44d86e5f929e0157fd7db3bc
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Jul 29 19:58:29 2011 +0200

    Updated Spanish translation

 po/es.po | 614
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 320 insertions(+), 294 deletions(-)

commit e17e6184ca30b2164e7b30d1a35f504b87973400
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Fri Jul 29 18:54:40 2011 +0100

    audio-src: check for new enough pulsesrc before trying to change mics

    This means this feature will automatically start working when a new
    enough pulsesrc is used. Making _get_microphones() fail has a nice
    side-effect that the Edit menu item doesn't appear at all. Neat.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-audio-src.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

commit cf7f9a1da8e7a830a0f0676accc0afa444ae8748
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Fri Jul 29 11:43:44 2011 +0100

    audio-src: update to newer GstPulseSrc API

    This time it's actually merged to master.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-audio-src.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

commit 89afdf6b8941ac525104cfb54f10174d6cb7dbcf
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Fri Jul 29 11:09:15 2011 +0100

    audio-src,mic-menu: use DEBUG macros

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-audio-src.c | 5 ++++-
 src/empathy-mic-menu.c  | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

commit a19f10561bf7ad86ff9f688f78df6a9df7a13899
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Fri Jul 29 11:06:25 2011 +0100

    audio-src: only call operations_run when PA is ready

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-audio-src.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 302af77150e52cb625bc3e164808bd812979cc32
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jul 28 15:29:44 2011 +0100

    mic-menu: display monitors when they're the current mic

    ...but otherwise hide them.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-mic-menu.c | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

commit 90eaac49d3f279ae20fa061adbe8ba9ac8aaf023
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jul 28 15:24:19 2011 +0100

    audio-src: add is_monitor boolean to mic struct

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-audio-src.c | 10 +++++++---
 src/empathy-audio-src.h |  1 +
 src/empathy-mic-menu.c  |  1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

commit a36214f589404b37c6125b0a3faa756f9e001cd6
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jul 28 12:45:21 2011 +0100

    call-window: add a Microphone menu to change mic on the fly

    Yay! Sorry this commit is kind of big with the addition of mic-menu,
    perhaps I should have added it in pieces.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/Makefile.am	    |	4 +-
 src/empathy-call-window.c  |	6 +
 src/empathy-call-window.ui |  16 ++
 src/empathy-mic-menu.c     | 392
 +++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-mic-menu.h     |  56 +++++++
 5 files changed, 473 insertions(+), 1 deletion(-)

commit 58df02da291709b265717d8bf2d196e4345ea2ba
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jul 28 12:38:26 2011 +0100

    call-window: add getters for the UI manager and audio src

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-call-window.c | 16 ++++++++++++++++
 src/empathy-call-window.h |  5 +++++
 2 files changed, 21 insertions(+)

commit 0bc0f8fca1696826af50b21c7339164c61d55764
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jul 28 09:45:11 2011 +0100

    audio-src: don't ignore monitors

    pavucontrol doesn't...

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-audio-src.c | 4 ----
 1 file changed, 4 deletions(-)

commit 7a58752393cb6ca9f55c2824ebab0c7a71311ff8
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Jul 27 17:50:15 2011 +0100

    audio-src: add comment about values for unknown values

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-audio-src.c | 2 ++
 1 file changed, 2 insertions(+)

commit dbddd441789b9a5ed3ebde3f870b9337d0c82a47
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Jul 27 17:49:41 2011 +0100

    audio-src: set property IDs properly

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-audio-src.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d9c603695a6c04b2eae543e9339014873ac18812
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Jul 27 17:44:21 2011 +0100

    audio-src: listen to PA state changes and signal accordingly

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-audio-src.c | 118
 ++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 104 insertions(+), 14 deletions(-)

commit 204fa9e744560be4bc0fbafbc5af95a3cf6b3a12
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Jul 27 17:24:58 2011 +0100

    src: give empathy-call sources to the marshal generator

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 01b0be54353820459d4741f2858be21207f7e754
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Jul 27 13:21:49 2011 +0100

    audio-src: add some comments explaining the PA changes

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-audio-src.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 1de1a894194a0fa355ef382783fa54f25ddca75c
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Jul 27 11:54:52 2011 +0100

    audio-src: add API for getting the mic source ID

    Also listen out for changes in the source output ID (but that'll only
    happen if we go READY -> NULL -> READY again).

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-audio-src.c | 68
 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-audio-src.h |  2 ++
 2 files changed, 70 insertions(+)

commit 4188e80b75c38b4b1f35c3e560fff738cb60ccde
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Fri Jul 29 16:09:24 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 949
 ++++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 949
 ++++++++++++++++++++++++++++++++----------------------------
 2 files changed, 1002 insertions(+), 896 deletions(-)

commit ecebf1390aef9119c33275d2b700321d86a9a930
Author: Daniel Nylander <po@danielnylander.se>
Date:	Fri Jul 29 09:53:34 2011 +0200

    Updated Swedish translation

 po/sv.po | 678
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 349 insertions(+), 329 deletions(-)

commit e1ae13450cf3ad12df82bd6a2111eedd6d169ef7
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Jul 29 14:23:21 2011 +1000

    Add a webview widget for displaying the log

    The widget is currently bolted in alongside the existing log display
    widget
    for comparison. This includes some debugging cruft like showing
    the secret
    notebook tabs.

    The webview is populated from the store_events treestore, allowing
    all of the
    existing node-management and ordering code to be used. Attempting
    to replace
    this logic in Javascript was demonstratably too hard. This approach
    keeps the
    Javascript code down to the 4 GtkTreeModel signals.

    TODO:
     - icons
     - pretty printed dates
     - expanders
     - supporting smileys, links, etc.
     - using the correct font, etc.
     - removing the debugging

 data/Makefile.am		     |	 5 +-
 data/empathy-log-window.html	     | 126
 ++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-log-window.c | 133
 ++++++++++++++++++++++++++++++++++++
 3 files changed, 263 insertions(+), 1 deletion(-)

commit 59e3591a594df91e6b0cb48b23899e9dbecfc1dd
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Thu Jul 28 19:18:18 2011 +0200

    Added Basque language

 help/Makefile.am			 |    2 +-
 help/eu/eu.po				 | 3527
 +++++++++++++++++++++++++++++++
 help/eu/figures/empathy-main-window.png |  Bin 0 -> 10261 bytes
 3 files changed, 3528 insertions(+), 1 deletion(-)

commit b5963d80cd471e4e86ba5f18d6636032871aa0fe
Author: Felipe Borges <felipe10borges@gmail.com>
Date:	Thu Jul 28 10:09:49 2011 -0300

    Updated Brazilian Portuguese translation

 po/pt_BR.po | 2004
 +++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1254 insertions(+), 750 deletions(-)

commit b1bfe6bfd06617dd1976a27bc8fc972b6ff62d69
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jul 28 10:43:32 2011 +0100

    CallWindow: pack the details box

    Even if we don't show it, so that the widgets exist and
    we don't assert.

 src/empathy-call-window.c | 4 ++++
 1 file changed, 4 insertions(+)

commit e414085fdfc7ee1618b0402a17cc6a3858a26de2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jul 28 09:29:04 2011 +0100

    Show the percentage sign in the volume

 src/empathy-preferences.c  | 13 +++++++++++++
 src/empathy-preferences.ui |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

commit 0b67a701c87a1defc2506a3cd4b1acda98dcea06
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jul 27 13:13:32 2011 +0100

    CallWindow: remove the sidebar

    And only leave the dialpad in its place.

 src/empathy-call-window.c  | 298
 +++++----------------------------------------
 src/empathy-call-window.ui |  15 +--
 2 files changed, 31 insertions(+), 282 deletions(-)

commit 70d6b206f2d40c136cb1d0d8701101ff8921a033
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jul 27 12:32:40 2011 +0100

    CallWindow: use the volume value from the preferences

    This also removes the 'Audio input' sidebar page, as all of
    it can now be found in the preferences.

 src/empathy-call-window.c | 100
 ++++++++++------------------------------------
 1 file changed, 21 insertions(+), 79 deletions(-)

commit bc537a1bb4f138dd71cd7dc411c10485f2cf96fa
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jul 27 12:20:54 2011 +0100

    Preferences: add a Calls tab

    It only contains the micro volume for now.

 src/empathy-preferences.c  |  12 ++++
 src/empathy-preferences.ui | 167
 +++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 173 insertions(+), 6 deletions(-)

commit 6b6e6cad7fb240e7d61285c55f44224376c9cf63
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jul 27 12:20:02 2011 +0100

    Add a new gsettings key for the call volume

 data/org.gnome.Empathy.gschema.xml.in | 8 ++++++++
 libempathy/empathy-gsettings.h        | 3 +++
 2 files changed, 11 insertions(+)

commit f2f49d58f04cd06ac73015ca763aa1b17c74b89a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jul 28 10:17:10 2011 +0100

    CallWindow: use tp_g_signal_connect_object

    So the signals are disconnected when the window is destroyed.

 src/empathy-call-window.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

commit 2223a2eb1e505b857ad13a44bc888149dc3f0334
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Jul 27 11:39:21 2011 +0100

    audio-src: add API for changing microphone

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-audio-src.c | 79
 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-audio-src.h |  5 ++++
 2 files changed, 84 insertions(+)

commit 77712e75df674fb1f6fb58bd92a26ce75cf41787
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Jul 26 17:45:50 2011 +0100

    audio-src: add the source name to the microphone info struct

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-audio-src.c | 2 ++
 src/empathy-audio-src.h | 1 +
 2 files changed, 3 insertions(+)

commit 7212c6e568aab0c729c9334b0b7a82e7eb33597d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Jul 26 14:27:33 2011 +0100

    audio-src: add API to query available microphones

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-audio-src.c | 197
 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-audio-src.h |  12 +++
 2 files changed, 209 insertions(+)

commit 2b922c7d744be1bd46f67215a8fb5b1eec6377c0
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Jul 26 14:25:50 2011 +0100

    configure: depend on libpulse

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 configure.ac | 2 ++
 1 file changed, 2 insertions(+)

commit 65e9deccdb37c518ebfa766b7762ace338e9a027
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Jul 26 14:24:29 2011 +0100

    audio-src: remove the element-added stuff

    Now that we hard-code pulsesrc, this is unnecessary.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-audio-src.c | 30 ------------------------------
 1 file changed, 30 deletions(-)

commit 8a937c926c79f24fdb36574cb036c9fc09532f3f
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Jul 26 10:32:34 2011 +0100

    audio-src: allow changing the audio source element

    Better than nothing, right?

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-audio-src.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 6146181a2cbcbcd3e5b631a9517441fefb9c4fcc
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Jul 26 10:28:40 2011 +0100

    audio-src: use pulsesrc instead of gconfaudiosrc

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-audio-src.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4f8ad828afebbacef6d7d3560067976e4fc6f90a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jul 27 09:06:01 2011 +0100

    CallWindow: build the toolbar from the .ui

 src/empathy-call-window.c  | 72
 +++-------------------------------------------
 src/empathy-call-window.ui | 63 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 66 insertions(+), 69 deletions(-)

commit 3066f837ec3c22d46382914111bd152b94f3f61e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jul 25 19:24:53 2011 +0100

    CallWindow: hide the audio/video call buttons on _init()

    When we create a new window it's because there's an incoming
    call, so hide the audio/video call buttons.

 src/empathy-call-window.c  | 2 ++
 src/empathy-call-window.ui | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

commit b8069dc8f3ec2cd215458194dc7a9eab26136faa
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jul 25 19:14:30 2011 +0100

    CallWindow: remove redial menu

 src/empathy-call-window.c  | 24 ------------------------
 src/empathy-call-window.ui |  9 ---------
 2 files changed, 33 deletions(-)

commit fd8f73fce4e74cfc0d0538a4b6c7363d35a41ff8
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jul 25 18:56:38 2011 +0100

    CallWindow: remove separator between hangup and dialpad buttons

 src/empathy-call-window.ui | 8 --------
 1 file changed, 8 deletions(-)

commit a12146186cab45c3b3ae074847c77007e23a077c
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jul 25 18:47:51 2011 +0100

    CallWindow: show audio and video call buttons to start a call

    Instead of the redial button.

 src/empathy-call-handler.c |  2 +-
 src/empathy-call-window.c  | 49
 +++++++++++++++++++++++++++++++++++++++-------
 src/empathy-call-window.ui | 22 ++++++++++++++-------
 3 files changed, 58 insertions(+), 15 deletions(-)

commit 146b284c38cd87ee7a56ad454ccd485d3938c1b1
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Jul 22 17:14:12 2011 +0100

    CallWindow: add the remote user name and presence to the toolbar

 src/empathy-call-window.c | 46
 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

commit 3b49f652dd86213f85655d4f1921e3cb52313dd5
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Jul 22 16:34:52 2011 +0100

    CallWindow: add an avatar to the top toolbar

 src/empathy-call-window.c | 43
 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 3 deletions(-)

commit 532ad67f84a53d2fcf8bad5f5e44672951ab95b2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Jul 22 15:26:20 2011 +0100

    CallWindow: move the status message to the bottom toolbar

    From its own statusbar.

 src/empathy-call-window.c  | 46
 +++++++++++++++++++++++-----------------------
 src/empathy-call-window.ui | 12 +-----------
 2 files changed, 24 insertions(+), 34 deletions(-)

commit 2dcddbe1397ab3ee2cdd84bd146d311d067b8729
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Jul 22 13:07:42 2011 +0100

    CallWindow: move the volume button to the bottom toolbar

 src/empathy-call-window.c  | 25 +++++++++----------------
 src/empathy-call-window.ui |  8 ++++++++
 2 files changed, 17 insertions(+), 16 deletions(-)

commit 7cedbcb6d8b8264ba5a35ebb692605fc047e4f27
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Jul 22 12:57:13 2011 +0100

    CallWindow: add a bottom toolbar

    And move some buttons to it following the new call UI design.

 src/empathy-call-window.ui | 60
 +++++++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 24 deletions(-)

commit 2a17ecc15a7ac2bdc45fd0339ac10e379de8056f
Author: Marek Černocký <marek@manet.cz>
Date:	Thu Jul 28 09:10:40 2011 +0200

    Updated Czech translation

 po/cs.po | 1803
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 1111 insertions(+), 692 deletions(-)

commit 6cee5de76941076ba103101392de644bee3bd8a6
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 13 13:38:51 2011 +1000

    Add letters underneath the numbers on the dialpad

    https://bugzilla.gnome.org/show_bug.cgi?id=632874

 libempathy-gtk/empathy-ui-utils.c | 52
 +++++++++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 13 deletions(-)

commit c5c0cd8d6f433896b406287cf5be078670cb734d
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 13 13:19:49 2011 +1000

    Factor out dialpad into a utility function

    The dialpad is shared between empathy-call and empathy-av.

    Really it would be nice to make the dialpad its own little widget
    that emits
    signals with DTMF event ids, but I've got things to get done.

    Conflicts:

	libempathy-gtk/empathy-ui-utils.c
	src/empathy-call-window.c
	src/empathy-streamed-media-window.c

 libempathy-gtk/empathy-ui-utils.c   | 47 ++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-ui-utils.h   |	5 ++++
 src/empathy-call-window.c	     | 53
 +++----------------------------------
 src/empathy-streamed-media-window.c | 53
 +++----------------------------------
 4 files changed, 60 insertions(+), 98 deletions(-)

commit ece8e76a9d3e39dbcf9f8efdeb5e12e6ba77461c
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Jul 26 12:34:22 2011 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9d302c6e465e559367dc70087894fc57cd5e1af4
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Jul 25 16:46:42 2011 +0200

    prepare release

 NEWS	      | 41 +++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 43 insertions(+), 2 deletions(-)

commit 20dd5c1f01cff2c523ce74bc02a57c8e53b2aa65
Merge: 5a56118 5beda72
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Jul 26 10:19:50 2011 +0200

    Merge remote-tracking branch 'danni/populate-popup-654669'

commit 5a56118ce05c8b0579e4a7397d9c57fdd3b01937
Merge: e10a065 d954376
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Jul 26 10:19:39 2011 +0200

    Merge remote-tracking branch 'danni/drag-n-drop-558942'

commit d954376bde5deb4cadfc55e510b703d946ede93f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Jul 26 13:50:21 2011 +1000

    Apply the same fix to EmpathyContactListView

 libempathy-gtk/empathy-contact-list-view.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 5beda725e1aff0da12703e2f51cdb4b95c63b321
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Jul 26 13:36:18 2011 +1000

    Assume GDK_KEY_PRESS in the default case

    Warn if making this assumption.

 libempathy-gtk/empathy-chat.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit e10a0655a4eb8c36f232d533078bcf6b8e7fdbd0
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Jul 25 21:36:31 2011 +0200

    Updated Spanish translation

 po/es.po | 248
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 127 insertions(+), 121 deletions(-)

commit 1005e9de9fc06a00818cc75e491181eb96801bf3
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Jul 22 11:23:48 2011 +0100

    CallWindow: fix comments

    We no longer show the self avatar

 src/empathy-call-window.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 7b4e9b313ba24d01853ef93f893fdc3a26b0b1ba
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Jul 22 11:22:48 2011 +0100

    CallWindow: fix typo

 src/empathy-call-window.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit c4906c89433cdd5dff9f500579c580799fe77dca
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Jul 22 12:08:39 2011 +0100

    CallWindow: ignore events in the data probe callback

    We only want to show the remote video again if we receive
    video frames, not if we receive an event for whatever reason.

    That's in fact what we get when we start sending our own video,
    and so we don't want to display the remote video if it was
    hidden because we're not receiving it anymore.

 src/empathy-call-window.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 5a591d49c2ce331c79247fa868a856fa2494196d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Jul 22 11:40:51 2011 +0100

    CallWindow: check the video exists before showing it

    Since empathy_call_window_show_video_output_cb() is called
    in an idle thread, it's possible that the video is removed
    before the function is executed, so check if it's still there
    before showing it.

 src/empathy-call-window.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 2a84ffe088258126169ae7d91806d32cab199286
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jun 13 12:07:31 2011 +0100

    CallWindow: show the remote avatar when video stops coming

    If we don't get incoming video for a few seconds, show the
    remote contact avatar instead of the frozen video, and show
    the video back if it starts coming again.

 src/empathy-call-window.c | 67
 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

commit d9bb5b999731c247b845ba7e97393d2e25bcfeca
Merge: dcd8d50 bed17cf
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Mon Jul 25 12:43:10 2011 +0100

    Merge branch 'irc-dialog'

    Fixes: <https://bugzilla.gnome.org/show_bug.cgi?id=654552>
    Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>

commit bed17cf9d003db8ecea2fc012cb53ff38554654d
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Jul 19 13:09:49 2011 +0100

    IRC accounts: top-justify the password hint.

    As mentioned on
    <https://bugzilla.gnome.org/show_bug.cgi?id=654552#c13>,
    this makes the password hint text be right up against the field it's
    hinting about, at the cost of even more ugly space between it and
    the Advanced expander. I think this is the lesser of two evils.

 libempathy-gtk/empathy-account-widget-irc.ui | 1 +
 1 file changed, 1 insertion(+)

commit dcd8d507b617e5b8fb6cea5a23d61d922bcca3ba
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jul 21 13:01:10 2011 +0100

    CallWindow: remove unused box

    It was taking horizontal space even if it was empty, causing
    the video widget to not take the full width when returning
    from fullscreen.

 src/empathy-call-window.c | 20 --------------------
 1 file changed, 20 deletions(-)

commit 0587937dc09abbd56d36ca395c82f64098903937
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jul 20 18:04:26 2011 +0100

    Set the video widget for the fullscreen window

    Otherwise the mouse cursor won't be hidden after a timeout
    and the 'Leave fullscreen' button won't dissapear when we
    unfullscreen the call window.

 src/empathy-call-window.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit f544815fbc8ccc9e0f35bfbcdbed4692ef1ab8e6
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Jul 20 17:06:33 2011 +1000

    Don't generate critical when dragging with no contact selected

    This also fixes the problem where dragging with no contact selected
    drags the
    previously selected contact.

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=558942

 libempathy-gtk/empathy-individual-view.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 00c4753fa9cf2431a6d35c28cb6a0b1e94670a89
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Tue Jul 19 22:26:32 2011 +0200

    Updated Slovenian translation

 po/sl.po | 407
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 218 insertions(+), 189 deletions(-)

commit 3d3452cab15ac7dcc8dee37edef9faffadded3a1
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Jul 19 09:22:26 2011 +0100

    IRC: validate 'username' parameter.

 libempathy-gtk/empathy-account-widget.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 926cc3f303b944e46a2398c51a220cde48f9b46d
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Jul 19 09:15:11 2011 +0100

    IRC: rename “user_name” regex to “nick_name”

    The 'account’ parameter in Telepathy, to which this regex applies,
    is
    the ‘nickname’ in IRC parlance.

    (I'm about to add a regex for what IRC calls ‘usernames’.)

 libempathy-gtk/empathy-account-widget.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 98182d81df41790db37ec222e598bfef1cd8d85b
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Jul 19 08:55:15 2011 +0100

    IRC accounts: make labels the same width.

    This addresses Nick's concern on
    https://bugzilla.gnome.org/show_bug.cgi?id=654552

 libempathy-gtk/empathy-account-widget-irc.ui | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 6ad8cdf6622aa204b4f7cef2f44433637099f175
Author: Rob Sharp <robrobrobsharp@gmail.com>
Date:	Tue Jul 19 09:03:42 2011 +0100

    Add an advanced section to the IRC configuration page

    -Move the Real Name and Quit Message to the advanced section
    -Add a new Username field to the advanced section

    https://bugzilla.gnome.org/show_bug.cgi?id=654552

 libempathy-gtk/empathy-account-widget-irc.c  |   1 +
 libempathy-gtk/empathy-account-widget-irc.ui | 259
 ++++++++++++++++++---------
 2 files changed, 180 insertions(+), 80 deletions(-)

commit 2af8f317369b987e5ae1492bd597bb741df7dcc3
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Jul 19 10:16:29 2011 +0100

    Revert "empathy_call_new_with_streams: prefer StreamedMedia over Call"

    Default to Call channels again.

    https://bugzilla.gnome.org/show_bug.cgi?id=654611

    This reverts commit 1cacc0945f81e0513013b83ca7488589dd6c61f7.

 libempathy-gtk/empathy-call-utils.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

commit a32ce8185b6600c7c26111ee3b64e6fd8912c567
Author: Daniel Nylander <po@danielnylander.se>
Date:	Mon Jul 18 23:10:00 2011 +0200

    Updated Swedish translation

 po/sv.po | 78
 ++++++++++++++++++++++++++--------------------------------------
 1 file changed, 32 insertions(+), 46 deletions(-)

commit 3b225294da4fb6f57d147f83c7ed78c8a44f0aec
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Jul 18 14:20:05 2011 +1000

    Populate spelling suggestions when menu key is pressed

    Track what kind of event generated the populate-popup event and then
    use the
    cursor position or mouse position as appropriate.

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=654669

 libempathy-gtk/empathy-chat.c | 52
 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 6 deletions(-)

commit b7c238e691a8f2a171b9efa2e5f38af0f0c2a56f
Author: Daniel Nylander <po@danielnylander.se>
Date:	Fri Jul 15 13:13:11 2011 +0200

    Updated Swedish translation

 po/sv.po | 2231
 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 1463 insertions(+), 768 deletions(-)

commit b4175711fb0b0cb34b51f049ff4eeb2cff7eec86
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Jul 15 10:21:26 2011 +0300

    Updated Hebrew translation.

 po/he.po | 399
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 214 insertions(+), 185 deletions(-)

commit 39ea5fe2605a9f02a74683cf0be9856217b38cc7
Author: Rob Sharp <robrobrobsharp@gmail.com>
Date:	Wed Jul 13 11:33:53 2011 +0100

    Debug logs will now be saved in the user's home directory rather
    than /tmp

    https://bugzilla.gnome.org/show_bug.cgi?id=654541

 src/empathy-debug-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 560d11b069f159a27b3a0e258842028ff705d612
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 13 12:09:19 2011 +0200

    release.py: detect bug numbers using their full URL

    git-bz uses the full address of the bug so best to support that
    format as
    well.

 release.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit a76fee797c59738c7f9e932fa5bfac16c49f66fe
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Jul 13 10:53:58 2011 +0200

    Updated Spanish translation

 po/es.po | 358
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 192 insertions(+), 166 deletions(-)

commit d3620a6f0eb0632c4ef96c48bcdb7adace8c1ff2
Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:	Tue Jul 12 15:04:25 2011 +0300

    Updated Latvian translation.

 po/lv.po | 2054
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 1233 insertions(+), 821 deletions(-)

commit d786fd74bda1df1067d71897f525f2a0e0fa50f7
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Tue Jul 12 12:50:05 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 398
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 212 insertions(+), 186 deletions(-)

commit 55d7a944fa0783718a69e4d1b5e574f326befa58
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Jul 12 10:26:17 2011 +0100

    LogWindow: stop retrieving logs if the window is closed

 libempathy-gtk/empathy-log-window.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 4305ae9d96e4a6b3fb749b64d6d0c4b0045ab1fc
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri May 13 11:54:49 2011 +0100

    Only follow available cameras if the contact can do Video calls

 libempathy-gtk/empathy-individual-menu.c | 13 +++++++++----
 libempathy/empathy-contact.c		  | 14 ++------------
 2 files changed, 11 insertions(+), 16 deletions(-)

commit c463ca2f1aa7ba43248b8f07879c4268cb536670
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed May 11 10:37:43 2011 +0100

    LogWindow: disable Video calls if no camera connected

 libempathy-gtk/empathy-log-window.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

commit fe7e98c6222fae967005ca81042963118953fd43
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 10 13:14:45 2011 +0100

    CallWindow: disable Video functionality if there's no camera

 src/empathy-call-window.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

commit 622469eebd6cee91e1c0a27c3532ecb836fa14fb
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu May 12 15:19:39 2011 +0100

    Bind 'Video call' menu items to available cameras

 libempathy-gtk/empathy-individual-menu.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 11b3e6e941f3407de410308191cbe5088cc074e4
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 10 13:14:05 2011 +0100

    A contact doesn't support video if we have no camera

 libempathy/empathy-contact.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

commit e12ee6f8126a10fb0789e634dfd4251f246e2b90
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 10 13:13:12 2011 +0100

    NewCallDialog: make 'Enable video' unsensitive when there's no camera

 libempathy-gtk/empathy-new-call-dialog.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

commit 3a54e248335203c6979ef733adc7b07a25660613
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 10 11:48:35 2011 +0100

    Add empathy_camera_monitor_get_available

 libempathy/empathy-camera-monitor.c | 7 +++++++
 libempathy/empathy-camera-monitor.h | 2 ++
 2 files changed, 9 insertions(+)

commit 20fe4d7b990d32e70fcdb9fd46cde2ed00c6d71d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 10 11:33:29 2011 +0100

    Optionally check for gudev for camera monitoring

 configure.ac		| 26 ++++++++++++++++++++++++++
 libempathy/Makefile.am |  4 +++-
 2 files changed, 29 insertions(+), 1 deletion(-)

commit c1465c5133df557ff5e0f5f3e7463e0fdc0eae1e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed May 11 10:47:55 2011 +0100

    Don't disable video calls when built without udev

 libempathy/empathy-camera-monitor.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 5c5890caba5e3ddc4298f138f3bb802993b21b4d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 10 10:32:33 2011 +0100

    Add EmpathyCameraMonitor

 libempathy/Makefile.am		     |	 6 +-
 libempathy/empathy-camera-monitor.c | 174
 ++++++++++++++++++++++++++++++++++++
 libempathy/empathy-camera-monitor.h |	54 +++++++++++
 3 files changed, 232 insertions(+), 2 deletions(-)

commit eba2a3dba40cab986589bac073d16627b3f9bf90
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 10 09:48:06 2011 +0100

    Add CheeseCameraDeviceMonitor from libcheese

 libempathy/Makefile.am			   |   9 +-
 libempathy/cheese-camera-device-monitor.c | 412
 ++++++++++++++++++++++++++++++
 libempathy/cheese-camera-device-monitor.h |  67 +++++
 3 files changed, 485 insertions(+), 3 deletions(-)

commit 7271692646a1212cce6d55731e38c7825b4e494e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jul 11 18:29:28 2011 +0100

    StreamedMediaWindow: don't use `call-window' for the geometry

    Use av-window instead, so Call and StreamedMedia windows'
    geometry isn't mixed as the windows are quite different now.

 src/empathy-streamed-media-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ee432f2c641a383ad8b32cb1ef7d2d2c2ee9c880
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jul 11 18:27:52 2011 +0100

    CallWindow: save the window geometry without the sidebar

    Since we don't show the sidebar when creating new call windows,
    we should not take the sidebar into account when saving the
    window geometry.

    https://bugzilla.gnome.org/show_bug.cgi?id=634809

 libempathy-gtk/empathy-geometry.c | 47
 ++++++++++++++++++++++++++-------------
 libempathy-gtk/empathy-geometry.h |  7 ++++++
 src/empathy-call-window.c	   | 47
 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+), 16 deletions(-)

commit 3535c55225076c649883aa4a497893b1f165a110
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jul 11 16:04:47 2011 +0100

    CallWindow: properly determine the sidebar width

    The first time we show the sidebar, gtk_widget_get_allocation()
    doesn't return the correct width as the allocation hasn't been
    done yet. So use gtk_widget_get_preferred_width() as the minimum
    width is what is actually allocated.

 src/empathy-call-window.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 70fc920514af12b5c96e928a3178dfd9ddd8ed9e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Jul 8 15:45:27 2011 +0100

    CallWindow: add a dialpad tool button

    Rename the dialpad menu entry to Sidebar and move it to
    the View menu at the same time.

 src/empathy-call-window.c  | 49
 ++++++++++++++++++++++++++++++++++------------
 src/empathy-call-window.ui | 19 ++++++++++++++----
 2 files changed, 52 insertions(+), 16 deletions(-)

commit f0c80062b0fcdec789a478ed58528ec6fdd14622
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jul 7 10:21:01 2011 +0100

    CallWindow: allow to show/hide the video preview

    There's now a button next to the video preview when it's shown
    and in a corner when it's hidden that allows to hide and show
    it.

 src/empathy-call-window.c  | 103
 +++++++++++++++++++++++++++++++++++++++++++--
 src/empathy-call-window.ui |  26 ++++++++++++
 2 files changed, 126 insertions(+), 3 deletions(-)

commit 538d987eb2e525e957caf9b05e6233ed7541c1d8
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jul 7 08:30:47 2011 +0100

    CallWindow: only show one button to control the camera

    Having three buttons to control the camera clutters the
    UI. Displaying the video preview but not sending video is
    not very useful, and we'll add a way of sending video without
    displaying the preview by clicking on the preview itself.

    https://bugzilla.gnome.org/show_bug.cgi?id=611789

 src/empathy-call-window.c  | 251
 +++------------------------------------------
 src/empathy-call-window.ui |  79 +-------------
 2 files changed, 18 insertions(+), 312 deletions(-)

commit 9c44255b53f38c60bb65eb799e0245a6e49e3613
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jul 6 16:31:37 2011 +0100

    CallWindow: remove the Sidebar button

 src/empathy-call-window.c | 38 ++++++--------------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

commit db8f9ed9b022e72ae2471c52268b9147ca4e3003
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jul 6 15:18:46 2011 +0100

    CallWindow: flip the video preview

 src/empathy-call-window.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 6aa94458db8c15961cb0a489cdde5ef59d6f6928
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jul 6 12:26:19 2011 +0100

    CallWindow: add a little offset to the video preview

 src/empathy-call-window.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

commit 519ed53f758fdbcde07089275dfcb94e76f0aaf2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jul 6 10:31:45 2011 +0100

    CallWindow: set the video container background color

    ...to match the rest of the window.

 src/empathy-call-window.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit 8dfbb6d5db069cd31e5c5223b0dee5841b1845fe
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jul 6 10:31:01 2011 +0100

    CallWindow: keep the aspect ratio of the remote video

 src/empathy-call-window.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 287973c0299353802f52b330c1050b03476e892d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jul 6 09:41:57 2011 +0100

    CallWindow: remove self avatar code

    We don't display the self avatar anymore.

 src/empathy-call-window.c | 33 ---------------------------------
 1 file changed, 33 deletions(-)

commit a1e502f0e583e02e8e826d6d74bafd988378f3f5
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Jun 24 16:50:55 2011 +0100

    CallWindow: set video preview on top of remote video

    https://bugzilla.gnome.org/show_bug.cgi?id=582442

 src/empathy-call-window.c | 131
 +++++++++++++++++++++++-----------------------
 1 file changed, 65 insertions(+), 66 deletions(-)

commit 6e1547e28b0139bd87a216790db1d067a88d387e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 23 16:46:00 2011 +0100

    CallWindow: use clutter to draw the remote video

 src/empathy-call-window.c | 46
 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

commit 2303f45817ba0960bbf4c3458781414c31561a91
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 23 16:24:37 2011 +0100

    CallWindow: use clutter to draw the video preview

 src/empathy-call-window.c | 53
 ++++++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 24 deletions(-)

commit 7e3203f4a7c1e8684c350ab96917057c2a83dbe4
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 23 16:24:19 2011 +0100

    empathy-call: initialize clutter

 src/empathy-call.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit a34ff2ef492de9b74bdc1d4f55758d389586d032
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 23 16:23:26 2011 +0100

    Require clutter for empathy-call

    It will be used to display video output.

 configure.ac | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

commit a79f4193bb6958ebd620f437b0d786e4449d9eed
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jul 11 10:45:41 2011 +0100

    EmpathyContact: don't crash if a contact doesn't have an account

    https://bugzilla.gnome.org/show_bug.cgi?id=654256

 libempathy/empathy-contact.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 342a4344f7f62d7b55e64f6f708b4b696b0765c3
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jul 11 10:32:40 2011 +0100

    CallWindow: don't add calls to searches if they don't match

 libempathy-gtk/empathy-log-window.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit 61b92614a738e8fefc9376aa66fe14b00167e30c
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jul 11 10:06:51 2011 +0100

    LogWindow: select 'Anyone' when searching

 libempathy-gtk/empathy-log-window.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 3a19d359f1cae8b2b4e6b4c31aaa193bd31a8720
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jul 11 09:39:38 2011 +0100

    LogWindow: don't crash when searching

 libempathy-gtk/empathy-log-window.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit eb2ef7bb98d193402e372efba43a7212d8e5127c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 11 16:02:08 2011 +0200

    use tp_text_channel_ack_all_pending_messages_async()

 libempathy-gtk/empathy-chat.c |  3 ++-
 libempathy/empathy-tp-chat.c  | 35 -----------------------------------
 libempathy/empathy-tp-chat.h  |  3 ---
 3 files changed, 2 insertions(+), 39 deletions(-)

commit 4644a9d69f070df504925902e7692fa1bc731dfa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 14 10:12:45 2011 +0100

    Set the DelegateToPreferredHandler hint

    This ensures that Empathy will always handle and display the channel,
    even if
    GNOME Shel is already handling it.

    https://bugzilla.gnome.org/show_bug.cgi?id=652439

 libempathy/empathy-request-util.c | 1 +
 1 file changed, 1 insertion(+)

commit a446f3ec4f2259f651de668e27563e3717226f04
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 13 15:22:23 2011 +0200

    coding style fixes

    https://bugzilla.gnome.org/show_bug.cgi?id=652439

 libempathy/empathy-request-util.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 5155eb52821b6fd1951ef01513a5110135adc9f3
Author: A S Alam <aalam@users.sf.net>
Date:	Sun Jul 10 20:48:39 2011 +0530

    update Punjabi Translation

 po/pa.po | 1893
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1192 insertions(+), 701 deletions(-)

commit c5efee19e257658a47b74e5113dfc046b4b31bcc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 6 15:58:05 2011 +0200

    theme-adium: use the pending-message-id instead of message-token
    in x-empathy-message-id

    message-token is not guaranteed to be implemented by all CMs while
    pending-message-id is (for incoming messages).

    https://bugzilla.gnome.org/show_bug.cgi?id=654015

 libempathy-gtk/empathy-theme-adium.c | 42
 ++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 18 deletions(-)

commit 6fcaaa418bffeb06c81f1bf1d581e7d2e323fabe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 8 13:19:43 2011 +0200

    bump tp-glib dep to 0.15.3

    We need it for tp_message_get_pending_message_id()

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9b4ae4814f0fd18fce4aefed2ee351485f0b18b1
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Jul 6 09:41:15 2011 +0200

    Updated Spanish translation

 po/es.po | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit a0c74363c0617abaa5522c2e0ffeb0a9372349d1
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Jul 5 12:30:53 2011 +0100

    Call: flip video preview horizontally

    https://bugzilla.gnome.org/show_bug.cgi?id=639353

 src/empathy-call-window.c	     |	6 +++++-
 src/empathy-streamed-media-window.c |	6 +++++-
 src/empathy-video-widget.c	     | 30 +++++++++++++++++++++++++++---
 3 files changed, 37 insertions(+), 5 deletions(-)

commit ab952e9d0b189663c0b723e2dfcc3f50ec19b98a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Jul 5 11:11:44 2011 +0100

    LogWindow: make type filters unsensitive as necessary

    If there are no events of one type, make its row in the What
    pane unsensitive.

    https://bugzilla.gnome.org/show_bug.cgi?id=653343

 libempathy-gtk/empathy-log-window.c | 81
 +++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

commit e213b939886dac6778e421b8b55be9453d72f6a6
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Tue Jul 5 16:38:48 2011 +0200

    Updated Spanish translation

 po/es.po | 106
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 56 insertions(+), 50 deletions(-)

commit 395f226c197ba97bd5c1bfa3b2f47c3866a37bb9
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jul 4 17:43:59 2011 +0100

    LogWindow: expand/collapse events when a row is activated

    https://bugzilla.gnome.org/show_bug.cgi?id=653341

 libempathy-gtk/empathy-log-window.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit 1fe8edf35901e82ad858876af84f75f5352ebef3
Author: Fran Dieguez <fran@openhost.es>
Date:	Mon Jul 4 21:07:35 2011 +0200

    Updated Galician translations

 po/gl.po | 309
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 174 insertions(+), 135 deletions(-)

commit 7835dd6c948517d422ef793afa84e7e331426c5f
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jul 4 16:11:02 2011 +0100

    Display `Chat in ...' for MUCs

    Instead of `Chat with ...'.

    https://bugzilla.gnome.org/show_bug.cgi?id=653175

 libempathy-gtk/empathy-log-window.c | 34
 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

commit 5e782bf815c2bd9fb2ae05812c1cd946260c8a1b
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Jun 21 17:53:28 2011 +0100

    LogWindow: really show the users' alias in the Who pane

    https://bugzilla.gnome.org/show_bug.cgi?id=653116

 libempathy-gtk/empathy-log-window.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

commit 858a4d27abd2f040d44eaeda17f618a1a63b1631
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Jun 21 17:53:07 2011 +0100

    empathy_contact_from_tpl_contact: don't override the alias

    Add a logged-alias property instead, which can be used by
    those who need the old alias.

    And use it in chat themes for the backlog.

 libempathy-gtk/empathy-theme-adium.c |  2 +-
 libempathy-gtk/empathy-theme-boxes.c |  4 ++--
 libempathy-gtk/empathy-theme-irc.c   |  4 ++--
 libempathy/empathy-contact.c	      | 45
 +++++++++++++++++++++++++++---------
 libempathy/empathy-contact.h	      |  1 +
 5 files changed, 40 insertions(+), 16 deletions(-)

commit 247f9a497a9dee8eb62d08cb161b9a5e1d7a6562
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 4 16:49:06 2011 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1f2b473a0f60b29356bef593a80fb7658481bbf1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 4 16:35:52 2011 +0200

    prepare 3.1.3

 NEWS	      | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  6 +++---
 2 files changed, 56 insertions(+), 3 deletions(-)

commit d5af4f045f07eb5990ed233548fba50ae7edd98a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 4 16:18:11 2011 +0200

    release.py: update last_tag_pattern

 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ea501264c4f45e6870bb4e7c2eecd6e95357ec3d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Jul 1 17:38:23 2011 +0100

    LogWindow: refresh the logs when new events happen

    If they would be displayed for the current selection.

    https://bugzilla.gnome.org/show_bug.cgi?id=653760

 libempathy-gtk/empathy-log-window.c | 263
 +++++++++++++++++++++++++++++++++++-
 1 file changed, 260 insertions(+), 3 deletions(-)

commit abbbbdaed8530a61d99ca49ca8a33878dd24eda2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Jul 1 17:17:53 2011 +0100

    LogWindow: make it a proper GtkWindow subclass

    And a proper singleton while at it.

    https://bugzilla.gnome.org/show_bug.cgi?id=653803

 libempathy-gtk/empathy-log-window.c  | 666
 +++++++++++++++++++----------------
 libempathy-gtk/empathy-log-window.h  |  25 ++
 libempathy-gtk/empathy-log-window.ui | 528 ++++++++++++++-------------
 3 files changed, 645 insertions(+), 574 deletions(-)

commit 3b221ab08d6798c6d91d48332921fab8c3e7790e
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Sat Jul 2 20:18:23 2011 +0200

    Updated Slovenian translation

 po/sl.po | 324
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 178 insertions(+), 146 deletions(-)

commit 95ff75f0dc6b402d2ef3c10704a9d1bc5606ea3e
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sat Jul 2 01:37:42 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 216
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 112 insertions(+), 104 deletions(-)

commit f529880740cfc4563b4983490bb077ca87757721
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Sat Jul 2 06:36:21 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1805
 +++++++++++++++++++++++++++++++++++++----------------------
 po/zh_TW.po | 1805
 +++++++++++++++++++++++++++++++++++++----------------------
 2 files changed, 2256 insertions(+), 1354 deletions(-)

commit f58332c44d0f258956b5530d4bace77a0ca4176b
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Jul 1 20:03:03 2011 +0300

    Updated Hebrew translation.

 po/he.po | 459
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 252 insertions(+), 207 deletions(-)

commit 93ca914aaa7ca852fd1ce8bef0f6bb7568fb257f
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Fri Jul 1 14:30:50 2011 +0200

    Updated Hungarian docs translation, lots of fixes

 help/hu/hu.po | 242
 ++++++++++++++++++++++++++--------------------------------
 1 file changed, 109 insertions(+), 133 deletions(-)

commit c011e6ce9d6d67d9d80ebfd871d96d87a43491ae
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Jul 1 10:40:34 2011 +0200

    Updated Spanish translation

 po/es.po | 420
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 226 insertions(+), 194 deletions(-)

commit d38c606c7f36ae1306bcf622cbc5e21b3609b746
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Thu Jun 30 20:12:42 2011 +0200

    Mark untranslated strings for translation. Fixes:

    https://bugzilla.gnome.org/show_bug.cgi?id=653767

 libempathy-gtk/empathy-contact-blocking-dialog.ui | 2 +-
 libempathy-gtk/empathy-log-window.ui		   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit f345b6d298fd7a92372c3d0d4e2d2ad306003737
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Thu Jun 30 20:21:21 2011 +0200

    Updated Hungarian translation

 po/hu.po | 1877
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 1133 insertions(+), 744 deletions(-)

commit 00b7ca3a4147cffe757d0fa59bab4c597f2a6991
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 30 14:58:35 2011 +0200

    Stop using deprecated API from libnotify (#653739)

 src/empathy-notifications-approver.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

commit c1909f3c881ae35e1e1a4f40fe28d628088c22ec
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 30 14:14:35 2011 +0200

    Use our own notification categories if there is no official one

 src/empathy-notifications-approver.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit e1db5549ea2349d0d17509171ffe7f977676acb7
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 30 11:29:35 2011 +0100

    Revert "Don't look for Call channels"

    Since we support Call in master nowadays.

    This reverts commit 5b894aa5ad8702279c0458b890025a22172bfdd1.

    https://bugzilla.gnome.org/show_bug.cgi?id=653730

 src/empathy-call-observer.c | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

commit 19cbd39e5eb916ecc4dc2f0705a204d0c7ca6e3a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 4 10:23:53 2011 +0200

    event_manager_add: don't crash if approval is NULL (#646555)

    When adding a "subscription request" event there is no
    EventManagerApproval
    associated with the event.

 src/empathy-event-manager.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 1b79d18321b2d1bcbc8da81f5572de90c851a87e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jun 29 15:47:58 2011 +0100

    Autocomplete contacts when blocking by alias

    https://bugzilla.gnome.org/show_bug.cgi?id=653650

 libempathy-gtk/empathy-contact-blocking-dialog.c | 83
 +++++++++++++++++++++++-
 1 file changed, 81 insertions(+), 2 deletions(-)

commit 6ba4cf17919cf343a000c3025d3e45bbe55b8188
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jun 29 11:23:12 2011 +0100

    LogWindow: keep the selected dates when changing Who or What

    If the same dates are present for the new selection.

    https://bugzilla.gnome.org/show_bug.cgi?id=653635

 libempathy-gtk/empathy-log-window.c | 83
 ++++++++++++++++++++++++++++++++++---
 1 file changed, 78 insertions(+), 5 deletions(-)

commit db0fd2e3da0b075282169e2a220a1c4051c4309d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 29 11:48:20 2011 +0200

    remove unused string util functions

 libempathy/empathy-utils.c | 33 ---------------------------------
 libempathy/empathy-utils.h | 10 ----------
 tests/Makefile.am	    |  4 ----
 tests/empathy-utils-test.c | 33 ---------------------------------
 4 files changed, 80 deletions(-)

commit 442e6acd522cfaaeae71b8ebde6031de0a3cc44e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 29 11:44:57 2011 +0200

    empathy-utils: port to new coding style

    Most of this file was already using it so best to stay consistent.

 libempathy/empathy-utils.c | 711
 +++++++++++++++++++++++----------------------
 libempathy/empathy-utils.h |  82 +++---
 2 files changed, 402 insertions(+), 391 deletions(-)

commit da1da170a1365d12a5eeaee5c2b0e3285f268038
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 28 16:49:47 2011 +0200

    add client and service file announcing the FileTransfer handler
    (#653575)

 data/.gitignore						  | 1 +
 data/Empathy.FileTransfer.client				  |
 7 +++++++
 data/Makefile.am						  |
 9 +++++++--
 ....freedesktop.Telepathy.Client.Empathy.FileTransfer.service.in | 3 +++
 4 files changed, 18 insertions(+), 2 deletions(-)

commit b112f5c4f17f24b4654ead7a0525230a45f7e536
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Tue Jun 28 22:57:29 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 338
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 181 insertions(+), 157 deletions(-)

commit cdbf7eab0ce5505998466349fed5b22b0d44342d
Author: Aurimas Černius <aurisc4@gmail.com>
Date:	Tue Jun 28 22:55:03 2011 +0300

    Updated Lithuanian translation.

 po/lt.po | 2261
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 1283 insertions(+), 978 deletions(-)

commit c257cb2ca71d2b3eb48d2ba5b8311d9582019ad9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 28 11:14:01 2011 +0200

    Display the time when messages have been sent, not received (#653551)

    Much more useful when receiving offline messages.

 libempathy/empathy-message.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit a7757678bf287ad748b097f9362f52d248afc6ca
Merge: 5bba4dd 53a110f
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Jun 28 09:11:45 2011 +0100

    Merge branch 'account-parameters'

commit 5bba4ddbda12fa41f68889a737a7ceaa17496f34
Merge: adfe48f 0f19e7e
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Jun 28 09:11:42 2011 +0100

    Merge branch 'bigger-favourite-chatrooms'

commit adfe48fe482e2aa966e7793652d3234685d07362
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 22 14:17:05 2011 +0200

    account-widget: hide advanced section for GTalk accounts

    Our fallback path is now robust enough, users shouldn't have to change
    advanced parameters.

 libempathy-gtk/empathy-account-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 53a110fcf6a8b697f8d27a8c34b0cccf4db04b24
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Mon Jun 27 17:14:09 2011 +0100

    Set require-encryption for Facebook and Google Talk

    Future versions of Gabble will do this too, but Empathy can make sure
    it's set too.

 libempathy-gtk/empathy-protocol-chooser.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 60d6f85f560b4c958085c8f759f519363a05e779
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Mon Jun 27 17:03:50 2011 +0100

    Set 'server' parameter on GTalk accounts.

    This stops us depending on properly-configured SRV records.
    'fallback-servers' is not good enough in this situation:

     • foo.com's XMPP stuff is served by Google Apps;
     • your router breaks SRV requests;
     • foo.com resolves to 1.2.3.4 which has a (different) XMPP server
       listening on port 5222.

    This may seem far-fetched, but this happened to two completely
    different
    people, both hosted with Dreamhost.

    https://bugzilla.gnome.org/show_bug.cgi?id=653510

 libempathy-gtk/empathy-protocol-chooser.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 9d13e5abfc9802832cc0e81cfa96663ffdd4744d
Merge: d191659 0f19e7e
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Mon Jun 27 14:02:48 2011 +0100

    Merge branch 'bigger-favourite-chatrooms'

commit d191659f11e5fcdcc4277c2c30295e2f5f099335
Author: Aron Xu <aronxu@gnome.org>
Date:	Sun Jun 26 09:47:51 2011 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po | 1821
 +++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1144 insertions(+), 677 deletions(-)

commit 26259ee3b6fce128a175f71b65dbcd523d56cbb8
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Sat Jun 25 22:00:52 2011 +0200

    [l10n] Updated German translation

 po/de.po | 1769
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1106 insertions(+), 663 deletions(-)

commit 81090144f9100924c0f45b003faf27efd7aeb3b5
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Fri Jun 24 22:20:32 2011 +0200

    [i18n] Added missing file to POTFILES.in

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit f7365ba52c11988ba7fa058cbf35de31da7326b2
Author: Hannie Dumoleyn <hannie@ubuntu-nl.org>
Date:	Fri Jun 24 22:16:41 2011 +0200

    [l10n] Updated Dutch translation

 po/nl.po | 1795
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 1104 insertions(+), 691 deletions(-)

commit 0f19e7e7b63a2c457a498bf84d4928db59fb56e4
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Jun 24 15:03:48 2011 +0100

    ChatroomsWindow: make the minimum size a bit bigger

    This patch makes the scrolled window's minimum size request the
    same as
    the new size for the status editor's scrolled window.

    https://bugzilla.gnome.org/show_bug.cgi?id=630943

 src/empathy-chatrooms-window.ui | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 9f79b7c5d74f1a82387881121403e755757f8cb3
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Jun 24 15:02:58 2011 +0100

    ChatroomsWindow: GNOME 3-ify the Remove button

 src/empathy-chatrooms-window.c  | 10 ++++++
 src/empathy-chatrooms-window.ui | 70
 ++++++++++++++++++++++++++---------------
 2 files changed, 54 insertions(+), 26 deletions(-)

commit 3e22c794dd4568a69c08ce80cc12e03eb27f836c
Merge: ea70cf0 896aa85
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Jun 24 14:28:23 2011 +0100

    Merge branch 'status-dialog'

    Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

commit 896aa85c871372227e96906420659e38d091f2ac
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Jun 24 11:56:34 2011 +0100

    PresetDialog: remove support for adding statuses entirely

    We already have a way to do this, namely on the contact list
    itself. So
    this dialog now becomes just a way to edit/remove the existing
    statuses.

    The margins on the VBox are chosen to make its right-hand edge line up
    exactly with the right-hand edge of the Close button in the dialog.

 libempathy-gtk/empathy-status-preset-dialog.c	| 258
 +------------------------
 libempathy-gtk/empathy-status-preset-dialog.ui |  81 +-------
 2 files changed, 4 insertions(+), 335 deletions(-)

commit 712f9da4f80e0426ca449431ffbe6cd3373adf12
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Jun 24 11:44:35 2011 +0100

    PresetDialog: make status icon in entry non-activatable

    It's not meaningfully activatable; this has the effect of making
    it not
    glow on mouse-over, and preventing the cursor from changing from
    a caret
    back to a pointer.

 libempathy-gtk/empathy-status-preset-dialog.c | 3 +++
 1 file changed, 3 insertions(+)

commit fb207a362a266da923f6f87c91c0dd649cfa9183
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Jun 24 11:09:28 2011 +0100

    PresetDialog: GNOME 3-ify the remove button

    Yum yum joined-toolbar!

 libempathy-gtk/empathy-status-preset-dialog.c	| 12 ++++-
 libempathy-gtk/empathy-status-preset-dialog.ui | 70
 ++++++++++++++++----------
 2 files changed, 54 insertions(+), 28 deletions(-)

commit 05fb4bd53ec98426d0880b0557031b2579ec96de
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Jun 10 21:15:35 2011 +0100

    PresetDialog: Don't leak path when focusing freshly-created status

    (This was not introduced by my changes.)

 libempathy-gtk/empathy-status-preset-dialog.c | 1 +
 1 file changed, 1 insertion(+)

commit 901256e30ba93abc86dfd3826ee28f322251c673
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Jun 10 21:09:33 2011 +0100

    PresetDialog: Select text cell of freshly-added status

    This means you can just mash Enter to edit your mistake. It's more
    useful than leaving the text entry focused. It also helps hide a bug
    where the entry doesn't get cleared if you just start typing another
    message. So previously, typing:

      Hello<Enter>Miaow<Enter>

    would give you two statuses, "Hello" and "MiaowEnter Custom Message".

    It didn't seem worth fixing this much more since Gtk+ 3.2 will
    probably
    grow native support for placeholder text:
    <https://bugzilla.gnome.org/show_bug.cgi?id=440963>

 libempathy-gtk/empathy-status-preset-dialog.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

commit 096e82cbc6e05aa693991d215cefe0ace429d497
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Jun 10 20:56:35 2011 +0100

    PresetDialog: Allow >1 status to be removed at a time.

    This is pretty niche but we may as well. I want it sometimes. There's
    no
    reason to disallow it, and it's not like it adds any significant
    complexity.

 libempathy-gtk/empathy-status-preset-dialog.c | 38
 ++++++++++++++++-----------
 1 file changed, 22 insertions(+), 16 deletions(-)

commit 01de3488d0287dc430582faab72932f846ec09dc
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Jun 10 20:51:20 2011 +0100

    PresetDialog: Don't allow resizing status preset dialog

    It's big enough.

 libempathy-gtk/empathy-status-preset-dialog.c | 1 +
 1 file changed, 1 insertion(+)

commit 49887f9ba8d3442b193759806f0371b07428718b
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Jun 10 20:18:59 2011 +0100

    PresetDialog: make Add button less huge.

    I tried and failed to make it the same size as the other two
    buttons, so
    this will have to do.

 libempathy-gtk/empathy-status-preset-dialog.ui | 1 +
 1 file changed, 1 insertion(+)

commit 6e61e4ff4b72e31a1f31205c9db3dc6cea8e64a1
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Jun 10 20:07:35 2011 +0100

    PresetDialog: make the window taller

    The element we really care about the size of is the list of statuses
    past. So I moved the horizontal size request to that—the window
    has 6px
    of padding or so, so this makes it pretty much exactly the same
    width—and made the height request be in the golden ratio to it.

    I'm probably unusual in having enough statuses to fill my laptop
    screen
    vertically, but, subjectively, this makes the dialog look less stubby
    even now I've removed them all to test.

    https://bugzilla.gnome.org/show_bug.cgi?id=630943

 libempathy-gtk/empathy-status-preset-dialog.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 8f42bd47699c9453aae13f9169a27a4d9bb80bb2
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Jun 10 20:02:28 2011 +0100

    PresetDialog test: quit cleanly

    Previously one had to kill the process, but by just switching to
    gtk_dialog_run() we get more functionality for less code. :D

 tests/interactive/test-empathy-status-preset-dialog.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit bf6f2b56d3a8a03cde5cee2469057d5e44933eed
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Jun 10 14:20:14 2011 +0100

    PresenceChooser: remove unused #define FLASH_TIMEOUT

 libempathy-gtk/empathy-presence-chooser.c | 3 ---
 1 file changed, 3 deletions(-)

commit ea70cf03674e4c844e27062b4b13c306aae39d40
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 23 12:27:53 2011 +0100

    Add a empathy-streamed-media-window.ui file

    EmpathyCallWindow and EmpathyStreamedMediaWindow were sharing
    the same .ui file, but they weren't both implementing everything
    (right now StreamedMedia didn't handle the Dialpad menu item).

    So add a empathy-streamed-media-window.ui from before new stuff
    was added to empathy-call-window.ui.

 src/Makefile.am		      |   1 +
 src/empathy-streamed-media-window.c  |   2 +-
 src/empathy-streamed-media-window.ui | 947
 +++++++++++++++++++++++++++++++++++
 3 files changed, 949 insertions(+), 1 deletion(-)

commit a41f7343a478a81ca0f61fb84a80904001a67800
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Thu Jun 23 11:16:51 2011 +0200

    Updated Spanish translation

 po/es.po | 124
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 62 insertions(+), 62 deletions(-)

commit 5e4bdbca5400a13e65e8b821562e3f8538516272
Author: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date:	Wed Jun 22 21:08:48 2011 +0200

    Don't try to access empathy_adium_info_* stuff when webkit support
    is disabled

    empathy-preferences.c:(.text+0x5dc): undefined reference to
    `empathy_adium_info_get_available_variants'
    empathy-preferences.c:(.text+0x5e9): undefined reference to
    `empathy_adium_info_get_default_variant'

 src/empathy-preferences.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 6b79054213ba3dd70298aa75e17c234aef2f09af
Author: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date:	Wed Jun 22 20:56:04 2011 +0200

    Don't try to access adium theme when webkit support is disabled

    Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>

 libempathy-gtk/empathy-theme-manager.c | 2 ++
 1 file changed, 2 insertions(+)

commit 955bea1f3654668ae91eed4aa2f32d79a87189cf
Merge: 3c17630 2b92c53
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 23 09:02:03 2011 +0100

    Merge branch 'history-misc'

commit 2b92c53540d0a3f7570f06850ad01e611c1704b6
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jun 22 16:05:40 2011 +0100

    LogWindow: display the user id in a tooltip in the Who pane

    https://bugzilla.gnome.org/show_bug.cgi?id=573652

 libempathy-gtk/empathy-log-window.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 3c17630fc5ba3cf2cf35decf428b1075ec4a7e12
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Wed Jun 22 21:13:25 2011 +0200

    Updated Slovenian translation

 po/sl.po | 202
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 103 insertions(+), 99 deletions(-)

commit a2060ed1cebe60f382383178c7fd10c9ad8ffba4
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jun 22 15:30:55 2011 +0100

    LogWindow: show "Chat with <MUC>" for MUCs

    Instead of "Chat with <someone>", which is confusing as there
    may be (and most likely there are) many people in the room.

    https://bugzilla.gnome.org/show_bug.cgi?id=653175

 libempathy-gtk/empathy-log-window.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

commit 24e45ffb59d929e39d8ceea3ef04c73a5bcfc912
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 25 14:23:50 2011 +0200

    Use tp-glib password API (#651055)

 libempathy-gtk/empathy-chat.c |  10 ++--
 libempathy/empathy-tp-chat.c  | 136
 +-----------------------------------------
 libempathy/empathy-tp-chat.h  |  10 ----
 3 files changed, 8 insertions(+), 148 deletions(-)

commit 4f7fbd7ee74147e1f4897ca25d140da02ddceb93
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 30 15:36:36 2011 +0200

    use tp_channel_dispatch_operation_close_channels_async() when
    rejecting server auth channels

    We can't use it for other channel types as the EmpathyTp* object is
    doing some
    extra work.

 src/empathy-event-manager.c | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

commit a997201320e14d4bdca30391bd3c8d29224d0b26
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 30 15:25:36 2011 +0200

    call-observer: use
    tp_channel_dispatch_operation_leave_channels_async() (#651473)

    We now return from Observe() right after having called Claim(). That's
    what
    the spec suggests and not doing so would break Claim() which can't
    return
    while Observer didn't return from Observe.

 src/empathy-call-observer.c | 98
 +++++++++++++--------------------------------
 1 file changed, 27 insertions(+), 71 deletions(-)

commit 9cfab15b0c15b23d59d01e88c9efac0d0cf27433
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 22 09:10:58 2011 +0200

    depend on tp-glib 0.15.2

    We need it for the high level password API and
    tp_channel_dispatch_operation_close_channels_async().

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 19da124b23d0ab1f315b2461b9889bcd9b76869e
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Tue Jun 21 14:02:04 2011 +0200

    Updated Galician translations

 po/gl.po | 255
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 133 insertions(+), 122 deletions(-)

commit 3db97d5b3ec2854c522b9d2b378f2a65620a783d
Merge: b6984f0 005e206
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 21 13:55:54 2011 +0200

    Merge branch 'unread-653090'

commit b6984f0d3afa9241ede62496d6a65e0d86fd0f8b
Merge: b95223f 3caeda4
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Jun 21 12:52:47 2011 +0100

    Merge branch 'history-ui'

commit 005e206844be26a15012cc235927531bd3e38420
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 21 13:45:14 2011 +0200

    empathy-chat: properly count unread messages when the connection
    goes away (#653090)

 libempathy-gtk/empathy-chat.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit 3caeda43f0b6cda2ff6687db5eebaf86b103dbaa
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Jun 21 12:27:58 2011 +0100

    LogWindow: also show the spinner and expand the chats for searches

 libempathy-gtk/empathy-log-window.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

commit f8ca62c8d1ec38fb1e4e6ad975e1a1d40452d600
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Jun 21 10:47:41 2011 +0100

    LogWindow: allow to start actions from an event row

    If we don't know the contact by looking at the 'Who' pane (because
    e.g. there are many selected or it has 'Anyone'), look at the
    selected row (if any) in the events pane to determine the contact.

    https://bugzilla.gnome.org/show_bug.cgi?id=652278

 libempathy-gtk/empathy-log-window.c | 188
 +++++++++++++++---------------------
 1 file changed, 76 insertions(+), 112 deletions(-)

commit b3c999b6507650423c026cceb641a1a16bbb552f
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jun 20 18:44:18 2011 +0100

    LogWindow: expand the events when there's only one

    https://bugzilla.gnome.org/show_bug.cgi?id=652265

 libempathy-gtk/empathy-log-window.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit 2117ad312759f5bd1190d20dffb714a34444adb1
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jun 20 18:34:46 2011 +0100

    LogWindow: improve loading spinner

    https://bugzilla.gnome.org/show_bug.cgi?id=652279

 libempathy-gtk/empathy-log-window.ui | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

commit 5faa536ed6fc6ce21421900d4ddea64c61f5182a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jun 20 17:38:32 2011 +0100

    LogWindow: highlight the searched text

    https://bugzilla.gnome.org/show_bug.cgi?id=652522

 libempathy-gtk/empathy-log-window.c | 57
 ++++++++++++++++++++++++++++++++-----
 1 file changed, 50 insertions(+), 7 deletions(-)

commit b95223f0d32b6c8424341bf0c406e4422c831de6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 21 12:01:47 2011 +0200

    EmpathySearchBar: inherit from a GtkBox instead of a GtkBin

 libempathy-gtk/empathy-search-bar.c | 48
 ++-----------------------------------
 libempathy-gtk/empathy-search-bar.h |	4 ++--
 2 files changed, 4 insertions(+), 48 deletions(-)

commit aafefb7b6c4a17715e181bb2263423d950dca369
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 21 11:50:34 2011 +0200

    EmpathyIndividualLinker: inherit from a GtkBox instead of a GtkBin

 libempathy-gtk/empathy-individual-linker.c | 34
 ++----------------------------
 libempathy-gtk/empathy-individual-linker.h |  4 ++--
 2 files changed, 4 insertions(+), 34 deletions(-)

commit 9f03fdbe713fb5664626e19fa1b58e7eb4ca7e50
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 21 11:19:00 2011 +0200

    EmpathyChat: inherit from a GtkBox instead of a GtkBin

    This allows us to get rid of the size_allocate method.

 libempathy-gtk/empathy-chat.c | 30 ++----------------------------
 libempathy-gtk/empathy-chat.h |  4 ++--
 2 files changed, 4 insertions(+), 30 deletions(-)

commit 946db1000fbbf2c04174bbbd2d84a1288ec4fe2d
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Mon Jun 20 20:22:57 2011 +0200

    Updated Slovenian translation

 po/sl.po | 189
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 97 insertions(+), 92 deletions(-)

commit 508639fd1bdf942f6a9fef1e501a1977d3451c21
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Jun 20 19:43:45 2011 +0200

    Updated Spanish translation

 po/es.po | 202
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 103 insertions(+), 99 deletions(-)

commit 04ab5d6190a94bcf5db98ff8f857fd20d61ef332
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jun 20 16:13:26 2011 +0100

    LogWindow: Add a border between the three search panes

 libempathy-gtk/empathy-log-window.ui | 3 +++
 1 file changed, 3 insertions(+)

commit 255c0f9f01429eef62c54efd7731af5cc3a9b90b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 20 15:38:38 2011 +0200

    individual-widget: use tp_g_signal_connect_object to connect the
    notify::contact-info signal (#652496)

 libempathy-gtk/empathy-individual-widget.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 5f6f70aa1e354af05675aa601ec168a879a1b8d2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 20 13:26:55 2011 +0200

    chatroom: don't leak the subject

 libempathy/empathy-chatroom.c | 1 +
 1 file changed, 1 insertion(+)

commit 6e05d6a2c75fe87e76c509ba3bf73b4ab44e8a12
Merge: 1b47c6c 4f4c33a
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Jun 20 11:06:48 2011 +0100

    Merge branch 'message-editing-rebase'

commit 1b47c6c449aa0b884a1029871278396f1d6d6406
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sun Jun 19 17:37:19 2011 +0200

    Updated Norwegian bokmål translation.

 po/nb.po | 247
 ++++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 182 insertions(+), 65 deletions(-)

commit d7c1b76be146ae5ffa9a713c75351c3237227786
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Sun Jun 19 11:50:41 2011 +0200

    Updated Spanish translation

 po/es.po | 118
 ++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 52 insertions(+), 66 deletions(-)

commit 217a9035dfe207ee243bb47bfa65dfa631c1660c
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Thu Jun 16 18:06:26 2011 +0200

    Updated Slovenian translation

 po/sl.po | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

commit e4195fde9427f63205b4cbb71641f599b2476bcf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 16 12:57:38 2011 +0100

    geocode_cb: actually destroy the resolved hash table, not the
    GAsyncResult result...

 libempathy/empathy-contact.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5aa6b7a616bbdb3a8f826831259f5d23a622d8d4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 16 12:45:35 2011 +0100

    cope with geocode_object_new_for_params returning NULL

 libempathy/empathy-contact.c | 2 ++
 1 file changed, 2 insertions(+)

commit 6e163c9e8f82c6f1943e2a361d8d941a824cd105
Author: krishnababu k <kkrothap@redhat.ocm>
Date:	Wed Jun 15 20:30:34 2011 +0530

    Corrections in Telugu file

 po/te.po | 1498
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 746 insertions(+), 752 deletions(-)

commit 3a1ca5a962eef416f19f7082246a7b2249fe7121
Merge: eacf74c c22df19
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Jun 15 11:00:33 2011 +0100

    Merge branch 'accounts-dialog-attractive'

commit c22df1977b4c9cc7c8b33e24b4f76f8a62310567
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Jun 15 10:25:42 2011 +0100

    Make the accounts-dialog attractive and GNOME3ish

 src/empathy-accounts-dialog.c	| 11 +++++
 src/empathy-accounts-dialog.ui | 99
 ++++++++++++++++++++----------------------
 2 files changed, 59 insertions(+), 51 deletions(-)

commit eacf74cb753138246a59d4e911adf190bb717b0b
Author: krishnababu k <kkrothap@redhat.ocm>
Date:	Wed Jun 15 15:22:09 2011 +0530

    Updated Telugu Translations done by Praveen Illa

 po/te.po | 4701
 +++++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 3263 insertions(+), 1438 deletions(-)

commit cf1e01a88cfee6c092c8f3bec8d5c0efad8c5ce2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jun 15 09:30:59 2011 +0100

    Update telepathy-yell submodule

 telepathy-yell | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a4479888dbe3805bd988845517937a8d391234de
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Tue Jun 14 18:35:05 2011 +0200

    Updated Slovenian translation

 po/sl.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 42ff9c946b756603b789a18a31a08d60aeddb6a5
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Tue Jun 14 18:21:34 2011 +0200

    Updated Slovenian translation

 po/sl.po | 83
 +++++++++++++++++++++++++---------------------------------------
 1 file changed, 32 insertions(+), 51 deletions(-)

commit 4cb792eb96fc4d38aa49614fc378e70d2dfc508a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 14 10:39:30 2011 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2dd5ba424137015582904b7092c5157e419c4b60
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 14 10:20:17 2011 +0100

    prepare 3.1.2.1

 NEWS	      | 17 +++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

commit 5c78cf4cdb5dfc43a10263bd3854dfc5c97513f6
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Jun 14 09:47:39 2011 +0100

    Add autogenerated marshal files to .gitignore

 src/.gitignore | 1 +
 1 file changed, 1 insertion(+)

commit c72f264918a8ff75bc8df3ddbac7123323d3de51
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jun 13 08:21:52 2011 +0100

    Add a translator comment.

    https://bugzilla.gnome.org/show_bug.cgi?id=652345

 libempathy/empathy-message.c | 1 +
 1 file changed, 1 insertion(+)

commit ba7f23c447a3eab5859811e7096588c7c971a684
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jun 13 08:20:28 2011 +0100

    Require telepathy-logger 0.2.10

    As it fixes a crash that affects the new history window.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4f4c33a6cab809bae137b9141e0c1697f951e9ec
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Jun 13 17:00:06 2011 +0100

    Only decrement unread_messages if it's not an edited message

    Prevents ending up with message counts of -1

 libempathy-gtk/empathy-chat.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit fa8a602e9717c2fa778a9f375fb4da407ee7d625
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Jun 13 16:47:16 2011 +0100

    Use an enum instead of the value type to determine what kind of
    object it is

 libempathy-gtk/empathy-theme-adium.c | 77
 ++++++++++++++++++++++++++----------
 1 file changed, 57 insertions(+), 20 deletions(-)

commit 8942f527929c370bb7cc7f1f57f4457cc2c163e1
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 27 11:38:31 2011 +1000

    Bump to released TPL version 0.2.10

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 830ced19dc7166bbb5aafba8db7d9dfc12e8aae2
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 27 10:31:57 2011 +1000

    Update for new TPL API, we now get timestamp and edit_timestamp

    This makes it backwards to what we get in Telepathy, but we can
    manage by
    translating it into the Telepathy form.

 libempathy/empathy-message.c | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

commit e0dd22a058f51c159937ebf9a4af7edbd386b02f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 25 17:13:52 2011 +1000

    Reset the chat state after receiving an edited message

 libempathy-gtk/empathy-chat.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

commit 2d91c5513fce276eb8a65a463119a80609a4eeb7
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 25 17:10:12 2011 +1000

    Replace tpl_text_event_dup_supersedes() with synthetic message

    This allows us to handle the case where we get b-supersedes-a,
    but we've lost
    the original message a.

 libempathy-gtk/empathy-chat.c | 42
 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

commit 3884ef55323a4060d043d37d565af3a8c2e9a293
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu May 26 12:18:36 2011 +1000

    Add 'original-timestamp' to EmpathyMessage

 libempathy/empathy-message.c | 37 +++++++++++++++++++++++++++++++++++++
 libempathy/empathy-message.h |  1 +
 2 files changed, 38 insertions(+)

commit 20cb884ca67835dfa20703c55763f613a41551a2
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 20 15:38:06 2011 +1000

    Set the edited icon for edited messages in the log viewer

 libempathy-gtk/empathy-log-window.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 878a1b3a5204e9713e9ce6203af14cb51c6f96af
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 20 15:25:58 2011 +1000

    Get the original message from the logger so we can supersede it

    Strictly, we don't need to do this, we could just use the
    supersedes-token
    as the message-token and we'd still be able to edit the messages in
    the future,
    but this way we get the nice pretty annotation saying that we edited
    it and
    when.

 libempathy-gtk/empathy-chat.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

commit 7d48e0689c9c13bfeb7dbc21854a87dfc58a3005
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 20 15:25:46 2011 +1000

    Set 'token' and 'supersedes' for events from the logger

 configure.ac		      |  2 +-
 libempathy/empathy-message.c | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

commit 04986511e537b4a5d90cc13f63580984e6fa1318
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 20 13:02:45 2011 +1000

    Add an icon to edited messages

    Currently this is using "format-text-direction-ltr" which is a
    crappy choice.
    We should ask for a better icon. Also, this should really be
    implemented as
    a class, so that the icon can change with the theme. Or be made part
    of the
    Adium theme, or something. Basically this is kludgey.

 libempathy-gtk/empathy-images.h      |  2 ++
 libempathy-gtk/empathy-theme-adium.c | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

commit 6b13df746bc564a8ee72d1575315c007100262ce
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 20 13:02:22 2011 +1000

    Add a tooltip saying when the message was edited

 libempathy-gtk/empathy-theme-adium.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit b87566f46243257310b6d3b5e9b8fc25a0f6954d
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 18 16:04:26 2011 +1000

    [theme-adium] implement edit_message()

    This is done via DOM manipulation, we find the id for the <span>
    tag we
    wrapped the message in in the previous commit. We then replace
    the innerHTML
    with the new message.

    This requires a version of WebKitGtk 1.3.x, but I'm not precisely
    sure what. I
    used WebKitGtk 1.4.0, but natty only has 1.3.13, so we'll try setting
    that as
    the dep.

    Need to somehow mark a message as edited. Could set a class on it,
    but that
    requires support in the theme. Need inspiration here.

 configure.ac			      |  2 +-
 libempathy-gtk/empathy-theme-adium.c | 68
 ++++++++++++++++++++++++++++++++++--
 2 files changed, 67 insertions(+), 3 deletions(-)

commit cb482b907f6d3e062ef77a104557e205cd1bbb90
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Mon Jun 13 17:51:28 2011 +0200

    Updated Slovenian translation

 po/sl.po | 1410
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 850 insertions(+), 560 deletions(-)

commit 0569ded29dbab08462670e4780fb17ec5e4950ff
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 18 15:57:55 2011 +1000

    [theme-adium] wrap the messages in <span id=...> so we can find
    them again

    This will enable our DOM manipulation

 libempathy-gtk/empathy-theme-adium.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

commit 97efba6e5ce4eb5d85005281b2b8b0a95f8c0dd8
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 18 15:56:40 2011 +1000

    Pass edited messages through to the ChatView

 libempathy-gtk/empathy-chat.c | 43
 ++++++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 15 deletions(-)

commit a4e44071b6bf128f4150a19e5b60975cae9218b2
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 18 12:52:29 2011 +1000

    Add edit_message() method to ChatView iface

 libempathy-gtk/empathy-chat-view.c | 12 ++++++++++++
 libempathy-gtk/empathy-chat-view.h |  4 ++++
 2 files changed, 16 insertions(+)

commit 44edc9fc835feaa279b5c20269a07aecff9e38cc
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 20 11:34:31 2011 +1000

    Add 'supersedes' property to EmpathyMessage

    It would be nice to remove EmpathyMessage, because now that TpMessages
    are a
    GObject, EmpathyMessage is just an empty abstraction layer that we
    have to
    keep punching through.

 libempathy/empathy-message.c | 42
 ++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-message.h |  2 ++
 2 files changed, 44 insertions(+)

commit 29ab54db065d7753aebd5501680fb91049011fce
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 18 12:51:43 2011 +1000

    Add 'token' property to EmpathyMessage

    This allows us to pass the 'message-token' from the TpMessage through
    to the
    chat-view.

 libempathy/empathy-message.c | 30 ++++++++++++++++++++++++++++++
 libempathy/empathy-message.h |  1 +
 2 files changed, 31 insertions(+)

commit 7c5097eea06fa807dff6cefdc42817647f831490
Author: Abduxukur Abdurixit <abdurixit@gmail.com>
Date:	Sat Jun 11 23:39:11 2011 +0200

    Added UG translation

 po/ug.po | 1936
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1224 insertions(+), 712 deletions(-)

commit cdcd685e0ced11bc3bcae0a641d656be052bd343
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Jun 11 12:08:38 2011 +0200

    Updated Spanish translation

 po/es.po | 290
 ++++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 212 insertions(+), 78 deletions(-)

commit 04235c04df16079a82076fe1bcef8882a315e80e
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sat Jun 11 01:59:48 2011 +0200

    Updated Galician translations

 po/gl.po | 1002
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 613 insertions(+), 389 deletions(-)

commit 51ddfed4916ba4f68196415c95ea6017669a0de1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 10 15:42:14 2011 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2cc2b38997bba7a93277f0b09499f24674a7a8de
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 10 15:34:49 2011 +0200

    add Chat_Manager.xml to EXTRA_DIST

 extensions/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit 84d12d32bb206c48ce45c416258f0c1316c2378b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 10 14:49:30 2011 +0200

    Prepare 3.1.2

 NEWS	      | 75
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 release.py   |  2 +-
 3 files changed, 78 insertions(+), 3 deletions(-)

commit c8beb5910b162e26e94c13a57d7d3213f9a3ef84
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Jun 10 12:47:56 2011 +0100

    Cope with tpl_event_get_receiver() returning NULL

 libempathy-gtk/empathy-log-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit 65fac9c002b47ba0c8a3e4e0d6c4fa9494b2f771
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 10 12:39:42 2011 +0200

    Rationalize use of EMPATHY_IMAGE_CALL_* images (#652270)

    We now always use call-start for incoming and outgoing calls and
    call-stop for
    missed ones. Ideally it would be cool to have different icons for
    incoming and
    outgoing but that will do for now.

 libempathy-gtk/empathy-images.h     | 5 +++--
 libempathy-gtk/empathy-log-window.c | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

commit 4b892eeb5e6c85706e14a28f5e7e5b9cd4fcd23e
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Jun 10 12:53:10 2011 +0300

    Updated Hebrew translation.

 po/he.po | 244
 +++++++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 183 insertions(+), 61 deletions(-)

commit 585b25ad427f22c33b8e7344acc051a1c07e1fb9
Merge: f680565 3fe402f
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Jun 10 09:32:28 2011 +0100

    Merge branch 'new-log-window'

commit 3fe402f9da25077cf075c55263c78d613c62687a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 9 16:52:05 2011 +0100

    Don't unref NULL pointers

    log_window_got_messages_for_date_cb() can return NULL for
    unknown event types, so don't unref the result in those
    cases.

 libempathy-gtk/empathy-log-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d49a19564bc1404c8536da85f97e22ae80e614e7
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 9 16:50:34 2011 +0100

    Don't require telepathy-logger with --enable-call

    Having it is required for displaying call events in the
    history window though.

 configure.ac			     | 38
 +++++++++++++++++++++++++++----------
 libempathy-gtk/empathy-log-window.c | 23 +++++++++++++++++++---
 libempathy/empathy-message.c	     | 12 +++++++++---
 3 files changed, 57 insertions(+), 16 deletions(-)

commit c5353cf8c819b549de202faa3326406f3638a899
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 9 14:57:14 2011 +0100

    empathy_contact_from_tpl_contact: check the accounts match

    Two contacts may not be the same if only their ids match, so
    also check the accounts.

    This was causing us to return the same contact from another
    account, which would cause "is-user" to not be properly set,
    confusing the log viewer.

 libempathy/empathy-contact.c | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

commit f6805650748b2851dcd22fa04901b91dd3ab0abd
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Jun 10 08:07:52 2011 +0300

    Updated Hebrew translation.

 po/he.po | 403
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 240 insertions(+), 163 deletions(-)

commit 0265c0ca2e832e5b1a68bdd2d40c62f64ad7233e
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Thu Jun 9 22:37:56 2011 +0200

    Updated Spanish translation

 po/es.po | 427
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 254 insertions(+), 173 deletions(-)

commit f135402a5c7fd43b4349ecb23c541b5540f36ba4
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Thu Jun 9 13:49:54 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 648
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 367 insertions(+), 281 deletions(-)

commit d74b660be9a8717615a01df58c3d7fa2a3d55bd0
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 9 12:49:12 2011 +0100

    Update empathy-log-window.ui for GTK+ 3

 libempathy-gtk/empathy-log-window.ui | 82
 ++++++++++++++++++++++++++++--------
 1 file changed, 64 insertions(+), 18 deletions(-)

commit ab11b8cd9cc3cba75af64f2ce7fbce042353d76e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 9 12:05:45 2011 +0100

    Fix typo

 libempathy-gtk/empathy-log-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4b4199bf5fa8b15db6de6016f8dbfa59b41d2d45
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 9 12:05:11 2011 +0100

    Remove unused variables

 libempathy-gtk/empathy-log-window.c | 4 ----
 1 file changed, 4 deletions(-)

commit e44cdbfd3407bb6801fed763da5ae3c332305d12
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 27 15:48:21 2011 +1000

    Use some markup to make the logs more readable

    Emotes are in italics. Sender's names are in bold.
    Mark emotes for translation since we've done that for messages.

 libempathy-gtk/empathy-log-window.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 22306d76874bd8931aa517d48331803fe6fa4c5a
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 27 15:47:57 2011 +1000

    Don't allow interactive searching on the log pane

 libempathy-gtk/empathy-log-window.c | 2 ++
 1 file changed, 2 insertions(+)

commit d2b2bd1716dbffd4b03422ff99111c04e1a975e6
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 27 15:37:55 2011 +1000

    Remove unrequired COL_WHAT_EXPANDER

 libempathy-gtk/empathy-log-window.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 2589cc3f824a7ccbea5ed016aa8ff40a7c3de1ae
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 27 15:36:25 2011 +1000

    [log-viewer] set search columns

 libempathy-gtk/empathy-log-window.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 9f2331fcb2254a28e17a607cc3f614187dd64af9
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 17 15:34:08 2011 +0100

    log_window_chats_set_selected: only act on normal rows

 libempathy-gtk/empathy-log-window.c | 5 +++++
 1 file changed, 5 insertions(+)

commit f68071937c2340fd5560c29f4502db146a459b5a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon May 16 18:25:48 2011 +0100

    Don't reset the alias when using empathy_contact_from_tpl_contact

    contact_set_property() calls empathy_contact_set_alias(), which
    tries to set the alias on the FolksPersona, but we don't want to
    do that when creating an EmpathyContact from a TplEntity. So just
    set priv->alias instead of passing it to g_object_new() instead.

 libempathy/empathy-contact.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit 4ee7e811f1686d7a24d951269f46dd8be682ff84
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 10 15:35:20 2011 +0100

    Use a weak ref to remove the tpcontact from the hashtable

    Conflicts:

	libempathy/empathy-contact.c

 libempathy/empathy-contact.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

commit 88c6ee078f25bc31c60308ca927118f8b1731972
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 10 09:31:24 2011 +0100

    LogWindow: Don't cut the log messages

 libempathy-gtk/empathy-log-window.c | 1 -
 1 file changed, 1 deletion(-)

commit 0fbbd7093243ca64a98ca6b81b2cf9e3439c041a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon May 9 19:53:32 2011 +0100

    LogWindow: better logic for the buttons sensitivity

 libempathy-gtk/empathy-log-window.c | 67
 ++++++++++++++++++++++++++++++-------
 1 file changed, 55 insertions(+), 12 deletions(-)

commit 577effbd7b0a97ce168105feb184ad5671db2bb6
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon May 9 19:51:34 2011 +0100

    empathy_contact_from_tpl_contact: set the TpContact

    If available, so we get extra info like capabilities.

    Based on a patch from Nicolas Dufresne.

    Conflicts:

	libempathy/empathy-contact.c

 libempathy/empathy-contact.c | 65
 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 50 insertions(+), 15 deletions(-)

commit 7e79c7c05aeee5497f31935ae79db1abee141875
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 3 13:37:50 2011 +0100

    LogWindow: don't crash if closed while retrieving logs

 libempathy-gtk/empathy-log-window.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 711272a739ab7add8972c5df146c24b62c0fdcf7
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 3 13:28:56 2011 +0100

    Show an spinner while logs are being retrieved

 libempathy-gtk/empathy-log-window.c  | 51
 ++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-log-window.ui | 56
 +++++++++++++++++++++++++++++++++---
 2 files changed, 103 insertions(+), 4 deletions(-)

commit ee8c16e7d70527760ebb2c5894dd85c545daa2e4
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 3 11:55:59 2011 +0100

    LogWindow: scroll the events view to the end

    Where newest messages are.

 libempathy-gtk/empathy-log-window.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit 90f40d91fb39eff7e64113411c3efa9f81803418
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 3 11:35:53 2011 +0100

    LogWindow: select the first normal date by default

 libempathy-gtk/empathy-log-window.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit a879702a4f71baac18c351a7c540d349ad8d20d0
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 3 11:22:42 2011 +0100

    LogWindow: set 'All accounts' by default

 libempathy-gtk/empathy-log-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 0f14ab8594d2867778bb96059ecad339cd16162d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue May 3 11:22:01 2011 +0100

    Add empathy_account_chooser_set_all

 libempathy-gtk/empathy-account-chooser.c | 24 ++++++++++++++++++++++++
 libempathy-gtk/empathy-account-chooser.h |  1 +
 2 files changed, 25 insertions(+)

commit f5288b26f8c6fc114ae50b99513ec37b7a1aa7fe
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Apr 28 12:33:31 2011 +1000

    Ensure tp-logger was compiled with Call support

 configure.ac | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit c9dc1e77d19bb525d8e69e59e53124d9a5c3ca60
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Apr 28 12:33:17 2011 +1000

    tp-logger 0.2.8 is required for Call support

    Conflicts:

	configure.ac

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 91eae10335e7802d95c1f80132aa206ac0f5e9ff
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 27 15:53:52 2011 +0100

    Display date and time in the event treeview

 libempathy-gtk/empathy-log-window.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit d77b0a9e495b8e20702824deef690dff6e43e95a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 27 15:10:18 2011 +0100

    Make the three panes a bit taller by default

 libempathy-gtk/empathy-log-window.ui | 1 +
 1 file changed, 1 insertion(+)

commit 0fecd9297170528afedbb3e8c3da92debbc41136
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 27 13:02:31 2011 +0100

    Add a clear icon to the search entry

 libempathy-gtk/empathy-log-window.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

commit a5a993d4b067029c8fc6c904762c12aec6740831
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 27 12:42:37 2011 +0100

    Don't use global variables

 libempathy-gtk/empathy-log-window.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

commit 716f0dfd75b38a218ce75b854e6e00c075f71cbb
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 27 11:47:25 2011 +0100

    Fix buttons to work again with multiselection

 libempathy-gtk/empathy-log-window.c | 83
 +++++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 35 deletions(-)

commit 4198f9e38072f8e36640af81db324e8787dc8e51
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 27 11:15:09 2011 +0100

    Use a define instead of hardcoding a magic number

 libempathy-gtk/empathy-log-window.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 652f53c7969e0df0ce9c1fa9b01fb2993f270121
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 27 11:07:07 2011 +0100

    Use a for instead of a do while to avoid returning early

    So we always free the stuff at the end of the function.

 libempathy-gtk/empathy-log-window.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit 6c7d3bb978f03da13cfc6dbef4d4a5b034283ce1
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 27 11:02:20 2011 +0100

    Don't leak the account and entity

 libempathy-gtk/empathy-log-window.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit e391423b415ea591dfd9c306508330e4d2be5484
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 27 10:59:08 2011 +0100

    Don't leak paths

 libempathy-gtk/empathy-log-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 17e3f7d1ac4f174141c21f7996cce34dd33f8c15
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 27 10:57:42 2011 +0100

    Compare against NULL

 libempathy-gtk/empathy-log-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 710b3bb90a2280396b954803fa73c243bf29bf69
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 27 10:53:31 2011 +0100

    Be neutral

 libempathy-gtk/empathy-log-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2d1b1e2d6e0ac8ee8c841c15938fde5a25ecd038
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 27 10:53:08 2011 +0100

    Style: use braces consistently

 libempathy-gtk/empathy-log-window.c | 42
 +++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 11 deletions(-)

commit ece7f43a1a51c679fdd9419411c3593ddb597354
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 27 10:47:45 2011 +0100

    Return early if the iter isn't a top level

 libempathy-gtk/empathy-log-window.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit 002bed41aa3e792e5367f9f996cd496461207783
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 27 10:44:36 2011 +0100

    Use a macro for magic numbers

 libempathy-gtk/empathy-log-window.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit dbfd14c60f1748e7608067a082d7a54434317440
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 27 10:41:27 2011 +0100

    Don't leak the account and entity

 libempathy-gtk/empathy-log-window.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

commit fcd9a97dbf9c6bf6e9e8c7ecd7f8cacdb5c34b4e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 27 10:36:43 2011 +0100

    Use tp_clear_pointer

 libempathy-gtk/empathy-log-window.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit baf7517f523381054f85810f0b2d4e20fe05e491
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Apr 26 23:52:20 2011 +0100

    LogWindow: group MUC events properly

 libempathy-gtk/empathy-log-window.c | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

commit 7c9bdd521147ee2f11c3f88de8f1c17c83fc2508
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Apr 26 22:38:00 2011 +0100

    LogWindow: check the 30min gap with the last message

 libempathy-gtk/empathy-log-window.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 0b1805580294ff8bafb80d61bf2dde4ab03a213d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Apr 26 22:23:44 2011 +0100

    LogWindow: find the corrent parent for chat events

 libempathy-gtk/empathy-log-window.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 5ba374369d6d95bc48b46c2d39205512bf663358
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Apr 26 21:02:32 2011 +0100

    LogWindow: Display /me messages properly

 libempathy-gtk/empathy-log-window.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

commit 11d6539fea44b435f42f43d1faac15c8e41a6bbf
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Apr 26 11:03:23 2011 +0100

    make check fixes

 libempathy-gtk/empathy-log-window.c | 2 +-
 po/POTFILES.in			     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 9f1815808fd5c7331d6c9866ce7c0606b846abf7
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Apr 26 10:56:59 2011 +0100

    Remove more dead code

 libempathy-gtk/empathy-log-window.c | 6 ------
 1 file changed, 6 deletions(-)

commit b6f9f49ea121fa1057a0b7b60a907051e7534d72
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Apr 26 10:28:23 2011 +0100

    Use a do while instead of a for loop where appropriate

 libempathy-gtk/empathy-log-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2815624c23a1a7acc9008926a1c2c513ef884c28
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Apr 26 10:25:33 2011 +0100

    Remove dead code

 libempathy-gtk/empathy-log-window.c | 3 ---
 1 file changed, 3 deletions(-)

commit 751af986ebacdebbb22f74c664ddddc4fe583c43
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Apr 26 10:24:06 2011 +0100

    Fix comment

 libempathy-gtk/empathy-log-window.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 1f1dcde3b69adf85047157f2816c171610019960
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Apr 26 10:21:58 2011 +0100

    Remove stray print statements

 libempathy-gtk/empathy-log-window.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit ab66619794d401c11ca30131bc4acbddaabe2db4
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Apr 26 10:20:09 2011 +0100

    Remove dead code

 libempathy-gtk/empathy-log-window.c | 30 ------------------------------
 1 file changed, 30 deletions(-)

commit d425a5037650360368a5c0da7358046b4e288097
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Apr 26 10:15:52 2011 +0100

    LogWindow: don't add duplicate dates

 libempathy-gtk/empathy-log-window.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

commit e168f565d9bb4ba7ccece873beb40fde959b8d29
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Apr 26 10:07:27 2011 +0100

    LogWindow: add 'Anyone' to search results

 libempathy-gtk/empathy-log-window.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit d423b12b76b8d5979340bdafb7e0532edde05eff
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Apr 26 10:02:20 2011 +0100

    LogWindow: select 'Anytime' by default when searching

 libempathy-gtk/empathy-log-window.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 30632ed84b27b97089e709688ddbc7f6fb0db69c
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Apr 25 16:04:48 2011 +0100

    Block the callback when clearing the store

 libempathy-gtk/empathy-log-window.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit 5f5c01b0844c63141a1f4bf7faaa7eea0553a239
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Apr 25 15:44:19 2011 +0100

    Switch remaining functions to the new style

 libempathy-gtk/empathy-log-window.c | 456
 +++++++++++++++++++-----------------
 1 file changed, 238 insertions(+), 218 deletions(-)

commit f1f313b03bb414cebfae33e34b7f7c3cc05253ee
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Apr 25 15:24:37 2011 +0100

    LogWindow: Add live search support

 libempathy-gtk/empathy-log-window.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

commit ce498170c595f9b6acec3a8a89f9f0fcb93f195d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Apr 25 15:11:40 2011 +0100

    LogWindow: Show dates properly

 libempathy-gtk/empathy-log-window.c | 54
 +++++++++++++++++++++++++++++++------
 1 file changed, 46 insertions(+), 8 deletions(-)

commit 3d69902551334b6a930116c6776fb84bb9a14b33
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Apr 25 13:23:09 2011 +0100

    LogWindow: Add multiselection to the 'When' pane

 libempathy-gtk/empathy-log-window.c | 143
 +++++++++++++++++++++++-------------
 1 file changed, 93 insertions(+), 50 deletions(-)

commit 58db428a7d1c832117fdab2446e7eae7c30db04f
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Apr 25 12:08:14 2011 +0100

    Stop processing logger calls when unneeded

 libempathy-gtk/empathy-log-window.c | 44
 ++++++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 8 deletions(-)

commit 9f9677ec63954a870daadfedd51359a631c43ea2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Apr 25 12:07:59 2011 +0100

    Add _tpl_action_chain_clear

 libempathy/action-chain-internal.h | 1 +
 libempathy/action-chain.c	    | 7 +++++++
 2 files changed, 8 insertions(+)

commit 62f5ed896ad09c54be054f6872a69b905db3b8c7
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Apr 25 10:35:23 2011 +0100

    Populate from 'Anyone' when changing the account

 libempathy-gtk/empathy-log-window.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

commit 4a8794ffe8898d4ddf25bff8a360c36ec8a4d9aa
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Apr 25 10:02:04 2011 +0100

    Make 'Anyone' work

 libempathy-gtk/empathy-log-window.c | 48
 +++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

commit 84424d0c20debc8366861a632b9046d24089e5dc
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Apr 22 12:46:33 2011 +0100

    LogWindow: Add multiselection to the 'Who' pane

 libempathy-gtk/empathy-log-window.c | 290
 ++++++++++++++++++++++++------------
 1 file changed, 195 insertions(+), 95 deletions(-)

commit b37d294b89a2a59f25c78a619aae871e25d6e77b
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Apr 22 09:43:00 2011 +0100

    LogWindow: Add multiselection to the 'What' pane

 libempathy-gtk/empathy-log-window.c | 45
 +++++++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 4 deletions(-)

commit 013aa1784ede94f87f24cb419ac6efbf2e95961b
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Apr 22 09:06:59 2011 +0100

    log_window_chats_get_selected -> log_window_get_selected

 libempathy-gtk/empathy-log-window.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit e899cd55697dba16f40d146ec3637ddd6f3bc53b
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon May 2 10:47:15 2011 +0100

    Don't free an uninitialized variable

 libempathy-gtk/empathy-log-window.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 8ff470e1b4aef8310f1cfb8627a46fd5a139489f
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 20 16:11:50 2011 +0100

    LogWindow: convert the event view to a treeview

    Following the design.

 libempathy-gtk/empathy-log-window.c  | 401
 +++++++++++++++++++++++++++++++----
 libempathy-gtk/empathy-log-window.ui |   5 +-
 2 files changed, 366 insertions(+), 40 deletions(-)

commit 65badd1d8579635ef44bbf7871a0e82d035a84c5
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 20 16:11:26 2011 +0100

    Add icons for missed/incoming/outgoing calls

 libempathy-gtk/empathy-images.h | 4 ++++
 1 file changed, 4 insertions(+)

commit 9e762d6902eed60649df3d7462ca7cd3a7ebe43a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 9 11:36:47 2011 +0100

    Adapt to the empathy-dispatcher removal

 libempathy-gtk/empathy-log-window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 346d5c25eae1e9bab5ab36cd66885d6bfbe0d262
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 20 09:32:56 2011 +0100

    Complete rewrite of the history window

    https://bugzilla.gnome.org/show_bug.cgi?id=619866

    Conflicts:

	libempathy-gtk/empathy-log-window.c
	libempathy-gtk/empathy-log-window.ui

 libempathy-gtk/empathy-log-window.c  | 2697
 +++++++++++++++++++++-------------
 libempathy-gtk/empathy-log-window.h  |   12 +-
 libempathy-gtk/empathy-log-window.ui |  430 ++----
 3 files changed, 1855 insertions(+), 1284 deletions(-)

commit f01e2c494ccb02637535b2419e80c172f85a5b5b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 9 13:30:10 2011 +0200

    empathy_individual_match_string: match if the string IS a prefix

 libempathy-gtk/empathy-ui-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 04d3b8f34e0cab394ac143b9323bd3d00a8abee7
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 20 09:29:02 2011 +0100

    account_chooser_find_account_foreach: check the col type

    As non ROW_ACCOUNT rows don't have an account.

 libempathy-gtk/empathy-account-chooser.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 2269bb1dbf55130f4ba625777dbbebc6407f9ce7
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 20 09:28:09 2011 +0100

    AccountChooser: add empathy_account_chooser_get_account_manager()

 libempathy-gtk/empathy-account-chooser.c | 8 ++++++++
 libempathy-gtk/empathy-account-chooser.h | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

commit 8d3f7406c2055e4483cdc9639f8463e48b521621
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 20 09:23:05 2011 +0100

    TplActionChain: add _tpl_action_chain_start()

 libempathy/action-chain-internal.h |  3 +++
 libempathy/action-chain.c	    | 18 +++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

commit 7a393000d1dd55dc60345f0b2bb51b44215d9607
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 20 09:21:49 2011 +0100

    Copy TplActionChain from telepathy-logger

 libempathy/Makefile.am		    |	2 +
 libempathy/action-chain-internal.h |  47 +++++++++++
 libempathy/action-chain.c	    | 169
 +++++++++++++++++++++++++++++++++++++
 3 files changed, 218 insertions(+)

commit 669b6782b2bb1c7275092f5923b8930cc2849c98
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 9 11:17:00 2011 +0100

    Handle unknown event types gracefully

 libempathy/empathy-message.c | 3 +++
 1 file changed, 3 insertions(+)

commit 36c30139b96a31bd00d81b73f83d3e5dc8f06bf2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 20 09:19:10 2011 +0100

    Don't ignore call events

    Conflicts:

	libempathy/empathy-message.c

 libempathy/empathy-message.c | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

commit 1ad9211ee247b05a11cc6d5358918611dd3a8fa9
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Mar 15 17:25:21 2011 +0000

    AccountChooser: All -> All accounts

 libempathy-gtk/empathy-account-chooser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 322ce4bfc48edf2331379809ab53b17254bcd8f2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Mar 15 16:40:01 2011 +0000

    Add a empathy_account_chooser_has_all_selected

    So we can know if 'All' is selected in the accounts chooser.

 libempathy-gtk/empathy-account-chooser.c | 24 ++++++++++++++++++++++++
 libempathy-gtk/empathy-account-chooser.h |  1 +
 2 files changed, 25 insertions(+)

commit 18f8901e810a6843f549b06680d9411d12901e5d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 9 10:42:58 2011 +0100

    Fix typo

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8944f13286ba5293781f2d57980da284cb2aa29d
Merge: 981a137 3f52e59
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 9 10:28:44 2011 +0100

    Merge branch 'call'

commit 3f52e59aa058c16a9ba115398681a16b1e289cd1
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 9 10:22:01 2011 +0100

    Update .gitignore for the new files

 data/.gitignore | 1 +
 src/.gitignore  | 1 +
 2 files changed, 2 insertions(+)

commit 54af9bea4d1e1f4e15207969f2ab89a012ad4d10
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 9 09:28:23 2011 +0100

    Turn g_prints into DEBUGs

 src/empathy-call-handler.c	     | 8 ++++----
 src/empathy-call-window.c	     | 6 +++---
 src/empathy-streamed-media-window.c | 2 +-
 src/empathy-video-src.c	     | 5 ++++-
 4 files changed, 12 insertions(+), 9 deletions(-)

commit 043b2fec4b21707ef62aebc3d80fc54c319e90f2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 9 09:26:00 2011 +0100

    Build fix

 libempathy-gtk/empathy-call-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 190ae6377f8b876062b503c31952b9e292068fd2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 9 09:17:54 2011 +0100

    Set 'Empathy' as program class in empathy-call

 src/empathy-call.c | 2 ++
 1 file changed, 2 insertions(+)

commit a59b409850d16d6612e1d1e02e9d67969b00d988
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 9 09:16:29 2011 +0100

    Port empathy-call to GtkApplication

    Based on the changes to empathy-av.

 src/empathy-call.c | 112
 ++++++++++++++++++++++-------------------------------
 1 file changed, 46 insertions(+), 66 deletions(-)

commit 70f3ecbecff1194994e950e0e34eaf45bab8a1b2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jun 8 20:07:34 2011 +0100

    CallWindow: properly track the dialpad status again

    This stopped working properly as the latest EvSidebar didn't
    have notify::current-page anymore.

 src/empathy-call-window.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

commit 523e8030211e4a0c84e3c5bec0c705818ca3c669
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jun 8 20:05:54 2011 +0100

    EvSidebar: add a changed signal

 src/ev-sidebar.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit d78ac0b3ee0d22b0b670216373e8b0db0b0479b0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 16 11:17:02 2011 +0100

    call-window: Put the details vbox in a scroll window

    Conflicts:

	src/empathy-call-window.c

 src/empathy-call-window.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit 033a72c1af2eeef7cae6d7f8712b56437ce787bd
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jun 8 19:06:36 2011 +0100

    Adapt to EmpathySidebar -> EvSidebar

 src/empathy-call-window.c | 25 ++++++++++++-------------
 telepathy-yell		   |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

commit 0d4971e462c733f212443c44d53690e9a6d41bc6
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Jun 7 11:20:11 2011 +0100

    Change the page before showing the sidebar

    To avoid showing it without the dialpad, which would cause
    the dialpad menu callback to be called to hide it before
    the page was changed, causing the sidebar to be hidden again!

 src/empathy-call-window.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 6e258dd8646083c5c17f71318901aad4f529d9ee
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Jun 7 11:19:24 2011 +0100

    Factor out the block/set/unblock code

 src/empathy-call-window.c | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

commit b1008464fa6550f3958a4acad3b8fc5ee5457207
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jun 6 13:21:33 2011 +0100

    Disable the dialpad when the call ends

 src/empathy-call-window.c | 1 +
 1 file changed, 1 insertion(+)

commit bd2690ad9d7a7920b5ab8df822fb282982cede22
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jun 6 11:29:07 2011 +0100

    Make it a toggle button

 src/empathy-call-window.c  | 61
 ++++++++++++++++++++++++++++++++++++++++------
 src/empathy-call-window.ui |  2 +-
 2 files changed, 55 insertions(+), 8 deletions(-)

commit 6bc173c8f3606c87ff0ba0be84140ac72a4b243c
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jun 2 11:29:00 2011 +0100

    CallWindow: add a dialpad menu entry

 src/empathy-call-window.c  | 18 ++++++++++++++++++
 src/empathy-call-window.ui |  7 +++++++
 2 files changed, 25 insertions(+)

commit a9f6738541b98e591e51bd321902acc5c8200d9b
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu May 26 20:43:46 2011 +0100

    Clear audio_output when the call ends

    So we create a new one when redialing instead of reusing it.

 src/empathy-call-window.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 9b81fd1bb7e9acee4fa68dd0b205593a2397761c
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon May 23 13:12:34 2011 +0100

    CallWindow: show 'On hold' in the statusbar when appropriate

 src/empathy-call-window.c | 41 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

commit f6a73795877708151ae8ea751553d4cebd23b968
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon May 23 12:41:35 2011 +0100

    Directly call the callback if we're ready

    Instead of duplicating the code in two places.

 src/empathy-call-window.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

commit e77ec8904ba6c4372c978ac51ce67d79dd90b869
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon May 16 16:43:59 2011 +0100

    Implement empathy_call_handler_start_call() for redialing

 src/empathy-call-handler.c | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

commit 039a108f7cc13f6fd587cf505cd43552e1a2a392
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon May 16 16:42:17 2011 +0100

    CallHandler: move on_call_accepted_cb() around

 src/empathy-call-handler.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

commit 11f851031af49234479be818c939c8d5edc2420b
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon May 16 16:40:21 2011 +0100

    CallHandler: emit signal with the correct parameters

 src/empathy-call-handler.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 62475a9a10093fc2ef93fcb5958c3f9dd29f28a3
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon May 16 16:37:21 2011 +0100

    Remove empathy_call_factory_new_call_with_streams

    It's unused and empathy_call_new_with_streams is better.

 src/empathy-call-factory.c | 52
 ----------------------------------------------
 src/empathy-call-factory.h |  6 ------
 2 files changed, 58 deletions(-)

commit 38e097caec45ba6faaf33b7077ac8795a5ff6b86
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed May 4 10:41:07 2011 +0100

    Correct the interface names used in Empathy.Call.client

 data/Empathy.Call.client | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 5616cdca13a978612a3762b6584c4f96dd7a334c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue May 3 20:03:34 2011 +0100

    Keep a persistent source video tee around

    Always keep the video input tee around, so we can easily hook up new
    video contents even if the camera isn't currently enabled. This fixes
    issues where a new content is added without the local camera being
    enabled.

 src/empathy-call-window.c | 38 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

commit dfd3e3b200d14c9dc1f9ccf8d8bb68efdb48fae3
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Apr 27 16:23:15 2011 +0100

    Don't build a shared telepathy-yell

 configure.ac | 3 +++
 1 file changed, 3 insertions(+)

commit 6d67672852072737fee47d2ef43031929520afd6
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Mar 24 14:20:37 2011 +0000

    Include yell before anything else

    Since we want to build against our copy of yell. Otherwise if
    you have yell installed in /usr, it'll be picked from there as
    we get -I/usr/include/telepathy-1.0 and telepathy-yell is installed
    as telepathy-yell/telepathy-yell.h in that directory.

 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e9d88fb3832f3014e8ed9aaf2ce5bb1f4b96fd49
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Mar 23 15:00:08 2011 +0000

    Minimize the scope in which we use TpyCallChannel

 src/empathy-call-window.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit 9b68b6c2bd3a55a817857575814d43145644f419
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Mar 23 14:45:56 2011 +0000

    Prepare the video input pipeline when there is an initial content

 src/empathy-call-window.c | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

commit 1db300a69d039838d68cd4af8fddbc404f31c74c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Mar 23 13:09:09 2011 +0000

    Wait for the channel to be ready before handling it

 src/empathy-call-factory.c | 51
 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 43 insertions(+), 8 deletions(-)

commit eceb49ae9be0555a9d1f5de1f6c4b72c05315cb1
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Mar 22 18:28:33 2011 +0000

    Use a new id for accepting without video

    Conflicts:

	src/empathy-status-icon.c

 src/empathy-notifications-approver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c849a5a953b0ffa1df1dc1383018dbc48254a2fa
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Mar 22 16:41:51 2011 +0000

    Also add Answer with video to the notification dialogs

    Conflicts:

	src/empathy-status-icon.c

 src/empathy-event-manager.c	      |  1 +
 src/empathy-event-manager.h	      |  1 +
 src/empathy-notifications-approver.c | 35
 ++++++++++++++++++++++++++++++++++-
 3 files changed, 36 insertions(+), 1 deletion(-)

commit 6b6213702cba10ca28494e44990f750569856217
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Mar 22 16:40:33 2011 +0000

    Add Answer with video to the default dialogs

    We should be able to answer calls with or without video. This
    patch only
    implements that for Call type channels, but for clarity have ``Answer
    with video'' as the only button on SM channels for video calls to be
    sure it's clear to the user what to expect

 src/empathy-event-manager.c | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

commit f7a474ccd13b1dd5da8c7000b9dd7e347ec5171e
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Mar 22 13:18:37 2011 +0000

    Follow the sending state of the channel to determine whether we
    should send video

 src/empathy-call-window.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

commit f2716880b947f4c47a33f1f9347e0454d3b48d4e
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Mar 17 11:41:25 2011 +0000

    When the remote side hangs up, clean up the call channel

 src/empathy-call-handler.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit 2ca45f96fa9f54295cd0416842192cf6e7be671d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Mar 17 11:35:46 2011 +0000

    Cope with unexpected call channel invalidation

 src/empathy-call-handler.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit cf83cc9c5a936c88e7e22033956001c4638b7d14
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Mar 17 11:31:25 2011 +0000

    Use modern private structure handling

 src/empathy-call-handler.c | 4 ++--
 src/empathy-call-handler.h | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

commit b49fd754dd479be529fc12d2e82498ed02d31512
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Mar 17 11:29:38 2011 +0000

    Correct Call channel refcounting

    The Call channel will get unreffed by the destroy function that's
    given
    to empathy_tp_contact_factory_get_from_id. So don't unref it in the
    callback explicitely

 src/empathy-call-factory.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 7992d97253ff1cecb4281191d0af459799ce9a21
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Mar 15 19:06:20 2011 +0000

    Don't start the Call when the streams start

    Since that can happen before the call is accepted. Instead of that,
    wait for the Call state to be ACCEPTED.

    Conflicts:

	src/empathy-call-window.c

 src/empathy-call-handler.c |  9 +++++++++
 src/empathy-call-window.c  | 28 +++++++++++++++-------------
 2 files changed, 24 insertions(+), 13 deletions(-)

commit 6786331e5d8411c48e0b2700cb20c434add2845d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Mar 14 18:43:57 2011 +0000

    client file channel file should be Call.DRAFT

 data/Empathy.Call.client | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit dd332efd3b0abfa789a54a03f105bdf04e0c9b78
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Mar 14 13:48:04 2011 +0000

    Add depend on new GStreamer for gst_element_request_pad

    Conflicts:

	configure.ac

 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 7253d660e407204ad205feb331fe152f8fff7843
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Mar 14 13:23:19 2011 +0000

    Reject approval if call was hung up during approval

    If an incoming call gets ENDED during our approval stage either we or
    someone else closed it. In that case reject the approval (which will
    claim and close the channel). A future improvement could be to show a
    notification in case this happens

 src/empathy-event-manager.c | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

commit 11c8e825a7e2a11ae46b567ca3ddf709c0a0e6c8
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Mar 14 12:14:32 2011 +0000

    Only distroy the video output if it exists

 src/empathy-call-window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit a1e3e5d9510ede8853fd74ff53ac3ecb7f1c141f
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Mar 14 12:14:13 2011 +0000

    Monitor the call state and close the channel when it ends

 src/empathy-call-handler.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit 5716e75e552c3e6431e5fc37169a9fa293cc80e6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Mar 14 11:09:23 2011 +0000

    Lock the hash table contents when using them

 src/empathy-audio-sink.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

commit 0679051ae7301209a9eab4bd4995535f119e3462
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Mar 14 09:37:43 2011 +0000

    Ensure our bin doesn't change state before being in the hash table

 src/empathy-audio-sink.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

commit c944633078a0769de5e50082e1d8b9e91565f940
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Mar 11 19:02:43 2011 +0000

    Remove live-adder

 src/empathy-call-window.c	     | 116
 +++++------------------------------
 src/empathy-streamed-media-window.c | 119
 +++++-------------------------------
 2 files changed, 30 insertions(+), 205 deletions(-)

commit e9fb5d29ff44ae35411b02c3715ae9650b61dd25
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Mar 11 19:01:17 2011 +0000

    Implement request pads for multiple sinks

    Instead of using an live-adder we're moving to using multiple
    pulseaudio
    sinks as pulse can do the right thing (tm). To make this easy for the
    call window have one bin that handles all the juggling of audiosinks
    and
    audio conversion

 src/empathy-audio-sink.c | 274
 +++++++++++++++++++++++++++++++++++++++--------
 src/empathy-audio-sink.h |   2 +
 2 files changed, 230 insertions(+), 46 deletions(-)

commit 8cbd6a5c6addfd360bdd274ac60e3c035b2ebc9b
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Feb 24 15:25:54 2011 +0000

    Keep a ref to our handler instance

 src/empathy-event-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b99045fc699ced3076e6a16a8b8bbf015aaa5e23
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 23 19:05:56 2011 +0000

    More consistent naming of the call handler option

 configure.ac | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit fb14bb8eda81211a5122cff01ca2394cdd46bd2d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 23 18:30:14 2011 +0000

    make the dots consistent

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b51267374d508af1f8554476af0c771f330ff813
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 23 18:29:30 2011 +0000

    auto-detect the presence of farsight

 configure.ac | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

commit 83cd1c694ff13c9a72a7b45ca5c6eb7e085de4f7
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 23 16:50:20 2011 +0000

    No need to borrow the connection, it gets passed to us

 src/empathy-event-manager.c | 1 -
 1 file changed, 1 deletion(-)

commit 1c1d3aeebb5a8df81af66cf89df5183edd941fa1
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 23 16:50:06 2011 +0000

    Trivial coding style fix (>80 chars)

 src/empathy-event-manager.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 69f9dbdb487ac77e506aca37706141fbcccffccf
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 23 16:49:26 2011 +0000

    Retrieve the contact for incoming calls so we can display it

 src/empathy-event-manager.c | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

commit 0d3fa03b5a9b8d2d9737c8f39aada70669fde194
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 23 16:45:16 2011 +0000

    Stop ringing after approving a Channel.Type.Call channel

 src/empathy-event-manager.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 2f449f6afa43994b4431b07c3ed582b6408a0533
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 23 16:44:55 2011 +0000

    event-manager Remove HAVE_CALL ifdefs, even if we didn't build the
    handler we can still approve

 src/empathy-event-manager.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

commit edce6cf46f60c02c178e386a0f27a05e4309814d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 23 16:44:05 2011 +0000

    Close call channels after hanging up

 src/empathy-event-manager.c | 1 +
 1 file changed, 1 insertion(+)

commit 808cacc3f55f380743c459648ee8ebe3d4835e36
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 23 14:26:15 2011 +0000

    Explicitely use the libtelepathy-yell .la file for dependency tracking

    Conflicts:

	libempathy/Makefile.am

 libempathy/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 550aad6f3bbc7840adacd721a573b7f0d976485f
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 23 11:20:34 2011 +0000

    Remove stray debug

 src/empathy-call-handler.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

commit c850d9b17d93c4e964c95bbaa526008f2431f912
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 23 11:39:35 2011 +0000

    Only change the UI in the main thread

 src/empathy-call-window.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

commit 612006042bfb3455072203b6afc3f1c6aa1462a0
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 23 11:38:54 2011 +0000

    Use target-contact instead of members

 src/empathy-call-window.c | 74
 ++++++++++++-----------------------------------
 1 file changed, 18 insertions(+), 56 deletions(-)

commit 5ba6968d314c8830ab7fb8b0be07b3fa6dc23d06
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 23 11:28:23 2011 +0000

    Move to using ->priv pointer in the object instance

 src/empathy-call-window.c | 12 +++++-------
 src/empathy-call-window.h |  2 ++
 2 files changed, 7 insertions(+), 7 deletions(-)

commit 5d709fede1e2cc6e5d3d54d30a5f3aed0752994a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 23 11:14:32 2011 +0000

    coding style trivia

 src/empathy-call-factory.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 2d6c887b9369e2db3c3bff166ee6c2c8a595faa4
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 23 11:14:06 2011 +0000

    Add TargetContact property that's guaranteed to exist on CallHandler

    Conflicts:

	src/empathy-call-factory.c

 src/empathy-call-factory.c | 34 ++++++++++++++++++++++++++++------
 src/empathy-call-handler.c | 22 +++++++++++++++++++++-
 src/empathy-call-handler.h |  3 ++-
 3 files changed, 51 insertions(+), 8 deletions(-)

commit a6b59ff12bf5563ad4db0427c0c9e41bd8842c25
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 23 11:12:07 2011 +0000

    Recognize Call channel capabilities

 libempathy/empathy-contact.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

commit 15bc6e462986ae39f8a2880b60274be9b8d45114
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 23 10:42:23 2011 +0000

    Don't use wildcards for just one marshal file

    When a build is triggered from a location that isn't the top
    build dir,
    the generated files break as the wrong prefix gets passed for some
    reason. Given we only create one -marshal file, being smart doesn't
    actually save us anything, so do things the simple way

 libempathy/Makefile.am | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit d871bf3cfa46354371d6f99d1a5f182761313d71
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Mar 11 14:42:14 2011 +0000

    Add a .client and a .service file for empathy-call

    https://bugzilla.gnome.org/show_bug.cgi?id=644500

 data/Empathy.Call.client			     | 21
 +++++++++++++++++++++
 data/Makefile.am				     |	9 +++++++--
 ...desktop.Telepathy.Client.Empathy.Call.service.in |	3 +++
 3 files changed, 31 insertions(+), 2 deletions(-)

commit 9be16f5be776b52b54f6fc9b4f8bccb167177162
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Mar 10 15:12:15 2011 +0000

    Check for TP_ERROR_EMERGENCY_CALLS_NOT_SUPPORTED when a call fails

 libempathy-gtk/empathy-call-utils.c | 2 ++
 1 file changed, 2 insertions(+)

commit 2906ba60cc084087fae19ee7060a661686f11ab6
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Feb 24 16:22:15 2011 +0000

    Add missing files to POTFILES.in

    Conflicts:

	po/POTFILES.in

 po/POTFILES.in | 3 +++
 1 file changed, 3 insertions(+)

commit a826ef6e4581c57834e1286b48afdc87ec8244c2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Feb 28 12:29:40 2011 +0000

    Return meaningful errors when starting a call fails

 libempathy-gtk/empathy-call-utils.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

commit 1cacc0945f81e0513013b83ca7488589dd6c61f7
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Feb 23 16:24:53 2011 +0000

    empathy_call_new_with_streams: prefer StreamedMedia over Call

    Conflicts:

	libempathy-gtk/empathy-call-utils.c

 libempathy-gtk/empathy-call-utils.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

commit 36581b216476e337425ca8737aa7059062a81d99
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Feb 23 16:19:48 2011 +0000

    Always build telepathy-yell and handle Call channels

    Just keep empathy-call optional.

    Conflicts:

	libempathy-gtk/empathy-call-utils.c
	libempathy/empathy-channel-factory.c

 configure.ac				  |  4 ++--
 libempathy-gtk/empathy-call-utils.c	  | 27 +--------------------------
 libempathy-gtk/empathy-new-call-dialog.c |  7 +------
 libempathy/empathy-channel-factory.c	  |  6 +-----
 src/empathy.c				  |  4 +---
 5 files changed, 6 insertions(+), 42 deletions(-)

commit a5e92745d265b5623c045b6cc90164af89b25ded
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Feb 22 18:15:07 2011 +0000

    Show an error dialog if starting a call fails

 libempathy-gtk/empathy-call-utils.c | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

commit 5e797f1df68283302038c9723604c87f476a0656
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Feb 22 18:14:07 2011 +0000

    Don't require EmpathyContacts to start a call

    Conflicts:

	libempathy-gtk/empathy-contact-menu.c
	libempathy-gtk/empathy-individual-menu.c
	libempathy-gtk/empathy-new-call-dialog.c

 libempathy-gtk/empathy-call-utils.c	  | 18 ++++++-------
 libempathy-gtk/empathy-call-utils.h	  | 11 +++-----
 libempathy-gtk/empathy-contact-menu.c	  |  8 ++++--
 libempathy-gtk/empathy-individual-menu.c |  8 ++++--
 libempathy-gtk/empathy-new-call-dialog.c | 43
 ++------------------------------
 src/empathy-call-factory.c		  |  3 ++-
 src/empathy-streamed-media-handler.c	  |  3 ++-
 7 files changed, 30 insertions(+), 64 deletions(-)

commit 0754b2673f0189e892074189535d3dfb6fd2a662
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Feb 22 17:15:11 2011 +0000

    Move empathy_call_* util functions to libempathy-gtk

    Since we want to pop up a dialog when starting a call fails.

    Conflicts:

	libempathy/empathy-utils.c

 libempathy-gtk/Makefile.am		  |   2 +
 libempathy-gtk/empathy-call-utils.c	  | 174
 +++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-call-utils.h	  |  46 ++++++++
 libempathy-gtk/empathy-contact-menu.c	  |   1 +
 libempathy-gtk/empathy-individual-menu.c |   1 +
 libempathy-gtk/empathy-new-call-dialog.c |   1 +
 libempathy/empathy-utils.c		  | 133 -----------------------
 libempathy/empathy-utils.h		  |  12 ---
 src/empathy-call-factory.c		  |   2 +
 src/empathy-streamed-media-handler.c	  |   2 +
 10 files changed, 229 insertions(+), 145 deletions(-)

commit f72a2717725a4865ebd313f7a496bd0e4f99baca
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Feb 22 11:24:26 2011 +0000

    Initialize GObject

    Conflicts:

	src/empathy.c

 src/empathy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7a9b33315229b4747a1b55741ca0493458181a22
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Feb 21 14:32:22 2011 +0000

    Temporarily disable some code

 src/empathy-call-handler.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit e71003c3547c3ecf62813c7716953d745628f8f7
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Feb 21 14:31:50 2011 +0000

    Call: check for priv->members to enable the video button

 src/empathy-call-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3c218b8490700d973fb049037e37c3a3e58c11f7
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Feb 18 17:05:33 2011 +0000

    Use the new empathy_call_create_call_request thoroughly

 src/empathy-call-factory.c | 20 +-------------------
 src/empathy-call-factory.h |  5 -----
 src/empathy-call-handler.c |  2 +-
 3 files changed, 2 insertions(+), 25 deletions(-)

commit 3c325292c4321da02ee0bc44a047202905767cc2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Feb 21 15:27:33 2011 +0000

    Don't use tpy_call_channel_is_receiving_video

    Rely on src-pad-added to show the remote user's video.

 src/empathy-call-window.c | 36 ++----------------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

commit 6f62cdace76e62b3ec32c3a83b99db1ef6636dfd
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Feb 21 15:41:16 2011 +0000

    Don't use tpy_call_channel_is_sending_video

    Check if we have initial video instead.

 src/empathy-call-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9f5331305a835383471406db7e66e0d9c1b97db3
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jun 8 16:02:33 2011 +0100

    Use EMPATHY_CALL_BUS_NAME_SUFFIX instead of the literal

 src/empathy-call-factory.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 88c7ff0d33171e9ee7ece04c001f8e5c5fd4a3b9
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Feb 18 17:00:32 2011 +0000

    empathy_call_new_with_streams: start Calls when we support them

    Conflicts:

	libempathy/empathy-utils.c

 libempathy/empathy-utils.c | 90
 +++++++++++++++++++++++++++++++++++++++++-----
 libempathy/empathy-utils.h | 17 +++++----
 2 files changed, 92 insertions(+), 15 deletions(-)

commit 8ea5a5768163c694085f9f39f55c1a4895e84798
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Jun 8 16:01:45 2011 +0100

    Define EMPATHY_CALL_BUS_NAME{,_SUFFIX}

 libempathy/empathy-request-util.h | 3 +++
 1 file changed, 3 insertions(+)

commit 981a1377f660a9d1e3660dc66613b993b78486fc
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Wed Jun 8 23:07:00 2011 +0200

    Updated Spanish translation

 po/es.po | 640
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 327 insertions(+), 313 deletions(-)

commit 58942506c55e5fba09a6e85e9e581b80cb62ac27
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Feb 18 16:45:21 2011 +0000

    Initialize telepathy-yell

    Conflicts:

	src/empathy.c

 src/empathy.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 21a8c4b59d8d69c8b2a1ff801e15766ecf5e74cf
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Feb 22 10:22:53 2011 +0000

    Show notifications for Calls

    Conflicts:

	src/empathy-status-icon.c

 src/empathy-notifications-approver.c | 3 +++
 1 file changed, 3 insertions(+)

commit de4007568e730d95899f235ff06fd1590b1a3dc9
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Feb 18 16:16:33 2011 +0000

    Build an empathy-call binary when we have Call support

    Conflicts:

	src/Makefile.am

 Makefile.am	 |  2 +-
 configure.ac	 |  6 ++++++
 src/Makefile.am | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)

commit 0282fd24b52bf8fbb29fb4249079d25e77fb6211
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Feb 18 16:42:08 2011 +0000

    EmpathyEventManager: handle Call channels

    Conflicts:

	src/empathy-event-manager.c

 src/empathy-event-manager.c | 90
 +++++++++++++++++++++++++++++++++++++++++++--
 src/empathy-event-manager.h |	1 +
 2 files changed, 87 insertions(+), 4 deletions(-)

commit b0578383999a3b0726a7c8cc306aaac6d67b2384
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Feb 18 16:31:35 2011 +0000

    Teach EmpathyChannelFactory how to create Call channels

    Conflicts:

	libempathy/empathy-channel-factory.c

 libempathy/Makefile.am		      |  2 ++
 libempathy/empathy-channel-factory.c | 13 +++++++++++++
 2 files changed, 15 insertions(+)

commit ee49de4c751017cb80ea6008560b61b0ee389d76
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Feb 18 16:26:28 2011 +0000

    NewCallDialog: support Calls

    Conflicts:

	libempathy-gtk/Makefile.am
	libempathy-gtk/empathy-new-call-dialog.c

 libempathy-gtk/Makefile.am		  |  2 +
 libempathy-gtk/empathy-new-call-dialog.c | 77
 +++++++++++++++++---------------
 2 files changed, 43 insertions(+), 36 deletions(-)

commit 00144b08212c401230a79de080316fcbdb5d7a59
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Feb 18 17:06:56 2011 +0000

    Add empathy-call

 src/empathy-call.c | 195
 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 195 insertions(+)

commit 9439162db162aff1261c495ef9f6b5847f392f47
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Feb 18 15:51:12 2011 +0000

    Add an EmpathyCallWindowFullscreen class

 src/empathy-call-window-fullscreen.c | 309
 +++++++++++++++++++++++++++++++++++
 src/empathy-call-window-fullscreen.h |  77 +++++++++
 2 files changed, 386 insertions(+)

commit 94f2c176f6b3ac1b995f9c99c1f5d671c47761b3
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Feb 18 15:50:55 2011 +0000

    Add an EmpathyCallWindow class

 src/empathy-call-window.c | 3310
 +++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-call-window.h |   65 +
 2 files changed, 3375 insertions(+)

commit 5b611a78eac57c9fca84d584d105f07554769965
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Feb 18 15:50:20 2011 +0000

    Add an EmpathyCallHandler class

 src/empathy-call-handler.c | 1012
 ++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-call-handler.h |  107 +++++
 2 files changed, 1119 insertions(+)

commit d712e4de0df9d94833b516aa1f40a86fc50bd2a5
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Feb 18 15:49:57 2011 +0000

    Add an EmpathyCallFactory class

 src/empathy-call-factory.c | 331
 +++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-call-factory.h |  80 +++++++++++
 2 files changed, 411 insertions(+)

commit 3784ae7edc461ba02536a69d367a2bb9c689b70b
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Feb 18 15:49:24 2011 +0000

    Check for telepathy-yell if requested

 autogen.sh   | 14 +++++++++++++-
 configure.ac | 17 +++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

commit 24b58d60a04564fc839cc32a7c01d9fbb878e045
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Feb 18 14:51:47 2011 +0000

    Add telepathy-yell as a submodule

 .gitmodules	| 3 +++
 telepathy-yell | 1 +
 2 files changed, 4 insertions(+)

commit cf5498106385fede11e732c6b9e23464c0f59a3b
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Feb 17 12:06:50 2011 +0000

    Add ax_config_dir from audacity

 m4/ax_config_dir.m4 | 109
 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 109 insertions(+)

commit e5773f0b667fabbf0597ab2c3600164fc018c727
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Jun 8 12:54:41 2011 +1000

    Check we actually have a part #1 before requesting it

    We were checking echo->len >= 1, but then requesting index 1 (the
    second part).
    So if we didn't have a second part, this would quite happily blow up.

 libempathy/empathy-tp-chat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f63939a4648a0ebd64a2ff1468a72036adadb581
Merge: a5656bd eaf1ecc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 8 11:43:59 2011 +0200

    Merge branch 'sms-651242'

commit a5656bd2eb7a3ff272726e898a0a81462eb438fa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 5 15:07:27 2011 +0200

    use geocode-glib instead of geoclue

 libempathy/empathy-contact.c | 146
 +++++++++----------------------------------
 1 file changed, 28 insertions(+), 118 deletions(-)

commit 76d23bc01b65271a4067a13a9f51037004019d42
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 5 15:06:05 2011 +0200

    add an optional dep on geocode-glib

 configure.ac		    | 30 ++++++++++++++++++++++++++++++
 libempathy-gtk/Makefile.am |  2 ++
 libempathy/Makefile.am     |  2 ++
 3 files changed, 34 insertions(+)

commit b98c0e0b2a91f7deec643288082c12d61982f575
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 7 14:58:12 2011 +0200

    individual-view: always display individuals having pending events
    (#651913)

 libempathy-gtk/empathy-individual-view.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

commit 49f661f321635b6b0350dbf27aec3548fbff8ee2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 7 14:53:45 2011 +0200

    individual-store: keep track of the number of events associated with
    each row

 libempathy-gtk/empathy-individual-store.c |  1 +
 libempathy-gtk/empathy-individual-store.h |  1 +
 src/empathy-main-window.c		   | 84
 +++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+)

commit 92ee08109f1af2bd3862b6f1c21a7a52adb0f9a4
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Wed Jun 8 09:56:09 2011 +0300

    Updated Hebrew translation.

 po/he.po | 426
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 218 insertions(+), 208 deletions(-)

commit 5649964cadfa3dedd5f5c2a355edf8aaea4c9a10
Author: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>
Date:	Tue Jun 7 23:10:47 2011 +0200

    Updated Esperanto translation

 po/eo.po | 952
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 510 insertions(+), 442 deletions(-)

commit b708db960de0882d0e0db9610f5b5ad490581a65
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue May 3 11:27:21 2011 +0200

    Adium: Let user select theme variant in preferences

    Fixes bug #585474

 data/org.gnome.Empathy.gschema.xml.in	|   5 +
 libempathy-gtk/empathy-theme-adium.c	| 134 +++++++++++-----
 libempathy-gtk/empathy-theme-adium.h	|   5 +-
 libempathy-gtk/empathy-theme-manager.c | 284
 ++++++++++++++++++++-------------
 libempathy/empathy-gsettings.h		|   1 +
 src/empathy-preferences.c		| 175 +++++++++++++++++++-
 src/empathy-preferences.ui		|  63 ++++----
 7 files changed, 482 insertions(+), 185 deletions(-)

commit f2ee2965a27340b7701c36230eb8ef0e7ecc6e8f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 7 15:13:54 2011 +0200

    main_window_flash_foreach: fix FolksIndividual leak

 src/empathy-main-window.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit 5ad816894a9a08c52298a84a183f6d853654f913
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 7 15:12:20 2011 +0200

    coding style tweak

 src/empathy-main-window.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 35800bfe0a29ff002cb8ee3c49a771e90e0d4f10
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Tue Jun 7 12:44:18 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 993
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 552 insertions(+), 441 deletions(-)

commit a662a6d379b9f619647a87a07177cc63d7133ad1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 7 11:39:38 2011 +0200

    account-widget: use tp_g_signal_connect_object to connect on the
    password-retrieved signal (#652015)

    Thanks to Roland Dreier for the original patch.

 libempathy-gtk/empathy-account-widget.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 24bfa52b2a137a2bdafceba1fee199a06a9509ec
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Thu May 12 14:37:03 2011 -0700

    Require Folks 0.5.1 for the API updates.

    Closes: bgo#648822 - Port Empathy to Folks 0.5.1

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 018ba00ead80bed3238273a772ec1fd1c55cf58e
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Tue May 10 16:41:04 2011 -0700

    Only retrieve server-stored groups for Individuals with TpContacts.

    Helps: bgo#648822 - Port Empathy to Folks 0.5.1

 libempathy-gtk/empathy-individual-store.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

commit a6f6a3b008a9da3e437488b480fdbb2b5d07e9fd
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Thu May 5 11:05:04 2011 -0700

    Adapt to API change in FolksIndividual::personas-changed.

    Helps: bgo#648822 - Port Empathy to Folks 0.5.1

 libempathy-gtk/empathy-individual-widget.c | 41
 ++++++++++++++++++++++++------
 libempathy-gtk/empathy-persona-store.c     | 26 ++++++++++++++-----
 2 files changed, 52 insertions(+), 15 deletions(-)

commit a922c5d3011ce0be0d57f26835d20758cf4c320e
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Wed May 4 14:22:36 2011 -0700

    Adapt to API change in FolksIndividualAggregator::individuals-changed.

    Helps: bgo#648822 - Port Empathy to Folks 0.5.1

 libempathy/empathy-individual-manager.c | 31
 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

commit 0e80ea37d08505e886ef61b03fbb606a8ea3ac36
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Mon May 2 13:17:23 2011 -0700

    Adapt to API change in folks_group_details_get_groups().

    Helps: bgo#648822 - Port Empathy to Folks 0.5.1

 libempathy-gtk/empathy-groups-widget.c    |  7 ++++---
 libempathy-gtk/empathy-individual-store.c | 21 ++++++++++++++-------
 2 files changed, 18 insertions(+), 10 deletions(-)

commit a8833fd63b3bc3856cbd885158cba6b8fca1225a
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Mon May 2 12:58:04 2011 -0700

    Change the type of EmpathyContact.priv.groups to GeeHashSet.

    This is to adjust to the newer API for
    folks_group_details_set_groups().
    It's also slightly cleaner than using a hash table to implement a set.

    Helps: bgo#648822 - Port Empathy to Folks 0.5.1

 libempathy/empathy-contact.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

commit d4989c9be7b3c6fa016d703e2a32774d5f74f836
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Fri Apr 29 13:57:05 2011 -0700

    Adapt to API change in folks_backend_get_persona_stores().

    Helps: bgo#648822 - Port Empathy to Folks 0.5.1

 libempathy/empathy-individual-manager.c |  6 ++++--
 libempathy/empathy-utils.c		 | 15 +++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

commit 202af99a8fe154b9d03c2d569287fa01f70c0bc6
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Wed Jun 1 10:54:40 2011 -0700

    Adapt to API change in FolksIndividual constructor.

    Helps: bgo#648822 - Port Empathy to Folks 0.5.1

 src/empathy-invite-participant-dialog.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

commit 736b4f3d04f1e826dd8252fed88a7445b52ad461
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Fri Apr 29 13:33:04 2011 -0700

    Adapt to API break in folks_individual_get_personas.

    Helps: bgo#648822 - Port Empathy to Folks 0.5.1

 libempathy-gtk/empathy-individual-dialogs.c	    |  15 +-
 .../empathy-individual-information-dialog.c	    |  13 +-
 libempathy-gtk/empathy-individual-linker.c	    |  70 +++++---
 libempathy-gtk/empathy-individual-linker.h	    |	2 +-
 libempathy-gtk/empathy-individual-menu.c	    |  93 ++++++----
 libempathy-gtk/empathy-individual-store.c	    | 121 ++++++++-----
 libempathy-gtk/empathy-individual-view.c	    |  70 +++++---
 libempathy-gtk/empathy-individual-widget.c	    | 193
 +++++++++++++--------
 libempathy-gtk/empathy-linking-dialog.c	    |  14 +-
 libempathy-gtk/empathy-persona-store.c		    |  27 ++-
 libempathy-gtk/empathy-ui-utils.c		    |  57 +++---
 libempathy/empathy-contact.c			    |  44 +++--
 libempathy/empathy-individual-manager.c	    |  82 +++++----
 libempathy/empathy-individual-manager.h	    |	2 +-
 libempathy/empathy-utils.c			    |  61 +++++--
 libempathy/empathy-utils.h			    |	2 +-
 src/empathy-invite-participant-dialog.c	    |  39 +++--
 17 files changed, 573 insertions(+), 332 deletions(-)

commit faa40483fd000099a0593c09d0e92b938beaaaa7
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Mon May 2 17:21:04 2011 -0700

    Don't conflate TpfPersona and FolksPersona.

 libempathy-gtk/empathy-individual-store.c  |  4 ++--
 libempathy-gtk/empathy-individual-widget.c | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

commit a17f14769b6867e240f1f79288ed1d33ec51760b
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Mon May 2 17:05:19 2011 -0700

    Don't shadow the global definition of 'log'.

 libempathy-gtk/empathy-chat.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit fcce5893bda44c7e9276b47ba1f9c20b84da8b9e
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Mon Jun 6 00:25:04 2011 +0200

    Updated Galician translations

 po/gl.po | 494
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 270 insertions(+), 224 deletions(-)

commit f1aa5a7dba657947d61f916eefaf9cc166196716
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Sat Jun 4 13:50:42 2011 +0300

    Updated Hebrew translation.

 po/he.po | 473
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 259 insertions(+), 214 deletions(-)

commit a61ee6daccbde3780e8f46bb51afacb3c009f5a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 31 17:38:42 2011 +0200

    invite-participant-dialog: add temporary individuals when searching

 src/empathy-invite-participant-dialog.c | 141
 ++++++++++++++++++++++++++++++++
 1 file changed, 141 insertions(+)

commit 849aba37bdf0cb62449174c4015a0c09b91d2ad6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 31 17:38:13 2011 +0200

    export individual_store_add_individual_and_connect and
    individual_store_remove_individual_and_disconnect

 libempathy-gtk/empathy-individual-store.c | 4 ++--
 libempathy-gtk/empathy-individual-store.h | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

commit eaf1ecca8c31263cef90bfbb4839e7114719eed8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 27 15:13:34 2011 +0200

    Use tp-glib SMS high level API (#651242)

 libempathy-gtk/empathy-chat.c |  5 +--
 libempathy/empathy-tp-chat.c  | 76
 -------------------------------------------
 libempathy/empathy-tp-chat.h  |  2 --
 src/empathy-chat-manager.c    |  2 +-
 4 files changed, 4 insertions(+), 81 deletions(-)

commit 7625bd2ae11f2c3064e3e208ea82fffa97dc7f18
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 26 11:10:06 2011 +0200

    empathy_avatar_new: stop stealing strings (#650939)

    It was pretty confusing when reading/reviewing code.

 libempathy-gtk/empathy-avatar-chooser.c | 24 +++++++++++++-----------
 libempathy/empathy-contact.c		 | 33
 ++++++++++++++++++---------------
 libempathy/empathy-contact.h		 |  6 +++---
 3 files changed, 34 insertions(+), 29 deletions(-)

commit ba731f3dceb447ffe8c4b9e168ad1c1a5f99f365
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 26 10:48:30 2011 +0200

    remove useless callback

 libempathy-gtk/empathy-avatar-chooser.c | 11 -----------
 1 file changed, 11 deletions(-)

commit 9087cb85bdd1483a7e3a1852aac0dca0454b5231
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 26 10:44:08 2011 +0200

    avatar-chooser: replace finalize by dispose

    It just unref objects.

 libempathy-gtk/empathy-avatar-chooser.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit 405df12b4627f6f6361e8be54f27bce928cd6e5e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 26 10:36:04 2011 +0200

    avatar-chooser: port to TP coding style

    We just changed most of this file so while we're on it...

 libempathy-gtk/empathy-avatar-chooser.c | 1693
 ++++++++++++++++---------------
 libempathy-gtk/empathy-avatar-chooser.h |   43 +-
 2 files changed, 899 insertions(+), 837 deletions(-)

commit 762682fd8f1850c03aa7afc0578b78fa4571d94a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 26 10:18:23 2011 +0200

    re-order functions so we can get rid of their declarations

 libempathy-gtk/empathy-avatar-chooser.c | 516
 +++++++++++++++-----------------
 1 file changed, 240 insertions(+), 276 deletions(-)

commit f7986cc0f08137246c406d85235b3f5cd77f951d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 26 10:07:28 2011 +0200

    avatar-chooser: use tp_clear_*

 libempathy-gtk/empathy-avatar-chooser.c | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

commit d538771d94d50dce4b6568a8f523014aa96d29f9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 26 10:01:01 2011 +0200

    avatar-chooser: use the self->priv pattern

 libempathy-gtk/empathy-avatar-chooser.c | 233
 +++++++++++++++-----------------
 libempathy-gtk/empathy-avatar-chooser.h |   3 +-
 2 files changed, 110 insertions(+), 126 deletions(-)

commit 1b3757bc5cc12a45509adf660fc6008ee1570ef8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 27 14:41:11 2011 +0200

    Use tp-glib Balance high level API (#651238)

 src/empathy-main-window.c | 80
 +++++++++++++++--------------------------------
 1 file changed, 26 insertions(+), 54 deletions(-)

commit db6773ebf31853608353b1bb156156879b303569
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 1 11:06:28 2011 +0200

    allow user to search for contacts using their full identifier

 libempathy-gtk/empathy-individual-view.c |  3 ++-
 libempathy-gtk/empathy-ui-utils.c	  | 13 ++++++++++++-
 libempathy-gtk/empathy-ui-utils.h	  |  3 ++-
 src/empathy-invite-participant-dialog.c  | 15 +++++++++++----
 4 files changed, 27 insertions(+), 7 deletions(-)

commit cc6c2b5423c3a1906b5f484c157bc67dd9ee9d86
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 1 11:33:04 2011 +0200

    empathy_individual_view_get_individual_menu: don't create a menu if
    we don't want any feature

    Fix an assertion error when right clicking in the 'Invite contact'
    treeview.

 libempathy-gtk/empathy-individual-view.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 5d2b0e7740e6929451c630dc072f0ac199f173c3
Merge: ecfcc6c b0bd73c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue May 31 11:20:21 2011 -0700

    Merge branch 'speedup-protocol-chooser'

commit ecfcc6cb011230531ef4fe527f4ff045217f714a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 31 15:36:30 2011 +0200

    invite-participant-dialog: add an entry searching the contact list

 src/empathy-invite-participant-dialog.c | 40
 ++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

commit 81c5f8b415c5835f200ea9d7d3d917481b6fd506
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 31 15:34:36 2011 +0200

    view_selection_changed_cb: don't unref NULL individual

 src/empathy-invite-participant-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5dc3feb4979804c710d4e872a1f05bc425fd9410
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 31 15:24:28 2011 +0200

    factor out empathy_individual_match_words()

 libempathy-gtk/empathy-individual-view.c | 34 ++------------------------
 libempathy-gtk/empathy-ui-utils.c	  | 42
 ++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-ui-utils.h	  |  4 +++
 libempathy/empathy-utils.c		  |  1 -
 4 files changed, 48 insertions(+), 33 deletions(-)

commit d4e5a5295ff83f664c80fe3af61db0692829ea1b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 31 15:20:10 2011 +0200

    live-search: export few more functions

 libempathy-gtk/empathy-live-search.c | 23 +++++++++++++++--------
 libempathy-gtk/empathy-live-search.h |  7 +++++++
 2 files changed, 22 insertions(+), 8 deletions(-)

commit 4a20b26434210820bdcc2d38b9c1f4b35eb36e71
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 31 14:54:15 2011 +0200

    add empathy_individual_view_refilter()

 libempathy-gtk/empathy-individual-view.c | 8 ++++++++
 libempathy-gtk/empathy-individual-view.h | 2 ++
 2 files changed, 10 insertions(+)

commit 1c1be234740e2e23f755668ce89483f0225ec329
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Fri May 27 16:13:49 2011 +0530

    Chatrooms: Make text input view sensitive on successful password entry

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=651058

 libempathy-gtk/empathy-chat.c | 1 +
 1 file changed, 1 insertion(+)

commit de0dd5093afcb898eaad92d0f15f6a342deda980
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 17 12:43:39 2011 +0200

    use tp_channel_dispatch_operation_claim_async() (#650386)

 libempathy/empathy-auth-factory.c |  6 +++---
 src/empathy-call-observer.c	   |  5 +++--
 src/empathy-event-manager.c	   | 16 ++++++++++------
 3 files changed, 16 insertions(+), 11 deletions(-)

commit 920122ee2e7be94a844d8f6736df2aab9f688a1d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 17 12:41:54 2011 +0200

    bump tp-glib dep to 0.15.1

    tp_channel_dispatch_operation_claim_with_async() has been introduced
    in 0.15.0
    but suffers a race (fdo #37280) fixed in 0.15.1.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b0bd73cfa5658971f12c86a1f3711cab663a3f40
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun May 29 09:02:32 2011 -0700

    Use pixbuf for PixbufCellRenderer in protocol chooser

    If an icon-name is given to a PixbufCellRenderer it will re-load the
    image from the icon theme every time the size gets requested for a
    different cell. Which happens a *LOT*.

    Instead load the icon the row is added to the model, such that the
    cell renderer can simply request the size of the pixbuf. This massive
    speeds up the performance of the protocol chooser combobox.

 libempathy-gtk/empathy-account-chooser.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit c1189dd5d21d40fd7773f3c13d24d55f7e897713
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:	Sun May 29 17:55:20 2011 +0200

    [l10n]Updated Catalan (Valencian) translation

 po/ca@valencia.po | 2377
 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 1384 insertions(+), 993 deletions(-)

commit 8a43221ed3a42fb8949b7568a29723197f204364
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun May 29 08:02:42 2011 -0700

    Don't set priv when it's not used

 libempathy-gtk/empathy-chat.c | 4 ----
 1 file changed, 4 deletions(-)

commit 05f66bda423f72350a5d766583946b48bf729757
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Thu May 26 20:04:21 2011 +0200

    Updated Spanish translation

 po/es.po | 204
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 106 insertions(+), 98 deletions(-)

commit 2f24b24251d1dce47dfd5fd34a6642ea2cd8a653
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 26 18:43:18 2011 +0200

    don't build avatar_chooser_set_avatar_from_pixbuf if building
    without cheese

 libempathy-gtk/empathy-avatar-chooser.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 67929359fee3036b7af9485854f009ce15b83f9d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun May 22 10:41:16 2011 +0200

    Adium: Convert NSDateFormatter to strftime

 libempathy-gtk/empathy-theme-adium.c | 155
 +++++++++++++++++++++++++++++++++--
 1 file changed, 149 insertions(+), 6 deletions(-)

commit e54915d63afa880d8fd3bb8764652efcb4a59165
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu May 26 12:45:30 2011 +0200

    Stop live search when main window gets hidden

 libempathy-gtk/empathy-live-search.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit 984e946f6bb2c385394db123f1b2edea05d9209b
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu May 26 12:00:58 2011 +0200

    Stop dealing with iconification of main window, just hide/present it

    It does not work with gnome-shell, unity and indicators anyway,
    so it is just complex code for no benefit anymore.

 libempathy-gtk/empathy-ui-utils.c | 53
 ---------------------------------------
 libempathy-gtk/empathy-ui-utils.h |  3 ---
 src/empathy-status-icon.c	   |  8 +++---
 3 files changed, 4 insertions(+), 60 deletions(-)

commit ff175f03615bdbd8d05bf352b3e4b49d59b3ce25
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu May 26 11:59:48 2011 +0200

    Do not show the main window when creating it, it will be presented
    if not start hidden

 src/empathy.c | 1 -
 1 file changed, 1 deletion(-)

commit 943d659bf3c2c966c5944faa4d05a576f9630906
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu May 26 11:57:24 2011 +0200

    Do not present chat window from empathy_chat_window_get_default()

    It is already handled in empathy_chat_window_present_chat()

 src/empathy-chat-window.c | 18 ------------------
 1 file changed, 18 deletions(-)

commit baeea6e11b647b788693ce6e16cccc18cd0b8402
Author: Raluca Elena Podiuc <ralucaelena1985@gmail.com>
Date:	Sun Apr 10 22:19:14 2011 +0200

    libempathy-gtk: avatar chooser from cheese (#521747)

    pixbuf saved into buffer as png -> set avatar from buffer

 libempathy-gtk/empathy-avatar-chooser.c | 105
 +++++++++++++++++++++++++++++---
 1 file changed, 98 insertions(+), 7 deletions(-)

commit 87118ba7e4c1a07765ccb762b9ccd603b5facc7b
Author: Raluca Elena Podiuc <ralucaelena1985@gmail.com>
Date:	Mon Apr 11 21:34:01 2011 +0200

    libempathy-gtk: add dependency on libcheese

 configure.ac		    | 20 ++++++++++++++++++++
 libempathy-gtk/Makefile.am |  2 ++
 2 files changed, 22 insertions(+)

commit a6a4c117c17659134df600c9b96f8cceb07f44ef
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 26 09:05:15 2011 +0200

    main_window_connection_changed_cb: still need the priv pointer

 src/empathy-main-window.c | 2 ++
 1 file changed, 2 insertions(+)

commit cddd93283537e99037176b7c01c3ac36bfcb6bf0
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu May 26 16:38:22 2011 +1000

    Remove the balance action when an account is removed

 src/empathy-main-window.c | 86
 ++++++++++++++++++++++++++---------------------
 1 file changed, 48 insertions(+), 38 deletions(-)

commit 465d2ffaf8c2cd31ae1efc7fdcc85b3d5cb0773c
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed May 25 12:50:16 2011 +0200

    Reopen tabs as SMS channels when appropriate

 src/empathy-chat-manager.c | 4 ++++
 1 file changed, 4 insertions(+)

commit ed9505140adea2ad3ef0a8d25057197864ead712
Merge: 5195f67 0a42a79
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 25 10:24:49 2011 +0200

    Merge remote-tracking branch
    'glassrose/make-favorite-room-names-more-detailed-646526'

commit 5195f67f8a9fce3da49f875868e288df16df6a52
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 19 14:15:21 2011 +0200

    use tp_text_channel_set_chat_state_async() directly

 libempathy-gtk/empathy-chat.c | 37 +++++++++++++++++++++++++++++++------
 libempathy/empathy-tp-chat.c  | 19 -------------------
 libempathy/empathy-tp-chat.h  |  2 --
 3 files changed, 31 insertions(+), 27 deletions(-)

commit 515c3eac45ed42be34feac88245a8a509825bf82
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 19 13:39:17 2011 +0200

    tp_chat_dispose: use tp_clear_object()

 libempathy/empathy-tp-chat.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

commit 826d5e5fe6079c3960688edb36d21b6bb7825ad3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 29 10:10:28 2011 +0200

    clear_chatrooms: prevent destroying the list twice

    Unreffing the chatroom may result in destroying the underlying
    EmpathyTpChat which will fire the invalidated signal and so make us
    re-call this function. We already set priv->chatrooms to NULL so we
    won't try to destroy twice the same objects.

 libempathy/empathy-chatroom-manager.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

commit 5079e73c8edf3b460ed11edc02ffb2cb6b705eac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 29 09:20:02 2011 +0200

    EmpathyTpChat: get rid of the destroy signal

    We should just use invalidated.

 libempathy-gtk/empathy-chat.c	       | 15 ++++++++------
 libempathy/empathy-chatroom-manager.c | 11 +++++-----
 libempathy/empathy-tp-chat.c	       | 39
 -----------------------------------
 3 files changed, 15 insertions(+), 50 deletions(-)

commit e74a36868d7abe9c8559567cd4e6d82ce24469af
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 15 10:23:21 2011 +0100

    event-manager: look for existing messages when approving

    We may have already received some as the EmpathyTpChat is created
    earlier now.

 src/empathy-event-manager.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit a286f611ab9e53e4ddbfaa9ed915b1f39d76794a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 14 15:53:07 2011 +0100

    EmpathyTpChat: Use a READY property instead of our own ready code

 libempathy/empathy-channel-factory.c |   3 +
 libempathy/empathy-tp-chat.c	      | 345
 ++++++++++++++++++++---------------
 libempathy/empathy-tp-chat.h	      |   4 +-
 src/empathy-chat-manager.c	      |  66 +------
 4 files changed, 205 insertions(+), 213 deletions(-)

commit 1a076de82797676d80ce3273dfe075d06111a446
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 12 16:48:42 2010 +0100

    remove empathy_tp_chat_get_connection and priv->connection

 libempathy-gtk/empathy-chat.c		 |  5 ++--
 libempathy/empathy-tp-chat.c		 | 47
 ++++++++++++++++-----------------
 libempathy/empathy-tp-chat.h		 |  1 -
 src/empathy-chat-window.c		 |  2 +-
 src/empathy-invite-participant-dialog.c |  2 +-
 5 files changed, 27 insertions(+), 30 deletions(-)

commit 0dd8e6cbd7b903d2ce8b56995e4b4ac6ed042f2c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 11 14:53:50 2011 +0100

    EmpathyTpChat: inherit from TpTextChannel (#650554)

 libempathy-gtk/empathy-chat.c		     |	20 +---
 libempathy-gtk/empathy-contact-list-store.c |	 9 +-
 libempathy/empathy-channel-factory.c	     |	27 ++++-
 libempathy/empathy-chatroom-manager.c	     |	 9 +-
 libempathy/empathy-tp-chat.c		     | 175
 ++++++++++++----------------
 libempathy/empathy-tp-chat.h		     |	11 +-
 src/empathy-chat-manager.c		     |	15 +--
 src/empathy-event-manager.c		     |	 5 +-
 src/empathy-invite-participant-dialog.c     |	 5 +-
 9 files changed, 125 insertions(+), 151 deletions(-)

commit 4e39c2c5adac55793143c110159fa40cc51f324c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 27 16:17:37 2011 +0200

    tp-chat: use the self->priv pattern

 libempathy/empathy-tp-chat.c | 701
 +++++++++++++++++++------------------------
 libempathy/empathy-tp-chat.h |   3 +-
 2 files changed, 317 insertions(+), 387 deletions(-)

commit 64d8e268e6be5afc2afd80ff93d9803318dc5953
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 11 14:29:02 2011 +0100

    Use the EmpathyChannelFactory with all components creating
    EmpathyTpChat

 libempathy/empathy-chatroom-manager.c | 8 ++++++++
 src/empathy-chat-manager.c	       | 9 +++++++++
 src/empathy-event-manager.c	       | 8 ++++++++
 3 files changed, 25 insertions(+)

commit 21bde4f1a8c82330ccb49eb6bdc00a14de7595aa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 28 14:15:23 2011 +0200

    rename message-received signal to message-received-empathy

 libempathy-gtk/empathy-chat.c | 2 +-
 libempathy/empathy-tp-chat.c  | 2 +-
 src/empathy-event-manager.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 935c16f4738604f3738d02b9be7a25cd2b49988a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 12 15:18:06 2010 +0100

    tp-chat: rename chat-state-changed to chat-state-changed-empathy

    chat-state-changed already exists in TpChannel and we can't
    redefine it.

 libempathy-gtk/empathy-chat.c | 2 +-
 libempathy/empathy-tp-chat.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 1a8f17fcac3c6f9bae7c358ab5222c2dabdb31d3
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon May 23 21:30:03 2011 +0200

    Updated Spanish translation

 po/es.po | 255
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 127 insertions(+), 128 deletions(-)

commit d0e556d4cea9f4a12825eada17ab22648ee3fa9c
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu May 19 10:11:44 2011 -0400

    cell-renderer-expander: fix rendering with GTK+3

    There are basically three issues here:
    - the renderer doesn't add the GTK_STYLE_CLASS_EXPANDER style
    class when
      rendering, which blocks the theme to apply the intended colors.
    - the GtkStateFlags that were set on the context were using
    GTK_STATE_*
      instead of GTK_STATE_FLAG_*
    - the flags set on the context were incomplete, as they were just
    using
      ACTIVE/NORMAL for expanded/collapsed and not SELECTED/FOCUSED/...

    https://bugzilla.gnome.org/show_bug.cgi?id=650590

 libempathy-gtk/empathy-cell-renderer-expander.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 380911d4b3da972b98e97eeb9935227657b01962
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 23 14:02:46 2011 +0200

    account-widget-yahoo: fix expand/fill settings (#650854)

 libempathy-gtk/empathy-account-widget-yahoo.ui | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 5b139ea4db4fbae7876b36eeec28ab874569f867
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 23 14:02:38 2011 +0200

    account-widget-sip: fix expand/fill settings (#650854)

 libempathy-gtk/empathy-account-widget-sip.ui | 6 ++++++
 1 file changed, 6 insertions(+)

commit f3385db2a89b1c14fb43527f99bcac69d34f4a76
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 23 14:02:29 2011 +0200

    account-widget-icq: fix expand/fill settings (#650854)

 libempathy-gtk/empathy-account-widget-icq.ui | 4 ++++
 1 file changed, 4 insertions(+)

commit 7c7a46d5a421506a61168787e042c57605a5874d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 23 14:02:11 2011 +0200

    account-widget-groupwise: fix expand/fill settings (#650854)

 libempathy-gtk/empathy-account-widget-groupwise.ui | 6 ++++++
 1 file changed, 6 insertions(+)

commit 460656fc0249390aa280400290efa5bc897d7d98
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 23 14:01:55 2011 +0200

    account-widget-aim: fix expand/fill settings (#650854)

 libempathy-gtk/empathy-account-widget-aim.ui | 4 ++++
 1 file changed, 4 insertions(+)

commit a5b5353000f407b35b928df6fbef288f5337f547
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 23 13:38:46 2011 +0200

    account-widget-msn: fix expand/fill settings (#650854)

 libempathy-gtk/empathy-account-widget-msn.ui | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 043fadc328839eb7c4bd893de81b6409509b54b2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 23 12:21:13 2011 +0200

    empathy_account_widget_setup_widget: unsensitive unsupported param
    (#650846)

 libempathy-gtk/empathy-account-widget.c | 3 +++
 1 file changed, 3 insertions(+)

commit c4dfdc69a46f64dfc2ca12aea673f98605a3c39d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 23 12:20:47 2011 +0200

    add empathy_account_settings_param_is_supported()

 libempathy/empathy-account-settings.c | 9 +++++++++
 libempathy/empathy-account-settings.h | 4 ++++
 2 files changed, 13 insertions(+)

commit 6c9d7372fb7e155be2ca6953db316c1b70744159
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 23 11:44:43 2011 +0200

    account-widget-sip: add ignore-tls-errors param (#650844)

 libempathy-gtk/empathy-account-widget-sip.c  |  1 +
 libempathy-gtk/empathy-account-widget-sip.ui | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

commit d94c2c708734d6a41cd6d6ad44684a816b66cff8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 20 16:02:44 2011 +0200

    live-search: fix keyboard navigation using Space (#632787)

 libempathy-gtk/empathy-live-search.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 50cc20d66183eb0e4a8fd1384dea77fdf3e29cf0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 20 15:38:03 2011 +0200

    live-search:fix keyboard navigation using PageUp/PageDown (#632787)

 libempathy-gtk/empathy-live-search.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit c105d23a6dc033e281304a0032095f13e7fef63f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 20 15:32:33 2011 +0200

    live-search: fix keyboard navigation using Home/End (#632787)

 libempathy-gtk/empathy-live-search.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit 584931b9c50f9390ba19d8609ac9917b570d6562
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 20 15:26:50 2011 +0200

    factor out fire_key_navigation_sig()

 libempathy-gtk/empathy-live-search.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

commit 12c7f7de95068377ff60b23bdc5d80367d554c2b
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri May 20 15:18:10 2011 +0200

    Always forward to the view keynav events, since we get them only if
    they are useless to the entry anyway

 libempathy-gtk/empathy-contact-list-view.c | 16 ++++++----------
 libempathy-gtk/empathy-individual-view.c   | 18 ++++++------------
 2 files changed, 12 insertions(+), 22 deletions(-)

commit ee227ec984e99ab5f1046c68b891413ba1b89507
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri May 20 15:17:33 2011 +0200

    LiveSearch: we don't want to emit keynav signal on left/right since
    those are useful to the entry

 libempathy-gtk/empathy-live-search.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit af03c9c7c50e68f5b10148e84ff782c94c5c6cd0
Author: Colin Walters <walters@verbum.org>
Date:	Wed May 18 19:52:49 2011 -0400

    Squash some set-but-unused variables

 src/empathy-chat-window.c | 4 ----
 1 file changed, 4 deletions(-)

commit 93a7de11fb8ec365c6a7f1818b1260e689e0428e
Merge: 4a5169b c51c43f
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed May 18 15:23:15 2011 +0100

    Merge branch 'LOLOOOLOLOLOLLLOLLLOLOLLL'

commit c51c43f90643a4a5080ec1412229f0eb56ca9a34
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed May 18 14:50:34 2011 +0100

    chat-manager: pass user action time of DBus to show the closed tab

    This was making undo closing tabs in the background, aww.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 extensions/Chat_Manager.xml |	5 +++++
 src/empathy-chat-manager.c  | 18 +++++++++++-------
 src/empathy-chat-manager.h  |	3 ++-
 src/empathy-chat-window.c   |	3 ++-
 4 files changed, 20 insertions(+), 9 deletions(-)

commit 4a5169bf01a7a67bfa08b2d596c6d4f5e92a73b6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 17 10:12:12 2011 +0200

    use g_list_free_full()

 src/empathy-invite-participant-dialog.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 259126957650f1c28abdbc101636fe5cbca03f48
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 17 10:06:50 2011 +0200

    filter_func: don't leak individual

 src/empathy-invite-participant-dialog.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit fa5df0324942721999ae2dd7ad8425379fbc59c9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 17 10:03:16 2011 +0200

    coding style fixes

 src/empathy-invite-participant-dialog.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

commit 6dc60aa53c3c458653417ddef1e3e9f3eb4debf2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 6 15:45:42 2011 +0200

    invite-participant-dialog: set a default height so a few contacts
    are displayed

 src/empathy-invite-participant-dialog.c | 3 +++
 1 file changed, 3 insertions(+)

commit 6b5bea43c508bc26c2ee88edac5d60cf127b175c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 6 14:55:39 2011 +0200

    invite-participant-dialog: add a scrolled window

 src/empathy-invite-participant-dialog.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit a557339964d56290345f5ad2841ef4a127839655
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 6 14:47:30 2011 +0200

    add some padding

 src/empathy-invite-participant-dialog.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 44162e3ac3604c3e4f14dd01b48fc32cd7fd1007
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 6 14:37:42 2011 +0200

    invite-participant-dialog: filter out contacts already in the chat

 src/empathy-invite-participant-dialog.c | 33
 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

commit 9e46660b7f36e1274ca43a47b9a011c056c35746
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 6 14:14:54 2011 +0200

    invite-participant-dialog: display only contacts on the right
    Connection

 src/empathy-invite-participant-dialog.c | 91
 ++++++++++++++++++++++++---------
 1 file changed, 68 insertions(+), 23 deletions(-)

commit 3cceb20e7ded94d9a797f53704b53afde9e5176f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 6 14:09:05 2011 +0200

    individual-view: add API to define our own filter function

 libempathy-gtk/empathy-individual-view.c | 17 +++++++++++++++++
 libempathy-gtk/empathy-individual-view.h |  4 ++++
 2 files changed, 21 insertions(+)

commit 08ba02749235ae95a586fa930690f921e74bda35
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 6 12:46:37 2011 +0200

    invite-dialog: display a individual view rather than forcing user
    to type the full ID of the contact (#646705)

 src/empathy-chat-window.c		 |  39 ++-----
 src/empathy-invite-participant-dialog.c | 191
 +++++++++++++++++++++++++++++---
 src/empathy-invite-participant-dialog.h |  19 +++-
 3 files changed, 204 insertions(+), 45 deletions(-)

commit 9999bf6834a4c2e592a39dcbc9b8dffc5bee9bd5
Merge: 7b526c2 510edcb
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed May 18 14:32:27 2011 +0100

    Merge branch 'undo-close-tab'

commit 7b526c2d40795fdd97ee63589a14a0a679a00e2a
Merge: 2950825 cbbf2cd
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed May 18 14:26:08 2011 +0100

    Merge branch 'remember-my-message-yo'

commit 510edcb3c7e288000544aa12fa4dc708085bfd2f
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed May 18 14:25:34 2011 +0100

    chat-manager: use EMPATHY_CHAT_BUS_NAME

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-chat-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 583dbd45639081ea4c760b81a4e2cc5c8137192e
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed May 18 14:23:24 2011 +0100

    chat-manager: don't leak proxy

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-chat-manager.c | 1 +
 1 file changed, 1 insertion(+)

commit cbbf2cd51ed0f7bd51c617fe75596511415b076f
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed May 18 14:16:54 2011 +0100

    chat-manager: clarify ownership of messages hash table

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-chat-manager.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 48eeafcb8aabeca933067ae45a39a7349dce6083
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed May 18 14:15:58 2011 +0100

    chat-manager: s/null/NULL/

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-chat-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8894350602117306df0038ff7cd622b910f70fa5
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed May 18 14:15:09 2011 +0100

    chat-manager: add missing free

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-chat-manager.c | 1 +
 1 file changed, 1 insertion(+)

commit f5d7d6d3a1d7a09e9e3c0cbf013a8456d33537dd
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed May 18 14:14:05 2011 +0100

    chat: rename get to dup

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-chat.c | 2 +-
 libempathy-gtk/empathy-chat.h | 2 +-
 src/empathy-chat-manager.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 2950825a4452bc984c0dd356c5bf17c3a674c451
Merge: 38e5925 9e19149
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue May 17 09:36:33 2011 +0100

    Merge branch 'ack'

commit 9e1914959b7e26e82ca4042ad5f7f042cb5a34a2
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue May 17 09:33:47 2011 +0100

    adium: set has_unread_message to FALSE when we think we've cleared
    them all

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-theme-adium.c | 2 ++
 1 file changed, 2 insertions(+)

commit 38e5925b90ca5864907aaef09cbaa4c963b1be98
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon May 16 19:22:43 2011 +0200

    Updated Spanish translation

 po/es.po | 320
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 179 insertions(+), 141 deletions(-)

commit 2d5e4f0a14794617d5fe385d4fcea86e4120edf5
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Mon May 16 15:13:13 2011 +0100

    main-window: call the remote UndoClosedTab

    It will work, unlike this one.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-main-window.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

commit 52e1e2fbdafd993933ba7866847ddbbedd7a2748
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Mon May 16 15:12:59 2011 +0100

    chat-manager: expose UndoClosedChat over DBus

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-chat-manager.c | 72
 +++++++++++++++++++++++++++++++++++++++++++++-
 src/empathy-chat-manager.h |  2 ++
 2 files changed, 73 insertions(+), 1 deletion(-)

commit 0261661359b354ee0bbc61898ebec8ede7ac5b2b
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Mon May 16 15:12:31 2011 +0100

    extensions: add ChatManager extension

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 extensions/Chat_Manager.xml | 31 +++++++++++++++++++++++++++++++
 extensions/misc.xml	     |	1 +
 2 files changed, 32 insertions(+)

commit 45609a2304c805e1c05ba15e0856c9c41f020986
Merge: 383bf53 9c42c7a
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Mon May 16 14:08:10 2011 +0100

    Merge branch 'more-contact-info'

commit 383bf53000a686e5d411f48603b506bb64dd0e28
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Mon May 16 13:42:55 2011 +0100

    Fix call to empathy_chat_window_find_chat in /part command

    0fda594 changed empathy_chat_window_find_chat() to take a third
    parameter indicating whether we're looking for an SMS channel or not,
    but the /part branch wasn't updated for this change before being
    merged.

    I think it's a reasonable assumption that someone will not try
    to /part
    an SMS channel.

    Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-chat-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9c42c7ae5d46bf3bf2aa4aab8e4d615876982eca
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu May 12 13:13:32 2011 +0100

    Add a /whois command.

    https://bugzilla.gnome.org/show_bug.cgi?id=571631

 libempathy-gtk/empathy-chat.c | 82
 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

commit af9646511992294411549884521130056f34f455
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue May 10 17:44:03 2011 +0100

    ContactWidget: expose IRC presence information

    This is basically just a temporary hack until Idle implements
    SimplePresence.

 libempathy-gtk/empathy-contact-widget.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit d5ddca2ac157b52b04b418d51530505d378b3dd5
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue May 10 17:40:25 2011 +0100

    ContactWidget: support IRC server and host info

 libempathy-gtk/empathy-contact-widget.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit 5eb74b177084b3cd03e412ea3b7f55b41542a9fe
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue May 10 17:35:20 2011 +0100

    ContactWidget: support Idle's x-idle-time field.

 libempathy-gtk/empathy-contact-widget.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

commit 3e99c2d9e8b4f5a36507722c8bd681086c3220c4
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue May 10 17:27:04 2011 +0100

    ContactWidget: generalize linkifying values

    Many of the new fields exposed by Idle need more processing than just
    bunging the first string into a label. Let's start by generalizing
    linkifying the first string. I speculatively allow the format
    functions
    to fail.

 libempathy-gtk/empathy-contact-widget.c | 40
 ++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 11 deletions(-)

commit e92e9e9c411ec02dacc1bb11f15aa4682fd64cdf
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue May 10 17:14:16 2011 +0100

    ContactWidget: show IRC channel list.

    Very recent versions of Idle expose the list of channels provided in
    WHOIS replies. The data is provided as a bunch of x-irc-channel fields
    with a single value, namely the name of the channel. Here we
    expose that
    data to the user as a comma-separated list of links; clicking a link
    ensures that channel.

    https://bugzilla.gnome.org/show_bug.cgi?id=592795

 libempathy-gtk/empathy-contact-widget.c | 74
 +++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)

commit 809e62df3bc50be5ee22a7bf5c4e14db94cc12eb
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Mon May 16 10:36:48 2011 +0100

    chat-manager: keep a hash table with messages left when the chat
    closed

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-chat-manager.c | 59
 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

commit add05052afddb11b158dd08075ffbe2c0404692a
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Mon May 16 10:35:56 2011 +0100

    chat: add {get,set}_text methods

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-chat.c | 23 +++++++++++++++++++++++
 libempathy-gtk/empathy-chat.h |  4 ++++
 2 files changed, 27 insertions(+)

commit ec997377c0765b3d1619120c501433799740edba
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Mon May 16 10:00:08 2011 +0100

    tp-chat: don't assert on not finding message

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-tp-chat.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit e22e3fd06caa9486b9641636c2bbe13cf954cab5
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Sun May 15 22:07:24 2011 +0200

    Updated Slovenian translation

 po/sl.po | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 6b9fe24b0b42133b831c0286ad060b776d5de748
Author: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>
Date:	Sat May 14 22:26:56 2011 +0200

    Updated Esperanto translation

 po/eo.po | 1739
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 1031 insertions(+), 708 deletions(-)

commit e46d39bd0ffad02ae26179e5b63cbe10f5b04d73
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Sat May 14 21:07:01 2011 +0200

    Updated Slovenian translation

 po/sl.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit c8acdd8ec6aa395aa16530fac8cb1cce710bbde7
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Sat May 14 21:03:16 2011 +0200

    Updated Slovenian translation

 po/sl.po | 775
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 460 insertions(+), 315 deletions(-)

commit 1c40d3370a1d2e1e98b1609377e0903a2ca40f6f
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri May 13 15:50:38 2011 +0100

    adium: add comment explaining why we add x-empathy-mesage-id-*

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-theme-adium.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit c84e0979d36aa41e7f0d554fbbdad4e82756f8b0
Merge: 2096980 34a7a0b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 13 16:27:21 2011 +0200

    Merge remote-tracking branch
    'glassrose/moving-part-functionality-to-empathy-chat-window-643295'

commit 46c85cbe83e943ce5b45fa8b66e19fe583f7d0ca
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri May 13 15:23:07 2011 +0100

    tp-chat: call acknowledge_message(s) directly

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-tp-chat.c | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

commit 4d140c3a4e3c4629a72c3bf0ea7ca8b8ee48fb72
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri May 13 15:18:57 2011 +0100

    tp-chat: rename signal to message-acknowledged

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-chat.c | 12 ++++++------
 libempathy/empathy-tp-chat.c  |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

commit d44680728465f8bb4da6f6dd50694d04aadd1745
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri May 13 15:16:25 2011 +0100

    chat: ::notify for all changes to unread messages

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-chat.c | 1 +
 1 file changed, 1 insertion(+)

commit 5af3e568a7048f1de84d9c5372973aeee87aff60
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri May 13 15:15:13 2011 +0100

    chat: call acknowledge_message on the chat view when it happens

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-chat.c | 3 +++
 1 file changed, 3 insertions(+)

commit bd1d3bc265f617b0aa86bd80da28d64b50dcbbfb
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri May 13 15:14:54 2011 +0100

    adium: implement acknowledge_message to remove unread marker

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-theme-adium.c | 88
 +++++++++++++++++++++++++++++++++++-
 1 file changed, 86 insertions(+), 2 deletions(-)

commit c68050906fb6a3017ed9162fb14b4dcca78eba0a
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri May 13 15:12:54 2011 +0100

    chat: don't toggle visibility of the chat view on marking messages
    read

    It doesn't make sense, and it's a lie. It will also break showing
    unread message markers in the adium chat view.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-chat.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 3329e947496629d8275ad68791d73c49d9fc820f
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri May 13 11:35:42 2011 +0100

    chat-view: add message_acknowledged vfunc

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-chat-view.c | 11 +++++++++++
 libempathy-gtk/empathy-chat-view.h |  4 ++++
 2 files changed, 15 insertions(+)

commit 96345c97d9c3fc52b45ef5ce522ef2e4c94bca63
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri May 13 11:35:09 2011 +0100

    tp-chat: give ::pending-message-removed the message

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-chat.c | 1 +
 libempathy/empathy-tp-chat.c  | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

commit 5080aa2351deb6abe0aa1cc442fd1175f2eaa70e
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri May 13 11:25:06 2011 +0100

    adium: split removing unread markers into two functions

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-theme-adium.c | 60
 ++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 26 deletions(-)

commit bd0755be84f285e48272fb0b7ac154bad4be0902
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri May 13 11:22:22 2011 +0100

    adium: set x-empathy-message-id class in messageStyles

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-theme-adium.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit 2096980125f9a556b5d92e541927e9cf9b213e20
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri May 13 08:35:48 2011 +0300

    Updated Hebrew translation.

 po/he.po | 176
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 89 insertions(+), 87 deletions(-)

commit e7afbce3f6925af7f3d43a443304f566a02d4942
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Thu May 12 16:49:37 2011 +0100

    chat-window: also update chat window title when the chat updates

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-chat-window.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 4fd01bccdea76bdb929bae14a31d16327cd0a5aa
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Thu May 12 16:49:24 2011 +0100

    chat-window: update tab when nb-unread-messages changes

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-chat-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit d36a313b26e957452fde60cac897791b0f6e4990
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Thu May 12 16:47:59 2011 +0100

    chat: make nb_unread_messages incoming only

    and add a property so it can have change notification.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-chat.c | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

commit 7412b7e93ee7106dc139365fb391e2f613c294ef
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Thu May 12 16:24:43 2011 +0100

    tp-chat: add pending-message-removed signal

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-tp-chat.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 7740933e258c4afe279d08599232e057e1c2d338
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Thu May 12 14:56:32 2011 +0100

    tp-chat: use ::pending-message-removed to update our pending queue

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-tp-chat.c | 54
 ++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 20 deletions(-)

commit 11120f662d911b9a50aff7ba46804bcc7c587492
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Thu May 12 14:33:16 2011 +0100

    message: stop storing pending-message-id

    We're storing the TpSignalledMessage for that nowadays.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-message.c | 21 ---------------------
 libempathy/empathy-message.h |  2 --
 2 files changed, 23 deletions(-)

commit cc5faf8b763d3b1ee5eb4a13525875707bb71217
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Thu May 12 14:32:18 2011 +0100

    tp-chat: acknowledge messages using TpTextChannel API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-tp-chat.c | 43
 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

commit ccc394aa7971cac1530931357dae7aaf14299ef2
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Thu May 12 14:29:23 2011 +0100

    message: store the TpMessage when created with one

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-message.c | 34 ++++++++++++++++++++++++++++++++++
 libempathy/empathy-message.h |  2 ++
 2 files changed, 36 insertions(+)

commit e98c7a31f74356590b5093d2108f100a661cfda1
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue May 10 16:36:00 2011 +0100

    Add empathy_duration_to_string()

    This is based on the body of empathy_time_to_string_relative();
    it takes
    a duration in seconds, rather than a timestamp.

 libempathy/empathy-time.c | 64
 ++++++++++++++++++++++++++---------------------
 libempathy/empathy-time.h |  1 +
 2 files changed, 36 insertions(+), 29 deletions(-)

commit a89cddec3e5faee08f61c1fc9ee67ccf243a0e1c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 12 11:09:37 2011 +0200

    Properly convert timestamps received from X11 (#650015)

    X11 timestamps are guint32 while Telepathy uses gint64 timestamps. We
    should
    always use tp_user_action_time_from_x11() to do the conversion.

 libempathy-gtk/empathy-chat.c		     | 4 ++--
 libempathy-gtk/empathy-contact-list-view.c  | 2 +-
 libempathy-gtk/empathy-contact-menu.c	     | 7 +++----
 libempathy-gtk/empathy-individual-menu.c    | 8 ++++----
 libempathy-gtk/empathy-new-call-dialog.c    | 3 ++-
 libempathy-gtk/empathy-new-message-dialog.c | 4 ++--
 src/empathy-chat-window.c		     | 2 +-
 src/empathy-event-manager.c		     | 3 ++-
 src/empathy-main-window.c		     | 4 ++--
 src/empathy-new-chatroom-dialog.c	     | 4 ++--
 src/empathy-streamed-media-window.c	     | 2 +-
 11 files changed, 22 insertions(+), 21 deletions(-)

commit f312b6f85b4128dffd08a5afc7797b7c204c7887
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 12 11:55:50 2011 +0200

    add empathy_get_current_action_time()

 libempathy-gtk/empathy-ui-utils.c | 6 ++++++
 libempathy-gtk/empathy-ui-utils.h | 2 ++
 2 files changed, 8 insertions(+)

commit d1bc3524be5909a9287b12b309f2dd2e97fc5778
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 12 10:56:29 2011 +0200

    empathy_chat_window_present_chat: always show newly created windows

    We just create so we should at least show it.

 src/empathy-chat-window.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 0a6ce2b0c136c05fa5395d51517208c041bc392d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 11 12:14:53 2011 +0200

    theme_adium_remove_focus_marks: early return if there is no unread
    message

 libempathy-gtk/empathy-theme-adium.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit b850f8c1c6106ac50b26e090c11bd1c7ae8c0f9d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 11 11:57:13 2011 +0200

    theme-adium: remove unread marks when sending a message

 libempathy-gtk/empathy-theme-adium.c | 3 +++
 1 file changed, 3 insertions(+)

commit ca3669ada0014c82b11a89921a4c38dee9296f13
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 11 11:47:56 2011 +0200

    theme-adium: remove focus marks as soon as the chat is not focused
    (#649890)

 libempathy-gtk/empathy-theme-adium.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit acde6c67cdd3c3684d564bb65f2628fdf1bec27a
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed May 11 10:39:36 2011 +0100

    contact: fix typo when creating new contact from logger entity

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-contact.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 34a7a0b348e1cdd3cfc184f135a8371d79741272
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Mon May 9 04:52:16 2011 +0530

    Password infobar amendments

    Destroy password infobar on parting password protected chatrooms and
    insensitivate input-text-view when displaying a new infobar

 libempathy-gtk/empathy-chat.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

commit 0c9a992db9d0f8426264b097f0aa0cfaca860509
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Mon May 9 16:26:30 2011 +0530

    Leave chatroom only if tp_chat exists

 src/empathy-chat-window.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

commit 50daa9eb6a529ad3d78448b134e4a76438124696
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 11 11:14:43 2011 +0200

    create_text_channel: pass Empathy.Chat as preferred handler

    Seem I forgot it when adding preferred handler in
    52eb24e6e7b012856525f6f09d3c1a941375d383.

 libempathy/empathy-request-util.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 07af036a20d37c11360add196bdbc9c7b841dc07
Author: Daniel Korostil <ted.korostiled@gmail.com>
Date:	Tue May 10 00:30:10 2011 +0300

    Uploaded Ukranian

 po/uk.po | 985
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 564 insertions(+), 421 deletions(-)

commit 2478a51afb098292194aa3825132c5ad52c211e7
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon May 9 19:31:49 2011 +0200

    Updated Spanish translation

 po/es.po | 92
 +++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 47 insertions(+), 45 deletions(-)

commit ae98a6de35c6fc05895d2be17c3f3a047f803f56
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 9 16:55:40 2011 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cedddaf2017b184abd2146f7cdb46c285ef5ee0c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 9 16:40:08 2011 +0200

    prepare 3.1.1

 NEWS	      | 88
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  6 ++---
 2 files changed, 91 insertions(+), 3 deletions(-)

commit ab93e6903be924419add3dc703bf5da9bfca63b3
Merge: 0b5aebd 72785d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 9 16:21:38 2011 +0200

    Merge remote-tracking branch
    'glassrose/save-chatrooms.xml-only-when-needed'

commit 72785d7ab576618ccc2847b8d51d1f4c9ff19241
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Sun May 8 00:44:43 2011 +0530

    Save changes to chatrooms.xml configuration file only when needed.

    Changes will be written to the file only when changes are made to a
    chatroom property that is listed in the file.

    Fixes room-list flicker:
    https://bugzilla.gnome.org/show_bug.cgi?id=642087

 libempathy/empathy-chatroom-manager.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 0b5aebd734f0a4759d2c8c5438830c372638fb70
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Mon May 9 12:59:27 2011 +0200

    Updated Galician translations

 po/gl.po | 698
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 408 insertions(+), 290 deletions(-)

commit 514c6109204c180fa7fc79581058f6dc8156a99e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 9 10:18:41 2011 +0200

    add translators comment explaining the insufficient balance error
    (#649735)

 libempathy-gtk/empathy-chat.c | 2 ++
 1 file changed, 2 insertions(+)

commit 7f6a15ff9f7eff608e4208ff99725eb8cd543d66
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 9 10:11:18 2011 +0200

    org.gnome.Empathy.gschema.xml: update summary and description of
    show-balance-in-roster

    We are generally using "contact list" instead of "roster". (#649734)

 data/org.gnome.Empathy.gschema.xml.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 7f4901b8677aeb0235b99acf2130eb5407f93b4d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 6 10:38:23 2011 +0200

    add a translation comment explaining the 'Provide' string (#649492)

 src/empathy-notifications-approver.c | 3 +++
 1 file changed, 3 insertions(+)

commit 9cd96631aadd370af208741905d7b90eac93907c
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Mon May 9 09:21:42 2011 +0300

    Updated Hebrew translation.

 po/he.po | 873
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 500 insertions(+), 373 deletions(-)

commit 5324df2fe08ece901d34271afc56ac41e5100fbf
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Mon Feb 28 05:07:31 2011 +0530

    Send full message for the default chat parted on part command

 libempathy/empathy-tp-chat.c |  3 +++
 src/empathy-chat-window.c    | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

commit ebd45e55f663e1c1e7bbadce2c910c0a8063e622
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sun May 8 17:08:55 2011 +0200

    Updated Spanish translation

 po/es.po | 569
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 304 insertions(+), 265 deletions(-)

commit 0a42a790212981b6740b2c93da647c835bddf25d
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Thu Mar 31 00:37:00 2011 +0530

    Attach account name information along with the chatroom names in
    main window Room menu

 src/empathy-main-window.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 9dbdbe692285c70d2b2bf713f2b21b156a87055c
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Sat Feb 26 04:29:46 2011 +0530

    Fire a "part-command-entered" signal from
    libempathy-gtk/empathy-chat.c to be caught in
    src/empathy-chat-window.c

    Fixes linking issues:
    https://bugzilla.gnome.org/show_bug.cgi?id=643295

 libempathy-gtk/empathy-chat.c | 41
 ++++++++++++-----------------------------
 libempathy-gtk/empathy-chat.h |  1 -
 src/empathy-chat-window.c     | 24 ++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 30 deletions(-)

commit 05715d914645b0415c77812b94f7a1b123857c8c
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Thu May 5 19:43:18 2011 +0200

    Updated Spanish translation

 po/es.po | 167
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 92 insertions(+), 75 deletions(-)

commit 3aca984088136430b8f54b16e5f1bed1e891c6d1
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Wed May 4 16:35:32 2011 +0200

    Include gi18n-lib.h in library sources, not gi18n.h.

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=649379

 libempathy-gtk/empathy-contact-blocking-dialog.c | 3 ++-
 libempathy-gtk/empathy-contact-search-dialog.c   | 3 ++-
 libempathy-gtk/empathy-contact-selector.c	  | 2 +-
 libempathy-gtk/empathy-location-manager.c	  | 2 +-
 libempathy-gtk/empathy-theme-adium.c		  | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

commit 9a17d44fc225a0e4a26d702366236622830c301a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 5 11:27:28 2011 +0200

    ignore return value of main_window_setup_balance_create_widget()

    fix unused-but-set-variable warnings with gcc 4.6. Thanks to Marc
    Plano-Lesay
    for reporting.

 src/empathy-main-window.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 05c9e6264afc59d72d824f19ca18f902dbd61cae
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed May 4 18:31:53 2011 +0200

    Adium: Fix wrong html fallbacks

    Fallbacks are actually more complex than I though. This is exactly
    how adium does
    the fallbacks

 libempathy-gtk/empathy-theme-adium.c | 339
 ++++++++++++++---------------------
 1 file changed, 131 insertions(+), 208 deletions(-)

commit cf10975ad04b36d408ae1615de570b5b0df52cf9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 5 10:31:04 2011 +0200

    Depends on tp-glib 0.14.3

    We need it for TP_ERROR_STR_INSUFFICIENT_BALANCE.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 822b3b6e0a5d781cbe0ff024eed6c8b8dace6526
Merge: c698741 90d1301
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu May 5 18:30:33 2011 +1000

    Merge branch 'balance-rebase'

commit c698741b1825e306de447fa09624f4a93f067374
Merge: 981d175 0d44943
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu May 5 18:22:31 2011 +1000

    Merge branch 'delivery-reports-rebase'

commit 981d17576bb3451bd4ac79cbd2de079fb64d260b
Author: Marc Plano-Lesay <marc.planolesay@gmail.com>
Date:	Wed May 4 14:35:07 2011 +0200

    fix unused-but-set-variable warnings

 libempathy-gtk/empathy-account-widget.c |  3 ---
 libempathy-gtk/empathy-contact-widget.c | 14 ++------------
 src/empathy-accounts-dialog.c		 | 20 --------------------
 src/empathy-auth-client.c		 |  3 +--
 src/empathy-chat-window.c		 |  9 ---------
 src/empathy-event-manager.c		 | 10 ----------
 src/empathy-ft-manager.c		 |  3 ---
 src/empathy-new-chatroom-dialog.c	 |  7 -------
 src/empathy-preferences.c		 |  6 +-----
 src/ev-sidebar.c			 |  2 --
 tests/interactive/contact-manager.c	 |  3 +--
 11 files changed, 5 insertions(+), 75 deletions(-)

commit 9a1a49ed9ddf5a3d1da99eabca27882705688545
Merge: 77fab8e 0fda594
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu May 5 17:37:40 2011 +1000

    Merge branch 'sms-support-rebase'

commit 0d44943efc4f3f727861387ba89f57238aa92577
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 4 10:05:16 2011 +1000

    Add a tooltip to the sending message spinner

 src/empathy-chat-window.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

commit 24e6b10a9c1795964f0e6e80e074eff24344f64b
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed May 4 09:58:18 2011 +1000

    Fix broken logic that caused delivery report spinner to spin forever

 libempathy/empathy-tp-chat.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 3e22736f0211a0bb668218243bc4764435f62a58
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Apr 28 15:28:35 2011 +1000

    [chat-window] add a spinner to the window tab for when messages are
    being sent

 src/empathy-chat-window.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

commit 4f37d474725cd006eb627e10349e0361ce9a7b29
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Apr 28 15:28:08 2011 +1000

    [chat] expose this property in EmpathyChat

 libempathy-gtk/empathy-chat.c | 44
 +++++++++++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-chat.h |  2 ++
 2 files changed, 46 insertions(+)

commit 1f46d6c5aa319ea7b81c29dcd08a0c7eb40d5789
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Apr 27 14:10:50 2011 +1000

    [tp-chat] add a counter for the number of pending messages

    Requires delivery reports to include delivery-token.

 libempathy/empathy-tp-chat.c | 81
 ++++++++++++++++++++++++++++++++++++++++++--
 libempathy/empathy-tp-chat.h |  6 ++++
 2 files changed, 84 insertions(+), 3 deletions(-)

commit b0aaacf05d0b46ca53f3b6b9f2dd0565cea0f5d0
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Apr 21 15:03:52 2011 +1000

    Use dbus-error from delivery report for better errors

 libempathy-gtk/empathy-chat.c | 52
 ++++++++++++++++++++++++++-----------------
 libempathy/empathy-tp-chat.c  | 12 ++++++----
 2 files changed, 39 insertions(+), 25 deletions(-)

commit 90d1301153a574f9d3ac986783efa6b96ebb2f57
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue May 3 17:36:12 2011 +1000

    Change the menu to say "Credit Balance"

 src/empathy-main-window.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8b7ca3f8fc98f353c439841efbf6951e86ad45a7
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue May 3 17:33:34 2011 +1000

    Update balance view in roster per feedback

 src/empathy-main-window.c | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

commit 49af530a5bfa17173e28a7b706c5e68117c2cd21
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue May 3 17:22:30 2011 +1000

    Change menu string to "Top up My Account ($1.23)..."

 src/empathy-main-window.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

commit ceeeac4a2c95f89e4ed4042e9e0795786c94fb82
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Apr 21 13:12:15 2011 +1000

    Update formatting for NOK

 libempathy/empathy-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0ba165de9aecc194985de7c6c938b69360e9c3a3
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Apr 19 08:32:31 2011 +1000

    The icon needs to be set as "icon-name" not "stock-id"

 src/empathy-main-window.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit a3efb63e796880a945daa81be60c77df8a610f95
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Apr 18 13:09:19 2011 +1000

    Fill out empathy_format_currency() with more currencies

 libempathy/empathy-utils.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

commit f8c157d0188f3c8244b74d4d07fc4f85b7ef1079
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Apr 18 11:12:47 2011 +1000

    Use pointless g* types for consistency

 libempathy/empathy-utils.c | 8 ++++----
 libempathy/empathy-utils.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

commit d4597e973a5eef6389f0900c3cea91d73e7c9873
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Apr 18 10:51:34 2011 +1000

    'spacing' is an object property, not a child property of the packing

 src/empathy-main-window.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4786fdc5f4424c88c7fcaad5357f42a27c4e24ad
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Apr 15 16:39:40 2011 +1000

    Add a menu item to choose whether to show account balances in
    the roster

 data/org.gnome.Empathy.gschema.xml.in |  5 +++++
 src/empathy-main-window.c	       | 30 +++++++++++++++++++++++++-----
 src/empathy-main-window.ui	       |  8 ++++++++
 3 files changed, 38 insertions(+), 5 deletions(-)

commit 1038e0350d5cbe5b70f8d618b1a13d6717da8d7c
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Apr 15 16:18:33 2011 +1000

    Create balance widget, tie it to the action

    TODO:
     - show and hide balance widgets in response to a toggleaction

 src/empathy-main-window.c  | 53
 +++++++++++++++++++++++++++++++++++++++++++++-
 src/empathy-main-window.ui | 19 ++++++++++++++---
 2 files changed, 68 insertions(+), 4 deletions(-)

commit 4f128d19a94c2315db1bab800be93d97e6033b72
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Apr 15 15:47:50 2011 +1000

    Factor out main_window_setup_balance_create_action()

 src/empathy-main-window.c | 66
 ++++++++++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 26 deletions(-)

commit c26345ba2beb3957327810e201a9f71097910738
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Apr 15 15:24:23 2011 +1000

    Support Conn.I.Balance.ManageCreditURI

 src/empathy-main-window.c | 43
 +++++++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 14 deletions(-)

commit 0892b114ee4fd20559fb0c613c7c145c8bedbc9d
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Apr 15 14:33:20 2011 +1000

    Remove balance from menu when account is disconnected

 src/empathy-main-window.c | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

commit 416da629fa9a0e9293b811d36547b0b189b6e13d
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Apr 15 14:20:31 2011 +1000

    Add a menuitem to report the account balance for each account

    Adds a menu item for each connection that supports Conn.I.Balance,
    requests
    the current balance and then tracks further updates to the balance.

    TODO:
     - remove the menu item when the account is disconnected
     - implement the activated signal

 src/empathy-main-window.c  | 197
 +++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-main-window.ui |	2 +
 2 files changed, 199 insertions(+)

commit 1cc68d03a0339cf5f31fabb308b3f1cd9bdb9272
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Apr 15 14:15:47 2011 +1000

    Add method empathy_format_currency()

    This method takes a Telepathy Currency_Amount and attempts to format
    it using
    currency rules appropriate for that amount.

    Unfortunately I haven't yet found a good summary of currency rules,
    so I've
    mostly been guessing. The currencies structure needs completing
    and checking.

 libempathy/empathy-utils.c | 74
 ++++++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-utils.h |  2 ++
 2 files changed, 76 insertions(+)

commit 0fda59487b536e49bfcec7ab1ee6e9c6d7b6f306
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu May 5 16:22:23 2011 +1000

    Include SMSChannel property in empathy_chat_window_find_chat()

    The approach in https://bugzilla.gnome.org/show_bug.cgi?id=644085
    was wrong
    because channel paths can change across reconnects. This would cause
    new chat
    windows to be created when they were rerequested.

    A more future-proof solution would be to keep a white/black list
    of comparable
    properties, but I think this is overengineering the problem for
    the time
    being. Instead we'll just include the SMSChannel property in the
    comparison.

 src/empathy-chat-manager.c | 3 ++-
 src/empathy-chat-window.c  | 8 +++++---
 src/empathy-chat-window.h  | 3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

commit 11e8ca993282f16043b821f00e55f5ebd03fb089
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Apr 13 16:24:21 2011 +1000

    Only set the SMS button sensitive if we have SMS capability

 libempathy-gtk/empathy-new-message-dialog.c | 65
 ++++++++++++++++++++++++++++-
 1 file changed, 63 insertions(+), 2 deletions(-)

commit 73220cb660bf75ac0c57f46ca514146cfa091e4f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Apr 13 16:23:41 2011 +1000

    contact-selector-dialog: add a selected-account property

 libempathy-gtk/empathy-contact-selector-dialog.c | 25
 +++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

commit 537eb8711fdac7dc78c047b390fc65ab424bd0d3
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Apr 12 16:23:49 2011 +1000

    Add an SMS button to the new-message dialog

 libempathy-gtk/empathy-new-message-dialog.c | 43
 ++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 4 deletions(-)

commit 2411c0bc8accdfe6ff38cca5510c79f0f56abd8f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Apr 12 09:43:36 2011 +1000

    Don't wait for SMS properties when there is no SMS support on
    the channel

 libempathy/empathy-tp-chat.c | 3 +++
 1 file changed, 3 insertions(+)

commit 8d16f171e0e256e0d8c954c7deb7c410e8e66465
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Apr 7 11:54:32 2011 +1000

    Add "(SMS)" to the tab name for SMS channels

 libempathy-gtk/empathy-chat.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 385dc5af3c16b6de75d92b989585e44f953967f6
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Apr 7 11:48:56 2011 +1000

    Change empathy_chat_get_name() from const char * -> char *

    Change the name to empathy_chat_dup_name() to reflect this change.

    Note to reviewer: I think I've updated all the callers, but this is
    the commit
    to check carefully for new leaks :)

 libempathy-gtk/empathy-chat.c |  8 ++++----
 libempathy-gtk/empathy-chat.h |  2 +-
 src/empathy-chat-window.c     | 42
 ++++++++++++++++++++++++++++--------------
 3 files changed, 33 insertions(+), 19 deletions(-)

commit 19ff66754d0afc6ef10fffba319c781dfc9d0ec9
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Apr 7 11:43:07 2011 +1000

    Add "SMS:" to the tooltip

 src/empathy-chat-window.c | 4 ++++
 1 file changed, 4 insertions(+)

commit a0069b64b55bd239eb7d4678fb9792b1359210dc
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Apr 7 11:42:12 2011 +1000

    Set EMPATHY_IMAGE_SMS on sms channels

 src/empathy-chat-window.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 6a5fd794b64d48898c3b941b64c6431f55419939
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Apr 7 11:41:54 2011 +1000

    Add sms-channel property to empathy-chat

 libempathy-gtk/empathy-chat.c | 46
 +++++++++++++++++++++++++++++++++++++++++--
 libempathy-gtk/empathy-chat.h |  2 ++
 2 files changed, 46 insertions(+), 2 deletions(-)

commit 8af3231ae3260e40bc327567540a0a3a76dce5b1
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Apr 6 17:13:33 2011 +1000

    Add sms-channel property to empathy-tp-chat

 libempathy/empathy-tp-chat.c | 77
 ++++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-tp-chat.h |  2 ++
 2 files changed, 79 insertions(+)

commit b41c1f0e4b8277feee45703d283591adaed6305b
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Wed May 4 00:59:12 2011 +0530

    Move the code ensuring a requested sms channel to empathy-request-util
    as empathy-dispatcher has been deleted in master

 libempathy-gtk/empathy-individual-menu.c |  2 +-
 libempathy/empathy-request-util.c	  | 55
 +++++++++++++++++++-------------
 libempathy/empathy-request-util.h	  |  5 +++
 3 files changed, 38 insertions(+), 24 deletions(-)

commit ce8a8930c60b7dbb45f14ed49e8473c4f78e9686
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Apr 6 16:34:43 2011 +1000

    Add SMS entry to empathy-individual-menu

 libempathy-gtk/empathy-images.h	  |  1 +
 libempathy-gtk/empathy-individual-menu.c | 65
 ++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-individual-menu.h |  5 ++-
 libempathy/empathy-contact.c		  | 21 +++++++++++
 libempathy/empathy-contact.h		  |  3 ++
 5 files changed, 94 insertions(+), 1 deletion(-)

commit 77fab8ebc60ce2625c4f449cde6296b25b10b05d
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed May 4 22:39:50 2011 +0200

    Updated Spanish translation

 po/es.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e589a87b20c200748226195090d4b0a89ae631eb
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed May 4 22:38:14 2011 +0200

    Updated Spanish translation

 po/es.po | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

commit f758b26e3d8bbc6ca348ce4de99b95547745a374
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed May 4 22:36:44 2011 +0200

    Updated Spanish translation

 po/es.po | 100
 ++++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 73 insertions(+), 27 deletions(-)

commit 3eef7be07ed7873e1f95571082eb6c2319e0b9b3
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed May 4 14:30:02 2011 +0200

    Adium: Correctly support action messages (/me)

    Fixes bug #649367

 libempathy-gtk/empathy-theme-adium.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

commit d26565223775beb169f46c315f8c09d1de0b85da
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue May 3 23:39:38 2011 +0200

    Adium: Fix selection of default variant

    For theme version >= 3, a variant CSS is mandatory. If none are set
    inf DefaultVariant, the first one from Variant/ should be used.

    For theme version <= 2, a variant CSS is optional, and by default they
    should not have one. If no variant is selected, fallback to main.css.

    This also prepare needed API to select other variants

 libempathy-gtk/empathy-theme-adium.c | 216
 ++++++++++++++++++++++++++---------
 libempathy-gtk/empathy-theme-adium.h |   3 +
 2 files changed, 166 insertions(+), 53 deletions(-)

commit f4d37063650dd562b21ff722700fff573ca5e6b6
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Wed May 4 11:14:27 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 623
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 348 insertions(+), 275 deletions(-)

commit 06abfe6cfc83b0355403ee7d5ccc45afc2d3b43d
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Tue May 3 23:11:22 2011 +0200

    Updated Spanish translation

 po/es.po | 113
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 56 insertions(+), 57 deletions(-)

commit a4c37d0cbf7030206a31a9eee838ae8b0d3f13d3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 3 14:43:34 2011 +0200

    empathy-chat: track chat displayed instead of channels being handled
    (#649273)

 src/empathy-chat-manager.c | 71
 +++++++++++++++++++++-------------------------
 src/empathy-chat.c	    |  6 ++--
 2 files changed, 35 insertions(+), 42 deletions(-)

commit 454bb79700b86511e3b0b03c7aab0d498e6a7258
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 3 14:29:26 2011 +0200

    remove unused empathy_chat_manager_get_num_handled_chats()

 src/empathy-chat-manager.c | 8 --------
 src/empathy-chat-manager.h | 2 --
 2 files changed, 10 deletions(-)

commit 74c8015453317b0084bdac8a22e6974e2af0865d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue May 3 16:21:54 2011 +0200

    Preferences: Show chat theme preview

    Fixes bug #541438

 src/empathy-preferences.c  |  250 +++++---
 src/empathy-preferences.ui | 1427
 ++++++++++++++++++++++++--------------------
 2 files changed, 965 insertions(+), 712 deletions(-)

commit 752ff0ce87069fad6eaea4d9e6dff84d8a2cf55d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue May 3 16:20:29 2011 +0200

    ThemeManager: Make sure to emit theme-changed only once when the
    theme changed

    Also avoid emiting the signal if it is just a variant change that can
    be applied on view.

 libempathy-gtk/empathy-theme-manager.c | 89
 ++++++++++++++++++++++++++++++----
 1 file changed, 79 insertions(+), 10 deletions(-)

commit af9137e60f178bcc5fe039c64ea5e7a762ffcc62
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue May 3 14:23:25 2011 +0200

    Adium: Also queue events when loading the page

 libempathy-gtk/empathy-theme-adium.c | 32
 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

commit 9c9775421d361b2f615bb06a7e9286bfeb912da0
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue May 3 11:11:43 2011 +0200

    Adium: Events must be queued until the Template.html loaded

 libempathy-gtk/empathy-theme-adium.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 7aa2b0f9959c05bd4c361cd582438fd92e9229e4
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon May 2 22:18:53 2011 +0200

    Adium: Mark autoreply message

 libempathy-gtk/empathy-theme-adium.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 1a3795ae51d0d0539a8a4ab267e743811d9ce75c
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon May 2 22:14:15 2011 +0200

    Adium: highlight messages starting with our name

 libempathy-gtk/empathy-theme-adium.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 0a23e2154b658e2093980e299045fdcc92feabd2
Author: Muhammet Kara <muhammet.k@gmail.com>
Date:	Tue May 3 11:23:24 2011 +0300

    Updated Turkish translation

 po/tr.po | 112
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 55 insertions(+), 57 deletions(-)

commit b71596cf3baf4852ec2bae3ce0fdab236e98d3cc
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon May 2 21:26:09 2011 +0200

    Depend on stable release of glib 2.28.0

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e3a4b93a1e7ec0fd3aa87818189bd87710645257
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon May 2 20:27:13 2011 +0200

    Fix crash if contact_id is NULL when selecting its color

 libempathy-gtk/empathy-theme-adium.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit e9ef0cff07611187f2230b08e396fc1637e14ec8
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon May 2 15:42:24 2011 +0200

    Adium: Temporally disable scrolling when appending backlog

 libempathy-gtk/empathy-theme-adium.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

commit 28e020cf508280879d2a7b8ea3ceec878f5c381b
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon May 2 15:10:39 2011 +0200

    Update Template.html from newest adium

 data/Template.html | 354
 ++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 269 insertions(+), 85 deletions(-)

commit 9c19838a24ca1085a5b77f40eb29bcd1b6597221
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 2 14:55:55 2011 +0200

    coding style fix

 libempathy-gtk/empathy-theme-adium.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d4250dd038f2c7f5556c7b564f011de8e210e1c3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 2 14:42:00 2011 +0200

    POTFILES.in: add libempathy-gtk/empathy-search-bar.c

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit 715bb21b4598091c2dac0ebf94b3d744056d01e6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 2 13:36:42 2011 +0200

    theme-adium: implement %senderColor% (#541632)

 libempathy-gtk/empathy-theme-adium.c | 33
 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

commit fdae42d539623655e9e496c80392164bc3c0f263
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon May 2 13:54:17 2011 +0200

    Support new themes that have only Resources/Content.html

    Still fallback to legacy html files if global one is missing.

 libempathy-gtk/empathy-theme-adium.c | 120
 +++++++++++++++++++++++------------
 1 file changed, 81 insertions(+), 39 deletions(-)

commit bc609ea14a874a1ef9c66747ce118228c9fb0a65
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon May 2 13:52:06 2011 +0200

    Fix a crash if replacement is NULL

 libempathy-gtk/empathy-theme-adium.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 4b846aa7efc67f6e01f2e4344d8da0a298d172b8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 2 10:10:17 2011 +0200

    individual_store_get_individual_status_icon_with_icon_name: look in
    the cache before creating new pixbuf

 libempathy-gtk/empathy-individual-store.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit ee02e3e2da01c356c6883fa51b2d5cf1cac7318c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 2 10:04:22 2011 +0200

    main_window_flash_foreach: don't leak the pixbuf returned by
    empathy_pixbuf_from_icon_name

 src/empathy-main-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit 7078e93bbcd562175248a8fdf752f2fa92f1171c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 29 17:53:17 2011 +0200

    set a not empty string when setting
    EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND

    libnotify now filters out empty string so the hint was not set
    (#648842).

 src/empathy-chat-window.c	      | 3 ++-
 src/empathy-notifications-approver.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

commit 85058e4e3f88412683771172f7dace66366ad069
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 29 15:47:50 2011 +0200

    Display favorite offline contacts only in the Favorite group (#648914)

 libempathy-gtk/empathy-individual-view.c | 53
 +++++++++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 5 deletions(-)

commit 5ead12fb5b53cea0c8a97e8f101e2d729ca47282
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sat Apr 30 23:09:26 2011 +0200

    Updated galician translations

 po/gl.po | 593
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 311 insertions(+), 282 deletions(-)

commit d8f9882180f0b1b8579a88e0c96a9b52895ab1a0
Author: Marek Černocký <marek@manet.cz>
Date:	Sat Apr 30 13:07:04 2011 +0200

    Updated Czech translation

 po/cs.po | 661
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 342 insertions(+), 319 deletions(-)

commit c85766cdb415b34c85f292573b46000d6f592487
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Thu Apr 28 21:25:18 2011 +0200

    Updated Slovenian translation

 po/sl.po | 605
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 316 insertions(+), 289 deletions(-)

commit 6f6b46ec60bd4492024c38a0e7a6301ccb880e2a
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Apr 27 20:12:22 2011 +0200

    Updated Spanish translation

 po/es.po | 364
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 193 insertions(+), 171 deletions(-)

commit 5360a078c1b0d1e80a031fab38b865144447080d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Apr 26 11:52:33 2011 +0200

    Use focus feature of adium themes

 libempathy-gtk/empathy-chat-view.c   | 11 +++++
 libempathy-gtk/empathy-chat-view.h   |  4 ++
 libempathy-gtk/empathy-chat.c	      | 16 ++++++-
 libempathy-gtk/empathy-theme-adium.c | 93
 ++++++++++++++++++++++++++++++++++--
 4 files changed, 118 insertions(+), 6 deletions(-)

commit e4e176e847974f11e5155f434c1620c042dacd69
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Apr 26 14:31:50 2011 +0200

    Add FIXMEs for things we don't implement yet from adium theme spec

    This also replaces well known keywords that we don't implement yet by
    "",
    otherwise the html is broken and webkit does not render it correctly.

 libempathy-gtk/empathy-theme-adium.c | 162
 ++++++++++++++++++++++++++---------
 1 file changed, 123 insertions(+), 39 deletions(-)

commit 898327a20db060ddcedde2e85757c952c08dbef3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 27 12:04:06 2011 +0200

    chat_window_page_switched_cb: get the child from the GTK+ signal

    We don't care about GTK+2 compatibility any more.

 src/empathy-chat-window.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

commit bc3746dd1bb352d54542d662846273491fa869e2
Author: Muhammet Kara <muhammet.k@gmail.com>
Date:	Tue Apr 26 15:21:12 2011 +0300

    Updated Turkish translation

 po/tr.po | 400
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 214 insertions(+), 186 deletions(-)

commit 3e34b40f5a2ce026187c2e9c8316f1b255c193e9
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Apr 15 19:31:28 2011 +0100

    contact_list_store_chat_state_changed_cb(): tidy

    This doesn't fix bgo#647891, but I think it makes the loop clearer.

    Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

 libempathy-gtk/empathy-contact-list-store.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit 4b33bdcdb42169a0e38c4a21b07deb6a4d8dcc93
Author: Abduxukur Abdurixit <abdurixit@gmail.com>
Date:	Mon Apr 25 09:56:22 2011 +0200

    Added UG translation

 po/ug.po | 272
 ++++++++++++++++++---------------------------------------------
 1 file changed, 77 insertions(+), 195 deletions(-)

commit e958f2457d7c4f9b51422cb10a658cc8a5756a13
Author: Sira Nokyoongtong <gumaraa@gmail.com>
Date:	Mon Apr 25 14:44:56 2011 +0700

    Updated Thai translation.

 po/th.po | 2317
 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 1573 insertions(+), 744 deletions(-)

commit 4d4d074747c78b34394af9931d241f087c720f7f
Author: Abduxukur Abdurixit <abdurixit@gmail.com>
Date:	Sun Apr 24 20:29:13 2011 +0200

    Added UG translation

 po/ug.po | 1563
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 845 insertions(+), 718 deletions(-)

commit 1af5e4df56d4be49a4f79fe614adf5016a28170c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 22 10:20:50 2011 +0200

    account-assistant: ensure that the import widget takes all the space
    available (#648372)

 src/empathy-account-assistant.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit bf973005c4dde610ecdf7d9e1207e602128ed48f
Author: Arash Mousavi <amousavi@src.gnome.org>
Date:	Fri Apr 22 01:07:58 2011 +0430

    Updated Persian translation

 po/fa.po | 1048
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 597 insertions(+), 451 deletions(-)

commit 6553d96b15dde13d30ed25f0c302c21f3c72bcce
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 20 14:27:37 2011 +0200

    account-widget: remove all the code related to the enabled checkbox

 libempathy-gtk/empathy-account-widget.c | 158
 +-------------------------------
 1 file changed, 2 insertions(+), 156 deletions(-)

commit 6df860aee0936c9bc903420c490a312dd6e3207e
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Mar 14 21:30:10 2011 +1100

    Remove enabled toggle from account-widget

 libempathy-gtk/empathy-account-widget.c | 4 ++++
 1 file changed, 4 insertions(+)

commit aab7e0e7a78708663fd75baddfd7bd2b06251257
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 20 14:21:08 2011 +0200

    don't display the enable switch if account is restricted

 src/empathy-accounts-dialog.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 9de3622a5e8e94005b2d2c782486822459690e2c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 20 14:09:07 2011 +0200

    use a GtkSwitch instead of MX switch

 src/empathy-accounts-dialog.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

commit 4d9b2abd1374653c7fa88cc1edc30438dcf0ba8f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Mar 14 21:24:15 2011 +1100

    Add an enabled switch to the account dialog GtkInfoBar

 src/empathy-accounts-dialog.c | 63
 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

commit 83f3f9dc6adf394915c7da8a1da16c127ea6a10d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 19 17:33:14 2011 +0200

    location-manager: use tp_asv_*

 libempathy-gtk/empathy-location-manager.c | 29
 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

commit 2f5f9eb6d3d4185f9a20c158567ccdd969df52d9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 19 17:25:15 2011 +0200

    location-manager: use the self->priv pattern

 libempathy-gtk/empathy-location-manager.c | 194
 ++++++++++++++----------------
 libempathy-gtk/empathy-location-manager.h |   3 +-
 2 files changed, 94 insertions(+), 103 deletions(-)

commit d98211ce5e4f1c092c4d8b2ebcb2734c00eb9548
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 19 17:13:18 2011 +0200

    location-manager: remove useless propety getter and setter

 libempathy-gtk/empathy-location-manager.c | 34
 -------------------------------
 1 file changed, 34 deletions(-)

commit 108817b949df863a7c17748587dbccc9b313ba16
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 19 17:12:20 2011 +0200

    location_manager_dispose: use tp_clear_*

 libempathy-gtk/empathy-location-manager.c | 41
 +++++--------------------------
 1 file changed, 6 insertions(+), 35 deletions(-)

commit 35722b1439baba701f5ba99ea8c3b956e7dda157
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Wed Apr 20 12:42:28 2011 +0200

    Updated Polish translation

 po/pl.po | 325
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 166 insertions(+), 159 deletions(-)

commit bdea54f59e52ebeaa0743674aa5998636f26a241
Merge: 9d9cfc0 eb6ab43
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 20 09:49:52 2011 +0200

    Merge branch 'timestamp-648188'

commit eb6ab4328849a0c5ee5959560f90f36fd71a815d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 19 12:18:02 2011 +0200

    chat_text_view_append_timestamp: use empathy_time_to_string_utc()

 libempathy-gtk/empathy-chat-text-view.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

commit 92af7e9f7c5f114963299fcf53b48b4ed86a2f7b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 19 11:06:52 2011 +0200

    Port all timestamps from time_t to gint64 (#648188)

 libempathy-gtk/empathy-chat-text-view.c    | 43 +++++++++--------
 libempathy-gtk/empathy-chat-text-view.h    |  2 +-
 libempathy-gtk/empathy-contact-widget.c    |  6 +--
 libempathy-gtk/empathy-individual-widget.c |  6 +--
 libempathy-gtk/empathy-location-manager.c  | 17 +++----
 libempathy-gtk/empathy-theme-adium.c	    |  6 +--
 libempathy-gtk/empathy-theme-boxes.c	    |  2 +-
 libempathy/empathy-ft-handler.c	    |  4 +-
 libempathy/empathy-message.c		    | 18 ++++---
 libempathy/empathy-message.h		    |  2 +-
 libempathy/empathy-time.c		    | 76
 ++++++++++++++++++------------
 libempathy/empathy-time.h		    |  8 ++--
 libempathy/empathy-tp-file.c		    |  2 +-
 src/empathy-map-view.c			    | 14 ++++--
 14 files changed, 110 insertions(+), 96 deletions(-)

commit 2d1ca4e5b9f7fdff7b1ea2d4fc31828d7dbbbae8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 19 11:31:18 2011 +0200

    empathy-time: remove unused functions

 libempathy/empathy-time.c | 50
 -----------------------------------------------
 libempathy/empathy-time.h |  2 --
 2 files changed, 52 deletions(-)

commit e3eb2f9d11ae3cc274c9d020dca0306fde07f783
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 19 10:49:42 2011 +0200

    empathy-message: cast timestamps to glong

    tp_message_get_received_timestamp() and tpl_event_get_timestamp()
    both return
    gint64 while the timestamp is stored as a glong. We need to cast it
    as varargs
    won't do it for us and not casting will result in a a sizing
    mismatch on
    32-bit.

    Ideally we should stop using time_t and always use gint64 with
    timestamps.

 libempathy/empathy-message.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 52d369333daea849d6119f4aee80007d9c659652
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 19 09:52:54 2011 +0200

    empathy_message_new_from_tp_message: assign priv as soon as the
    message is created

 libempathy/empathy-message.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 9d9cfc021b05fe9afbe8769d6e0c289cf1dc9734
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 13 12:34:38 2011 +0200

    accounts_dialog_cms_prepare_cb: don't update the settings if we are
    already preparing one

    This may lead to ignoring the existing setting if it's a slow one
    to prepare
    (as Haze for example). (#647641)

 src/empathy-accounts-dialog.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit c97c920a473ac08460f3869db70a6bb829c9317d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 18 14:48:47 2011 +0200

    use the TpChannel:chat-state-changed signal

 libempathy/empathy-tp-chat.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

commit d12280ac153d2b16b2a6a7181ebc5fa4c9300408
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 18 14:31:42 2011 +0200

    use delivery report instead of Text.SendError

 libempathy/empathy-tp-chat.c | 75
 +++++++++++++++++++++++++++++---------------
 1 file changed, 50 insertions(+), 25 deletions(-)

commit f3b23695b79b4eee34619e36c9f7c37160674de5
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Apr 15 15:53:03 2011 -0400

    preferences: use GtkBox instead of Gtk[V,H]Box

    Use the orientation property of GtkBox to inherit the new proper
    packing
    defaults, otherwise boxes in the preferences will look all spread
    in the
    notebook height.

    https://bugzilla.gnome.org/show_bug.cgi?id=647904

 src/empathy-preferences.ui | 86
 +++++++++++++++++++++++-----------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

commit 1f28f03c2d9765928df41bd5309ac58cfca45229
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 18 13:25:39 2011 +0200

    factor out handle_incoming_message()

 libempathy/empathy-tp-chat.c | 40
 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

commit 4cda099c0f5715355829e7ead5b272eb2465a3c0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 15 17:08:58 2011 +0200

    empathy-message: remove useless public setters

    Also fix the GParamFlags of properties.

 libempathy/empathy-message.c | 141
 +++++++------------------------------------
 libempathy/empathy-message.h |  13 ----
 2 files changed, 22 insertions(+), 132 deletions(-)

commit e3a5d537c9604663f46ec6e82cf397781718a222
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 15 16:50:33 2011 +0200

    remove empathy_message_new()

 libempathy/empathy-message.c | 22 +++++++---------------
 libempathy/empathy-message.h |  1 -
 2 files changed, 7 insertions(+), 16 deletions(-)

commit 6c45c22ef3b659f977221ad691638a073bcfa94e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 15 16:41:25 2011 +0200

    use tp_text_channel_send_message_async()

 libempathy-gtk/empathy-chat.c | 19 +++++++------
 libempathy/empathy-tp-chat.c  | 65
 +++++++++++++++++++++++++++++--------------
 libempathy/empathy-tp-chat.h  |  2 +-
 3 files changed, 56 insertions(+), 30 deletions(-)

commit 92ff1b9177bd6d8633b8d92357e5081db0e9554f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 18 14:38:46 2011 +0200

    chat_send_error_cb: don't display the message if it's NULL

 libempathy-gtk/empathy-chat.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit e311aa90b3aad5822ddc4a4c040162dea65dea68
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Sat Apr 16 17:13:51 2011 +0100

    Bug 647056 — Removing a contact causes a segfault

    Fix a double unref which was causing segfaults when removing contacts.

    Closes: bgo#647056

 libempathy-gtk/empathy-individual-view.c | 1 -
 1 file changed, 1 deletion(-)

commit 2af2286eb763f631624db953679c1cba28ff91d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 15 15:17:07 2011 +0200

    factor out empathy_message_new_from_tp_message

 libempathy/empathy-message.c | 33 ++++++++++++++++++
 libempathy/empathy-message.h |  5 +++
 libempathy/empathy-tp-chat.c | 83
 ++++++++------------------------------------
 3 files changed, 53 insertions(+), 68 deletions(-)

commit 05ab1873675c5e2a6a04c85ef976fb1067a0d743
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 15 15:35:07 2011 +0200

    empathy-message: add missing getter/setter

 libempathy/empathy-message.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit fde2bece1e5729ce6907f22a6ae48bb3d1eccab4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 15 14:37:53 2011 +0200

    use TpTextChannel:message-sent

 libempathy/empathy-tp-chat.c | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

commit c94106860671d6d7d522d93235727e746c10de07
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 15 14:08:33 2011 +0200

    use TpTextChannel:message-received

 libempathy/empathy-tp-chat.c | 52
 +++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 27 deletions(-)

commit 29ba2de90301c925a95214af450f6a0dae4867c7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 15 12:57:56 2011 +0200

    use tp_text_channel_get_pending_messages() to get the pending messages

 libempathy/empathy-tp-chat.c | 91
 +++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 57 deletions(-)

commit ddcc4fc3969c7eb60af1a298a8619d1bb0359a83
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 15 12:21:52 2011 +0200

    empathy-tp-chat: ensure that we get a TpTextChannel

 libempathy/empathy-chatroom-manager.c | 3 +++
 libempathy/empathy-tp-chat.c	       | 2 +-
 src/empathy-chat-manager.c	       | 7 +++++++
 src/empathy-event-manager.c	       | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

commit 5d64d93d3b713a474b56610f38c4fcbb9612c02e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 15 11:58:39 2011 +0200

    Add translation context on some strings (#646131)

 libempathy-gtk/empathy-account-widget.c |  2 +-
 libempathy/empathy-utils.c		 |  2 +-
 src/empathy-streamed-media-window.c	 | 12 ++++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

commit 75895a624190789b42a96b68051258cf837a0de6
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Mon Apr 18 10:46:29 2011 +0300

    Updated Hebrew translation.

 po/he.po | 447
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 229 insertions(+), 218 deletions(-)

commit 701b2d42aeb5175ee1713cdc5346e4be6ca3c02f
Merge: c2cd5ba 8160b75
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 15 11:24:30 2011 +0200

    Merge branch 'nm-asleep-647793'

commit 8160b750d804d3d7af55d6c77f1cddc6a16859b8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 15 08:33:27 2011 +0200

    connectivity: consider that network is disconnected if state is
    NM_STATE_ASLEEP (#647793)

 libempathy/empathy-connectivity.c | 1 +
 1 file changed, 1 insertion(+)

commit c2cd5bafc71297d80eff48708750b2a4a419b671
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:	Thu Apr 14 18:58:18 2011 +0700

    Updated Vietnamese translation

 po/vi.po | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

commit 45800f762da9457e8f4f72d9f23dcfea02bf5e97
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:	Thu Apr 14 18:52:55 2011 +0700

    po/vi.po: import from Damned Lies

 po/vi.po | 760
 ++++++++++++++++++++++-----------------------------------------
 1 file changed, 260 insertions(+), 500 deletions(-)

commit d2a6e841f9d9c4922c37305e5013b9fc884f250f
Author: Youness Alaoui <youness.alaoui@collabora.co.uk>
Date:	Mon Apr 4 21:41:40 2011 -0400

    Enable audio/video capabilities if InitialAudio/Video is in the
    fixed props for StreamedMedia channels If a connection manager puts
    InitialAudio=TRUE or InitialVideo=TRUE in the fixed properties,
    empathy thinks the CM doesn't support audio/video.

 libempathy/empathy-contact.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit ae01650e1c46d9856457d7cf657908acb3684913
Author: Daniel Martinez <entaltoaragon@gmail.com>
Date:	Mon Apr 11 22:11:56 2011 +0200

    [l10n] Updated Argonesian translation

 po/an.po | 2048
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 1175 insertions(+), 873 deletions(-)

commit acbd56b155b95df10b9bcb53618523bda3d561ba
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Apr 11 21:03:15 2011 +0200

    Updated Spanish translation

 po/es.po | 443
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 226 insertions(+), 217 deletions(-)

commit ceb451e3260ee114562f9f31324d1cd2206ba971
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 7 13:11:30 2011 +0200

    ft-manager: add a 'Close' button (#646084)

 src/empathy-ft-manager.c  |  9 ++++++++-
 src/empathy-ft-manager.ui | 13 +++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

commit 53138664c59afe454c5d3ade01ae9c9a1d87193b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 7 13:11:23 2011 +0200

    factor out close_window()

 src/empathy-ft-manager.c | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

commit e02b5b2a9d3ae6cc0a27cb17b0969898d978d021
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 29 11:23:00 2011 +0200

    Display a notification for auth events

    This makes them more visible when using the Shell (#646061).

 src/empathy-notifications-approver.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

commit f4711fa5d39fe11f158e11d6499a352d824715df
Author: Vitaly Minko <vitaly.minko@gmail.com>
Date:	Thu Apr 7 07:29:23 2011 +0000

    Base the search bar on GtkToolbar instead of GtkHBox in order not
    to resize the chat window when we activate it (#614319).

 libempathy-gtk/empathy-search-bar.c  |  42 ++++++++++
 libempathy-gtk/empathy-search-bar.ui | 152
 ++++++++++++++++++-----------------
 2 files changed, 119 insertions(+), 75 deletions(-)

commit 10d7351ff8da146ae19652186094b5fb3fde3ebd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 24 11:21:33 2011 +0100

    log_manager_got_entities_cb: don't use the currently selected account

    As the tpl_log_manager_get_entities_async() call is async, the
    selected
    account may have changed while it's running. So we have to explicitely
    pass
    the account which was selected when we started the call (#645586).

 libempathy-gtk/empathy-log-window.c | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

commit bd751c69ef2e0a9928b4853a8657e1cea376531e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 5 16:37:37 2011 +0200

    emulate '/me' command if CM doesn't support Action messages (#622118)

 libempathy-gtk/empathy-chat.c | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

commit ae37cca09e8af88c08d2ed16400c1860fd173f7c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 6 11:37:28 2011 +0200

    add empathy_tp_chat_get_self_contact()

    https://bugzilla.gnome.org/show_bug.cgi?id=622118

 libempathy/empathy-tp-chat.c | 10 ++++++++++
 libempathy/empathy-tp-chat.h |  2 ++
 2 files changed, 12 insertions(+)

commit 048f70b95b6845759d64196b18ebe8ff7d4aba2b
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Wed Apr 6 09:37:34 2011 +0200

    Updated Basque language

 po/eu.po | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

commit af33f911c23b3f478f197088e5ff9ea861cbb442
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Tue Apr 5 11:41:06 2011 +0200

    Updated French Doc Translation

 help/fr/fr.po | 141
 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 68 insertions(+), 73 deletions(-)

commit d7f6a39d2d12d9c66b94dfd58488b9c8f9aea35e
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:	Wed Mar 30 15:18:03 2011 +0100

    Bug 646227 — Possible overflow in persona-view:drag_data_get

    I think it was a fluke that this code worked in the first place,
    since it was
    accessing arrays with indices which were out of range, and which
    wouldn't have
    corresponded to the correct entries even if they were in range.

    This should fix the mapping between DND types and DND URIs/atoms
    in the
    contact list, individual and persona views.

    Closes: bgo#646227

 libempathy-gtk/empathy-contact-list-view.c | 18 ++-------------
 libempathy-gtk/empathy-individual-view.c   | 37
 ++++++++++++++++++------------
 libempathy-gtk/empathy-persona-view.c	    | 28 ++++++++++++++--------
 3 files changed, 43 insertions(+), 40 deletions(-)

commit cf5ae6bf0560a62e108eb43b172e1ee837d0aa9c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 4 15:50:58 2011 +0200

    Revert "-Fix use of include <config.h> to make sure translations work"

    This reverts commit f0f99ffaa08240fbb72d7eed198368fd22fe4c47.

    Sorry, I didn't mean to push that...

 libempathy-gtk/empathy-contact-blocking-dialog.c | 4 ----
 libempathy-gtk/empathy-contact-search-dialog.c   | 4 ----
 libempathy/empathy-account-settings.c		  | 3 ---
 libempathy/empathy-auth-factory.c		  | 4 ----
 libempathy/empathy-connection-managers.c	  | 3 ---
 libempathy/empathy-debug.h			  | 3 +++
 libempathy/empathy-ft-handler.c		  | 4 ----
 libempathy/empathy-presence-manager.c		  | 6 ++----
 libempathy/empathy-server-sasl-handler.c	  | 4 ----
 libempathy/empathy-server-tls-handler.c	  | 4 ----
 libempathy/empathy-tp-streamed-media.c		  | 4 ----
 src/empathy-invite-participant-dialog.c	  | 4 ----
 src/empathy-streamed-media-window.c		  | 3 ---
 13 files changed, 5 insertions(+), 45 deletions(-)

commit f0f99ffaa08240fbb72d7eed198368fd22fe4c47
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Tue Mar 29 19:03:09 2011 +0200

    -Fix use of include <config.h> to make sure translations work

 libempathy-gtk/empathy-contact-blocking-dialog.c | 4 ++++
 libempathy-gtk/empathy-contact-search-dialog.c   | 4 ++++
 libempathy/empathy-account-settings.c		  | 3 +++
 libempathy/empathy-auth-factory.c		  | 4 ++++
 libempathy/empathy-connection-managers.c	  | 3 +++
 libempathy/empathy-debug.h			  | 3 ---
 libempathy/empathy-ft-handler.c		  | 4 ++++
 libempathy/empathy-presence-manager.c		  | 6 ++++--
 libempathy/empathy-server-sasl-handler.c	  | 4 ++++
 libempathy/empathy-server-tls-handler.c	  | 4 ++++
 libempathy/empathy-tp-streamed-media.c		  | 4 ++++
 src/empathy-invite-participant-dialog.c	  | 4 ++++
 src/empathy-streamed-media-window.c		  | 3 +++
 13 files changed, 45 insertions(+), 5 deletions(-)

commit 9048ff4f63c8ac3174468ceb4787b658d948c6e0
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Mon Mar 28 13:31:17 2011 +0200

    Remove unnecessary code in empathy_auth_factory_constructed()

    https://bugzilla.gnome.org/show_bug.cgi?id=645930

 libempathy/empathy-auth-factory.c | 8 --------
 1 file changed, 8 deletions(-)

commit 0b0a93b600355d4c205c7777669ee5a42d5e9a3b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 4 15:19:26 2011 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ee8f98a6e6f1e3e3dd0e6c8cfc29189f2b368b8b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 4 14:58:18 2011 +0200

    prepare 3.0 release

 NEWS	      | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  8 ++++----
 2 files changed, 51 insertions(+), 4 deletions(-)

commit de3dbb6817d90c0eee7207fc5b69e53e7e72200a
Author: Danilo Segan <danilo@gnome.org>
Date:	Mon Apr 4 13:09:16 2011 +0200

    Initialize matched to FALSE to stop -Wall breaking the build (and
    potentially avoid a hard-to-track bug)

    Fixes bug #646691

 libempathy/empathy-tls-verifier.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit edb212fe16edbfc8a563bb74c52f9bcf8e92f0d7
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	Mon Apr 4 13:20:02 2011 +0300

    [l10n] Updated Estonian translation

 po/et.po | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

commit 94c471284d48d0a76aa91bf685474ffb8afd9f82
Author: Baris Cicek <baris@teamforce.name.tr>
Date:	Mon Apr 4 08:08:43 2011 +0300

    Updated Turkish translation

 po/tr.po | 3552
 +++++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 2465 insertions(+), 1087 deletions(-)

commit c4d472673077829a974c57f48bc9f6650adf42b0
Author: OKANO Takayoshi <kano@na.rim.or.jp>
Date:	Mon Apr 4 13:29:44 2011 +0900

    Updated Japanese translation

 po/ja.po | 1720
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 1041 insertions(+), 679 deletions(-)

commit 83a11e57bc0d48517ec933eb501345f9b4f32618
Author: Wolfgang Stöggl <c72578@yahoo.de>
Date:	Sun Apr 3 21:56:53 2011 +0200

    [l10n] Updated German doc translation, umlauts fixed

 help/de/de.po | 790
 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 404 insertions(+), 386 deletions(-)

commit fae3a5b7cc32c9812ef19cdef16eb4af64e78c1b
Author: Jordi Serratosa <serratosa@gmail.com>
Date:	Sun Apr 3 21:08:00 2011 +0200

    [l10n]Fixes on Catalan translation

 po/ca.po | 60
 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

commit f8a706890eb0e3e10151bbabb12a6b18ddcc6db0
Author: Wolfgang Stöggl <c72578@yahoo.de>
Date:	Sun Apr 3 21:02:29 2011 +0200

    [l10n] Updated German translation, umlauts fixed

 po/de.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit dd236139e7d5772268c4d9f930655e0d38a94238
Author: George Stefanakis <george.stefanakis@gmail.com>
Date:	Sun Apr 3 21:18:35 2011 +0300

    l10n: Updated Greek translation for empathy

 po/el.po | 644
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 366 insertions(+), 278 deletions(-)

commit 54efb4637d6e1d0ce4cf780a86c28406529f249b
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date:	Sun Apr 3 17:44:28 2011 +0200

    Updated Danish translation

 po/da.po | 1734
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 1000 insertions(+), 734 deletions(-)

commit 5b43017b00397e024ea2dbf4a4dbf64b81a656f6
Author: Rodrigo Padula de Oliveira <contato@rodrigopadula.com>
Date:	Sun Apr 3 09:41:13 2011 -0400

    Updated Brazilian Portuguese translation. Reviewed by Djavan Fagundes.

 po/pt_BR.po | 1660
 ++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 958 insertions(+), 702 deletions(-)

commit 1fb1ef5c1caeda184312047b78da3aacf6e09d0a
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Apr 2 21:04:35 2011 +0200

    Updated Spanish translation

 help/es/es.po | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

commit c81f08fb5baebdd855089f05828f1c68fbc74893
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 30 09:51:29 2011 +0200

    set a category on presence notifications

 src/empathy-event-manager.c	      | 6 ++++--
 src/empathy-event-manager.h	      | 3 ++-
 src/empathy-notifications-approver.c | 8 ++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

commit aaf4798dd5eb270c95964441cf29768e580ef80b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 29 10:07:01 2011 +0200

    set a category on chat related notifications

    That can be used by the Shell to filter out notifications it's
    handling itself
    directly (#645932).

 libempathy-gtk/empathy-notify-manager.h |  1 +
 src/empathy-notifications-approver.c	 | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

commit dfc65cb90ac55e7b84a4213356dbaec9a6ec6b9a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 29 09:48:22 2011 +0200

    set urgency hint on urgent notifications

    This will ensure that they stay visible in the Shell and that
    their actions
    buttons are displayed as well (#645932).

 src/empathy-notifications-approver.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

commit ae4b21495c6a89feab8733f5dcd0480e54f2a69d
Author: Leonid Kanter <leon@asplinux.ru>
Date:	Fri Apr 1 18:17:47 2011 +0300

    applied patch from https://bugzilla.gnome.org/show_bug.cgi?id=645870

 po/ru.po | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

commit f572cd37d07e92fbe6e38136d537f5b2b35af519
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:	Fri Apr 1 20:25:54 2011 +0700

    Updated Vietnamese translation

 po/vi.po | 676
 +++++++++++++++++++++++++--------------------------------------
 1 file changed, 264 insertions(+), 412 deletions(-)

commit aeefb7d2d3923afde063e0b732b3fa4f2c601add
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:	Fri Apr 1 19:36:03 2011 +0700

    po/vi.po: import from Damned Lies

 po/vi.po | 3549
 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 2356 insertions(+), 1193 deletions(-)

commit 41e332ab54dfdc11e69eee80ca7e3041a89d9923
Author: Hendrik Richter <hendrikr@gnome.org>
Date:	Fri Apr 1 12:02:53 2011 +0200

    Added translated German screenshots.

 help/de/de.po | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

commit 264d6b3e2894e667a18c56eee25e881c7ff068fc
Author: Hendrik Richter <hendrikr@gnome.org>
Date:	Fri Apr 1 11:58:20 2011 +0200

    Added translated German screenshots.

 help/de/figures/empathy-main-window.png | Bin 8924 -> 49766 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

commit d3222e8126fca4ea0a84c42fde7f847d9449ffe8
Author: Hendrik Richter <hendrikr@gnome.org>
Date:	Fri Apr 1 11:55:52 2011 +0200

    Added translated German screenshots.

 help/de/figures/empathy-new-account.png | Bin 15901 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

commit b82b1b9889a2711a37c6c4470b27af069c65a5ff
Author: Sweta Kothari <swkothar@redhat.com>
Date:	Fri Apr 1 14:14:04 2011 +0530

    Updated Gujarati Translations

 po/gu.po | 1265
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 619 insertions(+), 646 deletions(-)

commit 1088e62b5db25c12e1c850707d493ec571174317
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Fri Apr 1 08:57:29 2011 +0200

    [l10n] Updated German doc translation

 help/de/de.po | 656
 ++++------------------------------------------------------
 1 file changed, 43 insertions(+), 613 deletions(-)

commit f2c42001e687fbdcbc0a1472a71165728d4313f6
Author: Shaun McCance <shaunm@gnome.org>
Date:	Thu Mar 31 22:14:21 2011 -0400

    help/C/figures: Icon and screenshot updates

 help/C/figures/available.png		| Bin 689 -> 859 bytes
 help/C/figures/away.png		| Bin 538 -> 770 bytes
 help/C/figures/busy.png		| Bin 616 -> 893 bytes
 help/C/figures/empathy-logo.png	| Bin 1813 -> 1640 bytes
 help/C/figures/empathy-main-window.png | Bin 7703 -> 27421 bytes
 help/C/figures/offline.png		| Bin 405 -> 863 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)

commit 3a0570577e5c1c5e01379887d0064aa43fd19efa
Author: Branko Kokanović <branko.kokanovic@gmail.com>
Date:	Thu Mar 31 01:38:53 2011 +0200

    Updated Serbian translation

 po/sr.po	| 1742
 +++++++++++++++++++++++++++++++++-----------------------
 po/sr@latin.po | 1742
 +++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 2086 insertions(+), 1398 deletions(-)

commit 258307b49b00f853be61b50c58434e873e7837fa
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Wed Mar 30 19:49:31 2011 +0200

    Updated Basque language

 po/eu.po | 188
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 88 insertions(+), 100 deletions(-)

commit a67b3d4692546def274d7af1b41c498f19c1c9c4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 30 13:46:48 2011 +0200

    empathy_chat_window_present_chat: no need to call show_all on
    the window

    empathy_window_present_with_time() called later in this function
    will do it
    for us.

    This has the nice side effect of avoid to display the window before
    resizing
    it and do making it look bad (#638951).

 src/empathy-chat-window.c | 1 -
 1 file changed, 1 deletion(-)

commit 671e4e196414bd4bf7f25ef75458c118a93c4640
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 30 11:18:40 2011 +0200

    move the Enabled translator comment just before the string

    If not, gettext doesn't find it...

 libempathy-gtk/empathy-account-widget.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 97eacb399329265dd353c14e3f9bb0884b43e435
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 30 10:43:51 2011 +0200

    givve translators context for the 'Unknown' string

 libempathy/empathy-utils.c	     | 1 +
 src/empathy-streamed-media-window.c | 4 ++++
 2 files changed, 5 insertions(+)

commit 58f30b2d38b13d3cf3cc945766d86a2e15de5926
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 30 10:36:51 2011 +0200

    give translators context for the 'Enabled' checkbox (#646131)

 libempathy-gtk/empathy-account-widget.c | 2 ++
 1 file changed, 2 insertions(+)

commit 24017811832ecfb91b27b04a0bd2e131716f3659
Author: Pavol Klačanský <pavol@klacansky.com>
Date:	Tue Mar 29 17:44:47 2011 +0200

    Added Slovak translation

 po/LINGUAS |	 1 +
 po/sk.po   | 4371
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 4372 insertions(+)

commit e833fbd01588bbaf8a3c099ce24b137a7b3ebf5e
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Mar 28 16:27:01 2011 -0400

    ft-manager: make sure the scrolled window expands in the dialog height

    GTK+ 3 changed some packing defaults of GtkDialog, so this needs to be
    done explicitly here.

    https://bugzilla.gnome.org/show_bug.cgi?id=646010

 src/empathy-ft-manager.ui | 1 +
 1 file changed, 1 insertion(+)

commit 42d8206c772865ab8229f01e76d51f7690435a50
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 29 15:08:59 2011 +0200

    don't format header of presence notifications (#646097)

    According to the spec [1], only the Body can be formated.

    Furthermore, the Shell doesn't support such formating in the header.

    [1] http://www.galago-project.org/specs/notification/0.9/x161.html

 src/empathy-event-manager.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

commit fd5c50d89b88d0b62692aaf85252cf61eeba3341
Author: Luca Ferretti <lferrett@gnome.org>
Date:	Wed Mar 23 16:42:56 2011 +0100

    Use /org/gnome as starting path for schemas

 data/org.gnome.Empathy.gschema.xml.in | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit a71daa64a4d29b52ea772fed376a9a7422707ff6
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Tue Mar 29 10:26:56 2011 +0200

    Updated Basque language

 po/eu.po | 1221
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 694 insertions(+), 527 deletions(-)

commit 13a84a5541f97658873d360fd6caaffaeaf2a614
Author: Hannie Dumoleyn <lafeber-dumoleyn2@zonnet.nl>
Date:	Mon Mar 28 20:08:21 2011 +0200

    Updated Dutch translation by Hannie Dumoleyn

 po/nl.po | 1681
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 986 insertions(+), 695 deletions(-)

commit e0a3c2812f535f411a801baafc3e08ec1c82bd50
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 28 13:00:53 2011 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8f2225aa7f24ebcc3bf25943591d01e62a7a4e7c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 28 12:42:22 2011 +0200

    prepare 2.91.93

 NEWS	      | 24 ++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 26 insertions(+), 2 deletions(-)

commit 4a662ab1fc168a3868fa6f83ecb6845a6bb1bf37
Author: Rajesh Ranjan <rranjan@redhat.com>
Date:	Mon Mar 28 14:37:55 2011 +0530

    hindi updated

 po/hi.po | 3634
 +++++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 2545 insertions(+), 1089 deletions(-)

commit 3faa1f894ae25830ba4fbdf4d8d7f016f28cbcdf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 23 15:01:54 2011 +0100

    event-manager: only display incoming messages in notification

    If not, we display outgoing ones as well if the user uses Shell's
    message tray
    to reply.

 src/empathy-event-manager.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 36f079ca48db4727b237ea471f13f7593c8e1b71
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 24 15:00:37 2011 +0100

    theme-adium: keep count of the pages loading instead of using
    a boolean

    Each time theme_adium_clear() is called, WebKit has to reload the
    page. If we
    do multi calls to clear() in a short interval, we used to think the
    page was
    loaded while it was the *old* one which was actually loaded. (#645670)

 libempathy-gtk/empathy-theme-adium.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit 3935bc1bc5c5da553f74eb2db75d0a7f1444bc6d
Author: Abduxukur Abdurixit <abdurixit@gmail.com>
Date:	Sun Mar 27 19:18:36 2011 +0200

    Added UG translation

 po/ug.po | 1091
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 626 insertions(+), 465 deletions(-)

commit 3f93ca5601789155d84adfe42028ffa984a19272
Author: Žygimantas Beručka <zygis@gnome.org>
Date:	Sun Mar 27 19:34:29 2011 +0300

    Updated Lithuanian translation

 po/lt.po | 364
 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 232 insertions(+), 132 deletions(-)

commit cc31eef5cb583f5b521a754ffc9af0efbfb2a442
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:	Sun Mar 27 15:31:25 2011 +0530

    Updated Tamil translation

 po/ta.po | 1463
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 701 insertions(+), 762 deletions(-)

commit 29c5768b6eef66ba95baeff2d167b76716e8f4d7
Author: Krasimir Chonov <mk2616@abv.bg>
Date:	Sat Mar 26 06:40:04 2011 +0200

    Updated Bulgarian translation

 po/bg.po | 789
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 445 insertions(+), 344 deletions(-)

commit eae49dc6444e0e7a834c6d40fe79735f0ed2f23c
Author: Aron Xu <aronxu@gnome.org>
Date:	Fri Mar 25 04:09:07 2011 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po | 257
 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 128 insertions(+), 129 deletions(-)

commit 8f13a8e6f7cd8ab9ed79c8f63ba977ba3069627d
Author: A S Alam <aalam@users.sf.net>
Date:	Fri Mar 25 08:31:19 2011 +0530

    update tranlation for Punjabi by A S Alam

 po/pa.po | 296
 +++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 193 insertions(+), 103 deletions(-)

commit 2e24da05f2b400423be9c87fbfe5e60329b5a7f7
Author: Sandeep Shedmake <sshedmak@redhat.com>
Date:	Thu Mar 24 20:58:49 2011 +0530

    Updated Marathi Translations

 po/mr.po | 3634
 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 2494 insertions(+), 1140 deletions(-)

commit 2ba5f4fdf1d4ab286da84d9f442eb714be1dafd6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 24 10:41:14 2011 +0100

    Calendar widget should be disabled if no contact selected (#645582)

 libempathy-gtk/empathy-log-window.c  | 9 +++++++++
 libempathy-gtk/empathy-log-window.ui | 1 +
 2 files changed, 10 insertions(+)

commit 17df132d41f12c7003dbeda74a7de2cb598b64f9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 24 13:13:02 2011 +0100

    account_chooser_filter_ready_cb: don't unref the account

    Our ref is already released in filter_result_callback_data_free
    (#645672).

 libempathy-gtk/empathy-account-chooser.c | 1 -
 1 file changed, 1 deletion(-)

commit b7a5f478cc1e3828504f653b4a66b22f28523cb7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 23 14:27:19 2011 +0100

    chat_window_new_message_cb: check that we found the chatroom

    There is a race, if the chatroom manager didn't parse the chatrooms
    list yet,
    this was crashing.

 src/empathy-chat-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 26ac10366710eb6e60539421ccf88c5e6833a58b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 23 14:26:29 2011 +0100

    tp_chat_got_renamed_contacts_cb: use tp_clear_object() to unref
    priv->user

    If priv->user and old are both NULL, we used to crash.

 libempathy/empathy-tp-chat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1da2f83f35972269f9e4712ecee01ed0ad5a55a2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 23 09:53:17 2011 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 194f9646a5abb7d599d5624e7081cb6300323c44
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Tue Mar 22 22:21:45 2011 +0100

    [l10n] Updated German translation

 po/de.po | 1115
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 637 insertions(+), 478 deletions(-)

commit 36bf86cda2f19c44fb09f2254f098ca16ed0c86b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 22 16:36:49 2011 +0100

    prepare 2.91.92

 NEWS	      | 44 ++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  6 +++---
 2 files changed, 47 insertions(+), 3 deletions(-)

commit 5de055b29a5d04c5fc9220321a3f18fd30ce85d7
Merge: e68f144 91ddb84
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Tue Mar 22 17:16:35 2011 +0100

    Merge branch 'unbreak-tests'

commit 91ddb848264326ad2cec68ca750424b1649e7f64
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Tue Mar 22 17:10:32 2011 +0100

    Fix calls to empathy_tls_verifier_new() in tests.

 tests/empathy-tls-test.c | 87
 ++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 76 insertions(+), 11 deletions(-)

commit e68f14484d688716bb3d09fbc9ee4fa5ad17db9e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Mar 22 15:25:26 2011 +0000

    Don't try to block personas that don't support blocking

 libempathy/empathy-individual-manager.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit 6c943efd9aabd9d0d8674c3c58d2e58efdb412f6
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Mon Mar 21 10:58:31 2011 +0100

    Only add the 'extra-certificate-identities' parameter if gabble
    supports it.

 libempathy-gtk/empathy-protocol-chooser.c | 8 ++++++--
 libempathy/empathy-account-settings.c	   | 7 +++++++
 libempathy/empathy-account-settings.h	   | 4 ++++
 3 files changed, 17 insertions(+), 2 deletions(-)

commit 6cd0e1c0916e69eb15192c6bdbf1b5d7ee599f5a
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Fri Mar 18 14:38:10 2011 +0100

    Create GTalk accounts with extra-certificate-identities =
    'talk.google.com'

    When creating google talk accounts, allow 'talk.google.com' as
    an extra
    identity for server certificate validation.

    https://bugzilla.gnome.org/show_bug.cgi?id=645133

 libempathy-gtk/empathy-protocol-chooser.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 6c5affb1f943b6685a0ac63adcfff24b47be6e2e
Merge: 5316d72 698675b
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Tue Mar 22 15:22:43 2011 +0100

    Merge branch 'reference-identities'

    Conflicts:
	libempathy/empathy-server-tls-handler.c

commit 698675bdc1fbc7e6e622be24e272df7e70f34716
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Tue Mar 22 15:13:33 2011 +0100

    Use telepathy property constants in server EmpathyServerTLSHandler

    https://bugzilla.gnome.org/show_bug.cgi?id=645119

 libempathy/empathy-server-tls-handler.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 5316d721a24d2c1c2496f751a4cf139d88e274c1
Merge: e5bfa46 f357bd6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 22 14:54:32 2011 +0100

    Merge branch 'stable-block-645504'

commit e5bfa46e3a659aec01d328ab041a6e4ce1a5e446
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Tue Mar 22 14:32:25 2011 +0100

    Updated Italian translation

 po/it.po | 1682
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 971 insertions(+), 711 deletions(-)

commit 3bea79c93cd58333c4ccaee60afe98f861001afd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 7 11:31:48 2011 +0100

    accounts_dialog_add_account: ensure that the selected account is
    still visible in the treeview

 src/empathy-accounts-dialog.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

commit 0b9a9d0171d55523519249a55971c9f4f051dc4c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 7 11:05:23 2011 +0100

    accounts_dialog_model_set_selected: use select_and_scroll_to_iter

    That way we also scroll to the selected account (#643860).

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0ac4dcb553efbdd058a5b37ba948c1d542d87075
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 7 11:03:33 2011 +0100

    factor out select_and_scroll_to_iter()

 src/empathy-accounts-dialog.c | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

commit bf2ef141ceb1515dfabfd07b29236e13d333c884
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Tue Mar 22 19:21:39 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 827
 ++++++++++++++++++++++++++++++++++--------------------------
 po/zh_TW.po | 827
 ++++++++++++++++++++++++++++++++++--------------------------
 2 files changed, 932 insertions(+), 722 deletions(-)

commit f357bd611198d6156f3e58604729e24ad3366cea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 22 11:39:23 2011 +0100

    stop generating API for ContactBlocking

 .../Connection_Interface_Contact_Blocking.xml	    | 172
 ---------------------
 extensions/Makefile.am				    |	1 -
 extensions/misc.xml				    |	1 -
 3 files changed, 174 deletions(-)

commit 8b7056b27d71eb651bed271013ab3515b399cc83
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 22 11:48:15 2011 +0100

    Use stable API for ContactBlocking (#645504)

 libempathy/empathy-tp-contact-list.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit ce0a41ef7bd65f6c1ef5e96bb4317cf5cdf26fc5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 22 11:46:37 2011 +0100

    depends on telepathy-glib 0.14.1

    We need it for ContactBlocking API.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1b68d34282947697e1c173456bdb35700dc0f19e
Author: Dan Williams <dcbw@redhat.com>
Date:	Tue Mar 22 10:04:24 2011 +0100

    Handle new NM 0.9 states (#644412)

 libempathy/empathy-connectivity.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 5d27216d4ee76a9bb460b69370f205652a6d9c09
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Mar 22 14:44:12 2011 +1100

    Remove user from the blocked list when readding them

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=645487

 libempathy/empathy-tp-contact-list.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 17e2fea441df25d3b91597957744f172a0d80668
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 21 12:31:07 2011 +0100

    account_chooser_update_iter: don't leak the TpAccount

 libempathy-gtk/empathy-account-chooser.c | 2 ++
 1 file changed, 2 insertions(+)

commit 4d795d822f9590c2916bfa64b4cbc3d536e3ad4a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Mar 21 17:52:10 2011 +0000

    Also show an avatar when blocking from a conversation

    https://bugzilla.gnome.org/show_bug.cgi?id=645069

 libempathy-gtk/empathy-contact-dialogs.c | 11 +++++++++--
 libempathy-gtk/empathy-contact-dialogs.h |  1 +
 libempathy-gtk/empathy-contact-menu.c	  |  5 ++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

commit 9c4deab9ee56bd39de5f4828d774a4d1be59a7bb
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Mon Mar 21 23:07:50 2011 +0300

    Updated Russian translation

 po/ru.po | 293
 +++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 193 insertions(+), 100 deletions(-)

commit 0b92a57a1c29bb3195345cec85b7ce6e19a29a02
Author: Shankar Prasad <svenkate@redhat.com>
Date:	Mon Mar 21 16:12:50 2011 +0530

    Updated kn translations

 po/kn.po | 271
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 148 insertions(+), 123 deletions(-)

commit a8e558e10b1b5170346a75e1322f75d8ebad1662
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Mar 20 12:44:51 2011 +0000

    Fix some races in the chatroom joining code

    The auto-reconnection logic for chatrooms was a bit odd. It would for
    every chatroom that existed when the account manager was prepared
    connect once to status-changed for each account for each chatroom...

    Change this such that whenever an account connects, we simply
    get the then current list of chatrooms and auto-connect those
    as needed.

    This fixes issues when a chatroom gets removed from the manager
    and when
    the auto-connect options on a chatrooms change.

 src/empathy.c | 72
 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 38 insertions(+), 34 deletions(-)

commit 79cf371093d1a1b0d9120a4bbcc5d73c7c67842d
Author: Duarte Loreto <happyguy_pt@hotmail.com>
Date:	Mon Mar 21 00:19:03 2011 +0000

    Updated Portuguese translation

 po/pt.po | 747
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 416 insertions(+), 331 deletions(-)

commit 85bac3ba97a74efcc7c2a3ba835bd47431deddfb
Author: Gil Forcada <gforcada@gnome.org>
Date:	Sun Mar 20 21:25:58 2011 +0100

    [l10n]Updated Catalan translation

 po/ca.po | 663
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 364 insertions(+), 299 deletions(-)

commit 24a0b04281688f4fc1b7696d9ca806f1bae661dc
Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:	Sun Mar 20 17:03:09 2011 +0200

    Updated Latvian translation.

 po/lv.po | 1299
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 659 insertions(+), 640 deletions(-)

commit 819b9a246ae94aff9e55a706f37fcc00e1f0bcf2
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sun Mar 20 11:25:09 2011 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 216
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 108 insertions(+), 108 deletions(-)

commit 5acdf1332d6af7d895745ffe60bce72d7f4e3b69
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Thu Mar 17 09:53:23 2011 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 589
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 339 insertions(+), 250 deletions(-)

commit 8e4b1bdae8815bc8e64eea6ec78592c50c413bc8
Author: Aron Xu <aronxu@gnome.org>
Date:	Sat Mar 19 16:16:57 2011 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po | 877
 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 463 insertions(+), 414 deletions(-)

commit 882505f1fe475d4ec325e86a4858850eb086d3b3
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Sat Mar 19 16:12:27 2011 +0100

    Updated Polish translation

 po/pl.po | 656
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 368 insertions(+), 288 deletions(-)

commit 02922b22156fafc1c02a2e93cd2dee1394bb2f24
Author: Dirgita <dirgitadevina@yahoo.co.id>
Date:	Sat Mar 19 22:09:44 2011 +0700

    Updated Indonesian translation

 po/id.po | 2710
 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 1831 insertions(+), 879 deletions(-)

commit 24741700bd129cd0a7a6da87f6335ac98caa0e60
Author: Changwoo Ryu <cwryu@debian.org>
Date:	Sat Mar 19 22:11:38 2011 +0900

    Updated Korean translation

 po/ko.po | 460
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 233 insertions(+), 227 deletions(-)

commit 9ef9a7660d00fb00e59af3217f38da56e2d76884
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Sat Mar 19 02:56:20 2011 +0200

    Updated Arabic translation

 po/ar.po | 512
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 257 insertions(+), 255 deletions(-)

commit 6fc411c2e7a53eafe132c67c7ce430df665e5493
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Mar 18 21:00:21 2011 +0000

    Use the right marshal file

 libempathy-gtk/empathy-chat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c39a6c8faba251e0ef0bef64412fbd3ddd5c2ea2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Mar 18 14:39:06 2011 +0000

    Assistant: put the protocol chooser next to the label

 src/empathy-account-assistant.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit f1975e66ba22bfcfeeb2b1583143693a454aad89
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Fri Mar 18 14:48:55 2011 +0100

    Style changes from review for ReferenceIdentities code

 libempathy/empathy-server-tls-handler.c | 14 +++++++++-----
 libempathy/empathy-tls-verifier.c	 | 15 +++++++++------
 src/empathy-auth-client.c		 |  2 +-
 3 files changed, 19 insertions(+), 12 deletions(-)

commit 87fe6f3680d91edc933bc767cae6e500b8bac011
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Mar 18 11:19:34 2011 +0000

    Map Ctrl-Shift-F to contact search and Ctrl-F to find

    As discussed on <https://bugzilla.gnome.org/show_bug.cgi?id=645121>,
    currently Ctrl-F opens the contact search dialog, and there's no
    keyboard shortcut for searching within the contact list (other
    than just
    typing). The Gnome HIG handles this situation: it says that the former
    should be Ctrl-Shift-F and the latter should be Ctrl-F.
    <http://library.gnome.org/devel/hig-book/2.32/input-keyboard.html.en#standard-shortcuts>

 src/empathy-main-window.ui | 2 ++
 1 file changed, 2 insertions(+)

commit 5719134cc2ecacb5076c9e8133feb8473979b5f5
Author: Shankar Prasad <svenkate@redhat.com>
Date:	Fri Mar 18 18:39:37 2011 +0530

    Updated kn translations

 po/kn.po | 3731
 ++++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 2642 insertions(+), 1089 deletions(-)

commit 053503cfa6ee966a91f85069e0eda6da0335b0e6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 18 11:45:49 2011 +0100

    auth-factory: allow to handle more than one auth channel at the same
    time (#645112)

 libempathy/empathy-auth-factory.c | 50
 +++++++++++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 12 deletions(-)

commit b531101e9f3b6654476d236213ea22e100869a9c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 18 11:43:16 2011 +0100

    auth-factory: use a proper priv pointer

 libempathy/empathy-auth-factory.c | 4 ++--
 libempathy/empathy-auth-factory.h | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

commit 37e2773cfddb5ef46d79ccd70593bd16066e6512
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 18 11:42:24 2011 +0100

    add empathy_server_sasl_handler_get_channel()

 libempathy/empathy-server-sasl-handler.c | 12 ++++++++++++
 libempathy/empathy-server-sasl-handler.h |  3 +++
 2 files changed, 15 insertions(+)

commit 2eb0d2db6f945cb72fd9e9a909dd1d95c79e7d02
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Fri Mar 18 11:40:54 2011 +0100

    Free priv->hostname in EmpathyServerTlsHandler

    https://bugzilla.gnome.org/show_bug.cgi?id=645115

 libempathy/empathy-server-tls-handler.c | 1 +
 1 file changed, 1 insertion(+)

commit 25ed247445aacfce41e0c15aac08cc5697427c1a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Fri Mar 18 11:14:51 2011 +0000

    Display an avatar on the block contact dialog

    https://bugzilla.gnome.org/show_bug.cgi?id=645069

 libempathy-gtk/empathy-individual-dialogs.c |	 8 ++
 libempathy-gtk/empathy-individual-dialogs.h |	 1 +
 libempathy-gtk/empathy-individual-view.c    | 170
 +++++++++++++++++-----------
 3 files changed, 111 insertions(+), 68 deletions(-)

commit 3b10103f06517cd7bfbb1576daadaf4855b800a2
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Fri Mar 18 11:59:02 2011 +0100

    Use ServerTLSConnection.ReferenceIdentities to check cert identity.

    The certificate identity can be checked against more than just
    one piece of information. Load and use all the reference identities
    to check the identity of the certificate.

    https://bugzilla.gnome.org/show_bug.cgi?id=645119

 libempathy/empathy-server-tls-handler.c | 41
 ++++++++++++++++++++++++++++++++-
 libempathy/empathy-tls-verifier.c	 | 38
 ++++++++++++++++++++++++++----
 libempathy/empathy-tls-verifier.h	 |  3 ++-
 src/empathy-auth-client.c		 |  6 ++++-
 4 files changed, 81 insertions(+), 7 deletions(-)

commit 00f27e9c52f494cad1b36e0e106a129e884ac428
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Fri Mar 18 11:40:54 2011 +0100

    Free priv->hostname in EmpathyServerTlsHandler

    https://bugzilla.gnome.org/show_bug.cgi?id=645115

 libempathy/empathy-server-tls-handler.c | 1 +
 1 file changed, 1 insertion(+)

commit 385b1a5c6c3f0fd9d7cd5d33843466ed9e1238cc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 18 10:33:49 2011 +0100

    Allow to Observe a ServerAuthentication channel while handling
    another one

    There is no reason to refuse to Observe it. (#645108)

 libempathy/empathy-auth-factory.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit f1d664454fafb8f183c8721154f534f71d8423ea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 18 10:27:23 2011 +0100

    common_checks: tell the truth in debug messages

    It's really confusing to read a "Can't handle.." error while it's
    actually an
    observe error.

 libempathy/empathy-auth-factory.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

commit 73720bb84423e70ad21599b4713d1137f8a85e73
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 18 10:23:58 2011 +0100

    common_checks: rename must_be_sasl arg to observe

    It was things clearer and easier to understand.

 libempathy/empathy-auth-factory.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit 1d04deb0ffa562830485ba2eb626c123082afa3b
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Mar 18 08:33:07 2011 +1100

    Fix the icon metadata

    The new Empathy icon was mistakenly named 'Pidgin' in the metadata.
    Clearly when Jakub drew it he thought he was drawing it for
    Pidgin. Renaming
    it to Empathy so people don't get confused.

 data/icons/empathy.svg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 5970402dc0e1971226b9c29014da43c8e354c1fd
Author: Daniel Korostil <ted.korostiled@gmail.com>
Date:	Thu Mar 17 19:41:01 2011 +0200

    Uploaded Ukranian

 po/uk.po | 642
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 361 insertions(+), 281 deletions(-)

commit 728a0418bb6dbf5b3f16bd3b12ca802d1530de60
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 17 16:18:02 2011 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 22f5d4f35b734d1e47a810e369c7901da180905c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 17 15:54:12 2011 +0100

    prepare 2.91.91.1

 NEWS	      | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 57 insertions(+), 2 deletions(-)

commit 7f47a1b3053fdf5e07250f716b5c596f936b0302
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 17 11:49:43 2011 +0100

    server-sasl-handler: remove stored password if they can't be saved

 libempathy/empathy-server-sasl-handler.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit ca9d3b8180e49292724243090fd5394172fa24c9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 16 14:03:40 2011 +0100

    save the password before trying to connect the new account (#643690)

 libempathy/empathy-account-settings.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit 7980966fd3bb38fde70946c057704b1b5f409968
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 17 14:03:02 2011 +0100

    Allow to enter an email address as ICQ ID (#645014)

 libempathy-gtk/empathy-account-widget.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 1dc905b194ce6e1be82af2e111cdf7a913dd43fc
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Mar 17 11:58:56 2011 +0000

    Contact Search: close the dialog when adding a contact

 libempathy-gtk/empathy-contact-search-dialog.c | 3 +++
 1 file changed, 3 insertions(+)

commit f918489642f3e0f41f09c774a4e4b80497c9592a
Author: Michael Terry <michael.terry@canonical.com>
Date:	Wed Mar 16 12:57:25 2011 -0400

    Don't update Contact menu on a focus-in (#644936)

 src/empathy-chat-window.c | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

commit b82a98e0508d3a1f7935a13c6aa89acabab3ffe4
Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
Date:	Thu Mar 17 13:13:07 2011 +0100

    Updated Romanian translation

 po/ro.po | 332
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 162 insertions(+), 170 deletions(-)

commit eedc36ded1b4a3c55758a409e4efca8955bd3d27
Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
Date:	Thu Mar 17 10:45:12 2011 +0100

    Updated Romanian translation

 po/ro.po | 240
 ++++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 160 insertions(+), 80 deletions(-)

commit 88e09c99733982de201c3c1cfbf4742a0e8662b1
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Wed Mar 16 19:51:15 2011 +0100

    Fix warnings from GCC 4.6 about variables that are set but not used.

 libempathy-gtk/empathy-account-chooser.c	 | 10 --------
 libempathy-gtk/empathy-account-widget-irc.c	 |  6 -----
 libempathy-gtk/empathy-avatar-chooser.c	 |  6 -----
 libempathy-gtk/empathy-cell-renderer-expander.c |  6 -----
 libempathy-gtk/empathy-chat.c			 | 11 ---------
 libempathy-gtk/empathy-contact-list-store.c	 | 31
 ++-----------------------
 libempathy-gtk/empathy-contact-list-view.c	 | 11 ---------
 libempathy-gtk/empathy-groups-widget.c		 |  4 ----
 libempathy-gtk/empathy-individual-linker.c	 |  4 ----
 libempathy-gtk/empathy-individual-store.c	 | 23 ------------------
 libempathy-gtk/empathy-individual-view.c	 |  9 -------
 libempathy-gtk/empathy-log-window.c		 |  4 ----
 libempathy-gtk/empathy-persona-store.c		 |  7 ++----
 libempathy-gtk/empathy-persona-view.c		 | 12 ----------
 libempathy-gtk/empathy-presence-chooser.c	 |  2 --
 libempathy-gtk/empathy-ui-utils.c		 |  3 +--
 libempathy/empathy-auth-factory.c		 |  2 --
 libempathy/empathy-chatroom-manager.c		 |  4 ----
 libempathy/empathy-chatroom.c			 |  4 ----
 libempathy/empathy-ft-handler.c		 |  3 ---
 libempathy/empathy-individual-manager.c	 |  6 -----
 libempathy/empathy-irc-network-manager.c	 |  3 ---
 22 files changed, 5 insertions(+), 166 deletions(-)

commit 95a0ab7d884a6500cfba6ff63fea73269faec0da
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 17 12:25:40 2011 +0100

    auth-client: implement Debug interface (#645008)

 src/empathy-auth-client.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 52eb24e6e7b012856525f6f09d3c1a941375d383
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 7 15:22:29 2011 +0100

    pass a preferred handler when requesting channels

    We want to use Empathy components when possible instead of, say,
    KDE ones if
    both are installed (#643863).

 libempathy-gtk/empathy-chat.c		  | 4 ++--
 libempathy-gtk/empathy-new-call-dialog.c | 5 +++--
 libempathy/empathy-request-util.c	  | 8 ++++----
 libempathy/empathy-tp-chat.c		  | 5 +++--
 libempathy/empathy-utils.c		  | 6 +++---
 5 files changed, 15 insertions(+), 13 deletions(-)

commit 04edfb3dbbdf9a2a4ac6cf2ecafcbd88044ee094
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 7 14:54:01 2011 +0100

    define constants for handler bus name

    It's more convenient and safe than hardcoding them everywhere.

 libempathy/empathy-ft-factory.c      | 3 ++-
 libempathy/empathy-request-util.h    | 9 +++++++++
 src/empathy-chat-manager.c	      | 4 ++--
 src/empathy-streamed-media-factory.c | 3 ++-
 4 files changed, 15 insertions(+), 4 deletions(-)

commit 23d90f884b28cabd3b9b986998c118314a9238f9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 7 14:02:52 2011 +0100

    rename empathy-dispatcher to empathy-request-util

    We don't have EmpathyDispatcher any more so this file just contains
    some
    utility functions now.

 libempathy-gtk/empathy-chat.c			  |   8 +-
 libempathy-gtk/empathy-contact-list-view.c	  |   4 +-
 libempathy-gtk/empathy-contact-menu.c		  |   4 +-
 libempathy-gtk/empathy-contact-selector-dialog.c |   1 -
 libempathy-gtk/empathy-individual-menu.c	  |   4 +-
 libempathy-gtk/empathy-individual-view.c	  |   4 +-
 libempathy-gtk/empathy-new-message-dialog.c	  |   4 +-
 libempathy-gtk/empathy-share-my-desktop.c	  |   2 -
 libempathy-gtk/empathy-ui-utils.c		  |   1 -
 libempathy/Makefile.am				  |   4 +-
 libempathy/empathy-chatroom-manager.h		  |   1 -
 libempathy/empathy-dispatcher.c		  | 107
 -----------------------
 libempathy/empathy-dispatcher.h		  |  49 -----------
 libempathy/empathy-request-util.c		  | 107
 +++++++++++++++++++++++
 libempathy/empathy-request-util.h		  |  48 ++++++++++
 libempathy/empathy-utils.c			  |   1 -
 src/empathy-chat-manager.c			  |   6 +-
 src/empathy-chat-window.c			  |   3 +-
 src/empathy-main-window.c			  |   4 +-
 src/empathy-new-chatroom-dialog.c		  |   4 +-
 src/empathy.c					  |   6 +-
 tests/interactive/empetit.c			  |   4 +-
 22 files changed, 185 insertions(+), 191 deletions(-)

commit a7422e3aa529737591539a1e01889646c99e924b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 10 16:48:53 2011 +0100

    account-widget-irc: set password-prompt param when needed (#644406)

 libempathy-gtk/empathy-account-widget-irc.c | 58
 +++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

commit 9d201c64e57d8e2b37670e88efaaaf2de35c34ba
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Wed Mar 16 21:22:48 2011 +0100

    Updated French translation

 po/fr.po | 603
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 354 insertions(+), 249 deletions(-)

commit b4ad1d79492da018ee5a73f778f1116d9128171d
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date:	Wed Mar 16 17:05:12 2011 +0000

    Updated British English translation

 po/en_GB.po | 1098
 ++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 642 insertions(+), 456 deletions(-)

commit f402904568cf4bbd351d75424c9d040f6269fb3e
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Wed Mar 16 17:56:23 2011 +0200

    Updated Hebrew translation.

 po/he.po | 350
 ++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 212 insertions(+), 138 deletions(-)

commit 75e35374e831cee1045f0493b284167b68d737bd
Author: Jakub Steiner <jimmac@gmail.com>
Date:	Wed Mar 16 14:37:49 2011 +0100

    New Empathy icon (#614640)

    Thank you Telepathy icon, you served us well.

 data/icons/Makefile.am			      |    2 +-
 data/icons/empathy.svg			      | 6436
 ++++++++++++++++++++++++++
 data/icons/hicolor_apps_16x16_empathy.png    |  Bin 797 -> 890 bytes
 data/icons/hicolor_apps_22x22_empathy.png    |  Bin 1179 -> 1138 bytes
 data/icons/hicolor_apps_24x24_empathy.png    |  Bin 1249 -> 1118 bytes
 data/icons/hicolor_apps_256x256_empathy.png  |  Bin 24824 -> 17105 bytes
 data/icons/hicolor_apps_32x32_empathy.png    |  Bin 1813 -> 1640 bytes
 data/icons/hicolor_apps_48x48_empathy.png    |  Bin 2930 -> 2317 bytes
 data/icons/hicolor_apps_scalable_empathy.svg |  261 --
 9 files changed, 6437 insertions(+), 262 deletions(-)

commit 9dbf81ddbdbafb611fa7a29849f5fb54ff0d76b8
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Mar 16 13:17:19 2011 +0000

    ContactSearch: don't leak a GError

 libempathy-gtk/empathy-contact-search-dialog.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit ba64e4982bf47cbbb0bd2db754b888ea7affa90a
Merge: 1890507 2220cb9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 16 11:37:10 2011 +0100

    Merge branch 'call-details-644830'

commit 2220cb934612b293018e364ae22f1229f1023e0e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 16 09:54:14 2011 +0100

    streamed-media-window: Put the details vbox in a scroll window

    It can require a lot of horizontal space and we don't want to enlarge
    the call
    window just for that (#644830).

 src/empathy-streamed-media-window.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 18905073c9948920f1804540b332fb0758e2e5a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 14 15:24:43 2011 +0100

    individual-view: call empathy_individual_manager_remove() also when
    the response is GTK_RESPONSE_YES

    Also, don't remove the contact if the operation has been cancelled in
    empathy_block_individual_dialog_show().

 libempathy-gtk/empathy-individual-view.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

commit 8f7700d66b8ff5056777c803e754b8c00430ab2a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 14 14:58:55 2011 +0100

    individual-view: use our own RESPONSE enum

    This code was too confusing when using GTK_RESPONSE_*

 libempathy-gtk/empathy-individual-view.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

commit 20c4918fc73cca52bf51152878c7437686e05833
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	Wed Mar 16 10:14:34 2011 +0200

    [l10n] Updated Estonian translation

 po/et.po | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

commit fdc3218abcb76d83eabcf323cfed1aef89a6fa0e
Author: Marek Černocký <marek@manet.cz>
Date:	Wed Mar 16 00:46:38 2011 +0100

    Updated Czech translation

 po/cs.po | 1021
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 594 insertions(+), 427 deletions(-)

commit 73368c2d9f01213d38c9463df8ac5488fef4f90f
Author: Fran Diéguez <fran@openhost.es>
Date:	Tue Mar 15 15:13:22 2011 +0100

    Updated Galician translations

 po/gl.po | 764
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 445 insertions(+), 319 deletions(-)

commit 1ee3ed8a7b06f4078f4491f334362cf8eafee236
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Tue Mar 15 13:36:29 2011 +0200

    [l10n] Updated Estonian translation

 po/et.po | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 5 deletions(-)

commit 7fcb99d91de85877a7f70b94e8cdd3ce749464ec
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Tue Mar 15 03:36:26 2011 +0100

    Updated Hungarian translation

 po/hu.po | 277
 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 177 insertions(+), 100 deletions(-)

commit bc07e7d582af2c453a5a70f587726446156979cc
Author: Daniel Nylander <po@danielnylander.se>
Date:	Tue Mar 15 00:13:54 2011 +0100

    Updated Swedish translation

 po/sv.po | 1287
 ++++++++++++++++----------------------------------------------
 1 file changed, 326 insertions(+), 961 deletions(-)

commit 19773d451bc55664e85b1b9818925c0ae6c225b4
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Mar 14 22:13:59 2011 +0100

    Updated Spanish translation

 po/es.po | 142
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 84 insertions(+), 58 deletions(-)

commit 88a02952e20c58a233b9c88e6a10e72021b66a1a
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Mar 14 22:10:24 2011 +0100

    Updated Spanish translation

 po/es.po | 253
 ++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 152 insertions(+), 101 deletions(-)

commit ac2774f5966790318a1ae6b79589627b7aaf6868
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	Mon Mar 14 21:44:51 2011 +0100

    Updated Slovenian translation

 po/sl.po | 391
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 223 insertions(+), 168 deletions(-)

commit e2aa4ed914a8fd0bd09bc3e24a5ad56362499f32
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Mon Mar 14 12:32:36 2011 -0700

    Require the proper version of Folks.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 492b8ba0e7a37ad5b23ef7a3544dc6a2fd5e4eef
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Thu Mar 10 22:07:44 2011 -0800

    Adjust for Folks PresenceOwner -> PresenceDetails rename

    Fixes bgo#644470 - Empathy needs to catch up with Folks interface
    name change
    (API/ABI breaks)

 libempathy-gtk/empathy-individual-store.c  | 34
 +++++++++++++++---------------
 libempathy-gtk/empathy-individual-view.c   |  3 ++-
 libempathy-gtk/empathy-individual-widget.c | 25 +++++++++++-----------
 libempathy-gtk/empathy-persona-store.c     | 19 +++++++++--------
 libempathy-gtk/empathy-ui-utils.c	    |  4 ++--
 libempathy/empathy-contact.c		    | 20 +++++++++---------
 6 files changed, 54 insertions(+), 51 deletions(-)

commit abf8b17d703c071f4fe91c09bac97c09314a2dc0
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Thu Mar 10 22:01:09 2011 -0800

    Adjust for Folks Groupable -> GroupDetails rename

    Helps bgo#644470 - Empathy needs to catch up with Folks interface
    name change
    (API/ABI breaks)

 libempathy-gtk/empathy-contact-widget.c    |	6 +-
 libempathy-gtk/empathy-groups-widget.c     | 114
 +++++++++++++++--------------
 libempathy-gtk/empathy-groups-widget.h     |	8 +-
 libempathy-gtk/empathy-individual-store.c  |	3 +-
 libempathy-gtk/empathy-individual-view.c   |  12 +--
 libempathy-gtk/empathy-individual-widget.c |	4 +-
 libempathy/empathy-contact.c		    |  13 ++--
 libempathy/empathy-individual-manager.c    |	8 +-
 libempathy/empathy-utils.c		    |	2 +-
 libempathy/empathy-utils.h		    |	2 +-
 10 files changed, 89 insertions(+), 83 deletions(-)

commit 07434728e84556fd321ea4a38f828035803ee76b
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Thu Mar 10 21:46:49 2011 -0800

    Adjust for Folks Favouritable -> FavouriteDetails rename

    Helps bgo#644470 - Empathy needs to catch up with Folks interface
    name change
    (API/ABI breaks)

 libempathy-gtk/empathy-contact-widget.c    | 11 ++++++-----
 libempathy-gtk/empathy-individual-menu.c   |  6 ++++--
 libempathy-gtk/empathy-individual-store.c  |  3 ++-
 libempathy-gtk/empathy-individual-view.c   | 10 ++++++----
 libempathy-gtk/empathy-individual-widget.c |  8 ++++----
 libempathy/empathy-individual-manager.c    |  4 ++--
 6 files changed, 24 insertions(+), 18 deletions(-)

commit 04358054e19cdd50364afd1f51cb315b132cf1f7
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Thu Mar 10 21:42:20 2011 -0800

    Adjust for Folks AvatarOwner -> AvatarDetails rename

    Helps bgo#644470 - Empathy needs to catch up with Folks interface
    name change
    (API/ABI breaks)

 libempathy-gtk/empathy-ui-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 36eb0b9dec61bd0040161535f27fc4bbbd4511ca
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Thu Mar 10 21:12:13 2011 -0800

    Adjust for Folks Aliasable -> AliasDetails rename

    Helps bgo#644470 - Empathy needs to catch up with Folks interface
    name change
    (API/ABI breaks)

 libempathy-gtk/empathy-individual-dialogs.c	    |  4 ++--
 .../empathy-individual-information-dialog.c	    |  2 +-
 libempathy-gtk/empathy-individual-store.c	    | 26
 ++++++++++++----------
 libempathy-gtk/empathy-individual-view.c	    |  8 ++++---
 libempathy-gtk/empathy-individual-widget.c	    | 11 ++++-----
 libempathy-gtk/empathy-linking-dialog.c	    |  2 +-
 libempathy-gtk/empathy-persona-store.c		    | 14 ++++++------
 libempathy/empathy-contact.c			    |  4 ++--
 libempathy/empathy-individual-manager.c	    |  2 +-
 9 files changed, 39 insertions(+), 34 deletions(-)

commit 5751c344bd2783df6086b427ebcebdff9a77e63c
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Thu Mar 10 21:10:50 2011 -0800

    Bump the Folks version requirement for the following API changes.

    Helps bgo#644470 - Empathy needs to catch up with Folks interface
    name changes
    (API/ABI breaks)

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9b5ff539e9075f4efb718dd9473c07aaf37c990a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 14 14:20:29 2011 +0100

    individual_view_remove_dialog_show: set a mnemonic on the 'Delete
    and Block' button

 libempathy-gtk/empathy-individual-view.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

commit 82aa40180c8cdf81ea3d8a7b217f3435a2ffcbbc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 14 13:41:27 2011 +0100

    coding style fixes

 libempathy-gtk/empathy-contact-menu.c | 2 +-
 src/empathy-chat-window.c	       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit fcb0c8c46779ef6f37575fda25500d26b49a4227
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Mon Mar 14 14:47:37 2011 +0200

    Updated Arabic translation

 po/ar.po | 205
 +++++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 147 insertions(+), 58 deletions(-)

commit 9e16a464a2ca6eab92404bfe1867a3d5ec3d43d7
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Mon Mar 14 14:33:17 2011 +0200

    Add missing files

 po/POTFILES.in | 2 ++
 1 file changed, 2 insertions(+)

commit 8e6a977d36aea1eb4b429ddee84cb9b4bc4142cd
Merge: 2e3e5e8 c0eca04
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Mar 14 12:58:00 2011 +1100

    Merge branch 'glassrose-contact-blocking-rebase'

commit 2e3e5e8e732fbc2e4d3ed61892aefa09efabbfc2
Author: Michael Kotsarinis <mk73628@gmail.com>
Date:	Sun Mar 13 20:04:58 2011 +0200

    l10n: Updated Greek translation

 po/el.po | 977
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 527 insertions(+), 450 deletions(-)

commit e6a451f6f2127740016a9eea16e0a5b0feb9d47e
Author: Ivar Smolin <okul@linux.ee>
Date:	Sun Mar 13 16:01:56 2011 +0200

    [l10n] Updated Estonian translation

 po/et.po | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

commit 7ed12df7f33acfafd2c264f207854b21744bc3e1
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Sun Mar 13 02:50:53 2011 +0100

    Updated Hungarian translation

 po/hu.po | 956
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 512 insertions(+), 444 deletions(-)

commit 0d9edf1afdec76ee1885c986eeb8c79fee9016d9
Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
Date:	Sat Mar 12 04:21:11 2011 +0100

    Updated Romanian translation

 po/ro.po | 66
 ++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

commit 432364e42cba5c3ba3f31218fc5da880de32f242
Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
Date:	Sat Mar 12 04:14:20 2011 +0100

    Updated Romanian translation

 po/ro.po | 57 ++++++++++++++++++++++++++-------------------------------
 1 file changed, 26 insertions(+), 31 deletions(-)

commit db498504eae855196f1a9a4033ed99a6281c87df
Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
Date:	Sat Mar 12 04:08:15 2011 +0100

    Updated Romanian translation

 po/ro.po | 284
 ++++++++++++++++++++++++++-------------------------------------
 1 file changed, 117 insertions(+), 167 deletions(-)

commit 1f065e04fbcdb28d41b80ae3a48f9d47e9e7f812
Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
Date:	Sat Mar 12 03:32:13 2011 +0100

    Updated Romanian translation

 po/ro.po | 1592
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 935 insertions(+), 657 deletions(-)

commit 9c99b6b7e742402b1fd087ced138896caebe3fb0
Author: Daniel Nylander <po@danielnylander.se>
Date:	Fri Mar 11 19:10:47 2011 +0100

    Updated Swedish translation

 po/sv.po | 1020
 ++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 862 insertions(+), 158 deletions(-)

commit e982efac9e472070ff169daaf079673c4abdf816
Author: Daniel Nylander <po@danielnylander.se>
Date:	Fri Mar 11 19:10:15 2011 +0100

    Updated Swedish translation

 po/sv.po | 98
 +++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 54 insertions(+), 44 deletions(-)

commit 6d333a13c020f44505fca6eb3fb54536143dafbf
Author: Daniel Nylander <po@danielnylander.se>
Date:	Tue Mar 8 08:31:39 2011 +0100

    Updated Swedish translation

 po/sv.po | 81
 +++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 47 insertions(+), 34 deletions(-)

commit 4a31ec6419c4b15e3e96c3ab05c9d787d1a84951
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Fri Mar 11 14:58:23 2011 +0200

    Updated Arabic translation

 po/ar.po | 167
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 94 insertions(+), 73 deletions(-)

commit 037e132ba999ebad4f3f0a643ce33c61d0343f6a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 11 12:23:25 2011 +0100

    Empathy.Auth.client: set DelayApprovers (#644475)

 data/Empathy.Auth.client | 3 +++
 1 file changed, 3 insertions(+)

commit c0eca0414ca529da3b083c099ec3031436420b00
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Mar 11 12:05:24 2011 +1100

    Update the wording of the other contact blocking dialog

 libempathy-gtk/empathy-contact-dialogs.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 355a558cfa919b1fa91f7c430c738b6d762239fb
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Mar 11 11:08:06 2011 +1100

    Update the wording of the contact blocking dialog

    Include the list of personas which will not be blocked.

 libempathy-gtk/empathy-individual-dialogs.c | 71
 +++++++++++++++++++++++------
 1 file changed, 56 insertions(+), 15 deletions(-)

commit 0b2f92fa593370c799cc16b8cecf575cf3e5b130
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Fri Mar 11 12:27:23 2011 +0530

    Add FIXME to empathy_individual_manager_supports_blocking()

    The parameter @self is not required and the method can be placed in
    utility. I left it as it is to stay coherent with empathy-2.34
    and attached a FIXME to be fixed after empathy 2.x is done.

 libempathy/empathy-individual-manager.c | 2 ++
 1 file changed, 2 insertions(+)

commit 0deb4db1b785bfe4497de50cf04efdd873f58009
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Feb 15 08:19:46 2011 +1100

    Use tp_g_signal_connect_object for Tp proxies that outlive the
    CB dialog

 libempathy-gtk/empathy-contact-blocking-dialog.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 5690460d1809f6e181c3eeed2aa930af1253b38c
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Feb 14 12:44:34 2011 +1100

    Use Conn.I.CB to report contacts as abusive when blocking them

 libempathy/empathy-tp-contact-list.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

commit 4b7d2787c3d4487647628109e14a6618e3db8da8
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Feb 14 12:36:22 2011 +1100

    Only destroy block confirmation dialogs after we've read out the
    abusive state

 libempathy-gtk/empathy-contact-dialogs.c    | 3 +--
 libempathy-gtk/empathy-individual-dialogs.c | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 80d502ca384aaf07e2b572da7414d7ff36e91936
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Feb 14 12:24:58 2011 +1100

    Determine whether a connection supports reporting abuse, set the
    connection flag

 libempathy/empathy-tp-contact-list.c | 36
 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

commit 428ac8930ef8cf312523a4d8b24eeda26729c4b3
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Feb 14 12:10:35 2011 +1100

    Add draft Conn.I.ContactBlocking (danni's version) to extensions

 .../Connection_Interface_Contact_Blocking.xml	    | 172
 +++++++++++++++++++++
 extensions/Makefile.am				    |	1 +
 extensions/misc.xml				    |	1 +
 3 files changed, 174 insertions(+)

commit 103b4d5da19bf7ebf648658b8ff0ccab88aa24bd
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Feb 14 12:00:56 2011 +1100

    Hook up abusive argument into TpContactList backend

 libempathy-gtk/empathy-contact-dialogs.c | 6 ++++--
 libempathy-gtk/empathy-contact-menu.c	  | 6 +++---
 libempathy-gtk/empathy-individual-view.c | 7 +++++--
 libempathy/empathy-contact-list.c	  | 5 +++--
 libempathy/empathy-contact-list.h	  | 6 ++++--
 libempathy/empathy-contact-manager.c	  | 6 ++++--
 libempathy/empathy-individual-manager.c  | 5 +++--
 libempathy/empathy-individual-manager.h  | 3 ++-
 libempathy/empathy-tp-contact-list.c	  | 3 ++-
 9 files changed, 30 insertions(+), 17 deletions(-)

commit 0a9fd8a0a7517f099ca1b908679ab7935513cd9a
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Fri Mar 11 07:53:15 2011 +0530

    Initialize EmpathyContactManager before creating a new contact->Block
    menuitem

 libempathy-gtk/empathy-contact-menu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit dfbccc45923082027415c3c76322febf470c5901
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Fri Mar 11 07:50:51 2011 +0530

    Setting "window" data on submenu only if it's not NULL

 src/empathy-chat-window.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit bbbfc7bb3c209fbc387c1e2c0566ec83aae687b9
Author: Gil Forcada <gforcada@gnome.org>
Date:	Fri Mar 11 00:21:38 2011 +0100

    [l10n] Updated Catalan translation

 po/ca.po | 152
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 81 insertions(+), 71 deletions(-)

commit 39e6b7d1fb458d9fba486da9ffe19e8c80d13e0f
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Thu Mar 10 18:38:43 2011 +0200

    Updated Hebrew translation.

 po/he.po | 167
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 95 insertions(+), 72 deletions(-)

commit 5392210e8ffefcc7b825c4b1279ec69268d3cf6b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 10 12:20:16 2011 +0100

    Update our local fields having Overwritten_By_Nickname when updating
    our nickname (#644298)

 libempathy-gtk/empathy-contact-widget.c | 43
 +++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

commit 1e2ef0f3c681511d1b1e82a51f82b52b9414605f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 10 12:04:37 2011 +0100

    don't update Alias.Nickname if not needed

 libempathy-gtk/empathy-contact-widget.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit aaa8d50fa75585a71d61332a8109916099ce35a4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 10 11:59:46 2011 +0100

    inline set_alias_on_account()

 libempathy-gtk/empathy-contact-widget.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

commit c47b9f66fbc23e627a4458cc86d53d5d56b901b7
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Wed Mar 9 21:22:12 2011 +0100

    Updated Polish translation

 po/pl.po | 1123
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 639 insertions(+), 484 deletions(-)

commit a8605cd844511f18806460bfac2d6d9a95d48603
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Mar 9 19:38:51 2011 +0100

    Updated Spanish translation

 po/es.po | 74
 ++++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 42 insertions(+), 32 deletions(-)

commit ec1bdc5f4fc5591b081c3036cef2951ba0975ac9
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Wed Mar 9 17:37:51 2011 +0100

    Updated Slovenian translation

 po/sl.po | 215
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 119 insertions(+), 96 deletions(-)

commit fbe4c00e6fd22b199e28bc950f34561e7cf16bdc
Author: Daniel Korostil <ted.korostiled@gmail.com>
Date:	Wed Mar 9 18:05:44 2011 +0200

    Uploaded Ukranian

 po/uk.po | 167
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 95 insertions(+), 72 deletions(-)

commit 52d15a1d9e54d6311012ffad54d7e7881ab48f55
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 9 16:07:56 2011 +0100

    contact-widget: don't allow edit fields having the
    Overwritten_By_Nickname flag (#644296)

 libempathy-gtk/empathy-contact-widget.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit de12575fb9f2e1b4945798ad44c225faa78d333d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 9 13:02:18 2011 +0100

    contact-widget: only call SetContactInfo() is details changed
    (#644295)

 libempathy-gtk/empathy-contact-widget.c | 39
 +++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 7 deletions(-)

commit e469159d894fd16ff425dca1a3e0a65ab69e2deb
Merge: ee32beb c3eb5ce
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Wed Mar 9 09:10:23 2011 +0100

    Merge branch 'remember-any-exception'

commit ee32bebf86571c0eb386820f741b98d0f8504be6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 9 09:02:17 2011 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 81ba0edc73b6a226a054b76539645b7b4e5e2a99
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Tue Mar 8 13:36:05 2011 +0530

    Use Contact Manager flags instead of Individual Manager flags

 libempathy-gtk/empathy-individual-dialogs.c | 17 +++++-----
 libempathy/empathy-individual-manager.c     | 48
 +++++++----------------------
 libempathy/empathy-individual-manager.h     | 11 -------
 3 files changed, 20 insertions(+), 56 deletions(-)

commit 4d96e3ad50ccd6c25dae811f42fde02e303b2066
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 8 18:37:47 2011 +0100

    prepare 2.91.91

 NEWS	      | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  6 +++---
 2 files changed, 51 insertions(+), 3 deletions(-)

commit b27e3726d374beca4ba3aaf384d22c488edc3590
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 8 18:18:59 2011 +0100

    display a debug message if we can't get the TpContact

 src/empathy-call-observer.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 26ef41ebb67957d65436624b03af1f9ac18f58e5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 8 17:39:27 2011 +0100

    call-observer: display a notification when rejecting a call (#644127)

 po/POTFILES.in		     |	1 +
 src/empathy-call-observer.c | 99
 +++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 92 insertions(+), 8 deletions(-)

commit 9cd35a6b1cdcd23c5baf38cd6bba53866d7bbdfa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 8 17:27:50 2011 +0100

    call-observer: set the Recover flag

    We want to know about existing calls when starting.

 src/empathy-call-observer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2ecaf0508db1c5115b1da1dbd8cb6ad679922e7c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 8 15:12:20 2011 +0100

    Revert "disable the call observer for now"

    This reverts commit c4f12fc9ad76f90374e08460971f001fdfb90036.

 src/empathy-main-window.c | 5 -----
 1 file changed, 5 deletions(-)

commit ce13127604887b13d2059adb780ce6c121e84de9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 8 16:47:09 2011 +0100

    call-observer: reject all the channels we claimed

    Once we have claimed the ChannelDispatchOperation, we are now the
    handler of
    all its channels. So, we should close them all as we are not going
    to do
    anything with them. (#644210)

 src/empathy-call-observer.c | 81
 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 74 insertions(+), 7 deletions(-)

commit c87a719dbd15c6c527b0249b9e466456da5968aa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 8 16:31:03 2011 +0100

    return from ObserveChannels() after having called Claim()

 src/empathy-call-observer.c | 2 ++
 1 file changed, 2 insertions(+)

commit d1c3f0d9952f6806da997428d99cce3c8cb62d95
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 8 15:47:26 2011 +0100

    call-observer: return from ObserveChannels() if the channel was
    already invalidated

 src/empathy-call-observer.c | 2 ++
 1 file changed, 2 insertions(+)

commit 7c8e0dca9ac2e75a6d1522dc5d84c7e48175686b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 8 16:29:39 2011 +0100

    call-observer: set debug domain to 'voip' and add 2 debug messages

 src/empathy-call-observer.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit ddc6bf1db6787ece63bc28fdee0c7424a638e83a
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Tue Mar 8 14:42:48 2011 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 85
 ++++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 51 insertions(+), 34 deletions(-)

commit 7bab1095747eb7691532fa857b30cb6b11a54b02
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 8 08:29:23 2011 +0100

    depends on GTK+ 3.0.2

    We need it for GTK_STYLE_CLASS_PRIMARY_TOOLBAR.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c3eb5ce5e5c98bfbd6e190b2b1b7eac11d1d160d
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Tue Mar 8 07:34:35 2011 +0100

    libempathy-gtk: In TLS Dialog allow remembering of any exception.

    Previously we couldn't do this because we had nowhere to store these
    exceptions. But now this is possible because we're storing them
    as trust
    assertions.

    https://bugzilla.gnome.org/show_bug.cgi?id=639417

 libempathy-gtk/empathy-tls-dialog.c | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

commit e0a6f43c066920f6720db060c4b055288efdb721
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Tue Mar 8 09:23:25 2011 +0300

    Updated Russian translation

 po/ru.po | 584
 +++++++++++++++++++++++----------------------------------------
 1 file changed, 210 insertions(+), 374 deletions(-)

commit 3ff78cbfcfe5dd8cbda7263764d3a8d93995bc20
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Feb 11 20:30:56 2011 +1100

    Style fixes from review

 libempathy-gtk/empathy-individual-dialogs.c | 4 +++-
 libempathy-gtk/empathy-individual-dialogs.h | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

commit 95bbacd1eda4500ef9cef0f998ebb485861a3a3d
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Feb 11 16:17:48 2011 +1100

    Add confirmation dialog to Remove

    Also includes the future Report Abusive check box, so that all
    the strings
    are in place now.

 libempathy-gtk/empathy-individual-dialogs.c | 94
 +++++++++++++++++++++++++++++
 libempathy-gtk/empathy-individual-dialogs.h |	2 +
 libempathy-gtk/empathy-individual-view.c    | 16 ++++-
 libempathy/empathy-individual-manager.c     |	2 +
 libempathy/empathy-individual-manager.h     |	1 +
 5 files changed, 112 insertions(+), 3 deletions(-)

commit 1e15d1b253163c98064997aabe6b127acbecc64b
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Feb 11 15:27:05 2011 +1100

    Add block confirmation to the authorise publication dialog

 libempathy-gtk/empathy-contact-dialogs.c | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

commit 95283d6bffb0b907ec1741c6c685e7fe67d701a0
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Feb 11 13:46:07 2011 +1100

    Add UI to blocking confirmation dialog for future "report as abusive"
    function

 libempathy-gtk/empathy-contact-dialogs.c | 33
 +++++++++++++++++++++++++++++---
 libempathy/empathy-contact-list.h	  |  1 +
 2 files changed, 31 insertions(+), 3 deletions(-)

commit 9cf8d924a615ead7f3e74644d0b9d39532645649
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Feb 11 13:31:26 2011 +1100

    Factor out common blocking confirmation dialog

 libempathy-gtk/empathy-contact-dialogs.c | 43
 ++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-contact-dialogs.h |  3 +++
 libempathy-gtk/empathy-contact-menu.c	  | 33 ++++++------------------
 3 files changed, 53 insertions(+), 26 deletions(-)

commit 0c363023bd77f286bc6257db3f7d90aeb4e7b0f0
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Feb 10 16:23:58 2011 +1100

    contact-blocking-dialog: report errors to the user

 libempathy-gtk/empathy-contact-blocking-dialog.c | 55
 ++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 3 deletions(-)

commit 1a2bbd7b2824e683c772b4784b98dcd531e91089
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Feb 10 15:56:02 2011 +1100

    Don't leak EmpathyContact

 libempathy/empathy-individual-manager.c | 2 ++
 1 file changed, 2 insertions(+)

commit 9968dc5978d6eb12ccc1f1cc76ca08fc0a739e85
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Feb 10 15:45:17 2011 +1100

    Add Block button to the subscription authorization dialog

 libempathy-gtk/empathy-contact-dialogs.c  | 21 +++++++++++-
 libempathy-gtk/empathy-contact-dialogs.ui | 53
 ++++++++++++++++++++++++-------
 2 files changed, 61 insertions(+), 13 deletions(-)

commit 59b19ff6eafdfb68c94305ca074243f293fefeea
Author: A S Alam <aalam@users.sf.net>
Date:	Tue Mar 8 08:43:59 2011 +0530

    update Punjabi Translation by A S Alam

 po/pa.po | 84
 ++++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 48 insertions(+), 36 deletions(-)

commit 8e95ee8c1455390b18126d2280bcd218777379a8
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Feb 10 13:19:35 2011 +1100

    Add a confirmation dialog when you block a contact from the Contact
    menu

 libempathy-gtk/empathy-contact-menu.c | 43
 ++++++++++++++++++++++++++++++++++-
 src/empathy-chat-window.c	       |  7 ++++--
 2 files changed, 47 insertions(+), 3 deletions(-)

commit 630a864d8ebac32fb7c11317308468ddbc535815
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Feb 9 17:29:18 2011 +1100

    Add 'Delete and Block' as an option to the Remove Contact dialog

 libempathy-gtk/empathy-individual-view.c | 34
 ++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

commit 6da159d09091d68a102c142b10747ae58755de51
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Feb 9 17:24:27 2011 +1100

    Add contact blocking support to EmpathyIndividualManager

 libempathy/empathy-individual-manager.c | 104
 ++++++++++++++++++++++++++++++++
 libempathy/empathy-individual-manager.h |  18 ++++++
 2 files changed, 122 insertions(+)

commit 4f3b2d373b9f22abdbf2679a8c87ec68c1ae1d20
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Feb 9 13:05:20 2011 +1100

    Add 'Block Contact' to empathy-contact-menu

 libempathy-gtk/empathy-chat.c	       |  3 +-
 libempathy-gtk/empathy-contact-menu.c | 71
 +++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-contact-menu.h |  3 +-
 3 files changed, 75 insertions(+), 2 deletions(-)

commit 35500a8b9e672f703059707039a1ccee23dd3597
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Feb 7 13:41:40 2011 +1100

    Add contact blocking to EmpathyContactList and friends

 libempathy/empathy-contact-list.c    | 23 +++++++++++++
 libempathy/empathy-contact-list.h    | 12 +++++++
 libempathy/empathy-contact-manager.c | 41 +++++++++++++++++++++++
 libempathy/empathy-tp-contact-list.c | 64
 ++++++++++++++++++++++++++++++++----
 libempathy/empathy-tp-contact-list.h |  1 +
 5 files changed, 135 insertions(+), 6 deletions(-)

commit 67d602af3ed86c8df908dd8ad429bdb3f8ff5d5b
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Feb 8 13:53:11 2011 +1100

    Handle the case where there are no accounts with deny channels

 libempathy-gtk/empathy-contact-blocking-dialog.c | 88
 +++++++++++++++++-------
 1 file changed, 62 insertions(+), 26 deletions(-)

commit ac5479e2ab5b1291afd853892238b0eb22c6e345
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Feb 8 12:16:15 2011 +1100

    Don't need to prepare accounts separately

 libempathy-gtk/empathy-contact-blocking-dialog.c | 41
 +++++++-----------------
 1 file changed, 11 insertions(+), 30 deletions(-)

commit 65bf3f42d6699ce32edccab2412dabe195eac68d
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Feb 7 10:59:33 2011 +1100

    Add blocked contacts dialog to Empathy main window menu

 src/empathy-main-window.c  | 17 ++++++++++++++++-
 src/empathy-main-window.ui |  7 +++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

commit bf0586ea17afcd2ad04fefa24b8e74cd5e1f4b23
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Feb 7 10:59:14 2011 +1100

    Prepare EmpathyContactManager in test

 tests/interactive/test-empathy-contact-blocking-dialog.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit fe902c25eaf5944bba218bddd1484e87a85d9905
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Feb 7 10:58:32 2011 +1100

    Provide autocompletion of known contacts in the entry box

 libempathy-gtk/empathy-contact-blocking-dialog.c | 52
 +++++++++++++++++++++---
 1 file changed, 47 insertions(+), 5 deletions(-)

commit 290021178e77efb4324b4204d2ecf8124e60c65a
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Sun Feb 6 12:13:43 2011 +1100

    Add and remove contacts from deny list

 libempathy-gtk/empathy-contact-blocking-dialog.c  | 171
 +++++++++++++++++++++-
 libempathy-gtk/empathy-contact-blocking-dialog.ui |  24 +--
 2 files changed, 183 insertions(+), 12 deletions(-)

commit f6b306beda8ade7053786826eb470005b42fea36
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Sun Feb 6 11:04:11 2011 +1100

    Connect ::response in test

 tests/interactive/test-empathy-contact-blocking-dialog.c | 3 +++
 1 file changed, 3 insertions(+)

commit a859b6a6a2f9dde93ef52b445266b5df3f50373a
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Feb 4 17:55:24 2011 +1100

    Test for contact blocking dialog

 tests/interactive/.gitignore			    |  1 +
 tests/interactive/Makefile.am			    |  2 +
 .../test-empathy-contact-blocking-dialog.c	    | 45
 ++++++++++++++++++++++
 3 files changed, 48 insertions(+)

commit 83e88245ea04ee0d66c98ce36bf4f7112cbd2f23
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Feb 4 17:47:31 2011 +1100

    Beginning of contact blocking dialog

    Can currently select an account and view the contact blocking
    'deny' list.
    List reponds to changes in the group membership.

    Add/Remove buttons do not yet do anything.

 libempathy-gtk/Makefile.am			   |   3 +
 libempathy-gtk/empathy-contact-blocking-dialog.c  | 514
 ++++++++++++++++++++++
 libempathy-gtk/empathy-contact-blocking-dialog.h  |  60 +++
 libempathy-gtk/empathy-contact-blocking-dialog.ui | 145 ++++++
 4 files changed, 722 insertions(+)

commit bd4149f1340c9881f001455983f7eaba987bfcb8
Author: Duarte Loreto <happyguy_pt@hotmail.com>
Date:	Mon Mar 7 23:46:03 2011 +0000

    Updated Portuguese translation

 po/pt.po | 1580
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 890 insertions(+), 690 deletions(-)

commit 637cd236669994de6e23f10098ad44daae640841
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Mar 7 19:17:00 2011 +0100

    Updated Spanish translation

 po/es.po | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

commit c4f12fc9ad76f90374e08460971f001fdfb90036
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 7 16:58:42 2011 +0100

    disable the call observer for now

 src/empathy-main-window.c | 5 +++++
 1 file changed, 5 insertions(+)

commit b9b55324c17793ebf0d82d6cd0203694a931497a
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Mar 7 10:11:46 2011 -0500

    all: set the primary-toolbar style class on primary toolbars

    So themes can override their appearance without hardcoding the widget
    hierarchy.

    https://bugzilla.gnome.org/show_bug.cgi?id=644121

 src/empathy-call-window.ui | 3 +++
 src/empathy-debug-window.c | 2 ++
 src/empathy-main-window.ui | 3 +++
 3 files changed, 8 insertions(+)

commit 5b894aa5ad8702279c0458b890025a22172bfdd1
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Mar 7 13:18:11 2011 +0000

    Don't look for Call channels

    We don't support them on master yet.

 src/empathy-call-observer.c | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

commit b5cadd968f25270ddeb68c3760e6688124bae794
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Mar 7 13:15:38 2011 +0000

    Build fix

 libempathy-gtk/empathy-contact-search-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 53b016c19d0147a415b86cbadb94150c6078510a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Sun Mar 6 15:17:05 2011 +0000

    Delay the approvers

 src/empathy-call-observer.c | 2 ++
 1 file changed, 2 insertions(+)

commit 19c228d5cd6a1eec12b0d7d015bb0fc49821f1ce
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Mar 7 11:40:35 2011 +0000

    Autoreject incoming calls if there are others in progress

    https://bugzilla.gnome.org/show_bug.cgi?id=643656

 src/Makefile.am	     |	 1 +
 src/empathy-call-observer.c | 287
 ++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-call-observer.h |	54 +++++++++
 src/empathy-main-window.c   |	 6 +-
 4 files changed, 347 insertions(+), 1 deletion(-)

commit 20ec7b56ec63c56b41ad7c2cff2e4fd1ce3ba47f
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Mar 7 11:30:38 2011 +0000

    Show a profile info button in contact search results

 libempathy-gtk/empathy-contact-search-dialog.c | 55
 ++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

commit 3c2728fb0e70803085f699538c115b4c41b0b869
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Mar 7 11:26:05 2011 +0000

    Use the special "" search field if the CM supports it

 libempathy-gtk/empathy-contact-search-dialog.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit cbdebf9ecf19f3303015e0efded41fe171fedbe6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 7 11:50:21 2011 +0100

    account-assistant: add mnemonic for the "no salut account" checkbox
    (#644058)

 src/empathy-account-assistant.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit a9c435117a92ccad2a9b992a105102d1c471ca37
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 7 12:01:13 2011 +0100

    empathy_protocol_name_to_display_name: MSN has been renamed to
    "Windows live" (#643920)

 libempathy/empathy-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e512bbfceef58803a5e8ef389c8f5585ab53596f
Author: Gil Forcada <gforcada@gnome.org>
Date:	Mon Mar 7 12:01:54 2011 +0100

    [l10n] Updated Catalan translation

 po/ca.po | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

commit b9d097cb326e8e8af3f74b631c7c0cf0b4408db2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 4 15:24:06 2011 +0100

    auth-factory: set Observer.DelayApprovers (#643872)

 libempathy/empathy-auth-factory.c | 2 ++
 1 file changed, 2 insertions(+)

commit 46de927d35d667362a990905628ad7cbb4f9619e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 4 15:24:42 2011 +0100

    depends on telepathy-glib 0.13.16

    We need it for tp_base_client_set_observer_delay_approvers().

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b6e030fc577477fb6bf87d8833f2404ab8c6fc48
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Mar 7 11:21:43 2011 +1100

    Warn the user if she has insufficient disk space to receive a file

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=644062

 libempathy-gtk/empathy-ui-utils.c | 61
 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 3 deletions(-)

commit 2eb9099ce3e60b8c60039b7947e249c294b02167
Author: Žygimantas Beručka <zygis@gnome.org>
Date:	Sun Mar 6 17:16:12 2011 +0200

    Updated Lithuanian translation by Aurimas Černius and me

 po/lt.po | 1566
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 884 insertions(+), 682 deletions(-)

commit 1923d63c2cc51521bd31100e6bad88be798d8afa
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Sun Mar 6 15:41:59 2011 +0200

    Updated Arabic translation

 po/ar.po | 333
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 174 insertions(+), 159 deletions(-)

commit 584d3fcf8235676fcab935567729a6d97b7bbf9e
Author: Krasimir Chonov <mk2616@abv.bg>
Date:	Sat Mar 5 22:04:13 2011 +0200

    Updated Bulgarian translation

 po/bg.po | 1503
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 833 insertions(+), 670 deletions(-)

commit c6a022e2cf5f68ed49c78731886607530de22d04
Author: Ivar Smolin <okul@linux.ee>
Date:	Sat Mar 5 20:52:54 2011 +0200

    [l10n] Updated Estonian translation

 po/et.po | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

commit 78cef53c7c27496a5a108eb12ac414e3f3137b20
Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:	Sat Mar 5 15:12:25 2011 +0200

    Updated Latvian translation.

 po/lv.po | 2332
 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 1546 insertions(+), 786 deletions(-)

commit 1dc6fd11ddf1d028d23afa4de10791fe0068dff0
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Sat Mar 5 11:06:23 2011 +0100

    Updated Spanish translation

 po/es.po | 143
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 74 insertions(+), 69 deletions(-)

commit 43b41c43d30ea31769ed9fc263be72b2f9484f9f
Author: A S Alam <aalam@users.sf.net>
Date:	Sat Mar 5 07:02:40 2011 +0530

    update Punjabi Translation by A S Alam

 po/pa.po | 748
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 385 insertions(+), 363 deletions(-)

commit 8c651efbfd8e5ceea5e8796aec12d61840e9590d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 4 10:51:36 2011 +0100

    tp_chat_received_cb: display the path of the channel in debug log

    That can be convenient when debugging to easily match Empathy and
    CM logs.

 libempathy/empathy-tp-chat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 26d17c7c631bb175f58b00d9e332b0fd8c741d90
Author: Daniel Korostil <ted.korostiled@gmail.com>
Date:	Thu Mar 3 22:05:51 2011 +0200

    Uploaded Ukranian

 po/uk.po | 59 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 30 insertions(+), 29 deletions(-)

commit aae7107c07db72e86b335624ad1a7967f75e4e8e
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Thu Mar 3 22:09:54 2011 +0200

    Updated Hebrew translation.

 po/he.po | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

commit 1839a4f2675fea1855f8961ab7a263d54a5f4c4c
Author: liuzhen <liuzhen1191@gmail.com>
Date:	Thu Mar 3 14:45:55 2011 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po | 1258
 +++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 711 insertions(+), 547 deletions(-)

commit 897a8fc900ff393f204b5e5a6e1ba2b2e170f1a3
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Mar 4 00:16:18 2011 +1100

    Emit RESPONSE_APPLY on row-activated

 libempathy-gtk/empathy-contact-search-dialog.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit a5667a859d34c1d79c966f625e6c7f8997f4af36
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Mar 4 00:07:38 2011 +1100

    Contact Search Dialog: Search when enter is pressed

 libempathy-gtk/empathy-contact-search-dialog.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 3c8f0ee47ad969dcc56880dad67652263e7b813a
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Mar 4 00:02:53 2011 +1100

    Change 'Add' to 'Add Contact'

 libempathy-gtk/empathy-contact-search-dialog.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit df788298cd4def7fe18ab1ad89aa7291f9688017
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Mar 3 23:54:51 2011 +1100

    Tweak ContactSearchDialog padding

 libempathy-gtk/empathy-contact-search-dialog.c | 30
 +++++++++++++++-----------
 1 file changed, 17 insertions(+), 13 deletions(-)

commit 855095a0e0c5c50f0713caf11afad2329428827b
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Mar 3 13:35:45 2011 +1100

    Only show the "Remember password" tickybox if we can do that

 libempathy-gtk/empathy-password-dialog.c |  5 ++++-
 libempathy/empathy-server-sasl-handler.c | 37
 ++++++++++++++++++++++++++++++++
 libempathy/empathy-server-sasl-handler.h |  3 +++
 3 files changed, 44 insertions(+), 1 deletion(-)

commit 2d652e402b4ed7fa1ca01805288018e4fc867d53
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Mar 3 13:18:05 2011 +1100

    Implement MaySaveResponse and Ch.I.CredentialsStorage in SASL handler

 libempathy/empathy-server-sasl-handler.c | 43
 +++++++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 3 deletions(-)

commit 1543de6cc195aa22568d86ebb026b2c705b6d0b9
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Mar 3 13:02:14 2011 +1100

    Add Chan.I.CredentialsStorage to extensions

 .../Channel_Interface_Credentials_Storage.xml	    | 59
 ++++++++++++++++++++++
 extensions/Makefile.am				    |  1 +
 extensions/misc.xml				    |  1 +
 3 files changed, 61 insertions(+)

commit 1c72f78a3f5b6db07dcdf92f8530e3134f896d71
Author: Gil Forcada <gforcada@gnome.org>
Date:	Thu Mar 3 00:14:29 2011 +0100

    [l10n] Updated Catalan translation

 po/ca.po | 1575
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 862 insertions(+), 713 deletions(-)

commit c4d6e4444528d78e2e13e03dc94afa3f45db2511
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Tue Mar 1 18:18:03 2011 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 337
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 174 insertions(+), 163 deletions(-)

commit a28c97f368dd0ebe2c21c7be6fc579f45bf9b55a
Author: Leonid Kanter <leon@asplinux.ru>
Date:	Tue Mar 1 13:49:47 2011 +0200

    Update Russian translation by Yury Myasoedov <omerta13@yandex.ru>

 po/ru.po | 1407
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 795 insertions(+), 612 deletions(-)

commit c973683d56584d7bf14d1147e6efe44344b55d40
Author: Daniel Nylander <po@danielnylander.se>
Date:	Tue Mar 1 09:15:27 2011 +0100

    Updated Swedish translation

 po/sv.po | 435
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 224 insertions(+), 211 deletions(-)

commit d4e5ce709bf78e014c1006f1f1e648f58b474b76
Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
Date:	Fri Feb 25 17:38:26 2011 -0500

    Add support for message type to support /me

 libempathy/empathy-message.c | 2 ++
 1 file changed, 2 insertions(+)

commit e30adf5d90786cc1145828f304a0857f03fe562c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 28 15:00:20 2011 +0100

    find_items_cb: copy the string stored in the result

 libempathy/empathy-keyring.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 875ec756ab0f8ae86c40b9d9432d9c7b0b66c318
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 28 14:50:43 2011 +0100

    find_items_cb: always use the first password found

 libempathy/empathy-keyring.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

commit c4cdf9011e7cfe81b32db1742209edc7f2f54ee6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 28 13:13:52 2011 +0100

    accounts_dialog_set_selected_account: scroll to the selected account

 src/empathy-accounts-dialog.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

commit 79a01b5492f280cc8c9ceebeef046e085e684f48
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 28 13:13:33 2011 +0100

    empathy-accounts: allow to pass the full path of the account

 src/empathy-accounts.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit d8bb9ec37dd074d70115c481bb667318e833b893
Author: Robert Sajdok <robert.sajdok@gmail.com>
Date:	Mon Feb 28 10:17:33 2011 +0100

    Request a minimal size on the presence chooser

    This avoid to make it completely disappear when resizing the window
    (#583317)

 src/empathy-main-window.c | 1 +
 1 file changed, 1 insertion(+)

commit af14cf9bf6d5c19ca07245963def757408a0bdc5
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Sun Feb 27 22:55:22 2011 +0200

    Updated Hebrew translation.

 po/he.po | 303
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 157 insertions(+), 146 deletions(-)

commit 460927eb68940ef9194b4276aba42f47c1264e67
Author: Daniel Korostil <ted.korostiled@gmail.com>
Date:	Sun Feb 27 17:46:51 2011 +0200

    Uploaded Ukranian

 po/uk.po | 2451
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1570 insertions(+), 881 deletions(-)

commit bf7230f3bd199830b13f9b98c1754862954e3c56
Author: Changwoo Ryu <cwryu@debian.org>
Date:	Sat Feb 26 23:15:32 2011 +0900

    Updated Korean translation

 po/ko.po | 1530
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 857 insertions(+), 673 deletions(-)

commit 1ab50a302443947752c824ee777cecf7243ab0e1
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Sat Feb 26 12:01:05 2011 +0100

    Updated Spanish translation

 po/es.po | 307
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 160 insertions(+), 147 deletions(-)

commit 40a5e28276e503acea8bdfc5463a23ffbfe53db6
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Fri Feb 25 20:41:04 2011 +0100

    Updated French translation

 po/fr.po | 305
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 159 insertions(+), 146 deletions(-)

commit 6a98e814127df8d869a9c27949141783e14505d6
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Fri Feb 25 20:17:09 2011 +0100

    Updated Slovenian translation

 po/sl.po | 1000
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 533 insertions(+), 467 deletions(-)

commit 2ea7be6e9e50e8410c048f0c11c6d8e1ab148145
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 25 15:47:47 2011 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fe7a700a7929753dad158a947f63eb5cc918ef31
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 25 15:33:47 2011 +0100

    prepare 2.91.90.2

 NEWS	      | 6 ++++++
 configure.ac | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

commit dfa0a14010577349ccaa56a785c4e7f1ae68119d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 25 15:29:08 2011 +0100

    Disable /part command for now

    See https://bugzilla.gnome.org/show_bug.cgi?id=643295

 libempathy-gtk/empathy-chat.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit c1ac26eb983b09e55771a9a6f6130b7e9bdff1fb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 25 13:16:58 2011 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e8455be378847e312f34054e29e59caaf801a997
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 25 13:03:53 2011 +0100

    prepare 2.91.90.1

 NEWS	      | 25 +++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 27 insertions(+), 2 deletions(-)

commit 667cae90a298a8f9a0004431fd3ce494b3c15f26
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Wed Feb 23 11:55:25 2011 +0530

    Implementation of /PART command for MUCs

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=604348

 libempathy-gtk/empathy-chat.c | 62
 ++++++++++++++++++++++++++++++++++++++-----
 libempathy-gtk/empathy-chat.h |  3 +++
 2 files changed, 59 insertions(+), 6 deletions(-)

commit 9a5d1c52d41aab250ca5bfff3373b11d876bdf1f
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Wed Feb 23 11:44:54 2011 +0530

    Updating empathy_tp_chat_leave() function in empathy-tp-chat API

 libempathy-gtk/empathy-chat.c |  2 +-
 libempathy/empathy-tp-chat.c  | 60
 +++++++++++--------------------------------
 libempathy/empathy-tp-chat.h  |  3 ++-
 src/empathy-event-manager.c   |  2 +-
 4 files changed, 19 insertions(+), 48 deletions(-)

commit 860c0a75da2c97bc1e91ed3b4bb958cb7e3cb934
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Feb 24 13:46:11 2011 +0000

    Update the Logger dbus API for the new version

 extensions/Logger.xml | 114
 +++++++++++++++++++++-----------------------------
 1 file changed, 47 insertions(+), 67 deletions(-)

commit 830aa2622ca7832e4daad33bbe82e06d81be7388
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Feb 24 10:46:38 2011 +0000

    Indentation fix

 libempathy-gtk/empathy-log-window.c | 42
 ++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

commit 69c3a29e4d9af4b68c3ccb2a6d160cbf2fd9171a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Feb 24 10:46:00 2011 +0000

    Log window: free the entities together with the list

 libempathy-gtk/empathy-log-window.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 3370389a56ebd8fe1076721f55519ea1ad34c96a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Feb 24 10:37:58 2011 +0000

    Check for the right telepathy-logger pc file

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit acb645b19b6b0357e9a4b5af0d9e0faf3ebda49e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Feb 24 10:31:25 2011 +0000

    Log window: don't leak the account

 libempathy-gtk/empathy-log-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 72089c86163dd65754d251c9900ee98a1b9b2447
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Feb 24 10:14:53 2011 +0000

    Unref the entity when we're done

 libempathy-gtk/empathy-chat.c | 2 ++
 1 file changed, 2 insertions(+)

commit 67920cae23f4b8020559d7548fd1dff8de44e962
Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
Date:	Thu Feb 24 10:17:15 2011 +0000

    Port empathy to Telepathy logger 0.2.0

 configure.ac			       |   2 +-
 libempathy-gtk/empathy-chat.c	       |  37 ++++---
 libempathy-gtk/empathy-contact-menu.c |  11 +-
 libempathy-gtk/empathy-log-window.c   | 197
 ++++++++++++++++------------------
 libempathy/empathy-contact.c	       |   9 +-
 libempathy/empathy-message.c	       |  30 +++---
 libempathy/empathy-message.h	       |   4 +-
 7 files changed, 144 insertions(+), 146 deletions(-)

commit 677a6bf7fca3ce8e26cf02d36c2721fa03510a4d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 24 14:29:22 2011 +0100

    tls-dialog: destroy the dialog if the certificate is invalidated
    (#643186)

    There is no point to keep it around.

 libempathy-gtk/empathy-tls-dialog.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 4d45b02f6930ef0f97096deb5f70d62252dc7f95
Author: Nirbheek Chauhan <nirbheek@gentoo.org>
Date:	Wed Feb 23 20:55:49 2011 +0530

    Fix header collisions between clutter-gtk-0.10 and clutter-gtk-1.0

    Always include clutter-gtk-1.0 first to avoid header-include-path
    problems

    https://bugzilla.gnome.org/show_bug.cgi?id=643078

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 33b6ee49a826c72e8a872bc9a98ef5015bca638a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 22 11:44:57 2010 +0100

    re-implement /query and /msg (#623682)

 libempathy-gtk/empathy-chat.c | 62
 ++++++++++++++++++++++++++-----------------
 1 file changed, 38 insertions(+), 24 deletions(-)

commit c7112dca957e3c5fb4c318f2753b22e300960747
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 4 15:37:41 2011 +0100

    finally kill EmpathyDispatcher

    So long, and thanks for all the dispatching!

 libempathy/empathy-dispatcher.c | 656
 +---------------------------------------
 libempathy/empathy-dispatcher.h |  34 ---
 2 files changed, 1 insertion(+), 689 deletions(-)

commit 938d9c8dbe1c39c99d92311b0fa0c2a98c0cb940
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 4 15:35:00 2011 +0100

    ft-handler: stop instantiating a EmpathyDispatcher

 libempathy/empathy-ft-handler.c | 10 ----------
 1 file changed, 10 deletions(-)

commit ea84ad87c75088e29378c1c332a20567a76a538e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 4 15:34:37 2011 +0100

    empathy.c: stop instantiating a EmpathyDispatcher

 src/empathy.c | 6 ------
 1 file changed, 6 deletions(-)

commit ffb89eff7654897d8d5246bc06840411ab1de13f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 4 15:24:36 2011 +0100

    use tp_capabilities_supports_room_list() (#641491)

 src/empathy-new-chatroom-dialog.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

commit c96c271f838ffa3911bd301b37b6c7aaffb2dfc2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 24 10:11:26 2011 +0100

    depend on telepathy-glib 0.13.14

    We need it for tp_capabilities_supports_room_list()

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4435767a8769ac913b7fc7860474dca824a1cde8
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Wed Feb 23 20:40:08 2011 +0100

    Updated French translation

 po/fr.po | 158
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 81 insertions(+), 77 deletions(-)

commit 5ac753af160f7184594b74aa0b61e73e8fb3d5a7
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Wed Feb 23 19:28:48 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 349
 +++++++++++++++++++++++++++++++-----------------------------
 po/zh_TW.po | 349
 +++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 358 insertions(+), 340 deletions(-)

commit c7146024489b4cc95263b9dfa0f8f237dd799b42
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Feb 22 22:36:07 2011 +0000

    CC panel: don't use an undefined symbol

 src/cc-empathy-accounts-panel.c | 2 --
 src/empathy-accounts-common.h	 | 4 ----
 2 files changed, 6 deletions(-)

commit 35bbb7ce80ed1941a68b593fa69ebdb78c71e1e1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 22 09:58:31 2011 +0100

    Ship a 256x256 version of the Empathy icon

 data/icons/Makefile.am			     |	 1 +
 data/icons/hicolor_apps_256x256_empathy.png | Bin 0 -> 24824 bytes
 2 files changed, 1 insertion(+)

commit ef711c0be15feb40853087ea3b86d364e83030d4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 22 09:44:23 2011 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fc9e2392778db9c05b9f628cc104da12608c6369
Author: Ivar Smolin <okul@linux.ee>
Date:	Tue Feb 22 10:14:54 2011 +0200

    [l10n] Updated Estonian translation

 po/et.po | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 5527cc3dc589a986c7aaeafc54b50101059e506a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Feb 21 15:59:52 2011 +0000

    Fix make distcheck

 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 41688dd942557db1da816f6ba5f6e8502de2c1c4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 21 16:11:44 2011 +0100

    prepare 2.91.90

 NEWS	      | 58
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  6 +++---
 2 files changed, 61 insertions(+), 3 deletions(-)

commit 738c40c96bec045a28f6871bb50b85b660c6ef8e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 21 15:55:25 2011 +0100

    use GeditCloseButton (#642865)

 src/empathy-chat-window.c | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

commit 6b33a26fa16179fce84a6243ede3f2d226ce4718
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 21 15:54:46 2011 +0100

    add gedit-close-button

    This file is a bare copy from gedit.

 src/Makefile.am	  |  2 ++
 src/gedit-close-button.c | 80
 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/gedit-close-button.h | 60 ++++++++++++++++++++++++++++++++++++
 3 files changed, 142 insertions(+)

commit 7490e07615a360c73cf204f6023298785eefe183
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 21 14:15:18 2011 +0100

    coding style fixes

 libempathy-gtk/empathy-contact-list-view.c | 2 +-
 libempathy-gtk/empathy-ui-utils.c	    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit b5f65eef4dc95e0b8ba141c00a4e731e97c893cc
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Feb 21 13:59:37 2011 +0100

    Prevent segv attempting to free uninitialised value.

 libempathy/empathy-account-settings.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 24915e378ea1cd185acb406e4f69ddb029f6aea2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 21 11:57:56 2011 +0100

    re-enable strict-prototypes warning

    It seems that GTK+ has been fixed

 configure.ac | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit f80ac5a563fe7e7b88f7c3f3b737907792dae355
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Feb 21 10:59:56 2011 +0000

    Move farsight-using sources to src

    And only build them for empathy-av, since they use farsight.

 libempathy-gtk/Makefile.am	       |  12 +-
 libempathy-gtk/empathy-audio-sink.c   | 235 ----------------
 libempathy-gtk/empathy-audio-sink.h   |  67 -----
 libempathy-gtk/empathy-audio-src.c    | 387 ---------------------------
 libempathy-gtk/empathy-audio-src.h    |  66 -----
 libempathy-gtk/empathy-video-src.c    | 360 -------------------------
 libempathy-gtk/empathy-video-src.h    |  86 ------
 libempathy-gtk/empathy-video-widget.c | 487
 ----------------------------------
 libempathy-gtk/empathy-video-widget.h |  72 -----
 src/Makefile.am		       |   8 +
 src/empathy-audio-sink.c	       | 235 ++++++++++++++++
 src/empathy-audio-sink.h	       |  67 +++++
 src/empathy-audio-src.c	       | 387 +++++++++++++++++++++++++++
 src/empathy-audio-src.h	       |  66 +++++
 src/empathy-streamed-media-window.c   |   8 +-
 src/empathy-video-src.c	       | 360 +++++++++++++++++++++++++
 src/empathy-video-src.h	       |  86 ++++++
 src/empathy-video-widget.c	       | 487
 ++++++++++++++++++++++++++++++++++
 src/empathy-video-widget.h	       |  72 +++++
 19 files changed, 1774 insertions(+), 1774 deletions(-)

commit a11f7c047fbc1e02a28d5c8f4366e8f2d3e1e423
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Fri Feb 18 19:19:10 2011 +0100

    Fiexd wrong title capitalization for checkbox

 libempathy-gtk/empathy-account-widget-aim.ui	    | 2 +-
 libempathy-gtk/empathy-account-widget-groupwise.ui | 2 +-
 libempathy-gtk/empathy-account-widget-icq.ui	    | 2 +-
 libempathy-gtk/empathy-account-widget-jabber.ui    | 2 +-
 libempathy-gtk/empathy-account-widget-msn.ui	    | 2 +-
 libempathy-gtk/empathy-account-widget-sip.ui	    | 2 +-
 libempathy-gtk/empathy-account-widget-yahoo.ui     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

commit 7c0535692bcdc2c3cc0614ebd06e2bf24cdfd921
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 21 10:17:13 2011 +0100

    use champlain_view_ensure_layers_visible()

 libempathy-gtk/empathy-individual-widget.c | 4 +---
 src/empathy-map-view.c			    | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

commit 72b084c00c702917f32cc3f750fb648d9e191d2c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 21 10:11:33 2011 +0100

    use champlain_marker_layer_new()

 libempathy-gtk/empathy-contact-widget.c    | 2 +-
 libempathy-gtk/empathy-individual-widget.c | 2 +-
 src/empathy-map-view.c			    | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

commit 1629b3b04f38eb748ae8385e407e01bfaf312a63
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 17 15:29:03 2011 +0100

    Port to champlain 0.10 (#642010)

 configure.ac				    |  9 ++-
 libempathy-gtk/empathy-contact-widget.c    | 15 +++--
 libempathy-gtk/empathy-individual-widget.c | 29 ++++-----
 src/empathy-map-view.c			    | 96
 ++++++++++++++----------------
 4 files changed, 68 insertions(+), 81 deletions(-)

commit 932d46f051bbfbf144dcb063849e4f285daa8586
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Mon Feb 21 09:19:33 2011 +0200

    Updated Hebrew translation.

 po/he.po | 166
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 85 insertions(+), 81 deletions(-)

commit a415776354fb947c6a42abecae405009c7e1b6b6
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Sun Feb 20 23:47:26 2011 +0200

    Updated Arabic translation

 po/ar.po | 168
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 86 insertions(+), 82 deletions(-)

commit 31352fc1bd675fdda5d75b44429b4067bd0f626b
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Sun Feb 20 15:50:19 2011 +0000

    Check for GLib

    Since we obviously use it.

 configure.ac | 1 +
 1 file changed, 1 insertion(+)

commit adda2aa529b3d7a275b54a95afe0201aee1e6783
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Sun Feb 20 13:58:39 2011 +0100

    Updated Spanish translation

 help/es/es.po | 108
 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 52 insertions(+), 56 deletions(-)

commit 4b167f7717f6a2008cb8178861d5436bd6a4f9aa
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Sun Feb 20 13:58:18 2011 +0100

    Updated Spanish translation

 po/es.po | 168
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 84 insertions(+), 84 deletions(-)

commit cc1893624f843ba363b1bd3cceb5e4cc709cada7
Author: Mahyar Moghimi <mahyar.moqimi@gmail.com>
Date:	Fri Feb 18 23:49:56 2011 +0330

    Adding Persian Translation

 po/LINGUAS |	 1 +
 po/fa.po   | 3829
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 3830 insertions(+)

commit 03bbe3de832ab35a928e43bf05e3df099301cd67
Author: Friedel Wolff <friedel@translate.org.za>
Date:	Fri Feb 18 18:06:01 2011 +0200

    New translation for Zulu (zu)

 po/LINGUAS |	 1 +
 po/zu.po   | 3973
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 3974 insertions(+)

commit df72fd00377a9aaed2b532c84eb0c25383991b72
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 18 11:00:26 2011 +0100

    empathy-chat: ensure that the theme manager stay alive

 src/empathy-chat.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit df6a382a635251a6c86d81af128d4f1187491c5f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 18 10:57:11 2011 +0100

    empathy_theme_manager_dup_singleton: act as a proper dup singleton
    function

 libempathy-gtk/empathy-theme-manager.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 753a1862257d4c14fb2475a73ec08aeabdb7d907
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Sat Jan 29 16:16:29 2011 +0000

    Bug 637151 — Hide the user Individual from the contact list

    Generalise the mechanism used to determine whether a persona is to be
    displayed by Empathy to also take into account whether the persona
    is the
    user and, if so, whether they're in the contact list.

    This bumps the libfolks dependency to 0.3.5.

    Closes: bgo#637151

 configure.ac					    |  2 +-
 .../empathy-individual-information-dialog.c	    |  2 +-
 libempathy-gtk/empathy-individual-menu.c	    |  8 ++++----
 libempathy-gtk/empathy-individual-store.c	    |  4 ++--
 libempathy-gtk/empathy-individual-view.c	    | 21
 +++++++++++++++++----
 libempathy-gtk/empathy-individual-widget.c	    | 20
 ++++++++++----------
 libempathy-gtk/empathy-linking-dialog.c	    |  2 +-
 libempathy/empathy-contact.c			    |  4 ++--
 libempathy/empathy-utils.c			    | 22
 ++++++++++++++++++++--
 libempathy/empathy-utils.h			    |  1 +
 10 files changed, 59 insertions(+), 27 deletions(-)

commit d008f215bc41f4e69ff01879047ec946a4370148
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Sun Feb 6 12:14:28 2011 +0000

    Bug 641662 — Update for libfolks API changes to IndividualAggregator

    Update EmpathyIndividualManager re. changes to
    IndividualAggregator.add_persona_from_details,
    BackendStore.enabled_backends
    and BackendStore.get_backend_by_name in libfolks. Closes: bgo#641662

 libempathy/empathy-individual-manager.c | 33
 +++++++++++++++++++++++++++++++--
 libempathy/empathy-utils.c		 |  2 +-
 2 files changed, 32 insertions(+), 3 deletions(-)

commit 8e789be3d95d5e232bbde41094f5e0e426109132
Author: Xandru Armesto <xandru@softastur.org>
Date:	Thu Feb 17 18:12:11 2011 +0100

    Updating Asturian translation

 po/ast.po | 2872
 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1459 insertions(+), 1413 deletions(-)

commit 014148a2b30d9b77e29abb565e0450fa9f88e5c7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 17 12:55:00 2011 +0100

    accounts: release our ref on the TpDBusDaemon

 src/empathy-accounts.c | 1 +
 1 file changed, 1 insertion(+)

commit 73c9a3dba54975438ac127cc8020386ae5ed8e93
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 17 12:54:10 2011 +0100

    empathy_account_settings_check_readyness: don't leak a ref on manager

 libempathy/empathy-account-settings.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 84b316b42725de82000353a9650e9304f5d4f825
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 17 11:59:21 2011 +0100

    empathy_protocol_chooser_create_account_settings: ensure that cm is
    always unrefed

 libempathy-gtk/empathy-protocol-chooser.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 9cae8fb44d9d76ad88d09527f48192dffba57711
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 17 11:15:48 2011 +0100

    rename empathy_theme_manager_get() to
    empathy_theme_manager_dup_singleton()

    We also don't leak it any more.

 libempathy-gtk/empathy-chat.c		| 5 ++++-
 libempathy-gtk/empathy-log-window.c	| 7 +++++--
 libempathy-gtk/empathy-theme-manager.c | 2 +-
 libempathy-gtk/empathy-theme-manager.h | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

commit 382bb4914eb08c7c1472350633b1fe91bba50c05
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 17 10:54:08 2011 +0100

    chatroom_manager_parse_chatroom: don't leak chatroom

 libempathy/empathy-chatroom-manager.c | 1 +
 1 file changed, 1 insertion(+)

commit de93890f23fa987bcd5d78b6833dedbee7537eb8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 17 14:47:05 2011 +0100

    folks favorite API has changed

 libempathy-gtk/empathy-individual-view.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 6011de2aa9fc4427acfa42ffe423fb166a165058
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 11 12:28:41 2010 +0100

    Always display favorite contacts (#592595)

 libempathy-gtk/empathy-individual-view.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 600abe1e8b0f010484c7f1bdf185b4948660908e
Merge: a1579c8 313c508
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 17 14:37:14 2011 +0100

    Merge branch 'expander-642098'

commit 313c5081cb99cd116d51353f13827fa8c8e9e289
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 17 14:27:26 2011 +0100

    empathy_cell_renderer_expander_render: draw using the proper state
    (#642098)

 libempathy-gtk/empathy-cell-renderer-expander.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

commit 8c99779e5b055bc407ac2b8bf6bb26f4df63d555
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 11 12:30:28 2011 +0100

    update copyright

 libempathy-gtk/empathy-cell-renderer-expander.c | 1 +
 1 file changed, 1 insertion(+)

commit 81fe71399ae0fea7e5a522e998e129e5cb9e756f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 11 12:15:12 2011 +0100

    cell-renderer-expander: remove animation code

    It's broken and useless any way.

 libempathy-gtk/empathy-cell-renderer-expander.c | 163
 ------------------------
 1 file changed, 163 deletions(-)

commit a1579c86e5ff333a78dbafb6c196d39035284d07
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Thu Feb 17 13:13:06 2011 +0100

    Updated Norwegian bokmål translation.

 po/nb.po | 128
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 66 insertions(+), 62 deletions(-)

commit 0f4470c3e892cdbb0e6fdda9d300d0a84b6ff62e
Author: Asia Słowik <asiaslowik@gmail.com>
Date:	Wed Feb 16 22:06:09 2011 +0100

    Updated Polish translation

 po/pl.po | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

commit ef4f45ba4d629437d49fc73a7bde6ef4022b189c
Author: Asia Słowik <asiaslowik@gmail.com>
Date:	Wed Feb 16 19:14:21 2011 +0100

    Updated Polish translation

 po/pl.po | 1962
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 999 insertions(+), 963 deletions(-)

commit a44c73c2e1a57ce59a7eba6d547da2f76ecda430
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 16 15:49:04 2011 +0100

    disconnect the activate cb before detaching the menu

 libempathy-gtk/empathy-contact-list-view.c | 4 ++--
 libempathy-gtk/empathy-individual-view.c   | 4 ++--
 libempathy-gtk/empathy-ui-utils.c	    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

commit 89c2a14e5eba2921b4ee6264f2a218eb3d93717f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 16 15:42:17 2011 +0100

    debug-window: use empathy_context_menu_new()

 src/empathy-debug-window.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit ea092fdf3fd0a50acaa77c3768478169a7da589d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 16 15:39:30 2011 +0100

    accounts-dialog: use empathy_context_menu_new()

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a5685443623cf5be33ff0223c63621eda577c4d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 16 15:34:26 2011 +0100

    individual-widget: use empathy_context_menu_new()

 libempathy-gtk/empathy-individual-widget.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 867b57fdd04d230c205b2657b4ffa47db22af62a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 16 15:34:08 2011 +0100

    individual-view: use empathy_context_menu_new()

 libempathy-gtk/empathy-individual-view.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 57c8169491a65eb284984a252859e39c0272db91
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 16 15:25:23 2011 +0100

    contact-widget: use empathy_context_menu_new()

 libempathy-gtk/empathy-contact-widget.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 1a76481fbfc909010ff8fc79bc04ebca7330a40d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 16 15:18:06 2011 +0100

    contact-list-view: use empathy_context_menu_new() (#642461)

 libempathy-gtk/empathy-contact-list-view.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

commit b93ebf9d9f42e4de478b63b9219efcdf516e630e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 16 15:10:24 2011 +0100

    theme-adium: use empathy_context_menu_new() and remove our hack

    It ensures that the popup is destroyed as soon as we're done with it.
    (#642461)

 libempathy-gtk/empathy-theme-adium.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 33fec6ea1836eaa5ba39bd233a5b81e4f6998a18
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 16 15:09:09 2011 +0100

    add empathy_context_menu_new()

    That's basically the same trick as we did in
    individual_view_popup_menu_idle_cb(). We can't unfortunatelly not
    use this
    function there as the popup may be reused in some cases.

 libempathy-gtk/empathy-ui-utils.c | 34 ++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-ui-utils.h |  2 ++
 2 files changed, 36 insertions(+)

commit 404871f95d42c41f01af2fdff862a877e624675b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 4 16:40:15 2011 +0100

    accounts-dialog: only update the row which have actually been changed;
    may fix #636189

 src/empathy-accounts-dialog.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

commit 6ea60bb165253f1355d9fbfa1a5a010fb79c2c06
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 16 10:48:52 2010 +0100

    ft-factory: don't leak the handler

 libempathy/empathy-ft-factory.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 52269e4ffc18cd85d3bec8970192e104e7fc0898
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 16 10:43:06 2010 +0100

    fix coding style

 libempathy/empathy-ft-factory.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

commit a49b8d190c999195a68b0d2043894b8425a96edc
Author: Debarshi Ray <debarshir@src.gnome.org>
Date:	Tue Feb 15 17:28:09 2011 +0200

    Add some more servers and port numbers for Freenode

    The list of servers and port numbers for Freenode are given at:
    http://freenode.net/irc_servers.shtml

    Fixes: https://bugzilla.gnome.org/642385

 libempathy/irc-networks.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit d4cc2c6f60ba99c5e7772b08af6407b983f4b7a0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 15 11:20:59 2011 +0100

    only try reconnecting accounts if needed (#642358)

 libempathy-gtk/empathy-account-widget.c | 17 ++++++++++++++---
 libempathy/empathy-account-settings.c	 | 16 +++++++++++++++-
 libempathy/empathy-account-settings.h	 |  1 +
 src/empathy-account-assistant.c	 |  2 +-
 4 files changed, 31 insertions(+), 5 deletions(-)

commit f19e015dc6bc1b62805dd37159176b591a7f9676
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 16 10:44:20 2011 +0100

    set 'Empathy' as program class in all binaries

    This will make all the empathy apps windows appear as the same
    application
    in gnome-shell. (#642440)

    Thanks to Owen Taylor for this trick.

 src/empathy-accounts.c    | 2 ++
 src/empathy-auth-client.c | 3 +++
 src/empathy-av.c	   | 2 ++
 src/empathy-chat.c	   | 2 ++
 src/empathy-debugger.c    | 2 ++
 5 files changed, 11 insertions(+)

commit 9c59bb18947a31362ded4c9e5ec5c4ea8c4d0b83
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Tue Feb 15 21:30:54 2011 +0100

    Updated Spanish translation

 po/es.po | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

commit 6ab8e70515bcf91c79b78701ce5358d6beb0bd10
Merge: 1c70d6e c7e246e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 15 09:19:43 2011 +0100

    Merge remote branch 'glassrose/Reset-network-list-button-642264'

commit 1c70d6e3ea5a6a7a7d286ab1fd3163d804f736f9
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Mon Feb 14 18:13:24 2011 +0100

    Updated French translation

 po/fr.po | 1503
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 818 insertions(+), 685 deletions(-)

commit c7e246e02d143268e0e8fc310c2078d312e4b91a
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Mon Feb 14 07:41:30 2011 +0530

    Reset network list button

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=642264

 .../empathy-irc-network-chooser-dialog.c	    | 33 ++++++++++++
 libempathy/empathy-irc-network-manager.c	    | 63
 ++++++++++++++++++----
 libempathy/empathy-irc-network-manager.h	    |  3 ++
 libempathy/empathy-irc-network.c		    | 21 +++++++-
 libempathy/empathy-irc-network.h		    |  2 +
 5 files changed, 110 insertions(+), 12 deletions(-)

commit 9458d4eb2a490693a1a64f486ced58e0ec58369c
Author: Ivar Smolin <okul@linux.ee>
Date:	Mon Feb 14 17:58:41 2011 +0200

    [l10n] Updated Estonian translation

 po/et.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 94b8532b6cc83fa8924d5f734d3a92db5feac479
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 14 16:33:10 2011 +0100

    password-dialog: activate the dialog when the entry is activated
    (#642296)

 libempathy-gtk/empathy-password-dialog.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit 6a7796336de7c9a5f6834253c8862d1e752ef5f7
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Mon Feb 14 19:39:16 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 951
 +++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 954
 ++++++++++++++++++++++++++++++++----------------------------
 2 files changed, 1027 insertions(+), 878 deletions(-)

commit 1432ec6d6943ed7d8a5b6d2176924fef7cd517b5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 11 11:29:15 2011 +0100

    irc-network-chooser: recreate the default IRC network if needed
    (#641861)

 libempathy-gtk/empathy-irc-network-chooser.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

commit afe6426f268f5ba7b20f989bbd19f41ccb19b182
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sun Feb 13 14:01:57 2011 +0100

    Updated Galician translations

 po/gl.po | 299
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 152 insertions(+), 147 deletions(-)

commit d95f48409ba9a1a6815619bb085ba50b6eea5311
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sat Feb 12 13:49:15 2011 +0100

    Updated Norwegian bokmål translation.

 po/nb.po | 296
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 148 insertions(+), 148 deletions(-)

commit f2b315fe100c9292492c7a37221be11dd87d3e10
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Sat Feb 12 09:59:33 2011 +0100

    Updated Spanish translation

 po/es.po | 374
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 188 insertions(+), 186 deletions(-)

commit de7532516985cf487da00abbe8bdc3025c669961
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Sat Feb 12 00:23:24 2011 +0200

    Updated Hebrew translation.

 po/he.po | 292
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 146 insertions(+), 146 deletions(-)

commit 9314023680793975ddd928ca3f7b672b605da760
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Thu Feb 10 21:23:27 2011 +0200

    Updated Arabic translation

 po/ar.po | 292
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 146 insertions(+), 146 deletions(-)

commit a4ed316c8c6a786d4ac1cb8d969a3f27b6a57a04
Author: Daniel Nylander <po@danielnylander.se>
Date:	Thu Feb 10 18:13:07 2011 +0100

    Updated Swedish translation

 po/sv.po | 394
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 197 insertions(+), 197 deletions(-)

commit 5324201651b4be5a164ab2f3af2f7d4a8348e4a9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 10 13:21:09 2011 +0100

    account-settings: cope with g_regex_new returning NULL

 libempathy/empathy-account-settings.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

commit ef8d5543ab390b62c99a0fc17e1ef30cdb08f6a5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 10 13:18:12 2011 +0100

    string-parser: properly handle if g_regex_new() fails

 libempathy-gtk/empathy-string-parser.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

commit 3272874ae2d8cf8e53dd939fb590fbf63c9dc6fa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 12 13:52:30 2010 +0100

    add EmpathyChannelFactory (#634679)

    It just delegates everything to TpAutomaticProxyFactory for now.

 libempathy/Makefile.am		      |   2 +
 libempathy/empathy-channel-factory.c | 126
 +++++++++++++++++++++++++++++++++++
 libempathy/empathy-channel-factory.h |  58 ++++++++++++++++
 3 files changed, 186 insertions(+)

commit 356be50ba481e0046c0ade43032de78322f3eaa8
Author: Rob Bradford <rob@linux.intel.com>
Date:	Thu Feb 10 00:00:33 2011 +0000

    connectivity: Update to use new Connman D-BUS service names /
    interfaces

    The Connman service name and interface name has changed to a different
    namespace:
    http://lists.connman.net/pipermail/connman/2010-November/002548.html

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=641985

 libempathy/empathy-connectivity.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 189ac2ece4abcd095d94ec015154e50d13f46e02
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 10 11:57:34 2011 +0100

    improve phrasing of the subscription request message

 src/empathy-event-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit add7f929cb12b88b2d3c4810b2d7b034196ddbdf
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Feb 9 17:06:31 2011 +0000

    Only link empathy-av against farsight

 configure.ac	 | 8 ++++++--
 src/Makefile.am | 3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

commit 07460f755936ac04bbe4a2ffc30914b840b9861b
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Feb 9 17:01:32 2011 +0000

    Only build the EmpathyStreamedMedia* classes for empathy-av

    So the other binaries don't need to link against farsight.

 libempathy/Makefile.am			     |	 4 -
 libempathy/empathy-streamed-media-factory.c | 275 ---------
 libempathy/empathy-streamed-media-factory.h |	72 ---
 libempathy/empathy-streamed-media-handler.c | 923
 ---------------------------
 libempathy/empathy-streamed-media-handler.h | 106 ----
 src/Makefile.am			     |	25 +-
 src/empathy-av.c			     |	 2 +-
 src/empathy-streamed-media-factory.c	     | 276 +++++++++
 src/empathy-streamed-media-factory.h	     |	69 +++
 src/empathy-streamed-media-handler.c	     | 924
 ++++++++++++++++++++++++++++
 src/empathy-streamed-media-handler.h	     | 106 ++++
 src/empathy-streamed-media-window.h	     |	 3 +-
 12 files changed, 1393 insertions(+), 1392 deletions(-)

commit 2104fdf4bd3b020e2dca0d397ce445423f463704
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Feb 9 16:48:34 2011 +0000

    Move a couple of call-related functions to empathy-utils.h

    Since the rest of the call stuff will only be compiled for
    empathy-av so we don't link every binary against farsight.

 libempathy-gtk/empathy-contact-menu.c	     |	9 ++--
 libempathy-gtk/empathy-individual-menu.c    |	9 ++--
 libempathy/empathy-streamed-media-factory.c | 67
 -----------------------------
 libempathy/empathy-streamed-media-factory.h | 10 -----
 libempathy/empathy-streamed-media-handler.c |	3 +-
 libempathy/empathy-utils.c		     | 62
 +++++++++++++++++++++++++-
 libempathy/empathy-utils.h		     | 11 ++++-
 7 files changed, 80 insertions(+), 91 deletions(-)

commit f22e466ab6e525a148145f66aed3ce4a0f23128a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Feb 9 16:29:24 2011 +0000

    EmpathyCallFactory -> EmpathyStreamedMediaFactory

 libempathy-gtk/empathy-contact-list-view.c  |	 1 -
 libempathy-gtk/empathy-contact-menu.c	     |	 6 +-
 libempathy-gtk/empathy-individual-menu.c    |	 6 +-
 libempathy-gtk/empathy-individual-view.c    |	 1 -
 libempathy-gtk/empathy-new-call-dialog.c    |	 1 -
 libempathy/Makefile.am			     |	 4 +-
 libempathy/empathy-call-factory.c	     | 342
 ----------------------------
 libempathy/empathy-call-factory.h	     |	82 -------
 libempathy/empathy-streamed-media-factory.c | 342
 ++++++++++++++++++++++++++++
 libempathy/empathy-streamed-media-factory.h |	82 +++++++
 libempathy/empathy-streamed-media-handler.c |	 8 +-
 libempathy/empathy-streamed-media-handler.h |	 2 +-
 src/empathy-av.c			     |	12 +-
 src/empathy-event-manager.c		     |	 1 -
 src/empathy-streamed-media-window.c	     |	 1 -
 15 files changed, 443 insertions(+), 448 deletions(-)

commit e4d6dc647732a895dbf6c1b0983ccad39ed3a61c
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Feb 9 16:12:32 2011 +0000

    Generate closures for src/

 src/Makefile.am | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

commit 3fc3cb87f63dfbf4a33bc5512073600688729dd2
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Feb 8 14:47:33 2011 -0500

    accounts: fill in the right categories to show up in control-center

    https://bugzilla.gnome.org/show_bug.cgi?id=641868

 data/empathy-accounts.desktop.in.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fd7763a53b2e67de8676d34f6a755202832bf363
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Feb 8 14:44:58 2011 -0500

    cc-panel: make sure to always pack a widget during construction

    The CC library expects the panel to have a child widget after it's
    constructed, otherwise it segfaults.

    https://bugzilla.gnome.org/show_bug.cgi?id=641867

 src/cc-empathy-accounts-panel.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit c61ceefda501caad3efc8cad84662972d3652baa
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Feb 3 15:30:39 2011 +0000

    ::new-call-handler -> ::new-streamed-media-handler

 libempathy/empathy-call-factory.c | 2 +-
 src/empathy-av.c		   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 6e2db2cf4831d586d3db73ea431d6c6d18668286
Author: Sweta Kothari <swkothar@redhat.com>
Date:	Wed Feb 9 14:58:02 2011 +0530

    Updated Gujarati Translations

 po/gu.po | 3386
 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 2331 insertions(+), 1055 deletions(-)

commit be3b9622582ca5abc86532019e7563a37010b5ed
Author: Laurent Bigonville <bigon@bigon.be>
Date:	Tue Feb 8 10:40:54 2011 +0100

    GNOME is not using CVS for a while

 autogen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1d32cd41ebb142f313fde508aedde89f3c20d32d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 7 14:06:44 2011 +0100

    always color the room label when we are highlighted

 src/empathy-chat-window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit cf25437b4330f128f0d35e97a353824177736c53
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 7 13:13:20 2011 +0100

    use tp_clear_object()

 libempathy/empathy-tp-file.c | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

commit b07ca79425096c6e6f1cafda1be19b85cc2983a2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 7 13:11:20 2011 +0100

    tp-file: use the self->priv pattern

 libempathy/empathy-tp-file.c | 399
 +++++++++++++++++++------------------------
 libempathy/empathy-tp-file.h |   3 +-
 2 files changed, 182 insertions(+), 220 deletions(-)

commit 8846f4598c605911fa1c8bee6b5dd4e6aacb9a53
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 7 12:48:49 2011 +0100

    depends on telepathy-glib 0.13.12

    We need it for FileTransfer.URI API.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4f54a4e0ecb21b56c22efb1756f174eacd8c17f5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 7 11:33:39 2011 +0100

    Set FileTransfer.URI when accepting a file (#641707)

 libempathy/empathy-tp-file.c | 49
 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 10 deletions(-)

commit 7e67efc0b94e62d2a5f48412abc5f71c43ca764b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 31 14:11:57 2011 +0100

    set FileTransfer.URI on outgoing FT

 libempathy/empathy-ft-handler.c | 5 +++++
 1 file changed, 5 insertions(+)

commit e80937f80044e5125139dd4e6aeb5fac3019bcb8
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sun Feb 6 19:16:39 2011 +0100

    Updated Norwegian bokmål translation.

 po/nb.po | 635
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 329 insertions(+), 306 deletions(-)

commit fb57016c81a53579af803f8ffd82756225a72391
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Sat Feb 5 17:00:27 2011 +0200

    Updated Arabic translation

 po/ar.po | 477
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 256 insertions(+), 221 deletions(-)

commit 14e738d67444e05342802fb1ed841d217bd00cf1
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Feb 4 09:04:27 2011 +0200

    Updated Hebrew translation.

 po/he.po | 392
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 212 insertions(+), 180 deletions(-)

commit 7f58b46964f9ec00abfac3beb5356ab7fdb88cb4
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Feb 3 14:03:26 2011 +0000

    EmpathyCallWindowFullscreen -> EmpathyStreamedMediaFullscreen

 src/Makefile.am				|   2 +-
 src/empathy-call-window-fullscreen.c		| 309
 -------------------------
 src/empathy-call-window-fullscreen.h		|  77 ------
 src/empathy-streamed-media-window-fullscreen.c | 309
 +++++++++++++++++++++++++
 src/empathy-streamed-media-window-fullscreen.h |  77 ++++++
 src/empathy-streamed-media-window.c		|  28 +--
 6 files changed, 401 insertions(+), 401 deletions(-)

commit 4b985ad97ad2cfee604394c5b7c6fb47d87cab39
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Feb 3 13:57:28 2011 +0000

    EmpathyCallWindow -> EmpathyStreamedMediaWindow

 po/POTFILES.in			      |    2 +-
 src/Makefile.am		      |    2 +-
 src/empathy-av.c		      |    6 +-
 src/empathy-call-window-fullscreen.c |    4 +-
 src/empathy-call-window-fullscreen.h |    4 +-
 src/empathy-call-window.c	      | 3323
 ----------------------------------
 src/empathy-call-window.h	      |   64 -
 src/empathy-streamed-media-window.c  | 3323
 ++++++++++++++++++++++++++++++++++
 src/empathy-streamed-media-window.h  |   64 +
 9 files changed, 3396 insertions(+), 3396 deletions(-)

commit 734d2d4314edc2302dc8e1edb74dc58d6d16d908
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Feb 3 13:45:45 2011 +0000

    EmpathyCallHandler -> EmpathyStreamedMediaHandler

 libempathy/Makefile.am			     |	 4 +-
 libempathy/empathy-call-factory.c	     |	12 +-
 libempathy/empathy-call-factory.h	     |	 2 +-
 libempathy/empathy-call-handler.c	     | 924
 ----------------------------
 libempathy/empathy-call-handler.h	     | 106 ----
 libempathy/empathy-streamed-media-handler.c | 924
 ++++++++++++++++++++++++++++
 libempathy/empathy-streamed-media-handler.h | 106 ++++
 src/empathy-av.c			     |	 2 +-
 src/empathy-call-window.c		     |	60 +-
 src/empathy-call-window.h		     |	 4 +-
 10 files changed, 1072 insertions(+), 1072 deletions(-)

commit d8d937bd964bda813cc2b33389f464d1dfbcb95f
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Feb 3 12:15:12 2011 +0000

    EmpathyTpCall -> EmpathyTpStreamedMedia

 libempathy/Makefile.am			|   4 +-
 libempathy/empathy-call-factory.c	|  14 +-
 libempathy/empathy-call-handler.c	|  30 +-
 libempathy/empathy-call-handler.h	|   4 +-
 libempathy/empathy-tp-call.c		| 855
 ---------------------------------
 libempathy/empathy-tp-call.h		| 101 ----
 libempathy/empathy-tp-streamed-media.c | 855
 +++++++++++++++++++++++++++++++++
 libempathy/empathy-tp-streamed-media.h | 113 +++++
 libempathy/empathy-utils.c		|   1 -
 src/empathy-call-window.c		|  50 +-
 src/empathy-event-manager.c		|  22 +-
 11 files changed, 1030 insertions(+), 1019 deletions(-)

commit 9e808134b2d3770c1e23e1b7c3938b6ac2061ffb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 3 14:44:44 2011 +0100

    individual-view: properly unref the tooltip_widget when disposing
    (#641157)

 libempathy-gtk/empathy-individual-view.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit 7cbe28b6cfc22744a0a6079213b9614d87bf22ad
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 3 11:07:06 2011 +0100

    contact-list-view: backport fixes from
    individual_view_popup_menu_idle_cb

 libempathy-gtk/empathy-contact-list-view.c | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

commit 8978c0d955186405e291a7ff2ac71a063cdb9e68
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 3 11:02:35 2011 +0100

    individual-menu: ensure that the contact stays alive while the
    activate signal is connected (#641119)

 libempathy-gtk/empathy-individual-menu.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 8859363aee3d81abd6fb84f8d54f78e782d90425
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 3 10:58:57 2011 +0100

    individual-view: detach the individual menu once it has been displayed

 libempathy-gtk/empathy-individual-view.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit f7b205167a4b7e11f1eed687852cb253b1ce1a23
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 3 10:53:43 2011 +0100

    individual_view_popup_menu_idle_cb: remove useless sink/unref

    gtk_menu_attach_to_widget() takes the floating ref so this code
    is useless.

 libempathy-gtk/empathy-individual-view.c | 2 --
 1 file changed, 2 deletions(-)

commit 46be255840a0adb42dd0efa5378ceeecf8411edf
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Thu Feb 3 10:55:31 2011 +0100

    Updated Galician translations

 po/gl.po | 205
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 117 insertions(+), 88 deletions(-)

commit 2dc6d1116520e0f6fc9f4f6470271f137c0eef5f
Author: Ivar Smolin <okul@linux.ee>
Date:	Thu Feb 3 09:44:57 2011 +0200

    [l10n] Updated Estonian translation

 po/et.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 824d9f0c61898d3e4125c24b9ab6c3fd6cc0f8a0
Author: A S Alam <aalam@users.sf.net>
Date:	Thu Feb 3 08:10:59 2011 +0530

    update Punjabi Translation by A S Alam

 po/pa.po | 711
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 396 insertions(+), 315 deletions(-)

commit 8dfdeb48b7e558b9e0d6e8b29292367f0bdba020
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Feb 2 19:28:43 2011 +0100

    Updated Spanish translation

 po/es.po | 140
 ++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 85 insertions(+), 55 deletions(-)

commit 8914d8cdfdd984398e348fa4b666da05a5418722
Author: Ivar Smolin <okul@linux.ee>
Date:	Wed Feb 2 18:27:58 2011 +0200

    [l10n] Updated Estonian translation

 po/et.po | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

commit 7803366218ee4b09782394985ffc0d31cb1b8a78
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 1 17:33:27 2011 +0100

    individual-widget: use priv->contact as that's our pointer on the
    TpContact now

 libempathy-gtk/empathy-individual-widget.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 91386d401d9385cf334cf4d879f97d7e49540bb1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 1 16:48:24 2011 +0100

    empathy_contact_get_presence_message: use the tp_contact if there
    is no persona for the contact

    This is needed in muc as channel specific contacts don't have
    a persona
    associated with them (#640914).

 libempathy/empathy-contact.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 796ab375f5ff84b118320f71ea0d1a54f9dcb221
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 1 16:24:49 2011 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ae51279486457b96bb746799fbb79b3e4b8518e6
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Feb 1 14:51:06 2011 +0000

    Fix distcheck

 extensions/Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

commit 2c101f2718ae343a833e6f1885e11f45db8bc010
Merge: 1081451 c9dae1a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 1 15:31:19 2011 +0100

    Merge branch 'release'

commit 108145120d9c320c81ee276770b2c63abd53ac99
Author: Daniel Nylander <po@danielnylander.se>
Date:	Tue Feb 1 15:27:02 2011 +0100

    Updated Swedish translation

 po/sv.po | 593
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 306 insertions(+), 287 deletions(-)

commit c9dae1a810f67c37e1218fc42b7364e0e2f91fc2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 1 15:24:06 2011 +0100

    prepare 2.91.6.1

 NEWS	      | 11 +++++++++++
 configure.ac |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

commit 621bbbb8631f4b149d0478a3423687e4e973b04f
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Tue Feb 1 13:47:58 2011 +0000

    Update tools from telepathy-glib

 extensions/Makefile.am		      |  12 +-
 tools/Makefile.am		      |  14 +-
 tools/c-constants-gen.py	      |  84 +++++---
 tools/check-coding-style.mk	      |   4 +-
 tools/git-which-branch.sh	      |  25 +++
 tools/glib-client-gen.py	      | 283 +++++++++++++++----------
 tools/glib-errors-check-gen.py       |  58 ++++++
 tools/glib-errors-enum-body-gen.py   |  62 ------
 tools/glib-errors-enum-header-gen.py |  75 -------
 tools/glib-errors-str-gen.py	      |  82 ++++++++
 tools/glib-ginterface-gen.py	      | 293 +++++++++++++++++---------
 tools/glib-gtypes-generator.py       | 214 ++++++++++++-------
 tools/glib-interfaces-gen.py	      | 138 +++++++++++--
 tools/gobject-foo.py		      |  23 ++-
 tools/identity.xsl		      |   7 -
 tools/libglibcodegen.py	      |   5 +-
 tools/libtpcodegen.py		      |  36 +---
 tools/make-release-mail.py	      |  76 +++++++
 tools/manager-file.py		      | 175 ++++++++++++++++
 tools/shave.mk			      |   1 +
 tools/telepathy-glib.supp	      | 390
 +++++++++++++++++++++++++++++++++++
 tools/test-wrapper.sh		      |  30 +++
 tools/valgrind.mk		      |  13 ++
 tools/with-session-bus.sh	      |  10 +-
 tools/xincludator.py		      |  39 ++++
 25 files changed, 1623 insertions(+), 526 deletions(-)

commit 9503c4aa28b9a4215e3e325a31b500f2c78b712a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 1 11:34:37 2011 +0100

    individual-widget: connect on the notify::client-types only once

    Reconnecting a signal while you are handling it isn't exactly a good
    idea as
    it will result in an infinite loop eating all your memory (#635105).

 libempathy-gtk/empathy-individual-widget.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

commit 21321727a45ac859405638ba034dc4212f1374b8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 1 10:44:21 2011 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a1ce2e226d0d78f2e94ee3f6588341c3db6b6793
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 1 10:26:08 2011 +0100

    prepare 2.91.6

 NEWS	      | 39 +++++++++++++++++++++++++++++++++++++++
 configure.ac |  6 +++---
 2 files changed, 42 insertions(+), 3 deletions(-)

commit 6085b66ce169a5b7a9b6df6afac9a07290c733d3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 1 10:18:06 2011 +0100

    coding style fix

 libempathy-gtk/empathy-chat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 88c215486143dc4887b1016540d090c78027ddfa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 1 10:18:00 2011 +0100

    add empathy-contact-search-dialog.c to POTFILES.in

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit 38a7c551fb07d72dd7b6744a8d1a345466b011d2
Merge: 7f5c02a b03dfef
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Feb 1 08:50:22 2011 +0000

    Merge branch 'muc-password'

commit b03dfefd8103ea41f61407df122021a6d14d5a19
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Feb 1 08:41:39 2011 +0000

    keyring: use the recently added finish macros

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-keyring.c | 79
 +++++---------------------------------------
 1 file changed, 9 insertions(+), 70 deletions(-)

commit 267fb729f0536843bcb7c42858bd3d6a6d029411
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Feb 1 08:41:24 2011 +0000

    utils: add the _finish macros from wocky

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-utils.h | 45
 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

commit 7f5c02a63be19988ab199e497e22cd93880ae0bd
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Mon Jan 31 20:58:37 2011 -0800

    Bump the Folks requirement to match reality.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 19bfb625b0301e6412c77aaccc2faf471d4fbff6
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Tue Feb 1 02:29:26 2011 +0100

    Updating Galician translations

 po/gl.po | 322
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 163 insertions(+), 159 deletions(-)

commit 41f5717611c6bb3236ae78a187fd5753bbd9ccf3
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Wed Dec 22 17:22:59 2010 -0800

    Adjust for FolksHasPresence -> FolksPresenceOwner

    Fixes bgo#637847.

 libempathy-gtk/empathy-individual-store.c  | 31
 ++++++++++++++++--------------
 libempathy-gtk/empathy-individual-view.c   |  2 +-
 libempathy-gtk/empathy-individual-widget.c | 24 +++++++++++------------
 libempathy-gtk/empathy-persona-store.c     | 16 ++++++++-------
 libempathy-gtk/empathy-ui-utils.c	    |  4 ++--
 libempathy/empathy-contact.c		    | 20 +++++++++----------
 6 files changed, 51 insertions(+), 46 deletions(-)

commit dfffa71d1d33714b331faaac367110716d56c72c
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Wed Dec 22 17:46:06 2010 -0800

    Adjust for FolksHasAvatar -> FolksAvatarOwner

    Helps bgo#637847.

 libempathy-gtk/empathy-ui-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8643ff0acdf20596dd233e93db6c83c6ba598d07
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Sun Jan 30 23:19:45 2011 +0200

    Updated Hebrew translation.

 po/he.po | 480
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 240 insertions(+), 240 deletions(-)

commit 25a552a5eda176c376ec3cce7ab85aaa1eda2f82
Author: Ivar Smolin <okul@linux.ee>
Date:	Sat Jan 29 23:01:41 2011 +0200

    [l10n] Updated Estonian translation

 po/et.po | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

commit 498a3e516c4ca9b8e02b283e81050d4cc8a6f04c
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Jan 28 19:38:23 2011 +0100

    Updated Spanish translation

 po/es.po | 487
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 243 insertions(+), 244 deletions(-)

commit 935d2f62ebc72edfe86ccf4449b7d95ef758bb74
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Jan 28 16:44:56 2011 +0000

    chat: save room passwords in the keyring if requested

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-chat.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit 2e70e2fef401bcbe38d9caf8281992be7d0f6413
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Jan 28 16:44:44 2011 +0000

    keyring: add set_room_password functions

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-keyring.c | 62
 ++++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-keyring.h |  7 +++++
 2 files changed, 69 insertions(+)

commit cfab69400457247ece6cd9baf1d49e70d7d9ce9b
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Jan 28 16:44:35 2011 +0000

    keyring: fix typo

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-keyring.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4da8f83072b0a08d892a093bfab836bda29e1266
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Jan 28 16:29:31 2011 +0000

    chat: try to use a room password from the keyring or offer to save
    the password

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-chat.c | 167
 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 159 insertions(+), 8 deletions(-)

commit 0bc660b874d8c04e22f7601dc5a3de428253d9c3
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Jan 28 16:29:12 2011 +0000

    keyring: add get_room_password_{async,finish} functions

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-keyring.c | 55
 ++++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-keyring.h |  7 ++++++
 2 files changed, 62 insertions(+)

commit 1cbcfd3eda00fa93d081ef37c609103d84663941
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Jan 28 16:28:58 2011 +0000

    keyring: add is_available function

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-keyring.c | 6 ++++++
 libempathy/empathy-keyring.h | 2 ++
 2 files changed, 8 insertions(+)

commit f829b8e42bd93a53067c06d8ea52de2ba2632938
Author: Marek Černocký <marek@manet.cz>
Date:	Fri Jan 28 16:24:42 2011 +0100

    Updated Czech translation

 po/cs.po | 307
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 155 insertions(+), 152 deletions(-)

commit a8e29279f323a5a1f4fc66a450a633b3415bea4d
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Jan 28 13:52:26 2011 +0000

    keyring: rename current functions to be more specifically about
    account passwords

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-account-settings.c	  | 16 +++++++--------
 libempathy/empathy-auth-factory.c	  |  4 ++--
 libempathy/empathy-keyring.c		  | 34
 +++++++++++++++++++-------------
 libempathy/empathy-keyring.h		  | 12 +++++------
 libempathy/empathy-server-sasl-handler.c |  8 ++++----
 5 files changed, 40 insertions(+), 34 deletions(-)

commit fe7c6ed34c96c0b57b0294ccebdab20dd0b702ba
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Jan 28 13:18:59 2011 +0000

    chat: add clear secondary icon to password entry

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-chat.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

commit 703d75010df79a51d0781fec8b30cd8588769c10
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Jan 28 13:13:04 2011 +0000

    chat: make the password entry grow

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-chat.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit f195c0248cff2258fadca246d94f114c0fa2d685
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Jan 28 11:31:38 2011 +0000

    chat: display a spinner when attempting a MUC password

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-chat.c | 130
 +++++++++++++++++++++++++++---------------
 1 file changed, 84 insertions(+), 46 deletions(-)

commit f8f82f5ce0aa87ac4bbde36ece2fb4d8fa2559eb
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Jan 27 19:04:55 2011 +0000

    Main window: mark Edit→Context as untranslatable.

    The label of this menu item is changed to either _("Contact") or
    _("Group"), depending on what's currently selected in the tree
    view. If
    neither a contact nor a group is selected, the item is hidden
    entirely.

    Thus, it should be safe not to translate this string.

    I haven't tested this. I just came across this when mpt pointed it out
    on the Twitter: <http://twitter.theinfo.org/30701150579720192>. His
    tweets suggest that he's found a way to make it show up in the UI,
    but I
    can't find any way to do that (either reading the code, or playing
    with
    the actual UI).

    https://bugzilla.gnome.org/show_bug.cgi?id=640751

 src/empathy-main-window.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 598dd64034b56c84463580f248f5b54dcda361f2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Thu Jan 27 23:37:46 2011 +0000

    Add Contact Search support

    https://bugzilla.gnome.org/show_bug.cgi?id=606947

 configure.ac					|   2 +-
 libempathy-gtk/Makefile.am			|   2 +
 libempathy-gtk/empathy-account-chooser.h	|   1 +
 libempathy-gtk/empathy-contact-search-dialog.c | 572
 +++++++++++++++++++++++++
 libempathy-gtk/empathy-contact-search-dialog.h |  58 +++
 src/empathy-main-window.c			|  11 +
 src/empathy-main-window.ui			|   8 +
 7 files changed, 653 insertions(+), 1 deletion(-)

commit e1f1a8556be4ec33ec496c58f9d466026641133f
Author: Yanko Kaneti <yaneti@declera.com>
Date:	Fri Jan 28 00:58:32 2011 +0200

    Remove EMPATHY_PREFS_ACCOUNTS_SCHEMA leftovers

 data/org.gnome.Empathy.gschema.xml.in | 1 -
 libempathy/empathy-gsettings.h        | 2 --
 2 files changed, 3 deletions(-)

commit 716d990b17c0d74ec255a2f5bfa258df3caca128
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Thu Jan 27 10:40:25 2011 +0200

    Updated Arabic translation

 po/ar.po | 1767
 ++++++++++++++++++++++++++------------------------------------
 1 file changed, 742 insertions(+), 1025 deletions(-)

commit d87e605b55a9c1f70c30b8a47d9ffd301364842a
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Thu Jan 27 00:00:53 2011 +0100

    QA of Galician translations

 po/gl.po | 214
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 106 insertions(+), 108 deletions(-)

commit 71e8203ac15682c88cd2313c16a2e793d90312ce
Merge: 1570d9b 08d9529
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 26 09:30:07 2011 +0100

    Merge branch 'presence-manager-640532'

commit 08d9529b553d70b3fb4b422f2453fc2247a15f20
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 25 12:25:12 2011 +0100

    use tp_g_signal_connect_object()

 libempathy/empathy-presence-manager.c | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

commit 273fee5fe68846380765235aae3d9761c349f50c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 25 12:21:48 2011 +0100

    presence-manager: add a dispose function and use tp_clear_*

 libempathy/empathy-presence-manager.c | 37
 ++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 14 deletions(-)

commit 1c3a8da098c9efdd7ece9c8375473f584a374aae
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 25 12:17:40 2011 +0100

    presence_manager_finalize: chain up

 libempathy/empathy-presence-manager.c | 2 ++
 1 file changed, 2 insertions(+)

commit 7e877988467139f1d2bee59a68f28436620d0a0f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 25 12:16:28 2011 +0100

    use the self->priv pattern rather than GET_PRIV()

 libempathy/empathy-presence-manager.c | 279
 +++++++++++++---------------------
 libempathy/empathy-presence-manager.h |   3 +-
 2 files changed, 111 insertions(+), 171 deletions(-)

commit 4c2cba97c84799564a7b0efb14bbff1f75b5c427
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 25 11:50:35 2011 +0100

    presence-manager: port to new coding style

 libempathy/empathy-presence-manager.c | 1048
 +++++++++++++++++----------------
 libempathy/empathy-presence-manager.h |   62 +-
 2 files changed, 570 insertions(+), 540 deletions(-)

commit c9f2cd4f71e619f5a418090981afebbef43226c1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 25 11:13:51 2011 +0100

    rename EmpathyIdle to EmpathyPresenceManager (#640532)

    It's doing more than idle management now.

 libempathy-gtk/empathy-presence-chooser.c |  22 +-
 libempathy-gtk/empathy-ui-utils.c	   |   1 -
 libempathy/Makefile.am			   |   4 +-
 libempathy/empathy-account-settings.c	   |  11 +-
 libempathy/empathy-idle.c		   | 732
 -----------------------------
 libempathy/empathy-idle.h		   |  74 ---
 libempathy/empathy-presence-manager.c	   | 733
 ++++++++++++++++++++++++++++++
 libempathy/empathy-presence-manager.h	   |  74 +++
 libempathy/empathy-utils.c		   |  10 +-
 src/empathy-chat.c			   |   8 +-
 src/empathy-event-manager.c		   |  10 +-
 src/empathy-main-window.c		   |   1 -
 src/empathy.c				   |  26 +-
 13 files changed, 854 insertions(+), 852 deletions(-)

commit 1570d9b4827b5e24540960564bb1c487d3f062ae
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 25 10:04:38 2011 +0100

    empathy-chat: disable file transfer for now

    It's broken so better disabling it than crashing (#637322).

 libempathy-gtk/empathy-chat.c | 1 -
 1 file changed, 1 deletion(-)

commit cfaa4c875c382545b06162854c286d1b5b3f0497
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 25 10:03:33 2011 +0100

    add EMPATHY_CONTACT_FEATURE_FT

 libempathy-gtk/empathy-chat.c	       | 1 +
 libempathy-gtk/empathy-contact-menu.c | 8 +++++---
 libempathy-gtk/empathy-contact-menu.h | 3 ++-
 src/empathy-map-view.c		       | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

commit 8b4a09ed7450b0b3d806d0996d174f911e4c3352
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:	Sat Jan 22 17:44:55 2011 -0500

    main-window: use line-wrap for "no match" label

    On narrow contact lists, the ellipsizing makes the "No match" message
    disappear, users are forced to resize the window to know what's
    hidden beyond
    the ….

    Wrapping takes advantage of all the vertical space available.

    Bug #640295

 src/empathy-main-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e64970236bda77f049d23c890a590bdab8414705
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Mon Jan 24 18:38:54 2011 +0100

    Updated Basque language

 po/eu.po | 208
 +++++++++++++++++++++++++++------------------------------------
 1 file changed, 88 insertions(+), 120 deletions(-)

commit a95eadd6866a511e5a8e2574156bf767a4361918
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 24 16:44:00 2011 +0100

    use action_camera_on when using the camera action items

    We just need one item of the action group to interact with the whole
    group, so
    best to use the one we already have.

 src/empathy-call-window.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

commit f18f2746690b0ceae80c3b362529decc112ca77f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 24 16:41:11 2011 +0100

    call-window: sync the sensitivity of the button and "send video"
    menu (#637839)

 src/empathy-call-window.c  | 5 +++++
 src/empathy-call-window.ui | 1 +
 2 files changed, 6 insertions(+)

commit 1cb2462f5793d99ad42decfbcc34bc22474ccbdc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 24 16:32:55 2011 +0100

    call-window: remove unused priv->action_camera_preview

 src/empathy-call-window.c | 2 --
 1 file changed, 2 deletions(-)

commit 6924c640f01c5ca55d1001ddc5c44a46d7baf948
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 12 13:09:28 2011 +0100

    chat-window: don't play sound for pending messages (#639302)

    They have already be notified by the Approver.

 src/empathy-chat-window.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit f8d4856794d8bf6ba951586fe2e196a00743c764
Merge: ce51e07 aade7b7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 24 15:35:50 2011 +0100

    Merge remote branch 'glassrose/remove-typing-icon-in-muc-tabs-609420'

commit aade7b7e2006666d2af51016e1090bce5855edaf
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Mon Jan 24 19:41:43 2011 +0530

    Do not display typing icon in MUC tabs

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=609420

 src/empathy-chat-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ce51e074a4b2bf286980cad803239bd5e96e749b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 24 13:39:15 2011 +0100

    account-widget-yahoo: remove server field (#634853)

 libempathy-gtk/empathy-account-widget-yahoo.ui | 36
 +++-----------------------
 libempathy-gtk/empathy-account-widget.c	|  1 -
 2 files changed, 4 insertions(+), 33 deletions(-)

commit c06e987f5bccc63f2cf54567850d36f59a51a5f6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 24 14:11:01 2011 +0100

    account-dialog: keep a proper weak ref on setting_widget_object

    This prevent us of trying to use it after it has been disposed. For
    example,
    when switching to an Haze account, we have to wait that the
    EmpathyAccountSettings is ready before getting the new
    setting_widget_object
    but we can't try using the old one while waiting (#640411).

 src/empathy-accounts-dialog.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

commit 760fc904f7b1cb1df34bcee3cfbb57291ccc811c
Author: Vitaly Minko <vitaly.minko@gmail.com>
Date:	Tue Nov 2 21:51:28 2010 +0300

    Add calendar to the contact widget in order to simplify birthday
    selection (#631101).

 libempathy-gtk/empathy-contact-widget.c | 72
 ++++++++++++++++++++++++++++-----
 1 file changed, 63 insertions(+), 9 deletions(-)

commit 97b44882aafe0b900433cce84b72eea2d542e875
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Fri Jan 21 10:14:30 2011 +0100

    [l10n] Updated German translation

 po/de.po | 1372
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 755 insertions(+), 617 deletions(-)

commit e7500dd3bb047233c7a66523f16330e9279ee9ce
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Thu Jan 20 23:58:26 2011 +0100

    Updated Basque language

 po/eu.po | 1536
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 838 insertions(+), 698 deletions(-)

commit 1c78ba6bdffcf3ad90ac7c634b2ac62c2a275f92
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Thu Jan 20 23:27:41 2011 +0300

    Updated Russian translation

 po/ru.po | 1442
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 790 insertions(+), 652 deletions(-)

commit 73215d93ed358d8aa257efb9822dafe9f82e0f3e
Author: Marek Černocký <marek@manet.cz>
Date:	Wed Jan 19 20:28:58 2011 +0100

    Updated Czech translation

 po/cs.po | 1383
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 746 insertions(+), 637 deletions(-)

commit dbb95ed92ec1acc6d6bbf7b4a1dbcaf931070e4f
Merge: 8eb3671 1acf899
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 18 16:12:40 2011 +0100

    Merge remote branch
    'glassrose/Display-typing-icon-in-muc-contacts-list-609419'

commit 8eb3671bdebf2b31323d8ad26a0e89f9907cb828
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 18 16:09:53 2011 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5685283601ab2b184797c569eaa1bf3c49ad1812
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 18 15:45:59 2011 +0100

    prepare 2.91.5.1

 NEWS	      | 18 ++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 20 insertions(+), 2 deletions(-)

commit 1acf8998707505a367ef27e04730907b56408b3d
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Sun Jan 16 20:19:49 2011 +0530

    Display typing icon in MUC contact-list

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=609419

 libempathy-gtk/empathy-contact-list-store.c | 60
 ++++++++++++++++++++++++++++-
 libempathy/empathy-tp-chat.c		     |	9 +++++
 libempathy/empathy-tp-chat.h		     |	3 ++
 src/empathy-chat-manager.c		     |	4 +-
 4 files changed, 74 insertions(+), 2 deletions(-)

commit e09aaef167833f45492fa2df70f7d4563a5d9b66
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Jan 18 07:20:38 2011 +0000

    Empathy.Auth.client: fix handling and observing SASL channels

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 data/Empathy.Auth.client | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 59a145f0076fd39b5ff624e936dbe3d4dbc49d5b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 14 09:53:04 2011 +0100

    Improve connected/disconnected notifications (#639352)

 src/empathy-event-manager.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit 8f96f1f11ae5f8407127d5438e75c67426ec6368
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	Thu Jan 13 20:40:52 2011 +0100

    Updated Slovenian translation

 po/sl.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 03bb22ef948638473e71839d149101e63c926d96
Author: Michael Kotsarinis <mk73628@gmail.com>
Date:	Thu Jan 13 12:34:54 2011 +0200

    Updated Greek translation

 po/el.po | 1384
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 760 insertions(+), 624 deletions(-)

commit 876df65bb9a150cffcd67f22ade017d3dd7fcb6a
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Wed Jan 12 16:58:27 2011 +0530

    Chat command nick modified to use RequestRename instead of SetAliases

 libempathy-gtk/empathy-chat.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

commit 3de1ceb50c21c2ccc34bf44cd2b6abec3853239b
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Wed Jan 12 14:31:34 2011 +0530

    Allow /nick command only in chatrooms that support nick renaming

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=638766

 libempathy-gtk/empathy-chat.c | 57
 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 43 insertions(+), 14 deletions(-)

commit dc2525a1840bd029dd79709cdbe0de3a3cad7d37
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Thu Jan 6 01:44:23 2011 +0530

    Added Connection.Interface.Renaming to /extensions

 extensions/Connection_Interface_Renaming.xml | 98
 ++++++++++++++++++++++++++++
 extensions/Makefile.am			      |  1 +
 extensions/misc.xml			      |  1 +
 3 files changed, 100 insertions(+)

commit 4a8f54fdba23d9addb4d6c014423bc3f2619aafd
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Wed Jan 12 12:59:45 2011 +0100

    Updated Hungarian translation

 po/hu.po | 1373
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 739 insertions(+), 634 deletions(-)

commit 81a3d8288500cd4a2fd94cf562e6aaf9f5e031e0
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Wed Jan 12 11:31:54 2011 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 113
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 56 insertions(+), 57 deletions(-)

commit 983bdf7866b88fd9585197671d99a748a8683055
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 11 15:33:30 2011 +0100

    account-chooser: setup the combobox once the object has been
    constructed (#639214)

    See bgo #639139 for details, but basically that's because the
    cell_area is now
    created in a constructor instead of an init function.

 libempathy-gtk/empathy-account-chooser.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

commit c4a806bea01fcb3862ab43e88eede77fca1ce7e0
Author: Kushal Das <kushal@fedoraproject.org>
Date:	Tue Jan 11 17:49:18 2011 +0530

    Pressing F2 opens the Edit Contact Information window for #586257

 libempathy-gtk/empathy-individual-view.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

commit 2392932b2eed456f7d5b39d0a9eb839194dfb0e1
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jan 10 17:12:47 2011 +0000

    Don't use deprecated gdk_app_launch_context_new()

 libempathy-gtk/empathy-account-widget.c | 6 +++---
 src/empathy-accounts-dialog.c		 | 5 +++--
 src/empathy-main-window.c		 | 8 +++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

commit 41274d6973eef4628c1a1e26c281b703ecf8f980
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jan 10 16:38:16 2011 +0000

    Connect to style-updated signal

    ... instead of to the deprecated style-set one.

 src/empathy-chat-window.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit 4dab5e45e10c4aa8d305a7cc5be62cee243f029b
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jan 10 16:23:25 2011 +0000

    Don't use deprecated gtk_widget_get_style()

 src/empathy-chat-window.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 05047bfdd596bf6010d09f9409ff13a74190ed4c
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jan 10 15:03:44 2011 +0000

    Don't use deprecated gdk_keyboard_grab/ungrab

 libempathy-gtk/empathy-password-dialog.c | 35
 ++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

commit 0ffc53acc1c6993100c08e85180a10daf817556b
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jan 10 12:27:00 2011 +0000

    Port to GtkStyleContext

 configure.ac				     |	2 +-
 libempathy-gtk/empathy-cell-renderer-text.c | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

commit d7ef6ba2bb7daf43b5b05a25f314618a50710832
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Jan 10 11:32:44 2011 +0000

    Don't use deprecated gtk_paint_expander()

 libempathy-gtk/empathy-cell-renderer-expander.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

commit 9b16b39e05f3f9428605d93f0e1e277660442117
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 10 18:57:14 2011 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8103d9d64d3fa440921ae58f05d9c42aed0fc5ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 10 15:57:13 2011 +0100

    prepare 2.91.5

 NEWS	      | 23 +++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)

commit 4fb31c94452dfb42dc7a83ee3f864daabbe60f48
Author: Kushal Das <kushal@fedoraproject.org>
Date:	Mon Jan 10 18:46:06 2011 +0530

    Patch to transfer window to allow opening file with double clicks
    for #637195

 src/empathy-ft-manager.c | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

commit 363c9bdf35a11cde6ba7a0da3bc2cb7fcdb7a1b6
Merge: d5f5cfa 98b73f3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 10 11:02:02 2011 +0100

    Merge remote branch
    'glassrose/accounts-supporting-chatrooms-only-603027'

commit d5f5cfab4704fad9fad29a1e69a230645f0a4aa5
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sun Jan 9 00:34:19 2011 +0100

    Updated Galician translations

 po/gl.po | 400
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 220 insertions(+), 180 deletions(-)

commit 98b73f3620f3b2f94e7d2ce3cfd2cd07cc637d13
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Mon Jan 3 21:25:43 2011 +0530

    Skip accounts which don't support rooms in "Manage Favorites" dialog

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=603027

 libempathy-gtk/empathy-account-chooser.c | 71
 ++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-account-chooser.h |  4 ++
 src/empathy-chatrooms-window.c		  |  2 +-
 src/empathy-new-chatroom-dialog.c	  | 71
 +-------------------------------
 4 files changed, 77 insertions(+), 71 deletions(-)

commit 9e70e42316ad1970c4508404baa86c69c81575b0
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sun Jan 2 18:32:26 2011 +0100

    Updated Norwegian bokmål translation from Torstein Adolf Winterseth

 po/nb.po | 156
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 87 insertions(+), 69 deletions(-)

commit 4c19864b900fb571ce6db077812d3422a23df5db
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Fri Dec 31 10:52:51 2010 +0200

    [l10n] Updated Estonian translation

 po/et.po | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit aa3df0b40d88a51f972f1c635b01402ad56a7946
Author: Daniel Nylander <po@danielnylander.se>
Date:	Wed Dec 29 18:18:19 2010 +0100

    Updated Swedish translation

 po/sv.po | 1504
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 810 insertions(+), 694 deletions(-)

commit 2404d3b7b273d4af4af02b3c0515421d31962046
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Dec 26 19:29:59 2010 +0100

    Remove the chats_new_msg list from EmpathyChatWindow

 src/empathy-chat-window.c | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

commit d471250122f68adba8625fbc719614f927fa4103
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Dec 26 19:22:04 2010 +0100

    Remove the composing list

 libempathy-gtk/empathy-chat.c |  7 +++++++
 libempathy-gtk/empathy-chat.h |  2 ++
 src/empathy-chat-window.c     | 17 ++---------------
 3 files changed, 11 insertions(+), 15 deletions(-)

commit f49b34ee571c0894ab4e85af27479c288b0560c1
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Dec 26 14:50:11 2010 +0100

    Highlight both the tab and the menu label

 src/empathy-chat-window.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 048bf784409bd5c40705e4169793b0951c709264
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Dec 27 14:55:56 2010 +0100

    Fix lines > 80 chars

 src/empathy-accounts-dialog.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit fff4889260ab902aeb409273e41c6f4c5078310c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Dec 27 14:55:19 2010 +0100

    Prevent potential freeing of unitialized data

 src/empathy-accounts-dialog.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 53a5a7f37188ffaf3e050c5ad2e0852095a85c4b
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Dec 25 20:47:24 2010 +0100

    Simplify filter adding code by just using gdk_x11 functions instead
    of hoops

 libempathy-gtk/empathy-avatar-image.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

commit bfb7a859f932c540c4695ba5489ab135506e8494
Author: David Laban <david.laban@collabora.co.uk>
Date:	Mon Dec 20 15:46:36 2010 +0000

    Also turn off Access Unit Delimiters (aud)

    AUDs are *completely* pointless in RTP and just waste packets/confuse
    people.

 data/element-properties | 1 +
 1 file changed, 1 insertion(+)

commit a8bbe125863cee9c8a857562f99899f800e96cdf
Author: A S Alam <aalam@users.sf.net>
Date:	Wed Dec 29 07:36:25 2010 +0530

    update Punjabi Translation

 po/pa.po | 686
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 375 insertions(+), 311 deletions(-)

commit 92ca9d1a3c9fbe40b9f2d22d7377075e23cbecab
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Tue Dec 28 23:30:37 2010 +0100

    Updated Slovenian translation

 po/sl.po | 396
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 217 insertions(+), 179 deletions(-)

commit c6b58a76e119e7c5a9b57f5e216e72c000268165
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Sun Dec 26 19:55:05 2010 +0200

    Updated Hebrew translation.

 po/he.po | 69
 ++++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 39 insertions(+), 30 deletions(-)

commit 3becee6fc229553a28149c9ebde7b14a775d6850
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Dec 24 18:15:01 2010 +0100

    Updated Spanish translation

 po/es.po | 79
 +++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 43 insertions(+), 36 deletions(-)

commit 72a3058937bee67024b9bf87ff50f73409109c63
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Fri Dec 24 09:32:35 2010 -0600

    libempathy: Fix free of uninitialized variables.

    When a pinned certificate is present, these don't get initialized.

 libempathy/empathy-tls-verifier.c | 3 +++
 1 file changed, 3 insertions(+)

commit 36c700d49ac25f40e7ce47784fdf199c17ae8261
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Mon Dec 13 20:34:56 2010 +0000

    libempathy: Store pinned certificate for end entity cert in the chain.

    https://bugzilla.gnome.org/show_bug.cgi?id=636258

 libempathy/empathy-tls-verifier.c | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

commit 00da7eadfe0ed7c4d080cc1ee076302c37ec0f7b
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Mon Dec 13 20:25:38 2010 +0000

    tests: Fix memory leak of dbus connection

    https://bugzilla.gnome.org/show_bug.cgi?id=636258#c3

 tests/empathy-tls-test.c | 3 +++
 1 file changed, 3 insertions(+)

commit f1bc5efbef341a2af2ebf0f9fc3f687503fe7e07
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Mon Dec 13 20:25:08 2010 +0000

    libempathy: Fix memory leaks and use consistent naming for various
    arrays.

    https://bugzilla.gnome.org/show_bug.cgi?id=636258#c3

 libempathy/empathy-tls-verifier.c | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

commit de7d7bf967502778c927d80121e4aaf0a52a7461
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Mon Dec 13 17:46:03 2010 +0000

    libempathy: Fix leak of certificate data.

    https://bugzilla.gnome.org/show_bug.cgi?id=636258#c3

 libempathy/empathy-tls-verifier.c | 1 +
 1 file changed, 1 insertion(+)

commit 14baa8d05d72d94431b3422bf455835bd065707e
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Mon Dec 13 17:42:15 2010 +0000

    libempathy, tests: Wrap new function arguments properly.

    https://bugzilla.gnome.org/show_bug.cgi?id=636258#c3

 libempathy/empathy-tls-verifier.c | 16 +++++++++++-----
 tests/empathy-tls-test.c	   | 35
 ++++++++++++++++++++++++-----------
 2 files changed, 35 insertions(+), 16 deletions(-)

commit c9562e1613eac9ded3a3e211dbd2e5420a46602b
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Sat Dec 11 03:31:01 2010 +0000

    tests: Lookup the pkcs11 standalone directory at run time.

    Rather than cluttering up configure, lookup the relevant
    directory at runtime.

 configure.ac		  |  6 ------
 tests/Makefile.am	  |  1 -
 tests/empathy-tls-test.c | 21 ++++++++++++++++++++-
 3 files changed, 20 insertions(+), 8 deletions(-)

commit e694852b60dd75c8fe25d167672ca647006a5e8d
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Sat Dec 11 03:16:16 2010 +0000

    libempathy: Match changes in libgcr terminology and debug output.

    Add debug output for certificate chain, and fix up for some changes
    in libgcr terminology.

 libempathy/empathy-tls-verifier.c | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

commit ad51bca6104dc154fd1fdc3b177f160c8f05cd34
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Fri Dec 10 23:04:52 2010 +0000

    libempathy: Use new certificate chain facilities in libgcr

    Build the chain with new GcrCertificateChain and then use gnutls
    to verify it.

 libempathy/empathy-tls-verifier.c | 291
 ++++++++++++++------------------------
 1 file changed, 103 insertions(+), 188 deletions(-)

commit 02798920bfc26c86f0b4fb356f5635c3a20f203c
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Fri Dec 10 04:25:13 2010 +0000

    test: Add tests which load PKCS#11 modules for TLS verification.

    Add various tests which load gnome-keyring PKCS#11 modules and
    use them in the TLS verification. These are the standalone
    versions of the builtin gnome-keyring PKCS#11 modules.

 configure.ac					  |   6 +
 tests/Makefile.am				  |   2 +
 tests/certificates/collabora-ca/collabora-ca.cer | Bin 0 -> 1536 bytes
 tests/empathy-tls-test.c			  | 279
 +++++++++++++++++++----
 4 files changed, 242 insertions(+), 45 deletions(-)

commit eb0e10eba858ed194ec5a6bb63670ed80245a76b
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Fri Dec 10 03:48:13 2010 +0000

    libempathy: Complete successful verification properly.

    Complete TLS verification properly in TLS verifier.

 libempathy/empathy-tls-verifier.c | 1 +
 1 file changed, 1 insertion(+)

commit 430516c8f22e26821a22868621e59ec201d6a805
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Thu Dec 9 22:14:38 2010 +0000

    tests: Add test for basic verification.

    This test depends on the certificates you have in gnome-keyring,
    will fix this dependency in later commits.

 tests/empathy-tls-test.c | 60
 +++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 47 insertions(+), 13 deletions(-)

commit d6cacab44d2c134688c79be7d62ab4307ce7f527
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Thu Dec 9 22:14:19 2010 +0000

    libempathy: Fix reference counting of certs in verifier.

 libempathy/empathy-tls-verifier.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 34934197b7a1fb237c810c6de1aa498b4abbbc53
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Thu Dec 9 21:51:28 2010 +0000

    tests: Add mock object and test infrastructure for testing tls.

    Create a mock o.f.T.Authentication.TLSCertificate object and connect
    to it in various tests.

    Loads certificate data from certificates/ subdir

 tests/.gitignore			  |   1 +
 tests/Makefile.am			  |   6 +-
 tests/certificates/dhansak-collabora.cer | Bin 0 -> 1200 bytes
 tests/empathy-tls-test.c		  | 356
 +++++++++++++++++++++++++++++++
 4 files changed, 362 insertions(+), 1 deletion(-)

commit 636f502149f77a80ef1b79cfc6d2da4b20c6ec7c
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Mon Dec 6 22:47:13 2010 +0000

    libempathy: Use new gcr functions properly and fix build.

    libgcr now uses single header include model.

 libempathy/empathy-tls-verifier.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

commit 59384754d15dc9340466dbb69ad615ffc76ffb6a
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Thu Dec 2 19:55:54 2010 +0000

    libempathy: Load complete certificate chain even when not sent.

    Even when a complete certificate chain is not sent by the remote
    host, we can load a complete certificate chain based on the local
    certificates.

 libempathy/empathy-tls-verifier.c | 186
 +++++++++++++++++++++++++++-----------
 1 file changed, 133 insertions(+), 53 deletions(-)

commit edc69d9089b2d49570fa0644a4ef4f223c64550e
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Thu Dec 2 18:10:14 2010 +0000

    configure: Remove option to specify system certificates.

    These are now handled by gnome-keyring through libgcr.

 configure.ac | 33 ---------------------------------
 1 file changed, 33 deletions(-)

commit 8d72b18028c35d887c2352e3f08aacd9b7096f4c
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Thu Dec 2 18:08:51 2010 +0000

    libempathy: Store certificate exceptions in gnome-keyring.

    Use libgcr to store certificate trust exceptions properly.

 libempathy/empathy-tls-certificate.c | 127
 -----------------------------------
 libempathy/empathy-tls-certificate.h |   2 -
 libempathy/empathy-tls-verifier.c    |  21 ++++++
 libempathy/empathy-tls-verifier.h    |   2 +
 src/empathy-auth-client.c	      |  14 ++--
 5 files changed, 33 insertions(+), 133 deletions(-)

commit c55c9a4dd8848f7257794dc9fc8f8138f1b47f43
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Thu Dec 2 17:46:47 2010 +0000

    libempathy: Use trust assertions instead of certificate directories.

    Initial implementation.

 libempathy/Makefile.am		   |   2 +
 libempathy/empathy-tls-verifier.c | 460
 ++++++++++----------------------------
 src/Makefile.am		   |   1 +
 3 files changed, 125 insertions(+), 338 deletions(-)

commit 0b44641cdd6fec4abe8c8ee96d6bdbe84db944da
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 24 11:57:03 2010 +0100

    prepare 2.91.4.3

 NEWS	      | 16 ++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

commit 23cabd47964ba2d692018dbf8f8b2e87f208254b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 24 11:51:24 2010 +0100

    Depends on gcr 2.91.4

    We need it as we don't ship our own version of gcr-simple-certificate
    any
    more. I'm not sure we still need depending on gnome-keyring itself,
    I'll check
    with Stef; but for now I just want to make a release usable by
    the release
    team.

 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 8f4bd49edcf38951072b9f12ce50ba9aaddac83d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 24 11:42:57 2010 +0100

    just include gcr.h

 libempathy-gtk/empathy-tls-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 89ed5197c3cf61971b8425b176ce71073add7360
Author: Stef Walter <stefw@collabora.co.uk>
Date:	Thu Dec 2 17:21:38 2010 +0000

    libempathy-gtk: No need to 'egg' gcr-simple-certificate.[ch]

    These are now properly distributed by libgcr.

 libempathy-gtk/Makefile.am		 |   1 -
 libempathy-gtk/empathy-tls-dialog.c	 |   2 +-
 libempathy-gtk/gcr-simple-certificate.c | 134
 --------------------------------
 libempathy-gtk/gcr-simple-certificate.h |  61 ---------------
 4 files changed, 1 insertion(+), 197 deletions(-)

commit dfc08c3feee35e194fdb58441752ea82f79c166a
Merge: b55050d 083af6c
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Dec 24 17:04:05 2010 +1100

    Merge remote branch 'glassrose/enable-disable-accounts-popup-609568'

commit 083af6c8057407a6b7895020339d19a3eb7257c7
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Sat Dec 18 01:52:12 2010 +0530

    Popup menu feature to quickly enable/disable an account.

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=609568

 src/empathy-accounts-dialog.c | 95
 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)

commit b55050dbfb73d4f724d5b04fd4ddeff21e4f7685
Author: Gheyret T.Kenji <gheyret@gmail.com>
Date:	Thu Dec 23 18:32:01 2010 +0100

    Added UG translation

 po/ug.po | 831
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 439 insertions(+), 392 deletions(-)

commit 6d801f75006f2cf60c17f0f3abd0f3ba26638702
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 23 16:12:09 2010 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6d722a39df3e480da2d500e47d754e0f9262893a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 23 16:01:51 2010 +0100

    prepare 2.91.4.2

 NEWS	      | 5 +++++
 configure.ac | 2 +-
 release.py   | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

commit bc624045f0a4f4b1182efb3c6ec63c0de5a67c13
Merge: 307a2f3 c5a0441
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 23 15:59:14 2010 +0100

    Merge branch 'release.py'

commit 307a2f30b5a426ef97d7f566d3970d48e9a9613d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Dec 23 15:53:27 2010 +0100

    Fix build warnings for uninitialized variables

 libempathy-gtk/empathy-account-widget.c | 2 +-
 src/empathy-accounts-dialog.c		 | 2 +-
 src/empathy-main-window.c		 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit c5a04417666fa66dcf5502dd1a9f39ed15db1227
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 23 15:43:36 2010 +0100

    prepare 2.91.4.1

 NEWS	      | 11 +++++++++++
 configure.ac |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

commit fdcf1b26fd44a44c0dfe882f19ec2782cccd542c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 23 14:17:14 2010 +0100

    account-widget: use g_app_info_launch() instead of
    gdk_spawn_on_screen() (#637854)

 libempathy-gtk/empathy-account-widget.c | 44
 ++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 14 deletions(-)

commit 8cf5f1c4f4224bc8863ab498c4d89082db6ceb7b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 23 13:36:50 2010 +0100

    main-window: use g_app_info_launch() instead of gdk_spawn_on_screen()
    (#637854)

 src/empathy-main-window.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

commit a5c7ff32a6f9672ca78a4aca5a4dcf7554fc24f1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 23 13:31:01 2010 +0100

    accounts-dialog: use g_app_info_launch() instead of
    gdk_spawn_on_screen() (#637854)

 src/empathy-accounts-dialog.c | 39
 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

commit 23a647a3dcb0109aadcb9a3f40d788754cd48767
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 23 11:39:03 2010 +0100

    gdk_xid_table_lookup has been deprecated (#637855)

 libempathy-gtk/empathy-avatar-image.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 1968b5ac26a4e2dac0220cb3203def2854de095d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 22 14:14:47 2010 +0100

    Don't display any contact menu for muc chats

    It's confusing to have it in muc, even if a contact is selected. And
    we can
    still interact with the contact by right clicking on it if needed.

 libempathy-gtk/empathy-chat.c | 6 ------
 1 file changed, 6 deletions(-)

commit 432d3afbd187bc771a7b5577f3abb64ff39c8693
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 22 14:12:49 2010 +0100

    chat-window: unsensitive the Contact menu if there is no submenu
    (#637799)

 src/empathy-chat-window.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 555c78e00939cf1ce2a4f410e231b0271b654ed0
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 22 12:08:08 2010 +0000

    account-settings: only remove the MC password param if set in the
    keyring OK

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-account-settings.c | 42
 +++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 12 deletions(-)

commit e6172665de111c2b32d6f16679add6f581c66a02
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 22 11:58:38 2010 +0000

    account-settings: use tp_account_get_path_suffix

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-account-settings.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

commit 9f3eabf31f324237fd99fca8762a04bc98cd7630
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 22 11:57:38 2010 +0000

    account-settings: add a comment saying what to remove when purging
    migration code

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-account-settings.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit ae173323b5bc489f03fda053584dbcfe212836a2
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 22 11:56:20 2010 +0000

    account-settings: move the migration code to another function

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-account-settings.c | 99
 +++++++++++++++++++----------------
 1 file changed, 54 insertions(+), 45 deletions(-)

commit f2e6bb42906ad6cd5e11ee61fab64d3d2e7e879a
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 22 11:49:47 2010 +0000

    account-settings: migrate passwords from MC to gk ourselves

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-account-settings.c | 47
 +++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

commit 218a0c003b0528423164b1670daf33ec360acd20
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 21 11:15:59 2010 +0100

    disable maintainer mode for now

 configure.ac | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 940bae9cc720a0c2f0284b2a900926637a1f760c
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Dec 21 10:05:39 2010 +0100

    Fix build warning

 libempathy-gtk/empathy-contact-list-view.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 1a9c70712750f38e10520b37e9452d75a55a45e9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 20 16:57:38 2010 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e2637fcafa862b69129027d9d79374b4309abe47
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 20 16:42:17 2010 +0100

    prepare 2.91.4 release

 NEWS	      | 25 +++++++++++++++++++++++++
 configure.ac |  6 +++---
 2 files changed, 28 insertions(+), 3 deletions(-)

commit 385cc631f856d933724aa5c726dfd956fc28bed0
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Dec 20 15:22:30 2010 +0000

    Turn off sliced-threads, some implementations have problems with
    decoding it

 data/element-properties | 1 +
 1 file changed, 1 insertion(+)

commit 0cefa514f4e3be2572576acc017219991328ec61
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Mon Dec 20 14:13:30 2010 +0200

    [l10n] Updated Estonian translation

 po/et.po | 96
 ++++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 64 insertions(+), 32 deletions(-)

commit 98cdd44dfc25ca3424924fbaffaf131d0a65cf19
Author: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>
Date:	Sun Dec 19 14:26:49 2010 +0100

    Updated Esperanto translation

 po/eo.po | 2467
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 1505 insertions(+), 962 deletions(-)

commit cd1ac335ab5c0a76ee0b1a2148a0997be91a0ea1
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Sun Dec 19 01:00:22 2010 +0200

    Updated Hebrew translation.

 po/he.po | 249
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 136 insertions(+), 113 deletions(-)

commit 1a864c32e5c194f3ee07e5fa4874e97cbb0f5900
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Sat Dec 18 09:50:13 2010 +0100

    Updated Spanish Translation

 po/es.po | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

commit bcccb4db182e39ab9fed47f83fe90acae4bd1ef6
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Fri Dec 17 13:18:20 2010 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 360
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 194 insertions(+), 166 deletions(-)

commit 0bc496f9399912f0ed4f73aa55a335a340246d3b
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Dec 17 10:05:00 2010 +0000

    password-dialog: make OK insensitive unless there's a password set

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-password-dialog.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

commit e007679385406659e5653f3b80d566c1d964535e
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Dec 17 10:05:55 2010 +0000

    Make empathy-persona-view include empathy-ui-utils

 libempathy-gtk/empathy-persona-view.c | 1 +
 1 file changed, 1 insertion(+)

commit a482e027803c3f83dfb02f113d3bd5e15e22588c
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Wed Dec 15 22:09:31 2010 +0100

    Updated Spanish translation

 po/es.po | 372
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 206 insertions(+), 166 deletions(-)

commit 119cc5f2451bac0ef8eec82a8ea746846327be0b
Merge: d55a1e7 b10823a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 15 17:01:37 2010 +0100

    Merge branch 'gtk-style-636654'

commit b10823a453d7189c1b3515a8bd075a91d91e796b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 15 16:56:32 2010 +0100

    depends on GTK+ 2.91.6 as we use the new style API

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 91aa125dff5bbd4e967aa4cbec4892b4158c2f5b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 15 16:50:52 2010 +0100

    remove useless paranthesis

 libempathy-gtk/empathy-ui-utils.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 30f5f6ea4a935eaa5d68f9d68998bee4b5d1bcbb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 15 14:55:29 2010 +0100

    persona-view: use new GTK+ style API (#636500)

 libempathy-gtk/empathy-persona-view.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

commit 4b9243dc87b1e8659c3349d54c0f86b77c677876
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 15 14:53:11 2010 +0100

    individual-view: use new GTK+ style API (#636500)

 libempathy-gtk/empathy-individual-view.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

commit f77a1b3b6b3ffa4b47cf2e3cfab2f25f8383a3c1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 15 14:46:24 2010 +0100

    contact-list-view: use new GTK+ style API (#636500)

 libempathy-gtk/empathy-contact-list-view.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

commit 676e1f544d851935cb2dc7781f4a5ff39c366b2f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 15 14:43:31 2010 +0100

    factor out empathy_make_color_whiter()

 libempathy-gtk/empathy-account-widget.c |  5 +----
 libempathy-gtk/empathy-ui-utils.c	 | 10 ++++++++++
 libempathy-gtk/empathy-ui-utils.h	 |  3 +++
 3 files changed, 14 insertions(+), 4 deletions(-)

commit 46f7d3a0152fd23d15c707d851e9b1889fc512f0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 15 14:28:19 2010 +0100

    account-widget: use new GTK+ style API (#636500)

 libempathy-gtk/empathy-account-widget.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

commit 554b78890fd7c8c2b392c335ab3f49c7bc756b8a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 7 09:53:48 2010 +0100

    status-preset-dialog: use new GTK+ style API (#636500)

 libempathy-gtk/empathy-status-preset-dialog.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 3951d3a3c1a7181bee75cc963711ea1900949c02
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 7 09:52:40 2010 +0100

    chat-text-view: use new GTK+ style API (#636500)

 libempathy-gtk/empathy-chat-text-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 06637c4ad0fcc8765c2388f9264db7b49b260eaa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 6 15:08:29 2010 +0100

    video-widget: use new GTK+ style API (#636500)

 libempathy-gtk/empathy-video-widget.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit d55a1e75859e5aea911d2483fac21de714514163
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 15 15:57:52 2010 +0100

    use tp_account_get_path_suffix()

 src/empathy-accounts-dialog.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit f6f81b5b1c229e7f2e1806519ae065675d5ec183
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 15 15:57:41 2010 +0100

    show the account UI even if the selected account doesn't exist

 src/empathy-accounts.c | 2 ++
 1 file changed, 2 insertions(+)

commit a1aab6e03da2d2e031ebf1c0f65f30dc967bd8eb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 15 15:52:36 2010 +0100

    always set account_manager_prepared

 src/empathy-accounts.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 07c1e70246e3d01ccc1000e8bf624ad039b063a6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 15 15:49:08 2010 +0100

    get the value of selected_account_name in the callback (#637307)

    There is no point to pass it as user_data as selected_account_name
    is global
    and it's not defined yet when calling
    tp_account_manager_prepare_async() as
    the GApplication has not be prepared yet.

 src/empathy-accounts.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit 79d91365e3f7d986d28441ad072567bd72b9c776
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 15 15:34:35 2010 +0100

    empathy-accounts: no need to get argv, we don't use it

 src/empathy-accounts.c | 7 -------
 1 file changed, 7 deletions(-)

commit 86aa1501e7a76b92ba402dddc4ce85d403c609bf
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 15 13:57:02 2010 +0000

    password-dialog: destroy the dialog if the handler is invalidated

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-password-dialog.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit 275aa2505465bd2f1c5cf02427219a6ae54dfe93
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 15 09:17:15 2010 +0000

    keyring: change display name for passwords to be more human-readable

    Apparently people complained that when they opened seahorse to look at
    their passwords they were greeted by nice display names for keys for
    wireless networks saved by NetworkManager, and ugly keys for secret
    parameters saved by mission-control. Let's fix this now then and shut
    these people up.

    gnome-keyring finds passwords on the parameters set in the schema, so
    the display name really is only to show in seahorse. We can set
    anything we want here.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-keyring.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit e63548aeb4d170976beea77c299a3575287ca048
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 15 09:10:56 2010 +0000

    server-sasl-handler: add more debugging and only call Close in
    Status_Succeeded

    Calling Close() straight after AcceptSASL() should be fine, but it
    crashed gabble on versions < 0.11.4. Waiting for State_Accepted is
    fine though.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-server-sasl-handler.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 2ec9b6e89141999f919f8a3bd4a44fd8abad86ff
Merge: 2e38a9c 225ca2e
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 15 08:56:03 2010 +0000

    Merge branch 'sasl-gui'

commit 225ca2e12b053a6c8ece18179d470f01ed1d6fb7
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Dec 14 16:38:48 2010 +0000

    main-window: s/Cancel/Disconnect/ when not giving a password

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-main-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 01e02a165d271a155a4af0e79dd94c210b584cfa
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Dec 14 16:38:19 2010 +0000

    main-window: don't use _full functions where not necessary

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-main-window.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 932835ccd42c55d77017d6ffc77773db40385a27
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Dec 14 16:37:18 2010 +0000

    main-window: document what the key and value types are for hash tables

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-main-window.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 05e14d747fd88a260996c406a938a1bfdfbaca8f
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Dec 14 16:33:46 2010 +0000

    event-manager: use tp_clear_object

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-event-manager.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

commit 483c580a8b6aa2c0b4205e3cb2c674e80abe5ba7
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Dec 14 16:31:57 2010 +0000

    auth-factory: add a comment as to why we're also an approver

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-auth-factory.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 6093afb467c0c2ae855d8635d9a10e9bc5f072c4
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Dec 14 16:30:41 2010 +0000

    account-settings: use tp_clear_object in dispose

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-account-settings.c | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

commit 2e38a9c56cdac919f424107928dbbf35d69a41ed
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 14 16:43:03 2010 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1cf1fc435c4ce08b4d2c5085d1432066a95bcde8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 14 16:04:51 2010 +0100

    prepare 2.91.3.1

 NEWS	      | 40 ++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 42 insertions(+), 2 deletions(-)

commit 814dfdd0924a7f0a216b0afbde16b5f114fd89b3
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Mon Dec 13 23:47:01 2010 +0200

    Updated Hebrew translation.

 po/he.po | 139
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 74 insertions(+), 65 deletions(-)

commit c6371ec63c928c848cbb5474cb005af5cc414230
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Sun Dec 12 18:51:07 2010 +0000

    Bug 637097 — Port to latest folks API changes

    Catch up with three interface renamings which have happened in
    folks master.
    This bumps Empathy's folks dependency to 0.3.3. Closes: bgo#637097

 configure.ac				    |  2 +-
 libempathy-gtk/empathy-contact-widget.c    | 10 +++++-----
 libempathy-gtk/empathy-individual-menu.c   |  4 ++--
 libempathy-gtk/empathy-individual-store.c  | 27
 +++++++++++++++------------
 libempathy-gtk/empathy-individual-view.c   |  6 +++---
 libempathy-gtk/empathy-individual-widget.c | 29
 +++++++++++++++++------------
 libempathy-gtk/empathy-persona-store.c     | 12 +++++++-----
 libempathy-gtk/empathy-ui-utils.c	    |  6 ++++--
 libempathy/empathy-contact.c		    | 20 ++++++++++++--------
 libempathy/empathy-individual-manager.c    |  4 ++--
 10 files changed, 68 insertions(+), 52 deletions(-)

commit 92ab34517a94d36ced95514e4fdbde17b2e6004f
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Dec 8 18:59:41 2010 +0000

    Compile with --without-ca-file

 libempathy/empathy-tls-verifier.c | 2 ++
 1 file changed, 2 insertions(+)

commit e5677e4dc098d563a5e2617e978c45335717b915
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Mon Dec 13 13:55:49 2010 +0000

    Prevent premature finalisation of an EmpathyPersonaStore in certain
    cases

    In the case that one of the GtkTreeRowReferences belonging to the
    Personas
    in an EmpathyPersonaStore holds the last reference to the persona
    store, the
    store can be prematurely finalised, causing Empathy to go into
    an infinite
    loop inside GHashTable code (the hash table is finalised with
    the persona
    store, and overwritten with 0xfff… — this happens to cause the
    next bit of
    hash table code to be called to go into an infinite loop).

    This can be fixed by holding a reference to the persona store when
    changing
    its personas in response to a personas-changed signal.

 libempathy-gtk/empathy-persona-store.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 315675364ae3c5afb3bda08a7389d655112ad7a5
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Sun Dec 12 11:25:26 2010 +0000

    Bug 631096 — Should not mention "meta contacts" in UI

    Change all occurrences of “meta-contacts” in translatable strings
    to use the
    phrase “linked contacts” instead. Closes: bgo#631096

 libempathy-gtk/empathy-individual-widget.c |  8 ++++++--
 libempathy-gtk/empathy-linking-dialog.c    | 10 +++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

commit a2f8a7b9198d90f6a2e8e38c403e29c25b0b560c
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Sun Dec 12 18:15:51 2010 +0000

    Bug 636700 — Add an extra warning when deleting a metacontact

 libempathy-gtk/empathy-individual-view.c | 41
 ++++++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 4 deletions(-)

commit 7e4103ab9ceebf9369e9684fbe6564f1f5238adb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 13 13:15:10 2010 +0100

    remove released flag accidentally set in previous commit

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b51c1db854b9c367ea50d0a301fddca917486372
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Dec 13 09:41:34 2010 +0000

    configure: depend on the newest tp-glib for the new auth types stuff

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b4930806a93a8b365400e563b8fa359c00c4016a
Author: Robert Sajdok <robert.sajdok@gmail.com>
Date:	Mon Dec 13 10:40:23 2010 +0100

    main-window: add a tooltip on connection error info bars (#626507)

 configure.ac		   | 2 +-
 src/empathy-main-window.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

commit f6180441540a3a19f4b61d5908c97ebc5b60e779
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sun Dec 12 21:31:30 2010 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 432
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 225 insertions(+), 207 deletions(-)

commit cc04faff9afbffc10a5a1e82a78e073064219fc6
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:	Sun Dec 12 11:21:01 2010 +0000

    Update British English translation

 po/en_GB.po | 1256
 ++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 672 insertions(+), 584 deletions(-)

commit 4ce52c5fb8116e72a3b87c7a79f49ceefe355f9e
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Sat Dec 11 21:08:14 2010 +0100

    Updated Slovenian translation

 po/sl.po | 564
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 291 insertions(+), 273 deletions(-)

commit 209dd3b22e18e6faf6956c03e711b70023c8a9ff
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Sat Dec 11 15:28:44 2010 +0100

    Updated Spanish translation

 po/es.po | 426
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 221 insertions(+), 205 deletions(-)

commit 698e6e591310e605ff204915637527985f379bf2
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Fri Dec 10 18:11:40 2010 +0100

    Updated Galician translations

 po/gl.po | 468
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 242 insertions(+), 226 deletions(-)

commit a2dd862e0f2a262f61b4976148f6cc1e988ec66f
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Dec 10 12:28:09 2010 +0000

    account-widget: add Remember Password widgets for all the other
    protocols

    ...and link these widgets up nicely.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-account-widget-aim.ui	    | 34 ++++++++++-
 libempathy-gtk/empathy-account-widget-groupwise.ui | 40 +++++++++++--
 libempathy-gtk/empathy-account-widget-icq.ui	    | 34 ++++++++++-
 libempathy-gtk/empathy-account-widget-jabber.ui    | 70
 ++++++++++++++++++----
 libempathy-gtk/empathy-account-widget-msn.ui	    | 40 +++++++++++--
 libempathy-gtk/empathy-account-widget-sip.ui	    | 40 +++++++++++--
 libempathy-gtk/empathy-account-widget.c	    | 47 +++++++++++++++
 7 files changed, 281 insertions(+), 24 deletions(-)

commit 40791c62c791c6ec697b494b421b1e68c8384769
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Dec 10 12:24:40 2010 +0000

    account-widget: only show Remember Password ticky box if the CM
    supports SASL

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-account-widget.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit cf79884338c1a83eb3c7a18da9674f3563ed1829
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Dec 10 12:23:08 2010 +0000

    account-settings: add _supports_sasl function

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-account-settings.c | 8 ++++++++
 libempathy/empathy-account-settings.h | 2 ++
 2 files changed, 10 insertions(+)

commit e52ae339c601c4173b011ad28bcdca816649fd4c
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Dec 10 12:02:17 2010 +0000

    account-settings: don't block notify::ready on getting a password

    The account widget acts a little more synchronously, so we can't wait
    for the keyring to give us the password. We can signal later about it
    though.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-account-widget.c | 36
 +++++++++++++++++++++++++++++++++
 libempathy/empathy-account-settings.c	 | 25 +++++++++++++++++------
 2 files changed, 55 insertions(+), 6 deletions(-)

commit 41dd635842b27268454435c557b74ea32245c7ae
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Thu Dec 9 17:32:13 2010 +0000

    status-icon: blink when we get a password request

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-event-manager.c | 9 +++++----
 src/empathy-status-icon.c   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

commit d7293eb2b362224a70ad1c8402691c987b1caf1c
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Thu Dec 9 11:14:16 2010 +0000

    auth-factory: become an Observer and claim auth channels where
    necessary

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 data/Empathy.Auth.client	   |   6 +-
 libempathy/empathy-auth-factory.c | 274
 ++++++++++++++++++++++++++++++--------
 libempathy/empathy-auth-factory.h |   6 +-
 3 files changed, 229 insertions(+), 57 deletions(-)

commit db9e0a4a2394977b62f1034864365b1cae6f4714
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 8 18:34:26 2010 +0000

    main-window: display an info bar approving or rejecting the auth
    channel

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-main-window.c  | 148
 +++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-main-window.ui |  14 ++++-
 2 files changed, 161 insertions(+), 1 deletion(-)

commit 1a85f1ae21dd6be86f6e15e424ece5302c8faa4d
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 8 18:24:47 2010 +0000

    notifications-approver: don't show notifications for auth events

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-notifications-approver.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 071992a0704d43baa2a72b576401ea1f68b44de6
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 8 18:24:21 2010 +0000

    event-manager: become an approver for auth channels

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-event-manager.c | 90
 ++++++++++++++++++++++++++++++++++++++++++---
 src/empathy-event-manager.h |	1 +
 2 files changed, 85 insertions(+), 6 deletions(-)

commit d180fb24e4039659e5f731bbbf80a827aefe517f
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 8 16:04:00 2010 +0000

    event-manager: add the account to the EmpathyEvent struct

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-event-manager.c | 35 ++++++++++++++++++++++-------------
 src/empathy-event-manager.h |	1 +
 2 files changed, 23 insertions(+), 13 deletions(-)

commit c98f95bcef9336d82d303fc10b4c60ff90270885
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 8 12:58:54 2010 +0000

    account-widget: handle the remember password widget with the simple
    widget

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-account-widget-yahoo.ui | 34
 +++++++++++++++++++++++-
 libempathy-gtk/empathy-account-widget.c	| 36
 +++++++++++++++++---------
 2 files changed, 57 insertions(+), 13 deletions(-)

commit 216990096f7087f7e29c0fdf2c25c34274f83376
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Thu Dec 9 19:54:27 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 905
 ++++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 905
 ++++++++++++++++++++++++++++++++----------------------------
 2 files changed, 960 insertions(+), 850 deletions(-)

commit 373bf0d7ca7373a45a71e46f161695cc951a7316
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 8 12:57:45 2010 +0000

    account-settings: don't call TpAccount functions if we've not created
    it yet

    We're creating the account so the account isn't around yet.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-account-settings.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit e1db9121d3018495f97bcb41caa3805b3672afbc
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 8 12:44:44 2010 +0000

    password-dialog: re-enable showing the Remember password check button

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-password-dialog.c | 7 -------
 1 file changed, 7 deletions(-)

commit b2d04d8965c6fa63c6aa10a4c2197619f5234ef5
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 8 12:42:36 2010 +0000

    account-widget: hook up the remember password toggle button

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-account-widget.c | 38
 +++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

commit 5f2776557174cf952c465c9b13960238574c8481
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 8 12:01:53 2010 +0000

    account-settings: add support for saving the password in the keyring
    ourselves

    Only do this if the CM supports popping up SASL-enabled auth channels.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-account-settings.c | 164
 +++++++++++++++++++++++++++++++++-
 1 file changed, 161 insertions(+), 3 deletions(-)

commit b1a60391b1ca744b3bd5c3218488ccd4cab9b86c
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 8 09:32:06 2010 +0000

    account-settings: store the TpProtocol object and notify::ready when
    it's prepared

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-account-settings.c | 50
 ++++++++++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 3 deletions(-)

commit fdfca8f9fa60962a6e808e8c9cdb2173205457b0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 7 14:35:53 2010 +0100

    empathy_subscription_dialog_show: show contact details

    It makes sense to give as much info as possible on the contact when
    asking if
    we want to add him to our contact list (#608806).

 libempathy-gtk/empathy-contact-dialogs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 7ff5fadde643aa96b771dc57e47455ca761ed0f8
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Tue Dec 7 15:37:49 2010 +0200

    Updated Hebrew translation.

 po/he.po | 420
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 218 insertions(+), 202 deletions(-)

commit 92c0e18861d5a8fd9b55e7385581ac961f615a5e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 7 14:01:13 2010 +0100

    Remove Ovi chat profile

    Ovi services are about to change so best to wait for now.

 libempathy-gtk/empathy-account-widget-jabber.ui | 105
 ------------------------
 libempathy-gtk/empathy-account-widget.c	 |  35 --------
 libempathy-gtk/empathy-protocol-chooser.c	 |  15 ----
 libempathy/empathy-utils.c			 |   1 -
 4 files changed, 156 deletions(-)

commit 521662e23476ddc9bc9c96917bb04a06ff4479cc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 30 11:05:59 2010 +0200

    add services_infos containing infos regarding services

 libempathy-gtk/empathy-account-widget.c | 45
 ++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 21 deletions(-)

commit c5a45a77bcc3fc39bb4814f46deb994e1b29ddb5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 30 10:52:02 2010 +0200

    hide jabber example by default so we just have to show the one we want

 libempathy-gtk/empathy-account-widget-jabber.ui | 1 -
 libempathy-gtk/empathy-account-widget.c	 | 9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

commit 43070f934f712124c9b064c34021f42e09eb328e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 30 10:32:15 2010 +0200

    account_widget_get_service: check Service for Facebook and GTalk too

 libempathy-gtk/empathy-account-widget.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

commit 598db544a4d66a00aa45c036eb5bd6f591f0f996
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 30 10:27:30 2010 +0200

    empathy_account_widget_get_default_display_name: special case Ovi
    as well

 libempathy-gtk/empathy-account-widget.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 378fff47b595c21f802c0de3944cb520981a992d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 30 10:25:19 2010 +0200

    more use of account_widget_get_service()

 libempathy-gtk/empathy-account-widget.c | 34
 ++++-----------------------------
 1 file changed, 4 insertions(+), 30 deletions(-)

commit 0087a5bd8ddd99a16288bd74a5e23da41c0d8dd1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 30 10:20:15 2010 +0200

    add account_widget_get_service() and an enum to represent services

 libempathy-gtk/empathy-account-widget.c | 53
 +++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 13 deletions(-)

commit 7fa0c3b106c5d5d35cb86a75da047b8c7c5e2685
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 22 16:51:05 2010 +0200

    add account widget for Ovi

 libempathy-gtk/empathy-account-widget-jabber.ui | 105
 ++++++++++++++++++++++++
 libempathy-gtk/empathy-account-widget.c	 |  47 ++++++++++-
 2 files changed, 149 insertions(+), 3 deletions(-)

commit d25db434c8871b871fb007c2e41a0da834587974
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 21 14:28:01 2010 +0200

    account-widget: generalise facebook suffix code

 libempathy-gtk/empathy-account-widget.c | 46
 ++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 15 deletions(-)

commit 0b94b1427a34bc16d98c4c0622c637df8856adc4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 21 14:13:37 2010 +0200

    add Ovi chat profile (#630146)

 libempathy-gtk/empathy-protocol-chooser.c | 15 +++++++++++++++
 libempathy/empathy-utils.c		   |  1 +
 2 files changed, 16 insertions(+)

commit 6c5839c976407292715daf22cdddf6aca469fa75
Merge: 9d40a77 eb3f7d2
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Dec 7 11:54:33 2010 +0000

    Merge branch 'sasl'

commit eb3f7d2fb30be62b801b6086143fb476b5368b5d
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Dec 7 11:11:34 2010 +0000

    server-sasl-handler: shorten very long lines

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-server-sasl-handler.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 436815408e8a159a56a4a5ce0ee4aa52b51a8800
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Dec 7 11:10:20 2010 +0000

    server-sasl-handler: stop using GET_PRIV

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-server-sasl-handler.c | 33
 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 18 deletions(-)

commit bd7cb52a486f7f57d75070c28afd1f2b1b0dc017
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Dec 7 11:10:15 2010 +0000

    password-dialog: stop using GET_PRIV

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-password-dialog.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

commit 52620257848947efee91e27819cdc8f685784ed8
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Dec 7 11:02:14 2010 +0000

    password-dialog: small style change to please make check

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-password-dialog.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2599834381f57b1370986e2a574cde6781f0b6bc
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Dec 7 11:02:02 2010 +0000

    po: add password-dialog to POTFILES.in

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit a5a3b01dcda00b938e6ce61d3b6dbf6b0d57abe0
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Dec 6 16:24:38 2010 +0000

    keyring: change schema to be incompatible with current MC

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-keyring.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 4014b19321977ffd5700aa8d1df258393bb74521
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Dec 6 15:58:30 2010 +0000

    password-dialog: center the dialog

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy-gtk/empathy-password-dialog.c | 2 ++
 1 file changed, 2 insertions(+)

commit 15426cd6aa437bc2772397b77dd0d59a345e004b
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Dec 6 15:01:25 2010 +0000

    password-dialog: don't display "Remember password" for now

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy-gtk/empathy-password-dialog.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 07921157f6d77826e474eac64a425736a92e2321
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Dec 6 14:49:16 2010 +0000

    server-sasl-handler: handle invalid SASL statuses

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-server-sasl-handler.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 66f79bec1ec6b59d362324fbfdf0335e60c1d8e6
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Dec 6 12:28:13 2010 +0000

    keyring: allow set and delete password to have NULL callbacks

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-keyring.c | 2 --
 1 file changed, 2 deletions(-)

commit 9d40a77fae9175d7932c3af0e95cbdf1cfde433b
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Dec 1 18:53:59 2010 +0100

    Point to #empathy instead of #telepathy

 TODO | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2c201cf276aa11b3ae1d1bedcf92eb29abf7f04d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Dec 6 11:35:26 2010 +0000

    keyring: add a delete_password function

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-keyring.c | 96
 ++++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-keyring.h |  6 +++
 2 files changed, 102 insertions(+)

commit b66750b8540761c03b935ff93d50c642c9d1f07c
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Dec 6 10:06:51 2010 +0000

    server-sasl-handler: save the password if requested

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-server-sasl-handler.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

commit 085edd72db61d923a639d874f44c9ed2805e75a8
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Dec 6 10:05:56 2010 +0000

    keyring: add set_password_{async,finish} functions

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-keyring.c | 86
 ++++++++++++++++++++++++++++++++++++++++----
 libempathy/empathy-keyring.h |  7 ++++
 2 files changed, 87 insertions(+), 6 deletions(-)

commit bc099434f22a78d09d0dad3d5006ad836ab11d02
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Dec 6 09:43:34 2010 +0000

    server-sasl-handler: make a GAsyncInitable and get the password

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-auth-factory.c	  |  51 ++++++++---
 libempathy/empathy-server-sasl-handler.c | 145
 +++++++++++++++++++++++++++++--
 libempathy/empathy-server-sasl-handler.h |  11 ++-
 src/empathy-auth-client.c		  |   9 +-
 4 files changed, 193 insertions(+), 23 deletions(-)

commit 4d487def1692d57aca987219fa1ff6f133c389f1
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Dec 6 09:42:59 2010 +0000

    keyring: add simple keyring helper

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/Makefile.am       |   2 +
 libempathy/empathy-keyring.c | 115
 +++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-keyring.h |  37 ++++++++++++++
 3 files changed, 154 insertions(+)

commit ceff90e7c349418ed74c3bc2346fdb9270d534c0
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Dec 4 17:23:43 2010 +0000

    Fix uninitialized use of a variable

 libempathy/empathy-chatroom-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5c2ae48c27de994ba418bf759bbf011c8101943d
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Dec 3 15:58:05 2010 +0000

    auth-client: move the password dialog into a new file

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/Makefile.am		  |   2 +
 libempathy-gtk/empathy-password-dialog.c | 318
 +++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-password-dialog.h |  66 +++++++
 src/empathy-auth-client.c		  | 180 +----------------
 4 files changed, 390 insertions(+), 176 deletions(-)

commit e1873eec13666db81e379eb591b771a5d4122505
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 3 15:32:49 2010 +0100

    gdk_x11_drawable_get_xdisplay() has been renamed, so let's use the
    specific macro instead

 libempathy-gtk/empathy-ui-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ee8f480f660963c7d26872a27ba9889bbed6a000
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Dec 3 14:25:46 2010 +0000

    auth-client: grab the keyboard focus when popping up the password
    dialog

    I like this.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-auth-client.c | 73
 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

commit 5964bd5d8e7ba463e89e742701b006615d502a85
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 3 14:36:27 2010 +0100

    chatroom-mamanger: monitor for file changes (#636360)

 libempathy/empathy-chatroom-manager.c | 87
 +++++++++++++++++++++++++++++------
 1 file changed, 74 insertions(+), 13 deletions(-)

commit fd337e4163b26ea7e284473817a1d17946ab12d4
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Dec 3 13:04:04 2010 +0000

    auth-client: improve the password request dialog

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-server-sasl-handler.c | 10 ++++-
 libempathy/empathy-server-sasl-handler.h |  3 +-
 src/empathy-auth-client.c		  | 74
 +++++++++++++++++++++++++++-----
 3 files changed, 74 insertions(+), 13 deletions(-)

commit 2b5028d1ec652a136f30d7b3955562a6a07f9f42
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Dec 3 13:03:28 2010 +0000

    server-sasl-handler: add an account property

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-auth-factory.c	  |  3 ++-
 libempathy/empathy-server-sasl-handler.c | 34
 ++++++++++++++++++++++++++++++--
 libempathy/empathy-server-sasl-handler.h |  5 ++++-
 3 files changed, 38 insertions(+), 4 deletions(-)

commit bdbece32463e83f646d0c031f4cb2a8557a7e76d
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Fri Dec 3 12:40:53 2010 +0100

    Fix another article

 help/hu/hu.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0a84aa6ec9ab1ccf86e4d4d79a6f2fee8eaaa147
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Fri Dec 3 12:38:07 2010 +0100

    Fix article

 help/hu/hu.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 922b5acaf43a0653447622fc022d37757357dc36
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 2 16:07:05 2010 +0100

    rename unused empathy_chatroom_manager_chat_handled()

 libempathy/empathy-chatroom-manager.c | 33
 ---------------------------------
 libempathy/empathy-chatroom-manager.h |  4 ----
 2 files changed, 37 deletions(-)

commit b6376eb0eb55563b0ba8d063ad8fe139a704fbd7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 2 16:05:35 2010 +0100

    chatroom-manager: use a room channel Observer (#636202)

 libempathy/empathy-chatroom-manager.c | 107
 ++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)

commit b82b08de181b134cde387c0e634b8f5afc53a201
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 2 15:12:41 2010 +0100

    chat-manager: stop telling the chat mgr about handled rooms

    Now that the chat handler has moved to its own process this is
    no longer
    enough. The instance of the chat manager in empathy doesn't know
    about the
    handlded channels.

    The chat manager should implement an Observer instead to know about
    all the
    rooms.

 src/empathy-chat-manager.c | 18 ------------------
 1 file changed, 18 deletions(-)

commit 3ea940ebbbc219521ce3674a703fe036aebd96bb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 2 14:58:06 2010 +0100

    remove empathy_chatroom_manager_get_count()

    We don't use it any more.

 libempathy/empathy-chatroom-manager.c | 28 ----------------------------
 libempathy/empathy-chatroom-manager.h |  3 ---
 2 files changed, 31 deletions(-)

commit d8ecfc7dd920283a8e3c15b31a6b04087aef9936
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 2 11:53:51 2010 +0100

    chatroom-manager: unify coding style

    Most of the file was already using the new style so best stay
    coherent.

 libempathy/empathy-chatroom-manager.c | 526
 +++++++++++++++++-----------------
 libempathy/empathy-chatroom-manager.h |  67 +++--
 2 files changed, 304 insertions(+), 289 deletions(-)

commit b1782d8dea042c29a50152db4c3bd63da80f3c02
Merge: a955dcb 228251c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 1 15:50:11 2010 +0100

    Merge branch 'irc-grab-636203'

commit 1994d674ad7b35e8b4a5db7f431c31414d1230f3
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 1 14:48:13 2010 +0000

    auth-client: listen for new sasl handlers and pop up a password dialog

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-auth-client.c | 71
 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 69 insertions(+), 2 deletions(-)

commit 81d9ab0e356681fb49c43c7bd7bf75bdf84122bc
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 1 14:47:39 2010 +0000

    auth-factory: create ServerSASLHandlers and signal them appearing

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-auth-factory.c | 90
 +++++++++++++++++++++++++++++++++------
 1 file changed, 78 insertions(+), 12 deletions(-)

commit 2aef97996f1b3e033ad886cc80f66a0e3b4e1957
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 1 14:46:44 2010 +0000

    server-sasl-handler: added

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/Makefile.am			  |   2 +
 libempathy/empathy-server-sasl-handler.c | 264
 +++++++++++++++++++++++++++++++
 libempathy/empathy-server-sasl-handler.h |  71 +++++++++
 3 files changed, 337 insertions(+)

commit fcd80516f561eec897df4c750a1d15573bbdeb91
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 1 14:40:35 2010 +0000

    auth-factory: add EmpathyAuthFactory::new-server-sasl-handler

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-auth-factory.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 53ead42832d2af12c9487a6f8b370787442940f9
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 1 14:39:48 2010 +0000

    auth-factory: also handle auth channels

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 data/Empathy.Auth.client	   |  4 ++++
 libempathy/empathy-auth-factory.c | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

commit a76960e927b5f32387c17bb580d360669d6aace8
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 1 14:39:00 2010 +0000

    debug: add SASL debug flag and key

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-debug.c | 1 +
 libempathy/empathy-debug.h | 1 +
 2 files changed, 2 insertions(+)

commit 2f8390928641951691bc6d5b86a4310b2d81fc3d
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Dec 1 14:37:40 2010 +0000

    configure: depend on tp-glib >= 0.13.7 for tp-glib codegen

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a955dcbb4b7182a030974e80e6c6bee823392fad
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 1 14:52:24 2010 +0100

    tp-contact-factory: request avatar feature

    We still create TpContact for muc contacts list where we want
    to display
    avatars (#636207).

 libempathy/empathy-tp-contact-factory.c | 1 +
 1 file changed, 1 insertion(+)

commit 228251c3b10a22dedd3f3928561f08bbcae040a1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 1 14:03:31 2010 +0100

    Check if apply button has a top level window before calling
    gtk_widget_grab_default()

    IRC widgets don't have any mandatory argument, so the account is
    valid before
    the widget has been packed into the accounts
    dialog. gtk_widget_grab_default()
     can't be called on a widget not having a top level window. (#636203)

 libempathy-gtk/empathy-account-widget.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

commit 1f5ddc41bf768c11138edc049f1f70192cbd82a1
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Nov 30 17:50:24 2010 +0000

    empathy-spell: implement _get_enabled_language_codes with
    --disable-spell

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-spell.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit b6a08a8526af02877f97e1bd234fa5f4aace1464
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Nov 30 17:48:23 2010 +0000

    empathy-spell: updated _get_suggestions disabled implementation

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-spell.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit d69fe12699f6b07fc0f39dea2f18c3c87d3367db
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 30 16:12:42 2010 +0100

    update copyrights

 libempathy-gtk/empathy-chat.c | 2 +-
 src/empathy-chat-window.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit f275b954b00f0e49b2104cac312a99a420acbb46
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 30 16:11:38 2010 +0100

    remove old defines

 libempathy-gtk/empathy-chat.c | 3 ---
 1 file changed, 3 deletions(-)

commit 16b77581e53f068035343c0daf302ffb73303134
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 30 14:58:09 2010 +0100

    chat-window: don't display notifications for pending messages
    (#635513)

 src/empathy-chat-window.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit fb049bcc5f5622b56112c947b5b571c6f0956671
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 30 14:56:39 2010 +0100

    EmpathyChat::new-message: tell if the message is a pending one or not

 libempathy-gtk/empathy-chat.c | 16 ++++++++++------
 src/empathy-chat-window.c     |  1 +
 2 files changed, 11 insertions(+), 6 deletions(-)

commit 6d1261917c33f372f254ed84c3c6956c1e90fbc5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 30 14:10:19 2010 +0100

    Stop calling gtk_menu_detach()

    GTK+ does it for us now:
    http://git.gnome.org/browse/gtk+/commit/?id=6716e7c3f1925560a5b4901581cabbaee4e01e28

 libempathy-gtk/empathy-contact-list-view.c | 4 ----
 libempathy-gtk/empathy-individual-view.c   | 2 --
 2 files changed, 6 deletions(-)

commit 5a39893c82e21a54b6156054f45f8db9c5a9802c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 30 12:52:46 2010 +0100

    empathy_sound_manager_dup_singleton: add G_LIKELY

 libempathy-gtk/empathy-sound-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 47ecf4b12ab06848e3fcb685529f85df3ec3d045
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 30 12:51:58 2010 +0100

    fix typo in comment

 libempathy-gtk/empathy-sound-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 645a49863a63b917b1ea648f791824fee9efaa00
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 30 12:51:36 2010 +0100

    sound-manager: update copyright

 libempathy-gtk/empathy-sound-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 24f77567c932c7693b3051156f8d5ca4499c6d8c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 30 11:48:04 2010 +0100

    sound-manager: cache the sound GSettings

 libempathy-gtk/empathy-sound-manager.c | 39
 +++++++++++++---------------------
 1 file changed, 15 insertions(+), 24 deletions(-)

commit 7c0d36e3d1604a4056934bc1a44e89d0e0875051
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 30 11:42:33 2010 +0100

    sound-manager: move repeating_sounds to EmpathySoundManagerPrivate

 libempathy-gtk/empathy-sound-manager.c | 137
 ++++++++++++++++++---------------
 1 file changed, 75 insertions(+), 62 deletions(-)

commit 81068bbf3ebd6c251f308d6d45e4dadf07432ea7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 30 11:24:20 2010 +0100

    move sound functions to EmpathySoundManager methods

 libempathy-gtk/empathy-sound-manager.c | 34
 +++++++++++++++++++++++-----------
 libempathy-gtk/empathy-sound-manager.h | 19 ++++++++++++++-----
 src/empathy-call-window.c		| 15 +++++++++++----
 src/empathy-chat-window.c		|  9 +++++++--
 src/empathy-event-manager.c		| 30
 ++++++++++++++++++++++--------
 src/empathy-main-window.c		| 10 ++++++++--
 6 files changed, 85 insertions(+), 32 deletions(-)

commit 8172bca03c6f85d7dcc0ff39f1a81ccfd719b08b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 30 10:29:00 2010 +0100

    add EmpathySoundManager stub object (#636067)

 libempathy-gtk/empathy-sound-manager.c | 34
 ++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-sound-manager.h | 26 ++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)

commit 0dca19234c147a94609c6659660e83135e765b9c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 30 10:14:33 2010 +0100

    move empathy-sound to empathy-sound-manager

 libempathy-gtk/Makefile.am		|   4 +-
 libempathy-gtk/empathy-sound-manager.c | 389
 +++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-sound-manager.h |  56 +++++
 libempathy-gtk/empathy-sound.c		| 389
 ---------------------------------
 libempathy-gtk/empathy-sound.h		|  56 -----
 po/POTFILES.in				|   2 +-
 src/empathy-call-window.c		|   2 +-
 src/empathy-chat-window.c		|   2 +-
 src/empathy-event-manager.c		|   2 +-
 src/empathy-main-window.c		|   2 +-
 10 files changed, 452 insertions(+), 452 deletions(-)

commit ac0dab19efa8d17f3d7b0c9489a2d3ea06a00c6b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 29 17:25:51 2010 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 33d7e988e743ec40e3475c02ee2a3043c1d4a559
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 29 17:07:03 2010 +0100

    add empathy-notifications-approver.c to POTFILES.in

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit 1d033ef26ef053679d164686c8941727fe8c9883
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 29 16:59:07 2010 +0100

    prepare 2.91.3 release

 NEWS	      | 60
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 62 insertions(+), 2 deletions(-)

commit 6fb9b3aaa5c4b8cb82820548ada136380088584d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 29 16:32:38 2010 +0100

    event-manager: cache the UI GSettings

 src/empathy-event-manager.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

commit 6408432db9e2b1240c1cfea461d330ac0a01e49a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 29 16:26:27 2010 +0100

    event-manager: cache the notifications GSettings

 src/empathy-event-manager.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit 086f0fc0375d06fa0c41cf921f883ed36fdb14d0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 29 16:23:19 2010 +0100

    theme_adium_parse_body: use the cache GSettings chat

 libempathy-gtk/empathy-theme-adium.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit d6b43c2ff67d2d90bf577990fb67917a01e38807
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 29 16:03:07 2010 +0100

    notify-manager: cache the notification GSettings

 libempathy-gtk/empathy-notify-manager.c | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

commit a8724cc2dcfcc320b6a3c1b1e39f5d3e3978b5af
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 29 15:53:42 2010 +0100

    avatar-chooser: cache the UI GSettings

 libempathy-gtk/empathy-avatar-chooser.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit b63808b139096d53264b90908efcc6e63b1c4170
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 29 15:47:35 2010 +0100

    chat-text-view: cache the chat GSettings

 libempathy-gtk/empathy-chat-text-view.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit bcc2b4414470de50b757414471b52923d1849619
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 29 15:45:16 2010 +0100

    empathy-chat-text-view: rename gsettings to gsettings_desktop

 libempathy-gtk/empathy-chat-text-view.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 8a9a8bc51095f76e502293b463de676a1f6bc517
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 29 15:40:11 2010 +0100

    chat-window: cache the UI GSettings

 src/empathy-chat-window.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit adda65622351cabb18517bef5ca853890e9829af
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 29 15:36:59 2010 +0100

    chat-window: cache the notifications GSettings

 src/empathy-chat-window.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit 87b4a33dd408c9d5fe33d9261b6185e1833696d5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 29 08:53:08 2010 +0100

    fix typo

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit aa70692e1a16219f2bbda8f129dd2888d1bb6341
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Nov 27 18:35:29 2010 +0000

    Initialize libnotify properly to prevent crashes

    If libnotify isn't initialized properly the app_name won't be set,
    causing it
    to eventually pass NULL for a string value to GVariant. Which nicely
    results in
    a SEGV.

 src/empathy-chat.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit f2bc65f9bd9c5d47846ff44672a5a50e365d9da7
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Nov 26 18:03:55 2010 +0000

    Debug window: Correct spelling of "misson-control"

    It's been wrong for over a year, and no-one's noticed yet. :P

    Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

 src/empathy-debug-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6d815f42f4b0203bb01b2658d71dfd0dedb164c6
Merge: 5e3f159 72a4042
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Nov 26 13:02:23 2010 +1100

    Merge remote branch
    'glassrose/full_room_menu_never_insensitivated-597043'

commit 72a404293ef360571eda0eb45166517010daa247
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Thu Nov 25 07:42:51 2010 +0530

    Only the required submenus of 'Room' menu are updated, not the
    entire menu.

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=597043

 src/empathy-main-window.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

commit 5e3f159c66c8a68aad18c3d2ddd79ac9bc6ece79
Merge: c487a45 212a4ec
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 25 10:25:44 2010 +0100

    Merge branch 'notifications-635500'

commit c487a45a3509c2cda4bd712ed818924ccb09184f
Author: A S Alam <aalam@users.sf.net>
Date:	Thu Nov 25 09:07:46 2010 +0530

    update for Punjabi by A S Alam

 po/pa.po | 701
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 380 insertions(+), 321 deletions(-)

commit 4b33293b29499f574955946aea70dae420e7accc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 24 16:34:13 2010 +0100

    properly manage the reference of the pixbuf returned by
    empathy_pixbuf_avatar_from_individual_scaled_finish

 libempathy-gtk/empathy-individual-store.c | 1 +
 libempathy-gtk/empathy-ui-utils.c	   | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

commit fef8172419c5752d7d55e65cff3bd76a8176967e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 24 16:07:00 2010 +0100

    empathy_individual_view_get_group_menu: don't leak the group

 libempathy-gtk/empathy-individual-view.c | 1 +
 1 file changed, 1 insertion(+)

commit 5086e9b0734859f3bee5c0b0aa4b302a1e328b86
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 24 16:06:42 2010 +0100

    rename empathy_individual_view_get_selected_group to
    empathy_individual_view_dup_selected_group

 libempathy-gtk/empathy-individual-view.c | 8 ++++----
 libempathy-gtk/empathy-individual-view.h | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)

commit 0894474e8cfed8dfa4824205a9d43e76269b50b0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 24 16:01:02 2010 +0100

    log_window_get_messages_for_date: don't leak chat_id and account

 libempathy-gtk/empathy-log-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit 69afcc40e1fb02956b8ee0fad404b9afc776f64e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 24 12:05:59 2010 +0100

    smiley-manager: clean up memory management of the path

 libempathy-gtk/empathy-smiley-manager.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 0313474daf288bd973ea491c530d26dd2df0fd28
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 24 12:00:11 2010 +0100

    empathy_message_from_tpl_log_entry: don't leak receiver and sender

 libempathy/empathy-message.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

commit 74f2bf579605389d30cc8fab50c7718f666ca7ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 24 11:57:59 2010 +0100

    chat_log_filter: don't leak EmpathyMessage

 libempathy-gtk/empathy-chat.c | 1 +
 1 file changed, 1 insertion(+)

commit 212a4ecbdb3a41933a208f401f1803a930061cb7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 23 11:56:17 2010 +0100

    Clean up the way we keep references on notifications

 src/empathy-notifications-approver.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

commit 5196ab5cec62faae3ae7eaa3b3a9529fe7a2c33a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 23 13:46:09 2010 +0100

    use tp_g_signal_connect_object

 src/empathy-notifications-approver.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 42547ca133381bad23066b1513fde237632515c7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 23 13:42:37 2010 +0100

    fix comment

 src/empathy-notifications-approver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 43ed05000e87ed2798ab3bc222cc381b2859885f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 22 12:53:17 2010 +0100

    empathy.c: instantiate a EmpathyNotificationsApprover

 src/empathy.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit dedc37ecea14c0752c8a23b77e73248dd8a6fe2b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 22 12:52:31 2010 +0100

    Move notifications code from status-icon to notifications-approver
    (#635500)

 src/empathy-notifications-approver.c | 260
 +++++++++++++++++++++++++++++++++++
 src/empathy-status-icon.c	      | 259
 ----------------------------------
 2 files changed, 260 insertions(+), 259 deletions(-)

commit 426b89e06c978222479694873ec24d4dc8d2d2df
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 22 11:23:05 2010 +0100

    add EmpathyNotificationsApprover

 src/Makefile.am		      |   1 +
 src/empathy-notifications-approver.c | 107
 +++++++++++++++++++++++++++++++++++
 src/empathy-notifications-approver.h |  58 +++++++++++++++++++
 3 files changed, 166 insertions(+)

commit 13b07c1ae1c92c9b0a431576f6c78c95a46060fb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 23 10:44:55 2010 +0100

    empathy-av: early return if already activated

    Purely esthetic change to look more like empathy-chat.c

 src/empathy-av.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

commit 141c0caa3b8e132466a0472caabce59549151f46
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 23 10:40:21 2010 +0100

    empathy-chat: register the Handler when the app is activated

    This avoid to raise warnings when the app is launched a second time.

 src/empathy-chat.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

commit e218c8d18fffbba1f17dc44ba83825c7d8cdcc63
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 23 10:31:14 2010 +0100

    empathy-chat: don't use G_APPLICATION_IS_SERVICE

    It breaks EMPATHY_PERSIST (#635592). It's already done this way
    in empathy-av.

 src/empathy-chat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 45cfb4b41984b7a227943666cf90a727ebee6e21
Author: Nishio Futoshi <fut_nis@d3.dion.ne.jp>
Date:	Mon Nov 22 09:16:52 2010 +0100

    Fix miss spelling quadrigraphs in the configure.ac file (#635262)

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c637edc7059b1e3ed9413b9ca097abd4e307f30b
Merge: ac2b9a7 3acbe74
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 22 09:00:08 2010 +0100

    Merge branch 'chat-resize-635022'

commit ac2b9a7a95a152f874bf250f4365072a3bc976e1
Merge: 4b6678f 38f4477
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Nov 22 16:52:18 2010 +1100

    Merge remote branch 'glassrose/link_unfocussed_626560'

commit 38f4477ad6d36bc000db7f7388266007b194c0dd
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Mon Nov 15 04:42:44 2010 +0530

    Label removed form list of focusable widgets

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=626560

 libempathy-gtk/empathy-account-widget.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit 4b6678f1a01a33d2aa171314bb139bd5236f0ae4
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Sun Nov 21 13:00:41 2010 +0200

    Updated Hebrew translation.

 po/he.po | 364
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 184 insertions(+), 180 deletions(-)

commit ad9aaac5b3c56b9bda4fc947804a690a2a2b125f
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:	Sun Nov 21 12:00:39 2010 +0530

    Updated Tamil translation

 po/ta.po | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 1f66a46ee6c848fc35d176bdd9c4d58d8d77d179
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sat Nov 20 11:57:38 2010 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 642
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 342 insertions(+), 300 deletions(-)

commit 72730ceac9dda8713149277c6a784269b8cc398b
Author: Gheyret T.Kenji <gheyret@gmail.com>
Date:	Sat Nov 20 11:00:29 2010 +0100

    Added UG translation

 po/ug.po | 384
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 194 insertions(+), 190 deletions(-)

commit f2240c6a236d4b9606aeb40b0de87acd30d43c16
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sat Nov 20 01:44:39 2010 +0100

    Updated Galician translations

 po/gl.po | 212
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 108 insertions(+), 104 deletions(-)

commit 5e77d512450ae808190819be621b09acc5fe1b55
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Nov 19 13:40:40 2010 +0100

    Updated Spanish translation

 po/es.po | 220
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 112 insertions(+), 108 deletions(-)

commit 2b64bf3d16012a59a7d3b4cba68489af39c3f895
Author: Ivar Smolin <okul@linux.ee>
Date:	Fri Nov 19 01:03:13 2010 +0200

    [l10n] Updated Estonian translation

 po/et.po | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit b7ec8cc620c82c4c9bdb3b851b50de8b324d7add
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 18 14:51:58 2010 +0100

    individual_avatar_pixbuf_received_cb: don't leak the iters

 libempathy-gtk/empathy-individual-store.c | 2 ++
 1 file changed, 2 insertions(+)

commit 3f792393c4018956c7910e82c3680540612deeda
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 18 14:50:30 2010 +0100

    factor out free_iters

 libempathy-gtk/empathy-individual-store.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

commit 4d119f936fa8a692219fda73b5610482b554ba27
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 18 14:45:47 2010 +0100

    cell_renderer_text_set_property: don't leak client types (#635105)

 libempathy-gtk/empathy-cell-renderer-text.c | 1 +
 1 file changed, 1 insertion(+)

commit 5594d66040047febc79e85fb99af61abcb3c8a39
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 18 14:18:05 2010 +0100

    individual_store_name_sort_func: don't leak names

 libempathy-gtk/empathy-individual-store.c | 2 ++
 1 file changed, 2 insertions(+)

commit 3acbe74046df8d57fdf498acceacb2737be92d80
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 18 13:32:39 2010 +0100

    chat: add a timer before saving the hpane position

    This avoid to flood with D-Bus message when resizing the window
    (#635022).

 libempathy-gtk/empathy-chat.c | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

commit 220c1987a026a146dd8ae5121ac00e7fccd75339
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:	Thu Nov 18 16:04:42 2010 +0530

    Updated Tamil translation

 po/ta.po | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit a2882b3bb676a2196fd647cf2d09a12bae201fbc
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:	Thu Nov 18 16:01:20 2010 +0530

    Updated Tamil translation

 po/ta.po | 1176
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 632 insertions(+), 544 deletions(-)

commit a68402544850f77879b85cf5f258696a8ebb332c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 17 20:06:15 2010 +0100

    set do-lost property on the gstrtpjitterbuffer element

 data/element-properties | 3 +++
 1 file changed, 3 insertions(+)

commit 06098ff7becaed9aff517fb693c18adf6a21cca0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 17 17:12:46 2010 +0100

    remove EMPATHY_CONTACT_LIST_STORE_COL_CLIENT_TYPES

    It's unusd and we don't have this column in the model. (#635082)

 libempathy-gtk/empathy-contact-list-store.h | 1 -
 1 file changed, 1 deletion(-)

commit 479275712b6f5984d58728d28d9bad99c94108cf
Merge: a631e25 de93254
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Nov 17 15:29:01 2010 +0100

    Merge branch 'bug-547658'

commit de93254a7b91ea0620a4b6ae1c5cad2d922add91
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Nov 17 15:25:08 2010 +0100

    Remove spurious comment

 libempathy-gtk/empathy-cell-renderer-text.c | 1 -
 1 file changed, 1 deletion(-)

commit 880bc8eddf459b8eb25dd2ee5189a0f160dc690d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Wed Nov 17 12:16:17 2010 +0100

    Display the phone next to the status

    As shown in the mockup in bug 547658.

 libempathy-gtk/empathy-cell-renderer-text.c | 34 +++++++++++++++++++++---
 libempathy-gtk/empathy-contact-list-store.h |	1 +
 libempathy-gtk/empathy-individual-view.c    | 41
 ++---------------------------
 3 files changed, 34 insertions(+), 42 deletions(-)

commit a631e25e2ec0d4fdf0f526a38df6171a6a6b26bd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 17 09:39:43 2010 +0100

    chat-window: cache the 'chat' gsettings

    We use it each time the window is focused so best to reduce the
    D-Bus traffic
    (#635022).

 src/empathy-chat-window.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 92be64204fc424a3b2756be253b985112dcedcf2
Merge: d041967 8fd2127
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 16 14:12:28 2010 +0100

    Merge remote branch 'vminko/fix-634688-v3'

commit d041967019edda596ad98bd6d27e928dc2b7fd53
Merge: 7e37089 700d6bc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 16 14:11:05 2010 +0100

    Merge branch 'desktop-schema-626810'

commit 8fd21279bc061f25da3cf74690d7cdb74844f6e3
Author: Vitaly Minko <vitaly.minko@gmail.com>
Date:	Tue Nov 16 14:10:23 2010 +0300

    Need to set preferred height of the search bar manually (#634688).

 libempathy-gtk/empathy-search-bar.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit 7e37089963000a4dcce907f2e4e8849bd0c97a06
Author: Ivar Smolin <okul@linux.ee>
Date:	Tue Nov 16 11:11:24 2010 +0200

    [l10n] Updated Estonian translation

 po/et.po | 90
 +++++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 67 insertions(+), 23 deletions(-)

commit 700d6bc82ed3e3a83788c6ae27df0124157e847e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 16 09:04:25 2010 +0100

    fix identation

 libempathy-gtk/empathy-theme-adium.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5938582ef659b024de1b59d923939721d7a3730b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 11 16:33:01 2010 +0100

    remove gconf dep

 configure.ac | 2 --
 1 file changed, 2 deletions(-)

commit 57c1b01434b3a92f3a55fb6d859aaa142bbb14a5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 11 16:31:00 2010 +0100

    accounts-panel: remove gconf bits (#634595)

    This code is useless.

 src/cc-empathy-accounts-panel.c | 9 ---------
 1 file changed, 9 deletions(-)

commit 87f228d727344e28bb9d87f6a86845f6473a38b0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 11 15:42:14 2010 +0100

    use gsettings version of the document-font-name key (#626810)

 libempathy-gtk/empathy-chat-text-view.c | 38
 +++++++++++----------------------
 libempathy-gtk/empathy-theme-adium.c	 | 32 +++++++++++----------------
 libempathy/empathy-gsettings.h		 |  3 +++
 3 files changed, 29 insertions(+), 44 deletions(-)

commit a908b286fe5cc825f61cee64298395685b81b09d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 11 15:19:48 2010 +0100

    depend on gsettings-desktop-schemas

 configure.ac | 1 +
 1 file changed, 1 insertion(+)

commit 3889df3fdf5964f32a96912cee0c5b02e7bcfb58
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Nov 15 17:57:27 2010 +0100

    Only check for presence in presence-enabled personas 2.0

 libempathy-gtk/empathy-individual-widget.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 1e22706c294c3b775d1963aabff29a0695ccf595
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Mon Oct 18 13:15:22 2010 +0100

    empathy-individual-store: only check for presence in presence-enabled
    personas

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-individual-store.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit c391eb0efd50b519218c317d0c14e34954a45f9a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Sep 30 18:24:10 2010 +0100

    individual-widget: show a "on a phone" label in the individual view

    Also refactor having a TpContact in the EmpathyIndividualViewPriv
    struct, so that contact info and client types info use the same
    TpContact.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-individual-view.c    |	 3 +-
 libempathy-gtk/empathy-individual-widget.c  | 157
 ++++++++++++++++++++--------
 libempathy-gtk/empathy-individual-widget.h  |	 1 +
 libempathy-gtk/empathy-individual-widget.ui |	29 +++++
 4 files changed, 146 insertions(+), 44 deletions(-)

commit 6f9a0ae2e8dc6d71bc15bdc703cffec8851367ab
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Sep 30 16:01:20 2010 +0100

    contact: enable showing a phone next to contacts who are on phones

    The future!

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy-gtk/empathy-individual-store.c | 38 ++++++++++++++++++++++
 libempathy-gtk/empathy-individual-store.h |  1 +
 libempathy-gtk/empathy-individual-view.c  | 39 +++++++++++++++++++++++
 libempathy/empathy-contact.c		   | 52
 ++++++++++++++++++++++++++++++-
 libempathy/empathy-contact.h		   |  1 +
 libempathy/empathy-tp-contact-factory.c   |  1 +
 6 files changed, 131 insertions(+), 1 deletion(-)

commit 59f42ec7b50e15046fdd1b122c97a7f5d357922d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 15 16:25:07 2010 +0100

    don't set fill on the box containing buttons

 src/empathy-accounts-dialog.ui | 1 +
 1 file changed, 1 insertion(+)

commit a118a7cf1afc9858f1f4c6d7a10d949abf2fc210
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 15 16:18:47 2010 +0100

    use gtk_box_pack_start() to pack our widget to the dialog (#634912)

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 33d6d9dfbdeac6050a63912a9944b54e5c50d95f
Merge: 24ffd0a 4de0e21
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Nov 15 16:01:01 2010 +0100

    Merge branch 'bug-607146'

commit 24ffd0a12ef01048052c420b73d9b374515cb2f8
Author: Brian Pepple <bpepple@fedoraproject.org>
Date:	Sat Nov 6 18:31:32 2010 -0400

    Make ca-certs location configurable (#634197)

 configure.ac			   | 33 +++++++++++++++++++++++++++++++++
 libempathy/empathy-tls-verifier.c |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)

commit 4de0e218a3e225bbbfbbe3baf91036a262c0f782
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Nov 15 14:51:27 2010 +0100

    Make <Enter> on the account name try to log in

    https://bugzilla.gnome.org/show_bug.cgi?id=607146

 libempathy-gtk/empathy-account-widget.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit 750f7705fe5d58f2c13a57d5e3c844aa0f205e10
Merge: 4a8508f 1332eb9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 15 14:44:35 2010 +0100

    Merge branch 'trivia'

commit 4a8508f3b3a0c595add6908188a9a3e9c46c509a
Merge: 2a549bd 8d93b86
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 15 14:14:08 2010 +0100

    Merge remote branch 'zdra/configure'

commit 8d93b865c03829043b17010bc2bd7e3a89dbfb69
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Nov 15 13:40:43 2010 +0100

    Group all harddeps in one pkg-config call

    We do not support GTK2 anymore, so there is no point in keeping those

 configure.ac			    | 13 ++++---------
 libempathy-gtk/Makefile.am	    |  6 +-----
 nautilus-sendto-plugin/Makefile.am |  3 +--
 src/Makefile.am		    |  6 ------
 tests/Makefile.am		    |  2 --
 tests/interactive/Makefile.am	    |  2 --
 6 files changed, 6 insertions(+), 26 deletions(-)

commit 2a549bda5cbe7972fe496a9e02d6a9911214205c
Merge: c97e310 a05517d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Nov 15 12:59:01 2010 +0100

    Merge branch 'bug-595305'

commit c97e3104c2ab967d22093d981ab57714ce840f67
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Mon Nov 15 12:52:43 2010 +0100

    Updated Galician help translations

 help/gl/gl.po | 235
 ++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 130 insertions(+), 105 deletions(-)

commit aec32ec878a4eac2f3d885c7643891f2206d82ac
Author: Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>
Date:	Mon Nov 15 13:52:02 2010 +0200

    pofilter fixes for the Finnish translation, update translator-credits

 po/fi.po | 130
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 66 insertions(+), 64 deletions(-)

commit a05517d865e823e5bd939ae5efcc497ccadef066
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:	Mon Nov 15 12:31:36 2010 +0100

    Add a close button to Previous Conversations

    https://bugzilla.gnome.org/show_bug.cgi?id=595305

 libempathy-gtk/empathy-log-window.c  | 11 +++++++
 libempathy-gtk/empathy-log-window.ui | 58
 +++++++++++++++++++++++++++++++++++-
 2 files changed, 68 insertions(+), 1 deletion(-)

commit 1332eb95a91fb7e4f001757f702e79002ad3aebc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 15 11:38:43 2010 +0100

    individual_store_contact_sort: account is not supposed to be NULL

 libempathy-gtk/empathy-individual-store.c | 3 +++
 1 file changed, 3 insertions(+)

commit 40c46616ed8b86375777610b6befc35f22914497
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Mon Nov 15 10:58:23 2010 +0100

    Updated galician help translations

 help/gl/gl.po | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

commit c607201736ed8dd846454bc0ad397865f01ad805
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 15 10:58:34 2010 +0100

    bump folks dep to 0.3.2

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5d15b2ed1f68d17364a53549ceb503275c62769d
Merge: cb0e2e0 ff49ee8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 15 10:54:18 2010 +0100

    Merge remote branch 'pwith/634754-folks-api-changes'

commit cb0e2e0239d2bdad3aa4afbd683684f9ca2d1815
Merge: bf03b8e 875bf69
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 15 10:12:05 2010 +0100

    Merge remote branch 'vminko/fix-633481-v2'

commit bf03b8eec2f65636fde1abd1c9daddc7e2e2310d
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Sun Nov 14 12:20:27 2010 +0100

    Updated Slovenian translation

 po/sl.po | 211
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 99 insertions(+), 112 deletions(-)

commit 56b049b0bc721d16378f2c2ab57d8f29ffc9ef71
Author: Gheyret T.Kenji <gheyret@gmail.com>
Date:	Sat Nov 13 23:47:18 2010 +0100

    Added UG translation

 po/LINGUAS | 1 +
 1 file changed, 1 insertion(+)

commit e46c802a4071583cd642cfd2e2ac6090fe8c191b
Author: Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>
Date:	Sun Nov 14 00:40:10 2010 +0200

    Updated Finnish translation

 po/fi.po | 972
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 528 insertions(+), 444 deletions(-)

commit 2e8e24cd771f95e98de65219f7a70116088e1afa
Author: Gheyret T.Kenji <gheyret@gmail.com>
Date:	Sat Nov 13 21:49:27 2010 +0100

    Added UG translation

 po/ug.po | 3740
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 3740 insertions(+)

commit ff49ee828e63dd35b5c4faf3a0ccd962c7cd63a8
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:	Sat Nov 13 14:07:46 2010 +0000

    Stop using removed Individual convenience methods from folks

    They were removed from folks with commit
    def47dffa31a95ec6bd333f43c69822416098283. This doesn't require
    a dependency
    bump, since they're being replaced with calls to methods which exist
    in folks
    0.3.1. See: bgo#629078. Closes: bgo#634754

 .../empathy-individual-information-dialog.c	    |  2 +-
 libempathy-gtk/empathy-individual-store.c	    | 42
 +++++++++++-----------
 libempathy-gtk/empathy-individual-view.c	    |  6 ++--
 libempathy-gtk/empathy-linking-dialog.c	    |  2 +-
 libempathy-gtk/empathy-ui-utils.c		    |  3 +-
 libempathy/empathy-individual-manager.c	    |  2 +-
 6 files changed, 30 insertions(+), 27 deletions(-)

commit 2b1e108d1d4f19249c3fe666503e86df0da720dd
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sat Nov 13 01:11:19 2010 +0100

    Updated Galician translations

 po/gl.po | 394
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 214 insertions(+), 180 deletions(-)

commit 875bf697d54f1c4ca98478ded849bc733828f758
Author: Vitaly Minko <vitaly.minko@gmail.com>
Date:	Fri Nov 12 17:47:51 2010 +0300

    Make AccountChooser-related code simpler and clearer (re #633481).

 libempathy-gtk/empathy-account-chooser.c    | 32 +++++++++++++++++++-----
 libempathy-gtk/empathy-new-message-dialog.c | 33
 ++++---------------------
 src/empathy-new-chatroom-dialog.c	     | 38
 +++++------------------------
 3 files changed, 37 insertions(+), 66 deletions(-)

commit eb67ffa2d04e73f078f969f751c45678dc35a430
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 12 11:10:19 2010 +0100

    cell-renderer-text: implement get_preferred_height_for_width instead
    of get_size (#628043)

 libempathy-gtk/empathy-cell-renderer-text.c | 52
 +++++++++++------------------
 1 file changed, 20 insertions(+), 32 deletions(-)

commit 618c05bffb618c1ce5321c354e605afbdcec5553
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Thu Nov 11 17:22:30 2010 +0100

    Updated Spanish translation

 po/es.po | 262
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 136 insertions(+), 126 deletions(-)

commit c87c03791366d2d038f2854c171e0c91e17207aa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 11 15:03:46 2010 +0100

    input-text-view: use get_preferred_height instead of size_request

 libempathy-gtk/empathy-input-text-view.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

commit 379f636d605a99f04fbd29481ff755e783f34707
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 11 14:41:05 2010 +0100

    move size-requst handling in input-text-view

 libempathy-gtk/empathy-chat.c		  | 38 -------------------------
 libempathy-gtk/empathy-input-text-view.c | 49
 +++++++++++++++++++++++++++++++-
 2 files changed, 48 insertions(+), 39 deletions(-)

commit 1c7e66a2a609bf5e956c6f76bf7db7e585860731
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 11 14:31:09 2010 +0100

    add EmpathyInputTextView

 libempathy-gtk/Makefile.am		  |  2 ++
 libempathy-gtk/empathy-chat.c		  | 11 ++----
 libempathy-gtk/empathy-input-text-view.c | 62
 ++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-input-text-view.h | 62
 ++++++++++++++++++++++++++++++++
 4 files changed, 129 insertions(+), 8 deletions(-)

commit b1ca9031bfee03b12d6a4002d223b96a03810c20
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 11 13:52:40 2010 +0100

    empathy-chat: remove the size-request hack (#633835)

    It just work with GTK+3 \o/

 libempathy-gtk/empathy-chat.c | 51
 -------------------------------------------
 1 file changed, 51 deletions(-)

commit 3055c76a94c9628ef30da3bcdf1ca894cb671796
Author: Vitaly Minko <vitaly.mink@gmail.com>
Date:	Thu Nov 11 13:32:45 2010 +0100

    Display text in verbatim (#625745)

 libempathy-gtk/empathy-theme-adium.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 18d649cbfd8eda7678957a3d2a76b9bb8681a981
Author: Vitaly Minko <vitaly.minko@gmail.com>
Date:	Wed Nov 10 20:23:39 2010 +0300

    Make AccountChooser filters asynchronous to let them handle newly
    connected accounts properly (#633481).

 libempathy-gtk/empathy-account-chooser.c	  |  87
 ++++++++++++++-----
 libempathy-gtk/empathy-account-chooser.h	  |  26 +++++-
 libempathy-gtk/empathy-contact-dialogs.c	  |  16 ++--
 libempathy-gtk/empathy-contact-selector-dialog.c |  12 ++-
 libempathy-gtk/empathy-contact-selector-dialog.h |   6 +-
 libempathy-gtk/empathy-individual-dialogs.c	  |  11 ++-
 libempathy-gtk/empathy-new-call-dialog.c	  |  86
 ++++++++++++++-----
 libempathy-gtk/empathy-new-message-dialog.c	  |  85
 +++++++++++++++----
 src/empathy-new-chatroom-dialog.c		  | 103
 +++++++++++++++++------
 tests/interactive/test-empathy-account-chooser.c |   6 +-
 10 files changed, 336 insertions(+), 102 deletions(-)

commit c6cd722328a112e8f4b015ca57ffe8dc72f50cd8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 9 09:59:32 2010 +0100

    about-dialog: add my email

 src/empathy-about-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1cb5c43aef3aa182fa8b3b5aca74461ce7e90ab9
Merge: 13953e5 ccb133e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 9 09:49:25 2010 +0100

    Merge branch 'subscription-msg-630707'

commit 13953e50b8935ffcec168ffee32697a76ebf3db0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 9 09:39:10 2010 +0100

    init GTK+ before empathy-gtk

 src/empathy-debugger.c | 1 +
 1 file changed, 1 insertion(+)

commit ccb133e0244bd3812c0d40661942f0e003a8ea03
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 9 09:18:04 2010 +0100

    pass message to empathy_subscription_dialog_show

 src/empathy-event-manager.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit e390a8a182a198b0e7a8f60a760773019f6d4e08
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 27 18:57:08 2010 +0200

    empathy_subscription_dialog_show: display user's message if any
    (#630707)

 libempathy-gtk/empathy-contact-dialogs.c | 25 ++++++++++++++++++++++++-
 libempathy-gtk/empathy-contact-dialogs.h |  1 +
 src/empathy-event-manager.c		  |  2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)

commit 877ea6bc7673b4a3a31be2528a3f6e4bcad4262e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 28 15:08:18 2010 +0200

    Add Accept/Decline button in subscription notifications (#630706)

 src/empathy-status-icon.c | 54
 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

commit 2d91d86e1638f3c9a9be8be63ff974a8fc28d9ce
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 28 14:57:38 2010 +0200

    add empathy_event_remove()

 src/empathy-event-manager.c | 10 ++++++++--
 src/empathy-event-manager.h |	1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

commit a42effc9db9ad032587ded4d095bc8339b77a2ae
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Mon Nov 8 23:21:19 2010 +0200

    Updated Hebrew translation.

 po/he.po | 106
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 58 insertions(+), 48 deletions(-)

commit 8b856d4c77dd9dff397ff840ec318cab05c5bba7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 8 16:31:38 2010 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 file changed, 1 insertion(+)

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 file changed, 1 insertion(+), 1 deletion(-)

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 file 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 file 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 file 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 file 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 | 2033
 ++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1276 insertions(+), 757 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 file 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 file 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 file 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 file 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 file 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 file changed, 58 insertions(+)

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 file 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 file 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 file changed, 19 insertions(+), 1 deletion(-)

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 file changed, 10 insertions(+), 1 deletion(-)

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 file changed, 15 insertions(+), 1 deletion(-)

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 file changed, 8 insertions(+), 1 deletion(-)

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 file 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 file 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 file 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 file 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 file changed, 1 insertion(+), 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file changed, 1 insertion(+), 1 deletion(-)

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 file changed, 25 insertions(+)

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 file 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 file 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 file 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 file changed, 54 insertions(+)

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 file 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 file 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 file changed, 1 insertion(+), 1 deletion(-)

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 file 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

 data/org.freedesktop.Telepathy.Client.Empathy.Chat.service.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 file 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 file 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 file 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 file changed, 1 insertion(+), 1 deletion(-)

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 file 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 file 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 file 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 file changed, 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 deletion(-)

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(+)

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 +++---
 ...rg.freedesktop.Telepathy.Client.Empathy.Chat.service.in |  3 +++
 data/org.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 file changed, 1 insertion(+)

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 file 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 | 2005
 +++++++++++++++++++++++++++++++++--------------------
 1 file changed, 1257 insertions(+), 748 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 file 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 file 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 file changed, 1 insertion(+)

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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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, 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 file 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 file 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 file 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 file changed, 1 insertion(+), 1 deletion(-)

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 file 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 file changed, 1 insertion(+), 1 deletion(-)

commit 1c188eb538d9a8d191f70c3a994874db7e7bd397
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 18 16:18:05 2010 +0200

    prepare 2.91.1

 NEWS	      | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 50 insertions(+), 2 deletions(-)

commit e0586a58f10fe82931a2e4861d0ecd2ea7dfb0f0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 18 16:06:14 2010 +0200

    release.py: update last_tag_pattern

 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 798670e5ec296942eb26797cbc9dc8bb3cd2d771
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 18 16:35:20 2010 +0200

    move the 'Find in contact list' menu item

 src/empathy-main-window.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0446279dbf79a85718ca7a71bb6588d389ed15f5
Merge: d91cd1d b3a5b44
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 18 15:22:46 2010 +0200

    Merge remote branch 'vminko/fix-632024-v2'

commit d91cd1d110fa660385574d3a9128b83287fc9a92
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 18 15:05:21 2010 +0200

    individual-widget: set xalign on the status message (#632434)

    Seems the default changed in GTK3.

 libempathy-gtk/empathy-individual-widget.c | 1 +
 1 file changed, 1 insertion(+)

commit b3a5b441b884c25198b77ae014cde3b73d396257
Author: Vitaly Minko <vitaly.minko@gmail.com>
Date:	Mon Oct 18 16:51:03 2010 +0400

    Move the 'Find in Contact List' item from the View menu to the
    Edit menu.

 src/empathy-main-window.c  |  4 ++--
 src/empathy-main-window.ui | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

commit 2d25c8605b4e6a2cb832955de7f6e12080a658e0
Author: Vitaly Minko <vitaly.minko@gmail.com>
Date:	Mon Oct 18 15:32:37 2010 +0400

    Add an entry in the View menu to search for contacts (#632024).

 libempathy-gtk/empathy-individual-view.c | 19 +++++++++++++++----
 libempathy-gtk/empathy-individual-view.h |  2 ++
 src/empathy-main-window.c		  | 10 ++++++++++
 src/empathy-main-window.ui		  |  7 +++++++
 4 files changed, 34 insertions(+), 4 deletions(-)

commit 5ddb08157c2b22b3fe3d95ceaee89a641aadbb7f
Merge: 0da5677 f127e56
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 18 12:34:38 2010 +0200

    Merge branch 'no-notif-632422'

commit f127e56c1b1f27bf7b8be219e13a7c71ffdb63ec
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 18 11:23:29 2010 +0200

    empathy_notify_manager_notification_is_enabled: properly check the
    EMPATHY_PREFS_NOTIFICATIONS_DISABLED_AWAY preference

    If this key is set, that means we do NOT want the notification
    when being
    away/busy.

 libempathy-gtk/empathy-notify-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0da5677984bf4820ec0e723141bf43d3539a0fa3
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Oct 18 11:09:13 2010 +0200

    Updated Spanish translation

 po/es.po | 152
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 83 insertions(+), 69 deletions(-)

commit 64b7bd12aa298e080047cace1918d19098509b0a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 15 15:36:41 2010 +0200

    empathy-av: use GtkApplication (#621339)

 src/empathy-av.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 359fed84d5ee5b0fb82699cb927dbc3293c235cc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 15 15:31:07 2010 +0200

    empathy-debugger: use GtkApplication (#621339)

 src/empathy-debugger.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit 935bd1c90642bbef3430f19769e5649354f75731
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 15 15:28:51 2010 +0200

    define EMPATHY_DBUS_NAME

 src/empathy.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit fd57d14531134f57783ab46d6a366c3c23827685
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 15 15:25:39 2010 +0200

    stop linking on libunique

 configure.ac	 | 2 --
 src/Makefile.am | 4 ----
 2 files changed, 6 deletions(-)

commit 96311a0b2a5f03c2208ca8b383332ccfd154b8cb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 15 15:23:39 2010 +0200

    empathy-accounts-common: no need to include unique

 src/empathy-accounts-common.c | 1 -
 1 file changed, 1 deletion(-)

commit e34270c0664061091a9abdebe3df75e76adc5f3f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 15 15:22:59 2010 +0200

    empathy-accounts: port to GtkApplication (#621339)

 src/empathy-accounts.c | 53
 ++++++++++++--------------------------------------
 1 file changed, 12 insertions(+), 41 deletions(-)

commit 383e325a32599a0d359e3574cb86859c8a1ed76c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 15 14:35:19 2010 +0200

    Use GtkApplication::activated instead of libunique

    Also use empathy_window_present() to present the existing window as
    it does
    what we need.

 src/empathy.c | 75
 +++++++++++++++++------------------------------------------
 1 file changed, 21 insertions(+), 54 deletions(-)

commit 5d9afc90e6d9f07aa3408c1e230d0856d71f1363
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 15 13:02:06 2010 +0200

    EmpathyApp: inherit from GtkApplication (#621339)

 src/empathy.c | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

commit d002bc22326aaa6f710ab6f282486c19ef7b6261
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 14 17:20:58 2010 +0200

    Create a EmpathyApp object

 src/empathy.c | 418
 +++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 271 insertions(+), 147 deletions(-)

commit 2ff9d1b7c0ba3d1fe4e39941a89ed15e74509371
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Oct 18 10:35:34 2010 +1100

    Port empathy-debug-window to GtkComboBoxText

 src/empathy-debug-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit dcb853028f46c6d2f9f27af870b3311afb098644
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Oct 18 10:35:20 2010 +1100

    Port empathy-account-assistant to GtkComboBoxText

 src/empathy-account-assistant.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 0edff90c614fd8011c12c7be6981df5d9443f41b
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Oct 18 10:35:00 2010 +1100

    Port empathy-status-preset-dialog to GtkComboBox

 libempathy-gtk/empathy-status-preset-dialog.c	| 4 ++--
 libempathy-gtk/empathy-status-preset-dialog.h	| 2 +-
 libempathy-gtk/empathy-status-preset-dialog.ui | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

commit 18c25feae5e0094113b7e7327b3f0de308f1f369
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Oct 18 10:34:37 2010 +1100

    Port empathy-presence-chooser to GtkComboBox

 libempathy-gtk/empathy-presence-chooser.c | 24 ++++++++++++++++++------
 libempathy-gtk/empathy-presence-chooser.h |  6 +++---
 2 files changed, 21 insertions(+), 9 deletions(-)

commit 873f14fac716544d076fea1776f2b44c9dc233f6
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Oct 18 11:07:07 2010 +1100

    Bump GTK+ requirement to 2.91.1

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 643dc00f6a6e60f1dae91647301505169e8c7791
Merge: 2a7871a 53ca6d2
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Oct 18 09:14:11 2010 +1100

    Merge branch 'external-accounts'

commit 2a7871af19764420ad2fa78dfa97dca517a130da
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Sun Oct 17 15:12:32 2010 +0300

    [l10n] Updated Estonian translation

 po/et.po | 100
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 56 insertions(+), 44 deletions(-)

commit 378e46aee2d8376db3e6fbd1a9356cacf72a7aef
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sat Oct 16 12:46:05 2010 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 815
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 416 insertions(+), 399 deletions(-)

commit 2c5175128196c93f648b165bc7e155f5d9cef1c3
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Wed Oct 13 11:36:05 2010 -0700

    Retain the ContactManager for the lifetime of the main window.

    The ContactManager doesn't cleanly disconnect its signals when
    it's finalized
    (or initialized), so we need to retain it for the lifetime of the
    main window
    to avoid segfaults. It's not worth fixing the ContactManager,
    since we're
    planning to remove it.

 src/empathy-main-window.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

commit 1291ec05478f211d37479fc98904d9d3dda743b0
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Tue Oct 12 23:22:23 2010 -0700

    Remove obsolete ContactManager from IndividualManager.

    Helps bgo#625969.

 libempathy/empathy-individual-manager.c | 5 -----
 1 file changed, 5 deletions(-)

commit f5f2d3a1cf71a4fc89c517a15d1413bfd1bfcac5
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Tue Oct 12 23:20:55 2010 -0700

    Cut obsolete IndividualManagerFlags.

    Helps bgo#625969.

 libempathy/empathy-individual-manager.c | 30
 ------------------------------
 libempathy/empathy-individual-manager.h | 13 -------------
 2 files changed, 43 deletions(-)

commit 5598cb0b0b012199fb5cfe8a0f2a5b05ed8078c8
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Tue Oct 12 23:16:17 2010 -0700

    Add missing #include.

 libempathy/empathy-contact.c | 1 +
 1 file changed, 1 insertion(+)

commit a4cd05f5f8aeb4067652e4806f0e125b221d8ad1
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Tue Oct 12 22:45:53 2010 -0700

    Use Folks to check if a TpConnection can alias and group personas.

    Helps bgo#625969.

 libempathy-gtk/empathy-individual-menu.c |  7 ++-----
 libempathy/empathy-utils.c		  | 28
 ++++++++++++++++++++++++++++
 libempathy/empathy-utils.h		  |  2 ++
 3 files changed, 32 insertions(+), 5 deletions(-)

commit 4f39984ad575e8ee643e3cf52ad519386c23009e
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Tue Oct 12 09:45:03 2010 -0700

    Use Folks to check if a TpConnection can add personas.

    Helps bgo#625969.

 libempathy-gtk/empathy-individual-dialogs.c |	3 +-
 libempathy/empathy-utils.c		     | 52
 +++++++++++++++++++++++++++++
 libempathy/empathy-utils.h		     |	3 ++
 3 files changed, 56 insertions(+), 2 deletions(-)

commit 31905d995ddb96e2e25a795fa197cb541bc7724d
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Mon Oct 11 12:52:18 2010 -0700

    Use Folks to check the ability to remove Individuals in the store
    & view.

    Helps bgo#625969.

 configure.ac				   |  2 +-
 libempathy-gtk/empathy-individual-store.c | 14 +++------
 libempathy-gtk/empathy-individual-store.h |  1 -
 libempathy-gtk/empathy-individual-view.c  | 51
 +++++++++++++------------------
 libempathy-gtk/empathy-individual-view.h  |  3 --
 5 files changed, 27 insertions(+), 44 deletions(-)

commit cddc09f1ca10d13de7d71fa199b1ae4d5a7c8784
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	Fri Oct 15 21:46:04 2010 +0200

    Updated Slovenian translation

 help/sl/sl.po | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

commit 1f77f0d10cd6ce602b74210bf708e74d0ca83d52
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	Fri Oct 15 21:44:19 2010 +0200

    Updated Slovenian translation

 help/sl/sl.po | 1009
 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 527 insertions(+), 482 deletions(-)

commit aeec22a98c9acae6fe793fbd1e6cd37b5dc9058c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 15 11:52:08 2010 +0200

    help/.gitignore: ignore sl generated files

 help/.gitignore | 2 ++
 1 file changed, 2 insertions(+)

commit db7e70826c705e3724cecb2ba509242c3472ede0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 15 11:51:27 2010 +0200

    help/.gitignore: sort

 help/.gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 63d63edcd3294a47367b530e3b627e4354cc348c
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Fri Oct 15 11:47:40 2010 +0200

    Updated Spanish translation

 po/es.po | 70
 ++++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 44 insertions(+), 26 deletions(-)

commit 26e03eb5ff87e6148a7a316c9538e94e6587cfe3
Author: Vitaly Minko <vitaly.minko@gmail.com>
Date:	Fri Oct 15 11:18:56 2010 +0200

    Separate spelling suggestions in one sub-menu per language (#532832)

 libempathy-gtk/empathy-chat.c	| 90
 +++++++++++++++++++++++++++++++----------
 libempathy-gtk/empathy-spell.c | 91
 ++++++++++++++++++++++++------------------
 libempathy-gtk/empathy-spell.h |  4 +-
 src/empathy-preferences.c	| 35 +++++++---------
 4 files changed, 138 insertions(+), 82 deletions(-)

commit c07cc33d2453bc8bcb5597439f620a7534680d31
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Fri Oct 15 08:03:48 2010 +0530

    A modal dialog to warn the user if account manager could not be
    contacted

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=594576

    Reviewed-by: Danielle Madeley <danielle.madeley@collabora.co.uk>

 src/empathy.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit b13f029ad4b09ea1c61de7e05ff46eec9b7f2647
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Thu Oct 14 20:02:10 2010 +0200

    Added sl for Slovenian translation

 help/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2afeae6b56b1f0f2e2bc457b23fc54eac05c34c0
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Thu Oct 14 19:59:45 2010 +0200

    Updated Slovenian translation

 help/sl/sl.po | 60
 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

commit 7a4c8e7c2e707d20051cfe0fcc5bcfc5a74fc622
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Thu Oct 14 19:55:41 2010 +0200

    Added Slovenian translation

 help/sl/sl.po | 2267
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 2267 insertions(+)

commit 054e1f0bf407756fa8380513d3b1d24930503cce
Author: Vitaly Minko <vitaly.minko@gmail.com>
Date:	Thu Oct 14 11:55:25 2010 +0200

    Check format of some user names (#629261)

 libempathy-gtk/empathy-account-widget.c | 113
 ++++++++++++++++++++++++++++++++
 libempathy/empathy-account-settings.c	 | 106
 +++++++++++++++++++++++-------
 libempathy/empathy-account-settings.h	 |   8 +++
 3 files changed, 205 insertions(+), 22 deletions(-)

commit 1f107665d98cfba8175d47b46ff35dca07d886bc
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Thu Oct 14 11:14:18 2010 +0200

    Updated Hebrew translation.

 po/he.po | 103
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 52 insertions(+), 51 deletions(-)

commit fd1ccf04926964b9434701791c5f62078c5a69c4
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Wed Oct 13 15:50:37 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 707
 ++++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 705
 +++++++++++++++++++++++++++++++----------------------------
 2 files changed, 743 insertions(+), 669 deletions(-)

commit 33c0aab9178123734e88c5ac14e86fba36e05ff8
Author: A S Alam <aalam@users.sf.net>
Date:	Wed Oct 13 07:37:53 2010 +0530

    updating translation for Punjabi

 po/pa.po | 737
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 380 insertions(+), 357 deletions(-)

commit c959939c36693235243c46fcdbfe956eff943472
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Tue Oct 12 22:51:32 2010 +0200

    Updated Spanish translation

 po/es.po | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

commit 888df7fc53595e18c5de077860881bd10f327cc5
Author: Vitaly Minko <vitaly.minko@gmail.com>
Date:	Mon Oct 11 15:51:38 2010 +0200

    enable imported Pidgin accounts if needed (#594145)

 src/empathy-import-pidgin.c | 53
 +++++++++++++++++++++++++++++++++++++++++----
 src/empathy-import-utils.c  |	1 +
 src/empathy-import-utils.h  |	2 ++
 src/empathy-import-widget.c | 11 +++++++++-
 4 files changed, 62 insertions(+), 5 deletions(-)

commit 4722911e579557b37f543ee03d51562c02272184
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Oct 11 14:34:58 2010 +0200

    Updated Spanish translation

 po/es.po | 394
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 203 insertions(+), 191 deletions(-)

commit b8a1793bad1703c8a4aa6c487e41346e42527df0
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Mon Oct 11 10:33:54 2010 +0200

    Updated Galician translations

 po/gl.po | 706
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 358 insertions(+), 348 deletions(-)

commit 53ca6d2ca5de5401e55171bc71a3d75cc7e18fb8
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Oct 11 19:13:26 2010 +1100

    Bump required tp-glib version to 0.13.1.1

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0ee7dc02b4f710edcd83a41910ce5cdf5e51475b
Merge: 8cfe1e4 6c8e88f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Oct 11 19:04:12 2010 +1100

    Merge branch 'gcr-trivia-631657'

commit 6c8e88f2405c3c8f9b8ed8942407643ff5eeed0f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Oct 11 12:34:24 2010 +1100

    Force the GcrCertificateWidget to be at least 150 pixels high

 libempathy-gtk/empathy-tls-dialog.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 5c5bf4621619277a7a24e328f8a46ba49bb4211f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Oct 11 12:04:12 2010 +1100

    Remove formatting line breaks from translatable strings.

    Add extra line breaks.
    Add punctuation to translatable strings.

 libempathy-gtk/empathy-tls-dialog.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

commit 8cfe1e4d27b1da878ded1811f07f995ae3c34ccc
Author: Gil Forcada <gforcada@gnome.org>
Date:	Sun Oct 10 23:12:15 2010 +0200

    Updated Catalan translation

 po/ca.po | 1932
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 1194 insertions(+), 738 deletions(-)

commit 7a9411155285e47b40d5c82327a4074116645c0a
Author: Changwoo Ryu <cwryu@debian.org>
Date:	Sat Oct 9 09:14:51 2010 +0900

    Updated Korean translation

 po/ko.po | 1994
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1245 insertions(+), 749 deletions(-)

commit 69ccb1c49425512fd078f7d6901fbb0058c87fe9
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Oct 8 13:07:33 2010 +1100

    Fix Empathy to build with gcr-3

    Closes https://bugzilla.gnome.org/show_bug.cgi?id=631657

 libempathy-gtk/empathy-tls-dialog.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 99651e27bfe1dd1be31db6119f2cbd8686a905d0
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Oct 8 13:06:14 2010 +1100

    Access Account.I.Storage properties via TpAccount

 libempathy-gtk/empathy-account-widget.c | 73
 +++++++++++++++++----------------
 libempathy/empathy-account-settings.c	 |  9 +++-
 2 files changed, 45 insertions(+), 37 deletions(-)

commit aaebc7e2323b89aa577d7d724257522fd0407d3f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Oct 8 12:27:17 2010 +1100

    Revert changes to empathy-account-settings

 libempathy/empathy-account-settings.c | 92
 -----------------------------------
 libempathy/empathy-account-settings.h | 10 ----
 2 files changed, 102 deletions(-)

commit 9936a3252f26ddd99e936ad41dc03b1e83eba6ea
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 21 19:23:22 2010 +1000

    Support Account.Interface.Storage

    Also support org.moblin.libsocialweb for Meego

 configure.ac				 |   1 +
 libempathy-gtk/empathy-account-widget.c | 169
 +++++++++++++++++++++++++++-----
 libempathy/empathy-account-settings.c	 |  92 +++++++++++++++++
 libempathy/empathy-account-settings.h	 |  10 ++
 4 files changed, 246 insertions(+), 26 deletions(-)

commit 6f6575656b1553190bbaf698ee0671a6a8bc5bf4
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Wed Oct 6 15:06:38 2010 +0200

    Updated Slovenian translation

 po/sl.po | 1069
 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 459 insertions(+), 610 deletions(-)

commit e2087d9cd12d7f79e7409618b5ff661d04d9e686
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 6 12:06:59 2010 +0200

    main-window: elipsize "No match found" message

    This avoid to enlarge the contact list when displaying it (#631455).

 src/empathy-main-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit 9ff924e6e512d21414e080d78b93cdde8a3ae4fa
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Wed Oct 6 01:49:12 2010 +0200

    Updated Hebrew translation.

 po/he.po | 601
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 304 insertions(+), 297 deletions(-)

commit c772ac27197ef0440c81bc45496fa78875004da5
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Mon Oct 4 11:48:38 2010 -0700

    Update for changes to GTK 3 API.

 libempathy-gtk/empathy-cell-renderer-activatable.c |  4 ++--
 libempathy-gtk/empathy-cell-renderer-expander.c    | 26
 +++++++++++-----------
 libempathy-gtk/empathy-cell-renderer-text.c	    | 16 ++++++-------
 3 files changed, 23 insertions(+), 23 deletions(-)

commit 1594b24862967f7d0046c8d4328b11a0b2b45330
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Thu Sep 30 20:20:51 2010 -0700

    Don't bother fetching contact avatar details, since we already do
    that in Folks.

 libempathy/empathy-tp-contact-factory.c | 2 --
 1 file changed, 2 deletions(-)

commit 53aa7c1e6546214568969fe727926f7740a26127
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Sep 15 15:23:14 2010 +0100

    Port Empathy to use FolksAliasable and FolksGroupable

    FolksAliasable is the new name for FolksAlias, and FolksGroupable
    is the new name for FolksGroups.

 configure.ac				    |  2 +-
 libempathy-gtk/empathy-contact-widget.c    |  4 +--
 libempathy-gtk/empathy-groups-widget.c     | 48
 +++++++++++++++---------------
 libempathy-gtk/empathy-groups-widget.h     |  6 ++--
 libempathy-gtk/empathy-individual-view.c   |  8 ++---
 libempathy-gtk/empathy-individual-widget.c | 12 ++++----
 libempathy-gtk/empathy-persona-store.c     | 16 +++++-----
 libempathy/empathy-contact.c		    | 14 ++++-----
 libempathy/empathy-individual-manager.c    |  6 ++--
 libempathy/empathy-utils.c		    |  2 +-
 libempathy/empathy-utils.h		    |  2 +-
 11 files changed, 61 insertions(+), 59 deletions(-)

commit 3195780450fdcfe8678bf29e5fd20cb957283bc2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 4 16:50:53 2010 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a8bb1c59bba2f69ff3110822f2353c16f49d5a6a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 4 13:01:11 2010 +0200

    prepare 2.91.0 release

 NEWS	      | 27 +++++++++++++++++++++++++++
 configure.ac |  6 +++---
 2 files changed, 30 insertions(+), 3 deletions(-)

commit d5bcb9462a07ab89e5ce525c0f3572fd94feceed
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 4 13:33:49 2010 +0200

    Bump required version of libcanberra and Webkit

    We now depends on the GTK+-3 flavour of those libs. Best to depend
    on the
    version which introduced the new pc file to make things clearer
    to packagers.

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ab782c7ac56fedf80b3c839b59670538675b7558
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 4 13:23:32 2010 +0200

    Depends on latest GTK3 release

    We already depends on it as we ported Empathy to latest API changes.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4fca76dda02cb3dde2c0ae4b14895fdb3381acbc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 4 13:00:57 2010 +0200

    release.py: update last_tag_pattern

 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2283d55ce9a4cbb3076ce9ae2e95ba70239ca782
Merge: a63cc37 0c0e2b5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 4 15:51:47 2010 +0200

    Merge remote branch 'sjoerd/master'

commit a63cc377a55674f8b9ff5870e1d5db211c43049a
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Oct 4 11:13:22 2010 +0200

    Don't ignore the CA certificate if it's the only one in the chain

    This avoids auth-client crashes for servers which provide only a
    self-signed CA as TLS certificate on connect (#631095).

 libempathy/empathy-tls-verifier.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit ae556603dd7e354ba17657bee405f20d4d84c902
Author: Vincent Untz <vuntz@gnome.org>
Date:	Sun Oct 3 21:25:05 2010 +0200

    Always show icons for meta-contacts in context menu

    https://bugzilla.gnome.org/show_bug.cgi?id=631098

 libempathy-gtk/empathy-individual-menu.c | 2 ++
 1 file changed, 2 insertions(+)

commit 2afe7493a5d5bc0edac6525b02f8cc5e414a7aa0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 4 09:50:02 2010 +0200

    remove deprecated FIXME

 libempathy-gtk/empathy-contact-menu.c | 1 -
 1 file changed, 1 deletion(-)

commit bc597f022145cdfbd661d4355583d85c86e0c7f4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 4 10:49:07 2010 +0200

    chat-window: port to new GtkNotebook API

 src/empathy-chat-window.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit 166ee29973d7db1d0a7a5844eaa488470f5079f9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 30 16:17:46 2010 +0200

    call-window: remove GTK2 compat code

 src/empathy-call-window.c | 9 ---------
 1 file changed, 9 deletions(-)

commit 442462170b4be90281b67a76e2e3f38daa3a8beb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 30 15:27:55 2010 +0200

    remove has-separator property from XML files

    It has been removed from GtkDialog

 libempathy-gtk/empathy-account-widget-irc.ui | 1 -
 libempathy-gtk/empathy-contact-dialogs.ui    | 1 -
 src/empathy-ft-manager.ui		      | 1 -
 src/empathy-new-chatroom-dialog.ui	      | 1 -
 4 files changed, 4 deletions(-)

commit 6c8ce8dd1587c237c4cadf5b91c3aa117cc01ae1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 30 15:14:32 2010 +0200

    don't set has-window on the spinner

    There is no reason to and that makes GTK assert.

 src/empathy-main-window.c | 1 -
 1 file changed, 1 deletion(-)

commit 28cda4cfa04b92840430137ecb366769d1a28791
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 30 14:09:02 2010 +0200

    empathy-video-widget: port to new GTK+3 API

 libempathy-gtk/empathy-video-widget.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

commit e47e07d74933c39641c56bfa2f66fd9b31007993
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 30 11:51:19 2010 +0200

    remove EmpathyKludgeLabel

    It shouldn't be needed any more with GTK-3.

 libempathy-gtk/Makefile.am		    |  2 -
 libempathy-gtk/empathy-contact-widget.c    |  4 +-
 libempathy-gtk/empathy-individual-widget.c |  4 +-
 libempathy-gtk/empathy-kludge-label.c	    | 92
 ------------------------------
 libempathy-gtk/empathy-kludge-label.h	    | 53 -----------------
 5 files changed, 2 insertions(+), 153 deletions(-)

commit aae6cabf7a463de9c7586fecc3d909db6b1194a9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 30 11:29:49 2010 +0200

    Import latest version of ev-sidebar from totem

    This one builds fine with GTK-3. Also, stop renamespacing it so it's
    easier to
    update it.

 src/Makefile.am	   |   9 +-
 src/empathy-call-window.c |  28 +--
 src/empathy-sidebar.c	   | 606
 ----------------------------------------------
 src/empathy-sidebar.h	   |  85 -------
 src/ev-sidebar.c	   | 338 ++++++++++++++++++++++++++
 src/ev-sidebar.h	   |  76 ++++++
 6 files changed, 434 insertions(+), 708 deletions(-)

commit 47d11da4f3d9cefb236143a3c229128b91f64419
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 29 16:57:54 2010 +0200

    empathy_window_iconify: use gdk_window_get_display()

 libempathy-gtk/empathy-ui-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e129fe6f1784b3e2b4012961fc9f553b9213d986
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 29 16:14:30 2010 +0200

    about-dialog: gtk_about_dialog_set_url_hook has been removed

 src/empathy-about-dialog.c | 14 --------------
 1 file changed, 14 deletions(-)

commit 75b6dbfd673890da51b7b969acfc1b7e9d644760
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 29 16:10:25 2010 +0200

    individual-linker: no more need to implement size_request

 libempathy-gtk/empathy-individual-linker.c | 26
 --------------------------
 1 file changed, 26 deletions(-)

commit ee234cca5708bbccf5d538f75bf85fa46aa2a274
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 29 16:09:23 2010 +0200

    no more need to implement chat_size_request

 libempathy-gtk/empathy-chat.c | 24 ------------------------
 1 file changed, 24 deletions(-)

commit 68b25e741eaee424bc108fce67f2a65df4151448
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 29 16:05:40 2010 +0200

    no more need to implement empathy_search_bar_size_request

    GtkBin is smarter now and does it for us.

 libempathy-gtk/empathy-search-bar.c | 22 ----------------------
 1 file changed, 22 deletions(-)

commit 5a5b01af718f2db74fb131b1fa6d3cc14ad88793
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 29 16:03:48 2010 +0200

    cell_renderer_text_render: update to new API

 libempathy-gtk/empathy-cell-renderer-text.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

commit cce96b15f7ee09f7666d6b2e081ad8bddc197d3c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 29 16:03:14 2010 +0200

    empathy_cell_renderer_expander_render: update to new API

 libempathy-gtk/empathy-cell-renderer-expander.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

commit 8fda16b2e760ca46315aa6b9ef7434e741940a92
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 29 15:57:57 2010 +0200

    cell_renderer_activatable_render: update to new API

 libempathy-gtk/empathy-cell-renderer-activatable.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

commit e7e4a5c52a92f3d0b328b7a66b14063d9ef96fa8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 29 15:55:59 2010 +0200

    use gdk_error_trap_pop_ignored() instead of gdk_error_trap_pop()

    We actually ignore the return value.

 libempathy-gtk/empathy-avatar-image.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b70f96a527146903d637ef75434423da9a5b7468
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 29 15:45:08 2010 +0200

    GDK keys are now GDK_KEY_*

 libempathy-gtk/empathy-contact-list-view.c |  4 ++--
 libempathy-gtk/empathy-individual-view.c   |  4 ++--
 libempathy-gtk/empathy-live-search.c	    | 14 +++++++-------
 libempathy-gtk/empathy-presence-chooser.c  |  4 ++--
 libempathy-gtk/empathy-search-bar.c	    |  2 +-
 src/empathy-call-window.c		    |  2 +-
 src/empathy-chat-window.c		    |  4 ++--
 src/empathy-debug-window.c		    |  4 ++--
 src/empathy-ft-manager.c		    |  4 ++--
 src/empathy-main-window.c		    |  2 +-
 src/empathy-sidebar.c			    |  8 ++++----
 src/empathy-status-icon.c		    |  2 +-
 12 files changed, 27 insertions(+), 27 deletions(-)

commit 23535a4ce054f952aa31012bbbc2fd894ba77ecd
Author: Matthias Clasen <mclasen@redhat.com>
Date:	Tue Sep 28 15:45:17 2010 +0200

    Stop using GtkObject (#630685)

 libempathy-gtk/empathy-live-search.c | 4 ++--
 src/empathy-sidebar.c		      | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

commit b9881f163ef17c95689cd65f5a9311e8759eb774
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 30 16:17:25 2010 +0200

    hard depend on GTK3 (#623925)

 configure.ac | 112
 +++++++++++++----------------------------------------------
 1 file changed, 25 insertions(+), 87 deletions(-)

commit 96800fa8a3afc1dca53a76dabf2dea30de27e348
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Sep 20 18:38:49 2010 +0100

    Set the ptime multiple for PCM codecs to 20ms, needed for interop
    with some SIP phones

 data/element-properties | 6 ++++++
 1 file changed, 6 insertions(+)

commit eec595130fcd2488e9c5bb99f03c9756082be223
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sat Oct 2 10:44:40 2010 +0200

    [l10n] Updated help Italian translation

 help/it/it.po | 646
 +++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 442 insertions(+), 204 deletions(-)

commit c1ce4603c615b7a9e0d46876b8ca03cc539093de
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Fri Oct 1 22:44:57 2010 +0200

    [help] Removed SIP provider link, fixes bug #631049

 help/C/create-account.page | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit ecc9b3d5e04bd929179b500ca5b84ee82dfc8e3c
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Fri Oct 1 15:11:24 2010 +0200

    Updated Slovenian translation

 po/sl.po | 456
 +++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 299 insertions(+), 157 deletions(-)

commit 3c961e3c9ca41b941b0846a3dd5e78f8bcfde866
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Fri Oct 1 12:28:33 2010 +0200

    Updated Spanish translation

 po/es.po | 480
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 245 insertions(+), 235 deletions(-)

commit 36e8870de17b9dffab299e3f4f099a10db6e67af
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 1 12:01:41 2010 +0200

    remove 'import-asked' gsettings key

 data/empathy.convert		       | 1 -
 data/org.gnome.Empathy.gschema.xml.in | 5 -----
 libempathy/empathy-gsettings.h        | 1 -
 3 files changed, 7 deletions(-)

commit f08b753e0c8f29709390c832275290dc2934fe82
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 1 11:56:24 2010 +0200

    accounts-dialog: stop displaying the import dialog automatically
    (#631080)

    User had seen the nice assistant before so he already imported his
    account if
    he wanted to.

 src/empathy-accounts-dialog.c | 19 -------------------
 1 file changed, 19 deletions(-)

commit db94fca28c28e0025d8d36bd5e4048a6213b482e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 1 11:26:27 2010 +0200

    empathy_account_settings_set_*: check arguments

 libempathy/empathy-account-settings.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit 25d8783e9f0a72dcd2210b9f4ec0dbc7994140a6
Author: Bilal Akhtar <bilalakhtar@ubuntu.com>
Date:	Fri Oct 1 10:47:09 2010 +0300

    Move the 'Clear' menu option in the chat window right-click context
    menu to the last place. (#629544)

 libempathy-gtk/empathy-chat-text-view.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 381be5d52f5410939dce528a6a3beda9b70b231c
Author: Michael Kotsarinis <mk73628@gmail.com>
Date:	Fri Oct 1 02:32:35 2010 +0300

    l10n: Updated Greek translation for empathy help

 help/el/el.po | 342
 ++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 235 insertions(+), 107 deletions(-)

commit ab542dc5acbf1727552c711427d15a4f07b7e5d8
Author: Simos Xenitellis <simos@gnome.org>
Date:	Thu Sep 30 15:11:56 2010 +0300

    l10n: Updated Greek translation for empathy

 po/el.po | 728
 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 458 insertions(+), 270 deletions(-)

commit bf32549f220c7adb3133b413490cf1af276c9cc6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 30 11:38:12 2010 +0200

    coding style fixes

 libempathy/empathy-utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 1e6d8b7b214389b03bb94762333c0f15e6351579
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 30 11:35:59 2010 +0200

    add empathy-protocol-chooser.c to POTFILES.in

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit b68e00fd8bba2dec6140eaa45be99f3cf9e8287b
Merge: f83fcfb 204eecf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 29 17:37:26 2010 +0200

    Merge branch 'conference-tp-glib-630709'

commit f83fcfb28e6cf8d3f2ba31dddebc597eac934dae
Author: Žygimantas Beručka <zygis@gnome.org>
Date:	Wed Sep 29 14:18:30 2010 +0200

    Updated Lithuanian translation

 po/lt.po | 325
 ++++++++++++++++++++++++++-------------------------------------
 1 file changed, 132 insertions(+), 193 deletions(-)

commit 204eecf6dd4fc8da63f3f82e93af1ffa72836583
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 29 14:09:26 2010 +0200

    use TP_PROP_*

 libempathy/empathy-tp-chat.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 140247122d8b06b3ed1c293c562306a3056a373a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 29 14:02:07 2010 +0200

    Stop generating Conference API

 extensions/Channel_Interface_Conference.xml | 635
 ----------------------------
 extensions/Makefile.am			     |	 1 -
 extensions/misc.xml			     |	 1 -
 3 files changed, 637 deletions(-)

commit 12c53ccc7ab841ec7a6e52c3718316952d2518a9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 29 14:04:15 2010 +0200

    use tp-glib API for Conference (#630709)

 libempathy/empathy-tp-chat.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 733e7394cb7f805c41332c07336347e87b86c590
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 29 14:02:22 2010 +0200

    bump tp-glib dep to  0.11.16

    Conference API is generated since this version.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5cf10ed55ac02529b7ad8d960e6974da0bf4bf5f
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Wed Sep 29 13:53:53 2010 +0200

    Fix a typo

 help/hu/hu.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e713c34cf46fe2d1159f8c1d62cae220c8f40f3b
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Wed Sep 29 13:28:16 2010 +0200

    [i18n] Updated German translation

 po/de.po | 361
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 179 insertions(+), 182 deletions(-)

commit 1079bc533604184921cbd08cb85416cf33e721b7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 29 12:59:28 2010 +0200

    Update version

    Next release will be 2.91.0 so let's be 2.90.99 for now.

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2e589ed7517c0f98320481b93d6a9fcc39d56a3b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 28 13:30:03 2010 +0200

    use gettext() instead of _()

 libempathy/empathy-utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 4ac0bdf3c3322e5f4d94586569b8c60244e421c1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 28 13:19:42 2010 +0200

    allow to translate 'Google Talk'

    We allow to translate 'Facebook Chat' so best stay coherent.

 libempathy/empathy-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d6e5c9087b7c611c8b03a5239dbf9eb5aa50a9b4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 17 16:27:39 2010 +0200

    Allow to set the Service of newly created account (#629734)

 libempathy-gtk/empathy-protocol-chooser.c |  2 +-
 libempathy/empathy-account-settings.c	   | 32
 +++++++++++++++++++++++++++++++
 libempathy/empathy-account-settings.h	   |  4 ++++
 src/empathy-auto-salut-account-helper.c   |  2 +-
 4 files changed, 38 insertions(+), 2 deletions(-)

commit 9cd957b56a67984b4fd3d89aec3e6606372462d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 17 15:55:45 2010 +0200

    factor out empathy_protocol_chooser_create_account_settings()

    No need to keep this code duplicated.

 libempathy-gtk/empathy-protocol-chooser.c | 56
 ++++++++++++++++++++++++++++
 libempathy-gtk/empathy-protocol-chooser.h |  5 +++
 src/empathy-account-assistant.c	   | 59
 ++---------------------------
 src/empathy-accounts-dialog.c		   | 62
 ++-----------------------------
 4 files changed, 68 insertions(+), 114 deletions(-)

commit fc4059e17da2a94a3864f396b5de12d93865090d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 17 15:35:07 2010 +0200

    Add empathy_service_name_to_display_name()

    Also makes empathy_protocol_name_to_display_name() fallbacks to
    the protocol
    name so caller doesn't have to.

 libempathy-gtk/empathy-protocol-chooser.c |  8 +++-----
 libempathy/empathy-utils.c		   | 32
 ++++++++++++++++++++++++++++---
 libempathy/empathy-utils.h		   |  1 +
 src/empathy-account-assistant.c	   | 14 ++++++--------
 src/empathy-accounts-dialog.c		   | 16 +++++-----------
 5 files changed, 44 insertions(+), 27 deletions(-)

commit 3a6aca03ec70cb11d23cfd68e72a51a4a49220a2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 17 15:13:19 2010 +0200

    protocol-chooser: expose a 'service' string instead of boolean for
    facebook and gtalk

 libempathy-gtk/empathy-protocol-chooser.c | 46
 ++++++++++++-------------------
 libempathy-gtk/empathy-protocol-chooser.h |  6 ++--
 src/empathy-account-assistant.c	   | 32 +++++++++++++--------
 src/empathy-accounts-dialog.c		   | 26 +++++++++++------
 4 files changed, 57 insertions(+), 53 deletions(-)

commit 6341b2e61078bf64602c6de2115599690d680596
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 22 17:44:57 2010 +0200

    tp-roomlist: use TpAccountChannelRequest to create the channel

 libempathy/empathy-tp-roomlist.c | 76
 +++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 43 deletions(-)

commit e3ec7ef3fac49d470573eed6f31fd2e39ab72c40
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 22 15:33:59 2010 +0200

    Avoid to completely hide the last saved window when creating a new one

 src/empathy-chat-window.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 87a039507241c49c2cf6aeaf288c90a72c7119e3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 22 15:26:47 2010 +0200

    chat-window: remember the geometry of the last saved window

    This way new chat window have this geometry rather than the default
    one.

 src/empathy-chat-window.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

commit 1a69c8b6c2aa0ce113cd132eb7ead8058e9ddacb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 22 15:20:31 2010 +0200

    geometry: add suport for binding a window more than once

 libempathy-gtk/empathy-geometry.c | 105
 ++++++++++++++++++++++++++------------
 libempathy-gtk/empathy-geometry.h |   3 +-
 2 files changed, 75 insertions(+), 33 deletions(-)

commit a59a1e8874cdf7c0e1bc323543820f9a36167933
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 22 12:23:14 2010 +0200

    geometry: no need to export _load and _save

 libempathy-gtk/empathy-geometry.c | 4 ++--
 libempathy-gtk/empathy-geometry.h | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

commit af102f5b5497c155bece1e6d30a5efac06c86d68
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 22 11:55:45 2010 +0200

    chat-window: most of the functions can be static

 src/empathy-chat-window.c | 86
 +++++++++++++++++++++++++++--------------------
 src/empathy-chat-window.h | 18 +---------
 2 files changed, 51 insertions(+), 53 deletions(-)

commit 4bbcf0aa554eae683251b3a9681ad603bff57e18
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 15 13:13:11 2010 +0200

    Add context on "Select" strings (#629707)

 libempathy-gtk/empathy-groups-widget.c		     | 3 ++-
 libempathy-gtk/empathy-irc-network-chooser-dialog.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

commit d1eb6b4ce3920ac78f112e42e9b48f43fe600ab4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 29 11:02:05 2010 +0200

    fix typo

 libempathy-gtk/empathy-contact-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0c55599ad0a3210c60d37938b27225c607fc53fe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 28 16:08:27 2010 +0200

    field_value_is_empty: if the first element is not NULL field is
    not empty

 libempathy-gtk/empathy-contact-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit eb5008d66b2f55dd9c4f36d69a5a80cc48390f4e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 28 16:01:53 2010 +0200

    factor out field_value_is_empty()

 libempathy-gtk/empathy-contact-widget.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 90d9f4f454d2612643f1e17703df02661649ca12
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 27 10:46:20 2010 +0200

    add debug output

 libempathy-gtk/empathy-contact-widget.c | 3 +++
 1 file changed, 3 insertions(+)

commit 0f7279a3bbbe4bfd4dceb06e54ec983082d6c58f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 24 11:27:16 2010 +0200

    Add unsupported contact fields to details_to_set (#630427)

    This avoid to loss unsupported fields when closing the dialog.

 libempathy-gtk/empathy-contact-widget.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

commit e5bf164997d4580ae94fc1f2471a3bce6ac617b8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 24 11:15:17 2010 +0200

    Use tp_contact_info_field_copy() instead of creating a new field
    if found

 libempathy-gtk/empathy-contact-widget.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

commit c58139d810f6fc2b52637ae19839b92c3063bb78
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 24 10:31:33 2010 +0200

    contact_widget_details_update_edit: free the list returned by
    tp_contact_get_contact_info()

 libempathy-gtk/empathy-contact-widget.c | 1 +
 1 file changed, 1 insertion(+)

commit 795168da0bd6ef574206a2346038126b721a0eb9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 24 10:31:14 2010 +0200

    contact_widget_details_update_edit: no need to call
    tp_contact_get_contact_info() each iteration

 libempathy-gtk/empathy-contact-widget.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 6eeaa74b691e4dd7486b2bf7ffef236f582ac464
Author: Hannie Dumoleyn <lafeber-dumoleyn2@zonnet.nl>
Date:	Tue Sep 28 17:20:27 2010 +0200

    [i18n] Updated Dutch translation

 po/nl.po | 2098
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1344 insertions(+), 754 deletions(-)

commit b3b89c99324e36048b521bff044fff2735c2b177
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 28 13:02:51 2010 +0200

    ignore hu pages

 help/.gitignore | 2 ++
 1 file changed, 2 insertions(+)

commit 045d3c82deb7d6288c9026c98dc1b836370864ed
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 28 13:00:41 2010 +0200

    google-talk: no need to unset the 'server' param

    We don't set it anymore as fallback-servers super-seeded it but
    there is no
    point to unset; the account settings has just be created and is empty.

 src/empathy-account-assistant.c | 1 -
 src/empathy-accounts-dialog.c	 | 1 -
 2 files changed, 2 deletions(-)

commit 160736f1ea4964d5f6164c42913c094c6d25774f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 20 11:33:45 2010 +0200

    bump GTK+ dep to 2.22.0

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c7fdc8433c02694a4f456e4f7abfc44b93cecb70
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:	Sun Sep 19 18:10:20 2010 -0500

    empathy-chat: update GDK_ defines to GDK_KEY_

    This change works in both GTK+ 2.22 and GTK+ 3.0

    Bug #630107

 libempathy-gtk/empathy-chat.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit 4c517ce646a64c528b7340d7d57a09c0242f1c8f
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:	Sun Sep 19 18:08:00 2010 -0500

    Don't use deprecated gtk_dialog_set_has_separator

    This is deprecated in GTK+ 2.22

    Bug #630107

 libempathy-gtk/empathy-contact-dialogs.c		|  4 ----
 libempathy-gtk/empathy-contact-selector-dialog.c	|  2 --
 libempathy-gtk/empathy-individual-dialogs.c		|  1 -
 libempathy-gtk/empathy-individual-edit-dialog.c	|  1 -
 libempathy-gtk/empathy-individual-information-dialog.c |  1 -
 libempathy-gtk/empathy-linking-dialog.c		|  1 -
 libempathy-gtk/empathy-status-preset-dialog.c		|  1 -
 libempathy-gtk/empathy-ui-utils.h			| 16
 ----------------
 src/empathy-accounts-dialog.c				|  5 -----
 src/empathy-import-dialog.c				|  5 -----
 src/empathy-preferences.c				|  5 -----
 11 files changed, 42 deletions(-)

commit 8031eb1f58dff35e0deb3b01f80d75b6dce16454
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:	Sun Sep 19 18:06:27 2010 -0500

    empathy-avatar-image: don't use gdk_display global

    This is deprecated for GTK+ 2.22.

    Bug #630107

 libempathy-gtk/empathy-avatar-image.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 96da6bac8ac2cfa4b39cb27d6284b8f5d3dcfece
Author: Giannis Katsampirhs <juankatsampirhs@gmail.com>
Date:	Mon Sep 27 21:39:17 2010 +0300

    Updated Greek translation

 po/el.po | 1112
 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 484 insertions(+), 628 deletions(-)

commit 93e6230459c89c220dfe0d2ea4434fda3c85e4e2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 20 13:36:03 2010 +0200

    don't use gtk_window_present_with_time if timestamp ==
    GDK_CURRENT_TIME (#629922)

 libempathy-gtk/empathy-ui-utils.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 98f622ed45e569239ed32ba1aca7c9f3ca7732da
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 20 13:31:06 2010 +0200

    empathy_window_present: use gtk_get_current_event_time() as default
    timestamp (#629922)

 libempathy-gtk/empathy-ui-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a8f5972679288f101fc0ae993c34aa64ccc5acec
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 16 13:54:05 2010 +0200

    Disable the fullscreen action while we are not connected

 src/empathy-call-window.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit a277446bfd4a3a351e32b7704f5cb0dec109c17f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 16 13:47:03 2010 +0200

    empathy_call_window_fullscreen_set_cursor_visible: clean up function

 src/empathy-call-window-fullscreen.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 90d80cd4646694f544f95aa6af0dcf4e40b9dfb7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 16 13:39:14 2010 +0200

    Leave fullscreen mode when call is disconnected (#593437)

 src/empathy-call-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit 8049ff3dad3ea95b56a3be923ca5a51370d9cc82
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 16 13:38:56 2010 +0200

    show_borders: check if video_output still exists before using it

 src/empathy-call-window.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit 6d4cd24b722c8fc9ca63e24447b40892b84054de
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 16 13:38:05 2010 +0200

    empathy_call_window_fullscreen_set_cursor_visible: early return if
    video widget is NULL

 src/empathy-call-window-fullscreen.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 8b10e78f1885104417d39041c506a3a5bfe985eb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 16 13:37:34 2010 +0200

    call-window-fullscreen: NULLify the video widget when it's destroyed

 src/empathy-call-window-fullscreen.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 49918153e194f92b63049bf4bb93f13edfff7720
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 16 13:38:34 2010 +0200

    disconnect signal before destroying the video widget

 src/empathy-call-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 4ef008b72acb19f756f39e1a3795d1f3fc2c6820
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 16 13:08:41 2010 +0200

    factor out disconnect_video_output_motion_handler()

 src/empathy-call-window.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

commit fa600a4ea18f2c5e7163698fb44adccd9bc230b2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 22 11:29:53 2010 +0200

    call-window: remove the errors info bar when redialing (#630276)

 src/empathy-call-window.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 744a7afc76aba311c63ba8e7f6cced9d538da42a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 20 16:30:06 2010 +0200

    chat_window_new_message_cb: update the window icon as well (#558802)

    We want to change the window icon even if it's not focused.

 src/empathy-chat-window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 90d3b83c9a859a02e9439b41c81964acb7d5c070
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 17 14:17:05 2010 +0200

    voip_cmp_func: first check if we support and then audio

    This doesn't change anything when doing audio/video calls as we know
    for sure
    that the individials support the capabilities. But when doing chat,
    we first
    want to use the individial supporting video and then audio in case
    of a tie.

 libempathy/empathy-contact.c | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

commit a2851c345723360e779b9adc4fe17684136f40b7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 17 14:10:32 2010 +0200

    Prioritize default individual for chats using capabilities (#629912)

 libempathy/empathy-contact.c | 62
 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

commit 362d847a53dfa9c344781065c3b1af5952a405e3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 17 12:36:20 2010 +0200

    rename presence_sort_func to presence_cmp_func

    cmp_func() compare one feature (presence in this case) while
    sort_func() uses
    different cmp_func() to implement a feature specific sort.

 libempathy/empathy-contact.c | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

commit 23fc6264db524d903b3592f302dbcedae0edfab5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 16 10:47:55 2010 +0200

    empathy-accounts.c: check return value of unique_app_send_message
    (#629782)

 src/empathy-accounts.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 7d891f1e506421c8f05700d4b8d4df5b228eabf9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 16 10:47:46 2010 +0200

    empathy.c: check return value of unique_app_send_message (#629782)

 src/empathy.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 15c23ab80d0b2c5dba14ef5c8a671b8d157a2c2b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 27 15:15:58 2010 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 879c7af6493cb699a9925338f2e68dbe50680c8b
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Sep 27 14:58:28 2010 +0200

    Added Spanish translation, removed by mistake

 po/es.po | 4435
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 4435 insertions(+)

commit 88bc2e23655ac241b3201cc6e95b235a535217b1
Author: Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>
Date:	Mon Sep 27 21:43:03 2010 +0900

    Updated Japanese translation.

 po/ja.po | 85
 ++++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 48 insertions(+), 37 deletions(-)

commit 6067fe7784da71d766ccf1f8b3cfeee612fea554
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 27 11:43:25 2010 +0200

    prepare 2.32.0

 NEWS	      | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  6 +++---
 2 files changed, 57 insertions(+), 3 deletions(-)

commit 195a22476bac863bc3fe84009316051988d98d9b
Author: Damyan Ivanov <dam+gnome@ktnx.net>
Date:	Mon Sep 27 12:04:52 2010 +0300

    Updated Bulgarian translation

 po/bg.po | 1967
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 1203 insertions(+), 764 deletions(-)

commit 4d76137db79fe82d3519ef80124c238a0ef87274
Author: Claude Paroz <claude@2xlibre.net>
Date:	Mon Sep 27 10:55:28 2010 +0200

    [help] Updated French translation

 help/fr/fr.po | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

commit 9a86f7354190e8e7fd49fa5b1fef1a02d8088349
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Mon Sep 27 10:20:52 2010 +0200

    Updated Basque language

 po/eu.po | 221
 +++++++++++++++++++++++----------------------------------------
 1 file changed, 79 insertions(+), 142 deletions(-)

commit ff5a6f59da068e68703baebbf3d987d09c37ca9e
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sun Sep 26 11:33:46 2010 +0200

    Updated Spanish translation

 help/es/es.po |   15 +-
 po/es.po      | 4435
 ---------------------------------------------------------
 2 files changed, 9 insertions(+), 4441 deletions(-)

commit 87e7326154a835e21acf8a3e3f1865edc1fb31fb
Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
Date:	Sun Sep 26 11:58:23 2010 +0300

    Updated Romanian translation

 po/ro.po | 2561
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 1527 insertions(+), 1034 deletions(-)

commit da9034b8027b32788c367aaf80c36edbb6ad1fee
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Sat Sep 25 21:16:58 2010 +0200

    [i18n] Fixed typo in German doc translation

 help/de/de.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit afac8cc37c374bf716573eab59c1c72233b9ad82
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Sat Sep 25 21:12:51 2010 +0200

    [i18n] Updated German doc translation

 help/de/de.po | 842
 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 411 insertions(+), 431 deletions(-)

commit 0de58550a3ded0751a2990df61cdad261785f0ff
Author: Xhacker Liu <liu.dongyuan@gmail.com>
Date:	Sat Sep 25 17:22:00 2010 +0000

    Update Simplifid Chinese translation.

 po/zh_CN.po | 93
 ++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 52 insertions(+), 41 deletions(-)

commit 4a7a05b6eec6a40b77a24de891d09f23a110ec5b
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Sat Sep 25 19:50:20 2010 +0300

    [l10n] Updated Estonian translation

 po/et.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c41e40e299bddd3bfa39a7fe492f40df636b88c9
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Sat Sep 25 18:30:12 2010 +0200

    Updated Hungarian translation

 help/hu/hu.po | 2304
 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 1820 insertions(+), 484 deletions(-)

commit 0991b86db2e5a8e3181a6d34b467dc57bc2b5037
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Sat Sep 25 18:26:23 2010 +0200

    Added Hungarian translation

 help/hu/hu.po | 2047
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 2047 insertions(+)

commit 59ef11852056295a3cb1751aea944512dc8d309b
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Sat Sep 25 18:26:00 2010 +0200

    Add hu to DOC_LINGUAS

 help/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ac094e08ba7c3aa55e9ec9bd527a5361326aa493
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sat Sep 25 15:08:04 2010 +0200

    [help] Fixed wrong section name, fixes #630544

 help/C/geolocation-turn.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 61da7959acee524054b8de0ddf2b416758052c83
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sat Sep 25 14:42:21 2010 +0200

    [l10n] Updated Italian translation

 po/it.po | 126
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 69 insertions(+), 57 deletions(-)

commit e231c623c75d79f7c739d3e65e4a705bce853381
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sat Sep 25 12:20:36 2010 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 127
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 65 insertions(+), 62 deletions(-)

commit 2150325cfcf8bb1d46a2a23464e470bb550a6c6e
Author: Christian Kirbach <Christian.Kirbach@googlemail.com>
Date:	Sat Sep 25 11:38:07 2010 +0200

    [l10n] Updated German translation

 po/de.po | 120
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 65 insertions(+), 55 deletions(-)

commit f32e3e89d0b2603f0062b55c99aad22950370b3c
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Sep 25 10:44:58 2010 +0200

    Updated Spanish translation

 help/es/es.po | 35 ++++-------------------------------
 1 file changed, 4 insertions(+), 31 deletions(-)

commit 97b75c775ab5addb5ebfb99a0bf1eef52b46fcc1
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Sat Sep 25 13:50:23 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 83
 ++++++++++++++++++++++++++++++++++---------------------------
 po/zh_TW.po | 83
 ++++++++++++++++++++++++++++++++++---------------------------
 2 files changed, 94 insertions(+), 72 deletions(-)

commit ace44365832862f83b619d2e8e14c812b834fe9d
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Sat Sep 25 02:33:45 2010 +0200

    Updated Hebrew translation.

 po/he.po | 338
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 174 insertions(+), 164 deletions(-)

commit 9749375a3ae65b985d5bcd67bad07931529daf3c
Author: Paul Cutler <pcutler@gnome.org>
Date:	Fri Sep 24 10:36:11 2010 -0500

    [help] Fix typo - bgo 630476

 help/C/irc-start-conversation.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3ca2e046677674902cd2fc5b4f15587ab417cb17
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Fri Sep 24 16:56:27 2010 +0200

    Fix a mistranslation

 po/hu.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2f30803a90b064ae9657e4ce0c6c3dccc7685606
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Thu Sep 23 13:03:13 2010 +0200

    Mark button texts for translation, also make them HIG-compatible

 libempathy-gtk/empathy-search-bar.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 56cd3b2912c49e1510ef350b2daae38bfa8bf0ba
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Fri Sep 24 03:10:05 2010 +0200

    Fix a mistranslation

 po/hu.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 36ffb2ddfb8a48c25d8709b0803dcff73cc7b887
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Thu Sep 23 14:17:48 2010 +0200

    Fix a mistranslation

 po/hu.po | 327
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 168 insertions(+), 159 deletions(-)

commit a96c1c8616ac26e50868ee73bd260c22956400e5
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Thu Sep 23 13:38:01 2010 +0300

    Updated Arabic translation

 po/ar.po | 567
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 301 insertions(+), 266 deletions(-)

commit 60af5121eeaaf7ca9419888560367c37c3818d35
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date:	Thu Sep 23 01:15:38 2010 +0200

    Updated Danish translation

 po/da.po | 112
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 60 insertions(+), 52 deletions(-)

commit b9b942dd430daec5cf165b9324b77effe43eb04b
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date:	Wed Sep 22 19:38:13 2010 +0100

    Updated British English translation

 po/en_GB.po | 112
 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 60 insertions(+), 52 deletions(-)

commit e597df69139ef56918ac9b80db29c2e4e2792456
Author: A S Alam <aalam@users.sf.net>
Date:	Wed Sep 22 21:40:19 2010 +0530

    update for Punjabi

 po/pa.po | 329
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 166 insertions(+), 163 deletions(-)

commit b78a681d249bf1a70ec1a2313f8e317c49618fc3
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Wed Sep 22 17:47:56 2010 +0200

    Updated Polish translation

 po/pl.po | 2286
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1445 insertions(+), 841 deletions(-)

commit 2cf9c2bcf99e9414c5296867eb0b60d5b8a539fe
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Wed Mar 24 13:53:43 2010 +0100

    Updated Polish translation

 po/pl.po | 463
 ++++++++++++++++++++-------------------------------------------
 1 file changed, 148 insertions(+), 315 deletions(-)

commit 0f6403910ebe799d43dd222419cb5ae23ec13ae1
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Wed Sep 22 14:37:51 2010 +0200

    Updated Slovenian translation

 po/sl.po | 372
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 199 insertions(+), 173 deletions(-)

commit cab9e5cd0bf7c94e27483444a0c14f3b3a69c958
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Wed Sep 22 12:24:34 2010 +0200

    Updated Basque language

 po/eu.po | 2057
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 1274 insertions(+), 783 deletions(-)

commit 7ea9ec850542f09895143eaa7705694ed1cd952b
Author: Claude Paroz <claude@2xlibre.net>
Date:	Wed Sep 22 10:52:08 2010 +0200

    Updated French translation

 po/fr.po | 321
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 163 insertions(+), 158 deletions(-)

commit fb1697d82e09b8e855cebee16da99a4e8ee44249
Author: Yuri Myasoedov <ymyasoedov@src.gnome.org>
Date:	Wed Sep 22 12:12:14 2010 +0400

    Updated Russian translation

 po/ru.po | 1751
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 945 insertions(+), 806 deletions(-)

commit d342a2a3936c020460e89479cd22ea438ab76ad6
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Wed Sep 22 10:17:03 2010 +0300

    [l10n] Updated Estonian translation

 po/et.po | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

commit 413bdb07afbb302b2d3849c3e205afe26caf7069
Author: Duarte Loreto <happyguy_pt@hotmail.com>
Date:	Wed Sep 22 00:59:30 2010 +0100

    Updated Portuguese translation

 po/pt.po | 141
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 79 insertions(+), 62 deletions(-)

commit 8aef86895e28824bfcd2156846beb7bd068a2aa5
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Tue Sep 21 23:10:20 2010 +0200

    Updated Spanish translation

 po/es.po | 324
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 165 insertions(+), 159 deletions(-)

commit 33d1a2bdd606d95314f16c6a2c8910f30d17e44b
Author: Djavan Fagundes <djavan@comum.org>
Date:	Tue Sep 21 14:30:54 2010 -0300

    Updated Brazilian Portuguese translation

 po/pt_BR.po | 350
 +++++++++++-------------------------------------------------
 1 file changed, 63 insertions(+), 287 deletions(-)

commit 6979ea549e05e331f5a41f33956893ea4d26852c
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Tue Sep 21 00:04:41 2010 +0200

    Updated Hungarian translation

 po/hu.po | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 9b5bc71d66b2fc0f6f3429b0f8806a8cd36d531f
Author: Marek Černocký <marek@manet.cz>
Date:	Tue Sep 21 13:18:15 2010 +0200

    Updated Czech translation

 po/cs.po | 112
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 59 insertions(+), 53 deletions(-)

commit f85ec04cca1161512c3374169abca6eff15bb1c7
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Tue Sep 21 10:05:16 2010 +0200

    Updated Galician translations

 help/gl/gl.po |  31 ++++--
 po/gl.po      | 335
 ++++++++++++++++++++++++++++++----------------------------
 2 files changed, 194 insertions(+), 172 deletions(-)

commit 410f75cf02ab5d23d2ebb1f97afba3658e46108a
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Tue Sep 21 00:11:44 2010 +0200

    Add missing .h file to POTFILES.in

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit 0c0e2b5bd721f39577935c7182b792eface2e8ff
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Sep 20 18:38:49 2010 +0100

    Set the ptime multiple for PCM codecs to 20ms, needed for interop
    with some SIP phones

 data/element-properties | 6 ++++++
 1 file changed, 6 insertions(+)

commit 4fb52741016fc1135eea200f83272e5b1a8b8bea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 20 17:39:55 2010 +0200

    empathy_account_settings_set_strv: we have to copy the key (#630168)

 libempathy/empathy-account-settings.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 57cd2fba705b470cb37afdc6d8a8984de4aa8da7
Merge: 7319558 348652d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 20 11:35:38 2010 +0200

    Merge branch 'cancel-crash-629957'

commit 348652d606e06f1871880d689ee60cae9ea707bc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 20 10:11:28 2010 +0200

    contact-widget: unref the cancellable once we have cancelled the
    operation (#629957)

    The comment was a lie, contact_widget_details_request_cb early
    returns when
    the operation has been cancelled so it wasn't unset.
    There is no point waiting any way so we can unref it right away.

 libempathy-gtk/empathy-contact-widget.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 2ebd2e1cd78a2bb2d45f7cff51cbb590b07b366f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 20 10:09:51 2010 +0200

    use tp_clear_object to unref the cancellable

 libempathy-gtk/empathy-contact-widget.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 731955864482940ec2fc537c734a1c9b7f381f81
Author: Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>
Date:	Mon Sep 20 17:00:49 2010 +0900

    Updated Japanese translation

 po/ja.po | 53 ++++++++++++++++++++++++++---------------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

commit 0bd6e071d8c644615300dab25aeb7fc39ebcc251
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Sun Sep 19 12:07:53 2010 +0300

    [l10n] Updated Estonian translation

 po/et.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 8b7539169d61aa0a4f59c96e2fd1bab073915ce2
Author: Daniel Martinez Cucalon <entaltoaragon@gmail.com>
Date:	Sat Sep 18 18:44:57 2010 +0000

    Add Aragonese translation.

 po/LINGUAS |	 1 +
 po/an.po   | 3691
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 3692 insertions(+)

commit dc896d074e77612392a99ed6a1fea418bb1f133d
Author: Žygimantas Beručka <zygis@gnome.org>
Date:	Fri Sep 17 23:43:51 2010 +0300

    Updated Lithuanian translation

 po/lt.po | 2276
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1258 insertions(+), 1018 deletions(-)

commit b3f3d02d06a154a138c29caa8298fa365857e399
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Fri Sep 17 19:37:08 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 328
 ++++++++++++++++++++++++++++++------------------------------
 po/zh_TW.po | 328
 ++++++++++++++++++++++++++++++------------------------------
 2 files changed, 332 insertions(+), 324 deletions(-)

commit 9244f2e18c8533429a548921995fe660e3fe619f
Author: Christian Kirbach <Christian.Kirbach@googlemail.com>
Date:	Thu Sep 16 23:05:01 2010 +0200

    [l10n] Updated German help translation

 help/de/de.po | 1158
 ++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 653 insertions(+), 505 deletions(-)

commit da974a90c25f3021d130668f3031c8dd1c9e4a08
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Thu Sep 16 18:50:13 2010 +0200

    Updated Spanish translation

 help/es/es.po | 210
 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 102 insertions(+), 108 deletions(-)

commit cdc4578b57c835285f49dd7983e65962811729d4
Author: Aron Xu <aronxu@gnome.org>
Date:	Thu Sep 16 23:19:11 2010 +0800

    Update Simplified Chinese translation.

 po/zh_CN.po | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

commit 2fb2a77597bdcbe2ee18e3d5c1d0fa79ced11d2d
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Sep 15 16:22:30 2010 +0100

    Add individuals to the EmpathyIndividualStore before updating them

    When adding a new contact _with_ an alias set, the code in
    EmpathyIndividualStore was listening to (and acting on) property
    notifications
    (such as alias changes) for the individual before adding the
    individual to the
    store, resulting in duplicate contact listings. Closes: bgo#629380

 libempathy-gtk/empathy-individual-store.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit d0887a48a638132c8b831a2115bbac6485682fff
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 15 10:04:16 2010 +0200

    blacklist haze's sip protocol (#629736)

 libempathy-gtk/empathy-protocol-chooser.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 1f396fd4a78ff0c77beb69d4c1b5ce38985feb8a
Author: Aron Xu <aronxu@gnome.org>
Date:	Wed Sep 15 15:13:45 2010 +0800

    Update simplified Chinese translation.

 po/zh_CN.po | 1314
 ++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 839 insertions(+), 475 deletions(-)

commit 5d35b6a769fa3dd313ec5a7517101ba394a83213
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 14 12:26:06 2010 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e1bb9e9311e9850aa537372eac8c88d98df3469d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 14 12:01:49 2010 +0200

    prepare 2.31.92 release

 NEWS	      | 67
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  6 +++---
 2 files changed, 70 insertions(+), 3 deletions(-)

commit 645f4763739a3fa2fbfade2bce5a382e1e6b4a3e
Merge: 9ea4b77 94ab9ff
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 14 11:28:41 2010 +0200

    Merge remote branch 'smcv/conference'

commit 9ea4b778978146d5a79a0d101d6f96b72cb9cf13
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 14 11:13:00 2010 +0200

    empathy_chat_paste: paste to to search bar if visible (#629594)

 libempathy-gtk/empathy-chat.c | 5 +++++
 1 file changed, 5 insertions(+)

commit b932028b82cfb31da782beab7bc71248cc19e24f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 14 11:12:41 2010 +0200

    add empathy_search_bar_paste_clipboard()

 libempathy-gtk/empathy-search-bar.c | 7 +++++++
 libempathy-gtk/empathy-search-bar.h | 1 +
 2 files changed, 8 insertions(+)

commit 6c6409c01aeeec60ee88eecbf9efa4aa8b0629f0
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:	Tue Sep 14 10:36:55 2010 +0200

    tp_chat_group_members_changed_cb: early return if removed or added
    have not the expected length (#629549)

 libempathy/empathy-tp-chat.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit a7a632c6fc92759d927b18a020c76e5c9b848d69
Merge: 826cb45 c7fab42
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 14 10:21:03 2010 +0200

    Merge remote branch 'smcv/conference'

commit 826cb45814d5fc9c6431454b673e2748f584d347
Merge: 9d7af3c 923c077
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 14 10:09:11 2010 +0200

    Merge remote branch 'cosimo/tls-multireject'

commit 9d7af3cbb13bb74ccc28427a7261be514f7cb241
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Sep 14 07:38:17 2010 +0100

    Change videosrc element ordering

    GStreamers basetransform has a nasty issue where its caps negotiation
    doesn't
    keep the ordering of caps when unioning, as a result of this
    linking the
    pipeline as "<src> !  videoscale ! colorspace ! video/x-raw-yuv"
    means at the
    <src> element yuv is no longer preferred.

    Changing the pipeline to be "<src> ! colorspace ! videoscale
    ! video/x-raw-yuv"
    forces the videoscale to only negotiate video/x-raw-yuv, which in
    turns ensures
    the colorspace and <src> element pick the right colorspace.

    In combination with emulated formats in v4l2src picking the wrong
    colorspace
    causes quite a performance hit (the src would do a color conversion
    in libv4l,
    while the colorspace element would later convert it back to a
    colorspace
    actually native to the src device!)

 libempathy-gtk/empathy-video-src.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

commit b28a581a457842fb703b3ed85110e1e4c68f3707
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Sep 14 07:32:59 2010 +0100

    Polish recent EmpathyVideoSrc changes

    * Fix various typos and broken phrasing
    * Use the right log level for various messages
    * Fix potentially calling gst_object_unref (NULL)
    * Fix coding style
    * Make various debug messages more useful

 libempathy-gtk/empathy-video-src.c | 104
 ++++++++++++++++++-------------------
 libempathy-gtk/empathy-video-src.h |	3 --
 2 files changed, 52 insertions(+), 55 deletions(-)

commit 94ab9ff5f9234789b478d0068836f3fd9020e993
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:	Mon Sep 13 20:47:06 2010 +0100

    Update Auth.client for stable ServerTLSConnection namespace

 data/Empathy.Auth.client | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c7fab422d11a4e107c5585fa22ab145af16d812b
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:	Mon Sep 13 20:40:22 2010 +0100

    Update Chan.T.ServerTLSConnection and TLSCertificate to spec 0.19.13

 extensions/Authentication_TLS_Certificate.xml	   | 20
 ++++++++++++++------
 extensions/Channel_Type_Server_TLS_Connection.xml |  8 ++++----
 2 files changed, 18 insertions(+), 10 deletions(-)

commit 589cddd9c1a7a0658e34c4c87a622e6335bb015f
Merge: 51cb135 923c077
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:	Mon Sep 13 20:38:50 2010 +0100

    Merge remote branch 'cosimoc/tls-multireject' into conference

commit 51cb1355ad28c5d96d097084fb7f236f94374f7b
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:	Mon Sep 13 20:08:14 2010 +0100

    Update the Conference spec to the version from spec 0.19.13 (no
    code changes)

 extensions/Channel_Interface_Conference.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 87b676e68039fbc254f9cba2ca4ec0792a05902f
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:	Mon Sep 13 19:02:12 2010 +0100

    Update Channel.I.Conference to draft 2 (no code changes)

 extensions/Channel_Interface_Conference.xml | 535
 ++++++++++++++++++++--------
 1 file changed, 385 insertions(+), 150 deletions(-)

commit 923c077b85f4a6607e7e2ba0ea3a7f1c8b7d7ea1
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 13 18:18:06 2010 +0200

    Use tp_clear_boxed() to free the Rejection array

 libempathy/empathy-tls-certificate.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit a74be9c64f64980bf542f07fe970787cfd0599e9
Merge: 1c67913 77d5de2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 13 17:58:14 2010 +0200

    Merge branch 'channel-accessors'

commit 77d5de2dc9f4e8602151e4a22db98ebf41b36453
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 13 17:49:04 2010 +0200

    use tp_channel_get_requested()

 libempathy/empathy-tp-call.c | 7 +------
 libempathy/empathy-tp-file.c | 4 +---
 2 files changed, 2 insertions(+), 9 deletions(-)

commit 12a271f9dfb0b30ee686466a4188a30311fef036
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 13 17:49:27 2010 +0200

    bump tp-glib dep to 0.11.15

    We need it for new TpChannel accessors.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d70bd8a286c4756409437e40a0a6a38108079b06
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 13 17:21:09 2010 +0200

    Update Empathy to the new draft API

 libempathy/empathy-tls-certificate.c | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

commit 4ddb99a82925a475cadd900bb76a9deab67bf045
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 13 16:49:34 2010 +0200

    Update to new tp-spec draft

 extensions/Authentication_TLS_Certificate.xml | 177
 +++++++++++++-------------
 1 file changed, 85 insertions(+), 92 deletions(-)

commit 1c67913708fb51caa7f769631a0a705b6f6553e6
Author: Timo Jyrinki <timo.jyrinki@iki.fi>
Date:	Mon Sep 13 18:19:59 2010 +0300

    Updated Finnish translation by Ubuntu Finnish translators team.

 po/fi.po | 2493
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1273 insertions(+), 1220 deletions(-)

commit dac42b77124239862e31b2b5d23df362b4ce2f91
Author: Alexey Fisher <bug-track@fisher-privat.net>
Date:	Thu Sep 9 22:28:21 2010 +0200

    Add two optional filter to video src

    Add videomaxrate and postproc_tmpnoise as optional filters to
    empathy_video_src_init. Thay will used if thay are installed.

    videomaxrate will set maximal framerate to 15fps if some haw webcam
    will get more than 15fps it will not kill empathy-av with high
    CPU load.

    postproc_tmpnoise will reduce video noise produced by most (all)
    webcams.
    This will add smoll overhead for load but reduce CPU load of video
    encoder.
    Also this should reduce network load (for theoraenc x2)

    Signed-off-by: Alexey Fisher <bug-track@fisher-privat.net>

 libempathy-gtk/empathy-video-src.c | 67
 +++++++++++++++++++++++++++++---------
 1 file changed, 51 insertions(+), 16 deletions(-)

commit 4815a75a72a0ebacc7e2f29e7026b8493c6ea320
Author: Alexey Fisher <bug-track@fisher-privat.net>
Date:	Mon Sep 13 16:43:51 2010 +0200

    Add empathy_gst_make_to_bin

 libempathy-gtk/empathy-video-src.c | 80
 ++++++++++++++++++++++++++++++++------
 libempathy-gtk/empathy-video-src.h |  2 +
 2 files changed, 71 insertions(+), 11 deletions(-)

commit d7e8bf5c3db088092e5458f13097a7b81b27c9e2
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Mon Sep 13 15:27:31 2010 +0100

    switched notebook pages

    to start with the scrolled window for the treeview as first
    page. this fixes bug #627238 and the empathy part of bug #626503

 src/empathy-main-window.c  |  4 ++--
 src/empathy-main-window.ui | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

commit 1cb32224bfc3f633057cb60229476334909f7d4f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 13 16:23:52 2010 +0200

    Remove "Use Yahoo Japan" label (#609484)

    It's not a valid connection param any more. Yahoo Japan has its
    own protocol
    now.

 libempathy-gtk/empathy-account-widget-yahoo.ui | 20 +-------------------
 libempathy-gtk/empathy-account-widget.c	|  1 -
 2 files changed, 1 insertion(+), 20 deletions(-)

commit 3cc5f86c16058e7aaaf95348d0c5277e05c9ed97
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 13 16:06:14 2010 +0200

    wrap label explaining the facebook account configuration (#611107)

 libempathy-gtk/empathy-account-widget-jabber.ui | 1 +
 1 file changed, 1 insertion(+)

commit 562666b74b8f6d863dd6c4970fd7bea3e9d899d6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Sep 13 15:27:16 2010 +0200

    coding style fix

 libempathy-gtk/empathy-chat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 72433c26360feadfdae1cbd1327375abd438c0eb
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Mon Sep 13 14:03:58 2010 +0100

    fixed typo in empathy utils

 libempathy/empathy-individual-manager.c | 2 +-
 libempathy/empathy-utils.c		 | 2 +-
 libempathy/empathy-utils.h		 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit d2f7576b808682dedce1e436709f9f618ab5f367
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Mon Sep 13 13:19:50 2010 +0200

    Updated Galician translations for help

 help/gl/gl.po | 725
 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 581 insertions(+), 144 deletions(-)

commit 93e0b1f4a7aefe9ffafdc3adb63cb3246e5432c2
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Mon Sep 13 11:37:10 2010 +0200

    Updated French doc translation

 help/fr/fr.po | 117
 +++++++++++++++++++++++++++-------------------------------
 1 file changed, 55 insertions(+), 62 deletions(-)

commit 11931abfe552a6366359df284a8ccafd59c2df7e
Author: Marek Černocký <marek@manet.cz>
Date:	Mon Sep 13 00:04:35 2010 +0200

    Updated Czech translation

 po/cs.po | 92
 +++++++++-------------------------------------------------------
 1 file changed, 12 insertions(+), 80 deletions(-)

commit a36e1197ab1ad01e2e472d0d5d64da3d7e265c61
Author: Christian Kirbach <Christian.Kirbach@googlemail.com>
Date:	Sun Sep 12 01:19:50 2010 +0200

    [l10n] Updated German translation

 po/de.po | 1314
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 838 insertions(+), 476 deletions(-)

commit 363c02d65a7d1def90a126808405821bdc977a1d
Author: Duarte Loreto <happyguy_pt@hotmail.com>
Date:	Sat Sep 11 20:07:31 2010 +0100

    Updated Portuguese translation

 po/pt.po | 1996
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 1235 insertions(+), 761 deletions(-)

commit 8c3586032428cdbd03b3dd034797c3e2daaeb6d8
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date:	Sat Sep 11 19:32:25 2010 +0200

    Updated Danish translation

 po/da.po | 870
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 516 insertions(+), 354 deletions(-)

commit da3159c661a80ea7515437cade69bb5a3f121860
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sat Sep 11 19:27:19 2010 +0200

    [l10n] Refreshed Italian translation

 po/it.po | 140
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 70 insertions(+), 70 deletions(-)

commit b2fdf17b036f208d36106230ce5347d63e49d68e
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sat Sep 11 19:26:12 2010 +0200

    [help] Fixed Empathy name in the index page

 help/C/index.page | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit 160d05286c8c7e45fd821fb3dbcabb8ef4052faf
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sat Sep 11 19:24:26 2010 +0200

    [help] Fixed contacts linking/unlinking topic, fixed the audio and
    video topics

 help/C/audio-call.page    | 20 ++++++--------------
 help/C/link-contacts.page | 12 ++++++------
 help/C/video-call.page    | 16 ++++------------
 3 files changed, 16 insertions(+), 32 deletions(-)

commit a40af88a19cdf6c830ad3e9e9a3ff01858c38781
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date:	Sat Sep 11 17:40:41 2010 +0100

    Updated British English translation

 po/en_GB.po | 257
 +++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 143 insertions(+), 114 deletions(-)

commit df7ccf6028da6e07edf1443a341bc8ab13a47e44
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Sep 11 13:47:05 2010 +0200

    Updated Spanish translation

 help/es/es.po | 340
 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 264 insertions(+), 76 deletions(-)

commit af46d1c43a9ec496b9bba718fea3b790b2a1a093
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sat Sep 11 10:52:45 2010 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 515
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 274 insertions(+), 241 deletions(-)

commit 9a1f003ea7d085e32d6e98acf5d211f165eafaea
Author: Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>
Date:	Sat Sep 11 15:10:15 2010 +0900

    Updated Japanese translation.

 po/ja.po | 942
 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 435 insertions(+), 507 deletions(-)

commit 7ba8c7108bb81644534401cd4336b60dd4ebdbf4
Author: Dr.Tirumurti Vasudevan <vasudeven@git.gnome.org>
Date:	Sat Sep 11 11:14:53 2010 +0530

    Updated Tamil translation

 po/ta.po | 250
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 139 insertions(+), 111 deletions(-)

commit 8f20e57110376d55d477fdb3f92c564740c1a704
Author: Petr Kovar <pknbe@volny.cz>
Date:	Fri Sep 10 21:49:34 2010 +0200

    Update Czech translation by Marek Cernocky

 po/cs.po | 904
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 531 insertions(+), 373 deletions(-)

commit b6193cbf5582425abc95d88d411b9dbece94e934
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Fri Sep 10 21:28:34 2010 +0200

    Updated French doc translation

 help/fr/fr.po | 341
 +++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 243 insertions(+), 98 deletions(-)

commit cf3f9a16802246c4aa79c351ff23cca7c396c94b
Author: Henrique P. Machado <hpmachado@gnome.org>
Date:	Fri Sep 10 09:07:07 2010 -0300

    Updated Brazilian Portuguese translation

 po/pt_BR.po | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

commit 7f1a6c80a830655a686aea1db7b7eda7ef8fafe0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Sep 10 10:13:49 2010 +0200

    fix build of the link-contacts doc page

 help/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6910a2a1783365b530665cc7dd8253f8b9fd7988
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Thu Sep 9 23:14:38 2010 +0200

    Updated Galician translations

 help/gl/gl.po | 95
 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 84 insertions(+), 11 deletions(-)

commit b00c9da7dec0f64eea08e158ca970b483d667d41
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Thu Sep 9 22:53:58 2010 +0200

    [help] Added topic about linking contacts, fixed other topics to
    reflect the new feature

 help/C/audio-call.page    |  58 ++++++++++++++++++-------
 help/C/link-contacts.page | 106
 ++++++++++++++++++++++++++++++++++++++++++++++
 help/C/send-message.page  |  43 ++++++++++++-------
 help/C/video-call.page    |  35 +++++++++++++--
 help/Makefile.am	   |   1 +
 5 files changed, 208 insertions(+), 35 deletions(-)

commit 750be1030ea02a4b972532f2b84036c415c87050
Author: Henrique P. Machado <hpmachado@gnome.org>
Date:	Thu Sep 9 15:39:55 2010 -0300

    Updated Brazilian Portuguese translation

 po/pt_BR.po | 1865
 +++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1183 insertions(+), 682 deletions(-)

commit 9b50f0afd9f08f3ed469a1425e09bfefc01b3811
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Sep 9 12:20:59 2010 +0200

    Use TP_ARRAY_TYPE_UCHAR_ARRAY_LIST

 libempathy/empathy-tls-certificate.c | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

commit be1c1d3cc028033f90eb6b5366a3ff363c275041
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Sep 9 12:20:44 2010 +0200

    Bump required tp-glib version

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1df0a982198b8bd8cec867708dd65b8b7373acee
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Sep 9 12:01:05 2010 +0200

    Use separate new/free functions for the handler context data

 libempathy/empathy-auth-factory.c | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

commit d4a88e86b74d89c0fb6022b6fea430eb904fe9b5
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 8 17:38:35 2010 +0200

    Don't assume there's only one concurrent TpHandleChannelsContext

 libempathy/empathy-auth-factory.c | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

commit 58cd63ef0352c756f784c44f5b7ec4f2ed26994d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 9 10:51:36 2010 +0200

    fix typo of #629134 in po files as well

 po/ar.po	| 2 +-
 po/el.po	| 2 +-
 po/en_GB.po	| 4 ++--
 po/es.po	| 2 +-
 po/et.po	| 2 +-
 po/fr.po	| 2 +-
 po/gl.po	| 2 +-
 po/he.po	| 2 +-
 po/hu.po	| 2 +-
 po/it.po	| 2 +-
 po/ja.po	| 2 +-
 po/nb.po	| 2 +-
 po/pa.po	| 2 +-
 po/sl.po	| 2 +-
 po/sr.po	| 2 +-
 po/sr@latin.po | 2 +-
 po/sv.po	| 2 +-
 po/ta.po	| 2 +-
 po/zh_HK.po	| 2 +-
 po/zh_TW.po	| 2 +-
 20 files changed, 21 insertions(+), 21 deletions(-)

commit e47c8cc7d48426f4c5104540f4d34658cc2092b1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 9 09:49:54 2010 +0200

    tls-dialog: fix typo in a string (#629134)

 libempathy-gtk/empathy-tls-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3e97317d56f9ae49a8424c679fc6e489483da8d1
Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
Date:	Fri Sep 3 16:45:45 2010 -0400

    Enable server fallback for GTalk account

    Instead of hardcoding one server, let the connection manager try doing
    SRV resolution and if the resolution fails, let it try a list
    of fallback
    servers. Note that talkx.l.google.com is now used instead of
    talk.google.com. This is the DNS used in the Windows client, this DNS
    returns a list of IPs instead of 1. This also enable usage of HTTPS
    proxy when falling back to port 443 with old_ssl.

    Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

 src/empathy-account-assistant.c | 14 ++++++++++----
 src/empathy-accounts-dialog.c	 | 14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

commit 0d31be0718c4624eaa17778f60f953f261f7487d
Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
Date:	Fri Sep 3 16:45:08 2010 -0400

    Add support for 'as' in account settings

 libempathy/empathy-account-settings.c | 26 ++++++++++++++++++++++++++
 libempathy/empathy-account-settings.h |  5 +++++
 2 files changed, 31 insertions(+)

commit c7630607a2ad03c27ee42b95093ada15d54087b9
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Wed Sep 8 21:33:05 2010 +0300

    [l10n] Updated Estonian translation

 po/et.po | 45 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 13 deletions(-)

commit 366d36a10c2e88306fa2d556570e3def1b0149d6
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 8 16:57:49 2010 +0200

    Make sure we allocate the right size for certificates

 libempathy/empathy-tls-certificate.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 127bd46e7c03eb95501e65836c301b1bbb6c8c5d
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 8 16:57:29 2010 +0200

    Use better names for saving the certificates

 libempathy/empathy-tls-certificate.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

commit 82fa83288652fb6b856b442145b10791941f3113
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 8 16:56:54 2010 +0200

    Move _get_certificate_hostname() out of the verifier

 libempathy/empathy-tls-verifier.c | 37
 +------------------------------------
 libempathy/empathy-utils.c	   | 35
 +++++++++++++++++++++++++++++++++++
 libempathy/empathy-utils.h	   |  4 ++++
 3 files changed, 40 insertions(+), 36 deletions(-)

commit 1cefa1fe32007daa35459bb1d74fb2622ec4a8c9
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Tue Sep 7 21:34:55 2010 +0200

    [l10n] Updated Italian translation

 po/it.po | 115
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 68 insertions(+), 47 deletions(-)

commit 31fec20a7f2d38235902608d1122b55f5096e7e0
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Tue Sep 7 10:58:23 2010 +0100

    Don't use gtk_progress_bar_set_orientation() when building with GTK+ 3

    GtkProgressBar now implements GtkOrientable, but this hasn't been
    backported
    to GTK+ 2, so we need to use some #ifdef magic.

 src/empathy-call-window.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 290a4853102e645d76318e8e09ef45420a6559bc
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Tue Sep 7 10:46:12 2010 +0100

    Remove calls to gtk_dialog_set_has_separator() if building against
    GTK+ 3

    gtk_dialog_set_has_separator() has been removed in GTK+ 3, but
    can't be
    removed (or the property's default value changed) in GTK+ 2 without
    breaking
    API. This adds a wrapper macro to keep the calls when building
    against GTK+ 2,
    and remove them when building against GTK+ 3.

 configure.ac						|  2 ++
 libempathy-gtk/empathy-contact-dialogs.c		|  8 ++++----
 libempathy-gtk/empathy-contact-selector-dialog.c	|  2 +-
 libempathy-gtk/empathy-individual-dialogs.c		|  2 +-
 libempathy-gtk/empathy-individual-edit-dialog.c	|  2 +-
 libempathy-gtk/empathy-individual-information-dialog.c |  2 +-
 libempathy-gtk/empathy-linking-dialog.c		|  3 ++-
 libempathy-gtk/empathy-status-preset-dialog.c		|  2 +-
 libempathy-gtk/empathy-ui-utils.h			| 16
 ++++++++++++++++
 src/empathy-accounts-dialog.c				|  3 +++
 src/empathy-import-dialog.c				|  4 ++++
 src/empathy-preferences.c				|  4 ++++
 12 files changed, 40 insertions(+), 10 deletions(-)

commit 0b6ef5b5eac2633e4c7660c58b2bb6f412dd1a2a
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Sep 6 21:01:38 2010 +0200

    Updated Spanish translation

 po/es.po | 296
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 163 insertions(+), 133 deletions(-)

commit 19d34f447d51d7a37e6c8d3f860a9d44d8c49336
Author: Claude Paroz <claude@2xlibre.net>
Date:	Mon Sep 6 20:23:29 2010 +0200

    Updated French translation

    Contributed by Nils ?, Claude Paroz and Bruno Brouard

 po/fr.po | 1543
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 995 insertions(+), 548 deletions(-)

commit 2aed14733293044790279577fdf8e1bb465d5f8f
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Mon Sep 6 18:11:46 2010 +0200

    Updated Galician translations

 help/gl/gl.po |  57 +++++++-----
 po/gl.po      | 289
 ++++++++++++++++++++++++++++++++--------------------------
 2 files changed, 191 insertions(+), 155 deletions(-)

commit ddfcc0de96874f901308cf56b082f6fcf360ee70
Author: A S Alam <aalam@users.sf.net>
Date:	Mon Sep 6 20:57:46 2010 +0530

    update for Punjabi

 po/pa.po | 376
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 183 insertions(+), 193 deletions(-)

commit 238feae615e7bf327f89dd5d67f2d5579c4d56f6
Author: Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>
Date:	Mon Sep 6 23:25:40 2010 +0900

    Updated Japanese translation.

 po/ja.po | 622
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 313 insertions(+), 309 deletions(-)

commit deadb02e590a50b31b09fa37c427cb922bf904e4
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Mon Sep 6 15:42:51 2010 +0200

    Updated Hungarian translation

 po/hu.po | 319
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 174 insertions(+), 145 deletions(-)

commit cffe6842b644ba1a54cd3f46fe6a159c3425fa01
Author: Daniel Nylander <po@danielnylander.se>
Date:	Mon Sep 6 15:32:10 2010 +0200

    Updated Swedish translation

 po/sv.po | 281
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 151 insertions(+), 130 deletions(-)

commit f10efcae5a1b10d2427cab32894bcfe984037cb7
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Mon Sep 6 15:28:47 2010 +0300

    Updated Hebrew translation.

 po/he.po | 43 +++++++++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 10 deletions(-)

commit 0cabb6f791135f5f1bc8573edc7d57715def9b55
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Mon Sep 6 14:06:44 2010 +0200

    Updated Slovenian translation

 po/sl.po | 300
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 152 insertions(+), 148 deletions(-)

commit 60d158ac379d725e0ecd91c74ea7de7a65b212bc
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Sep 1 11:12:09 2010 +0100

    Add a tooltip to the “Unlink” button

    Closes: bgo#628376

 libempathy-gtk/empathy-linking-dialog.c | 2 ++
 1 file changed, 2 insertions(+)

commit a32e3cde4a0f551169367baeadfc76587eae2b29
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Sep 1 11:05:20 2010 +0100

    Add a confirmation dialogue to the unlink process

    This makes it harder to accidentally remove a linked Individual now
    that the
    “Unlink” button is easier to find, and also makes it more
    obvious that
    Empathy hasn't just crashed when unlinking. Helps: bgo#628377

 libempathy-gtk/empathy-linking-dialog.c | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

commit d7c3afd92a4851669316aeb352235643002004e7
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Sep 1 10:42:00 2010 +0100

    Move the “Unlink” button from the Edit dialogue to the linking
    dialogue

    This is a more logical place for it, making unlinking more
    discoverable.
    Helps: bgo#628376

 libempathy-gtk/empathy-individual-edit-dialog.c | 53
 +------------------------
 libempathy-gtk/empathy-linking-dialog.c	 | 40 +++++++++++++++++++
 2 files changed, 41 insertions(+), 52 deletions(-)

commit ee0ed7f28d8a567675d434e6d9b8d13789b72292
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Sep 1 10:28:17 2010 +0100

    Fix code formatting in EmpathyLinkingDialog

 libempathy-gtk/empathy-linking-dialog.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

commit 89de8d02c44b2b06b77a0ec1a5e52dfaae53fe35
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Mon Sep 6 12:59:50 2010 +0300

    Updated Hebrew translation.

 po/he.po | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit bd7e5e9972f45cfcf426e18cc9915bdacc8355b4
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Sep 1 10:24:44 2010 +0100

    Change “Link…” to “Link Contacts…” in the individual menu

    This makes it clearer what the menu entry does, making linking more
    discoverable. Closes: bgo#628377

 libempathy-gtk/empathy-individual-menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 98820e829061929d6a89f1b7fbaae9772b070d41
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Sep 5 15:22:48 2010 +0200

    [l10n] Updated Italian translation

 po/it.po | 1871
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 1133 insertions(+), 738 deletions(-)

commit 937fccd2cefd59d7216a4cf931136460f913d2ff
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Sun Sep 5 19:52:14 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 711
 +++++++++++++++++++++++++++++++++++++-----------------------
 po/zh_TW.po | 711
 +++++++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 870 insertions(+), 552 deletions(-)

commit 0fbeb6cd58b0bc6a6a800ef3adf16e0e888f2608
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:	Sat Sep 4 15:07:48 2010 +0100

    Update British English translation

 po/en_GB.po | 280
 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 143 insertions(+), 137 deletions(-)

commit 75fd99f20d2c2ac2912392e52f22201a79e540fb
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Sep 4 09:34:33 2010 +0200

    Updated Spanish translation

 po/es.po | 123
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 61 insertions(+), 62 deletions(-)

commit 43ba61df5a70b34739ac4eb75bdbf8d5ef940358
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Sat Sep 4 02:30:03 2010 +0300

    Updated Hebrew translation.

 po/he.po | 344
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 172 insertions(+), 172 deletions(-)

commit bdb0ecb9044b18ee61cc5f0773ef20b993cba507
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Fri Sep 3 18:33:50 2010 +0200

    Updated Slovenian translation

 po/sl.po | 131
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 77 insertions(+), 54 deletions(-)

commit ecbfb5ab622cba9d0d02630bba27f46fc71298f6
Author: drtv <vasudeven@git.gnome.org>
Date:	Fri Sep 3 21:50:17 2010 +0530

    Updated Tamil translation

 po/ta.po | 1812
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1130 insertions(+), 682 deletions(-)

commit 5cd27afeb3ec9d2fed887a9af91f29987fc19c16
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Fri Sep 3 17:59:57 2010 +0300

    [l10n] Updated Estonian translation

 po/et.po | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

commit fb19bdf040a1970a32f43565c1d5eb3abf16b345
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Sep 2 18:29:50 2010 +0100

    Update the Edit dialogue on contact linking or unlinking

    Ensure any open Edit dialogues are:
     • closed, if they're editing the details for a meta-contact which
     is then
    unlinked; or
     • reloaded to show the details of the new meta-contact, if
     they're editing
    the details for a contact which is then linked.

 libempathy-gtk/empathy-individual-edit-dialog.c | 107
 +++++++++++++++++-------
 1 file changed, 78 insertions(+), 29 deletions(-)

commit 56575f683db3c77fd1f2ecae170ad5f4d04ca1d1
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Sep 2 17:29:50 2010 +0100

    Update the Information dialogue on contact linking or unlinking

    Ensure any open Information dialogues are:
     • closed, if they're showing the details for a meta-contact which
     is then
    unlinked; or
     • reloaded to show the details of the new meta-contact, if
     they're showing
    the details for a contact which is then linked.

 .../empathy-individual-information-dialog.c	    | 186
 ++++++++++++---------
 1 file changed, 111 insertions(+), 75 deletions(-)

commit 9a1557d2740bcb627033bb2cdd6593d31d081c19
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Sep 2 17:28:38 2010 +0100

    Handle the EmpathyIndividualWidget disappearing during an async
    details call

    The EmpathyIndividualWidget may be destroyed between starting and
    finishing
    an async call to get contact details. This patch prevents the
    finishing
    callback from accessing private data which may have been freed.

 libempathy-gtk/empathy-individual-widget.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 569e01b98e70c3a51eeb8f8eb8dc3871f871c62d
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Sep 2 16:42:58 2010 +0100

    Don't try to update EmpathyIndividualWidget's location without
    an Individual

 libempathy-gtk/empathy-individual-widget.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 3cc4fc238021bfdb6f8448a160988ff223662dc3
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Sep 2 16:39:09 2010 +0100

    Listen to FolksIndividual::removed in EmpathyIndividualWidget

    In certain cases, a tooltip will be updated on the contact list
    when unlinking
    a meta-contact (reproducable with a meta-contact of meta-contacts). In
    order
    to prevent an individual table from getting stuck in the
    EmpathyIndividualWidget in the tooltip, EmpathyIndividualWidget
    needs to
    connect to FolksIndividual::removed to be updated when the
    Individual is
    removed or replaced.

 libempathy-gtk/empathy-individual-widget.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit b50d7c49a1e5ac9dc43befe60a4296240b8d093e
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Sep 3 10:34:49 2010 +0100

    Remove an idle handler when EmpathyChat is destroyed

    This prevents the idle handler potentially running after the
    EmpathyChat has
    been destroyed, and accessing freed memory. Closes: bgo#628156

 libempathy-gtk/empathy-chat.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

commit 415b48c96ad03fa4949268d0ce9645f02005a818
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Sep 2 16:02:01 2010 +0100

    Add a heuristic to prefer audio- and video-capable Personas when
    calling

    When choosing which Persona out of an Individual to start an audio
    or video
    call to, given a choice between two Personas of equal presence,
    choose the
    one which is capable of both audio and video calls over the one
    which is
    capable of only one of the two. This is because clients which can
    do both
    types of call are generally more featureful than those which can
    only do one
    type. Helps: bgo#628338

 libempathy/empathy-contact.c | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

commit 5de0be112e18b3c1ad4d122a6a293bd4cb6807af
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Sep 2 13:28:59 2010 +0100

    Port EmpathyIndividualView to use
    empathy_contact_dup_best_for_action()

    This ports the code in EmpathyIndividualView which starts a chat
    when a row
    is activated. Closes: bgo#628338

 libempathy-gtk/empathy-individual-view.c | 29
 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

commit e2b20cc525b7c5dff94ab69a1dad7c1cd0176531
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Sep 2 13:28:07 2010 +0100

    Port EmpathyIndividualMenu to use
    empathy_contact_dup_best_for_action()

    This improves the menu code so that it no longer prefers personas
    with a
    higher presence, but which can't do the given action. Helps:
    bgo#628338

 libempathy-gtk/empathy-individual-menu.c | 125
 +++++++++----------------------
 1 file changed, 36 insertions(+), 89 deletions(-)

commit c1b7707c628cb16b44d2159fff993b44e1a5b946
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Sep 2 13:26:31 2010 +0100

    Add empathy_contact_dup_best_for_action()

    This takes a FolksIndividual and returns an EmpathyContact
    corresponding to
    the FolksPersona in the Individual which is most suited to having
    a given
    action performed on it. Helps: bgo#628338

 libempathy/empathy-contact.c | 140
 +++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-contact.h |  14 +++++
 2 files changed, 154 insertions(+)

commit 76db409a25964cfb74e030c2edb426bc1aab2d6a
Author: Cyril Roelandt <tipecaml@gmail.com>
Date:	Fri Sep 3 09:57:04 2010 +0200

    account-widget: apply settings when activating the password entry
    (#625575)

 libempathy-gtk/empathy-account-widget.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

commit bfe50b4fa80f68bc55b0f10565257d9de9900178
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Fri Sep 3 02:34:20 2010 +0200

    Updated Galician translations

 po/gl.po | 112
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 59 insertions(+), 53 deletions(-)

commit a1b5bb68482c204dcd1c06671bb48e63d6131279
Author: Daniel Nylander <po@danielnylander.se>
Date:	Fri Sep 3 01:43:15 2010 +0200

    Updated Swedish translation

 po/sv.po | 700
 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 447 insertions(+), 253 deletions(-)

commit 9bbc278fd11492150729e4734301dca97bb0903f
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Thu Sep 2 20:00:54 2010 +0200

    Updated Arabic translation

 po/ar.po | 235
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 132 insertions(+), 103 deletions(-)

commit 019365d216471676ddc3c878219e1685874c3d7e
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Sep 2 10:58:41 2010 +0100

    Ensure we disconnect from signals on Individuals' Personas as
    they're removed

    EmpathyIndividualStore connects to some signals on all of the
    (Telepathy)
    Personas in each Individual it stores. If an Individual changes its
    set of
    Personas, some of those signals might end up never getting
    disconnected. This
    fixes that by listening to FolksIndividual::personas-changed and
    disconnecting
    signals as appropriate. Closes: bgo#628153

 libempathy-gtk/empathy-individual-store.c | 82
 ++++++++++++++++++-------------
 1 file changed, 48 insertions(+), 34 deletions(-)

commit 8605cf086f2509d751beb4290921327bc409dde8
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Thu Sep 2 17:55:48 2010 +0300

    Updated Hebrew translation.

 po/he.po | 240
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 134 insertions(+), 106 deletions(-)

commit 336210d368813691731b96971407939f7d1319c1
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Sep 2 14:31:28 2010 +0100

    Remove the “Add Contact…” menu entry from EmpathyIndividualMenu

    It's never used, but is a CPU drain and can sometimes appear
    uninvited.

 libempathy-gtk/empathy-individual-menu.c | 91
 --------------------------------
 libempathy-gtk/empathy-individual-menu.h |  1 -
 2 files changed, 92 deletions(-)

commit a4a6f1b83dcf33c57c0fca1a7f68735df05f888e
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Sep 1 14:59:03 2010 +0100

    Don't unnecessarily remove Individuals if Individual IDs have
    been reused

    When linking and unlinking, it's possible for the linked Individual
    to have
    the same ID as one of its component Individuals (before linked or once
    unlinked). If two such Individuals with the same ID are added and
    removed at
    the same time (as could [only] happen during linking or unlinking),
    EmpathyIndividualManager should do the Individual removals before the
    additions, in order to prevent one of the Individuals getting
    clobbered.
    Closes: bgo#627819

 libempathy/empathy-individual-manager.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

commit 88a455a446bdf3617de594052dc5c756c1013da8
Merge: 1446a40 5091e14
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 2 15:37:25 2010 +0200

    Merge branch 'translate-param-628601'

commit 1446a4070254cb7cb02fa79dabf724e0429a7ca5
Merge: 3ac7d8d 007716d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 2 14:50:00 2010 +0200

    Merge remote branch 'kaserf/fix-account-name-update'

commit 5091e14d27d15b56fccf46d6a26b142b2223872a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 2 13:04:13 2010 +0200

    account_widget_generic_format_param_name: translate common params
    (#628601)

 libempathy-gtk/empathy-account-widget.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

commit 3ac7d8d0867872513543d71fe5fdb4a3825a560e
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Thu Sep 2 12:27:26 2010 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 537
 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 338 insertions(+), 199 deletions(-)

commit ba5f02669144bd3e9728ddf85f1ea8fcd3994332
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Sep 1 18:30:08 2010 +0100

    Bug 628133 — Linking dialog's live search should copy the one from
    the roster

    When launching a linking dialogue from EmpathyIndividualView, copy
    the view's
    live search text to the EmpathyIndividualView in the linking dialogue.
    Closes: bgo#628133

 libempathy-gtk/empathy-individual-view.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit f32eb6e690caf29430e14fddb410491732d89800
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Sep 1 18:29:43 2010 +0100

    Add empathy_linking_dialog_get_individual_linker()

    Helps: bgo#628133

 libempathy-gtk/empathy-linking-dialog.c | 8 ++++++++
 libempathy-gtk/empathy-linking-dialog.h | 5 +++++
 2 files changed, 13 insertions(+)

commit 0cdd19e18818fb096db954d48ae8770d3458908d
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Sep 1 18:28:52 2010 +0100

    Add empathy_individual_linker_set_search_text()

    Helps: bgo#628133

 libempathy-gtk/empathy-individual-linker.c | 20 ++++++++++++++++----
 libempathy-gtk/empathy-individual-linker.h |  3 +++
 2 files changed, 19 insertions(+), 4 deletions(-)

commit 5bd4329e0aab6dd6a4a8e084ff8c46873fdcc525
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Sep 1 17:51:50 2010 +0100

    Add an EmpathyIndividualMenu::link-contacts-activated signal

    This is emitted each time the “Link Contacts…” menu entry
    is activated.
    Helps: bgo#628133

 libempathy-gtk/empathy-individual-menu.c | 36
 ++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 9 deletions(-)

commit 3172fd7585eef696197237c9e0d7dbd910a7af9f
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Sep 1 17:37:30 2010 +0100

    Make EmpathyIndividualMenu a proper GObject, derived from GtkMenu

 libempathy-gtk/empathy-individual-menu.c | 155
 ++++++++++++++++++++++++++++---
 libempathy-gtk/empathy-individual-menu.h |  26 ++++++
 2 files changed, 168 insertions(+), 13 deletions(-)

commit a92e47dd31f74bcbbf50d6c2285b7d82bf82c4be
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 31 10:23:43 2010 +0200

    empathy_account_widget_get_default_display_name: use the network name
    (#598394)

 libempathy-gtk/empathy-account-widget.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

commit dea80ff6471a66f17dc0ade2c1c5795439e4078c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 31 10:23:07 2010 +0200

    account-widget-irc: return the EmpathyIrcNetworkChooser when building
    the widget

 libempathy-gtk/empathy-account-widget-irc.c | 8 ++++++--
 libempathy-gtk/empathy-account-widget-irc.h | 7 +++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

commit 7afc46a7f88a0fb1d92cbc25b6a96c1a11633bf6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 31 10:18:59 2010 +0200

    add empathy_irc_network_chooser_get_network()

 libempathy-gtk/empathy-irc-network-chooser.c | 8 ++++++++
 libempathy-gtk/empathy-irc-network-chooser.h | 4 ++++
 2 files changed, 12 insertions(+)

commit 9a4ee6c2e7a494afdc830043becbe11c08c69772
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 2 11:53:44 2010 +0200

    NEWS: 2.31.91 secretely depends on gcr too

 NEWS | 1 +
 1 file changed, 1 insertion(+)

commit 96bf4cf74db1b5c4be55202dcd0e7701ea6cbcd3
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Sep 1 18:38:42 2010 +0100

    Only unref the EmpathyIndividualView after emptying the group
    hash table

    Otherwise, unreffing the view could cause it to be destroyed, and thus
    emptying the hash table will write into freed memory and crash.

 libempathy-gtk/empathy-individual-view.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 326f9c92459246f8124ad6b2091a7f91ec7d5bda
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 2 10:38:54 2010 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4ff89fc3800b496aab529fb7a1da5d1d7bf694f4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Sep 2 10:15:09 2010 +0200

    prepare 2.31.91.1

 NEWS	      | 34 ++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 36 insertions(+), 2 deletions(-)

commit 08aa9a4e24a6087ee94774027cdcfce54f87e175
Author: A S Alam <aalam@users.sf.net>
Date:	Thu Sep 2 07:39:21 2010 +0530

    update for Punjabi

 po/pa.po | 954
 +++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 600 insertions(+), 354 deletions(-)

commit 007716dcb3720dc85aedbf01f33b787f66a2f8e6
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Wed Sep 1 17:19:18 2010 +0100

    do not set the overridden flag when creating

    when we are creating a new account we should not set the
    display-name-overridden flag, since then changes in
    the account details wont update the name in the accounts tree.

 libempathy-gtk/empathy-account-widget.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 416fc11e36c34a4c7ea489a25904ac9c6df4bd78
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Sep 1 14:32:08 2010 +0100

    Remove the expand groups idle handler when destroying an
    EmpathyIndividualView

    This prevents the idle handler from being run after destruction
    and crashing
    due to referencing the EmpathyIndividualView's private memory
    which has
    already been freed.

 libempathy-gtk/empathy-individual-view.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 85d6992961f24ed935a17ef8b09de11e75986c9e
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Sep 1 14:13:07 2010 +0100

    Bug 628106 — Groups are not expanded when reconnecting

    Ensure that the list of groups to expand is cleared when going
    offline, so
    that it can be freshly created when we come back online again.
    Closes: bgo#628106

 libempathy-gtk/empathy-individual-view.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 900b09f4b5f9f51383519fa487079ce3124a38ae
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Sep 1 12:59:03 2010 +0100

    Ensure all persona tables are removed from EmpathyIndividualWidget

    In the case that EmpathyIndividualWidget is going from showing
    Personas to
    showing an Individual table, ensure that all persona tables are
    removed from
    the widget, including those for Personas who're being removed from the
    Individual. Closes: bgo#628481

 libempathy-gtk/empathy-individual-widget.c | 2 ++
 1 file changed, 2 insertions(+)

commit ab1bd1a137ac8ffd7245669663e739e309a0a86f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 30 15:31:21 2010 +0200

    contact: get info from the tp-contact in constructed (#628315)

    Doing it in set_property is racy:
    - The tp-contact property is set. We use the contact to set the
    capabilities
    of the contact
    - The "capabilities" property has not be defined so GLib sets
    its default
    value (unknown) and so override the real capabilities of the contact.

 libempathy/empathy-contact.c | 75
 ++++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 38 deletions(-)

commit ba2d90094dbbf611a6d28c9a45f7ed892b162e91
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 30 14:51:21 2010 +0200

    contact: make some setters static

 libempathy/empathy-contact.c | 202
 +++++++++++++++++++++----------------------
 libempathy/empathy-contact.h |   8 --
 2 files changed, 101 insertions(+), 109 deletions(-)

commit 304c189c78f86299c80beb0edbc33d0d970cf458
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 1 10:10:07 2010 +0200

    the GTK3 flavour of gcr is gcr-3 (#627916)

 configure.ac | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 69a4acc92a7891595c624e89f2d5d0fc4e9327ff
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Tue Aug 31 18:25:55 2010 +0100

    Add an INDIVIDUAL_CALL feature to EmpathyIndividualView

    This allows the context menu on the VoIP icon to be disabled, so
    that it
    can't be used from the linking dialogue. Closes: bgo#628433

 libempathy-gtk/empathy-individual-view.c | 4 ++++
 libempathy-gtk/empathy-individual-view.h | 7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

commit 628a7449101e36c00fffb76260d828737913c232
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Tue Aug 31 18:52:24 2010 +0100

    Fix the audio/video icon in the contact list

    Closes: bgo#628421

 libempathy-gtk/empathy-individual-store.c | 82
 +++++++++++++++++++------------
 1 file changed, 51 insertions(+), 31 deletions(-)

commit 6a558ab4c6d124e684544568ca85b74b25bd6c17
Merge: 819ea9b 4e0778f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 1 10:39:07 2010 +0200

    Merge remote branch 'maiku/previous-conversation-crash'

commit 819ea9bf98a7f2c7a65090398bbb46888756ac59
Author: Simos Xenitellis <simos@gnome.org>
Date:	Wed Sep 1 11:18:53 2010 +0300

    l10n: Updated Greek translation for empathy help

 help/el/el.po | 2 --
 1 file changed, 2 deletions(-)

commit d5848ae0fa3a3c7b2c4809aee270ee30eb30ab46
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:	Wed Sep 1 09:17:55 2010 +0100

    Update British English translation

 po/en_GB.po | 199
 +++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 111 insertions(+), 88 deletions(-)

commit 3121cfd3c3c30a11254a93b44e85d6a0c15bd3a2
Author: Michael Kotsarinis <mk73628@gmail.com>
Date:	Wed Sep 1 11:16:27 2010 +0300

    l10n: Updated Greek translation for empathy help

 help/el/el.po | 3032
 +++++++++++++++++----------------------------------------
 1 file changed, 912 insertions(+), 2120 deletions(-)

commit 4e0778f0e0033d922d2fd0a925df9c12865fb832
Author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
Date:	Tue Aug 31 21:35:11 2010 -0500

    Fix crash in log_manager_got_chats_cb.

    When the log window is opened through the contact list with the
    previous
    conversations menu item, Empathy crashes due to there not being
    a currently
    selected account when log_manager_got_chats_cb is called. This patch
    adds a condition to check if there is a selected account before
    using it.

 libempathy-gtk/empathy-log-window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit b99d25fc2ec920c61fee30c98029f20785800ce5
Author: Michael Kotsarinis <mk73628@gmail.com>
Date:	Tue Aug 31 23:12:18 2010 +0300

    l10n: Updated Greek translation for empathy

 po/el.po | 341
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 178 insertions(+), 163 deletions(-)

commit 09f51db6ad6efd94da25475cce99433c2c95e005
Author: Michael Kotsarinis <mk73628@gmail.com>
Date:	Tue Aug 31 23:09:41 2010 +0300

    l10n: Updated Greek translation for empathy

 po/el.po | 808
 +++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 503 insertions(+), 305 deletions(-)

commit e5698f30ca5095c98492dbe2b4d630561fc73882
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Tue Aug 31 19:40:33 2010 +0300

    [l10n] Updated Estonian translation

 po/et.po | 79
 ++++++++++++++++++++++++++++------------------------------------
 1 file changed, 35 insertions(+), 44 deletions(-)

commit dd9eead438083aa52a4dafb918b8ae5389fe30c1
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Tue Aug 31 05:12:27 2010 +0200

    Updated Spanish translation

 po/es.po | 225
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 117 insertions(+), 108 deletions(-)

commit 3035176e9e2577693b1aadd670fa92f5aa87c417
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Tue Aug 31 02:13:41 2010 +0200

    Updated Hungarian translation

 po/hu.po | 179
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 98 insertions(+), 81 deletions(-)

commit 050bb6f5ad36f0682d53d5bbdf9fa6941318b6dc
Author: Branko Kokanović <branko.kokanovic@gmail.com>
Date:	Tue Aug 31 02:35:27 2010 +0200

    Updated Serbian translation

 po/sr.po	| 297
 ++++++++++++++++++++++++++-------------------------------
 po/sr@latin.po | 297
 ++++++++++++++++++++++++++-------------------------------
 2 files changed, 270 insertions(+), 324 deletions(-)

commit ca1d01a1b550cac102eb8358dc97022dcd874db8
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Mon Aug 30 22:24:20 2010 +0200

    Updated Galician translations

 po/gl.po | 201
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 112 insertions(+), 89 deletions(-)

commit 32dbca048ba71329771a61ee33012db3b9581fca
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Mon Aug 30 19:00:45 2010 +0200

    Updated Slovenian translation

 po/sl.po | 416
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 231 insertions(+), 185 deletions(-)

commit 3534770c5701a2bc3f53bf200b525e1055fb4cef
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 30 17:55:17 2010 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2fa738e0b080215563a5da9805d98dba89ba5554
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 30 17:46:23 2010 +0200

    coding style fixes

 libempathy/empathy-tls-certificate.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit e060d3b2d0033e4a20eec2389c798872404d5fea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 30 17:45:11 2010 +0200

    add empathy-irc-network-chooser-dialog.c to POTFILES.in

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit 49d08bdaa01855db315563c8cac613f524c3c91c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 30 17:25:23 2010 +0200

    prepare 2.31.91 release

 NEWS	      | 82
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 +--
 2 files changed, 84 insertions(+), 2 deletions(-)

commit 37d6905510d419e22e024adb05decddbc4595af3
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Mon Aug 30 16:28:37 2010 +0100

    Choose an best_contact even if it isn't sensitive in the
    EmpathyIndividualMenu

    This fixes the "Send File" entry not working.

 libempathy-gtk/empathy-individual-menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 59333ef35fe969e67e3a9da55f2bd5856d878e3a
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Mon Aug 30 15:05:42 2010 +0100

    Change the sensitivity of the Link button if changes have been made

    Closes: bgo#628320

 libempathy-gtk/empathy-linking-dialog.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

commit dfcab5196d9ba84e4cce84ac31750495e4b36f06
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Mon Aug 30 15:04:51 2010 +0100

    Add a has-changed property to EmpathyIndividualLinker

    This exposes information about whether the new Individual has changed
    from the start Individual, to allow for widget sensitivities to be
    changed appropriately. Helps: bgo#628320

 libempathy-gtk/empathy-individual-linker.c | 56
 ++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-individual-linker.h |  3 ++
 2 files changed, 59 insertions(+)

commit 32905fa2cb9fb3419f50c5894ac7507fb9330f8f
Author: Frédéric Péters <fpeters@0d.be>
Date:	Mon Aug 30 16:59:33 2010 +0200

    Check for gcr-1 when building against GTK+ 3 (GNOME bug #628092)

 configure.ac		    | 6 +++++-
 libempathy-gtk/Makefile.am | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

commit 5ea7f6cfbc591afac428bffbff513ccb77db3d63
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Aug 27 15:41:50 2010 +0100

    Bug 628121 — Should pick an online persona when starting a chat

    Change the EmpathyIndividualMenu and EmpathyIndividualView code
    for starting
    chats with Individuals to choose the most available Persona to chat
    to, rather
    than just the first available one. Helps: bgo#628121

 libempathy-gtk/empathy-individual-menu.c | 48
 +++++++++++++++++++++++---------
 libempathy-gtk/empathy-individual-view.c | 28 ++++++++++++++++++-
 2 files changed, 62 insertions(+), 14 deletions(-)

commit eaa8c0029aa90c33d415a000342354bb2fe771d4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 27 16:17:05 2010 +0200

    yahoo and icq widget: change the accelerator of the Character
    set widget

    It conflicts with the Close button.

 libempathy-gtk/empathy-account-widget-icq.ui	| 2 +-
 libempathy-gtk/empathy-account-widget-yahoo.ui | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 1113b0de4d21dd60a57b893f8a4a2fce4012e9a0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 27 16:13:58 2010 +0200

    account-widget-jabber: change the accelerator of the Priority widget

    It clash with the Login button.

 libempathy-gtk/empathy-account-widget-jabber.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2457c2bc21a88f2f5cbeaa9ca64412ec0cef72ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 27 16:10:35 2010 +0200

    account-widget-jabber: change accelerator of the encryption widget

    'E' is used by Enabled now.

 libempathy-gtk/empathy-account-widget-jabber.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a736b53700bb6394f666834728754d032a1906ae
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 27 16:10:03 2010 +0200

    account-widget-local-xmpp: change accelerator of the email widget

    'E' i's used by Enabled now.

 libempathy-gtk/empathy-account-widget-local-xmpp.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6fa2cd9457ec3434677a18862ed47f1ab0e382cd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 27 16:07:20 2010 +0200

    account-widget: add accelerator on Enabled

 libempathy-gtk/empathy-account-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9935cd88e7ecb4bf5ccc6f708735b735b06ea2fa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 27 16:04:36 2010 +0200

    jabber and yahoo widget: change the accelerator of the Ignore widget

 libempathy-gtk/empathy-account-widget-jabber.ui | 2 +-
 libempathy-gtk/empathy-account-widget-yahoo.ui  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 30cfef02ad93f671b6d0cfff401e881d58c2d57f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 27 16:01:15 2010 +0200

    account-widget-local-xmpp: change the accelerator of the Nickname
    widget

    'n' is used by the Cancel button now.

 libempathy-gtk/empathy-account-widget-local-xmpp.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fc35b678523bc01e1475345a9e339f52eb5637a1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 27 16:00:03 2010 +0200

    fix accelerator conflict with the Cancel button (#623164)

 libempathy-gtk/empathy-account-widget.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

commit 7bd4c5d096a48c7488774a9e0cc7f1f41e5b1e82
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 27 15:55:13 2010 +0200

    fix accelerator conflict with the Apply button (#623164)

 libempathy-gtk/empathy-account-widget.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

commit 73a8a1b248293643aaca7afe40480d2cf6de64e9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 27 15:48:53 2010 +0200

    factor out set_apply_button()

 libempathy-gtk/empathy-account-widget.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

commit 6fab1a3f3a374bbb914898ce7ddb7b5d80b09cf8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 30 13:22:13 2010 +0200

    chat_window_detach_hook: move the window *after* showing it

    Showing the window fire the "map" signal which is catched in
    empathy-geometry
    to move the window to its saved position. (#608140)

 src/empathy-chat-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6d4a28c88bc0a70af8f0fe97943199b010d9870e
Author: GLSJPN_Etsuko <etsuko.murozono@ptiglobal.net>
Date:	Mon Aug 30 20:16:44 2010 +0900

    Updated Japanese translation (from gnome-2-28 branch)

 po/ja.po | 3084
 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 2113 insertions(+), 971 deletions(-)

commit 054086355fe0cb29c40c08da0e9b1f106ff5407a
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Mon Aug 30 10:58:40 2010 +0100

    Fix a logic error when expanding groups in EmpathyIndividualView

    This prevents use of uninitialised memory in the second part of the
    expression, and should cause groups to be added to the table of
    groups to
    expand/contract more frequently (correctly). Helps: bgo#628106

 libempathy-gtk/empathy-individual-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 788b62fd3efbfefcd2788772693af497d0123dc6
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Mon Aug 30 10:06:03 2010 +0100

    Force all toggle buttons in the linking UI to update on each toggle
    event

    This ensures that the toggle buttons for different instances of
    the same
    Individual in the list always display in the correct state. Closes:
    bgo#628123

 libempathy-gtk/empathy-individual-linker.c | 44
 ++++++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 5 deletions(-)

commit 7373f750b996baae4d229952a4e2a0140820487c
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Aug 27 14:34:39 2010 +0100

    Fix calculation of the number of new personas in
    EmpathyIndividualWidget

 libempathy-gtk/empathy-individual-widget.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit e1d5083710cbafe299f37ce280e48005eaf85dca
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Mon Aug 23 11:41:48 2010 +0100

    Port EmpathyPersonaStore to use Individual.personas_changed

    This makes the notification of changed Personas a lot more efficient
    in the
    store. Closes: bgo#627706

 libempathy-gtk/empathy-persona-store.c | 44
 +++++++++-------------------------
 1 file changed, 11 insertions(+), 33 deletions(-)

commit 09116852afa9a1379d1dac957f787918432c1767
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Mon Aug 23 11:32:22 2010 +0100

    Port EmpathyIndividualWidget to use Individual.personas_changed

    This makes the notification of changed Personas a lot more efficient
    in
    the widget. Helps: bgo#627706

 libempathy-gtk/empathy-individual-widget.c | 119
 +++++++++++++++--------------
 1 file changed, 61 insertions(+), 58 deletions(-)

commit a2130e671045ce703e2f06647ceaac786aaf47a1
Author: Ivar Smolin <okul@linux.ee>
Date:	Mon Aug 30 12:31:04 2010 +0300

    [l10n] Updated Estonian translation

 po/et.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit eba7c8345b08ab112e0b68445cbec6833fd92516
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Aug 27 15:53:03 2010 +0100

    Bug 628124 — Disallow activating group rows in the linking dialogue

 libempathy-gtk/empathy-individual-linker.c | 3 +++
 1 file changed, 3 insertions(+)

commit 7b68f5928812d926d27bb0a6fa8550629ef23a2c
Author: Branko Kokanović <branko.kokanovic@gmail.com>
Date:	Sun Aug 29 20:21:39 2010 +0200

    Updated Serbian translation

 po/sr.po	| 1947
 ++++++++++++++++++++++++++++++++------------------------
 po/sr@latin.po | 1947
 ++++++++++++++++++++++++++++++++------------------------
 2 files changed, 2216 insertions(+), 1678 deletions(-)

commit ee26288e23806e1f9cbc346d773959f2a91f3ef5
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Sun Aug 29 11:47:23 2010 +0300

    [l10n] Updated Estonian translation

 po/et.po | 597
 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 499 insertions(+), 98 deletions(-)

commit c524de9194894f5ced26cfb334ed61ab4fc794c7
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:	Sat Aug 28 14:11:30 2010 +0100

    Update British English translation

 po/en_GB.po | 203
 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 110 insertions(+), 93 deletions(-)

commit 4618baec28e21d5a710a6d419a9a7fae28d15321
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Sat Aug 28 16:05:52 2010 +0200

    Updated doc French translation

 help/fr/fr.po | 332
 +++++++++++++++++++++++++++++++---------------------------
 1 file changed, 177 insertions(+), 155 deletions(-)

commit 00c3a65b897714cf0dcd0299ef572c9c943d31b5
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Sat Aug 28 10:40:32 2010 +0200

    Updated Hungarian translation

 po/hu.po | 284
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 153 insertions(+), 131 deletions(-)

commit 301f5b9989b61b067fcf6d628f38c536529c7eb6
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Aug 28 10:05:41 2010 +0200

    Updated Spanish translation

 po/es.po | 223
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 130 insertions(+), 93 deletions(-)

commit 4a142ae419c2c6c4ac0b0f2171e23b7b0ef64798
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Fri Aug 27 23:03:52 2010 +0200

    Updated Hungarian translation

 po/hu.po | 1776
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 1077 insertions(+), 699 deletions(-)

commit 75792c4923298aba3b45802f3c82b66cdd0cdb54
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Fri Aug 27 17:36:27 2010 +0200

    Update Galician translations

 po/gl.po | 305
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 167 insertions(+), 138 deletions(-)

commit 1d0676cf03884445f11b29b9d06df547a836e95f
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Fri Aug 27 15:41:29 2010 +0200

    Updated Arabic translation

 po/ar.po | 377
 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 240 insertions(+), 137 deletions(-)

commit ab866567be1702e6811f7c6d5827b446a29d7d83
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Aug 27 15:54:28 2010 +0300

    Updated Hebrew translation.

 po/he.po | 384
 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 246 insertions(+), 138 deletions(-)

commit 410d7f6e391a3b88961fd4002a6048ca79640384
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 5 10:57:39 2010 +0200

    nautilus-sendto-plugin: depend on 2.31.7 when building with GTK+2

    This version will have the same API that 2.90.0 so we don't have
    to stay
    compatible with the old API.

 configure.ac					  |  4 +---
 nautilus-sendto-plugin/empathy-nautilus-sendto.c | 18 ------------------
 2 files changed, 1 insertion(+), 21 deletions(-)

commit 973ebccf5c1ba3664677a8c5d1bdfe52009f82be
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Aug 27 12:33:20 2010 +0100

    Bug 628064 — Miscellaneous string fixes

 data/empathy.desktop.in.in		      | 2 +-
 data/org.gnome.Empathy.gschema.xml.in	      | 6 +++---
 libempathy-gtk/empathy-account-widget-irc.ui | 2 +-
 libempathy-gtk/empathy-log-window.ui	      | 4 ++--
 libempathy-gtk/empathy-tls-dialog.c	      | 4 ++--
 libempathy/empathy-utils.c		      | 4 ++--
 src/empathy-accounts.c			      | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

commit ed67c7eca44a3d9891197aa02a14410e66227a1d
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Aug 27 12:22:35 2010 +0100

    Bug 628062 — Add translator comments

 libempathy-gtk/empathy-individual-menu.c | 6 ++++++
 libempathy-gtk/empathy-linking-dialog.c  | 6 ++++++
 2 files changed, 12 insertions(+)

commit 7b31c4e8aec4e800fef27bbe25b90a26186f2b20
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Aug 27 12:18:38 2010 +0100

    Unmark strings as translatable which aren't shown to the user

    Helps: bgo#628062

 src/empathy-accounts-dialog.ui | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit df0638989774934a9553d3355decd3e5ccaece83
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 27 13:28:09 2010 +0200

    new-chatroom-dialog: remove markup from transltable string

 src/empathy-new-chatroom-dialog.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit cb6f0691b1129d7ba2e5d88147733b8e87241ad5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 27 12:49:31 2010 +0200

    remove markups around 'Location'

 libempathy-gtk/empathy-contact-widget.c    | 6 +++++-
 libempathy-gtk/empathy-individual-widget.c | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

commit 70159532bf83cb1e8210155b2e968f833fa4dd7e
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Aug 25 19:39:19 2010 +0100

    Add an EmpathyIndividualView::show-untrusted property

    This allows the view to filter out untrusted Individuals (such
    as link-local
    XMPP contacts). This is used in the linking dialogue to disallow
    selection
    of link-local XMPP contacts for linking. Closes: bgo#627930

 libempathy-gtk/empathy-individual-linker.c |  1 +
 libempathy-gtk/empathy-individual-view.c   | 49
 ++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-individual-view.h   |  6 ++++
 3 files changed, 56 insertions(+)

commit 2c7fdebf7a7cea6efbc0a305e681b7e7d158d821
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Aug 25 19:35:06 2010 +0100

    Move all individual view visibility logic into is_visible_individual()

 libempathy-gtk/empathy-individual-view.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit a0d79de6f5151ee14b25364060e5dd2338f800a9
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Aug 25 19:04:09 2010 +0100

    Desensitise the "Link…" menu entry for untrusted Individuals

    This prevents the linking dialogue from being opened for local-xmpp
    contacts,
    who cannot be trusted.

    This bumps Empathy's dependency on libfolks to 0.1.15. Helps:
    bgo#627930

 configure.ac				  | 2 +-
 libempathy-gtk/empathy-individual-menu.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

commit b4a1d5606e68916a99ca672818bcbebb5c2a8ee0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 27 09:43:23 2010 +0200

    accounts-dialog.ui: set pango properties in the UI file (#628063)

 src/empathy-accounts-dialog.ui | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 5e28683dab504d1b1c4d4d4a3bbcdb17519f335e
Merge: 17d3840 7504002
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 27 11:57:14 2010 +0200

    Merge branch 'trivia'

commit 17d384008361384be53a2466fcd9a7e837e10d09
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Thu Aug 26 16:39:42 2010 -0700

    Don't filter out Individual removal at the IndividualManager level.

    The IndividualManager sometimes falsely filters out members of
    FolksIndividualAggregator:individuals-changed:removed that should
    be passed
    along to its users.

 libempathy/empathy-individual-manager.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

commit 270a982f2cf19635a61f41e6cc49f7d6e8cfd016
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Tue Aug 24 17:54:34 2010 +0100

    Bug 627715 — Linking dialog: move personas using DnD

    Add support for dragging Individuals from the EmpathyIndividualView
    to the
    EmpathyPersonaView in the linking dialogue, and for dragging Personas
    in the
    reverse direction, linking and unlinking the appropriate Individuals,
    respectively. Closes: bgo#627715

 libempathy-gtk/empathy-individual-linker.c | 86
 +++++++++++++++++++++++++++++-
 1 file changed, 84 insertions(+), 2 deletions(-)

commit 86d76dc3d8e58b52749756f498648307fb513465
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Tue Aug 24 17:54:26 2010 +0100

    Add drag and drop support to EmpathyPersonaView

    This includes an EmpathyPersonaView::drag-individual-received
    signal, to
    allow for notification that an Individual has been dropped onto
    the view.
    Helps: bgo#627715

 libempathy-gtk/empathy-persona-view.c | 225
 ++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-persona-view.h |   8 +-
 2 files changed, 232 insertions(+), 1 deletion(-)

commit 1337c4e6f42da41d1da84f32586f33812b8ec2b5
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Tue Aug 24 14:57:56 2010 +0100

    Add feature support for EmpathyPersonaView

 libempathy-gtk/empathy-individual-linker.c |  3 ++-
 libempathy-gtk/empathy-persona-view.c	    | 43
 ++++++++++++++++++++++++++++--
 libempathy-gtk/empathy-persona-view.h	    |  9 ++++++-
 3 files changed, 51 insertions(+), 4 deletions(-)

commit 5e9eff1788ca0344be6cb09a304a89add7002248
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Aug 25 12:34:35 2010 +0100

    Accept text/plain drops as file transfers, rather than as Individuals

 libempathy-gtk/empathy-individual-view.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

commit 8c812cfbd960392d2acee585c3d7d3030d3e3fa8
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Aug 25 12:08:02 2010 +0100

    Add an EmpathyIndividualView feature for receiving Persona drops

    This is necessary to avoid Personas being droppable on the main
    contact list,
    which makes no sense (for the time being). Helps: bgo#627715

 libempathy-gtk/empathy-individual-view.c | 119
 +++++++++++++++----------------
 libempathy-gtk/empathy-individual-view.h |   5 +-
 src/empathy-main-window.c		  |   5 +-
 3 files changed, 64 insertions(+), 65 deletions(-)

commit e2f43f8e42064400f777e52937b845f804331b26
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Tue Aug 24 17:54:14 2010 +0100

    Add an EmpathyIndividualView::drag-persona-received signal

    This allows notification of drops of personas on the individual view.
    Helps: bgo#627715

 libempathy-gtk/empathy-individual-view.c | 86
 +++++++++++++++++++++++++++++++-
 libempathy-gtk/empathy-individual-view.h |  5 ++
 2 files changed, 89 insertions(+), 2 deletions(-)

commit 9bee6ee28d745736a6c5c9b0cd26041575da9b73
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Tue Aug 24 14:34:00 2010 +0100

    Add an EmpathyIndividualView::drag-individual-received signal

    Subclasses or users of the widget can then override this and stop
    the signal
    emission to do new and interesting things with dropped Individuals,
    rather
    than just changing their groups.

 libempathy-gtk/empathy-individual-view.c | 84
 +++++++++++++++++++-------------
 libempathy-gtk/empathy-individual-view.h |  6 +++
 2 files changed, 55 insertions(+), 35 deletions(-)

commit 3f23b6d1c7a04cf288872cf975cdb81da1325289
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Tue Aug 24 14:08:46 2010 +0100

    Use EmpathyIndividualFeatureFlags consistently in
    EmpathyIndividualView

 libempathy-gtk/empathy-individual-view.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 751691d4e019a00b7ee52de97b259fee3d9c8af3
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Tue Aug 24 14:03:25 2010 +0100

    Use text/individual-id instead of text/contact-id for dragging
    Individuals

 libempathy-gtk/empathy-individual-view.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 7c2d23958c938a73eefbd35c2ecfb74fc57c1421
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Tue Aug 24 13:54:57 2010 +0100

    Rename EMPATHY_INDIVIDUAL_VIEW_FEATURE_CONTACT_* to
    *_FEATURE_INDIVIDUAL_*

 libempathy-gtk/empathy-individual-view.c | 14 +++++++-------
 libempathy-gtk/empathy-individual-view.h | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

commit 5b5f330cef05c8ebaa5ded6c74992910d7d85999
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Tue Aug 24 12:57:37 2010 +0100

    Add an EmpathyIndividualView feature for changing Individuals' groups

    This separates drag and drop support from changing groups, so that
    EmpathyIndividualView instances (such as the one in the linking
    dialogue)
    may support dragging and dropping Individuals to and from another
    tree view,
    but not support dragging them between groups inside the
    EmpathyIndividualView
    instance. Helps: bgo#627715

 libempathy-gtk/empathy-individual-view.c | 38
 ++++++++++++++++++++++++--------
 libempathy-gtk/empathy-individual-view.h | 15 ++++++++-----
 2 files changed, 38 insertions(+), 15 deletions(-)

commit a1aea4b698a537c046e53215d2a64259b97cd935
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Tue Aug 24 12:37:45 2010 +0100

    Fix memory leaks in EmpathyIndividualView drop handling code

 libempathy-gtk/empathy-individual-view.c | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

commit 56e80c63b33bff7d82cd43bc8e1dc02f1a10a1d4
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Tue Aug 24 12:31:10 2010 +0100

    Move individual_view_handle_drag() to
    individual_view_contact_drag_received()

    This will make refactoring easier. Helps: bgo#627715

 libempathy-gtk/empathy-individual-view.c | 73
 +++++++++++++++-----------------
 1 file changed, 33 insertions(+), 40 deletions(-)

commit 4b17d88ae214bc8b9b74d7fd6c0c01e14f206478
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Tue Aug 24 12:22:38 2010 +0100

    Add an EmpathyIndividualView feature for dropping files on Individuals

    This allows drag and drop to be enabled for the linking dialogue
    without
    allowing files to be dropped onto the dialogue, which wouldn't
    make sense.
    Helps: bgo#627715

 libempathy-gtk/empathy-individual-view.c | 16 +++++++++++-----
 libempathy-gtk/empathy-individual-view.h |  3 ++-
 2 files changed, 13 insertions(+), 6 deletions(-)

commit 750400297f05dd45369f2bb77c7a351c4561a585
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 27 10:05:28 2010 +0200

    main-window: define an enum for pages

 src/empathy-main-window.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 7c95784276fa35bb9d0c91189ebfbb8be50f6564
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 27 10:02:42 2010 +0200

    Increase the size of the 'No Match Found' label

    It looks less crap that way.

 src/empathy-main-window.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit ab97f58c9a4bf3b0230693f09c76e6de5a23d3fe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 27 10:00:27 2010 +0200

    no need to use a #define

 src/empathy-main-window.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit c9bc158a8897e4ab2f0758d87084f048e51de165
Author: Jiří Techet <techet@gmail.com>
Date:	Thu Aug 26 22:01:41 2010 +0200

    Use libchamplain 0.7.1 or newer for the map plugin

    Signed-off-by: Jiří Techet <techet@gmail.com>

 configure.ac | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit f2c8ce84037c1dd9afcd6114b9df366995e2c1be
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:	Thu Aug 26 20:53:25 2010 +0100

    Fix British English translation

 po/en_GB.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 3bdcc8ded8e80167626ef22a89c85455f36b50c4
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:	Thu Aug 26 20:44:23 2010 +0100

    Update British English translation

 po/en_GB.po | 1824
 ++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1119 insertions(+), 705 deletions(-)

commit 197d3f143f4ad7980bc651d9b643334d1dac910d
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Thu Aug 26 19:43:54 2010 +0200

    Updated Spanish translation, fixes bug #627996

 po/es.po | 174
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 93 insertions(+), 81 deletions(-)

commit 6db1a23b9956518d8c33443611960fe850e42872
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Aug 26 17:48:50 2010 +0100

    Fix row toggling on activation in EmpathyIndividualLinker

    Previously, row toggling was only working when activating rows at
    the end of a
    live search. This makes it work for all row activation events
    (i.e. selecting
    a row and pressing "enter").

 libempathy-gtk/empathy-individual-linker.c | 37
 ++++++++++--------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

commit d58a372562b1de6bd73bd521bd6dfcf4276bdcec
Author: Michael Kotsarinis <mk73628@hotmail.com>
Date:	Thu Aug 26 18:38:14 2010 +0300

    l10n: Updated Greek translation for empathy

 po/el.po | 1850
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1157 insertions(+), 693 deletions(-)

commit aef5465e619c75eb8b310ebd38a511c1cb6f924b
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Aug 26 16:28:00 2010 +0100

    Fix selectable labels in EmpathyIndividualWidget

    Ensure that labels in EmpathyIndividualWidget are only selectable
    if the
    widget isn't in tooltip mode. Closes: bgo#627917

 libempathy-gtk/empathy-individual-widget.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

commit d5872cec74644d7e3c53a65433271ca05c67c4b9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 26 17:15:30 2010 +0200

    unsensitive the remove button while loading

 src/empathy-accounts-dialog.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

commit c43467a6cc9dbc9f1e9eab28ce9bfd2feed3f998
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 26 16:59:27 2010 +0200

    insensitive treeview while loading

 src/empathy-accounts-dialog.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit f3d884d8ddc2fbe3e2db3d333f41f03036ab71a4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 26 15:38:18 2010 +0200

    accounts-dialog: display loading page while loading accounts (#611701)

 src/empathy-accounts-dialog.c	| 27 +++++++++++++++++++++++++++
 src/empathy-accounts-dialog.ui | 29 ++++++++++++++++++++++++++++-
 2 files changed, 55 insertions(+), 1 deletion(-)

commit 5352fa2563809bcb5fc80ec4192dab28569130e6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 26 14:41:13 2010 +0200

    accounts-dialog: add a GtkNotebook

 src/empathy-accounts-dialog.ui | 166
 +++++++++++++++++++++++++----------------
 1 file changed, 102 insertions(+), 64 deletions(-)

commit d311e01d703d6040560e1edf913c5d612d0a5ad5
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Aug 26 15:40:25 2010 +0100

    Fix the "Show Protocols" option with linked contacts

 libempathy-gtk/empathy-individual-store.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3962499d4caedcce812fe1ce9b09b7a775e33a86
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Thu Aug 26 16:04:47 2010 +0200

    allow to choose irc network with ENTER

    while searching, the enter key allows you to select an irc network

 libempathy-gtk/empathy-irc-network-chooser-dialog.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 692cee58aba936f5df2c791b89b697c1b05d208c
Merge: d02dfde 08c4500
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 26 15:39:43 2010 +0200

    Merge branch 'irc-wizard-596086'

commit d02dfde3919057b552cf8ba505495d73a8644ae6
Merge: 77a7cae 7a0749f
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Thu Aug 26 15:00:03 2010 +0200

    Merge branch 'irc-network-selection-fix'

commit 7a0749f54ef5cb3ef3074940f08753c53e53de37
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Thu Aug 26 14:52:23 2010 +0200

    fix selection problems in irc networks

 .../empathy-irc-network-chooser-dialog.c	    | 26
 +++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

commit 77a7caeaf8ce5d3c83b8f61d9eea6efe15c5886f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 26 14:33:03 2010 +0200

    accounts-dialog: insensitive 'add' and 'import' buttons while loading
    (#624353)

 src/empathy-accounts-dialog.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

commit 08c450056e0bb41e7ecc10f505ae0e6fea6dc6ea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 25 15:24:24 2010 +0200

    account-assistant: stop blacklisting IRC (#596086)

 src/empathy-account-assistant.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 975f45f447bb3ceea7a467766a513b301c4b36c2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 25 15:24:01 2010 +0200

    use the simple variant of the IRC widget if needed

 libempathy-gtk/empathy-account-widget.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

commit 94895f1acb08a01dc28dae1f423abe43e8f6afbd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 25 15:23:42 2010 +0200

    account-widget-irc: add simple version of the widget

 libempathy-gtk/empathy-account-widget-irc.c  | 41 ++++++++++++++++++
 libempathy-gtk/empathy-account-widget-irc.h  |  3 ++
 libempathy-gtk/empathy-account-widget-irc.ui | 63
 ++++++++++++++++++++++++++++
 3 files changed, 107 insertions(+)

commit 2de3bc4c03f97f1ceea44f43a1b86dedcb7e6893
Merge: f7a63b4 e624601
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 26 14:03:11 2010 +0200

    Merge branch 'irc-widget-588243'

commit e62460125c8a90e0f77f18326d597868ca01a42c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 26 13:59:36 2010 +0200

    grab focus on the treeview after adding, editing or removing network

 libempathy-gtk/empathy-irc-network-chooser-dialog.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 3ba9a682ce49528af7db7a6d7e5b5baddd475618
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 26 13:54:01 2010 +0200

    irc-network-chooser-dialog: make it transient and modal

 libempathy-gtk/empathy-irc-network-chooser-dialog.c | 6 +++++-
 libempathy-gtk/empathy-irc-network-chooser-dialog.h | 3 ++-
 libempathy-gtk/empathy-irc-network-chooser.c	     | 5 ++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

commit f7a63b4c249208122cfa17f668a19d853d158dfa
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Aug 26 11:28:11 2010 +0100

    Don't let the GtkCellRendererToggle get activated by clicking on a
    tree row

    GtkTreeView activates a row when it's clicked or double-clicked,
    which ends
    up toggling the GtkCellRendererToggle in the linking dialogue even
    if it's
    insensitive, allowing the start Individual to be removed from the
    link, and
    causing chaos. See bgo#567481. Closes: bgo#628011

 libempathy-gtk/empathy-individual-linker.c | 1 +
 1 file changed, 1 insertion(+)

commit c48ad853488aed4cd28eeb20d6c4614f01b4b2f0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 26 12:20:18 2010 +0200

    search_text_notify_cb: select first matching only if we are still
    searching

    Also scroll to the selected network when cancelling the search.

 .../empathy-irc-network-chooser-dialog.c	    | 23
 ++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

commit acc900cd828e7883436fe41ca68d5de3b27cf1df
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 26 11:50:11 2010 +0200

    Hide the search after picking the network to get the right one

 libempathy-gtk/empathy-irc-network-chooser-dialog.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 83d9b1cb0f1b3ff248b24e0b25a1139e475677ef
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Aug 25 17:34:02 2010 +0100

    Disconnect from the group-changed signal when destroying
    EmpathyGroupsWidget

 libempathy-gtk/empathy-groups-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit deddbb95eba55352658572a9a3c9293fed4842c2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 25 16:41:35 2010 +0200

    properly set table_common_settings

    account-widget needs it to add the "Enabled" checkbox.

 libempathy-gtk/empathy-account-widget-irc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c9815085eed66cf02ab8dfb40fbf0aab393ccd4d
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Aug 25 12:50:41 2010 +0100

    Don't expand rows if the tree view has been destroyed

 libempathy-gtk/empathy-individual-view.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit f8c7011a571c35d976e00526491d499ec623acb9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 25 16:30:15 2010 +0200

    cance live search when adding/removing a network

 libempathy-gtk/empathy-irc-network-chooser-dialog.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 469e9ea6d1e007265f7a5ec518e27052be9305a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 25 16:28:09 2010 +0200

    search_text_notify_cb: rename iter to filter_iter to avoid confusion

 libempathy-gtk/empathy-irc-network-chooser-dialog.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 0ead72dafcd03ac8db7b854cf883bea7a8394616
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 25 16:25:19 2010 +0200

    factor out iter_to_filter_iter()

 .../empathy-irc-network-chooser-dialog.c	    | 35
 +++++++++++++---------
 1 file changed, 21 insertions(+), 14 deletions(-)

commit 98318894ea8217020e29be42b2cae209831b179c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 25 16:16:31 2010 +0200

    scroll_to_iter: need a filter iter

 libempathy-gtk/empathy-irc-network-chooser-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d4e129c0d66340a755a9cb14f91e92539426e76d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 25 16:14:30 2010 +0200

    assert that iter convert don't fail

    If they do we did something wrong.

 libempathy-gtk/empathy-irc-network-chooser-dialog.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit e12b292643c831d8e35ddeca8aed4d24269cfe7f
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Wed Aug 25 15:14:31 2010 +0200

    Updated Slovenian translation

 po/sl.po | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

commit af80486a7408355ede05b131af5e848b84e62d5e
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Wed Aug 25 15:12:08 2010 +0200

    Updated Slovenian translation

 po/sl.po | 133
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 114 insertions(+), 19 deletions(-)

commit 88cdfb884de9b2e288d07924624083a8fabe643f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 25 15:00:12 2010 +0200

    select_iter: set the cursor as well

 libempathy-gtk/empathy-irc-network-chooser-dialog.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 102c526be04a1356d1935844f293431fd864d9fe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 25 14:23:07 2010 +0200

    make title clearer

 libempathy-gtk/empathy-irc-network-chooser-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c196520a0117248010140b0612e7d2726d135afc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 25 14:18:06 2010 +0200

    don't allow to select a network if none is actually selected

 libempathy-gtk/empathy-irc-network-chooser-dialog.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit 75f7bc8ce00e28a84d19bf036382e2566b60f9e8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 25 14:17:50 2010 +0200

    replace the close button by 'Select'

 libempathy-gtk/empathy-irc-network-chooser-dialog.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit cc260a6fe68be18a935dbc81caf25107325b5563
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 25 14:12:22 2010 +0200

    select the first matching network when searching

 libempathy-gtk/empathy-irc-network-chooser-dialog.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit fd86b3c72bcc01a3592cc5beec052526c098e1bd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 25 14:10:10 2010 +0200

    pass filter iter to select_iter() and scroll_to_iter()

 .../empathy-irc-network-chooser-dialog.c	    | 46
 +++++++++++++---------
 1 file changed, 27 insertions(+), 19 deletions(-)

commit 1d030ae9e63bbaac4fcd805dae61e22e3b1f5592
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 25 11:17:11 2010 +0200

    irc-network-chooser: use network accessors

 libempathy-gtk/empathy-irc-network-chooser.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

commit a687feb900220a231b63bce08f43743488dc6bbe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 25 11:14:59 2010 +0200

    irc-network-chooser-dialog: use network accessors

 .../empathy-irc-network-chooser-dialog.c	    | 22
 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

commit c7c68087a5a17cb270ac120e631cf4dbe7339fa4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 25 11:12:47 2010 +0200

    irc-network-chooser-dialog: add live search support

 .../empathy-irc-network-chooser-dialog.c	    | 98
 ++++++++++++++++++++--
 1 file changed, 91 insertions(+), 7 deletions(-)

commit e1513fcc6cebe513e0b3b0778b5cfe18097fe576
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 25 10:55:46 2010 +0200

    irc-network: add accessors for name and charset

 libempathy/empathy-irc-network.c | 16 ++++++++++++++++
 libempathy/empathy-irc-network.h |  4 ++++
 2 files changed, 20 insertions(+)

commit ba36ddff81ce9f228f150246069ceb76425cfee5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 24 16:11:42 2010 +0200

    account-widget-irc: use EmpathyIrcNetworkChooser

    This avoid having a huge list in a combo box (#588243)

 libempathy-gtk/empathy-account-widget-irc.c  | 405
 ++-------------------------
 libempathy-gtk/empathy-account-widget-irc.ui |  78 +-----
 2 files changed, 24 insertions(+), 459 deletions(-)

commit f867ae2b8bbe9b885419f9748465d96ce70755d9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 24 16:10:28 2010 +0200

    irc-network-chooser: popup network chooser dialog when clicked

 libempathy-gtk/empathy-irc-network-chooser.c | 63
 +++++++++++++++++++++++++++-
 1 file changed, 62 insertions(+), 1 deletion(-)

commit 8f678a31a63eccb4fc086a8caddb37b1a0e7de91
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 24 16:09:24 2010 +0200

    add empathy-irc-network-chooser-dialog

    Some of the code has been copied from empathy-account-widget-irc.c.

 libempathy-gtk/Makefile.am			    |	2 +
 .../empathy-irc-network-chooser-dialog.c	    | 487
 +++++++++++++++++++++
 .../empathy-irc-network-chooser-dialog.h	    |  70 +++
 3 files changed, 559 insertions(+)

commit 4b08cbd1605f1671a9d90ffa7f3a3a1776e5a61a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 23 17:24:59 2010 +0200

    add empathy-irc-network-chooser

 libempathy-gtk/Makefile.am		      |   2 +
 libempathy-gtk/empathy-irc-network-chooser.c | 299
 +++++++++++++++++++++++++++
 libempathy-gtk/empathy-irc-network-chooser.h |  61 ++++++
 3 files changed, 362 insertions(+)

commit 860c26554e90126287adcba3ae9dc536bdfbb622
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 24 14:20:23 2010 +0200

    add empathy_irc_network_manager_dup_default()

 libempathy/empathy-irc-network-manager.c | 34
 ++++++++++++++++++++++++++++++++
 libempathy/empathy-irc-network-manager.h |  2 ++
 2 files changed, 36 insertions(+)

commit 1ceaa6d1ee7135f6a578eecb12686493fac88d6c
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Wed Aug 25 10:41:28 2010 +0200

    added some files to gitignore

    they were introduced by the interactive tls certificate verification
    patches.

 data/.gitignore | 1 +
 src/.gitignore  | 1 +
 2 files changed, 2 insertions(+)

commit 656ba0f01d0a55af0c07d2d76e8e9d17502b12b6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Aug 24 21:38:04 2010 +0200

    Use gmodule-export-2.0 so introspecting ourselves works

 configure.ac | 1 +
 1 file changed, 1 insertion(+)

commit 05166126df1b96b26a7fb2c9eb6c344214878371
Author: Saleem Abdulrasool <compnerd@compnerd.org>
Date:	Wed Mar 3 20:30:24 2010 +0000

    allow building empathy without eds

 configure.ac				 | 13 ++++++++++++-
 src/Makefile.am			 |  6 ++++--
 src/empathy-auto-salut-account-helper.c |  7 +++++++
 tests/interactive/Makefile.am		 |  8 +++++---
 4 files changed, 28 insertions(+), 6 deletions(-)

commit 3b8d776ba062864878dc5901f080bccbdd440c7e
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Tue Aug 24 21:03:13 2010 +0200

    Update Galician translations

 po/gl.po | 126
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 109 insertions(+), 17 deletions(-)

commit 927ccfb98fa72539dee8e3a418faff1be49751b9
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Tue Aug 24 20:56:42 2010 +0200

    Updated Spanish translation

 po/es.po | 129
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 111 insertions(+), 18 deletions(-)

commit 56bcabd8df3185bca2805f1e4945c3adf28f0be1
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Mon Aug 23 11:39:12 2010 -0700

    Don't leak a reference when updating an IndividualWidget.

 libempathy-gtk/empathy-individual-widget.c | 2 ++
 1 file changed, 2 insertions(+)

commit 4f79cd98c0501367570bc140776b5ec40bfee49c
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:	Mon Aug 23 11:37:42 2010 -0700

    When setting an EmpathyContact's Persona, disconnect existing
    signal handler

 libempathy/empathy-contact.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 3bd33b4812d0b909a8a44b12791fcac75fcf365d
Merge: 180d834 dc73f3d
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 24 15:24:38 2010 +0200

    Merge branch 'tls-connection'

commit dc73f3d3e51958edaf3b0508c4205c387e735547
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 24 15:20:06 2010 +0200

    Properly handle corner cases of _prepare_async() called twice

    - If it's called twice before the first call returned, emit an error.
    - If it's called twice on an already-prepared object, just
    successfully
      return.

 libempathy/empathy-tls-certificate.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

commit 76d38803e7992e50333c1054c48bb789ff63c699
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 24 11:54:17 2010 +0200

    Don't leak certificate data

 libempathy/empathy-tls-certificate.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit b76f9bf45aca489bfe40c333a048be513410f36c
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 24 11:53:59 2010 +0200

    Use new certificate API in EmpathyServerTLSHandler

 libempathy/empathy-server-tls-handler.c | 43
 ++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 14 deletions(-)

commit 1426cd161d371c161e1e6e66ed7b66a163d5bdaa
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 24 11:53:11 2010 +0200

    Make EmpathyTLSCertificate a TpProxy subclass

 libempathy/empathy-tls-certificate.c | 201
 ++++++++++-------------------------
 libempathy/empathy-tls-certificate.h |  16 ++-
 2 files changed, 65 insertions(+), 152 deletions(-)

commit 180d83485a0d10d8c45760852d8d588e20a7d3e2
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Mon Aug 23 13:12:49 2010 +0100

    Remove EmpathyAvatar->token

 libempathy-gtk/empathy-avatar-chooser.c |  4 ++--
 libempathy/empathy-contact.c		 | 13 +++----------
 libempathy/empathy-contact.h		 |  1 -
 3 files changed, 5 insertions(+), 13 deletions(-)

commit 77646a2826689c6f171e5a80eb1cf4702b458494
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Mon Aug 23 13:11:30 2010 +0100

    Use the avatar filename rather than token for change detection

    The filename includes the token, so this allows us to remove the
    token field
    from EmpathyAvatar.

 libempathy-gtk/empathy-theme-boxes.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 597f34ccdbe2000aad148147d9ecafb3e17c9e0a
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Mon Aug 23 12:33:32 2010 +0100

    Remove empathy_contact_new_for_log()

    It was unused.

 libempathy/empathy-contact.c | 17 -----------------
 libempathy/empathy-contact.h |  2 --
 2 files changed, 19 deletions(-)

commit c71c43c5756061e2e3d877aa47078140b518e3fa
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Mon Aug 23 12:23:18 2010 +0100

    Make empathy_contact_load_avatar_cache() private

 libempathy/empathy-contact.c | 10 ++++++----
 libempathy/empathy-contact.h |  2 --
 2 files changed, 6 insertions(+), 6 deletions(-)

commit d2d137673a575a54d51a1501d243f852e6723ab2
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Mon Aug 23 12:09:53 2010 +0100

    Make empathy_contact_set_avatar() private

 libempathy/empathy-contact.c | 19 +++++++++----------
 libempathy/empathy-contact.h |  2 --
 2 files changed, 9 insertions(+), 12 deletions(-)

commit ceb6c0312d3b6f2933b06ff866accd7e1bf22e6d
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Aug 24 10:44:32 2010 +0200

    use proper model in linking ui

    when searching in the linking-ui-treeview the filtered model has to
    be used. fixes bug #627500

 libempathy-gtk/empathy-individual-linker.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 503e6b771b4ba4455dc47483af9f6502a3447ae1
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Tue Aug 24 04:10:48 2010 +0200

    Updated Arabic translation

 po/ar.po | 1530
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 920 insertions(+), 610 deletions(-)

commit e3f2c5cbd45c8c7974062e4bdd845db9b833bc8e
Author: Petr Kovar <pknbe@volny.cz>
Date:	Mon Aug 23 22:51:45 2010 +0200

    Update Czech translation by Marek Cernocky

 po/cs.po | 1525
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 931 insertions(+), 594 deletions(-)

commit 9145d78fe35ab4accec07c899c5dcc89e3fc566d
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Aug 23 17:40:25 2010 +0200

    Updated Spanish translation

 po/es.po | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

commit 248e2de94a951d5e0727c0d5ab87a707c853b4da
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 23 15:02:21 2010 +0200

    linker: add some padding in the 2 part of the pane

 libempathy-gtk/empathy-individual-linker.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

commit a39128b04df75da0965452c9c74b902c633e25ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 23 14:39:08 2010 +0200

    individual-widget: adapt number of rows to the features needed

 libempathy-gtk/empathy-individual-widget.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 9609495ef4dedb1c80a39faeb780fe1f660cc411
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 23 14:22:32 2010 +0200

    linker: add a label explaining how to use the dialog

 libempathy-gtk/empathy-individual-linker.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

commit 3ecae374709ef76a984656f90f360e5f42831fc0
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Mon Aug 23 20:03:21 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 826
 +++++++++++++++++++++++++++++++++++++-----------------------
 po/zh_TW.po | 826
 +++++++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 1030 insertions(+), 622 deletions(-)

commit 2aab3515e97c67ab6704f5c49e91a8be6114400a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 23 13:40:19 2010 +0200

    Display the number of personas only in tooltips

 libempathy-gtk/empathy-individual-widget.c | 44
 +++++++++++++++++-------------
 1 file changed, 25 insertions(+), 19 deletions(-)

commit 784b4a32084df08c173e6ca63a8d270e01cc81eb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 23 13:22:43 2010 +0200

    pass NULL instead of "" to gtk_label_new()

    This saves us a strdup.

 src/empathy-account-assistant.c | 2 +-
 src/empathy-sidebar.c		 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit f78f4f123ab01a70e7f8c7bb659e39bb0a4bc9ae
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 23 11:47:50 2010 +0200

    linker: display titles in bold

 libempathy-gtk/empathy-individual-linker.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit db05ed13ac1bb1e4b58d7b3c14e382679ea5f92d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 23 10:25:47 2010 +0200

    Consider contact without presence as online (#627587)

    That what we use to do but f8c37da731af9f6cd74e7a0ef08fa02059d981ac
    breaked
    it. If we don't consider such contacts as online, IRC contacts don't
    appear in
    the room contact list.

 libempathy/empathy-contact.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit aa3556ffa5eb1571b928918cf8995705db4754a1
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Mon Aug 23 02:16:50 2010 +0200

    Updated galician translations

 po/gl.po | 131
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 73 insertions(+), 58 deletions(-)

commit 7a499be36ac62d1321f80ec7e3578ebed0aee3b1
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date:	Sun Aug 22 15:09:24 2010 +0200

    Updated Danish translation

 po/da.po | 1546
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 915 insertions(+), 631 deletions(-)

commit 00bc52c3017d481d64a78c1dad1fe06c0014a1f3
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Aug 21 12:17:44 2010 +0200

    Updated Spanish translation

 po/es.po | 147
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 79 insertions(+), 68 deletions(-)

commit f7e35697066068b2e95fddf5221a22cce5dd8239
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sat Aug 21 11:56:49 2010 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 858
 +++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 526 insertions(+), 332 deletions(-)

commit eb2bc994c92ff8f5682394d3c08efc52f048e97a
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Sat Aug 21 08:34:33 2010 +0200

    Updated Slovenian translation

 po/sl.po | 249
 +++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 153 insertions(+), 96 deletions(-)

commit 1d2734c7c782359266dc824b12945883ec11c761
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Sat Aug 21 02:32:59 2010 +0300

    Updated Hebrew translation.

 po/he.po | 241
 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 153 insertions(+), 88 deletions(-)

commit 485836b9e046d420bc349749ac15c82b0dbd6261
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Aug 20 15:40:33 2010 +0100

    Add a "Linked Contacts" label at the top of the Information dialogue

 .../empathy-individual-information-dialog.c	    | 38
 ++++++++++++++++++++--
 po/POTFILES.in					    |  1 +
 2 files changed, 36 insertions(+), 3 deletions(-)

commit b713ffc898aaa18edee52c0ef0c499d632ade836
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Aug 20 15:26:36 2010 +0100

    Allow EmpathyIndividualInformationDialog to be resized

 libempathy-gtk/empathy-individual-information-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 598d4c4821575442bb87329cb9d8b0b61db51dee
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Aug 20 14:37:54 2010 +0100

    Fix some visual breakage of EmpathyIndividualWidget in tooltips

    It was expanding too much and leaking out of the tooltip balloon.

 libempathy-gtk/empathy-individual-widget.c  | 17 +++++++++++------
 libempathy-gtk/empathy-individual-widget.ui |	1 +
 2 files changed, 12 insertions(+), 6 deletions(-)

commit 320771c43432260d55c1a32d127fdaa0dabfa1fe
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Aug 20 14:02:22 2010 +0100

    Bug 627360 — "Information" of a meta contact is too big for
    the screen

    Add a GtkScrolledWindow to EmpathyIndividualWidget in the case
    that it's
    showing personas. Closes: bgo#627360

 libempathy-gtk/empathy-individual-widget.c  | 39
 +++++++++++++++++++++++++++++
 libempathy-gtk/empathy-individual-widget.ui | 20 ++++++++++++---
 2 files changed, 56 insertions(+), 3 deletions(-)

commit 00b878b87455a47494ef640c0b5fd2cab4e6b66c
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Aug 20 15:19:59 2010 +0100

    Display Personas' accounts in the linking dialogue

    Display the account name instead of the Persona's presence message
    on the
    right-hand side of the linking dialogue. Closes: bgo#626715

 libempathy-gtk/empathy-persona-view.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit a63a58b777180d1b5c9eee39faab5edd891ac80d
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Aug 20 15:10:01 2010 +0100

    Add an "account" column to EmpathyPersonaStore

    This stores the display name of the PersonaStore for each Persona.

 libempathy-gtk/empathy-persona-store.c | 9 +++++++++
 libempathy-gtk/empathy-persona-store.h | 1 +
 2 files changed, 10 insertions(+)

commit 4c7d5bbab4325fbfae01a0d2ef58756403c18fb7
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Aug 20 12:31:56 2010 +0100

    Avoid conflicting accelerators in New Call dialog.

    _Call conflicts with the stock _Cancel button.

    Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

 libempathy-gtk/empathy-new-call-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5fa714c470951e828f8dab44856b8cc2d4c30340
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Aug 18 11:04:06 2010 +0100

    Add EmpathyIndividualEditDialog

    This replaces the edit dialogue from empathy-contact-dialogs.c,
    and is now
    used from the EmpathyIndividualMenu. Closes: bgo#626544

 libempathy-gtk/Makefile.am			 |   2 +
 libempathy-gtk/empathy-individual-edit-dialog.c | 273
 ++++++++++++++++++++++++
 libempathy-gtk/empathy-individual-edit-dialog.h |  59 +++++
 libempathy-gtk/empathy-individual-menu.c	 |   8 +-
 po/POTFILES.in					 |   1 +
 5 files changed, 337 insertions(+), 6 deletions(-)

commit e445d9d5b2781ef59e1a07e97853f232c94d0dc2
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Tue Aug 10 11:54:48 2010 +0100

    Allow unlinking individuals through EmpathyIndividualManager

    Wrap the FolksIndividualAggregator individual unlinking API in
    EmpathyIndividualManager with some basic error reporting (it isn't
    expected
    that unlinking will fail).

 libempathy/empathy-individual-manager.c | 34
 +++++++++++++++++++++++++++++++++
 libempathy/empathy-individual-manager.h |  4 ++++
 2 files changed, 38 insertions(+)

commit e09695146f8ac0fad504ead9e080b70fe70d3b9b
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Fri Aug 20 13:32:43 2010 +0200

    Updated galician translations

 po/gl.po | 236
 +++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 148 insertions(+), 88 deletions(-)

commit 23566ca74cbdca4b237f9fd0758493bee26e95a9
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Aug 20 11:04:40 2010 +0100

    Don't try to expand groups if the EmpathyIndividualView's store
    is unset

 libempathy-gtk/empathy-individual-view.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 7906c05973b29175938775fa5fabc3e3f347b372
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Aug 19 14:44:22 2010 +0100

    Bug 627219 — Link dialog search doesn't work

    Allow the store of an EmpathyIndividualView to be changed after
    construction,
    and cope with recreating the filter when this happens. Closes:
    bgo#627219

 libempathy-gtk/empathy-individual-linker.c |  6 +-
 libempathy-gtk/empathy-individual-view.c   | 95
 +++++++++++++++++++++++-------
 libempathy-gtk/empathy-individual-view.h   |  5 ++
 3 files changed, 81 insertions(+), 25 deletions(-)

commit 4a38890ece9f9e0ef045c689d79d13e00515d98c
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Thu Aug 19 21:13:39 2010 +0200

    Updated Spanish translation

 po/es.po | 241
 +++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 149 insertions(+), 92 deletions(-)

commit b992a04452d574d1afb5787499ee0498b74210d3
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Mon Jul 5 17:09:35 2010 +0100

    Use EmpathyIndividualWidget in EmpathyIndividualInformationDialog

 .../empathy-individual-information-dialog.c	    | 38
 ++++++----------------
 1 file changed, 10 insertions(+), 28 deletions(-)

commit 4c6aa4d6c9ffa412fa0cf1513dab34af6aedc7e9
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Aug 11 18:51:28 2010 +0100

    Use EmpathyIndividualWidget in EmpathyIndividualView tooltips

 libempathy-gtk/empathy-individual-view.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

commit b733c20124b92b6dedec267eee6b586b312e5d5b
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Aug 19 13:03:56 2010 +0100

    Fix the flags given to the widget in EmpathyIndividualLinker

 libempathy-gtk/empathy-individual-linker.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 48417775ef19cdb1ebe2ecd631953f431aa144b4
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Aug 19 13:05:36 2010 +0100

    Expand EmpathyIndividualWidget

    It's now a fully-fledged widget of its own, rather than a thin wrapper
    around EmpathyContactWidget. Closes: bgo#626728

 libempathy-gtk/Makefile.am		     |	  3 +-
 libempathy-gtk/empathy-individual-widget.c  | 1892
 +++++++++++++++++++++++++--
 libempathy-gtk/empathy-individual-widget.h  |	 42 +-
 libempathy-gtk/empathy-individual-widget.ui |	173 +++
 po/POTFILES.in				     |	  2 +
 5 files changed, 2012 insertions(+), 100 deletions(-)

commit 8da7760544ee3c592f9a884a13b13103b3b5a674
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Tue Aug 10 19:43:54 2010 +0100

    Split the group editing widgets out of EmpathyContactWidget

    They can be shared between EmpathyContactWidget and a new
    EmpathyIndividualWidget, once it's written.

 libempathy-gtk/Makefile.am		  |   2 +
 libempathy-gtk/empathy-contact-widget.c  | 307 +---------------
 libempathy-gtk/empathy-contact-widget.ui | 104 +-----
 libempathy-gtk/empathy-groups-widget.c   | 600
 +++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-groups-widget.h   |  66 ++++
 po/POTFILES.in				  |   1 +
 6 files changed, 688 insertions(+), 392 deletions(-)

commit 1599c6961f70341daf755d28857f155c86ba8f39
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 19 16:22:28 2010 +0200

    live-search: fix typo

 libempathy-gtk/empathy-live-search.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d077181fac75859a864eede51d28c9517127afd8
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Thu Aug 19 14:33:22 2010 +0200

    Updated Slovenian translation

 po/sl.po | 84
 +++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 51 insertions(+), 33 deletions(-)

commit f2a86e5a6df46be0ce54d5a379f4c9c934c90f58
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Thu Aug 19 09:25:22 2010 +0300

    Updated Hebrew translation.

 po/he.po | 125
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 67 insertions(+), 58 deletions(-)

commit 2a5ce3706d080bec3c949bda07e9b926659b7e77
Author: Daniel Nylander <po@danielnylander.se>
Date:	Wed Aug 18 22:23:39 2010 +0200

    Updated Swedish translation

 po/sv.po | 179
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 101 insertions(+), 78 deletions(-)

commit 433ed2c918f81aeac6fd7eb1dacfbeb2d82a6f6d
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Aug 18 18:32:29 2010 +0100

    Ensure we disconnect signals from all Personas in an Individual

 libempathy-gtk/empathy-individual-store.c | 77
 +++++++++++++++++++++++--------
 1 file changed, 58 insertions(+), 19 deletions(-)

commit 015070caec0ec80ac53127c619bde516081670e6
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Aug 18 18:13:02 2010 +0100

    Allow cancellation of avatar load operations

    Automatically cancel all pending avatar load operations when
    disposing of
    an EmpathyIndividualStore. This prevents crashes when linking
    individuals in
    the case that the EmpathyIndividualStore in the linking dialogue gets
    notified of the new linked individual just before it's destroyed.

 libempathy-gtk/empathy-individual-store.c | 57
 ++++++++++++++++++++++++++-----
 libempathy-gtk/empathy-ui-utils.c	   |  7 ++--
 libempathy-gtk/empathy-ui-utils.h	   |  3 +-
 3 files changed, 54 insertions(+), 13 deletions(-)

commit 4472cbd53db695b41146ec4c9345ee4ab3197b04
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 19:28:25 2010 +0200

    Use _complete instead of _complete_in_idle()

 libempathy/empathy-tls-certificate.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ea19d00b74b36acc40115a3b48218ccc6af54d04
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 19:07:17 2010 +0200

    Don't show the error if user-requested is set

 src/empathy-main-window.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 92aee43c95f51aa828c34c828c18c38a3e1fdcb6
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 19:06:59 2010 +0200

    Use new API in EmpathyAccountsDialog

 src/empathy-accounts-dialog.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 5b7271c8f3c349637516c6b5bdb442aa9a480925
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 19:06:27 2010 +0200

    Add an usre_requested param to _account_get_error()

 libempathy/empathy-utils.c | 15 +++++++++++++--
 libempathy/empathy-utils.h |  3 ++-
 2 files changed, 15 insertions(+), 3 deletions(-)

commit 61e8bd3c9fec6cef2aa65cdaef98a383f346dcf1
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 18:11:42 2010 +0200

    Use the hostname properties in the dialog

 libempathy-gtk/empathy-tls-dialog.c | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

commit d7d8916076c8dcca1b1d95f090444cc6e7a05cd6
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 18:01:45 2010 +0200

    Fill 'user-requested' when we reject the certificate

 src/empathy-auth-client.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

commit 6c3c7278e4d1716342d1d222891c33e98d829691
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 18:01:15 2010 +0200

    Use the hash table directly as a parameter to reject ()

    Clients will have to fill it anyway

 libempathy/empathy-tls-certificate.c | 7 +------
 libempathy/empathy-tls-certificate.h | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

commit 37d64d2ec686d48a88db3f94b92e88df213b11b7
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 17:54:34 2010 +0200

    Remove whitespace

 libempathy/empathy-server-tls-handler.c | 2 +-
 libempathy/empathy-tls-certificate.c	 | 6 +++---
 libempathy/empathy-tls-verifier.c	 | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

commit 460043daa52d76ffdc90b2f9cf6432b12c850a0f
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 17:53:42 2010 +0200

    Add new files to extensions/Makefile.am

 extensions/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

commit 709119042e1c45e0aafb38659ac6ea7396c8aa0c
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 17:53:29 2010 +0200

    Add new files to POTFILES.in

 po/POTFILES.in | 2 ++
 1 file changed, 2 insertions(+)

commit 526dbcddf5a3969a8714b49441e4dd62927837f3
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 16:55:03 2010 +0200

    Implement a timeout machinery for the auth client

    Similar to the one used in empathy-av.c

 src/empathy-auth-client.c | 64
 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

commit 5286587e932047f9b32001429a395d8caf193b26
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 16:47:02 2010 +0200

    Rename empathy-auth-helper->empathy-auth-client

 ...esktop.Telepathy.Client.Empathy.Auth.service.in |	2 +-
 src/Makefile.am				    |	6 +-
 src/empathy-auth-client.c			    | 198
 +++++++++++++++++++++
 src/empathy-auth-helper.c			    | 198
 ---------------------
 4 files changed, 202 insertions(+), 202 deletions(-)

commit 9005c6a1357b612d9a3bce36dd6326da487ab728
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 16:44:30 2010 +0200

    Don't allow calling verify_async() twice

 libempathy/empathy-tls-verifier.c | 2 ++
 1 file changed, 2 insertions(+)

commit a272c04575698908bff1363f3d652cc67876e599
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 16:43:17 2010 +0200

    Use tp_clear_pointer() where possible

 libempathy/empathy-tls-verifier.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

commit 53966af9c627e5217fb247b64ef62bf40541c5f8
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 16:41:22 2010 +0200

    Push the details table to the dialog after verification

 src/empathy-auth-helper.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 86eac228724f7a4c45b8bc58254af77bdad1e766
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 16:40:50 2010 +0200

    Add a details hash table to the dialog properties

 libempathy-gtk/empathy-tls-dialog.c | 29 ++++++++++++++++++++++++++++-
 libempathy-gtk/empathy-tls-dialog.h |	3 ++-
 2 files changed, 30 insertions(+), 2 deletions(-)

commit f0793af4b460ffcde3df89f77590f6130c2b8b9e
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 16:40:21 2010 +0200

    Add a details hash table as an out param of the verification

 libempathy/empathy-tls-verifier.c | 35
 +++++++++++++++++++++++++++++------
 libempathy/empathy-tls-verifier.h |  1 +
 2 files changed, 30 insertions(+), 6 deletions(-)

commit 0a173bc247669513992889723e93eb2de4cc0de9
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 16:18:10 2010 +0200

    Make it more clear which snippets are taken from GnuTLS

 libempathy/empathy-tls-verifier.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit f735801461c5748ee212eaba80c894f33ecf3f10
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 16:11:20 2010 +0200

    Assert when we have an invalid pointer

 libempathy/empathy-tls-verifier.c | 2 ++
 1 file changed, 2 insertions(+)

commit 69983e8165de21075d7e9102fa855c99ffa2290b
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 16:09:22 2010 +0200

    Update to the new EmpathyTLSCertificate async API

 src/empathy-auth-helper.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit d20fcc3aedd0b76b3ea0307bb69324121f49b555
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 16:08:49 2010 +0200

    Make _accept/_reject real async methods

 libempathy/empathy-tls-certificate.c | 69
 +++++++++++++++++++++++++++++++-----
 libempathy/empathy-tls-certificate.h | 17 +++++++--
 2 files changed, 74 insertions(+), 12 deletions(-)

commit 92c282488352fd9067fdfbd1d9e96b668a2ff19c
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 15:41:49 2010 +0200

    Use _borrow_immutable_properties instead of GetAll()

    This also simplifies the code somewhat

 libempathy/empathy-server-tls-handler.c | 65
 +++++++++++----------------------
 1 file changed, 21 insertions(+), 44 deletions(-)

commit d9428d22891d01b25b08f23278317daa78871274
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 15:41:01 2010 +0200

    Properly use errors when handling channels

 libempathy/empathy-auth-factory.c | 70
 +++++++++++++++++++++++++++++++--------
 1 file changed, 56 insertions(+), 14 deletions(-)

commit 41c88d2a8b3670901473061dd53eb83e6f7ad34c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 18 15:20:56 2010 +0200

    Display invite dialog even if we don't know the inviter (#627228)

 src/empathy-event-manager.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

commit 35cde642055edd0334283ad63224608e0f388fdb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 18 15:19:11 2010 +0200

    display_invite_room_dialog: deal with contact being NULL

 src/empathy-event-manager.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

commit 12edcf477eaf0bd6a2c9307e2d82a0c1383646d8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 18 15:14:44 2010 +0200

    factor out display_invite_room_dialog

 src/empathy-event-manager.c | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

commit 2b47047e4493f4ea950d9ecbe4174a0553812d3e
Author: Baurzhan Muftakhidinov <baurthefirst@gmail.com>
Date:	Wed Aug 18 14:30:58 2010 +0300

    l10n: Added Kazakh translation for empathy

 po/kk.po | 3557
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 3557 insertions(+)

commit 29770cf3aedfe6c55016cf3428fd55b6fa246798
Author: Baurzhan Muftakhidinov <baurthefirst@gmail.com>
Date:	Wed Aug 18 14:30:45 2010 +0300

    l10n: Added Kazakh (kk) to po/LINGUAS for empathy

 po/LINGUAS | 1 +
 1 file changed, 1 insertion(+)

commit 03c9af3782b65f1d9d549c1b6326d36705a4900a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 18 12:24:50 2010 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 1fba1db04fde57223ace7332111d146a124a643a
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 11:09:11 2010 +0200

    Add reference to the original gnome-keyring repo

 libempathy-gtk/gcr-simple-certificate.c | 3 +++
 libempathy-gtk/gcr-simple-certificate.h | 3 +++
 2 files changed, 6 insertions(+)

commit 1f436c6ef319671d80b1c35bd498dd4893c6919b
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 18 11:03:07 2010 +0200

    Require GnuTLS >= 2.8.5

 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 file 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 file 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 file changed, 1 insertion(+), 1 deletion(-)

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 file 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 file changed, 1 insertion(+), 1 deletion(-)

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 file 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 file 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 file 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 file 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 file 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 file 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(+)

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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file changed, 205 insertions(+), 171 deletions(-)

commit 2c95c1dd40e651b5f565e027b1a07cae251f87b2
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 13 16:20:07 2010 +0200

    Add the checkbox only if the reason is SelfSigned

    Also, add a comment to explain why.

 libempathy-gtk/empathy-tls-dialog.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

commit 1937b83032ff55814c27176c22e4184d0d30e045
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 13 16:15:17 2010 +0200

    Save the certificate when we are told to remember

 src/empathy-auth-helper.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 2d6a216618624813b28495701d50c184c9934d77
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 13 16:15:00 2010 +0200

    Build the right path when looking at user certs

 libempathy/empathy-tls-verifier.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 48973a29e5016c9e88b3b19fdfe8e31856ce9cf5
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 13 16:14:28 2010 +0200

    Add a 'remember' checkbox and property to the dialog

 libempathy-gtk/empathy-tls-dialog.c | 35
 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

commit dd57dd21018ac62e2cc89f5aa5e24d682d4c9886
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 13 16:14:09 2010 +0200

    Add a method to store the CA certificate

 libempathy/empathy-tls-certificate.c | 119
 +++++++++++++++++++++++++++++++++++
 libempathy/empathy-tls-certificate.h |   2 +
 2 files changed, 121 insertions(+)

commit c61bb1765e65369933a571b6dccb07ec338cb515
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 13 12:32:43 2010 +0200

    Integrate the dialog into the auth helper

 src/empathy-auth-helper.c | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

commit ae9cd01797616138fc16931e558fa1b65d9301eb
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 13 12:31:21 2010 +0200

    Import gcr-simple-certificate from gcr

    Don't know why, but this isn't exported from gcr.
    While we try to make this public, include it here, as it's
    self-contained anyway.

 libempathy-gtk/Makefile.am		 |   1 +
 libempathy-gtk/gcr-simple-certificate.c | 131
 ++++++++++++++++++++++++++++++++
 libempathy-gtk/gcr-simple-certificate.h |  58 ++++++++++++++
 3 files changed, 190 insertions(+)

commit f0f6e527dfe5de231d202bcc3cfcb4c7d85ab19e
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 13 12:30:48 2010 +0200

    Add EmpathyTLSDialog

 libempathy-gtk/Makefile.am	     |	 2 +
 libempathy-gtk/empathy-tls-dialog.c | 275
 ++++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-tls-dialog.h |	68 +++++++++
 3 files changed, 345 insertions(+)

commit 1c109373f9911de8f639cb6b355035478c0ab899
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 13 12:30:11 2010 +0200

    Depend on gcr from gnome-keyring

 configure.ac		    | 3 ++-
 libempathy-gtk/Makefile.am | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

commit b06a27336c0e42fc81ae4c9e51dfd2a02967e88f
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Aug 12 18:48:06 2010 +0200

    Add also certificates from our storage

    I.e. ~/.config/telepathy/certs. Also, make sure we release memory when
    finalizing the object.

 libempathy/empathy-tls-verifier.c | 83
 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 77 insertions(+), 6 deletions(-)

commit 20a75e4d53bb2b72de3f2fc535956a9ad57b9eb4
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Aug 12 18:47:42 2010 +0200

    Cosmetic changes

 libempathy/empathy-tls-verifier.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit 8d376fae7df339ead4ab9ef2ae588e2762849ccf
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Aug 12 18:47:13 2010 +0200

    Implement hostname checking

 libempathy/empathy-tls-verifier.c | 59
 +++++++++++++++++++++++++++++++++++----
 1 file changed, 54 insertions(+), 5 deletions(-)

commit dd4b301661b2516731027eebbf3147692292d749
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Aug 12 18:46:08 2010 +0200

    Correctly treat the last certificate in the chain

    I.e. emit SelfSigned if we don't have any trusted CAs in our cache.

 libempathy/empathy-tls-verifier.c | 43
 ++++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 10 deletions(-)

commit 7472633dcbe1e50a28224960a02b8cf8f83bf422
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Aug 12 18:45:05 2010 +0200

    Use the right GnuTLS->Tp mapping for reasons.

 libempathy/empathy-tls-verifier.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e04b713c4a14b7accff86fe57ca78cb4cd5e0e46
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed Aug 11 19:44:08 2010 +0200

    Use the right index to access the cert array.

 libempathy/empathy-tls-verifier.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5c313ddb2557218b7ccd4b3dd13dc1aad3834506
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 11 19:01:01 2010 +0200

    Make sure to release all the references

 libempathy/empathy-server-tls-handler.c | 10 +++++++---
 libempathy/empathy-tls-certificate.c	 |  4 ++++
 2 files changed, 11 insertions(+), 3 deletions(-)

commit 50f265ad2feffc9826a0c3a77782673fc39fca0e
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 11 18:35:36 2010 +0200

    Whitespace fix

 libempathy/empathy-server-tls-handler.h | 1 -
 1 file changed, 1 deletion(-)

commit e750de24904feef14c5e1e4bd68f935abd3cb6de
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 11 18:35:20 2010 +0200

    Verify the certificate from the helper.

 src/empathy-auth-helper.c | 56
 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 52 insertions(+), 4 deletions(-)

commit 2db2e6fb886a7406736c8343f9cbd8d61edc5b16
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 11 18:35:01 2010 +0200

    Add debug output

 libempathy/empathy-tls-certificate.c | 2 ++
 1 file changed, 2 insertions(+)

commit 8293e56eb851b8780986e67043b55304218cb1cb
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 11 18:34:49 2010 +0200

    Update to the new tp-spec API

 libempathy/empathy-tls-certificate.c | 31 ++++++-------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

commit b8fcad07a799884570e6ac115622e8bf0f2762ce
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 11 18:34:12 2010 +0200

    Add Hostname and Certificate properties

 libempathy/empathy-server-tls-handler.c | 29
 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

commit b5e5d4af88422f5afc0377bb20a0863520911837
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 11 18:33:36 2010 +0200

    Update spec snapshot

 extensions/Authentication_TLS_Certificate.xml	   | 308
 +++++++++++-----------
 extensions/Channel_Type_Server_TLS_Connection.xml |  26 +-
 2 files changed, 173 insertions(+), 161 deletions(-)

commit 6a16791dc335fed6706352e1612893f312a80a3f
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 11 18:33:08 2010 +0200

    Add EmpathyTLSVerifier

    This also introduces a dependency on GnuTLS

 configure.ac			   |   1 +
 libempathy/Makefile.am		   |   2 +
 libempathy/empathy-tls-verifier.c | 558
 ++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-tls-verifier.h |  78 ++++++
 src/empathy-auth-helper.c	   |   9 +
 5 files changed, 648 insertions(+)

commit 2f63c0828065d86239a6ff6ebbb8b07ddc929046
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon Aug 9 12:27:47 2010 +0200

    Update for the new tp-spec API

 libempathy/empathy-tls-certificate.c | 70
 ++++++++++++++++++++++++++++++++----
 libempathy/empathy-tls-certificate.h |  3 +-
 2 files changed, 66 insertions(+), 7 deletions(-)

commit ce6b6bc1f8662ff24ec44fb76e869394b3f64328
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon Aug 9 12:27:09 2010 +0200

    Update to the merged spec.

 extensions/Authentication_TLS_Certificate.xml	   | 175
 ++++++++++++++++++----
 extensions/Channel_Type_Server_TLS_Connection.xml |  27 ++--
 2 files changed, 159 insertions(+), 43 deletions(-)

commit 3564f1760938f7312b3cd16f1c8c8227c44ab4ad
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Jul 22 19:28:23 2010 +0200

    Add the proxy properties and methods.

    Mirror them on the GObject itself, for Empathy to use and consume
    them.

 libempathy/empathy-tls-certificate.c | 96
 ++++++++++++++++++++++++++++++++++++
 libempathy/empathy-tls-certificate.h |  6 +++
 2 files changed, 102 insertions(+)

commit 7a8b4058baa7f61cf93aa41076047a6f08d0eecb
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Jul 22 19:27:07 2010 +0200

    Add the Authentication.TLSCertificate iface

 libempathy/empathy-tls-certificate.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 6ce5a087dad56816cb895dbdb2b30ac3a0c1f9a4
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Jul 22 19:26:13 2010 +0200

    Unref the handler after the signal.

    It's useless at that point, as it only carries the TLS certificate;
    also, if someone wants to keep it, they can always ref it.

 libempathy/empathy-auth-factory.c | 1 +
 1 file changed, 1 insertion(+)

commit 268f91e2666922f1a7ced025d0a69956a7257e73
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Jul 12 19:32:39 2010 +0200

    Add a debug flag for TLS

 libempathy/empathy-debug.c | 1 +
 libempathy/empathy-debug.h | 1 +
 2 files changed, 2 insertions(+)

commit c41523ab7160693a91640a68f309d5266c5708ad
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Jul 12 19:31:54 2010 +0200

    Add the service files for the new client.

 data/Empathy.Auth.client				       | 6 ++++++
 data/Makefile.am					       |
 9 +++++++--
 data/org.freedesktop.Telepathy.Client.Empathy.Auth.service.in | 3 +++
 3 files changed, 16 insertions(+), 2 deletions(-)

commit 487385179b4d3156348c82637109bdc3f6f319f1
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Jul 9 16:44:11 2010 +0200

    Add tp-spec extensions for TLS auth.

 extensions/Authentication_TLS_Certificate.xml	   | 191
 ++++++++++++++++++++++
 extensions/Channel_Type_Server_TLS_Connection.xml |  54 ++++++
 extensions/misc.xml				   |   2 +
 3 files changed, 247 insertions(+)

commit 494ed942822cc9657465a03a5b95936cb60da280
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Jul 9 16:43:49 2010 +0200

    Add a first skeleton of the auth helper.

 src/Makefile.am	   |  6 ++-
 src/empathy-auth-helper.c | 93
 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+), 1 deletion(-)

commit ed819ae5dfef5c6fd584fd8a63bbce9080cd4040
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Jul 9 16:43:25 2010 +0200

    Add a first skeleton of the auth factory.

 libempathy/Makefile.am		   |   2 +
 libempathy/empathy-auth-factory.c | 208
 ++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-auth-factory.h |  66 ++++++++++++
 3 files changed, 276 insertions(+)

commit 2cbd1c3661cc56f3558bd7391c6f15cc16f2f61f
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Jul 22 17:50:30 2010 +0200

    Add EmpathyServerTLSHandler.

 libempathy/Makefile.am			 |   2 +
 libempathy/empathy-server-tls-handler.c | 265
 ++++++++++++++++++++++++++++++++
 libempathy/empathy-server-tls-handler.h |  74 +++++++++
 3 files changed, 341 insertions(+)

commit 92655cecb16b8f0d370d03450804a5cbc4fd89d2
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Jul 22 17:50:09 2010 +0200

    Add EmpathyTLSCertificate.

 libempathy/Makefile.am		      |   2 +
 libempathy/empathy-tls-certificate.c | 292
 +++++++++++++++++++++++++++++++++++
 libempathy/empathy-tls-certificate.h |  69 +++++++++
 3 files changed, 363 insertions(+)

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 file changed, 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 insertion(+), 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 file changed, 1 insertion(+), 1 deletion(-)

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 file 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(+)

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 file changed, 1 insertion(+), 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 file 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 file 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 file changed, 1 insertion(+)

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 file changed, 3 insertions(+), 1 deletion(-)

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 file 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 file 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 file changed, 4 insertions(+)

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 file changed, 1 insertion(+), 1 deletion(-)

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 file 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 file 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 file 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 file changed, 1 insertion(+), 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 file changed, 2 insertions(+), 1 deletion(-)

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 file 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 file changed, 1 insertion(+), 1 deletion(-)

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(+)

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(+)

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(+)

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(+)

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 file changed, 1 insertion(+), 1 deletion(-)

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 file 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 file 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, 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 file changed, 1 insertion(+), 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 file 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 file 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 file 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, 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, 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 file 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 file 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 file 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 file changed, 1 insertion(+)

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 file 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 file 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 file 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 file 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 file 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 file changed, 9 insertions(+)

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 file changed, 1 insertion(+), 1 deletion(-)

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 file changed, 4 insertions(+)

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 file changed, 6 insertions(+)

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 file 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 file changed, 1 insertion(+), 1 deletion(-)

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 file changed, 1 deletion(-)

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 file changed, 1 insertion(+), 1 deletion(-)

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 file changed, 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 file 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 file changed, 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file 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 file changed, 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 file 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 file 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 file 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 file 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 file changed, 1 insertion(+), 1 deletion(-)

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 file 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 file 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 file 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 file 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 file 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 file changed, 1 insertion(+), 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 insertion(+), 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 file 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 file changed, 1 insertion(+), 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 file changed, 21 insertions(+)

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(+)

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 file 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 file 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 file 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 file 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 file 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 file 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 file changed, 13 insertions(+)

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 file changed, 1 insertion(+), 1 deletion(-)

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 file changed, 23 insertions(+)

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 file changed, 4 insertions(+)

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(+)

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(+)

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 file 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 file changed, 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 file 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 file 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 file changed, 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 file 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 file changed, 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 deletion(-)

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 file 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 file 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 file changed, 1 insertion(+), 1 deletion(-)

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 file changed, 1 insertion(+), 1 deletion(-)

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 file changed, 2 insertions(+), 2 deletions(-)

commit 19089099870f5bfe681aa18b90136906025caab7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 2 17:35:17 2010 +0200

    prepare 2.31.6

 NEWS	      | 40 ++++++++++++++++++++++++++++++++++++++++
 configure.ac |  6 +++---
 2 files changed, 43 insertions(+), 3 deletions(-)

commit dd0384472ded465c5124700accba8f4b786c51d1
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Mon Aug 2 16:55:42 2010 +0100

    Don't warn when adding an existing contact

    Closes: bgo#625830

 libempathy/empathy-individual-manager.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit 25c5ac2188cde02fe35d9d29eccb11adb6950a8b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 2 16:40:31 2010 +0200

    map-view: be a proper GtkWindow (#625826)

 src/empathy-map-view.c  | 228
 +++++++++++++++++++++++++++++-------------------
 src/empathy-map-view.h  |  24 +++++
 src/empathy-map-view.ui | 123 ++++++++++++--------------
 3 files changed, 221 insertions(+), 154 deletions(-)

commit f0f07ffc65b2b8f353262ee8e0f5e4cc535a9772
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 2 14:56:06 2010 +0200

    free the list returned by clutter_container_get_children()

 src/empathy-map-view.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit bf773817f5ea14ac8566171153e2df793aeb03aa
Author: Nicolò Chieffo <yelo3@gmail.com>
Date:	Mon Aug 2 12:40:52 2010 +0200

    show the date in messages coming from history (#624599)

 libempathy-gtk/empathy-log-window.c  |  2 +-
 libempathy-gtk/empathy-theme-adium.c | 16 +++++++++++-----
 libempathy/empathy-time.h	      |  3 ++-
 3 files changed, 14 insertions(+), 7 deletions(-)

commit f8f4c3a9dc1e21df9e78dafb259112a9a5ac4b46
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 2 10:40:51 2010 +0200

    Check for the right version of CC depending on GTK+

    gnome-control-center has been ported to GTK+3 in 2.31.4

 configure.ac | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit f77a8afd5d85a230b743d97e12ed069a0309b660
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jul 23 14:41:32 2010 +0200

    Group all matching functions together

    This is only code move, no change

 libempathy-gtk/empathy-live-search.c | 138
 +++++++++++++++++------------------
 1 file changed, 69 insertions(+), 69 deletions(-)

commit 6f3136b0a2168dee114dae4381f9e5c0b9d0ba0d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jul 23 14:40:10 2010 +0200

    Abort directly if a test failed

 tests/empathy-live-search-test.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit 3251e70779cb69865797a32da731194eaa89f882
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jul 23 14:39:39 2010 +0200

    Simplify code: Avoid nested loops

 libempathy-gtk/empathy-live-search.c | 124
 ++++++++++++++++++-----------------
 1 file changed, 63 insertions(+), 61 deletions(-)

commit fa60b75334999bedb28dfacdbb5a73f1cc62193a
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jul 22 15:02:06 2010 +0200

    Make livesearch work if accentued letters are pre-decomposed

 libempathy-gtk/empathy-live-search.c | 12 ++++++------
 tests/empathy-live-search-test.c     |  7 ++++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

commit 9ab5da340ffe6f13afc5b3e32682635980b96ad5
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Jun 22 13:04:05 2010 +0200

    Add unit tests for the multi-word searching

 tests/empathy-live-search-test.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 0cdeb7e2b28f91b84cefb15d72eaa21af8a5be99
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Jun 22 13:03:36 2010 +0200

    Make EmpathyLiveSearch's match algo smarter with words

    Fixes bug #622376

 libempathy-gtk/empathy-live-search.c | 101
 +++++++++++++++++++++++++----------
 1 file changed, 74 insertions(+), 27 deletions(-)

commit 09224fdb009abd2cc54ff4c3b6c64b47970f47d3
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jul 22 12:43:10 2010 +0200

    Add GTK_LIBS to build tests

 tests/Makefile.am | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 9f98cdc5cb1e709fbe150bb98b94e49e165e6d12
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Thu Jul 29 17:02:01 2010 +0200

    backport the last commit to contact-list-view

 libempathy-gtk/empathy-contact-list-view.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

commit df5cfb43b2c1bb9d0cd5f55b7397cfd327aedd34
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Thu Jul 29 16:53:28 2010 +0200

    added return value for the keynav signal

    now the hook widget can decide if it wants to handle the event
    or not. in case of the treeview this allows us to navigate in the
    search entry with left and right and navigate in the treeview with
    up and down since those are catched by the treeview

 libempathy-gtk/empathy-individual-view.c |  8 ++++++--
 libempathy-gtk/empathy-live-search.c	  | 12 +++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

commit f42a546df394424e9ca71e123e2482bcc021ed82
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Thu Jul 29 16:07:34 2010 +0200

    changed the type of keynav signal

    now VOID__BOXED is used instead of VOID__POINTER

 libempathy-gtk/empathy-individual-view.c | 8 ++++----
 libempathy-gtk/empathy-live-search.c	  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

commit 8b6f735f75f51774bce12eb64ad1ed4712289bbb
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Wed Jul 28 17:49:44 2010 +0200

    added check for null before scroll to cell

 libempathy-gtk/empathy-individual-view.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 673b6d90189c65ef4d859e2a3139ce7c0cea1e49
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Wed Jul 28 14:59:06 2010 +0200

    add key navigation possibilities to search

    one result of this patch is that key navigation in the search-entry
    will not be possible any more, in order to allow the hook widget to
    react to key navigation.

 libempathy-gtk/empathy-individual-view.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

commit f49028633f80ab1c641f29f85ae39e2184894f93
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Wed Jul 28 14:43:05 2010 +0200

    keep the selected contact visible after search

    empathy will scroll automatically to the cell which is selected,
    when the search is hidden.

 libempathy-gtk/empathy-individual-view.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 6568f7b78787cd1c6dbf7a447b71865986b12bc6
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Jul 27 16:59:58 2010 +0200

    enable keynavigation during search in contact-list

 libempathy-gtk/empathy-contact-list-view.c | 24 ++++++++++++++++++++++++
 libempathy-gtk/empathy-live-search.c	    | 28
 ++++++++++++++++++++++++----
 2 files changed, 48 insertions(+), 4 deletions(-)

commit 2e4f5741143341616ed2cca3bf27a0204483d4ff
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Jun 15 15:04:52 2010 +0200

    dont catch key up and down from the treeview

    it is needed for the navigation. current implementation did catch
    it from the treeview and propagate it to the live search entry.

 libempathy-gtk/empathy-live-search.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 4ac906564f1cfc4991f7482a8469881ef79639e8
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Wed Jul 28 17:55:27 2010 +0200

    fixed a critical when quiting while searching

 libempathy-gtk/empathy-live-search.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 85e71e2cfadaceab73addb357c04557652d0cee9
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Wed Jul 28 16:55:44 2010 +0200

    added zh_CN to help/.gitignore

 help/.gitignore | 2 ++
 1 file changed, 2 insertions(+)

commit 423f378b511ca9e15b2e476d0c453b087470bc1a
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Wed Jul 28 16:42:32 2010 +0200

    fix small regression with expanding groups

 libempathy-gtk/empathy-individual-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c5634d7706322a4c86bef37b0c59740bd4f3ec0e
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Tue Jul 27 23:02:12 2010 +0200

    [i18n] Updated German translation

 po/de.po | 242
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 132 insertions(+), 110 deletions(-)

commit f84aee88c44c0b9f58709e95675c7b3fd6547428
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Tue Jul 27 17:50:55 2010 +0200

    Updated Galician translations

 po/gl.po | 208
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 115 insertions(+), 93 deletions(-)

commit 34e8fc1344c5433be1a9d8f8614cdb84933a84fb
Merge: 4ca3b29 a976f81
Author: Travis Reitter <treitter@gmail.com>
Date:	Tue Jul 27 12:54:06 2010 +0200

    Merge branch 'folks-async-and-prepare'

commit a976f8193404e5c89d0a9a9051f629057e200f9b
Author: Travis Reitter <treitter@gmail.com>
Date:	Mon Jul 26 18:49:35 2010 +0200

    Adjust for signature change in folks_groups_change_group()

 libempathy-gtk/empathy-individual-view.c | 22 ++++++++++++++++++++--
 libempathy/empathy-contact.c		  | 19 ++++++++++++++++++-
 libempathy/empathy-individual-manager.c  | 19 ++++++++++++++++++-
 3 files changed, 56 insertions(+), 4 deletions(-)

commit e854ea2dad6350cc1787f9ac9ee1012c7c2ebd77
Author: Travis Reitter <treitter@gmail.com>
Date:	Mon Jul 26 18:24:51 2010 +0200

    Adjust for signature change in
    folks_individual_aggregator_remove_individual()

 libempathy/empathy-individual-manager.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

commit da3c11790a80db7fce92778352481bafd95bf939
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Jun 30 14:52:27 2010 +0100

    Use the new IndividualAggregator.prepare() method

    This avoids races when connecting to signals from the
    IndividualAggregator.

 configure.ac				 | 2 +-
 libempathy/empathy-individual-manager.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 4ca3b29b70ca4f624153783c26f0d746f58003a8
Author: Aron Xu <aronxu@gnome.org>
Date:	Tue Jul 27 15:28:19 2010 +0800

    Add Simplified Chinese help translation.

 help/Makefile.am    |	  2 +-
 help/zh_CN/zh_CN.po | 2711
 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 2712 insertions(+), 1 deletion(-)

commit d3edbb376910878781d5a326c52cb9885d9b15d2
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Tue Jul 27 01:09:27 2010 +0200

    Updated Galician translations

 help/gl/gl.po | 2653
 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 1324 insertions(+), 1329 deletions(-)

commit 8f1e4293a4d4410c48ca3572c71c3a2eb9509d71
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Jul 26 20:58:43 2010 +0200

    Updated Spanish translation

 po/es.po | 250
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 134 insertions(+), 116 deletions(-)

commit fc4697f53ca3bde0ec9cb911587806d2245a536e
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Jul 26 20:11:04 2010 +0200

    Committed version of x264enc needs profile=1 for baseline

 data/element-properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8c67868e68f97c9822f9f66ad2de0554a16f9882
Author: Torstein Adolf Winterseth <kvikende@fsfe.org>
Date:	Mon Jul 26 18:02:00 2010 +0200

    Updated Norwegian Nynorsk translation

 po/nn.po | 1147
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 584 insertions(+), 563 deletions(-)

commit 27b984d49c08f1504da5dda6f449a759795721bd
Author: Torstein Adolf Winterseth <kvikende@fsfe.org>
Date:	Mon Jul 26 17:58:29 2010 +0200

    Added Norwegian Nynorsk translation

 po/LINGUAS |	 1 +
 po/nn.po   | 3335
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 3336 insertions(+)

commit fa64735c16e43857bdcee54b55b4911766731f3b
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	Sun Jul 25 20:55:40 2010 +0200

    Updated Slovenian translation

 po/sl.po | 352
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 172 insertions(+), 180 deletions(-)

commit 2c0802e450f955c5688babc552d6af029267a5d8
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sun Jul 25 16:25:19 2010 +0200

    Updated Galician translations

 help/gl/gl.po | 210
 ++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 138 insertions(+), 72 deletions(-)

commit e5fbae9a9796477e1373098e036b6247d1aa0b6b
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Sat Jul 24 20:00:22 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 204
 +++++++++++++++++++++++++++++++++---------------------------
 po/zh_TW.po | 204
 +++++++++++++++++++++++++++++++++---------------------------
 2 files changed, 226 insertions(+), 182 deletions(-)

commit 4d97eef1d2c42553d41ff5a24bac1c835c4afe37
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Sat Jul 24 13:27:38 2010 +0300

    Updated Hebrew translation.

 po/he.po | 252
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 137 insertions(+), 115 deletions(-)

commit aa08e47f9ae2bcbb7aeeeabb5bd30d7c09cc9aaa
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jul 23 10:44:15 2010 +0200

    Add help/gl/ in gitignore

 help/.gitignore | 2 ++
 1 file changed, 2 insertions(+)

commit f82c41d6384f727fec1f2937714f831d84e20dfd
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jul 23 10:42:53 2010 +0200

    Remove cc-empathy-accounts-page.c from POTFILE.in

 po/POTFILES.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit ffe01c047fd5fcc7f6443c2bd2bf01a91882c6e8
Author: Yunqiang Su <wzssyqa@gmail.com>
Date:	Fri Jul 23 13:21:35 2010 +0800

    Update Simplified Chinese translations.

 po/zh_CN.po | 164
 ++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 92 insertions(+), 72 deletions(-)

commit e3955eea9b1a64b4252226936c985f4eae8db5aa
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Thu Jul 22 16:32:15 2010 +0200

    Updated Galician translations

 po/gl.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit d79516d0ed6831314ff73a2f0563c39c20e9c462
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Jul 9 14:53:37 2010 +0100

    Use presence message from FolksPersona rather than TpContact

 libempathy/empathy-contact.c | 40
 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

commit 0c9907c6a704bed65db982ac9ae5fe83912c647d
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Jul 9 14:22:54 2010 +0100

    Enforce use only of TpfPersonas

    If we only allow EmpathyContacts to be linked to TpfPersonas, we can
    make some assumptions about which interfaces are available on the
    personas for efficiency purposes.

 libempathy/empathy-contact.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit e922ae799989e073cb6649578555ad686bcb0fc8
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Jul 7 17:01:59 2010 +0100

    Re-enable setting of groups for newly-added contacts

    Changes to groups made while adding a contact need to be cached up
    until the
    contact's FolksPersona is set, when they can be flushed to the
    libfolks
    backend.

 libempathy-gtk/empathy-contact-widget.c | 13 ++-------
 libempathy/empathy-contact.c		 | 47
 +++++++++++++++++++++++++++++++++
 libempathy/empathy-contact.h		 |  2 ++
 3 files changed, 51 insertions(+), 11 deletions(-)

commit d64a31579c0cdaa7013f5165f5111d57feb9b92e
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Jul 7 16:25:53 2010 +0100

    Update FolksPersona:alias when updating EmpathyContact:alias

 libempathy/empathy-contact.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit b6568db4f81cf4e78e96aa5fe23f020de5ff6557
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Jul 7 16:21:43 2010 +0100

    Merge EmpathyContact:name and *_set_alias() to EmpathyContact:alias

    The "name" API was a relic of Gossip.

 libempathy-gtk/empathy-chat.c			  | 18 +++---
 libempathy-gtk/empathy-contact-dialogs.c	  |  2 +-
 libempathy-gtk/empathy-contact-list-store.c	  | 26 ++++-----
 libempathy-gtk/empathy-contact-list-view.c	  |  4 +-
 libempathy-gtk/empathy-contact-selector-dialog.c |  6 +-
 libempathy-gtk/empathy-contact-widget.c	  |  6 +-
 libempathy-gtk/empathy-theme-adium.c		  |  2 +-
 libempathy-gtk/empathy-theme-boxes.c		  |  4 +-
 libempathy-gtk/empathy-theme-irc.c		  |  4 +-
 libempathy-gtk/empathy-ui-utils.c		  |  2 +-
 libempathy/empathy-contact.c			  | 71
 ++++++++++--------------
 libempathy/empathy-contact.h			  |  5 +-
 libempathy/empathy-individual-manager.c	  |  2 +-
 libempathy/empathy-message.c			  |  2 +-
 libempathy/empathy-tp-chat.c			  |  2 +-
 src/empathy-call-window.c			  |  8 +--
 src/empathy-chat-window.c			  |  2 +-
 src/empathy-event-manager.c			  | 20 +++----
 src/empathy-ft-manager.c			  | 10 ++--
 src/empathy-map-view.c				  |  2 +-
 20 files changed, 91 insertions(+), 107 deletions(-)

commit a244924636a2a0cde9da06909ac2b1b141ce3b9e
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Jul 7 13:26:19 2010 +0100

    Remove folks_individual_dup_from_empathy_contact()

    As EmpathyContact is now a wrapper around FolksPersona, we can
    mutate the
    persona instead of acquiring an individual and mutating that instead.

 libempathy-gtk/empathy-contact-widget.c | 48
 +++++++++++----------------------
 libempathy/empathy-contact.c		 | 36 ++++++-------------------
 libempathy/empathy-utils.c		 | 32 ----------------------
 libempathy/empathy-utils.h		 |  1 -
 4 files changed, 23 insertions(+), 94 deletions(-)

commit 7e4dfd33eb0fe4e87aef3a0b6c8dbc94c540e7b0
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Jul 7 11:17:14 2010 +0100

    Add a link between EmpathyContact and FolksPersona

    EmpathyContact should eventually just be a thin wrapper over
    FolksPersona.

 libempathy/empathy-contact.c		 | 95
 +++++++++++++++++++++++++++++++++
 libempathy/empathy-contact.h		 |  4 ++
 libempathy/empathy-individual-manager.c |  3 ++
 3 files changed, 102 insertions(+)

commit da5ec3c2bf5f816cff03932d23aec183beb18ee5
Author: Travis Reitter <treitter@gmail.com>
Date:	Wed Jul 14 13:55:07 2010 -0700

    Merge remote branch 'pwith/folks-integ-rebase1-fixes-rebase1'
    into folks-fixes

 libempathy-gtk/empathy-contact-widget.c   |  4 ++--
 libempathy-gtk/empathy-individual-menu.c  |  6 ++----
 libempathy-gtk/empathy-individual-store.c | 27
 +++++++++++++++++++--------
 libempathy/empathy-individual-manager.c   |  1 +
 po/POTFILES.in				   |  1 +
 src/empathy-main-window.c		   |  2 ++
 6 files changed, 27 insertions(+), 14 deletions(-)

commit 5ee7ffd39ff228c35d0fb85aa7d55bbfe044e73f
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Jul 21 11:57:08 2010 +0100

    Re-add support for the "People Nearby" group

 libempathy-gtk/empathy-individual-store.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

commit 5f58a8e1491eb0a2c44bbcd73674cf88877500e3
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Wed Jul 21 13:40:07 2010 +0300

    Typos

 po/ar.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e2af25ce63ffd32d5bc3d411a3e57462d14a48f4
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Jul 21 10:14:06 2010 +0100

    Add authors and fix copyrights for empathy-accounts-module

 src/cc-empathy-accounts-panel.c | 4 +++-
 src/cc-empathy-accounts-panel.h | 3 ++-
 src/empathy-accounts-module.c	 | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

commit 8d37c869f388f81adccd057042cc520fdeb8f02e
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Jul 16 11:55:46 2010 +1000

    Remove unneccesary signal disconnection in EmpathyAccountsDialog

    Generated critical warnings under GTK+ 3

 src/empathy-accounts-dialog.c | 44
 +++++++++----------------------------------
 1 file changed, 9 insertions(+), 35 deletions(-)

commit de35a9afcc8b6c6273ae01876919a14c6179c5a5
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Jul 16 11:55:21 2010 +1000

    Update cc-empathy-accounts-panel for latest gnome-control-center

 data/empathy-accounts.desktop.in.in |	 1 +
 src/Makefile.am		     |	 2 -
 src/cc-empathy-accounts-page.c      | 264
 ------------------------------------
 src/cc-empathy-accounts-page.h      |	55 --------
 src/cc-empathy-accounts-panel.c     | 171 +++++++++++++++++------
 src/cc-empathy-accounts-panel.h     |	 2 +-
 6 files changed, 130 insertions(+), 365 deletions(-)

commit 4d850fee976c589164ab5b6355afbda8db75efe2
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Jul 15 17:15:48 2010 +1000

    Update gnome-control-center dependency

 configure.ac | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

commit 033b4fe0ddcf1827b4b3f6a617c47978e7edfde7
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Jul 15 17:14:52 2010 +1000

    Remove apostrophes from configure.ac because they break vim's
    highlighting

 configure.ac | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit f3e4307c1cfda8b363ac516e789a3b9668df23b3
Author: Travis Reitter <treitter@gmail.com>
Date:	Wed Jul 14 10:01:43 2010 -0700

    Take advantage of tp_asv_new().

 libempathy/empathy-individual-manager.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

commit 83b905bd5e671421b6346b328461017927440211
Author: Travis Reitter <treitter@gmail.com>
Date:	Wed Jul 14 09:55:27 2010 -0700

    Use the proper source_tag in
    empathy_pixbuf_avatar_from_individual_scaled_*().

 libempathy-gtk/empathy-ui-utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 7beead812ce0f9cf5b96233505f28ca479d58fd1
Author: Travis Reitter <treitter@gmail.com>
Date:	Mon Jul 12 23:23:24 2010 -0700

    Adjust to the new add_persona_from_details() API.

 configure.ac				 | 2 +-
 libempathy/empathy-individual-manager.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

commit e135f5a5112058e61bb20357f34f69e63a4cc942
Author: Travis Reitter <treitter@gmail.com>
Date:	Mon Jul 12 17:12:14 2010 -0700

    Update to the FolksIndividualAggregator:individuals-changed signal.

 configure.ac				 |  2 +-
 libempathy/empathy-individual-manager.c | 37
 +++++++++++++--------------------
 libempathy/empathy-utils.c		 |  7 +++++++
 libempathy/empathy-utils.h		 |  1 +
 4 files changed, 23 insertions(+), 24 deletions(-)

commit faa4b2c9106b84c7c083c9ef2763dbd0e6892998
Author: Travis Reitter <treitter@gmail.com>
Date:	Mon Jul 12 12:13:02 2010 -0700

    Don't depend on Folks capabilities in the IndividualView

 libempathy-gtk/empathy-individual-view.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

commit 9d7bdfa085b50a7c96082ffeebd5489c7192f4e2
Author: Travis Reitter <treitter@gmail.com>
Date:	Mon Jul 12 10:08:05 2010 -0700

    Calculate contact capabilities ourselves.

    The libfolks Capabilities interface will be removed temporarily,
    so we can't
    rely upon it for now.

 libempathy-gtk/empathy-individual-store.c | 45
 ++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 12 deletions(-)

commit 61814a215542bfe7353679affcc1d5dfaf1db094
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Jul 9 18:26:48 2010 -0700

    Only have one parameter per function definition line.

 libempathy/empathy-individual-manager.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 4be5fe61180e2c211114435b6490f820fd04d18c
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Jul 9 18:20:11 2010 -0700

    Cut excessive G_STRLOC in DEBUG statements.

 libempathy/empathy-individual-manager.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit e17c5b6110887b9fa038d174f9deb203d2e8259c
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Jul 9 18:18:04 2010 -0700

    Chain up IndividualManager's dispose() to call its parent's dispose().

 libempathy/empathy-individual-manager.c | 2 ++
 1 file changed, 2 insertions(+)

commit eee71e1200b22c9d168db3b111075f88595e5130
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Jul 9 18:16:00 2010 -0700

    Perform the IndividualManager dispose work in a dispose() function,
    not finalize.

 libempathy/empathy-individual-manager.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 57ad2410667935dfdab6d58fb09594ae94f83e05
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Jul 9 18:07:13 2010 -0700

    Add a comment about the IndividualManager's general memory management
    policy.

 libempathy/empathy-individual-manager.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 75d01286920321fd40c5cfbe3d040789359e8a5e
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Jul 9 17:58:59 2010 -0700

    Use the more-conventional approach to signal emission in
    IndividualManager.

 libempathy/empathy-individual-manager.c | 76
 +++++++++++++++++++--------------
 1 file changed, 44 insertions(+), 32 deletions(-)

commit 784be67cd65bcf43252d1d48067ca909add9b26e
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Jul 9 17:41:51 2010 -0700

    Take advantage of tp_clear_object().

 libempathy-gtk/empathy-individual-view.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 16b9e5e98e4e57896751ee1d37012cd30a8d508a
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Jul 9 17:39:56 2010 -0700

    Minimize the scope of some variables and avoid risk of double-freeing
    a string.

 libempathy-gtk/empathy-individual-view.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 4705170690b772c5c4ee375926272fd178a2fd19
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Jul 9 17:08:04 2010 -0700

    Enclose a non-trivial expression in () in an assignment.

 libempathy-gtk/empathy-individual-store.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b2dd6cd0f905bc78c678ea1206de81193fcadebc
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Jul 9 17:06:57 2010 -0700

    Also sort the IndividualStore by underlying protocol and account ID.

 libempathy-gtk/empathy-individual-store.c | 27
 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

commit 3f4a0ae03c0eee55bf84f413214f5c834308011b
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Jul 9 14:25:14 2010 -0700

    Don't enclose trivial blocks in {}.

 libempathy-gtk/empathy-individual-store.c | 44 ++++------------
 libempathy-gtk/empathy-individual-view.c  | 85
 ++++++++-----------------------
 2 files changed, 33 insertions(+), 96 deletions(-)

commit b22ad13080a14191a8e33c92bc8332b40674824c
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Jul 9 14:17:15 2010 -0700

    Use explicit '!= NULL' for pointer boolean expressions.

 libempathy-gtk/empathy-individual-store.c |  4 ++--
 libempathy-gtk/empathy-individual-view.c  | 21 +++++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

commit adf158ac3343088b4553b192b55ad0da5c629b71
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Jul 9 13:55:46 2010 -0700

    Cut obsolete comment.

 libempathy-gtk/empathy-individual-menu.c | 1 -
 1 file changed, 1 deletion(-)

commit 325dee46c2ea53bdc24802fa264b632b8b704e5b
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Jul 9 13:55:23 2010 -0700

    Simplify validation.

 libempathy-gtk/empathy-individual-menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 22c93bf49f6a3fdf31496d2c2fd7b7553ee351f1
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Jul 9 13:54:16 2010 -0700

    Take advantage of tp_clear_object().

 libempathy-gtk/empathy-individual-menu.c |  3 +--
 src/empathy-main-window.c		  | 11 ++++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

commit d392ae0a2fd82c9ae39a0f9594f7cdd8ed3b4411
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Jul 9 13:34:20 2010 -0700

    We already know that this contact is a FolksIndividual if it isn't
    NULL, so simplify the conditional.

 libempathy-gtk/empathy-individual-dialogs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b94698cb3423f9852dbf2347773ab22598df1136
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Jul 9 13:21:29 2010 -0700

    Stick with the term 'contact' instead of adding 'individual'.

 libempathy-gtk/empathy-individual-dialogs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cf0b25a06daab8458f4a469b7e81ccb5a5775096
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Jul 9 13:17:32 2010 -0700

    Update copyright notice.

 libempathy-gtk/empathy-individual-dialogs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 171cc611ef2f74bbd51196c56a2eedef342f8c28
Author: Travis Reitter <treitter@gmail.com>
Date:	Thu Jul 8 11:51:53 2010 -0700

    Fix alignment.

 src/empathy-main-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a4421e0ebac291f3cb897f1ea0ff2839ec50d014
Author: Travis Reitter <treitter@gmail.com>
Date:	Thu Jul 8 11:46:00 2010 -0700

    Don't leak references to the contacts returned from
    empathy_contact_dup_from_folks_individual().

 libempathy-gtk/empathy-individual-dialogs.c | 3 +++
 libempathy-gtk/empathy-individual-menu.c    | 6 ++++++
 libempathy-gtk/empathy-individual-store.c   | 4 ++++
 libempathy-gtk/empathy-individual-view.c    | 3 ++-
 4 files changed, 15 insertions(+), 1 deletion(-)

commit fef2dec3ea6216921b297c7edbb3665e6c222ef5
Author: Travis Reitter <treitter@gmail.com>
Date:	Thu Jul 8 11:34:35 2010 -0700

    Add 'dup' to the names of empathy_contact_from_folks_individual()
    and folks_individual_from_empathy_contact() to make it clear that
    the return value has been referenced.

 libempathy-gtk/empathy-contact-widget.c     | 14 ++++++------
 libempathy-gtk/empathy-individual-dialogs.c |	2 +-
 libempathy-gtk/empathy-individual-menu.c    | 34
 ++++++++++++++---------------
 libempathy-gtk/empathy-individual-store.c   |	4 ++--
 libempathy-gtk/empathy-individual-view.c    |	6 ++---
 libempathy/empathy-utils.c		     |	6 ++---
 libempathy/empathy-utils.h		     |	4 ++--
 src/empathy-main-window.c		     |	4 ++--
 8 files changed, 37 insertions(+), 37 deletions(-)

commit 571d3f81c92099c569c061f38c1ac3b923c04637
Author: Travis Reitter <treitter@gmail.com>
Date:	Thu Jul 8 11:18:20 2010 -0700

    Simplify empathy_folks_individual_contains_contact().

 libempathy/empathy-utils.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

commit 151eb2b90cb579c7d538d0e3735e2d6157c57839
Author: Travis Reitter <treitter@gmail.com>
Date:	Thu Jul 8 11:11:55 2010 -0700

    Add comments for the new Individual/Contact utility functions.

 libempathy/empathy-utils.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit ebea339331d9c7a8eb69c125bd261ab60b3781eb
Author: Travis Reitter <treitter@gmail.com>
Date:	Thu Jul 8 11:01:02 2010 -0700

    Use the gio async pattern for fetching Individuals' avatars

 libempathy-gtk/empathy-individual-store.c | 37 ++++++++++----
 libempathy-gtk/empathy-ui-utils.c	   | 80
 +++++++++++++++++++++----------
 libempathy-gtk/empathy-ui-utils.h	   | 14 ++++--
 3 files changed, 92 insertions(+), 39 deletions(-)

commit c922fe784e177fa328f987e0a8cd84b0de10f019
Author: Travis Reitter <treitter@gmail.com>
Date:	Wed Jul 7 20:19:48 2010 -0700

    Reduce line length.

 libempathy-gtk/empathy-ui-utils.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit cb703ba93de027d1b62b1a9716ca7d9c0d90133b
Author: Travis Reitter <treitter@gmail.com>
Date:	Wed Jul 7 20:16:46 2010 -0700

    Take advantage of the tp_clear_* utility functions.

 libempathy-gtk/empathy-individual-store.c | 28 +++++------------------
 libempathy-gtk/empathy-individual-view.c  | 37
 ++++++-------------------------
 libempathy-gtk/empathy-ui-utils.c	   |  4 ++--
 libempathy/empathy-individual-manager.c   |  7 ++----
 4 files changed, 16 insertions(+), 60 deletions(-)

commit df6ea1a0a3bdef9fc134bfaaa02ca3614398ca16
Author: Travis Reitter <treitter@gmail.com>
Date:	Wed Jul 7 19:54:58 2010 -0700

    Cut misinformed comment about a potential race condition.

 libempathy-gtk/empathy-ui-utils.c | 1 -
 1 file changed, 1 deletion(-)

commit 980fc7fda64a1c2e5a9de44858362e7211aa7a32
Author: Travis Reitter <treitter@gmail.com>
Date:	Wed Jul 7 19:46:05 2010 -0700

    Create a constructor for PixbufAvatarFromIndividualClosure.

 libempathy-gtk/empathy-ui-utils.c | 37
 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

commit bd01a33901d5b12a07630e2b3e862838baa0369c
Author: Travis Reitter <treitter@gmail.com>
Date:	Wed Jul 7 19:28:27 2010 -0700

    Clarify that toggling a group in the EmpathyContactWidget actually
    toggles it.

 libempathy-gtk/empathy-contact-widget.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 7473d7a97d02be9aeefa271269184485ddf460a4
Author: Travis Reitter <treitter@gmail.com>
Date:	Wed Jul 7 19:22:15 2010 -0700

    Use explicit boolean expressions for if-conditionals, according to
    Telepathy style.

 libempathy-gtk/empathy-contact-widget.c   | 12 ++++++------
 libempathy-gtk/empathy-individual-store.c |  2 +-
 libempathy-gtk/empathy-individual-view.c  |  6 +++---
 src/empathy-main-window.c		   |  6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

commit a854cb126541cda286f4f48d2962c43e3be8a4f5
Author: Travis Reitter <treitter@gmail.com>
Date:	Wed Jul 7 08:10:12 2010 -0700

    Add the empathy-individual-* files to POTFILES.in

 po/POTFILES.in | 3 +++
 1 file changed, 3 insertions(+)

commit e25fa2252ec8b46a9584f294d8604dee86ff7a38
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Tue Jul 6 14:40:35 2010 +0100

    Hold a reference to the contact we're adding as an individual

    In empathy_individual_manager_add_from_contact(), we must hold a
    reference to
    the contact we're adding throughout the entire async process, or
    the TpHandle
    which represents the contact could get unreffed and destroyed. This
    causes
    the new contact to get lost.

 libempathy/empathy-individual-manager.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

commit 1acf1e0f3b5686b95f1b0787a5308e0a6298eb08
Author: Travis Reitter <treitter@gmail.com>
Date:	Tue Jul 6 12:23:13 2010 -0700

    Add some more validation when sorting the contact list.

 libempathy-gtk/empathy-individual-store.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

commit c9602a81b0f64f20c1927947c8e456929c521119
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Jul 2 12:11:06 2010 +0100

    Fix setting favourites from the contact editing dialogue

 libempathy-gtk/empathy-contact-widget.c | 33
 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

commit ac58a4101765c64d94c18d10c59fde7fa67ea4ae
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Jul 2 12:00:55 2010 +0100

    Allow changing of individuals' aliases

 libempathy-gtk/empathy-contact-widget.c   | 9 ++++++++-
 libempathy-gtk/empathy-individual-store.c | 4 +---
 2 files changed, 9 insertions(+), 4 deletions(-)

commit 265ea7ef4abb3df7cf6d8e1c9f4c5bfe68763179
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Jul 2 11:29:05 2010 +0100

    Re-enable changing individuals' groups

    This introduces a hacky function to return the individual for a given
    EmpathyContact, which should go away once we break the assumption that
    individuals are 1:1 with contacts.

 libempathy-gtk/empathy-contact-widget.c | 28 +++++++++++++++-------------
 libempathy/empathy-utils.c		 | 29
 +++++++++++++++++++++++++++++
 libempathy/empathy-utils.h		 |  1 +
 3 files changed, 45 insertions(+), 13 deletions(-)

commit 0919a8a5cc60ddda3a6d727533c926fa691617d2
Author: Travis Reitter <treitter@gmail.com>
Date:	Thu Jul 1 10:23:37 2010 -0700

    Bump libfolks requirement.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e557b1763dc2f454695bceeb84db3d8931dde759
Author: Travis Reitter <treitter@gmail.com>
Date:	Thu Jul 1 10:23:25 2010 -0700

    Fix trivial casting error.

 libempathy/empathy-individual-manager.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 2fcee569ba4bf86f78b6b5d6c12bfeeecbb1c47e
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Jul 1 17:03:59 2010 +0100

    Support removing groups

 libempathy-gtk/empathy-individual-view.c |  6 ++++--
 libempathy/empathy-individual-manager.c  | 26 ++++++++++++++++++++++++++
 libempathy/empathy-individual-manager.h  |  3 +++
 3 files changed, 33 insertions(+), 2 deletions(-)

commit 2999dda22d4d80df40420334273fcbb7aadac091
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Thu Jul 1 14:26:04 2010 +0100

    Fix some referencing bugs with the IndividualStore and IndividualView

 libempathy-gtk/empathy-individual-store.c |  7 ++-----
 libempathy-gtk/empathy-individual-view.c  | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

commit 336c38712dde2938b1ead01f05e1cd01f96c888d
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Jun 30 15:37:33 2010 +0100

    Re-implement file sending with drag and drop

 libempathy-gtk/empathy-individual-view.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 6d9c8a607e2b44d20d54a11e917d0723da81078d
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Jun 30 15:26:03 2010 +0100

    Remove unused EmpathyIndividualManager instances from the individual
    menu

 libempathy-gtk/empathy-individual-menu.c | 9 ---------
 1 file changed, 9 deletions(-)

commit ce240862c8f53b1bf62b80bba5f1fcdca07393d6
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Jun 30 14:53:49 2010 +0100

    Remove an unused connection to the telepathy-logger service

 libempathy/empathy-individual-manager.c | 24 ------------------------
 1 file changed, 24 deletions(-)

commit 88e3360d3ac088cd67e0ca36710d84d63eca4d91
Author: Travis Reitter <treitter@gmail.com>
Date:	Tue Jun 29 15:22:48 2010 -0700

    Bump required version of libfolks for API change.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 71d1825aac6609bb478c40e87c53fb50a1234d98
Author: Travis Reitter <treitter@gmail.com>
Date:	Mon Jun 28 15:56:44 2010 -0700

    Sync up with the libfolks replacement of
    folks_individual_aggregator_get_members().

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f3a1bdae4d3e5a93c5803dda1e46ee36f5851c35
Author: Travis Reitter <treitter@gmail.com>
Date:	Mon Jun 28 14:57:39 2010 -0700

    Cut outdated comment.

 libempathy/empathy-individual-manager.c | 2 --
 1 file changed, 2 deletions(-)

commit 5c2858c57a9718f9d78b1a7440e82ebf17bf31f4
Author: Travis Reitter <treitter@gmail.com>
Date:	Sat Jun 26 11:56:13 2010 -0700

    Take advantage of favourites being a hard requirement and add stubs
    for adding/removing individuals as favourites.

 libempathy-gtk/empathy-individual-menu.c | 4 ----
 1 file changed, 4 deletions(-)

commit c41d778c8d76d17289f37909c0e7535603010b1a
Author: Travis Reitter <treitter@gmail.com>
Date:	Sat Jun 26 11:43:42 2010 -0700

    Hide/show groups as necessary when their members change.

 libempathy-gtk/empathy-individual-view.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit e0aec0ced01a21901075e046e39a343c7f6e5cc6
Author: Travis Reitter <treitter@gmail.com>
Date:	Sat Jun 26 11:33:44 2010 -0700

    Replace the IndividualView's setup function with a more-conventional
    constructed function.

 libempathy-gtk/empathy-individual-view.c | 1 -
 1 file changed, 1 deletion(-)

commit 268c9c8237b3948d3613233dc0a6615b5ea191a2
Author: Travis Reitter <treitter@gmail.com>
Date:	Sat Jun 26 11:25:31 2010 -0700

    Catch up with convention for getting the view's model.

 libempathy-gtk/empathy-individual-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d714360e053a1e2c75d63cbc8497453a689cfd39
Author: Travis Reitter <treitter@gmail.com>
Date:	Sat Jun 26 11:22:05 2010 -0700

    Follow the new tree store insertion convention used by the contact
    list store in the individual store.

 libempathy-gtk/empathy-individual-store.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

commit 0dea2287893dc5cf657bb48c2707e30139118cb4
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Fri Jun 25 13:48:43 2010 +0100

    Finish adding favourites support

 libempathy-gtk/empathy-individual-store.c | 41
 ++++++++++++++++---------------
 libempathy-gtk/empathy-individual-view.c  |  7 ------
 libempathy/empathy-individual-manager.c   | 22 +++++++++++++++++
 3 files changed, 43 insertions(+), 27 deletions(-)

commit e54fe4814b321be3e32e99f7dfd49b93e392bded
Author: Travis Reitter <treitter@gmail.com>
Date:	Wed Jun 23 20:12:42 2010 -0700

    Support contact removal

 configure.ac				   |  2 +-
 libempathy-gtk/empathy-individual-store.c | 10 ++++++++--
 libempathy/empathy-individual-manager.c   | 18 ++++++++++++++++--
 3 files changed, 25 insertions(+), 5 deletions(-)

commit ae79986102a22b65a3f9f4eb2328971272eec204
Author: Travis Reitter <treitter@gmail.com>
Date:	Tue Jun 22 08:43:18 2010 -0700

    Support contact adding

 libempathy-gtk/Makefile.am		     |	 2 +
 libempathy-gtk/empathy-individual-dialogs.c | 152
 ++++++++++++++++++++++++++++
 libempathy-gtk/empathy-individual-dialogs.h |	38 +++++++
 libempathy-gtk/empathy-individual-menu.c    |	10 +-
 libempathy/empathy-individual-manager.c     |	50 +++++++++
 libempathy/empathy-individual-manager.h     |	 4 +
 src/empathy-main-window.c		     |	 3 +-
 7 files changed, 251 insertions(+), 8 deletions(-)

commit 315a71325f98d86722d7c313d726828f767cef82
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Jun 23 16:46:38 2010 +0100

    Use the new FolksFavourite interface for favourites support

 libempathy-gtk/empathy-individual-menu.c  |  9 +++------
 libempathy-gtk/empathy-individual-store.c |  4 +---
 libempathy-gtk/empathy-individual-view.c  |  2 ++
 libempathy/empathy-individual-manager.c   | 28
 ++++------------------------
 libempathy/empathy-individual-manager.h   |  4 ----
 5 files changed, 10 insertions(+), 37 deletions(-)

commit e53b7431a34c09ceed319a1680cde1e44a50dab2
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Wed Jun 23 16:46:26 2010 +0100

    Fixes from merging master

 src/empathy-main-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 6bf4569e50d1df275281b790adcae934b8a53ce7
Author: Travis Reitter <treitter@gmail.com>
Date:	Tue Jun 22 08:43:53 2010 -0700

    Avoid potential segfaults if there are no contacts on the first pass.

 configure.ac				   | 25 -------------------------
 libempathy-gtk/empathy-individual-menu.c  | 23 +++++------------------
 libempathy-gtk/empathy-individual-store.c | 13 ++++++++-----
 3 files changed, 13 insertions(+), 48 deletions(-)

commit 10ee532d6097cac699ad317d296d4126079b772f
Author: Travis Reitter <treitter@gmail.com>
Date:	Tue Jun 15 17:23:01 2010 -0700

    Add a note about future work to be done after we break the 1:1
    FolksIndividual:TpContact relationship.

 libempathy/empathy-utils.c | 3 +++
 1 file changed, 3 insertions(+)

commit 9be29ffebe4166ab6e985d64efa2ea3a51d2e6b8
Author: Travis Reitter <treitter@gmail.com>
Date:	Tue Jun 15 16:42:29 2010 -0700

    Re-add the audio and video call menu items in the call-activated
    handler.

 libempathy-gtk/empathy-individual-view.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 3e573e124347366975ae1effd18d7127e5fd9397
Author: Travis Reitter <treitter@gmail.com>
Date:	Tue Jun 15 16:39:10 2010 -0700

    Support the contact list tooltip

 libempathy-gtk/empathy-individual-view.c | 49
 +++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

commit c75319eb432d4d815bf07ee30396f958b021abed
Author: Travis Reitter <treitter@gmail.com>
Date:	Tue Jun 15 18:29:03 2010 -0700

    Re-implement the context menu for Individuals

 libempathy-gtk/Makefile.am		   |   1 +
 libempathy-gtk/empathy-individual-menu.c  | 769
 ++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-individual-menu.h  |  20 +
 libempathy-gtk/empathy-individual-store.c |  41 +-
 libempathy-gtk/empathy-individual-view.c  |  22 +-
 libempathy/empathy-individual-manager.c   |  30 ++
 libempathy/empathy-individual-manager.h   |   6 +
 libempathy/empathy-utils.c		   |  24 +
 libempathy/empathy-utils.h		   |   1 +
 src/empathy-main-window.c		   |   3 +
 10 files changed, 881 insertions(+), 36 deletions(-)

commit cdd2409d9048d1ffc7794713de52810ef0d18ebb
Author: Travis Reitter <treitter@gmail.com>
Date:	Mon Jun 14 09:37:49 2010 -0700

    Don't crash if a row gets deleted before being expanded.

 libempathy-gtk/empathy-individual-view.c | 1 -
 1 file changed, 1 deletion(-)

commit c05d4cda33e0f10ce58a8afeaea0bad28af4b254
Author: Travis Reitter <treitter@gmail.com>
Date:	Sat Jun 12 16:20:24 2010 -0700

    Fix the formatting of some calls to g_object_set()

 libempathy-gtk/empathy-individual-view.c | 32
 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

commit 08a9285fea7fbe9e4ff25394b72c7852a77ea750
Author: Travis Reitter <treitter@gmail.com>
Date:	Sat Jun 12 16:08:57 2010 -0700

    Back-port better solution for incorrect-groups-expanded problem.

 libempathy-gtk/empathy-individual-view.c | 1 +
 1 file changed, 1 insertion(+)

commit 48a9944fd9f3b4461a239d2da490fba24874df80
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Jun 11 13:22:38 2010 -0700

    Implement avatar support.

 configure.ac				   |   2 +-
 libempathy-gtk/empathy-individual-store.c |  33 +++++--
 libempathy-gtk/empathy-ui-utils.c	   | 159
 ++++++++++++++++++++++++++----
 libempathy-gtk/empathy-ui-utils.h	   |   9 ++
 4 files changed, 171 insertions(+), 32 deletions(-)

commit d6aa2f99e3e626f81b455c0fa1ff4817a4e4f2f6
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri May 28 16:13:51 2010 -0700

    Base the contact list around libfolks metacontacts. Not yet to
    feature-parity
    with mainline Empathy.

 configure.ac				   |   28 +
 libempathy-gtk/Makefile.am		   |	5 +
 libempathy-gtk/empathy-individual-menu.h  |   44 +
 libempathy-gtk/empathy-individual-store.c | 1830
 +++++++++++++++++++++++++
 libempathy-gtk/empathy-individual-store.h |  148 ++
 libempathy-gtk/empathy-individual-view.c  | 2125
 +++++++++++++++++++++++++++++
 libempathy-gtk/empathy-individual-view.h  |   99 ++
 libempathy-gtk/empathy-ui-utils.c	   |   20 +-
 libempathy-gtk/empathy-ui-utils.h	   |	6 +-
 libempathy/Makefile.am			   |	2 +
 libempathy/empathy-individual-manager.c   |  290 ++++
 libempathy/empathy-individual-manager.h   |   82 ++
 libempathy/empathy-utils.c		   |   35 +
 libempathy/empathy-utils.h		   |	4 +
 src/empathy-main-window.c		   |  122 +-
 15 files changed, 4788 insertions(+), 52 deletions(-)

commit 57a1f36eaec69df0195e90d8a4b050574a19d6b3
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Tue Jul 20 19:37:13 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 58
 ++++++++++++++++++++++++++--------------------------------
 po/zh_TW.po | 58
 ++++++++++++++++++++++++++--------------------------------
 2 files changed, 52 insertions(+), 64 deletions(-)

commit 69ff2159a6ed984c212cf2054931e5ae1ee742ff
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Jul 15 17:34:20 2010 +1000

    GtkNotebookPage no longer exists in GTK+ 3

 src/empathy-chat-window.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 004fb69b847bbf1ffbd28ed22e307e1b3a859da8
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sun Jul 18 18:18:55 2010 +0200

    Fixed headers in galician translation file

 po/gl.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1c4aae4eae9646b25aba931798f9af157f8296af
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sun Jul 18 18:18:08 2010 +0200

    Fixed headers in galician translation file

 po/gl.po | 282
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 155 insertions(+), 127 deletions(-)

commit 100f0a02a14a8c5594ab334e12c5ff3c543a2309
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Sun Jul 18 15:16:44 2010 +0300

    [l10n] Updated Estonian translation

 po/et.po | 301
 ++++++++++++++++-----------------------------------------------
 1 file changed, 74 insertions(+), 227 deletions(-)

commit 95ecb356a80e7a112b064ff24e91fd780337101e
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sun Jul 18 12:51:32 2010 +0200

    Updated Spanish translation

 po/es.po | 218
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 125 insertions(+), 93 deletions(-)

commit 0f533ff1229e8b3c6f0940ae85810f7f80b6c8b5
Author: Aron Xu <aronxu@gnome.org>
Date:	Sat Jul 17 15:37:54 2010 +0800

    Update Simplified Chinese translation.

 po/zh_CN.po | 1434
 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 758 insertions(+), 676 deletions(-)

commit 5d145f0e4c4ddf32e5339acd928fef583993cd0a
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Jul 16 15:49:11 2010 +0300

    Updated Hebrew translation.

 po/he.po | 240
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 131 insertions(+), 109 deletions(-)

commit 90d81c0c42cdc99642e7191be01a907cc1b2c852
Author: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date:	Thu Jul 15 19:32:10 2010 +0200

    avoid segfault in event_manager_add (#624462)

    Check if approval is not NULL before trying to modify it

 src/empathy-event-manager.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 447bd35e4e5ff25cdbeda0d5273e11606d7f45c1
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Thu Jul 15 21:41:58 2010 +0200

    [i18n] Updated German translation

 po/de.po | 1309
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 618 insertions(+), 691 deletions(-)

commit c79d81eff8d5894ac8cc92112ecce18ccc89f1dd
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Jul 9 18:35:05 2010 +0100

    Tune settings for the updated x264enc element

 data/element-properties | 4 ++++
 1 file changed, 4 insertions(+)

commit de9d358969dd483611cacf8c9b150a6932207d35
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Wed Jul 14 21:02:19 2010 +0200

    Added gl to DOC_LINGUAS

 help/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c4c9150ec2d9133dcce5bde09305c7192c21bc67
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Wed Jul 14 20:58:53 2010 +0200

    Updated Galician translations for docs

 help/gl/gl.po | 2963
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 2963 insertions(+)

commit ee6cdcf63e498ba848813e930d1b1544973ad98d
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Wed Jul 14 20:05:15 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 659
 +++++++++++++++++++++++++++++++++---------------------------
 po/zh_TW.po | 659
 +++++++++++++++++++++++++++++++++---------------------------
 2 files changed, 736 insertions(+), 582 deletions(-)

commit f28debea9fe92f32a0faa9954af06cab15825df3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 14 11:32:02 2010 +0200

    Disable /query and /msg commands for now (#624268)

    This avoid to crash while bug 623682 hasn't been fixed.

 libempathy-gtk/empathy-chat.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit ab41c50394233d90650679b9aced9b92f6eb630d
Merge: f94f23d 652acf5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 14 11:21:07 2010 +0200

    Merge branch 'debug-av-599166'

commit f94f23d8e922713c593e423722ee50517e12cb49
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 13 13:43:50 2010 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6dd1e61df46aabe6d24af0c7bd2ea7a5313b7c24
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 13 12:40:11 2010 +0200

    prepare 2.31.5.1

 NEWS	      | 13 +++++++++++++
 configure.ac |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

commit 652acf51f63f430fb5cbbc004739a2d7b551da71
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 13 09:34:44 2010 +0200

    display the clock rate of the codec as well

 src/empathy-call-window.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

commit c519ac92b5c2b928685edbb05e3dc781885ff07d
Author: Laurent Bigonville <bigon@bigon.be>
Date:	Tue Jul 13 09:07:36 2010 +0200

    libnm_glib.pc has been renamed to lib-glib.pc (#624202)

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cc0928eca755af7678b6aebe8e08af965f9f5d05
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Tue Jul 13 02:51:31 2010 +0200

    Updated Galician translations

 po/gl.po | 115
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 64 insertions(+), 51 deletions(-)

commit 8d730f427e20c5e1727824b320dbe684b117f63f
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Tue Jul 13 03:32:19 2010 +0300

    Updated Hebrew translation.

 po/he.po | 109
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 59 insertions(+), 50 deletions(-)

commit d586d81c61b57221309317e5a56a24d0076bb4f4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 12 20:37:22 2010 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 70d8fff20eb68ad2febfaf72e81c3f22a2385774
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 12 20:03:52 2010 +0200

    prepare 2.31.5 release

 NEWS	      | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 54 insertions(+), 2 deletions(-)

commit 2afbcc31503e9e17bebbfd964a8c984cd8f8c60f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 12 20:25:20 2010 +0200

    add GTK+ flags when building tests

 tests/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit bf4b7622a7dc16d156902095a2769250c22255e9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 12 20:18:09 2010 +0200

    preferences: coding style fix

 src/empathy-preferences.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1542510953ec87f4279165476c6f4f6cc71a5639
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 12 20:18:01 2010 +0200

    main-window: coding style fix

 src/empathy-main-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 557c7faedb00dddc519226dec258a33dfdd63d32
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 12 20:17:49 2010 +0200

    empathy-log-window: coding style fixes

 libempathy-gtk/empathy-log-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 0dc52c58e16a3438ae6de9f6cf80f973d856d0f7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 12 20:17:33 2010 +0200

    empathy-contact-list-view: coding style fix

 libempathy-gtk/empathy-contact-list-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit beeba464478b13169a2a2e7163d4de2088ca80b2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 12 20:03:41 2010 +0200

    add empathy-av.c to POTFILES.in

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit ddecbcd81f0377608de94dcdf7e3a797ae0022fd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 12 17:54:56 2010 +0200

    reset codecs when call is disconnected

 src/empathy-call-window.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 33687760c2eb1d9ddf41092c88aef8ba65108df6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 12 17:16:37 2010 +0200

    call-window: display receiving codecs

 src/empathy-call-window.c  |  74 +++++++++++++++++++++++++++
 src/empathy-call-window.ui | 121
 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 195 insertions(+)

commit eaa8e09ab61444d649d88f31c9047f006627b787
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 12 17:16:23 2010 +0200

    call-handler: add audio/video recv codecs properties

 libempathy/empathy-call-handler.c | 103
 +++++++++++++++++++++++++++++++++++++-
 libempathy/empathy-call-handler.h |   6 +++
 2 files changed, 108 insertions(+), 1 deletion(-)

commit f93c1b261ed44eff2bbaa99d8c10ebd39682ca27
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 12 12:56:55 2010 +0200

    call-window: Add 'details' pane containing encoding codecs (#599166)

    The details pane has been inspired from totem's 'Properties' pane.

 src/empathy-call-window.c  |  63 +++++++++++
 src/empathy-call-window.ui | 276
 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 339 insertions(+)

commit 84307490fb67c43c291627d22381f542f6824206
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 12 12:15:34 2010 +0200

    call-handler: add send audio/video codec properties

 libempathy/empathy-call-handler.c | 102
 ++++++++++++++++++++++++++++++++++++--
 libempathy/empathy-call-handler.h |   7 +++
 2 files changed, 106 insertions(+), 3 deletions(-)

commit cea420f26c8f38e216f2c94fdc22437ef5235541
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 9 15:52:47 2010 +0200

    bump telepathy-farsight dep

    The API to get the TpStream object has been added in this version.

 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit c46ed4f0469071f10eb3b363c790c0beb464d5b7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 8 14:25:55 2010 +0200

    empathy-accounts.1: document --if-needed

 src/empathy-accounts.1 | 3 +++
 1 file changed, 3 insertions(+)

commit f6cf9ea3896123239e838825da0c14de670c5e95
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 8 14:22:48 2010 +0200

    empathy-accounts.1: --import has been removed

 src/empathy-accounts.1 | 3 ---
 1 file changed, 3 deletions(-)

commit 35c2f2093089a86cdbed59c77debf0e84ce5bd47
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 8 14:19:54 2010 +0200

    import empathy-accounts manpage from Debian

    Thanks to Laurent Bigonville for this man page.

 src/Makefile.am	|  3 ++-
 src/empathy-accounts.1 | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

commit a36d0fe444e451f3bfc10c05510596901b1f72e1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 8 14:16:18 2010 +0200

    sync empathy manpage with Debian package

 src/empathy.1 | 40 +++++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

commit c60dc144eb53bc084f5ac51f0ee3794ecaceb6ac
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:	Sat Jul 10 17:19:32 2010 +0100

    Fix a memory leak in EmpathyAvatar (#624054)

    The avatar filename was being leaked.

 libempathy/empathy-contact.c | 1 +
 1 file changed, 1 insertion(+)

commit 505c8415b87f7b0ebfce502ec44a39b0c3bf7ff5
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Jul 9 18:39:48 2010 +0100

    Fix activating [ ] Enabled with the keyboard.

    The GtkToggleButton::released signal has been deprecated since
    Gtk+ 2.8.
    And, is also wrong, because there are other ways to change the
    state of
    this button besides using your mouse.

    Fixes bug #623972.

    Toggled-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy-gtk/empathy-account-widget.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit b17b7bcb810f293a2de4515bbc7239b786189293
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 9 14:39:54 2010 +0200

    empathy_status_icon_new: always call status_icon_set_visibility

    Seems calling gtk_widget_show() doesn't mark the window as active
    right away.
    This code used to work fine before but doesn't since we replace
    empathy_main_window_show() by empathy_main_window_dup().

 src/empathy-status-icon.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 5f4f3e491530aac63d78c00c6b06bb8cb1e4d043
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 9 14:38:57 2010 +0200

    empathy_status_icon_new: don't ignore hide_contact_list (#623937)

    That's a regression introduced when we switch to GSettings.

 src/empathy-status-icon.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 47fe98399a18bd0a69b86656c7821addb7916885
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sun Jul 11 16:24:55 2010 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 567
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 300 insertions(+), 267 deletions(-)

commit 15933b3643b147f29c4b34cef1f81502feaf0af7
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Jul 10 10:20:31 2010 +0200

    Updated Spanish translation

 po/es.po | 101
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 51 insertions(+), 50 deletions(-)

commit 32e442f47b3a901d0a02ed364b9052750d989900
Author: Ivar Smolin <okul@linux.ee>
Date:	Sat Jul 10 09:56:18 2010 +0300

    [l10n] Updated Estonian translation

 po/et.po | 372
 +++++++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 280 insertions(+), 92 deletions(-)

commit 85593df4f49b9ac3bd6d881446da7934aff77705
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 9 15:17:31 2010 +0200

    Improve desktop's Comment (#617405)

    Thanks to Danny Piccirillo for his suggestion.

 data/empathy.desktop.in.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 36db8ebb6a9bcc9852c7218b020ef05f6105bb69
Merge: 03635af 1607492
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 9 14:18:32 2010 +0200

    Merge branch 'backlog-623914'

commit 03635afd3d842f27d1e64d9e056b0a810b38f0e2
Merge: f5d81f3 5b580ca
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 9 13:52:05 2010 +0200

    Merge branch 'auto-approve'

commit f5d81f3c9dd74a9c53fcbe53375acf99e9387f79
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 29 16:24:13 2010 +0200

    debug_window_name_owner_changed_cb: update client services as well

    Remove some deprecated comments in th proccess.

 src/empathy-debug-window.c | 65
 +++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 33 deletions(-)

commit ec08d8cafdf99f9ae3de2c92d3fcfbb94704bafd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 29 16:06:25 2010 +0200

    Store the unique name in the model

    This avoid to add one entry per Empathy head for example.

 src/empathy-debug-window.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

commit 678527d4d55a1b93916187f08f038fdacdfaf8d2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 29 15:55:23 2010 +0200

    FillCmChooserData: rename, add type field and helper functions

 src/empathy-debug-window.c | 47
 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 35 insertions(+), 12 deletions(-)

commit bbe77b37c47e4e40967863f985fc4eacbf71d1d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 29 15:25:33 2010 +0200

    rename vars, functions and constants to make code less CM specific

    Basically a renaming from 'cm' to 'services' to make code clearer.

 src/empathy-debug-window.c | 164
 ++++++++++++++++++++++-----------------------
 1 file changed, 82 insertions(+), 82 deletions(-)

commit 63dc035915797386772ac3b9c2dfe968121565de
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 29 15:07:28 2010 +0200

    coding style fix

 src/empathy-debug-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 405a6c07d0579285dc4d35cb9cfee795fff0f744
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 29 14:56:19 2010 +0200

    debug-window: add Telepathy clients

 src/empathy-debug-window.c | 54
 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

commit f598e0acbf7c981d5adaf7bf52a30d2a61d04aba
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 29 14:38:38 2010 +0200

    debug-window: remove hardcoded clients

 src/empathy-debug-window.c | 22 ----------------------
 1 file changed, 22 deletions(-)

commit 5b580ca6e7e87b15f829a621cf60556f1ce4942e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 9 13:31:20 2010 +0200

    Pass EMPATHY_DISPATCHER_NON_USER_ACTION as action time when
    auto-approving mucs

 src/empathy-event-manager.c | 1 +
 1 file changed, 1 insertion(+)

commit 16074928eee79472c804687556c193f50409ce8c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 9 12:42:25 2010 +0200

    tp-chat: mark scrollback messages as backlog

 libempathy/empathy-tp-chat.c | 3 +++
 1 file changed, 3 insertions(+)

commit fe9075a08d2ee01281397511752087e94ea3c3c2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 9 12:35:36 2010 +0200

    Properly mark messages from TPL as backlog (#623914)

    If the message is build from a TplEntry it *is* a backlog one.

 libempathy/empathy-message.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit acc341d1178dc9806b32d7aadc4154259dadf63c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Jul 8 00:01:31 2010 +0100

    tell the chatroom manager asap about chats

 src/empathy-chat-manager.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

commit 6bb5c181852365a1bb14820528bd2b925069140d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jul 8 16:29:18 2010 +0200

    Some coding style fixes in configure.ac

 configure.ac | 52 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

commit 62bd07ab4997bb1959c1095fcce91f97c2878a8d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jul 8 16:27:23 2010 +0200

    Cleanup nm/conman pkg check

    No need to check for libnm_glib twice

 configure.ac | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

commit 00c7156baa528fff2ee491c8d3452d3e2effb627
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Thu Jul 8 23:12:20 2010 +0200

    Updated Spanish translation

 po/es.po | 329
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 178 insertions(+), 151 deletions(-)

commit 701e8ee3edfb7a2de17f1d3b82137d0dfdb3388f
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jul 8 15:24:10 2010 +0200

    Fail to build if --enable-gtk3 is passed but only gtk2 is available

 configure.ac | 4 ++++
 1 file changed, 4 insertions(+)

commit 5033a8f7fae372bece2f8c49c7fd1e7f69e37fb9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 8 14:54:37 2010 +0200

    add have_gtk3 var

 configure.ac | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

commit 6f95b307dda6580150cff92b974166958c9af222
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 8 14:41:09 2010 +0200

    don't check GTK3 deps if GTK3 is not present

 configure.ac | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit 0664e133624ca7def05aa0f16b6e1a05669937a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 6 15:49:08 2010 +0200

    tp-contact-list: add a comment

 libempathy/empathy-tp-contact-list.c | 1 +
 1 file changed, 1 insertion(+)

commit d5269ccea8739cc0cd0c40f1673ecfbeee8eb667
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 6 15:48:49 2010 +0200

    simplify empathy_presence_chooser_new

 libempathy-gtk/empathy-presence-chooser.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

commit 1e7ad4e03e46b877974b7f73d28dbc737ec9a977
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 6 15:29:33 2010 +0200

    dispatcher: explicitely keep a ref on accounts in
    status_changed_handlers

    It makes things much cleaner.

 libempathy/empathy-dispatcher.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 0637683a2f89087f49fa0d91e44b04ed26d72ba3
Merge: 526cac7 6b1d425
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 8 14:35:53 2010 +0200

    Merge branch 'gtk3-621753'

commit 526cac765322aa7516d46d735fc9b5f1c4f2c228
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 8 14:07:17 2010 +0200

    empathy_pixbuf_contact_status_icon_with_icon_name: don't use
    icon_filename after freeing it

 libempathy-gtk/empathy-ui-utils.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 6b1d4251dc32cf7c75871002a1f8163af9775f65
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 8 11:32:20 2010 +0200

    Build with latest NST when using GTK3 and port to new API (#623199)

 configure.ac					  | 16 ++++++++++++----
 nautilus-sendto-plugin/empathy-nautilus-sendto.c | 17 +++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

commit 166785e324a397f3b1444820102a41413041d76d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 8 10:50:59 2010 +0200

    disable champlain when using GTK3

 configure.ac | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

commit 757c4d6c3e3a1872588387bfd49f473ce444b3cf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 8 10:36:16 2010 +0200

    Check for webkitgtk-3.0 when building with GTK3

 configure.ac | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit 457808007540c9d7ab0f6b29f2d8e643d46eb8b4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 8 10:08:53 2010 +0200

    no need to explicitely check for gdk-x11

 configure.ac | 1 -
 1 file changed, 1 deletion(-)

commit ce007d41e6854b9434efe29621e98efe95ff0d3b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 8 10:01:01 2010 +0200

    link on unique-3 when using GTK3

 configure.ac	 | 3 ++-
 src/Makefile.am | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

commit c98757d4c4dff4e7f6cea083e4bcf8ac07e93a08
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 8 09:46:44 2010 +0200

    Update libnotify dep when using GTK3

    Since 0.5.1 libnotify doesn't link on GTK+.

 configure.ac | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 9a1f7eef53c664ec9a81f51bfe9a7ec5659b8c6c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 7 17:03:45 2010 +0200

    notify-manager: include empathy-contact.h as we use it

 libempathy-gtk/empathy-notify-manager.h | 2 ++
 1 file changed, 2 insertions(+)

commit e56070fd87fe3429ee046550623c90d64c98eb83
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 7 16:20:54 2010 +0200

    use libcanberra-gtk3 when building with GTK3

 configure.ac		    | 7 ++++++-
 libempathy-gtk/Makefile.am | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

commit fc57cd132b0563feeec4dba0e5a7298c7d904a0a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 7 16:11:39 2010 +0200

    Build with GTK+3 if available (#621753)

 configure.ac | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

commit bc2b3bf0966076e8452a170a9741ded016051f44
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 7 15:49:08 2010 +0200

    move GTK+ check to its own PKG_CHECK_MODULES

 configure.ac			    | 3 ++-
 libempathy-gtk/Makefile.am	    | 2 ++
 nautilus-sendto-plugin/Makefile.am | 3 ++-
 src/Makefile.am		    | 2 ++
 tests/interactive/Makefile.am	    | 4 +++-
 5 files changed, 11 insertions(+), 3 deletions(-)

commit 0abfccd4c28892dbf098ba15e2d7565caa97e87d
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Thu Jul 8 12:29:34 2010 +0300

    Updated Hebrew translation.

 po/he.po | 496
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 265 insertions(+), 231 deletions(-)

commit 71e2b896131187e81e4af8b485864f7a173d496b
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Wed Jul 7 17:45:05 2010 +0200

    Updated Galician translations

 po/gl.po | 507
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 273 insertions(+), 234 deletions(-)

commit 85063c344a4dada140b609c726118a889e4e09ac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 7 15:41:05 2010 +0200

    call-window: use gtk_widget_get_allocation()

 src/empathy-call-window.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 3dffe8d0ebce77eded0b7e9ed70ac03b09d0090e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 7 15:25:53 2010 +0200

    sort dependencies

 configure.ac | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

commit 9fd5a0d64710c248045f245317f8d9e4ddbf005b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 7 15:09:02 2010 +0200

    Simplify checking of the deps

    The empathy/libempathy/libempathy-gtk border is less clear than it
    used to be
    so there is not point continuing checking deps separately.

 configure.ac		    | 60
 ++++++++--------------------------------------
 extensions/Makefile.am     |  2 +-
 libempathy-gtk/Makefile.am |  4 ++--
 libempathy/Makefile.am     |  4 ++--
 4 files changed, 15 insertions(+), 55 deletions(-)

commit b9ae519cbeec01245b6f589a60d6fb63d730d19a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 7 11:57:53 2010 +0200

    rephrase 'Important Room' menu entry

 src/empathy-chat-window.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0ee5b6292c89521a3ca52780c3a230199f01ee85
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 6 12:37:45 2010 +0200

    set a title to the room invitation dialog

 src/empathy-event-manager.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 32ea1c129259b67d020944b3092a410f8b84908a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 6 12:33:11 2010 +0200

    Make incoming file chooser dialog's title more informative

    This gives a bit more context when the dialog is displayed right away.

 libempathy-gtk/empathy-ui-utils.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

commit 48d289288400d52adc40a78548ba0dbaf7dea3cd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 6 12:27:06 2010 +0200

    Add a title to the incoming call dialog

    This gives a bit more context when the dialog is displayed right away.

 src/empathy-event-manager.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit cc77a379d1daa6130dad17486d52808c874c62a7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 6 12:23:05 2010 +0200

    display incoming events right away if user asked to

 src/empathy-event-manager.c | 41
 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

commit 5b029371a79ba91901cf88f7362f86632e94e223
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 5 16:48:41 2010 +0200

    Add option to disable displaying events in the notif area (#585914)

 data/org.gnome.Empathy.gschema.xml.in |  6 ++++++
 libempathy/empathy-gsettings.h        |  1 +
 src/empathy-preferences.c	       |  8 ++++++++
 src/empathy-preferences.ui	       | 17 ++++++++++++++++-
 4 files changed, 31 insertions(+), 1 deletion(-)

commit dbf13d34105beedc112b8d6005c0b8ff0646aa0f
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Wed Jul 7 10:41:13 2010 +0200

    Updated Spanish translation

 po/es.po | 539
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 275 insertions(+), 264 deletions(-)

commit 24bf0cac9c5f51ba172e1ec9c673c5c1781e6379
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 6 14:49:38 2010 +0200

    add accept/decline buttons to invitation notifications

 src/empathy-status-icon.c | 1 +
 1 file changed, 1 insertion(+)

commit 4ac0eb75372d295c6ff7bd36fb7d708ad28132b2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 6 14:49:09 2010 +0200

    use a specific event type for muc invitations

 src/empathy-event-manager.c | 4 ++--
 src/empathy-event-manager.h | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

commit dd3a1f3f2ce8b7b6f7c7ed02ff956ca26bc556e2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 6 14:44:10 2010 +0200

    add accept/decline buttons to FT notifications

 src/empathy-status-icon.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit f589f32173b109b4bf8ade5710ff7a8a11f9b939
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 6 14:43:45 2010 +0200

    event-manager: allow to reject FT channels

 src/empathy-event-manager.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit c4240a8b706c62564179654af0f6e423fa27b1e0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 6 14:20:55 2010 +0200

    add answer/decline buttons in call notifications (#597124)

 src/empathy-status-icon.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

commit cf452c7dd1d96a8d2f80b8cf8c64c03604a50c31
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 6 14:20:47 2010 +0200

    add empathy_event_decline

 src/empathy-event-manager.c | 10 ++++++++++
 src/empathy-event-manager.h |	1 +
 2 files changed, 11 insertions(+)

commit 8963051c95e0c4511f264eff2e7bc1336e4b9735
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 6 14:07:17 2010 +0200

    Add 'Respond' button only for text channels and approve it directly

 src/empathy-status-icon.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

commit 8e794ecc865cd0cc031963fa8c271de1b2e68993
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 6 14:04:42 2010 +0200

    add empathy_event_approve()

 src/empathy-event-manager.c | 10 ++++++++++
 src/empathy-event-manager.h |	1 +
 2 files changed, 11 insertions(+)

commit 3103575b755da0765275fb3b774e2e8f8a88bd46
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 6 13:56:55 2010 +0200

    factor out add_notification_actions

 src/empathy-status-icon.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

commit ac6f56a439647386c15fdd6045c00b914f4975f9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 6 16:29:29 2010 +0200

    chat: add FIXME explaining how we should ideally request channels

 libempathy-gtk/empathy-chat.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 26110eb9baef0ef58e8daebff9c3373485da3e50
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 6 16:18:39 2010 +0200

    empathy_dispatcher_join_muc: remove callback arg

    We always want to let the text handler handle the channel.

 libempathy-gtk/empathy-chat.c	   | 6 ++----
 libempathy/empathy-dispatcher.c   | 6 ++----
 libempathy/empathy-dispatcher.h   | 4 +---
 src/empathy-chat-manager.c	   | 2 +-
 src/empathy-main-window.c	   | 2 +-
 src/empathy-new-chatroom-dialog.c | 2 +-
 src/empathy.c			   | 5 ++---
 7 files changed, 10 insertions(+), 17 deletions(-)

commit 817f3db6bb903c509b55a194425a1ccb350192fa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 5 16:08:48 2010 +0200

    chat: no need to pass a callback to
    empathy_dispatcher_chat_with_contact_id any more

    The HandleChannels implementation will re-set the tp-chat once we
    get it.

 libempathy-gtk/empathy-chat.c | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

commit a13ef5ed10746ecb68171f965fe62806189c4f27
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 6 16:11:28 2010 +0200

    /join: don't pass a call when calling empathy_dispatcher_join_muc()

    We want to let the text channel handler to handle it.

 libempathy-gtk/empathy-chat.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

commit e756c74ca8b2656a4975934fcc048cf5bf151a36
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Tue Jul 6 15:11:40 2010 +0200

    Updated Slovenian translation

 po/sl.po | 1720
 ++++++++++++++++++++++++--------------------------------------
 1 file changed, 673 insertions(+), 1047 deletions(-)

commit b5e9f28beaa02f564016b30e173adb36e6279642
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 6 12:32:21 2010 +0100

    Revert "no need to specify each time of handle"

    This reverts commit d88eaef098d3afc329266f25ce194c6dfebbc979.

 data/Empathy.client	    |  9 +++++++++
 src/empathy-chat-manager.c | 11 +++++++++++
 2 files changed, 20 insertions(+)

commit c17ffb62ebc6e69071e0a0380b2402ba8201bb83
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 6 11:23:46 2010 +0200

    dispatcher_channel_invalidated_cb: always remove invalidated chan
    from the list

    It doesn't hurt to always try to remove it and prevent us of
    keeping an
    invalidated or disposed object around if something weird happens.

 libempathy/empathy-dispatcher.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 5be45ef12ac579cbbb914f4d056df51a787bf98f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 5 15:33:03 2010 +0200

    Empathy.AudioVideo.client: properly define filters

 data/Empathy.AudioVideo.client | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b07f3a5c948066219cb57bb113a48d0981106f23
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 5 10:58:55 2010 +0200

    Inform the chatroom mgr when we are handling a new room

    It can't rely on the internal dispatcher any more.

 libempathy/empathy-chatroom-manager.c | 45
 +++++++----------------------------
 libempathy/empathy-chatroom-manager.h |  6 +++--
 src/empathy-chat-manager.c	       | 10 ++++++++
 src/empathy.c			       |  1 -
 4 files changed, 22 insertions(+), 40 deletions(-)

commit d88eaef098d3afc329266f25ce194c6dfebbc979
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 5 10:13:47 2010 +0200

    no need to specify each time of handle

 data/Empathy.client	    |  9 ---------
 src/empathy-chat-manager.c | 11 -----------
 2 files changed, 20 deletions(-)

commit 49aabeaba61750883864e95dc5f1bb254dbdb20d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 2 13:41:56 2010 +0200

    Update Empathy.client

 data/Empathy.client | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

commit f178351cb959326996921f56c7a881a8a3e1e771
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 2 13:41:00 2010 +0200

    Handle text channels using TpSimpleHandler (#623358)

    Also move handling code from empathy.c to empathy-chat-manager.

 src/empathy-chat-manager.c | 168
 +++++++++++++++++++++++++++++++++++++++++++++
 src/empathy.c		    |  47 +------------
 2 files changed, 169 insertions(+), 46 deletions(-)

commit 73845ad550f78190379cfa74a4b9e4ecefa6b241
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 2 13:37:42 2010 +0200

    connect sigs using tp_g_signal_connect_object

 libempathy/empathy-tp-chat.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 23e70b8d3b88b893d3dd5ab818b5243d215bd48e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 2 12:07:51 2010 +0200

    chat-manager: document the queue

 src/empathy-chat-manager.c | 1 +
 1 file changed, 1 insertion(+)

commit 9be71372f5579a2517231f1c5c2733610a550975
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 2 12:00:46 2010 +0200

    stop handling text channels using EmpathyDispatcher

 libempathy/empathy-dispatch-operation.c | 40
 +--------------------------------
 src/empathy.c				 | 22 +-----------------
 2 files changed, 2 insertions(+), 60 deletions(-)

commit f965c339f09e993d4d02567b93e09646b3d6f627
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 2 11:57:28 2010 +0200

    room list channels are not dispatched

 src/empathy.c | 2 --
 1 file changed, 2 deletions(-)

commit f01a6553b2bf073fd200e9ee3f8f442a3999a02b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 2 15:56:41 2010 +0200

    main: destroy the window when we're done (#623396)

 src/empathy.c | 1 +
 1 file changed, 1 insertion(+)

commit 5dc6e55d7bb8199aa54bba603eb5154ba41a49c7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 2 15:21:08 2010 +0200

    status-icon: drop our ref on the window when disposing

 src/empathy-status-icon.c | 1 +
 1 file changed, 1 insertion(+)

commit 7f5324c4a8e1c2bec44a79558c3b02ab95d906ac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 2 14:12:48 2010 +0200

    empathy_geometry_save: fix string leak

 libempathy-gtk/empathy-geometry.c | 1 +
 1 file changed, 1 insertion(+)

commit af6301ba7e46881feaf21f696a4721bbec946ca6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 2 14:12:32 2010 +0200

    contact_widget_location_update: fix string leak

 libempathy-gtk/empathy-contact-widget.c | 1 +
 1 file changed, 1 insertion(+)

commit 34676cc2bbd026908720a6c0067eee58dbf20d5b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 2 13:50:39 2010 +0200

    rename valgrind.supp to tp-glib.supp

 tests/Makefile.am   |	 2 +-
 tests/tp-glib.supp  | 333
 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/valgrind.supp | 333
 ----------------------------------------------------
 3 files changed, 334 insertions(+), 334 deletions(-)

commit 172a473d7dfa3e28211758eebad57d4b65b77b2a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 2 13:46:49 2010 +0200

    sync valgrind supp file with tp-glib's one

 tests/valgrind.supp | 784
 ++++++++++++++--------------------------------------
 1 file changed, 203 insertions(+), 581 deletions(-)

commit 268d7f421f60d1688134f6438fa2a2c4caf0a68f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 2 10:15:03 2010 +0200

    empathy-types: remove EmpathyContactMonitor

 libempathy/empathy-types.h | 2 --
 1 file changed, 2 deletions(-)

commit 2cba9cbe1638c309e680778598ff66e319615b0a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 29 14:25:49 2010 +0200

    chat: display pending messages once constructed if the channel is
    a room (#623112)

    Now that we wait that the TpChat has retrieved pending messages before
    considering it as ready, the message-received signal is fired
    *before* we
    connect it in EmpathyChat and so it misses them.

    We fix that by looking for pending messages once the EmpathyChat
    has been
    constructed.

 libempathy-gtk/empathy-chat.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 807c4cdfac49d1cf4d8eefbda394c2b53bd5598b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 29 12:20:07 2010 +0200

    install empathy-av to libexec

 data/Makefile.am						     |
 2 +-
 data/org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in |
 2 +-
 src/Makefile.am						     |
 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

commit 0d3a21856b23f8ba591e833f77ff3a5bcb465d24
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 24 15:54:44 2010 +0200

    add AV client to the debug window

 src/empathy-debug-window.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 4834af14fe305ac39331b1619e3cc4c3121a6c16
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 29 11:08:54 2010 +0200

    Disable timer if EMPATHY_PERSIST is set

 src/empathy-av.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit bba82eedbef0a2e3ea30ef924d64c85a7a105ad4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 29 11:05:19 2010 +0200

    Add a timer stopping the proccess after a while if idling

    There is no point to keep it around when not needed.

 src/empathy-av.c | 61
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

commit 8ad9151c1f7228436492e992158346e2bc808122
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 29 10:35:58 2010 +0200

    Claim that we support H264

    May not be actually true but needed to be callable using Google Video.

 data/Empathy.AudioVideo.client    | 1 +
 libempathy/empathy-call-factory.c | 1 +
 2 files changed, 2 insertions(+)

commit 9694c8d334037461fc11537920d0a01520a032e5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 29 10:23:42 2010 +0200

    add empathy_call_factory_register

    So we can connect signal before registering the Handler.

 libempathy/empathy-call-factory.c | 15 +++++++++------
 libempathy/empathy-call-factory.h |  3 +++
 src/empathy-av.c		   |  8 ++++++++
 3 files changed, 20 insertions(+), 6 deletions(-)

commit 70821f0c74f2d441bc889110e56bbfa602863559
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 29 09:56:58 2010 +0200

    add service and client files

 data/.gitignore				      |  1 +
 data/Empathy.AudioVideo.client			      | 20
 ++++++++++++++++++++
 data/Makefile.am				      | 12 ++++++++++--
 ...op.Telepathy.Client.Empathy.AudioVideo.service.in |  3 +++
 4 files changed, 34 insertions(+), 2 deletions(-)

commit 53fa331b0f2ad50a8520c4adf6983b744d5cddbd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 24 15:47:33 2010 +0200

    Add empathy-av, a new process handling media channels (#599161)

 src/.gitignore   |   3 +-
 src/Makefile.am  |  14 +++++--
 src/empathy-av.c | 111
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 122 insertions(+), 6 deletions(-)

commit 01e72ff82e7516cf71bdab66e107b8a3df3f1749
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 24 15:34:20 2010 +0200

    empathy_call_factory_new_call_with_streams: no need to pass a
    EmpathyCallFactory

 libempathy-gtk/empathy-contact-menu.c | 9 ++-------
 libempathy/empathy-call-factory.c     | 3 +--
 libempathy/empathy-call-factory.h     | 3 +--
 libempathy/empathy-call-handler.c     | 4 ++--
 4 files changed, 6 insertions(+), 13 deletions(-)

commit 661b357c331dca16c4ff0a075dd7f3982e028dce
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 24 15:06:14 2010 +0200

    empathy: stop handling media channels

 src/empathy.c | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

commit 406dc93dff623caa69b1b416d526cfd2030aa09a
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Jun 29 14:08:14 2010 +1000

    Fix up distribution of GSettings schemas

 data/Makefile.am | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

commit f563f6d7383c61c560d22a7e500dddb499cdea11
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Jun 29 13:58:20 2010 +1000

    Work around GCompletion deprecation for the time being

 libempathy-gtk/empathy-chat.c | 1 +
 1 file changed, 1 insertion(+)

commit 65b4cee8ab5be953fa62cf182134d0de7339686f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Jun 29 12:07:05 2010 +1000

    Revert "remove org.gnome.Empathy.gschema.xml.in from POTFILES.in"

    This reverts commit 78031524a27be66bdf51f1132f8285fa859b0c7a.

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit 0dfb3ff44eebef82fd9f6a5772363b74356459c6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 28 18:46:06 2010 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 78031524a27be66bdf51f1132f8285fa859b0c7a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 28 18:43:39 2010 +0200

    remove org.gnome.Empathy.gschema.xml.in from POTFILES.in

    It breaks "make distcheck" and I didn't have time to dig right now...

 po/POTFILES.in | 1 -
 1 file changed, 1 deletion(-)

commit 2fee6f40ab6259146f10cb609c1f295c5d11cbd2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 28 18:06:19 2010 +0200

    prepare 2.31.4 release

 NEWS	      | 68
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 70 insertions(+), 2 deletions(-)

commit ab65204f5cf4788225d96871f42b7fbb08364665
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 28 17:50:09 2010 +0200

    tp-chat: Wait that all the pending messages have been added to the
    pending queue

    EmpathyChat which is using the TpChat should be sure that all
    the pending
    messages have been processed so it can rely on
    empathy_tp_chat_get_pending_messages() to return all the pending
    messages.

    If not, it can't check if the message it receives from the logger
    are actually
    pending ones and so will display them twice (#622729).

 libempathy/empathy-tp-chat.c | 40
 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

commit 70f51868d4d8ea7cb8450f6250c3acc33e02ef83
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Sun Jun 27 23:09:30 2010 +0300

    [l10n] Updated Estonian translation

 po/et.po | 142
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 68 insertions(+), 74 deletions(-)

commit 17e7c371fea17571b9956fa4433e51c08c1e8f27
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Sun Jun 27 21:19:58 2010 +0300

    [l10n] Updated Estonian translation

 po/et.po | 310
 ++++++++++++++++-----------------------------------------------
 1 file changed, 75 insertions(+), 235 deletions(-)

commit 88597272bf17b0922f27c4ae58f372bae79aa1cf
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Sat Jun 26 14:05:49 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1154
 ++++++++++++++++++++++++++++++-----------------------------
 po/zh_TW.po | 1154
 ++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 1170 insertions(+), 1138 deletions(-)

commit 07d1cebc43b8d3c409fb807d46f35fcef7129fd8
Author: Claude Paroz <claude@2xlibre.net>
Date:	Fri Jun 25 08:48:26 2010 +0200

    Updated French translation

    Contributed by Pablo Martin-Gomez and Claude Paroz

 po/fr.po | 1275
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 627 insertions(+), 648 deletions(-)

commit 5c7c725365a5892334f3e90083e59096d311fae7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 24 13:40:26 2010 +0200

    Approve right away group text channels if we are not invited

    If we have not been invited, that means the channel is spawned by
    the CM (when
    using IRC proxy for example) so we want to display it right away.

 src/empathy-event-manager.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 1371d08976f21ed34079aad293adbe827127cae8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 24 13:20:26 2010 +0200

    rename approver service to Empathy.EventManager

    This is more coherent with Empathy.AV.

 src/empathy-event-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 26b67edf41dec99963ee6ac8463ad9c2b93fa243
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Jun 24 20:41:20 2010 +1000

    Add missing signal to EmpathyMainWindow

 src/empathy-main-window.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 37560cd2f2265eaded4024767d51e1ec51c8dc59
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 24 11:52:29 2010 +0200

    remove empathy-import-mc4-accounts (#622578)

 po/POTFILES.in			   |   1 -
 src/Makefile.am		   |   1 -
 src/empathy-import-mc4-accounts.c | 532
 --------------------------------------
 src/empathy-import-mc4-accounts.h |  34 ---
 4 files changed, 568 deletions(-)

commit 86efddfe8356a9dd959efeb38be26698ab5a80d9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 24 11:55:02 2010 +0200

    remove imported-mc4-accounts gsettings key

 data/empathy.convert		       | 4 ----
 data/org.gnome.Empathy.gschema.xml.in | 7 -------
 libempathy/empathy-gsettings.h        | 1 -
 3 files changed, 12 deletions(-)

commit 17460b3291e61861ed56cbb5d5867d910297da58
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 24 11:52:45 2010 +0200

    stop importing MC4 accounts

 src/empathy-accounts-common.c | 13 -------------
 src/empathy-accounts.c        | 33 +--------------------------------
 src/empathy.c		       |  7 ++-----
 3 files changed, 3 insertions(+), 50 deletions(-)

commit 45ca662701afa1fd92d26c587e56b6e1ade16e83
Merge: 249af05 ee36de0
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Jun 24 19:38:15 2010 +1000

    Merge branch 'preferences-dialog-622557'

commit ee36de0c87a759e0ffe7ef6e845110e53a724299
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Jun 24 12:34:33 2010 +1000

    Port EmpathyPreferences to GtkDialog subclass

 src/empathy-main-window.c  |  13 +-
 src/empathy-preferences.c  | 325
 +++++++++++++++++++++++++--------------------
 src/empathy-preferences.h  |  25 +++-
 src/empathy-preferences.ui |  49 -------
 4 files changed, 215 insertions(+), 197 deletions(-)

commit 53ff0c11c8b340eb7038bade1a12a7c4bd5f4cac
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Jun 23 23:33:49 2010 +1000

    Port EmpathyMainWindow to GtkWindow subclass

 src/empathy-event-manager.c |	29 +--
 src/empathy-main-window.c   | 466
 +++++++++++++++++++++++++-------------------
 src/empathy-main-window.h   |	26 ++-
 src/empathy-main-window.ui  |	 8 -
 src/empathy.c		     |	 3 +-
 5 files changed, 308 insertions(+), 224 deletions(-)

commit 249af05e390dc85d6545917b5449f090c1e19d16
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Jun 22 20:05:24 2010 +0200

    Use document font by default for adium themes

    Fixes bug #622266

 libempathy-gtk/empathy-theme-adium.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 30963d50de3652cca566fda8d753e733f0fb243a
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Tue Jun 22 21:11:51 2010 +0200

    Updated Spanish translation

 po/es.po | 568
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 289 insertions(+), 279 deletions(-)

commit 9ec19adf1ee7294ea71f128c509179ccd838651a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 22 17:12:39 2010 +0200

    log_window_get_messages_for_date: don't clear the marks on the
    calendar

    There is no reason to.

 libempathy-gtk/empathy-log-window.c | 2 --
 1 file changed, 2 deletions(-)

commit 865c47d9121bb63474ecaed7f5451188db67382b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 22 17:10:58 2010 +0200

    add 2 comments

 libempathy-gtk/empathy-log-window.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 09df593e038c3f7bfed05294155dbffeabba6ea0
Merge: 603a228 89ca74a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 22 17:26:10 2010 +0200

    Merge branch 'av-handler-622368'

commit 89ca74a938a753c1137cc9f008619805622e490c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 22 15:45:06 2010 +0200

    new-call-dialog: create the AV channel using the TargetID so we
    don't have to wait for the EmpathyContact

 libempathy-gtk/empathy-new-call-dialog.c | 65
 +++++++++++---------------------
 1 file changed, 22 insertions(+), 43 deletions(-)

commit 603a22855ea710b276892654b86a529167f8d32b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 22 13:50:50 2010 +0200

    debug-window: add the logger (#622381)

 src/empathy-debug-window.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 9f52496c8d0d54e898b3d9df419201617417bdba
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 22 15:00:54 2010 +0200

    log-window: check if the window still exist in async cb (#622273)

 libempathy-gtk/empathy-log-window.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

commit 0e6298a2a650970c32706c6e6b703417b747b7fd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 22 14:34:07 2010 +0200

    move the static variable used by the singleton out of
    empathy_log_window_show

    That's useful for other functions which would like to check if there
    is still
    a window or not.

 libempathy-gtk/empathy-log-window.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

commit d22972c5b30ef8b771a148e57d80a9f4d54424c8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 22 11:42:54 2010 +0200

    remove empathy_tp_call_to

    We don't need it any more:
    - The TpContact is now always set during object construction
    - The status is changed once the contact has been set
    - We don't need to request streams any more as we use
    Initial{Audio,Video}

 libempathy/empathy-call-handler.c |  3 ---
 libempathy/empathy-tp-call.c	   | 22 ----------------------
 libempathy/empathy-tp-call.h	   |  3 ---
 3 files changed, 28 deletions(-)

commit 31e110e96745858e11fce4fffab2334d5e32a873
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 22 11:38:39 2010 +0200

    remove empathy_call_handler_new_for_contact_with_streams

 libempathy/empathy-call-handler.c | 21 ---------------------
 libempathy/empathy-call-handler.h |  3 ---
 2 files changed, 24 deletions(-)

commit b379e5e873e51d3bcad1fc055b2f7974267c7daa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 22 11:37:20 2010 +0200

    empathy_tp_call_accept_incoming_call: early return if the call is
    not an incoming one

    We use to rely in the call handler on the presence or not of the
    TpCall object
    to check if the call was incoming or not.
    But now TpCall object are created earlier so that's not true any more.

 libempathy/empathy-tp-call.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit bd2d501f03e157f8f26a52f75e06dcb49621f663
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 22 11:28:00 2010 +0200

    empathy_call_handler_start_call: use
    empathy_call_factory_new_call_with_streams

 libempathy/empathy-call-handler.c | 55
 +++++++++------------------------------
 1 file changed, 13 insertions(+), 42 deletions(-)

commit 2064d5324ec602a7a6c2e9e63d5b406e5228824c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 22 11:25:01 2010 +0200

    empathy_call_factory_new_call_with_streams: request channel using
    the CD

    Also allow caller to pass the timestamp and an optionnal callback.

 libempathy-gtk/empathy-contact-menu.c	  |  6 +++--
 libempathy-gtk/empathy-new-call-dialog.c | 33 ++++++++++++++++++++++---
 libempathy/empathy-call-factory.c	  | 41
 +++++++++++++++++++++-----------
 libempathy/empathy-call-factory.h	  |  8 ++++++-
 4 files changed, 68 insertions(+), 20 deletions(-)

commit 57459c6892de159e92a90231e8c10e63c566ac32
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 22 11:20:32 2010 +0200

    tp-call: use tp_g_signal_connect_object to connect signal on the
    channel

    This ensure that the cb won't be called after the TpCall has been
    destroyed.

 libempathy/empathy-tp-call.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 066f1c90a7e6461ccb8ea11a2f511604abbd2472
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 21 16:47:18 2010 +0200

    tp-call: use TargetHandle to get the remote contact

 libempathy/empathy-tp-call.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

commit eafc9830daea1f750be9b68d7360a8b4b8345e5a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 21 16:21:34 2010 +0200

    tp-call: use the Requested property to check if the call is an
    incoming one or not

 libempathy/empathy-tp-call.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

commit f20aa2a8401a472c6d9d2ffa0979ae8169f1df85
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 21 14:55:54 2010 +0200

    remove empathy_call_factory_new_call

    It's not used any more.

 libempathy/empathy-call-factory.c | 15 ---------------
 libempathy/empathy-call-factory.h |  3 ---
 2 files changed, 18 deletions(-)

commit 6b7a7b32680892b3e5cc45e8ef012fc323d06a4c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 21 13:15:25 2010 +0200

    call-factory: use TpSimpleHandler to handle incoming calls (#622368)

 libempathy/empathy-call-factory.c | 130
 +++++++++++++++++++++++++++++++++++---
 libempathy/empathy-call-factory.h |   3 -
 2 files changed, 120 insertions(+), 13 deletions(-)

commit f43fbe8cdb7adf761c2b23206b4c13ee5efc3332
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 21 13:14:35 2010 +0200

    stop handling internally stream media channels

    We are going to do it properly using TpSimpleHandler.

 libempathy/empathy-dispatch-operation.c | 30 ---------------------------
 src/empathy.c				 | 36
 +--------------------------------
 2 files changed, 1 insertion(+), 65 deletions(-)

commit 6d577ec2bc68b365aa0b02235d8b1d8d1aac297c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 21 15:56:39 2010 +0200

    share-my-desktop: ownership of the request hash table is passed to
    empathy_dispatcher_create_channel

 libempathy-gtk/empathy-share-my-desktop.c | 1 -
 1 file changed, 1 deletion(-)

commit 23347330b2a4859f7e1af042d00d54ba1c4d5b15
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Jun 21 17:03:45 2010 +0200

    Make sure taping ENTER when searching contact starts a chat.

    Make sure there is always a contact selected when live search is
    active, and
    activate its row when the live search is activated

 libempathy-gtk/empathy-contact-list-view.c | 65
 ++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

commit b0e035046ad5d3b9d483e8f74ef5f36149a73f16
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Jun 21 17:03:13 2010 +0200

    Add "activate" signal on EmpathyLiveSearch

    It is emitted when its GtkEntry is activated.

 libempathy-gtk/empathy-live-search.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

commit 7ecb49662199bb39b38e38f58ab4dcf5e3393b7b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 21 13:18:36 2010 +0200

    Stop advertissing audio/video capabilities using old API

    Connection.Interface.Capabilities is so passé...

 libempathy/empathy-dispatcher.c | 38
 --------------------------------------
 1 file changed, 38 deletions(-)

commit e0dfeacc5638249a9b3864e04195353ea4271806
Merge: 91085fb 43db9e7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 21 14:19:12 2010 +0200

    Merge branch 'vino-621998'

commit 91085fbd03668468fa598e59e536c751478a57f5
Merge: 44b337d 6a40190
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 21 14:19:00 2010 +0200

    Merge branch 'check-vinagre-589225'

commit 44b337df1962dbcda7b8de161444735570d38972
Merge: 783c15a 733ae44
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Jun 21 19:33:42 2010 +1000

    Merge remote branch 'sjoerd/misc'

commit 783c15aecdb7aba0ef69c4a82dae0f391007185e
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Jun 21 19:08:30 2010 +1000

    Delay setting both contact list values until the each is set.

    Solves a loop in the notification code that caused things to get
    stuck.

 src/empathy-main-window.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

commit e7f7ba7259d1b668b0d1702687f7241581b74d87
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 21 10:32:28 2010 +0200

    strip name of the room (#622201)

 src/empathy-new-chatroom-dialog.c | 2 ++
 1 file changed, 2 insertions(+)

commit bfca0ccfebc3cf36e1f9add5cf720917fe17c54e
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Jun 20 09:35:00 2010 +0200

    Grab focus on the main window's tree view by default

    This is needed to make live search works when the main window is shown

    Fixes bug #621089

 src/empathy-main-window.c | 2 ++
 1 file changed, 2 insertions(+)

commit e3c21c1ec71d405844089814ec3dec058a2b39a7
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Jun 21 08:45:08 2010 +0200

    Remove dead code in tests that still use MC4

 tests/test-helper.c | 103
 ----------------------------------------------------
 1 file changed, 103 deletions(-)

commit 56c3590ccf790223f30894c81c2e6c2ac0ffa4b8
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Jun 21 08:44:32 2010 +0200

    Remove useless occurences of 'gconf' word

    Die gconf, die!

 libempathy/empathy-connectivity.c     | 2 +-
 src/empathy-preferences.c	       | 2 +-
 tests/empathy-chatroom-manager-test.c | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

commit 43db9e78ea221b6fc5deea18a395086ea34aa238
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 18 12:28:13 2010 +0200

    share-my-desktop: request the tube using the CDO

    Recent Vino are now proper handlers so all we have to do is to
    request the
    channel and let MC dispatch it to Vino.

 libempathy-gtk/empathy-share-my-desktop.c | 231
 ++++--------------------------
 1 file changed, 28 insertions(+), 203 deletions(-)

commit 6a401905c9f98fcf821383012e71f9ea8abe0bc3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 18 16:10:29 2010 +0200

    replace empathy_contact_can_use_stream_tube by
    empathy_contact_can_use_rfb_stream_tube

    That's the only type of tube we care about and that allows us to
    enable the
    'Share my Desktop' option only with contacts having a tube enabled
    Vinagre
    installed (#589225).

 libempathy-gtk/empathy-contact-menu.c |  3 ++-
 libempathy/empathy-contact.c	       | 12 +++++++++---
 libempathy/empathy-contact.h	       |  4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

commit 7ed9fa5ef0cf9091ae3ea1b1e326440fe6d5727e
Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:	Sun Jun 20 18:16:02 2010 +0300

    Updated Latvian translation.

 po/lv.po | 207
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 99 insertions(+), 108 deletions(-)

commit 733ae445e0f0c79b13de25e408957f23ed9a53a9
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Jun 19 20:38:03 2010 +0100

    Rely on compare_separator_and_groups when either A or B isn't
    a contact

    We can't rely on the fact that compare_separator_and_groups only
    returns
    0 in the case it compares two contacts. But we can completely rely
    on its
    result if we give it at least one non-contact.

 libempathy-gtk/empathy-contact-list-store.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit 96a20bbc3f491b9f6bfa00401beb4cf24b7a200c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Jun 19 20:29:51 2010 +0100

    Now that we depend on the logger always enable favourite contact
    support

 configure.ac				     | 30
 -----------------------------
 libempathy-gtk/empathy-contact-list-store.c |	2 --
 libempathy-gtk/empathy-contact-menu.c	     |	4 ----
 libempathy-gtk/empathy-contact-widget.c     |	8 --------
 libempathy/empathy-contact-list.c	     |	6 ------
 5 files changed, 50 deletions(-)

commit fb06bf8e12d112645433eb7ed2bd9ffb82980278
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Jun 19 20:06:07 2010 +0100

    Pick the right sort function early

    We can't assume that the group and seperator sorting function never
    returns 0,
    so don't use that to imply that both A and B are contacts. Instead
    just check
    if A and B are contacts...

 libempathy-gtk/empathy-contact-list-store.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 813e42dcf617f97e0ed0cdc7a77ad428d5b87ef2
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Jun 19 20:05:43 2010 +0100

    Throw a warning if the contact sort function didn't get two contacts

 libempathy-gtk/empathy-contact-list-store.c | 2 ++
 1 file changed, 2 insertions(+)

commit f6e4c9ebc9374f787d623fbb787a2afd5407f5fe
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Jun 19 19:54:38 2010 +0100

    Always prepare both the Connection and the Channel

 libempathy/empathy-dispatch-operation.c | 35
 ++++++++++++++-------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

commit c39c07e8c009170514ebcdfa0d9a639d673ee604
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Jun 19 17:49:45 2010 +0100

    Use the right GSettings scheme

 libempathy-gtk/empathy-chat.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 48d30c3fabc70f012542ffe6c67742f6a39c8f10
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Jun 19 17:49:25 2010 +0100

    EmpathyChat: use an opaque struct for priv not a void pointer

 libempathy-gtk/empathy-chat.c | 4 ++--
 libempathy-gtk/empathy-chat.h | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

commit e420cf3f2eeabb09f8deef22e615809220eb3139
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Jun 19 14:22:29 2010 +0100

    Remove IDT_COMPILE_WARNINGS as we don't have the macro anymore

 configure.ac | 1 -
 1 file changed, 1 deletion(-)

commit 2ec790f9cb9f2025b5dcf25f2cbaed978f8c0fb5
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Sat Jun 19 19:29:11 2010 +0300

    Updated Hebrew translation.

 po/he.po | 722
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 367 insertions(+), 355 deletions(-)

commit 61fa3b9bfc5656d7305d397104bbe03e969100a3
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sat Jun 19 15:18:44 2010 +0200

    Updated Galician translations

 po/gl.po | 687
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 350 insertions(+), 337 deletions(-)

commit e32273c1e0315e0c491d59c974996428b89adc77
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sat Jun 19 12:20:29 2010 +0200

    Added Norwegian bokmål translation

 po/nb.po | 711
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 361 insertions(+), 350 deletions(-)

commit 8855dfdbfb2fb0fc6b1158658b87cd300cd8c8fb
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sat Jun 19 12:04:29 2010 +0200

    Rename the schemas

 po/POTFILES.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bfb75bb92f7e1a4aa93a9e144b781faf03df93eb
Merge: 13699e0 247ea7a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 18 18:11:58 2010 +0200

    Merge branch 'approvers-redone-599158'

commit 13699e023a50f88055f24c0230c28a7163c8356d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 18 17:56:32 2010 +0200

    remove old logger files

 libempathy/empathy-log-manager.c	| 454 ------------------
 libempathy/empathy-log-manager.h	| 106 -----
 libempathy/empathy-log-manager.xsl	| 148 ------
 libempathy/empathy-log-store-empathy.c | 822
 ---------------------------------
 libempathy/empathy-log-store-empathy.h |  71 ---
 libempathy/empathy-log-store.c		| 172 -------
 libempathy/empathy-log-store.h		| 104 -----
 7 files changed, 1877 deletions(-)

commit d345fc72a9ff9ce2af454f428b56f78cb611416a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 18 17:53:38 2010 +0200

    Depend on telepathy-logger (#610956)

 configure.ac			       |  31 +--
 libempathy-gtk/Makefile.am	       |   2 -
 libempathy-gtk/empathy-chat.c	       |  62 +-----
 libempathy-gtk/empathy-contact-menu.c |  17 +-
 libempathy-gtk/empathy-log-window.c   | 352
 ----------------------------------
 libempathy/Makefile.am		       |  27 ---
 libempathy/empathy-contact.c	       |   5 -
 libempathy/empathy-contact.h	       |   4 -
 libempathy/empathy-message.c	       |   4 -
 libempathy/empathy-message.h	       |   4 -
 nautilus-sendto-plugin/Makefile.am    |   1 -
 src/Makefile.am		       |   2 -
 src/empathy.c			       |  13 --
 tests/Makefile.am		       |   2 -
 tests/interactive/Makefile.am	       |   2 -
 15 files changed, 6 insertions(+), 522 deletions(-)

commit fc409d61494d325be2714f8b5a7aff2281755248
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 17 17:10:31 2010 +0200

    use ISO-8601 dates in DEBUG

 libempathy-gtk/empathy-log-window.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 323e59fd738a061d741608f26e16d56fec1f4e09
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 17 17:01:23 2010 +0200

    don't use strptime

 libempathy-gtk/empathy-log-window.c | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

commit 824264d894e91c80cc03cd2ef837eb767d4e5242
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 17 12:21:38 2010 +0200

    depend on telepathy-logger-0.1

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3a2a8251d7b4c79962fd17a978475df5b3cb57a9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 16 13:24:33 2010 +0200

    TplContact has been renamed to TplEntity

 libempathy/empathy-contact.c | 14 +++++++-------
 libempathy/empathy-contact.h |  4 ++--
 libempathy/empathy-message.c |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

commit 09a49d81dafe86a68546613cfeee4e2a118cf198
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 10 10:13:09 2010 +0200

    TplLogEntry(Text) has been renamed to TplEntry(Text)

 libempathy-gtk/empathy-chat.c	     |	6 +++---
 libempathy-gtk/empathy-log-window.c |	2 +-
 libempathy/empathy-message.c	     | 28 ++++++++++++++--------------
 libempathy/empathy-message.h	     |	4 ++--
 4 files changed, 20 insertions(+), 20 deletions(-)

commit be2ae7a5b3f10393fa1afcefb67042493cb0eee7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 2 14:56:15 2010 +0200

    tpl_log_manager_search_new_async has been renamed to
    tpl_log_manager_search_async

 libempathy-gtk/empathy-log-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 153e113efb28b8fb42054dc27b46c6f169dfeeea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 1 16:02:56 2010 +0200

    tp-logger now use GDate rather than strings in its API

 libempathy-gtk/empathy-log-window.c | 164
 ++++++++++++++++++++++--------------
 1 file changed, 100 insertions(+), 64 deletions(-)

commit b606f4e60bd4ffe0d8d2b9121391d299a5941101
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 27 13:52:07 2010 +0200

    nautilus-sendto: add TPL CFLAGS

 nautilus-sendto-plugin/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit 51a18eccb46077ed826aa95590ae8a2211c7a316
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 27 13:51:52 2010 +0200

    tests: add TPL CFLAGS and LIBS

 tests/Makefile.am	       | 2 ++
 tests/interactive/Makefile.am | 2 ++
 2 files changed, 4 insertions(+)

commit 210388d6821d72dacd55063ad805857a27c14e3f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 27 13:44:35 2010 +0200

    port to latest tp-logger API

 configure.ac			     |	2 +-
 libempathy-gtk/empathy-chat.c	     |	5 ++---
 libempathy-gtk/empathy-log-window.c | 30 ++++++++++++------------------
 libempathy/empathy-message.c	     |	6 +++---
 src/empathy.c			     |	1 -
 5 files changed, 18 insertions(+), 26 deletions(-)

commit b0eb7b2baf39cd5a509668bc53e5e34d70cb255d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 17 18:24:40 2010 +0200

    log-store: relicense to LGPL

    This file was based on gossip-log and its copyright owners agreed to
    relicense it; see GOSSIP-RELICENSING.txt.

 libempathy/empathy-log-store.c | 19 +++++++++----------
 libempathy/empathy-log-store.h | 19 +++++++++----------
 2 files changed, 18 insertions(+), 20 deletions(-)

commit 247ea7a25d8495d2f1cd2b6ac2bf6fe582a3c5fb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 18 11:23:45 2010 +0200

    rename channel_claim_cb to reject_channel_claim_cb

 src/empathy-event-manager.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit b7d237fb040f262730fbc0b4e34ebeae5dc33b19
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Jun 15 23:20:56 2010 +0100

    Add shortcut keys for contact list item sizes

    Maybe these are overkill?

    https://bugzilla.gnome.org/show_bug.cgi?id=621703

 src/empathy-main-window.ui | 3 +++
 1 file changed, 3 insertions(+)

commit c563c362a275d985a2d51c218ce0aca7ad3248f0
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Jun 11 16:36:09 2010 +1000

    Port empathy-import-mc4-accounts imported setting to GSettings

 libempathy/empathy-gsettings.h    |  3 +++
 src/empathy-import-mc4-accounts.c | 29 ++++++++++++++---------------
 2 files changed, 17 insertions(+), 15 deletions(-)

commit 4b4d14729fd0b03b72fd8b02047e0e97a4f79042
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Jun 11 12:07:58 2010 +1000

    Mark schema summaries and descriptions for translation

 data/.gitignore		       |   1 +
 data/Makefile.am		       |   1 +
 data/org.gnome.Empathy.gschema.xml    | 253
 ---------------------------------
 data/org.gnome.Empathy.gschema.xml.in | 258
 ++++++++++++++++++++++++++++++++++
 4 files changed, 260 insertions(+), 253 deletions(-)

commit 161ce29c6a6c9a88d5ebbe9773ab3c276d4ad7f9
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Jun 11 12:00:46 2010 +1000

    Add a keyfile for gsettings-data-convert

 data/Makefile.am     |  5 ++++
 data/empathy.convert | 74
 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)

commit a9c56d98390d3c2c592c00ceef0d10151d6f9c49
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Jun 10 18:47:38 2010 +1000

    Convert to new-style schema

 configure.ac			    |	5 +-
 data/.gitignore		    |	2 +-
 data/Makefile.am		    |  22 +-
 data/empathy.schemas.in	    | 651
 -------------------------------------
 data/org.gnome.Empathy.gschema.xml | 253 ++++++++++++++
 m4/gsettings.m4		    |  80 +++++
 6 files changed, 342 insertions(+), 671 deletions(-)

commit 96569c764125b9c80909c7cece9e37b65eb632ca
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Jun 10 14:16:00 2010 +1000

    Port Empathy code to GSettings, remove EmpathyConf

 libempathy-gtk/Makefile.am		   |   2 -
 libempathy-gtk/empathy-avatar-chooser.c   |  21 +-
 libempathy-gtk/empathy-chat-text-view.c   |  53 ++-
 libempathy-gtk/empathy-chat.c		   |  72 ++--
 libempathy-gtk/empathy-conf.c		   | 371 ----------------
 libempathy-gtk/empathy-conf.h		   | 135 ------
 libempathy-gtk/empathy-location-manager.c |  84 ++--
 libempathy-gtk/empathy-notify-manager.c   |  34 +-
 libempathy-gtk/empathy-sound.c		   |  36 +-
 libempathy-gtk/empathy-spell.c		   |  24 +-
 libempathy-gtk/empathy-theme-adium.c	   |  38 +-
 libempathy-gtk/empathy-theme-boxes.c	   |   1 -
 libempathy-gtk/empathy-theme-manager.c    |  49 +--
 libempathy-gtk/empathy-ui-utils.c	   |   1 -
 libempathy/Makefile.am			   |   1 +
 libempathy/empathy-gsettings.h		   |  92 ++++
 src/empathy-account-assistant.c	   |   1 -
 src/empathy-accounts-dialog.c		   |  16 +-
 src/empathy-auto-salut-account-helper.c   |   1 -
 src/empathy-chat-window.c		   |  37 +-
 src/empathy-event-manager.c		   |  21 +-
 src/empathy-ft-manager.c		   |   1 -
 src/empathy-main-window.c		   | 160 ++++---
 src/empathy-migrate-butterfly-logs.c	   |  22 +-
 src/empathy-preferences.c		   | 676
 +++++++++---------------------
 src/empathy-status-icon.c		   |  34 +-
 src/empathy.c				   |  46 +-
 27 files changed, 672 insertions(+), 1357 deletions(-)

commit f748067f6fa10635261313a28e0a0102168de91e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 17 17:35:14 2010 +0200

    log-manager: relicense to LGPL

    This file was based on gossip-log and its copyright owners agreed to
    relicense it; see GOSSIP-RELICENSING.txt.

 libempathy/empathy-log-manager.c | 19 +++++++++----------
 libempathy/empathy-log-manager.h | 19 +++++++++----------
 2 files changed, 18 insertions(+), 20 deletions(-)

commit b8c3e1f86a5982c06a63116a6dc98a9b583b468c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 17 17:34:18 2010 +0200

    log-manager: update Collabora copyright

 libempathy/empathy-log-manager.c | 2 +-
 libempathy/empathy-log-manager.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit f9894b899100467c88b3cf6b218df704d49647c2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 17 11:47:07 2010 +0200

    log-store-empathy: relicense to LGPL

    This file was based on gossip-log and its copyright owners agreed to
    relicense it; see GOSSIP-RELICENSING.txt.

 libempathy/empathy-log-store-empathy.c | 19 +++++++++----------
 libempathy/empathy-log-store-empathy.h | 19 +++++++++----------
 2 files changed, 18 insertions(+), 20 deletions(-)

commit 8728a86cda80fe0b824a8cb87b91db8eb1a2b99f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 17 11:44:34 2010 +0200

    log-store-empathy: update Collabora copyright

 libempathy/empathy-log-store-empathy.c | 2 +-
 libempathy/empathy-log-store-empathy.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit ae842e153796a77dccc171254625793acf754c3f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 17 11:38:22 2010 +0200

    empathy-time: relicense to LGPL

    This file was based on gossip-time and its copyright owners agreed to
    relicense it; see GOSSIP-RELICENSING.txt

 libempathy/empathy-time.c | 19 +++++++++----------
 libempathy/empathy-time.h | 19 +++++++++----------
 2 files changed, 18 insertions(+), 20 deletions(-)

commit aeb4b0095d9685e8c40e4a86144f214caf3c63e8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 17 11:35:36 2010 +0200

    empathy-time: add Collabora copyright

 libempathy/empathy-time.c | 1 +
 libempathy/empathy-time.h | 1 +
 2 files changed, 2 insertions(+)

commit 437accd81b67da4e729acdf7a20ed5c2fa644f45
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 17 14:34:01 2010 +0200

    add GOSSIP-RELICENSING.txt

 GOSSIP-RELICENSING.txt | 411
 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 411 insertions(+)

commit 5185368aeb46bbf1380b4a80248e401f08a82ac0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 17 15:57:44 2010 +0200

    factor out reject_approval

 src/empathy-event-manager.c | 54
 +++++++++++++++++----------------------------
 1 file changed, 20 insertions(+), 34 deletions(-)

commit 0b1118ceffb8320a75182c322a7942c8488cedc3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 17 15:45:11 2010 +0200

    approve_channels: use quarks to compare channel types

 src/empathy-event-manager.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit eb0e906fdf31444a970cd907357cb383a61949c7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 17 15:41:19 2010 +0200

    fix typo

 src/empathy-event-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ddfaea7497d40b45295d657b3a1f905ed5899252
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 19 09:44:07 2010 +0200

    event-manager: re-implement approving using a proper Approver
    (#599158)

 src/empathy-event-manager.c | 376
 ++++++++++++++++++++++++++++++++------------
 1 file changed, 275 insertions(+), 101 deletions(-)

commit 8c8046a95a4db39a507aceb78e3c23f959eb7745
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 19 11:16:22 2010 +0200

    add inviter arg to empathy_tp_chat_is_invited

 libempathy/empathy-tp-chat.c | 5 +++--
 libempathy/empathy-tp-chat.h | 3 ++-
 src/empathy.c		      | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

commit 14d38669faa5ed366832dd8f8fc9da7813f8a4af
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 18 17:50:21 2010 +0200

    remove internal approving code

 libempathy/empathy-dispatch-operation.c | 50
 +------------------------------
 libempathy/empathy-dispatch-operation.h |  4 ---
 libempathy/empathy-dispatcher.c	 | 53
 +++------------------------------
 3 files changed, 5 insertions(+), 102 deletions(-)

commit 6255e0f1e25d1a2928fb29fd3a0417cabaec46b4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 18 17:46:19 2010 +0200

    event-manager: disable approving for now

 src/empathy-event-manager.c | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

commit 81073b4ead57026a71a8e192947123aef9f9a3cf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 17 12:49:26 2010 +0200

    empathy_message_equal: always use the timestamp+body (#621797)

    There is no reason to only use this new heuristic only in the
    TPL case.
    Furthermore, we're about to make TPL mandatory so it's good to have
    it more
    tested.

 libempathy/empathy-message.c | 4 ----
 1 file changed, 4 deletions(-)

commit d0b4b584e9cab568cd6bc25e2ad0fc0a00cfbca2
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jun 17 11:17:51 2010 +0200

    Remove the treeview's build-in search function, we use the live
    search now.

 libempathy-gtk/empathy-contact-list-store.c | 42
 -----------------------------
 libempathy-gtk/empathy-contact-list-store.h |	5 ----
 libempathy-gtk/empathy-contact-list-view.c  |	4 ---
 3 files changed, 51 deletions(-)

commit fdaa85ff7081f8e3c23984872cb72d585ee1d76b
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jun 17 11:16:16 2010 +0200

    Fix the visibility of group when live search is active

 libempathy-gtk/empathy-contact-list-view.c | 56
 ++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

commit 3b25a660fcf33449a4de4b9106c8682e66952aa2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 16 17:19:59 2010 +0200

    map-view: add a debug message when adding a marker

 src/empathy-map-view.c | 2 ++
 1 file changed, 2 insertions(+)

commit c5e4a16ea91a6857a9e8d3876f8e47872bfd2b8c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 16 16:39:43 2010 +0200

    use tp_g_signal_connect_object to connect the "closed" signal on
    the notification

    This fix a crash if the chat window is destroyed while the
    notification is
    still displayed (#621789).

 src/empathy-chat-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit eb7d0f7647e16dff399ca6cc77e4971ff437a56a
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Jun 15 23:21:34 2010 +0100

    Make status preset editor taller by default

    This window defaulted to coming up really small, and it looked
    silly. So
    this patch makes it a bit taller.

    (420 / 260 is approximately the Golden Ratio.)

 libempathy-gtk/empathy-status-preset-dialog.ui | 1 +
 1 file changed, 1 insertion(+)

commit 59bff3ec68fae3ce295983234e2016d1f4cb760c
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Tue Jun 15 19:26:09 2010 +0200

    Updated Spanish translation

 po/es.po | 231
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 117 insertions(+), 114 deletions(-)

commit 779239e5698e387aa19836b3079fbad5f271c559
Merge: 65117be 468edbc
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Jun 15 21:43:33 2010 +1000

    Merge branch 'gseal'

commit 65117be024913a3a6ee38b85b4c36118a99cb379
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Jun 15 13:05:53 2010 +0200

    Bump required version of telepathy-glib to 0.11.7 for ContactInfo API

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3f2f102289b7cc3195d77afa03cdb2158dd2bcfc
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jun 3 18:08:45 2010 +0200

    Add a GtkSpinner to notify the RequestContactInfo progress

 libempathy-gtk/empathy-contact-widget.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 84db1f04162ce84f915f739d68e831d0d3baf449
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri May 14 14:16:36 2010 +0200

    Display contact vCard in information dialog, add basic vCard editor
    for self contact

    Fixes bug #588922

 libempathy-gtk/empathy-contact-dialogs.c |   5 +-
 libempathy-gtk/empathy-contact-widget.c  | 393
 ++++++++++++++++++++++++++++++-
 libempathy-gtk/empathy-contact-widget.h  |   2 +
 libempathy-gtk/empathy-contact-widget.ui |  74 +-----
 4 files changed, 403 insertions(+), 71 deletions(-)

commit 75723c313503c6d8541a662fe19f0c6dbf22a06d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Jun 14 16:55:29 2010 +0200

    Bump required version of libunique to 1.1.2

    Fixes bug #621545

 configure.ac | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 679fc9b59b198352af5c72881fe5d06b74a6ad3c
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Jun 14 13:05:35 2010 +0200

    Fix authors and copyright of EmpathyLiveSearch

 libempathy-gtk/empathy-live-search.c | 3 +++
 libempathy-gtk/empathy-live-search.h | 3 +++
 2 files changed, 6 insertions(+)

commit b81b252fddaaa77207a7b6c11e7e05c9c2c26410
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Jun 14 08:39:33 2010 +0200

    If path is NULL, the signal is blocked forever

 libempathy-gtk/empathy-contact-list-view.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 95107dadaa0b19028c03bfe89f7c473ec91e9d8e
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sun Jun 13 23:32:06 2010 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 174
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 87 insertions(+), 87 deletions(-)

commit 492a5fc0e466526f991e30f82fe7a42c22b4ec64
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Jun 13 11:56:06 2010 +0200

    Do not crash if the row gets deleted before the expand idle cb

 libempathy-gtk/empathy-contact-list-view.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 17f8244abe8a5456512f860a7132d3b56613891a
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sun Jun 13 01:50:41 2010 +0200

    Updated Galician translations

 po/gl.po | 116
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 58 insertions(+), 58 deletions(-)

commit 4a47a43ac27b276bc74c6cf92ba18e104a3dfaf4
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Jun 13 00:28:20 2010 +0200

    Use a GtkTreeRowReference instead of GtkTreePath to expand/collapse
    a group in idle cb

 libempathy-gtk/empathy-contact-list-view.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

commit 468edbcfb17c5d67d945debf2f019dfd9974ccf9
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Jun 11 17:51:39 2010 +1000

    Access GdkDragContext members via getters

 libempathy-gtk/empathy-avatar-chooser.c    | 8 +++++---
 libempathy-gtk/empathy-contact-list-view.c | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

commit feda58b5da761dce7c18a2cb2d4531481fe3bfce
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed May 5 09:30:03 2010 +0200

    Use gtk_text_view_get_vadjustment() instead of assuming parent is
    a GtkScrolledWindow

 libempathy-gtk/empathy-chat-text-view.c | 45
 ++++++++++-----------------------
 1 file changed, 14 insertions(+), 31 deletions(-)

commit 9e495e95ae426f691c8682285b698f84e0a942d3
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jun 11 17:05:49 2010 +1000

    Use new GtkTextView API to make EmpathyChat build with GSEAL enabled

 libempathy-gtk/empathy-chat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 702b642ccb80a59f204d9283993653495668df1c
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jun 11 17:05:15 2010 +1000

    Require GTK+ 2.21.2

 configure.ac | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 287d005ac6346e5029ce10375e1773c1f77bdb2d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 11 15:04:23 2010 +0200

    Don't display the 'Important Room' menu item in private chats

 src/empathy-chat-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 2bae9ac9f9dded0762344c1478202d78e7f01200
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 11 14:56:17 2010 +0200

    check if the search widget exists before trying to use it

 libempathy-gtk/empathy-contact-list-view.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 904bdd9b2d01cba1894f7626cdfce74983e12a0b
Author: Kristjan Schmidt <kristjan.schmidt@googlemail.com>
Date:	Thu Jun 10 17:55:08 2010 +0200

    Updated Esperanto translation

 po/eo.po | 4097
 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 2739 insertions(+), 1358 deletions(-)

commit 0a8c8a26392654e2f384015190665b42f7e2f73f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 9 17:07:52 2010 +0200

    coding style fixes

 libempathy-gtk/empathy-contact-list-view.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 25ed66df1c96c44357d5d89d7feebbcd44fd4ceb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 9 16:42:21 2010 +0200

    empathy_string_replace_escaped: use gsize instead of gssize

    Avoid signed/unsigned comparaison in the for loop.

 libempathy-gtk/empathy-string-parser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 266835f4f2885c11109bd0777ed970241c52622e
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Jun 9 15:15:57 2010 +0200

    Strip the @server.com part of the contact ID for the live search
    matching.

 libempathy-gtk/empathy-contact-list-view.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

commit a7bf51e52c22b1b5c4d2d86ea8ead88adfe97f75
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Jun 8 23:47:27 2010 +0200

    Show/Hide the live search before refiltering

 libempathy-gtk/empathy-live-search.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 0cb1c94b09fa663adbabe8b8869a6747524a9b3e
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Jun 8 17:25:12 2010 +0200

    Use EmpathyLiveSearch in main window's contact list

 libempathy-gtk/empathy-contact-list-view.c | 342
 +++++++++++++++++++++++++----
 libempathy-gtk/empathy-contact-list-view.h |	3 +
 src/empathy-main-window.c		    |  14 +-
 3 files changed, 321 insertions(+), 38 deletions(-)

commit 4331e1a45060bac43c4083df8ca22f6be7361d92
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 9 10:06:26 2010 +0200

    factor out set_requirements

 libempathy-gtk/empathy-location-manager.c | 36
 +++++++++++++++++++------------
 1 file changed, 22 insertions(+), 14 deletions(-)

commit e74e1d64e45dba2677757dfff5adafabc611b13f
Author: Laurent Bigonville <bigon@bigon.be>
Date:	Tue Jun 8 23:38:26 2010 +0200

    Call geoclue_master_client_set_requirements before asking for
    position/address

    Be sure geoclue_master_client_set_requirements() is called in
    setup_geoclue()
    otherwise no provider will be selected (#621023)

 libempathy-gtk/empathy-location-manager.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit bf6242ed6cbd030902064c4d7d3460105ac986ab
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Jun 8 17:01:55 2010 +0200

    refactored how contacts are added to the store

    the advantage of insert_with_values is that only the row-added
    signal is emitted and not first row-added (while the row is empty)
    and then row-changed

 libempathy-gtk/empathy-contact-list-store.c | 26
 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

commit 03c709802eebcacdabe2c2738e166da9f4cb1f31
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 8 17:14:22 2010 +0200

    empathy_string_replace_escaped: remove '\r' (#620903)

 libempathy-gtk/empathy-string-parser.c | 16 +++++++++++++++-
 tests/empathy-parser-test.c		|  4 ++++
 2 files changed, 19 insertions(+), 1 deletion(-)

commit 8b8e9567d5a5d44bbb565013e1b7856f21ab1c5f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 8 16:46:05 2010 +0200

    empathy-parser-test: use empathy_string_replace_escaped

 tests/empathy-parser-test.c | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

commit ce6520bd5432a14f9d2689aae388747a9303c014
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 8 16:50:09 2010 +0200

    empathy-parser-test: stop as soon a test fails

    That's much easier to spot the test failing.

 tests/empathy-parser-test.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

commit e804261f77cf34814c56e947cd2667aff9d544cf
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Jun 8 17:15:03 2010 +0200

    Add unit test for the live search matching

 tests/.gitignore		  |  1 +
 tests/Makefile.am		  |  6 +++-
 tests/empathy-live-search-test.c | 75
 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 81 insertions(+), 1 deletion(-)

commit d4e8ed896d085e3ad76c07861a93c3366d34f340
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Jun 8 17:13:44 2010 +0200

    Add EmpathyLiveSearch widget

 libempathy-gtk/Makefile.am	      |   2 +
 libempathy-gtk/empathy-live-search.c | 559
 +++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-live-search.h |  71 +++++
 3 files changed, 632 insertions(+)

commit d1799870d3b8e8de188b6843d25ae20737376f14
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 7 22:03:37 2010 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 file 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(+)

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 file changed, 25 insertions(+)

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 file 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(+)

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 file 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 file changed, 1 insertion(+), 1 deletion(-)

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 file changed, 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 file 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 file 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 file 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 file 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 file 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 file changed, 1 insertion(+), 1 deletion(-)

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 file 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 file 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 file 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 file 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 file changed, 68 insertions(+), 1 deletion(-)

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 file 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 file 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 file 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 file changed, 1 insertion(+), 1 deletion(-)

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 file 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 file 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 file changed, 1 insertion(+), 1 deletion(-)

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 | 6123
 +++++++++++++++++++++++++-------------------------------------
 1 file changed, 2449 insertions(+), 3674 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 file 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 file 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 file 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 file 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 file 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 file changed, 1 insertion(+), 1 deletion(-)

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 deletion(-)

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 file 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(+)

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 file 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 file 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 file 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 file changed, 11 insertions(+), 1 deletion(-)

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 file 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 file 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, 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 file 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 file 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 file changed, 1 insertion(+), 1 deletion(-)

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(+)

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 file changed, 1 insertion(+), 1 deletion(-)

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 file changed, 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 file 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 file changed, 1 insertion(+), 1 deletion(-)

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 file 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 file changed, 4 insertions(+)

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 file 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 file 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 file 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(+)

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 file 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 file changed, 1 insertion(+), 1 deletion(-)

commit 71f34da10e1e25c8c861395beb97c4149f53a852
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 24 17:13:31 2010 +0200

    prepare 2.31.2 release

 NEWS	      | 26 ++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 28 insertions(+), 2 deletions(-)

commit 503296c1c8c3cb8bf4bde4e9325fc0a58aa91c70
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Mon May 24 15:36:45 2010 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 423
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 211 insertions(+), 212 deletions(-)

commit b9fba4f58c149afedd5a49ab9b44b95ac4ec4023
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 21 15:35:44 2010 +0200

    main_window_favorite_chatroom_join: skip not connected accounts
    (#606738)

    This fix a crash if the account is connecting.

 src/empathy-main-window.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 8125535e64eb29da486f642103eb3b220a280fb7
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri May 21 09:45:03 2010 +0200

    Remove empathy_link_button_new(), it's unused

 libempathy-gtk/empathy-ui-utils.c | 22 ----------------------
 libempathy-gtk/empathy-ui-utils.h |  2 --
 2 files changed, 24 deletions(-)

commit 64d4af1b917c249a571f8b608c1976fb065dca49
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri May 21 17:38:09 2010 +1000

    Change names of variables that shadow libc symbols

 libempathy-gtk/empathy-ui-utils.c | 4 ++--
 src/empathy-about-dialog.c	   | 4 ++--
 src/empathy-debug-window.c	   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

commit b1c4c4d2ed01fd1e87f1b3f815b5282fc63183c9
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Thu May 20 18:47:31 2010 +0200

    Updated Galician translations

 po/gl.po | 431
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 216 insertions(+), 215 deletions(-)

commit da99affb434f4bd1b61287ad812c3a5cfb297772
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 20 17:10:20 2010 +0200

    use avatar-default instead of the deprecated stock_person icon

 libempathy-gtk/empathy-avatar-chooser.c | 4 +++-
 libempathy-gtk/empathy-images.h	 | 1 +
 libempathy-gtk/empathy-theme-adium.c	 | 3 ++-
 src/empathy-call-window.c		 | 5 +++--
 src/empathy-call-window.ui		 | 2 +-
 src/empathy-event-manager.c		 | 4 ++--
 6 files changed, 12 insertions(+), 7 deletions(-)

commit bb43456be55d117ea23c65f3488c49a128dbcb62
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed May 19 19:24:15 2010 +0100

    Add defaults for VP8 encoding

 data/codec-preferences  | 4 ++++
 data/element-properties | 6 ++++++
 2 files changed, 10 insertions(+)

commit fe45d91be46ad4c05bdecf162b720ee7502c3f30
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed May 19 09:51:02 2010 +0200

    initialize a GError pointer

 libempathy/empathy-dispatcher.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 692f6f48a36f967beec4ff2509b6ea2747e6ad76
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 18 12:57:08 2010 +0200

    account-widget-irc: call empathy_account_widget_changed when the
    network dialog is destroyed

    This will allow user to save or discard changes he just done
    (#618883).

 libempathy-gtk/empathy-account-widget-irc.c | 1 +
 1 file changed, 1 insertion(+)

commit ab223625f15bae56e5b32b4798e87cf0e4b04944
Author: Rob Bradford <rob@linux.intel.com>
Date:	Tue May 18 11:09:45 2010 +0100

    Use library i18n method for source files included in shared library

    Since these files are included in the g-c-c shared module we must
    use the
    version of the _ macro that includes the domain.

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=618969

 src/empathy-account-assistant.c	 | 3 ++-
 src/empathy-accounts-common.c		 | 2 +-
 src/empathy-accounts-dialog.c		 | 2 +-
 src/empathy-auto-salut-account-helper.c | 4 +++-
 src/empathy-import-dialog.c		 | 2 +-
 src/empathy-import-mc4-accounts.c	 | 4 +++-
 src/empathy-import-widget.c		 | 4 +++-
 7 files changed, 14 insertions(+), 7 deletions(-)

commit ab73964666777182f59203b64b8d8309b996ced0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 18 11:33:55 2010 +0200

    add 22x22 version of the im-message icon

    Copied from
    http://git.gnome.org/browse/empathy/tree/data/scalable/message.xcf?id=c7010d43264dafca66ff65540c5d6666f1c66e2a

 data/icons/Makefile.am				|   1 +
 data/icons/hicolor_status_22x22_im-message.png | Bin 0 -> 654 bytes
 2 files changed, 1 insertion(+)

commit bf7c9ffb5e2cf5b9c2c00b15da260648db1eadb9
Author: ekspiulo <ekspiulo@gmail.com>
Date:	Tue May 18 11:21:07 2010 +0200

    Use 'A' as accelerator for the "Automatically connect on startup"
    option (#618753)

 src/empathy-preferences.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 693aa043f996448c2a0ffb241c3f5c26b596a625
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 17 15:59:57 2010 +0200

    fix irc-networks.xml lookup when EMPATHY_SRCDIR is defined

    The file is in libempathy/

 libempathy-gtk/empathy-account-widget-irc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ac12fee45e6a1f90189d675e1276c1da8588c887
Author: Brian Curtis <bcurtiswx@ubuntu.com>
Date:	Mon May 17 15:49:01 2010 +0200

    use port 8001 to connect to freenode irc (#618401)

 libempathy/irc-networks.xml | 1 +
 1 file changed, 1 insertion(+)

commit 51bb109841eee7c9099b938554bb80a3fa449c67
Author: Petr Kovar <pknbe@volny.cz>
Date:	Sun May 16 23:53:59 2010 +0200

    Update Czech translation by Ondrej Kopka

 po/cs.po | 600
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 309 insertions(+), 291 deletions(-)

commit d06fb95a0ed6337d4897e8f9b0538057dee8c053
Author: Robert McQueen <robert.mcqueen@collabora.co.uk>
Date:	Sat May 15 13:54:18 2010 +0100

    use user-extended-away status icon in favour of user-idle

    The freedesktop.org icon spec defines that the icon for the extended
    away
    status is called user-idle. However, some icon theme authors
    interpret this
    name as meaning mere idleness rather than the intended extended
    away semantic
    of away *and* idle, creating visual confusion (extended-away contacts
    appearing
    less away than contacts who are merely away). Some themes contain a
    non-standard user-extended-away icon with the correct semantic,
    so this patch
    makes Empathy use it in preference to user-idle if
    available. (Incidentally, at
    the moment Telepathy itself never actually shows remote contacts
    as idle.)

 libempathy-gtk/empathy-images.h   | 3 ++-
 libempathy-gtk/empathy-ui-utils.c | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

commit 3315956fb2248bcadec5042234b6e3fe869995f1
Author: Thomas Thurman <tthurman@gnome.org>
Date:	Wed May 12 18:41:16 2010 -0400

    Updated Shavian transliteration

 po/en@shaw.po | 2451
 +++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 1672 insertions(+), 779 deletions(-)

commit 81f64a90c243f460624ab1ddb2fb7954ac755d94
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat May 8 17:20:25 2010 +0100

    Don't try to start change the camera when there is no input

    Fixes bug #618167

 src/empathy-call-window.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

commit 0cd0f8435131a23d216ee6f0f1ea866803ba625e
Author: Rob Bradford <rob@linux.intel.com>
Date:	Thu May 6 15:17:57 2010 +0100

    ui-utils: Set translation domain on GtkBuilder UIs

    This is necessary for when GtkBuilder UIs are used outside of the
    main Empathy
    process.

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=617909

 libempathy-gtk/empathy-ui-utils.c | 1 +
 1 file changed, 1 insertion(+)

commit a56bf15a5dca91b8b7bce593c939ec6404ae37b6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat May 8 15:28:47 2010 +0100

    If there is no publish list, don't auto-add people to it

 libempathy/empathy-tp-contact-list.c | 3 +++
 1 file changed, 3 insertions(+)

commit 95f8148c1324e21bdec46ebe8c43037ffb6f2328
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Sat May 8 19:01:14 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 772
 ++++++++++++++++++++++++++++++-----------------------------
 po/zh_TW.po | 781
 ++++++++++++++++++++++++++++++------------------------------
 2 files changed, 787 insertions(+), 766 deletions(-)

commit 4b8ac78f0001e5dc9ca5cd2aaef11aeb890eea2f
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri May 7 16:47:08 2010 -0700

    Add missing tp-glib/util.h header to the AccountsPage.

 src/cc-empathy-accounts-page.c | 1 +
 1 file changed, 1 insertion(+)

commit aac9ffc5d26531278f64d12209db21cfb5d44dfe
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu May 6 14:56:37 2010 +0200

    Remove unused #include from empathy-map-view.c

 src/empathy-map-view.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit da872faea7e299cd6cffe2b121354fd50f9a9409
Author: Andika Triwidada <andika@gmail.com>
Date:	Wed May 5 12:54:35 2010 +0700

    Added Indonesian translation, cotributed by Taufiq Wirahman
    Added id to LINGUAS

 po/LINGUAS |	 1 +
 po/id.po   | 3248
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 3249 insertions(+)

commit 6b9ab475b3885f265d2d23f9f736575f9a176758
Author: Danishka Navin <danishka@gmail.com>
Date:	Wed May 5 11:17:28 2010 +0530

    updated si.po

 po/si.po | 1067
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 538 insertions(+), 529 deletions(-)

commit 364823fc277db364723b8954135727f2ee200e06
Author: Harold Schreckengost <mewshi@gmail.com>
Date:	Tue May 4 18:44:39 2010 +0200

    [help] Reordered the topics in index.page

 help/C/index.page | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit 04d48c09e75845e6ca99b591f1821452667ba770
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 4 18:11:54 2010 +0200

    release.py: update last_tag_patern

 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8e337f9b0c7af72c0dbc846d5581edfa69aa9874
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 4 18:11:38 2010 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bd4c5a56246c01d70b5d0bc5232bff8146235fad
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 4 16:48:31 2010 +0200

    prepare 2.31.1 release

 NEWS	      | 115
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |   4 +--
 2 files changed, 117 insertions(+), 2 deletions(-)

commit 4355545bd82b498b4ddb688b0ee250d72864e0b9
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue May 4 16:26:08 2010 +0100

    Set a target bitrate for theora

 data/element-properties | 3 +++
 1 file changed, 3 insertions(+)

commit bb4750da5ff85a61e8e9d4643fc63fbefe34a1c0
Merge: 046792f 61de8fb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 4 14:20:15 2010 +0200

    Merge branch 'timestamp-615976'

commit 61de8fbbea5d8d096aafcaa8c2b8093d0f349c87
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 4 13:55:19 2010 +0200

    define EMPATHY_DISPATCHER_CURRENT_TIME rather than using G_MAXINT64
    directly

 libempathy/empathy-dispatcher.h | 1 +
 src/empathy-chat-window.c	 | 2 +-
 src/empathy-event-manager.c	 | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

commit d3f2e5578d5ec8ad221c54f30e43909547ed9617
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 4 13:50:48 2010 +0200

    fix typo in comment

 src/empathy-chat-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit da5288f52ae5af2100caff3fe80dd981d2333d32
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue May 4 11:49:05 2010 +0100

    Set the user action time when the user approves stuff

 libempathy/empathy-dispatch-operation.c | 10 ++++++++++
 libempathy/empathy-dispatch-operation.h |  4 ++++
 src/empathy-event-manager.c		 | 19 +++++++++++++++++++
 3 files changed, 33 insertions(+)

commit 86579ed008210dcdd95b0e0f92ab1648b0fd9494
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue May 4 11:48:34 2010 +0100

    Consider G_MAXIN64 as a secred code for GDK_CURRENT_TIME

 src/empathy-chat-window.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

commit 05e3181257bc2664f462879467850d522450d48d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue May 4 11:30:01 2010 +0100

    Add a comment, fix indentation

 src/empathy-chat-window.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 046792f3fd596574132fe1d6217dd1877bffe743
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon May 3 23:10:05 2010 +0200

    Updated Spanish translation

 po/es.po | 374
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 185 insertions(+), 189 deletions(-)

commit 849dcc2fd36ec01352a3544c501cbbe5afa78d95
Author: Rob Bradford <rob@linux.intel.com>
Date:	Fri Apr 30 10:29:22 2010 +0100

    accounts-module: Remove call to textdomain ()

    This shouldn't be called in shared module.

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=617262

 src/empathy-accounts-module.c | 2 --
 1 file changed, 2 deletions(-)

commit 875d4b68230acf60788d7cc40342dbb931c718e4
Author: Frédéric Péters <fpeters@0d.be>
Date:	Sun May 2 17:54:11 2010 +0200

    Do not display "missing image" for contacts without avatar (#608103)

 libempathy-gtk/empathy-avatar-image.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 4716b7036a43d51b3e834c5d5a75c68e4fdb7a0a
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon May 3 08:32:14 2010 +0200

    Updated Spanish translation

 help/es/es.po | 64
 +++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 26 deletions(-)

commit 871a256b4eda943d1924bde6109f66197be060ca
Author: Harold Schreckengost <mewshi@gmail.com>
Date:	Sun May 2 18:20:49 2010 +0200

    [help] Fixed some typos

 help/C/create-account.page |  2 +-
 help/C/introduction.page   | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

commit 8aa208af6017b3b5217e783b7b6f865508a54a2e
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Sun May 2 15:30:11 2010 +0200

    Updated German translation

 po/de.po | 809
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 411 insertions(+), 398 deletions(-)

commit 97fc0a1dd8bd6bd293a09ce0dc34281068ccd620
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Apr 29 11:44:49 2010 +0200

    No need of a contact factory to set location

 libempathy-gtk/empathy-location-manager.c | 17 ++++++++++++-----
 libempathy/empathy-tp-contact-factory.c   | 29
 -----------------------------
 libempathy/empathy-tp-contact-factory.h   |  2 --
 3 files changed, 12 insertions(+), 36 deletions(-)

commit ae49c73f899c8156333813484c6429fde8ce811a
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sat May 1 19:16:41 2010 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 683
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 333 insertions(+), 350 deletions(-)

commit 1a20f4da20a8d6c6b8206f13a41e0d50e9f110a8
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat May 1 09:54:49 2010 +0200

    Updated Spanish translation

 help/es/es.po | 48 +++++++++---------------------------------------
 1 file changed, 9 insertions(+), 39 deletions(-)

commit 0120881bdf600b459b47fcdb19b9d85214a455a1
Author: Paul Cutler <pcutler@gnome.org>
Date:	Fri Apr 30 18:02:20 2010 -0500

    Fixed small grammar issues in intro

 help/C/introduction.page | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit bfe8b3d75fefa2f7d5fa1afa923536fbb67fe99f
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Thu Apr 29 12:13:20 2010 +0200

    Updated German doc translation

 help/de/de.po | 138
 +++++++++++++++++++++++++++++++---------------------------
 1 file changed, 75 insertions(+), 63 deletions(-)

commit 1d916b24fde90ff3f3f0941aefc079003ab7058b
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Thu Apr 29 12:08:33 2010 +0200

    Updated German doc translation

 help/de/de.po | 1101
 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 563 insertions(+), 538 deletions(-)

commit 9112b095a25846d795221d371232afd70934c13f
Merge: 6baa8e2 4354a8d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 28 16:32:07 2010 +0200

    Merge remote branch 'wjt/avatars-in-boxes-theme'

commit 4354a8d3b0f7eabcafe3a4a4a56cc12d4335e635
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Apr 28 12:34:58 2010 +0100

    Always show avatars in "Boxes" C theme

    Previously, avatars were only shown in the conversation window if they
    were shown in the contact list. It's not an obvious connection —
    I had
    to look at the source to figure it out — and also I'd argue that if
    anything, you're more likely to want avatars in the conversation
    window
    if you don't have them in the contact list, because you won't ever see
    them otherwise. (Or, that's what I found. :))

    I left the boolean in place, forcing it to TRUE, so that if someone
    feels like it they can add a tickybox to the Theme tab in Preferences.

 libempathy-gtk/empathy-theme-boxes.c | 37
 ++++--------------------------------
 1 file changed, 4 insertions(+), 33 deletions(-)

commit 6baa8e2c6789bde8337b61604aa3c15f80a9a080
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Wed Apr 28 07:49:41 2010 +0200

    Updated Spanish translation

 help/es/es.po | 349
 +++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 201 insertions(+), 148 deletions(-)

commit 857837c539058df84e398d482b24de3b71e2469a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 21 10:37:27 2010 +0200

    use TP_PROP_* constants

 libempathy/empathy-contact.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

commit 749997ed48b485fa703d4c417a4ee3224955fe6e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 21 10:33:25 2010 +0200

    use tp_value_array_unpack

 libempathy/empathy-contact.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 623c65fa0d997818b6c955c01eaf0783c24ccf14
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 16 11:08:14 2010 +0200

    tp-contact-factory: stop tracking capabilities

    This is done in empathy-contact using TpContact:capabilities now.

 libempathy/empathy-tp-contact-factory.c | 339
 --------------------------------
 1 file changed, 339 deletions(-)

commit a275161d3810fa1729fe0e48b451b07f819fad0f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 16 10:54:47 2010 +0200

    request the TP_CONTACT_FEATURE_CAPABILITIES feature

 libempathy/empathy-tp-contact-factory.c | 1 +
 1 file changed, 1 insertion(+)

commit d3155798adce20b724b1059ce2ece927950a42a7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 16 10:53:11 2010 +0200

    contact: get capabilities from TpContact if available (#579813)

 libempathy/empathy-contact.c | 82
 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

commit 595c95a0f9237cda825ad343d76ed24f13f77dcc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 16 10:11:51 2010 +0200

    bump tp-glib dep tp 0.11.3

    We need TpContact:capabilities

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8dc0c03b37ff1b6abaeb6b73b85eb0e9b3ab32af
Author: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date:	Tue Apr 27 09:38:45 2010 +0200

    tp-file: include netinet/in.h

    The storage size of 'addr' isn't known without netinet/in.h (#616859).

 libempathy/empathy-tp-file.c | 1 +
 1 file changed, 1 insertion(+)

commit 81083111d84e63d44f868bb656482e16d70859d9
Author: Shaun McCance <shaunm@gnome.org>
Date:	Mon Apr 26 09:54:32 2010 -0500

    [help] Minor language tweaks to updated content

 help/C/create-account.page |  7 +++----
 help/C/irc-join-pwd.page   | 10 ++++------
 2 files changed, 7 insertions(+), 10 deletions(-)

commit 36cfeec5f9c5746a4b79cc36e44a96777621eaa0
Author: Rob Bradford <rob@linux.intel.com>
Date:	Fri Apr 23 16:23:52 2010 +0100

    cc-empathy-accounts-panel: Enable gettext when the panel is created

    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=616660

 src/Makefile.am		 | 1 +
 src/cc-empathy-accounts-panel.c | 4 ++++
 2 files changed, 5 insertions(+)

commit ecf57786b46e333e17d0b11c3209b0f4b069f65d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 26 09:43:03 2010 +0200

    doc: properly spell 'freenode' (#616711)

 help/C/account-irc.page       | 2 +-
 help/C/irc-nick-password.page | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit be58587b93d42be5126a57bc15472f17876c8ff9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 26 09:42:14 2010 +0200

    irc-networks.xml: properly spell 'freenode' (#616711)

 libempathy/irc-networks.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 46338dc06aaa765efa00b98b497ca4a3dace5b5a
Merge: 6cc47b6 97dd1e1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 26 09:38:09 2010 +0200

    Merge remote branch 'sjoerd/dislay-leaks'

commit 6cc47b68ab83d4fc6db320313f40b89869444afa
Author: Claude Paroz <claude@2xlibre.net>
Date:	Mon Apr 26 08:40:41 2010 +0200

    Fix French translation (fixes bug #615719)

 po/fr.po | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit f079b5e6d31c8ec8f18bc5dac4f54c11b22eae69
Author: Francisco Diéguez <fran.dieguez@mabishu.com>
Date:	Sun Apr 25 16:54:29 2010 +0200

    Updated Galician translations

 po/gl.po | 58 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

commit dc016647861e791f1fe3374d34a580b0abb88d26
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Apr 25 15:30:21 2010 +0200

    Updated Italian help translation

 help/it/it.po | 296
 ++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 165 insertions(+), 131 deletions(-)

commit d84744422bb86a38d130259b6ef7ecd41b630ce4
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Apr 24 18:35:42 2010 +0100

    Only present and tab switch for new events

 src/empathy-chat-window.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

commit 9e34e6de9a81e02929cfc65d771a4da6eb348df6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Apr 24 18:06:48 2010 +0100

    No longer need to dig out the X time ourselves

 libempathy-gtk/empathy-ui-utils.c | 14 --------------
 1 file changed, 14 deletions(-)

commit 76332f0f9be6ffe77f7b756d00384e1c46c6cf9e
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Apr 24 18:05:44 2010 +0100

    Always at least show new chat windows even if not presenting them

 src/empathy-chat-window.c | 1 +
 1 file changed, 1 insertion(+)

commit c633b9b25a6bd729b8441382332e807d31331a93
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Apr 24 17:39:39 2010 +0100

    Pass the ChannelDispatcher timestamp onwards to window_present

 libempathy-gtk/empathy-ui-utils.c | 10 ++++++++--
 libempathy-gtk/empathy-ui-utils.h |  4 +++-
 src/empathy-chat-window.c	   |  9 ++++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

commit 14eab5e164f0078f7d0bfbd580b8ecd19e61d72f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 20 10:00:44 2010 +0200

    pass timestamp to empathy_chat_window_present_chat

 src/empathy-chat-window.c | 6 ++++--
 src/empathy-chat-window.h | 3 ++-
 src/empathy.c		   | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

commit cdd773bdb91f860c502864bf9d40df45f935aa7c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 19 17:28:52 2010 +0200

    dispatch-operation: add user-action-time property

 libempathy/empathy-dispatch-operation.c | 36
 +++++++++++++++++++++++++++++++--
 libempathy/empathy-dispatch-operation.h | 10 +++++++--
 libempathy/empathy-dispatcher.c	 | 12 ++++++-----
 3 files changed, 49 insertions(+), 9 deletions(-)

commit 221c1186f4b34b585767ae5b6f8e705410bf60dc
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Apr 24 17:23:02 2010 +0100

    add timestamp arg to empathy_dispatcher_create_channel

 libempathy/empathy-call-handler.c | 5 +++--
 libempathy/empathy-call-handler.h | 3 ++-
 libempathy/empathy-dispatcher.c   | 5 +++--
 libempathy/empathy-dispatcher.h   | 7 +++++--
 libempathy/empathy-ft-handler.c   | 3 ++-
 libempathy/empathy-tp-chat.c	   | 2 +-
 src/empathy-call-window.c	   | 3 ++-
 7 files changed, 18 insertions(+), 10 deletions(-)

commit a6748d5d5fd1f37cef6bf26a6256cd299a60a09c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Apr 24 17:19:50 2010 +0100

    add timestamp arg to empathy_dispatcher_join_muc

 libempathy-gtk/empathy-chat.c	   | 3 ++-
 libempathy/empathy-dispatcher.c   | 4 ++--
 libempathy/empathy-dispatcher.h   | 4 +++-
 src/empathy-chat-manager.c	   | 3 ++-
 src/empathy-main-window.c	   | 3 ++-
 src/empathy-new-chatroom-dialog.c | 3 ++-
 src/empathy.c			   | 6 ++++--
 7 files changed, 17 insertions(+), 9 deletions(-)

commit 54ae82bdf32156387e3d720656bd361a859b8db6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Apr 24 17:16:32 2010 +0100

    add timestamp arg to empathy_dispatcher_chat_with_contact(_id)

 libempathy-gtk/empathy-chat.c		     |	3 ++-
 libempathy-gtk/empathy-contact-list-view.c  |	3 ++-
 libempathy-gtk/empathy-contact-menu.c	     |	3 ++-
 libempathy-gtk/empathy-new-message-dialog.c |	3 ++-
 libempathy/empathy-dispatcher.c	     | 11 +++++++----
 libempathy/empathy-dispatcher.h	     |	8 ++++++--
 src/empathy-chat-manager.c		     |	2 +-
 src/empathy-chat-window.c		     |	2 +-
 tests/interactive/empetit.c		     |	3 ++-
 9 files changed, 25 insertions(+), 13 deletions(-)

commit 985a3c10e9fa40d2023f73df03d7709816bf0ecc
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Apr 24 16:58:49 2010 +0100

    dispatcher: add timestamp attribute to DispatcherRequestData

 libempathy/empathy-dispatcher.c | 14 ++++++++++----
 libempathy/empathy-dispatcher.h |  2 ++
 2 files changed, 12 insertions(+), 4 deletions(-)

commit 97dd1e1301eb2c0e2cfc25c4cda6cd9a8bc447d5
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Apr 24 16:13:50 2010 +0100

    Fix X display connection leak

    Use gdk_x11_get_server_time instead our own function for getting the
    X server time. This also fixes a leak of one X connection each time
    empathy_window_present is used without a timestamp.

 libempathy-gtk/empathy-ui-utils.c | 64
 ++++++++-------------------------------
 1 file changed, 12 insertions(+), 52 deletions(-)

commit 694d330bc1eda0fd5bfeb60496378e0843bfd1a6
Author: Ask H. Larsen <asklarsen@gmail.com>
Date:	Fri Apr 23 12:08:16 2010 +0200

    Updated Danish translation

 po/da.po | 204
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 102 insertions(+), 102 deletions(-)

commit 65a010f05fd89ec4b2e59e29f62effcf3637294a
Author: Xandru Armesto <xandru@softastur.org>
Date:	Fri Apr 23 07:10:13 2010 +0200

    Updated asturian translation

 po/ast.po | 2642
 ++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 1740 insertions(+), 902 deletions(-)

commit 205a25fa895114721c9ee4b853edb24e4457de53
Author: Petr Kovar <pknbe@volny.cz>
Date:	Fri Apr 23 00:15:47 2010 +0200

    Fix Czech translation

 po/cs.po | 266
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 130 insertions(+), 136 deletions(-)

commit 18caf0455ed4a811b503efcbe20491372dd66ae9
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:	Thu Apr 22 22:58:34 2010 +0200

    Updated Catalan (Valencian) translation

 po/ca@valencia.po | 5401
 +++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 4199 insertions(+), 1202 deletions(-)

commit 09fe4a9dd7e53a6986d262b2d3fd8c37c5364f5c
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Thu Apr 22 21:50:23 2010 +0200

    [help] Some updates to the help based on the new version

 help/C/account-irc.page    |  8 +++++---
 help/C/account-jabber.page |  2 +-
 help/C/add-account.page    |  3 ++-
 help/C/audio-call.page     |  4 +++-
 help/C/create-account.page | 17 ++++++++++++++++-
 help/C/irc-manage.page     |  6 ++++++
 help/C/remove-account.page |  3 ++-
 help/C/video-call.page     |  4 +++-
 8 files changed, 38 insertions(+), 9 deletions(-)

commit 8d15c5c7a837b1999799e2a6fca26dcd067de87c
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Thu Apr 22 21:26:23 2010 +0200

    Updated Italian translation

 po/it.po | 722
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 368 insertions(+), 354 deletions(-)

commit 1c4e9ef872af537436a0b8676256fb6c1f7e4198
Author: David Laban <david.laban@collabora.co.uk>
Date:	Tue Apr 20 15:51:30 2010 +0100

    disconnect empathy_call_window_bus_message() in dispose (#616301)

    Otherwise, we will crash because priv->handler is not there.

 src/empathy-call-window.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit f2684964e27ae50e40b9708aeb5f46562b25df29
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 20 14:27:52 2010 +0200

    iterate_on_channels: continue instead of returning if a channel
    doesn't match

    We are iterating on channels so we should check the remaining
    channels...

 libempathy/empathy-tp-contact-list.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 136e7561dbe34bafa1974ea6aa9aa5acceb00c61
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 20 11:47:26 2010 +0200

    fix show_offline gconf key (#616267)

    The key is /ui/show_offline not /contacts/show_offline

 libempathy-gtk/empathy-conf.h | 2 +-
 src/empathy-main-window.c     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 73b78f9eb4e187b5c347225e1ba178f7b5cad7c1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 19 17:32:07 2010 +0200

    remove empathy_dispatch_operation_new_with_wrapper

    It's not needed any more.

 libempathy/empathy-dispatch-operation.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

commit 86a3d7231f766c1c157ce84bf2444c396610a4fb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 19 17:12:50 2010 +0200

    dispatcher: don't check for Requests when fetching conn properties

 libempathy/empathy-dispatcher.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

commit 1f6d356c8b5d55afdc4a2383f3d56c458c56f53e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 19 17:10:36 2010 +0200

    dispatcher: stop supporting old style channel requesting

    Requests is mandatory now and we use the CD any way.

 libempathy/empathy-dispatcher.c | 157
 ++++------------------------------------
 1 file changed, 15 insertions(+), 142 deletions(-)

commit d7612089c859f73dbafae2498104cf9329b51e9b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 19 15:30:23 2010 +0200

    call cb with an error if dispatcher_chat_with_contact* fails

 libempathy/empathy-dispatcher.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit e35291afaace4f378dd34377cd976003735af47c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 19 15:11:59 2010 +0200

    dispatcher_connection_invalidated_cb: terminate pending requests

 libempathy/empathy-dispatcher.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

commit e29d5a655b02386c615bef866f73ffec052ceba3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 19 11:13:17 2010 +0200

    empathy_dispatcher_chat_with_contact: check if connection_data is NULL

    If the connection has been invalidated, it has been removed from
    priv->connections so we should check to avoid using a NULL pointer
    (#615970).

 libempathy/empathy-dispatcher.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 6f392c8adacd186ac9895d44f64543e59cef8925
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 19 12:57:09 2010 +0200

    user-extended-away has been renamed to user-idle.svg

 data/icons/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bf99966390e344166336746fd821561fc8064b7d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Apr 13 18:55:48 2010 +0200

    Move the spinner next to the expander label in new chatroom dialog

 src/empathy-new-chatroom-dialog.c  |  8 ++++----
 src/empathy-new-chatroom-dialog.ui | 31 +++++++++++++++++++------------
 2 files changed, 23 insertions(+), 16 deletions(-)

commit d8ee766305ccac5a7df6678e09938d95f63a2583
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Apr 13 16:27:12 2010 +0200

    Fix some build errors when GSEAL is enabled

 configure.ac				 |  8 ++++++--
 libempathy-gtk/empathy-chat-text-view.c | 33
 ++++++++++++++++++++++++++++-----
 2 files changed, 34 insertions(+), 7 deletions(-)

commit db806e6906469a1db633090b4a02298e4ebb4afd
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Apr 13 16:25:57 2010 +0200

    Remove check for GTK version now that we depend on 2.20

    Fixes bug #612185

 libempathy-gtk/empathy-string-parser.c | 8 --------
 1 file changed, 8 deletions(-)

commit cd798ab3c9d123c271245dea28682e3b85d3f9de
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Apr 13 16:12:25 2010 +0200

    Do not use deprecated GTK symbols

 libempathy-gtk/empathy-chat.c	       | 2 +-
 libempathy-gtk/empathy-geometry.c     | 2 +-
 libempathy-gtk/empathy-video-widget.c | 2 +-
 src/empathy-chat-window.c	       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

commit f9d98f63fe3eaf8b3871df629445343c59d6da76
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Apr 13 16:02:53 2010 +0200

    Replace EphySpinner by GtkSpinner

    Fixes bug #598446

 configure.ac			   |   2 +-
 src/Makefile.am		   |   1 -
 src/empathy-accounts-dialog.c	   |  12 +-
 src/empathy-main-window.c	   |  38 +-
 src/empathy-map-view.c		   |  17 +-
 src/empathy-new-chatroom-dialog.c |  17 +-
 src/ephy-spinner.c		   | 976
 --------------------------------------
 src/ephy-spinner.h		   |  69 ---
 8 files changed, 43 insertions(+), 1089 deletions(-)

commit 6a00d34eec703d3c3044e7471dd2c8e370e145c9
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Apr 13 15:42:38 2010 +0200

    Force maintainer mode if it is not a released empathy

 configure.ac | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

commit 1cb13f899d7d6a22db3e54a58f5dca2753da0637
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sun Apr 18 18:10:15 2010 +0100

    contact list store: order contacts by alias, ID, protocol then
    account ID (fixes #612864)

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-contact-list-store.c | 45
 +++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 3 deletions(-)

commit 60597b2520aebd3b13a5e576ec72d53febc15a5f
Author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
Date:	Sat Apr 17 03:31:04 2010 -0500

    Update the Tabs menu when a tab is moved.

    Previously when a tab was moved, the Tabs menu didn't update
    regarding the directions the tab could further be moved. If
    wrapping is off, a tab on the edge moved one way couldn't be
    moved back. Fixes #616012

 src/empathy-chat-window.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 72f5c71dcb33e72e9f7b35d3f5c673360443eaa1
Author: Olav Vitters <olav@vitters.nl>
Date:	Sun Apr 18 11:30:58 2010 +0200

    Fix doap file

 empathy.doap | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit bc89eb630dfeab4bd2e3ce7208824b4196381b33
Author: Francisco Diéguez <fran.dieguez@mabishu.com>
Date:	Sat Apr 17 16:11:31 2010 +0200

    Updated Galician translations

 po/gl.po | 717
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 365 insertions(+), 352 deletions(-)

commit 354b5e3105ad91938d62691b76a84149cdc658c2
Author: Mirsal Ennaime <mirsal.ennaime@gmail.com>
Date:	Mon Apr 12 18:31:02 2010 +0200

    src/empathy-chat-window.ui: Swap keyboard controls for moving tabs

    Closes: bgo#615164
    Keyboard shortcuts for moving tabs and for changing tabs work in
    the opposite direction.
    Users may expect them to work in the same direction and to be
    consistant with other GNOME applications.
    The mapping is now Ctrl + Shift + PageUp / PageDown for moving tabs
    left / right respectively, as it is in GNOME Terminal for instance.

 src/empathy-chat-window.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 751cec65da3d79d0714c1e898a791b67640dc0e2
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Fri Apr 16 08:45:21 2010 +0200

    Updated Spanish translation

 po/es.po | 518
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 267 insertions(+), 251 deletions(-)

commit 12687af8e7e87e5c31a15df4b686ac89b58941e3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 15 17:19:56 2010 +0200

    protocol-chooser: return NULL if for some reason we can't find the
    procol any more

    This could eventually happen if a CM claims to support a protocol
    in its
    manager file but actually don't. Should fix #61582

 libempathy-gtk/empathy-protocol-chooser.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit e90abd7be91524f1692054920692c83b47662b07
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 15 14:00:51 2010 +0200

    account-widget-generic: embed the advanced section in a
    GtkScrolledWindow (#615827)

 libempathy-gtk/empathy-account-widget-generic.ui | 36
 ++++++++++++++++--------
 1 file changed, 25 insertions(+), 11 deletions(-)

commit 3d1d52b0eb6b199a24f9173befee734cb086df3b
Merge: 438d9d9 a82dcc2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 15 10:20:37 2010 +0200

    Merge remote branch 'alsuren/fix-615734'

commit 438d9d9e9f1ede9624718ec3c5fd7a71f1907038
Author: vasudeven <agnihot3@gmail.com>
Date:	Thu Apr 15 13:34:55 2010 +0530

    updated Tamil translation

 po/ta.po | 738
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 368 insertions(+), 370 deletions(-)

commit 25696ab036340476c881762bf63171c125aa5458
Author: vasudeven <agnihot3@gmail.com>
Date:	Sun Mar 21 07:27:07 2010 +0530

    updated Tamil translation

 po/ta.po | 56 ++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 20 deletions(-)

commit f6245033315d3edef775a49360f2371e70ea8579
Author: vasudeven <agnihot3@gmail.com>
Date:	Wed Mar 17 19:46:04 2010 +0530

    updated Tamil translation

 po/ta.po | 476
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 252 insertions(+), 224 deletions(-)

commit f5dcf3055489334a6b3254c54b1cc6cf8b3d8e31
Author: Vladimir Melo <vmelo@gnome.org>
Date:	Wed Apr 14 20:59:39 2010 -0400

    Updated Brazilian Portuguese translation.

 po/pt_BR.po | 700
 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 355 insertions(+), 345 deletions(-)

commit a82dcc2fc27ff9e069c7046c3eaba8768aa6b06c
Author: David Laban <david.laban@collabora.co.uk>
Date:	Wed Apr 14 15:57:54 2010 +0100

    account-assistant: make impl_signal_apply() behave more like
    impl_signal_prepare()

    Fixes b.g.o#615734

    current_page only seems to be == PAGE_ENTER_CREATE the first time
    you visit the page.
    After that, it has been seen to be 4 or larger. impl_signal_prepare()
    currently checks
    for >=, so I'm copying that, and also dealing with refs in the
    same way.

    This patch probably probably actually hides a bug in how current_page
    is set, because
    I can't see how it should be set >= 4 because the enum only goes up
    to 3. I'll look into
    that now, but the patch is tested and works.

 src/empathy-account-assistant.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 5cc1da760b9ef6fd18861da30cbf6c28f5659410
Author: Yannig Marchegay <yannig@marchegay.org>
Date:	Wed Apr 14 13:21:18 2010 +0200

    Occitan translation update

 po/oc.po | 350
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 189 insertions(+), 161 deletions(-)

commit a5874f2717a5bf55bdc0a0831dd992cb59e4738d
Author: Yannig Marchegay <yannig@marchegay.org>
Date:	Wed Apr 14 02:20:51 2010 +0200

    Updated Occitan translation

 po/oc.po | 474
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 251 insertions(+), 223 deletions(-)

commit 9ce24420531516f4afc723e65d3de628261e5827
Author: Yannig Marchegay <yannig@marchegay.org>
Date:	Wed Apr 14 01:39:31 2010 +0200

    Updated Occitan translation

 po/oc.po | 3870
 +++++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 2704 insertions(+), 1166 deletions(-)

commit 8bb1dbf33289a7b07187e40258cd90990d90c715
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Apr 13 09:04:48 2010 +0200

    Take full width for the password and id entries for jabber account
    settings

 libempathy-gtk/empathy-account-widget-jabber.ui | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

commit da10da28e05b0846027f416786b2202cb251ef4d
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Mon Apr 12 16:01:00 2010 +0200

    Updated Arabic translation

 po/ar.po | 579
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 298 insertions(+), 281 deletions(-)

commit f55bbff68f75e6f4d60c5a37c0db8fcd16842f24
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 12 14:19:19 2010 +0200

    libempathy-gtk/empathy-search-bar.ui: remove invisible_char property;
    we want to use the default

 libempathy-gtk/empathy-search-bar.ui | 1 -
 1 file changed, 1 deletion(-)

commit bfd5bc0696c9cd69a0e91ebff7c4d42f571e3200
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 12 14:19:19 2010 +0200

    libempathy-gtk/empathy-contact-widget.ui: remove invisible_char
    property; we want to use the default

 libempathy-gtk/empathy-contact-widget.ui | 1 -
 1 file changed, 1 deletion(-)

commit 9419dbfd770eca81f3a1bc35542e8313ff217005
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 12 14:19:19 2010 +0200

    libempathy-gtk/empathy-contact-selector-dialog.ui: remove
    invisible_char property; we want to use the default

 libempathy-gtk/empathy-contact-selector-dialog.ui | 1 -
 1 file changed, 1 deletion(-)

commit da7208db24f379609c956cd7610a0d5958f49d6b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 12 14:19:19 2010 +0200

    libempathy-gtk/empathy-account-widget-yahoo.ui: remove invisible_char
    property; we want to use the default

 libempathy-gtk/empathy-account-widget-yahoo.ui | 8 --------
 1 file changed, 8 deletions(-)

commit 0a8de225f93e2ffaa2fa6911bd2132e7ae3d91d1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 12 14:19:19 2010 +0200

    libempathy-gtk/empathy-account-widget-sip.ui: remove invisible_char
    property; we want to use the default

 libempathy-gtk/empathy-account-widget-sip.ui | 9 ---------
 1 file changed, 9 deletions(-)

commit 3c3a67da628947d496693e88bafd7df1ad63e3a4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 12 14:19:19 2010 +0200

    libempathy-gtk/empathy-account-widget-msn.ui: remove invisible_char
    property; we want to use the default

 libempathy-gtk/empathy-account-widget-msn.ui | 6 ------
 1 file changed, 6 deletions(-)

commit 00a95939f6ccef38ba2f990a1cf14d30c22c0db2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 12 14:19:19 2010 +0200

    libempathy-gtk/empathy-account-widget-local-xmpp.ui: remove
    invisible_char property; we want to use the default

 libempathy-gtk/empathy-account-widget-local-xmpp.ui | 6 ------
 1 file changed, 6 deletions(-)

commit 312d0f3da73339acd57c95ae63083342055bec92
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 12 14:19:19 2010 +0200

    libempathy-gtk/empathy-account-widget-jabber.ui: remove invisible_char
    property; we want to use the default

 libempathy-gtk/empathy-account-widget-jabber.ui | 12 ------------
 1 file changed, 12 deletions(-)

commit dd31cfee25e8315b920552c9ed4fc812611c5ef5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 12 14:19:19 2010 +0200

    libempathy-gtk/empathy-account-widget-irc.ui: remove invisible_char
    property; we want to use the default

 libempathy-gtk/empathy-account-widget-irc.ui | 4 ----
 1 file changed, 4 deletions(-)

commit 5fe405d56c7559b6254fd442add272ff3a4d7271
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 12 14:19:19 2010 +0200

    libempathy-gtk/empathy-account-widget-icq.ui: remove invisible_char
    property; we want to use the default

 libempathy-gtk/empathy-account-widget-icq.ui | 7 -------
 1 file changed, 7 deletions(-)

commit 986c3ec062e8c9cee5c7d6ffb485d1ae4ff6369d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 12 14:19:19 2010 +0200

    libempathy-gtk/empathy-account-widget-groupwise.ui: remove
    invisible_char property; we want to use the default

 libempathy-gtk/empathy-account-widget-groupwise.ui | 6 ------
 1 file changed, 6 deletions(-)

commit db7249144136a0333a399de73327c04725327692
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 12 14:19:19 2010 +0200

    libempathy-gtk/empathy-account-widget-aim.ui: remove invisible_char
    property; we want to use the default

 libempathy-gtk/empathy-account-widget-aim.ui | 6 ------
 1 file changed, 6 deletions(-)

commit ecf8a0957d0af767dcb1527cd6719feb321831e1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 12 13:39:08 2010 +0200

    widget-sip: re-add the entry_password

    It has been accidentally removed in
    3479e2bafb401bd4cd7fc3332c52c3c3cbdc8ba0.

 libempathy-gtk/empathy-account-widget-sip.ui | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 84dda47991e04e1db9c68b589f310662dd03527a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 12 11:32:28 2010 +0200

    contact-widget: use empathy_account_chooser_get_account

 libempathy-gtk/empathy-contact-widget.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 5f90792f29e4a474e37dffc2deafcb3e8e310831
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 12 11:32:18 2010 +0200

    add empathy_account_chooser_get_account

 libempathy-gtk/empathy-account-chooser.c | 14 ++++++++++++++
 libempathy-gtk/empathy-account-chooser.h |  1 +
 2 files changed, 15 insertions(+)

commit 5531c75fbba792d0b6af2ba8e72fdced6e67ca74
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 9 14:02:04 2010 +0200

    change empathy_avatar_chooser_set_connection to
    empathy_avatar_chooser_set_account

    This is a first step in having a more account centric Empathy. This
    will be
    used once we'll have Protocol objects to set avatar on offline
    accounts.

 libempathy-gtk/empathy-avatar-chooser.c |  8 +++++---
 libempathy-gtk/empathy-avatar-chooser.h |  4 ++--
 libempathy-gtk/empathy-contact-widget.c | 10 +++++++---
 3 files changed, 14 insertions(+), 8 deletions(-)

commit 0fd156b0466bf42db93a58b1426386c84ad7e43b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 9 13:55:11 2010 +0200

    contact-widget: use empathy_avatar_chooser_set_connection

 libempathy-gtk/empathy-contact-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cd734c192518f165b8af0247e6dc8f7398e7d063
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 9 13:52:28 2010 +0200

    add empathy_avatar_chooser_set_connection

 libempathy-gtk/empathy-avatar-chooser.c | 7 +++++++
 libempathy-gtk/empathy-avatar-chooser.h | 3 +++
 2 files changed, 10 insertions(+)

commit d64ff737b787f2dd431d017739f1bf80a916554f
Author: Žygimantas Beručka <zygis@gnome.org>
Date:	Sat Apr 10 21:33:36 2010 +0300

    Updated Lithuanian translation

 po/lt.po | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

commit 3d0a7fef9d5a82348eb75ca94319aa1326b4f392
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 22 14:09:11 2010 +0100

    remove empathy_signal_connect_weak (#613583)

 libempathy/empathy-utils.c | 86
 ----------------------------------------------
 libempathy/empathy-utils.h |  5 ---
 2 files changed, 91 deletions(-)

commit 4a007b35a3aa479fdd937137efccc6a3607fe1f9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 22 15:40:22 2010 +0100

    libempathy-gtk/empathy-location-manager.c: use
    tp_g_signal_connect_object instead of empathy_signal_connect_weak

 libempathy-gtk/empathy-location-manager.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 4a764bfb273808bf08c2504cad952e1c4eb32a8d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 22 14:34:38 2010 +0100

    src/empathy-status-icon.c: use tp_g_signal_connect_object instead
    of empathy_signal_connect_weak

 src/empathy-status-icon.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 897411fdb8e01d8f6a675aa9a8c814119b3cd21d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 22 14:34:38 2010 +0100

    src/empathy-chat-window.c: use tp_g_signal_connect_object instead
    of empathy_signal_connect_weak

 src/empathy-chat-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b9e87dc7d7bf94ea2bd39dd675cf1806cf34bbe4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 22 14:34:38 2010 +0100

    src/empathy-call-window.c: use tp_g_signal_connect_object instead
    of empathy_signal_connect_weak

 src/empathy-call-window.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

commit e55ee9e0a53d9f51aac4a1c94af38bed1e048e72
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 22 14:34:38 2010 +0100

    src/empathy-accounts-dialog.c: use tp_g_signal_connect_object instead
    of empathy_signal_connect_weak

 src/empathy-accounts-dialog.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 697c8d943e237bb023a844b29c14019a566fa47b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 22 14:34:38 2010 +0100

    src/cc-empathy-accounts-page.c: use tp_g_signal_connect_object
    instead of empathy_signal_connect_weak

 src/cc-empathy-accounts-page.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 78d68b6e3d67526e86b2da55f5eeda2ac675a665
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 22 14:34:38 2010 +0100

    libempathy/empathy-idle.c: use tp_g_signal_connect_object instead
    of empathy_signal_connect_weak

 libempathy/empathy-idle.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b7b5032e10ebcb498909ffc06835f979f6346ef0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 22 14:34:38 2010 +0100

    libempathy/empathy-dispatcher.c: use tp_g_signal_connect_object
    instead of empathy_signal_connect_weak

 libempathy/empathy-dispatcher.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d63220c8c80096490cda7134a9641ad638936759
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 22 14:34:38 2010 +0100

    libempathy/empathy-contact-manager.c: use tp_g_signal_connect_object
    instead of empathy_signal_connect_weak

 libempathy/empathy-contact-manager.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit de38f68e54c1d92fb966f15a6f1df888a7dd5677
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 22 14:34:38 2010 +0100

    libempathy/empathy-account-settings.c: use tp_g_signal_connect_object
    instead of empathy_signal_connect_weak

 libempathy/empathy-account-settings.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b57f4e748f8f631d56786d0c4856ab74bdfc5ff5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 22 14:34:38 2010 +0100

    libempathy-gtk/empathy-presence-chooser.c: use
    tp_g_signal_connect_object instead of empathy_signal_connect_weak

 libempathy-gtk/empathy-presence-chooser.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

commit 999e2a590caa9b013621902ea000a3e16be54b32
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 22 14:34:38 2010 +0100

    libempathy-gtk/empathy-chat.c: use tp_g_signal_connect_object instead
    of empathy_signal_connect_weak

 libempathy-gtk/empathy-chat.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 300328f66a6556ba8b1e54bc679efa77d1defce6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 22 14:34:38 2010 +0100

    libempathy-gtk/empathy-account-widget.c: use
    tp_g_signal_connect_object instead of empathy_signal_connect_weak

 libempathy-gtk/empathy-account-widget.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e34f43e96600ce35768cd53540893c6a1bf96f2b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 22 14:34:38 2010 +0100

    libempathy-gtk/empathy-account-chooser.c: use
    tp_g_signal_connect_object instead of empathy_signal_connect_weak

 libempathy-gtk/empathy-account-chooser.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 6cdc040da5561c019ed87cc0a3c6ac10eb5b9223
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 9 10:01:45 2010 +0200

    account_assistant_apply_account_and_finish: explicitely ask to set
    the display name

    Checking if priv->current_widget_object is NULL or not isn't right
    because if
    we create a normal account before the Salut one, this pointer is
    not NULL and
    we rename the Salut account to the same name that the standard one.

    This patch adds an extra argument
    account_assistant_apply_account_and_finish
    saying if we should set a new display name or not. It's more clear
    and avoid
    to rely on side effects.

    Fixes bug #615058

 src/empathy-account-assistant.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

commit c8ed0aa2975b0e549e28c5e65d262e362a94c507
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 7 11:22:03 2010 +0200

    status-icon: don't approve event if notification bubble has been
    dismissed

    This code was broken anyway so we don't change the current behaviour.

 src/empathy-status-icon.c | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

commit 663b3a5cd91eb33a776094adb2c3bb8fad5a688d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 7 11:15:07 2010 +0200

    remove NotificationData

    We just need the window now.
    This has the nice side effect of fixing bug #615027.

 src/empathy-chat-window.c | 30 +++---------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

commit 023eba833dab183c7d31250649290acdd5eff32d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 7 11:08:45 2010 +0200

    chat-window: don't present chat if notification has been dismissed

    Clicking on a notification mean 'please go away'. If user wants to
    approve the
    action he has to click on the 'Reply' button.

    This code was broken anyway so we don't change the current behaviour.

 src/empathy-chat-window.c | 8 --------
 1 file changed, 8 deletions(-)

commit 1c41a18e144b49a0ed793d907db93a049a9d1354
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 8 15:50:48 2010 +0200

    look for the right key when checking if altitude is set

 libempathy/empathy-contact.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a55eb11a5775dd27041f4b6555d527aa67ba0069
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 8 15:18:43 2010 +0200

    use tp_asv_set_double

 libempathy/empathy-contact.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e303afdaf2cdfde7467cffd9b311074e205281f0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 8 14:05:18 2010 +0200

    geocode_cb: create a new location hash table instead of modifying
    the current one

    The location we receive from tp-glib should be considered as read-only
    as we
    don't have any guarantee about the way keys and values are freed.

    Should hopefully fix (#615135).

 libempathy/empathy-contact.c | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

commit 093c7b7b64293adb9e8e31d08e557320a47dc757
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 8 13:51:41 2010 +0200

    geocode_cb: don't update location if we didn't get the full position

 libempathy/empathy-contact.c | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

commit ee8b4ad4f89343de7e965a2414e1f746bd018b5a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 8 13:42:43 2010 +0200

    update_geocode: don't search for position if we already have lat
    or lon

    If contact publishes his position, it's fair to assume it publishes
    lat and
    lon.

 libempathy/empathy-contact.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit e793c8e563a0ab7f61c06852423571a21f2e3c05
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 8 13:34:38 2010 +0200

    don't start geocode search if the address is empty

 libempathy/empathy-contact.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 04ef027198384baacd47346f59c8a22c5c7d2e20
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 8 13:31:09 2010 +0200

    unref avatar and location in dispose rather than finalize

 libempathy/empathy-contact.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

commit 8ba8fc742b0f53228fb3e507cb99ddcb2e58120d
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Wed Apr 7 13:33:21 2010 +0200

    update last_timestamp with every message

    the last_timestamp is updated with every message in chat-text-view

 libempathy-gtk/empathy-chat-text-view.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 77fd33616f44a907342651a5a2d7e326ad5ccf55
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Wed Apr 7 13:19:08 2010 +0200

    group messages only if the delay is short

    messages from the same sender should not be grouped when the delay
    between two messages is too long (5min). fixes bug #604475

 libempathy-gtk/empathy-chat-text-view.c | 10 ++++++++++
 libempathy-gtk/empathy-chat-text-view.h | 25 +++++++++++++------------
 libempathy-gtk/empathy-theme-boxes.c	 | 15 +++++++++++----
 3 files changed, 34 insertions(+), 16 deletions(-)

commit c92e1b6631677972dbd25b1164d00ea983340fee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 7 10:02:01 2010 +0200

    factor out iteration on channels

 libempathy/empathy-tp-contact-list.c | 46
 ++++++++++++++----------------------
 1 file changed, 18 insertions(+), 28 deletions(-)

commit 2a6a15152ede1372f283b87fc9db0c50cec0955e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 30 15:37:27 2010 +0200

    Call EnsureChannel with an 'infinite' timeout so we don't have to
    catch list channels in NewChannels any more

 libempathy/empathy-tp-contact-list.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

commit 9cf5ae7ff275a02cd8560b252e4d36d16eb20617
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 30 15:17:48 2010 +0200

    pass properties hash table to tp_contact_list_group_add_channel

 libempathy/empathy-tp-contact-list.c | 38
 +++++++++---------------------------
 1 file changed, 9 insertions(+), 29 deletions(-)

commit 622345a7aac9595346fa6e19afaf84389573aa64
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 30 15:12:11 2010 +0200

    Use Requests.Channels property instead of the deprecated
    ListChannels()

 libempathy/empathy-tp-contact-list.c | 89
 +++++++++++++++++++++---------------
 1 file changed, 51 insertions(+), 38 deletions(-)

commit 005b8cbca64b9b6d71cea5dcab3b53ed89849e13
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 30 14:58:19 2010 +0200

    Use NewChannels signal to catch group channels (#614236)

 libempathy/empathy-tp-contact-list.c | 32
 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

commit 8a83a0fed90f5ad0061e1cf7aae573139f314206
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 30 14:48:30 2010 +0200

    new_channels_cb: don't early return if TargetHandleType !=
    TP_HANDLE_TYPE_LIST

 libempathy/empathy-tp-contact-list.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

commit 08a935de1ab0f4f63b8d2c7704d1ebf98b228a65
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 30 14:35:38 2010 +0200

    tp-contact-list: stop disconnecting NewChannels

    We are going to use it to get group channels as well.

 libempathy/empathy-tp-contact-list.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

commit d94b3a1b1ee4359882f0773f7e9c379ca05bd362
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 8 11:30:35 2010 +0200

    rename im-xmpp icon to im-jabber

    Empathy uses 'im-jabber'.

 data/icons/Makefile.am				|  12 +-
 data/icons/hicolor_apps_16x16_im-jabber.png	| Bin 0 -> 663 bytes
 data/icons/hicolor_apps_16x16_im-xmpp.png	| Bin 663 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-jabber.png	| Bin 0 -> 953 bytes
 data/icons/hicolor_apps_22x22_im-xmpp.png	| Bin 953 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-jabber.png	| Bin 0 -> 1013 bytes
 data/icons/hicolor_apps_24x24_im-xmpp.png	| Bin 1013 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-jabber.png	| Bin 0 -> 1492 bytes
 data/icons/hicolor_apps_32x32_im-xmpp.png	| Bin 1492 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-jabber.png	| Bin 0 -> 2413 bytes
 data/icons/hicolor_apps_48x48_im-xmpp.png	| Bin 2413 -> 0 bytes
 data/icons/hicolor_apps_scalable_im-jabber.svg | 632
 +++++++++++++++++++++++++
 data/icons/hicolor_apps_scalable_im-xmpp.svg	| 632
 -------------------------
 13 files changed, 638 insertions(+), 638 deletions(-)

commit 870ea8243da43be5386e699d2ba59135f8716e24
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 7 17:05:46 2010 +0200

    add the current date as suffix the the log name

 src/empathy-debug-window.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

commit 7906aeb81fc96b59fc3cb3b137dfdf50a87af099
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 7 15:35:30 2010 +0200

    set default name when saving logs (#615052)

 src/empathy-debug-window.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit fc107ee85585fe7a482f25a24fcce56494d23a3d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 7 15:35:15 2010 +0200

    factor out get_active_cm_name

 src/empathy-debug-window.c | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

commit b3abb681b83f36c6893a4a181e84aad29e1ceac2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Apr 7 15:04:35 2010 +0200

    debug-window: set temp directory as default folder when saving logs

 src/empathy-debug-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit 280cd635f51af340e13b81dde87241b75484b8f1
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:	Wed Apr 7 13:40:22 2010 +0100

    location_manager_dispose: chain up to the parent's dispose, not the
    parent's finalize

    This leads to crashes when other code is relying on weak reference
    notifications happening in the right order.

 libempathy-gtk/empathy-location-manager.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit ef99f724c790755478e66542bd0b25582d8307a7
Author: Theppitak Karoonboonyanan <thep@linux.thai.net>
Date:	Wed Apr 7 16:39:40 2010 +0700

    Updated Thai translation.

 po/th.po | 775
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 402 insertions(+), 373 deletions(-)

commit db1c4ea0a5d8f1e472d2f3ffd899b2f9effb7048
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 6 18:12:56 2010 +0200

    fix coding style

 libempathy/empathy-contact.c | 239
 +++++++++++++++++++++++--------------------
 1 file changed, 127 insertions(+), 112 deletions(-)

commit bb155a9fa3c8b940205ed787b730ccb5bedf14f6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 6 18:06:03 2010 +0200

    don't define update_geocode if geoclue is not enabled

 libempathy/empathy-contact.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 3607fded92aa603e2f6135144e16b109bfb900f8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 2 16:21:23 2010 +0200

    Get location update from TpContact (#599162)

 libempathy/empathy-contact.c | 23 +++++++++++++++++++++--
 libempathy/empathy-contact.h |  2 --
 2 files changed, 21 insertions(+), 4 deletions(-)

commit 76a5a6e1be3b8dd36421d95affc6516ca057b4dc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 2 13:12:29 2010 +0200

    contact-factory: stop managing locations

 libempathy/empathy-tp-contact-factory.c | 76
 ---------------------------------
 1 file changed, 76 deletions(-)

commit 561bd44882f577b3d1f9bb83d43fb58b8e448453
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 2 13:09:06 2010 +0200

    move tp_contact_factory_geocode to empathy-contact

 libempathy/empathy-contact.c		 | 156
 ++++++++++++++++++++++++++++++++
 libempathy/empathy-tp-contact-factory.c | 154
 -------------------------------
 2 files changed, 156 insertions(+), 154 deletions(-)

commit 94b8c8eca8f68adf89dcb800f31bab9c4690d74b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 2 13:01:50 2010 +0200

    pass Location feature to Contacts

 libempathy/empathy-tp-contact-factory.c | 1 +
 1 file changed, 1 insertion(+)

commit ab5053cba9d2cea3610916eff7aa88b4f219a22c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 1 12:16:36 2010 +0200

    remove empathy_tp_contact_factory_set_avatar

    This is not needed any more.

 libempathy/empathy-tp-contact-factory.c | 61
 ---------------------------------
 libempathy/empathy-tp-contact-factory.h |  4 ---
 2 files changed, 65 deletions(-)

commit a75c2aa330535747d736c53cf69f0601fbf0f7b3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 1 12:16:10 2010 +0200

    Use Account.Avatar to set our own avatar (#613043)

 libempathy-gtk/empathy-contact-widget.c | 32
 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

commit 73b0aa1cb6fed931065e566646c004985cf433ad
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Apr 6 10:52:05 2010 +0200

    bump tp-glib dep to 0.11.1

    We need it for tp_account_set_avatar_async()

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 47ce1857ea9407e99cb553ce0837e0905eada822
Author: Javier Jardón <jjardon@gnome.org>
Date:	Tue Apr 6 11:36:26 2010 +0200

    Fix .desktop file

    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=614944

 data/empathy-accounts.desktop.in.in | 1 -
 1 file changed, 1 deletion(-)

commit 43c870b31162d6b2fcf0a846c3121f402021b249
Author: Ask H. Larsen <asklarsen@gmail.com>
Date:	Mon Apr 5 23:01:52 2010 +0200

    Updated Danish translation

 po/da.po | 603
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 305 insertions(+), 298 deletions(-)

commit 8d08c9ce5b488f09be435db11fbf26bf33e8ea00
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 5 15:59:47 2010 +0200

    add tests/interactive/test-empathy-account-chooser.c

 tests/interactive/.gitignore			  |  1 +
 tests/interactive/Makefile.am			  |  4 ++-
 tests/interactive/test-empathy-account-chooser.c | 45
 ++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)

commit 6637bf59307f771e97481141f6dfa60f246dcd86
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 5 15:58:41 2010 +0200

    account-chooser: check if account is NULL before trying to use it
    (#614874)

 libempathy-gtk/empathy-account-chooser.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 8a541771a297fd390b5dae66340ea3fa2c1f4933
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 31 17:14:24 2010 +0200

    Use Account.Nickname to set our own alias (#613044)

 libempathy-gtk/empathy-contact-widget.c | 38
 +++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

commit 86ebf6f6a255295675ab717045471e01096057cc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Apr 5 13:37:04 2010 +0200

    bump tp-glib dep to 0.11.0

    This will be needed to set avatar and nickname properties on Account.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 342669c9505ebd80c264187338a58e5f129e0d26
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Apr 2 16:45:46 2010 +0200

    map-view: no need to create a model

 src/empathy-map-view.c | 58
 +++++++++++++++-----------------------------------
 1 file changed, 17 insertions(+), 41 deletions(-)

commit b87be7d45c4696125bc815b67bdb5433bc655d95
Author: Reşat SABIQ <tilde.birlik@gmail.com>
Date:	Sat Apr 3 14:19:49 2010 -0500

    Minor update for Crimean Tatar/Turkish translation

 po/crh.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 24d8a05c4b6a428add69fb51bfc45fee904c9616
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Mar 4 10:37:10 2010 +0100

    Hide the expander if the topic is not ellipsed

    Fixes bug #533638

 libempathy-gtk/empathy-chat.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 0df6dd7c16289086ed9e3744edbe6db109219da9
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Mar 4 00:47:17 2010 +0100

    Make topic label expand and wrap nicely

 libempathy-gtk/empathy-chat.c	| 93
 +++++++++++++++++++++++++++++++++++++++++-
 libempathy-gtk/empathy-chat.ui | 12 ++----
 2 files changed, 95 insertions(+), 10 deletions(-)

commit be561a17e0f0045128bca90226635be54165af44
Author: Jordi Serratosa <jordis.lists@gmail.com>
Date:	Thu Apr 1 21:44:48 2010 +0200

    Fixes to Catalan translation

 po/ca.po | 574
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 291 insertions(+), 283 deletions(-)

commit 1d042fed20a17c94c546538af93e911c77a7f33e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 1 17:08:17 2010 +0200

    empathy-cell-renderer-text: don't display status if it's NULL
    (#614562)

 libempathy-gtk/empathy-cell-renderer-text.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 9d03a4333a55b07e137f3be5460e7550ec8bedb5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 1 13:48:02 2010 +0200

    empathy-idle: stop using tp_dbus_daemon_dup

    It has been deprecated.

 libempathy/empathy-idle.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit bc2eade547a04c1324b3cfc563353d9b06dff1aa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Apr 1 13:47:38 2010 +0200

    empathy-handler: stop using tp_get_bus

    It has been deprecated.

 libempathy/empathy-handler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 01b686e3cd62fb958c36e9f6ad534bac1cc81c5f
Merge: a078336 c36eb1e
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Apr 1 20:01:03 2010 +1100

    Merge branch 'no-ungrouped-in-mucs-614524'

commit a0783366242adb859dcdaedfe188edd7bd49911b
Author: Nicolò Chieffo <84yelo3@gmail.com>
Date:	Thu Apr 1 10:37:28 2010 +0200

    Support append hint in notifications (#607446)

 src/empathy-chat-window.c | 58
 ++++++++++++++++++++++++++++++++---------------
 src/empathy-status-icon.c | 53
 +++++++++++++++++++++++++++++++------------
 2 files changed, 79 insertions(+), 32 deletions(-)

commit af87c9c1f8da17892f8694299df79bf50ec7663d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 31 17:49:08 2010 +0200

    empathy_call_window_sink_added_cb: unref the pad

 src/empathy-call-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 35b83837a6c7cba0cf8ae91d8f1194c8f87160f9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 31 15:08:34 2010 +0200

    unref liveadder when disposing

 src/empathy-call-window.c | 4 ++++
 1 file changed, 4 insertions(+)

commit cd6761777585a8defa934562abd4a35bc7e816e9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 31 15:07:45 2010 +0200

    don't recreate a video preview or update the window if we're about
    to destroy it

 src/empathy-call-window.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

commit c34f2be5d70d9a45b953b4f9b0f09b9b1ee4a231
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 31 13:00:33 2010 +0200

    don't leak the fullscreen window

 src/empathy-call-window.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 99bda309f129b94db112c52dfa674cd7355f4374
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 31 12:59:46 2010 +0200

    init_contact_avatar_with_size: don't leak the pixbuf

 src/empathy-call-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit 764a5d2e90664a02b0d8e33dd5ce41a388de87b9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 31 12:25:19 2010 +0200

    stop using gst_bin_add_many and gst_element_link_many

 src/empathy-call-window.c | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

commit feab20693e67e58701010c2a4613d8345d7fedcf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 31 12:11:42 2010 +0200

    use tp_g_signal_connect_object so we don't have to disconnect
    empathy_call_window_video_stream_changed_cb manually

 src/empathy-call-window.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 961ccc0473138e4dd195b7af6e80d0a43ae2463f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 17 14:21:32 2010 +0000

    Fix race when restarting a call

    Fix a race between user hitting the 'redial' button and the pipeline
    being
    ready.

 src/empathy-call-window.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

commit 1f5ff2f5609f1915d20140f0446a47088c3d6fb5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 17 14:07:30 2010 +0000

    Allow to use the video preview when the call has been terminated
    (#602937)

 src/empathy-call-window.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

commit d8b0cb43c5cfc1bae067ce513a440327e181171e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 17 13:37:44 2010 +0000

    empathy_call_window_restart_call: there is no reason to show_all
    all the hbox

    Widgets should already be properly displayed.

 src/empathy-call-window.c | 2 --
 1 file changed, 2 deletions(-)

commit 1cf5eb7686a37fad462ecfc1ddd0afb9f59afaf1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 17 12:57:05 2010 +0000

    empathy_call_window_reset_pipeline: start the new pipeline right away

    This will allow us to display the video preview before the call
    is restarted.

 src/empathy-call-window.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

commit 93fdc771e51c327cad047b39a9be05f66d58fa21
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 17 11:35:39 2010 +0000

    Actually turn off the camera when preview/sending is disabled

    There is no point to let the camera on if we are not using it.

    Also split empathy_call_window_setup_video_preview() to
    create_video_preview()
    and add_video_preview_to_pipeline().

 src/empathy-call-window.c | 80
 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 54 insertions(+), 26 deletions(-)

commit ef79ba8294dbb740f38c3d15d732b7a8933264a7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 3 11:57:35 2009 +0000

    stop disabling the video-preview button when call is disconnected
    (#602937)

 src/empathy-call-window.c | 12 ------------
 1 file changed, 12 deletions(-)

commit f33b0e66fb97038aed56563b6e7754c37bd8625b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 2 18:10:30 2009 +0000

    recreate the pipeline as soon we destroyed the old one

    This will allow us to be able to display the preview after the call
    has been
    terminated. It's easier and more robust to recreate a new pipeline
    than
    reusing the old one.

 src/empathy-call-window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 11bae3305bed3b10b5b1288ef589bff12d758bf2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 2 18:06:33 2009 +0000

    split create_video_output_widget out of create_pipeline

 src/empathy-call-window.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit cbf57d8ce685d1c959f4c207157dd327155d636f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 2 17:39:22 2009 +0000

    recycle the audio input gst element

 src/empathy-call-window.c | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

commit cd06c1463688a3684fc17d474bf227f1a984b665
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 2 17:32:35 2009 +0000

    recycle the video input gst element

    There is no point to recreate it for each call.

 src/empathy-call-window.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

commit bfa6966c0a677b418a14b5864326b175d926036c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 2 17:17:07 2009 +0000

    rename initialize_output_elements to create_video_output_widget

 src/empathy-call-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 688514d4d5cca5ad23d6b9c54506252089ac5b49
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 2 17:15:27 2009 +0000

    recycle the audio output gst element

    There is no point to create a new one for each call.

 src/empathy-call-window.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit e274163d0c1adafbf989096a3637d57867e19e23
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 2 16:58:30 2009 +0000

    destroy the video_output widget when the call is disconnected

    There is no point to destroy it when redialing to recreate it
    immediately
    after.

 src/empathy-call-window.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 3942c3d23f6ad8b1e476e6c32bec7e936fca89d4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 2 16:04:17 2009 +0000

    No need to recreate GTK+ widgets when recreating the pipeline

    Only recreate the GStreamer elements for now.

 src/empathy-call-window.c | 59
 ++++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 29 deletions(-)

commit 80facfc7c3f11f3b75ab0c3cebbcc0a9801040d9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 2 15:27:03 2009 +0000

    call-window: factor out create_pipeline

 src/empathy-call-window.c | 64
 ++++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 31 deletions(-)

commit c36eb1e8df169da9691acf730a9cd1996aed5d76
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Apr 1 14:28:37 2010 +1100

    Make 'Favourite' only appear when EMPATHY_CONTACT_FEATURE_FAVOURITE
    set

 libempathy-gtk/empathy-contact-menu.c | 11 +++++++----
 libempathy-gtk/empathy-contact-menu.h |  3 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)

commit 149dcf3ffc77f9ce8e94aed00f0ee11505f640d3
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Apr 1 14:28:15 2010 +1100

    Falgs -> Flags

 libempathy-gtk/empathy-contact-list-view.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2516bd84d5ed687f352746ce8e67676868680c15
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Apr 1 11:54:18 2010 +1100

    contact-list-store: don't put contacts in 'Ungrouped' when show-groups
    = False

    Further, set show-groups = False for the contact list in EmpathyChat

 libempathy-gtk/empathy-chat.c		     |	6 +++-
 libempathy-gtk/empathy-contact-list-store.c | 50
 ++++++++++++++++++-----------
 2 files changed, 37 insertions(+), 19 deletions(-)

commit ecee0a557957c60cd78bf04e0f9f3a5dacc7892e
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Wed Mar 31 21:11:08 2010 +0200

    Updated Italian translation

 po/it.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 19efaa3785a92464fe4057fef0a840917d67f395
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 31 11:03:40 2010 +0200

    compare_separator_and_groups: fix check if a is a bottom group

 libempathy-gtk/empathy-contact-list-store.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 77f461b861167a019ced300be89b169e787bb9ad
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 31 10:49:01 2010 +0200

    Always use fake groups (#614375)

    There is no reason to use them when favourite contacts are enabled
    any more.

 libempathy-gtk/empathy-contact-list-store.c | 23 -----------------------
 1 file changed, 23 deletions(-)

commit fb4dd0e753b8ff6fa717096edcacab43ee2a56f2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 14 12:38:11 2009 +0000

    empathy_presence_get_default_message: return a string for
    TP_CONNECTION_PRESENCE_TYPE_UNKNOWN

 libempathy/empathy-utils.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit e3f34384ba4de2c35bd120f75df167fe2d2d242a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 14 12:31:29 2009 +0000

    fix indentation

 libempathy/empathy-tp-contact-list.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 71c849737edc440b6f98f4d61a428ab7b0673e70
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 14 12:27:35 2009 +0000

    tp-contact-list: add members of 'stored' as members

    This allow us to display contacts with subscriptio='none' (#539765).

 libempathy/empathy-tp-contact-list.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

commit f898afc1d4e7bfae0ee8e3c5e6b7a0a0427fd6e3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 14 12:25:34 2009 +0000

    got_added_members_cb: check if contact is already in the hash before
    adding it

    empathy_tp_contact_factory_get_from_handles is async, so if the
    contact has
    already been added when it returns the contact objects there is no
    point to
    try to re-add it twice.

 libempathy/empathy-tp-contact-list.c | 3 +++
 1 file changed, 3 insertions(+)

commit 821a05da92cf42b7d3971500575375e3f0308866
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 14 12:16:23 2009 +0000

    add members of 'publish' as members of the TpContactList

 libempathy/empathy-tp-contact-list.c | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

commit 9a36a55fb92e7f0a0c92a9c04c4d02215af7a4b6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 14 11:56:34 2009 +0000

    pass handles to add_to_members instead of contact objects

 libempathy/empathy-tp-contact-list.c | 75
 ++++++++++++++++++++----------------
 1 file changed, 42 insertions(+), 33 deletions(-)

commit 43258f57de15a215d15ecf373a6d55547733f5fd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 11 16:35:25 2009 +0100

    auto-accept pending call in
    tp_contact_list_subscribe_group_members_changed_cb

    So we don't have to wait to have the contact and can group them to
    do only on
    AddMembers call.

 libempathy/empathy-tp-contact-list.c | 33
 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

commit a610fd969c0aa9483ef4d575d65ed989bf114cbc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 14 11:16:31 2009 +0000

    factor out remove_from_member_if_needed

    Call it that way because we are about to add some check before
    removing a
    contact from members.

 libempathy/empathy-tp-contact-list.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

commit 8957694686f44c0bad99b2fc4995f198795597ef
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 11 16:09:09 2009 +0100

    factor out add_to_members

 libempathy/empathy-tp-contact-list.c | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

commit e403541be39943e428b65f8615352eddea7cece8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 11 14:57:16 2009 +0100

    empathy_icon_name_for_presence: use 'pending' icon if presence
    is unknown

 libempathy-gtk/empathy-ui-utils.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit fc421b1d10d92c197910a8b7ea6fa4ddccb092f4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 10 15:54:13 2009 +0000

    rename EMPATHY_IMAGE_UNKNOWN to EMPATHY_IMAGE_PENDING

 libempathy-gtk/empathy-images.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 86a7a528d7b54abf6335a023b3afc5099b3eea4f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 10 14:30:04 2009 +0000

    tp-contact-list: Improve hash table descriptions

 libempathy/empathy-contact-manager.c |  2 ++
 libempathy/empathy-tp-contact-list.c | 21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

commit 5d6902cc05f95832e06afd88b6d581be68c1a79f
Merge: 62a0fee d8dd568
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Mar 30 14:48:31 2010 +0100

    Merge branch 'undo-close-tab'

commit 62a0fee5ae1749f38e476ba67c0e1f2804ad5ee7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 30 14:26:09 2010 +0200

    fix #endif comment

 src/empathy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 597aeabb364bc04027209e0a37fae53a7d4208b8
Author: Christian Kampka <chris@emerge-life.de>
Date:	Tue Mar 30 14:23:49 2010 +0200

    add gconf key to disable auto-away (#613603)

 data/empathy.schemas.in       | 14 ++++++++++++++
 libempathy-gtk/empathy-conf.h |  1 +
 src/empathy.c		       | 25 +++++++++++++++++++++++--
 3 files changed, 38 insertions(+), 2 deletions(-)

commit 28e12b663411f992d373bc3a96167b0146760889
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 30 13:43:25 2010 +0200

    properly cast GArray content

 libempathy/empathy-tp-call.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0513f2521e2bed5451053d8dcf2fbe89f97f41c5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 26 16:14:56 2010 +0100

    map-view: display position of contacts added after the map has been
    created (#614012)

 src/empathy-map-view.c | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

commit 02ee7fc17b51f8ee5be937f09f8ab01d21735548
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 26 16:08:32 2010 +0100

    factor out contact_added

 src/empathy-map-view.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

commit 7e082683ab606d1521fbbaa7dffd75efe7395e20
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 26 15:59:53 2010 +0100

    map_view_update_contact_position: don't call contact_has_location
    twice

 src/empathy-map-view.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit b3967cf0f91e74052af81df1b6a7a93b02be3df4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 26 15:56:47 2010 +0100

    Always connect "notify::location" on contact

    Now contact position will be displayed even if they didn't have a
    postion when
    the map has been created (#614012).

 src/empathy-map-view.c | 3 ---
 1 file changed, 3 deletions(-)

commit 496a7fb5c48fbc3eb5756d9a63e81bd1d8146d1c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 26 15:56:09 2010 +0100

    map_view_contacts_foreach: no need to create the marker any more

    map_view_update_contact_position will do it if needed.

 src/empathy-map-view.c | 1 -
 1 file changed, 1 deletion(-)

commit 14819097275f60f97d9960dee3f031a11223ca47
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 26 15:55:57 2010 +0100

    map_view_update_contact_position: create marker if needed

 src/empathy-map-view.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 7dc3996067e1b97aaf49a478dcb7a72265fecba3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 26 15:53:55 2010 +0100

    factor out contact_has_location

 src/empathy-map-view.c | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

commit 2d93063b49b5a05272d37f7de10bd5970480a2cf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 26 15:25:50 2010 +0100

    factor out create_marker

 src/empathy-map-view.c | 47
 ++++++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 19 deletions(-)

commit 2c8bdd816922be9da7db6f57ac87ed027aad1266
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 26 14:47:18 2010 +0100

    rename map_view_marker_update_position to
    map_view_update_contact_position and pass a contact rather than
    a marker

 src/empathy-map-view.c | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

commit 00d66d902bbec612e612275191f917ac9f56b028
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 26 14:40:16 2010 +0100

    map-view: add a mapping from EmpathyContact to ChamplainMarker

 src/empathy-map-view.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 6101ab6b84beb8a9e19527a2416e0e6fcd6438c1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 30 13:30:41 2010 +0200

    empathy_tp_call_leave: allocate the array on the stack

 libempathy/empathy-tp-call.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

commit 174a1b4a20753f7467c1c78f5163660a233fb36b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 22 18:04:16 2010 +0000

    empathy_call_handler_stop_call: use empathy_tp_call_leave rather
    than empathy_tp_call_close

    This will gracefully hang up calls (#610477).

 libempathy/empathy-call-handler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c95542fa3be19a5350bec6b631d97a4734e9f27d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 22 18:03:32 2010 +0000

    add empathy_tp_call_leave

 libempathy/empathy-tp-call.c | 46
 ++++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-tp-call.h |  2 ++
 2 files changed, 48 insertions(+)

commit 09c8c6dee9aaf2ff5e19bc78c3c59d5013098990
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 22 18:00:59 2010 +0000

    call-window: call empathy_call_handler_stop_call when closing a call

    This will allow us to properly terminate the call.

 src/empathy-call-window.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 3b1c4d6e3e072373bc7b55db8dbe8c50796bf7fd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 22 17:33:36 2010 +0000

    empathy_call_window_disconnected: remove call to
    empathy_call_window_reset_pipeline out of variable declarations

 src/empathy-call-window.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 3479e2bafb401bd4cd7fc3332c52c3c3cbdc8ba0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 16 16:05:53 2010 +0100

    remove forget button

 libempathy-gtk/empathy-account-widget-aim.ui	    | 35 ++----------
 libempathy-gtk/empathy-account-widget-groupwise.ui | 63
 ++++++----------------
 libempathy-gtk/empathy-account-widget-icq.ui	    | 35 ++----------
 libempathy-gtk/empathy-account-widget-jabber.ui    | 26 +--------
 libempathy-gtk/empathy-account-widget-msn.ui	    | 63
 ++++++----------------
 libempathy-gtk/empathy-account-widget-private.h    |  1 -
 libempathy-gtk/empathy-account-widget-sip.c	    |  1 -
 libempathy-gtk/empathy-account-widget-sip.ui	    | 40 --------------
 libempathy-gtk/empathy-account-widget-yahoo.ui     | 35 ++----------
 libempathy-gtk/empathy-account-widget.c	    | 60
 ---------------------
 10 files changed, 51 insertions(+), 308 deletions(-)

commit 34667825a2bf494807755558b33e58512db5caee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 16 16:34:58 2010 +0100

    Add clear icon in entry containing password (#608104)

 libempathy-gtk/empathy-account-widget.c | 42
 +++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

commit ea4d3e69aa11e413f83e418ea640cab31ac07269
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 30 12:39:38 2010 +0200

    2.31 here we go

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6e47476b2258d7c5f7bd268ee0edb93431f69acc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 25 13:00:38 2010 +0100

    Rename empathy status icons to fit standard icon name

    This give us fallback to Empathy icons for free if they are not
    implemented in
    the theme.

 data/icons/Makefile.am				    |  60 ++++-----
 .../hicolor_status_16x16_empathy-available.png     | Bin 685 -> 0 bytes
 data/icons/hicolor_status_16x16_empathy-away.png   | Bin 536 -> 0 bytes
 data/icons/hicolor_status_16x16_empathy-busy.png   | Bin 618 -> 0 bytes
 .../hicolor_status_16x16_empathy-extended-away.png | Bin 752 -> 0 bytes
 .../icons/hicolor_status_16x16_empathy-offline.png | Bin 405 -> 0 bytes
 data/icons/hicolor_status_16x16_user-available.png | Bin 0 -> 685 bytes
 data/icons/hicolor_status_16x16_user-away.png	    | Bin 0 -> 536 bytes
 data/icons/hicolor_status_16x16_user-busy.png	    | Bin 0 -> 618 bytes
 data/icons/hicolor_status_16x16_user-idle.png	    | Bin 0 -> 752 bytes
 data/icons/hicolor_status_16x16_user-offline.png   | Bin 0 -> 405 bytes
 .../hicolor_status_22x22_empathy-available.png     | Bin 967 -> 0 bytes
 data/icons/hicolor_status_22x22_empathy-away.png   | Bin 740 -> 0 bytes
 data/icons/hicolor_status_22x22_empathy-busy.png   | Bin 1041 -> 0 bytes
 .../hicolor_status_22x22_empathy-extended-away.png | Bin 1115 -> 0 bytes
 .../icons/hicolor_status_22x22_empathy-offline.png | Bin 571 -> 0 bytes
 data/icons/hicolor_status_22x22_user-available.png | Bin 0 -> 967 bytes
 data/icons/hicolor_status_22x22_user-away.png	    | Bin 0 -> 740 bytes
 data/icons/hicolor_status_22x22_user-busy.png	    | Bin 0 -> 1041 bytes
 data/icons/hicolor_status_22x22_user-idle.png	    | Bin 0 -> 1115 bytes
 data/icons/hicolor_status_22x22_user-offline.png   | Bin 0 -> 571 bytes
 .../hicolor_status_24x24_empathy-available.png     | Bin 1075 -> 0 bytes
 data/icons/hicolor_status_24x24_empathy-away.png   | Bin 825 -> 0 bytes
 data/icons/hicolor_status_24x24_empathy-busy.png   | Bin 1081 -> 0 bytes
 .../hicolor_status_24x24_empathy-extended-away.png | Bin 1199 -> 0 bytes
 .../icons/hicolor_status_24x24_empathy-offline.png | Bin 570 -> 0 bytes
 data/icons/hicolor_status_24x24_user-available.png | Bin 0 -> 1075 bytes
 data/icons/hicolor_status_24x24_user-away.png	    | Bin 0 -> 825 bytes
 data/icons/hicolor_status_24x24_user-busy.png	    | Bin 0 -> 1081 bytes
 data/icons/hicolor_status_24x24_user-idle.png	    | Bin 0 -> 1199 bytes
 data/icons/hicolor_status_24x24_user-offline.png   | Bin 0 -> 570 bytes
 .../hicolor_status_32x32_empathy-available.png     | Bin 1433 -> 0 bytes
 data/icons/hicolor_status_32x32_empathy-away.png   | Bin 1057 -> 0 bytes
 data/icons/hicolor_status_32x32_empathy-busy.png   | Bin 1218 -> 0 bytes
 .../hicolor_status_32x32_empathy-extended-away.png | Bin 1612 -> 0 bytes
 .../icons/hicolor_status_32x32_empathy-offline.png | Bin 724 -> 0 bytes
 data/icons/hicolor_status_32x32_user-available.png | Bin 0 -> 1433 bytes
 data/icons/hicolor_status_32x32_user-away.png	    | Bin 0 -> 1057 bytes
 data/icons/hicolor_status_32x32_user-busy.png	    | Bin 0 -> 1218 bytes
 data/icons/hicolor_status_32x32_user-idle.png	    | Bin 0 -> 1612 bytes
 data/icons/hicolor_status_32x32_user-offline.png   | Bin 0 -> 724 bytes
 .../hicolor_status_48x48_empathy-available.png     | Bin 2211 -> 0 bytes
 data/icons/hicolor_status_48x48_empathy-away.png   | Bin 1606 -> 0 bytes
 data/icons/hicolor_status_48x48_empathy-busy.png   | Bin 1848 -> 0 bytes
 .../hicolor_status_48x48_empathy-extended-away.png | Bin 2622 -> 0 bytes
 .../icons/hicolor_status_48x48_empathy-offline.png | Bin 1062 -> 0 bytes
 data/icons/hicolor_status_48x48_user-available.png | Bin 0 -> 2211 bytes
 data/icons/hicolor_status_48x48_user-away.png	    | Bin 0 -> 1606 bytes
 data/icons/hicolor_status_48x48_user-busy.png	    | Bin 0 -> 1848 bytes
 data/icons/hicolor_status_48x48_user-idle.png	    | Bin 0 -> 2622 bytes
 data/icons/hicolor_status_48x48_user-offline.png   | Bin 0 -> 1062 bytes
 .../hicolor_status_scalable_empathy-available.svg  | 104 ---------------
 .../icons/hicolor_status_scalable_empathy-away.svg |  93 --------------
 .../icons/hicolor_status_scalable_empathy-busy.svg | 140
 ---------------------
 ...color_status_scalable_empathy-extended-away.svg | 120
 ------------------
 .../hicolor_status_scalable_empathy-offline.svg    | 101 ---------------
 .../hicolor_status_scalable_user-available.svg     | 104 +++++++++++++++
 data/icons/hicolor_status_scalable_user-away.svg   |  93 ++++++++++++++
 data/icons/hicolor_status_scalable_user-busy.svg   | 140
 +++++++++++++++++++++
 data/icons/hicolor_status_scalable_user-idle.svg   | 120
 ++++++++++++++++++
 .../icons/hicolor_status_scalable_user-offline.svg | 101 +++++++++++++++
 61 files changed, 588 insertions(+), 588 deletions(-)

commit 242c8fda4fbf2bb57ebc3502eed4628cf81203ff
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 2 12:16:52 2010 +0100

    use the 'user-invisible' icon if implemented

 libempathy-gtk/empathy-images.h   | 4 +++-
 libempathy-gtk/empathy-ui-utils.c | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

commit f2f2a999c6459d0ac17771075fe3e6a4f4e68515
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 2 11:58:36 2010 +0100

    Use standard names for status icons (#602420)

 libempathy-gtk/empathy-images.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 940d0e9778828657a6ffbcadd35a8a84d706ac70
Merge: e7f7047 fff7680
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Mar 30 21:37:25 2010 +1100

    Merge branch 'people-nearby-fake-group-613558'

commit fff76809babe6a154cd548e9bc3aa43199e9eda9
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Mar 30 21:35:17 2010 +1100

    Remove People Nearby from sorted groups list

 libempathy-gtk/empathy-contact-list-store.c | 1 -
 1 file changed, 1 deletion(-)

commit e7f70475f0533c310995a9dc3b2f5ee1eb58b618
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Mar 26 20:15:58 2010 +0000

    CellRendererText: Use G_PARAM_STATIC_STRINGS

    This patch also changes the name of the "is group" property to use a
    hyphen (which is the canonical form) rather than an underscore,
    because
    the combination of the underscore and G_PARAM_STATIC_STRINGS makes
    GObject blow up:

      GLib-GObject-CRITICAL **: g_param_spec_internal: assertion
      `!(flags &
      G_PARAM_STATIC_NAME) || is_canonical (name)' failed

 libempathy-gtk/empathy-cell-renderer-text.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit 802baeadd5caf73b813462791b29d052a7134cd6
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Mar 26 20:09:45 2010 +0000

    Show status messages in compact view (#614052)

    Previously, when the contact list was in compact mode your contacts'
    status mesasges were not shown. With this patch, status messages are
    shown in the space to the right of the contact's name, in the same
    small, grey font as in the expanded view.

    Only custom messages are shown; fallback strings like _("Available")
    are
    redundant and made the list way too hard to read, so are not shown.

    This patch does show that most of my contacts are too boring to have
    status messages...

 libempathy-gtk/empathy-cell-renderer-text.c | 59
 +++++++++++++++++++++--------
 libempathy-gtk/empathy-contact-list-store.c | 12 ++++--
 libempathy-gtk/empathy-contact-list-store.h |	3 +-
 libempathy-gtk/empathy-contact-list-view.c  | 16 +++-----
 4 files changed, 60 insertions(+), 30 deletions(-)

commit e0535b86ebb7a0d5908597ecb82a7754c31a6076
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Mar 26 19:43:03 2010 +0000

    Use a temporary variable for param specs

 libempathy-gtk/empathy-cell-renderer-text.c | 45
 +++++++++++------------------
 1 file changed, 17 insertions(+), 28 deletions(-)

commit c821e81c68acc1daba78899c9c844f916ea2c99e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 24 11:49:18 2010 +0100

    disconnect NewChannels signal once we got all the list channels we
    care about

 libempathy/empathy-tp-contact-list.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

commit 7ba0f1046ada332737644ecbe1892911b81d6aef
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 24 11:38:39 2010 +0100

    tp-contact-list: watch for list channels announced in NewChannels
    signals

    If ensuring list channels fails (for example because the server is
    slow and the
    D-Bus call timeouts before CM fetches the roster), we have a chance
    to get them
    later. (#612949)

 libempathy/empathy-tp-contact-list.c | 47
 ++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

commit 4893de0412531c4cb0eb846cffc9fec8031d5a1d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 24 11:32:00 2010 +0100

    allow got_list_channel to be called more than once for the same
    channel

    Also allow to pass other list channel such as 'deny' for example.

 libempathy/empathy-tp-contact-list.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 944632a01dd934666170583b87e970f32211f810
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 24 11:22:53 2010 +0100

    factor out got_list_channel

 libempathy/empathy-tp-contact-list.c | 46
 +++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 19 deletions(-)

commit 6af5464b86a9e013ffc36b5243055c5c0d8495f9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 30 10:18:10 2010 +0200

    don't leak the classes list

 src/empathy-new-chatroom-dialog.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

commit c9c1f10a1684e62f9e628974206578bb2f79ace3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 26 12:53:07 2010 +0100

    Unsensitive roomlist expander if roomlist is not supported (#614002)

 src/empathy-new-chatroom-dialog.c | 2 ++
 1 file changed, 2 insertions(+)

commit 5c93e102dc5ac20a01a805e1f8bfc5d1986fedb0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 26 12:52:47 2010 +0100

    Don't request roomlist channel if not supported (#614002)

 src/empathy-new-chatroom-dialog.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

commit 57cbda8c31761ad2cc577c6139199ef57a9e2976
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 26 12:40:54 2010 +0100

    empathy_dispatcher_find_requestable_channel_classes: allow handle_type
    being 0

    This allows us to check if channel type with HandleType=None are
    supported
    (for example roomlist channels).

 libempathy/empathy-dispatcher.c | 2 --
 1 file changed, 2 deletions(-)

commit d03f537aabceae14cd953bd45d5e13768e6aa2d6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 30 11:01:02 2010 +0200

    release.py: releases are now tagged EMPATHY_2_30*

 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a7fc06448ff7adffc32be7ee3b4d8232cf3ef5e9
Author: Aaron Brown <aaron.j.brown@hotmail.com>
Date:	Tue Mar 30 15:33:15 2010 +1000

    Sets sensitivity of Previous/Next Tab menu items based on
    gtk-keynav-wrap-around and tab position (#613382)

 src/empathy-chat-window.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit 9026fc61824658c231847e1f023be6fd1eb673e4
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Mon Mar 29 22:12:35 2010 +0200

    Updated Arabic translation

 po/ar.po | 246
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 121 insertions(+), 125 deletions(-)

commit eb7c5a3ae3ba35ee8e0c5952e2f4b17fc803f59c
Author: Peteris Krisjanis <pecisk@gmail.com>
Date:	Mon Mar 29 22:39:41 2010 +0300

    Updated Latvian translation.

 po/lv.po | 809
 ++++++++++++++++++++++++++-------------------------------------
 1 file changed, 335 insertions(+), 474 deletions(-)

commit f5600abfa444ec8ccbca5ffb11c3e649e16f338e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 18 15:50:32 2010 +0100

    chat: use empathy_signal_connect_weak to connect signal on the buffer

    The textview can't survive once the EmpathyChat has been destroyed
    but if for
    some reason its buffer it's still alive, firing this signal leads
    to a crash
    (#612363).

 libempathy-gtk/empathy-chat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e3c822bf3b14a6a769353a35a137a0b0e183ac15
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 18 15:45:32 2010 +0100

    chat_input_text_buffer_changed_cb: 'priv' is useless

 libempathy-gtk/empathy-chat.c | 3 ---
 1 file changed, 3 deletions(-)

commit b8cc8019e97c48c259c04e100443f2ce526a821c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 19 15:34:25 2010 +0100

    coding style fixes

 src/empathy-call-window.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

commit 66d8d07abade96645aca23d9c0dd526a9ed5481c
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Sat Mar 6 19:18:27 2010 -0500

    Check for errors when linking the video source into a call (#612020)

 src/empathy-call-window.c | 67
 ++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 60 insertions(+), 7 deletions(-)

commit 1711b4dffc6c39c948ac441aec2bd81a99c411ff
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Sat Mar 6 18:37:36 2010 -0500

    Verify that the video source could be linked into the pipeline

 src/empathy-call-window.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit ee584165872d730f364018915231e014fb0ca37f
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Sat Mar 6 18:36:30 2010 -0500

    Return error when the audio source can not be started

 src/empathy-call-window.c | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

commit bcbcb511ce03d1bfde0096830f28bfa21c703569
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Sat Mar 6 18:31:16 2010 -0500

    telepathy-glib sucks, need to send stream error from the main thread

 libempathy/empathy-call-handler.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

commit b860ad599ff905a735ca00f4f256c43411c09a85
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Sat Mar 6 18:27:56 2010 -0500

    Return a telepathy error if the source can't be added

 libempathy/empathy-call-handler.c | 11 ++++++++---
 src/empathy-call-window.c	   |  3 ++-
 2 files changed, 10 insertions(+), 4 deletions(-)

commit fc5be44316c04af418f131f6be0d9e4d9dda2e39
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Sat Mar 6 18:22:49 2010 -0500

    Remove false comment

    The sink-added callback is called in response to a dbus call, so
    from the main
    thread. It is the src-addec callback that comes from a streaming
    thread.

 src/empathy-call-window.c | 1 -
 1 file changed, 1 deletion(-)

commit 92be33483073c5475567d60b442c8c130dd1babb
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Sat Mar 6 18:21:24 2010 -0500

    Add audio conversion filter to receive pipeline

 src/empathy-call-window.c | 44
 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

commit 49542a8ff607d5b1b60d14d3d34ebef943362778
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Sat Mar 6 18:11:13 2010 -0500

    Add fakesink to srcpad if not real sink could be linked

 src/empathy-call-window.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

commit 6f2876c2a265e4dbd968113795ec222dec86d008
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Sat Mar 6 16:59:51 2010 -0500

    Emit error when failing to link audio pad

 src/empathy-call-window.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

commit 4a4a8f89579147d1e712d5da257c83786f86439f
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Sat Mar 6 17:02:32 2010 -0500

    Send stream error when the src pad can't be linked

 libempathy/empathy-call-handler.c | 11 ++++++++---
 src/empathy-call-window.c	   |  4 +++-
 2 files changed, 11 insertions(+), 4 deletions(-)

commit c7662e15ba7412146c8d9d76c9c3b4c3cffb4089
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Sat Mar 6 16:59:20 2010 -0500

    Handle errors from audio sink

 src/empathy-call-window.c | 58
 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 53 insertions(+), 5 deletions(-)

commit c3d5568a05b65ec18ff7ff6012be6420340bebab
Author: Andrew Gorcester <andrewsg@u.washington.edu>
Date:	Mon Mar 29 17:33:32 2010 +0200

    new-chatroom-dialog: filter CM not implementing groupchat

 src/empathy-new-chatroom-dialog.c | 46
 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

commit c3057afe0d6ffddc4b7223fab51751473dfb1a1f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 26 11:58:50 2010 +0100

    tp-chat: update self user if it has been renamed (#613930)

 libempathy/empathy-tp-chat.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 2fcfa45d056d18a8eec36b3da755d82e7dcf7484
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 29 17:03:14 2010 +0200

    start dev of next release

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4717ca516f32e001c8888de619ea6624ef074dae
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Sun Mar 28 12:28:31 2010 +0200

    fallback to JID if alias is empty

    if the alias is empty, contact_get_name should fallback to the jabber
    id. this fixes bug #614162

 libempathy/empathy-contact.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit d0c2fc30cafbc9e1f2066bff136f0d19074268ee
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Mon Mar 29 09:48:48 2010 +0200

    fix alignment of the label in error-infobar

    this left aligns the label which contains the error message in the
    infobar. fixes bug #609823

 src/empathy-main-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 0f13fb09fbc611dcf24df92a1e4a59b039abb094
Author: Simos Xenitellis <simos@gnome.org>
Date:	Mon Mar 29 16:46:08 2010 +0300

    Updated Greek translation for empathy documentation

 help/el/el.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7de31d272fb3aa732befbe56aa277ca3532e4e08
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 29 14:43:12 2010 +0200

    prepare 2.30 release

 NEWS	      | 71
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  6 ++---
 2 files changed, 74 insertions(+), 3 deletions(-)

commit 947c4ba4558c7cb156956ac63000b03bddbb0c9c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 29 14:28:01 2010 +0200

    release.py: add release date in NEWS

 release.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit f468e66e0f35532de89ffd072828ea26d496090d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 29 14:16:25 2010 +0200

    release.py: draw a 'line' of the length of the title

 release.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 8a7843d2d137f6bd8ca336b79226b7e7a9d79bfa
Author: Aron Xu <aronxu@gnome.org>
Date:	Mon Mar 29 18:36:47 2010 +0800

    Update Simplified Chinese translation.

 po/zh_CN.po | 1686
 ++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 960 insertions(+), 726 deletions(-)

commit 6bd3bfe6aa288d05f1aaf4cdbbf2f9ac574a3121
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 23 12:20:29 2010 +0100

    remove empathy_log_store_empathy_get_dir

 libempathy/empathy-log-store-empathy.c | 7 -------
 libempathy/empathy-log-store-empathy.h | 3 ---
 2 files changed, 10 deletions(-)

commit 025b934de806230bb79a51b0758cc8b87f9f4e67
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 23 12:16:01 2010 +0100

    ship a copy of empathy_log_store_empathy_get_dir in
    migrate-butterfly-logs.c

    Code duplication isn't cool but that allows us to migrate logs when
    Empathy is
    built with TPL as well (#613437).

    The other option was to always build log-store-empathy but it's
    pulling
    log-store and even the log-manager. I think adding this small
    duplication is
    ok as that's temporary code that will be dropped during the 2.31
    cycle.

 src/empathy-migrate-butterfly-logs.c | 37
 +++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

commit cfc400ded9d7fa0ef6ab7649b0b34f7a048a93bb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 29 12:04:46 2010 +0200

    coding style fixes

 libempathy-gtk/empathy-ui-utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b1dbf73f50b304032c9caf49fee748b8eca81f72
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 29 11:02:12 2010 +0200

    fix menu_tabs_right accelerator

 src/empathy-chat-window.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b0f4c4e1287dd2c2d4cc58b819cc467e46316600
Merge: fd2a444 4bbaced
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 29 10:48:19 2010 +0200

    Merge commit 'treitter/bug-613272'

commit fd2a444d4a91e4e9f1863f0d476be4012fced75a
Author: Aaron Brown <aaron.j.brown@hotmail.com>
Date:	Mon Mar 29 10:29:17 2010 +0200

    Adds Ctrl+Shift+PgUp/PgDn accelerator key to move current tab
    left/right (#614155)

 src/empathy-chat-window.ui | 2 ++
 1 file changed, 2 insertions(+)

commit 39d1d503097a0c4a0999629377f1dc7cf57eea7b
Author: Branko Kokanović <branko.kokanovic@gmail.com>
Date:	Sun Mar 28 23:58:16 2010 +0200

    Updated Serbian translations

 po/sr.po	| 516
 ++++++++++++++++++++++++++++++---------------------------
 po/sr@latin.po | 516
 ++++++++++++++++++++++++++++++---------------------------
 2 files changed, 548 insertions(+), 484 deletions(-)

commit 09198a0c8857f7143410911f82689964cc839149
Author: Petr Kovar <pknbe@volny.cz>
Date:	Sun Mar 28 19:52:56 2010 +0200

    Update Czech translation

 po/cs.po | 49 ++++++++++++++++++++++---------------------------
 1 file changed, 22 insertions(+), 27 deletions(-)

commit ee3304194ccf4a241bddc79caf3666c16b9a5cbb
Author: Jamil Ahmed <itsjamil@gmail.com>
Date:	Sun Mar 28 15:29:54 2010 +0600

    Updated Bengali translation

 po/bn.po | 280
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 132 insertions(+), 148 deletions(-)

commit a8e9eb71a1a35a04e9d5191c69615a07321ccc32
Author: Ask H. Larsen <asklarsen@gmail.com>
Date:	Sat Mar 27 23:52:19 2010 +0100

    Updated Danish translation

 po/da.po | 2490
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 1528 insertions(+), 962 deletions(-)

commit e42a38b11705aed85f420bb2f780cdb0793327b0
Author: Simos Xenitellis <simos@gnome.org>
Date:	Sat Mar 27 17:39:22 2010 +0200

    Updated Greek translation

 po/el.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 051cc1c0efa6dde4fec6350f830a60df22f42a0d
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Sat Mar 27 15:30:50 2010 +0100

    Updated Basque language

 po/eu.po | 54 +++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 15 deletions(-)

commit bfc1579d2720ed173d29c43f8ba5b626dfbf8944
Author: Jamil Ahmed <itsjamil@gmail.com>
Date:	Sat Mar 27 19:27:19 2010 +0600

    Updated Bengali translation

 po/bn.po | 1379
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 741 insertions(+), 638 deletions(-)

commit b36357c57875a6e2da423a366d25c3990e1ac82c
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Sat Mar 27 20:40:48 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 74
 +++++++++++++++++++++++++++++--------------------------------
 po/zh_TW.po | 74
 +++++++++++++++++++++++++++++--------------------------------
 2 files changed, 70 insertions(+), 78 deletions(-)

commit 2d0fb06ce2c802aa06b73b0f15b43e68acb7b15e
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sat Mar 27 11:16:53 2010 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 490
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 250 insertions(+), 240 deletions(-)

commit d177a45c881341397702c92b28c72d1e5182684e
Author: Jiri Eischmann <jiri@eischmann.cz>
Date:	Sat Mar 27 10:02:17 2010 +0100

    Update Czech translation

 po/cs.po | 2316
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 1385 insertions(+), 931 deletions(-)

commit eb6de3a66f0c945999561a4e2ee989fc7763d985
Author: Žygimantas Beručka <zygis@gnome.org>
Date:	Fri Mar 26 23:33:15 2010 +0200

    Updated Lithuanian translation

 po/lt.po | 2445
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1578 insertions(+), 867 deletions(-)

commit 7dc6046d1986a74212b4d4789caa4a47d54ff722
Author: Marios Zindilis <m.zindilis@dmajor.org>
Date:	Fri Mar 26 23:17:04 2010 +0200

    Updated Greek translation for empathy documentation

 help/el/el.po | 185
 +++++++++++++++-------------------------------------------
 1 file changed, 47 insertions(+), 138 deletions(-)

commit 4bbaced7e7674a62c4c071d483e5d9f9058a6603
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Mar 26 10:57:43 2010 -0700

    Set a default empathy-accounts window size such that any scrolled
    Advanced section will be somewhat-reasonably-sized.

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 782d06ab7f1f053bc3153315735838ea8d4c95e7
Author: Sîmurg56 <simurg56@gmail.com>
Date:	Fri Mar 26 15:41:32 2010 +0100

    Updated Kurdish translation

 po/ku.po | 2120
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 1275 insertions(+), 845 deletions(-)

commit c726208ae4c6b6e6c8eda8b56e05c7c089037141
Author: Sîmurg56 <simurg56@gmail.com>
Date:	Fri Mar 26 15:39:18 2010 +0100

    Updated Kurdish translation

 po/ku.po | 2065
 +++++++++++++++++++++-----------------------------------------
 1 file changed, 703 insertions(+), 1362 deletions(-)

commit 38204039e3b2199d9837af3decc2992f78a20d1c
Author: Maxim V. Dziumanenko <dziumanenko@gmail.com>
Date:	Fri Mar 26 13:31:55 2010 +0200

    Updated Ukrainian translation

 po/uk.po | 430
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 225 insertions(+), 205 deletions(-)

commit 863a1653f6c7d262e36ac6cf9c257df6161509ba
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Fri Mar 26 11:13:35 2010 +0100

    Updated German doc translation

 help/de/de.po | 822
 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 420 insertions(+), 402 deletions(-)

commit a450bc13ff9de2546bc450e41479a531e85ea647
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 25 11:36:55 2010 +0100

    Add a comment explaining translator how to make the Facebook string
    look nice

 libempathy-gtk/empathy-account-widget-jabber.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 600a7af1f885043ff82c3ea09ae5d3b44b1446a3
Author: Timo Jyrinki <timo.jyrinki@iki.fi>
Date:	Fri Mar 26 11:45:50 2010 +0200

    One more time...

 po/fi.po | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

commit 7e69b277ef2ecb8de723a3a2d6d8e6f540127dfb
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Fri Mar 26 10:36:57 2010 +0100

    Updated French doc translation

 help/fr/fr.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 8f27abc5614d08dd8c4eb916c9c71c35595e43a3
Author: Timo Jyrinki <timo.jyrinki@iki.fi>
Date:	Fri Mar 26 10:47:44 2010 +0200

    Updated translation from Launchpad.

 po/fi.po | 250
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 126 insertions(+), 124 deletions(-)

commit b83d40cbb92d2579d18a5847f7f49fbb09192f73
Author: Reşat SABIQ <tilde.birlik@gmail.com>
Date:	Thu Mar 25 21:07:32 2010 -0500

    Updated Crimean Tatar (Crimean Turkish) translation

 po/crh.po | 2377
 ++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1500 insertions(+), 877 deletions(-)

commit 9229bb3761d7051c5bd6e3a8fe7f9115ccdcdca4
Author: Nicolò Chieffo <84yelo3@gmail.com>
Date:	Wed Mar 24 13:18:27 2010 +0100

    Removed the non standard notification capabilities from the list

 libempathy-gtk/empathy-notify-manager.h | 4 ----
 1 file changed, 4 deletions(-)

commit f43443d48a3982739a2872ee389cda4937c9bc82
Merge: 0988fd7 301e13e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 25 10:26:42 2010 +0100

    Merge branch 'hidden-613892'

commit 0988fd71bc0a32a3fa169a26867b6481c0e863e8
Author: Μάριος Ζηντίλης <m.zindilis@dmajor.org>
Date:	Thu Mar 25 11:11:00 2010 +0200

    Updated Greek translation

 help/el/el.po | 2123
 ++++++++++++++++++++++++++-------------------------------
 1 file changed, 973 insertions(+), 1150 deletions(-)

commit 301e13ea631e31f7dcb43750d6db9fb5cd4325c1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 25 10:09:43 2010 +0100

    Launch Empathy in hidden mode when invoked (#613892)

 data/org.freedesktop.Telepathy.Client.Empathy.service.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0d830578c9f264708ef32c96950df7386b0127bd
Author: Kostas Papadimas <pkst@gnome.org>
Date:	Thu Mar 25 10:23:22 2010 +0200

    Updated Greek translation

 po/el.po | 1220
 +++++++++++++++++++++-----------------------------------------
 1 file changed, 411 insertions(+), 809 deletions(-)

commit 021db6b4be5579b06a00c3b1cddcdccae254f5c5
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Wed Mar 24 20:52:39 2010 +0100

    Updated Spanish translation

 help/es/es.po | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit 4eb6eb2634f170ac8dc8c44bf6293d05f5b80733
Author: Travis Reitter <treitter@gmail.com>
Date:	Wed Mar 24 10:29:16 2010 -0700

    Another way to fix Gnome bug #613272. This puts the Advanced expander
    content for each of the problem protocols in a scrolled window,
    instead of the entire Details section.

 libempathy-gtk/empathy-account-widget-jabber.ui | 317 +++++-----
 libempathy-gtk/empathy-account-widget-sip.ui	 | 734
 ++++++++++++------------
 src/empathy-accounts-dialog.c			 |   4 +-
 src/empathy-accounts-dialog.ui			 | 203 +++----
 4 files changed, 630 insertions(+), 628 deletions(-)

commit 69ba8084bf267c6b39e47f0b5e464c4097c87d86
Author: Paul Cutler <pcutler@gnome.org>
Date:	Wed Mar 24 10:58:23 2010 -0500

    fix enalbe typo - bgo 613772

 help/C/prob-conn-acctdisabled.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3c3e9cd0b59d3a3b835d76c894f40be776c2545f
Author: Fran Diéguez <frandieguez@ubuntu.com>
Date:	Wed Mar 24 16:06:11 2010 +0100

    Updated Galician translation

 po/gl.po | 46 ++++++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

commit a71fd64977dbe42f53c52c4a861d35f64b6f7714
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Wed Mar 24 13:41:32 2010 +0100

    Updated French doc translation

    Contributed by Bruno Brouard <annoa.b@gmail.com> and
    Rémi Peixoto <remi.peixoto@gmail.com>

 help/fr/fr.po | 4007
 ++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 2982 insertions(+), 1025 deletions(-)

commit 2eea9e870d0f9a5de6bd1ac2bafccbe5f5337cd3
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Mar 24 22:13:00 2010 +1100

    Same reap-child fix for empathy-debugger

 src/empathy-main-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a79cbb8de56de5a163340d31524f0f77bc35ac2a
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Mar 24 22:05:09 2010 +1100

    Automatically reap the empathy-accounts child process

    Remove unrequired exit_cb code

 src/empathy-accounts-dialog.c | 17 ++++-------------
 src/empathy-accounts-dialog.h |  2 --
 src/empathy-main-window.c     |  6 +++---
 src/empathy.c		       | 14 +-------------
 4 files changed, 8 insertions(+), 31 deletions(-)

commit 1a665bc714aa3c9789c3f0c46307f3e93679f15e
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Mar 22 17:02:21 2010 +1100

    Clean up sorting function to take top/bottom lists of fake groups

    Even if we choose not to sort People Nearby, this patch is useful
    because it
    makes how the sorting of groups is done much clearer and allows us
    to add
    other fake groups in the future.

 libempathy-gtk/empathy-contact-list-store.c | 61
 ++++++++++++++++++++++++-----
 1 file changed, 52 insertions(+), 9 deletions(-)

commit 9cd08545e92314b01ca95b5432ef612720e24afb
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Mar 22 16:20:04 2010 +1100

    Add an icon for People Nearby

 libempathy-gtk/empathy-contact-list-view.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit 505b19ef1cd82dd94c701c3229cbab6626855167
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Mar 22 16:19:14 2010 +1100

    Make People Nearby into a Fake Group like Ungrouped and Favourites

 libempathy-gtk/empathy-contact-list-store.c | 18 ++++++++++++++++--
 libempathy-gtk/empathy-contact-list-store.h |	1 +
 libempathy/empathy-tp-contact-list.c	     | 19 -------------------
 3 files changed, 17 insertions(+), 21 deletions(-)

commit d47742d59d3635d1dc78cc298244baaeede9f67d
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Mar 24 17:00:21 2010 +1100

    empathy-contact-manager: no need to pass object as user_data and
    weak_object

 libempathy/empathy-contact-manager.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 3ef2b98db024258db0161755b35bfc2a0a577bad
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Mar 24 16:58:24 2010 +1100

    empathy-contact-manager: remove unrequired for loop when unpacking
    struct

 libempathy/empathy-contact-manager.c | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

commit ae5f68d68c85b00d8b9dc337bb77fea393341f1c
Author: Gil Forcada <gforcada@gnome.org>
Date:	Wed Mar 24 00:00:46 2010 +0100

    Updated Catalan translation

 po/ca.po | 2503
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 1513 insertions(+), 990 deletions(-)

commit 390d589fe52fce28aff5b09521ae38c5aa2ae7ed
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 23 10:05:01 2010 +0100

    empathy-debugger: set text domain

    If we don't set it the debugger is not translated.

 src/empathy-debugger.c | 1 +
 1 file changed, 1 insertion(+)

commit c91768a1567df411b23f4068c799a5334f45612a
Author: A S Alam <aalam@users.sf.net>
Date:	Tue Mar 23 08:12:46 2010 +0530

    updating for Punjabi by A S Alam

 po/pa.po | 120
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 64 insertions(+), 56 deletions(-)

commit 5d7e9cb53b5a5eab698da0f8535d23af9521fc37
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Mon Mar 22 17:22:22 2010 +0100

    Updated Basque language

 po/eu.po | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit cc1cdbf44c5471f3fd54d4fc2a1fab342ef72f7c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 22 15:58:02 2010 +0100

    empathy-accounts: set text domain

    If we don't set it the accounts assistant and dialog are not
    translated
    (#613596).

 src/empathy-accounts.c | 1 +
 1 file changed, 1 insertion(+)

commit 7270ae487433b9a0bc4381b7afe5c991bf074820
Author: Adi Roiban <adi@roiban.ro>
Date:	Mon Mar 22 14:32:39 2010 +0200

    Update Romanian translation

 po/ro.po | 442
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 235 insertions(+), 207 deletions(-)

commit 4fad374b36f1b750397ce29ccd313464052f6f59
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 22 11:12:09 2010 +0100

    chat-window: remove some DEBUG calls

    They don't really give us anything useful and flood logs.

 src/empathy-chat-window.c | 15 ---------------
 1 file changed, 15 deletions(-)

commit 3011ba3c2dd559c63c1ec659ccf494d7e85fe8f2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 18 16:41:38 2010 +0100

    empathy_window_present: use X server time if there is no event

 libempathy-gtk/empathy-ui-utils.c | 53
 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 51 insertions(+), 2 deletions(-)

commit e8e8bfcd27704588c20755eb5528c08571c87406
Author: Ivar Smolin <okul@linux.ee>
Date:	Sun Mar 21 19:27:13 2010 +0200

    Estonian translation updated

 po/et.po | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 42ee648e8fa97511f60caf6fdf5d2a4fdd276256
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Sun Mar 21 15:28:11 2010 +0100

    Updated Hungarian translation

 po/hu.po | 1702
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 957 insertions(+), 745 deletions(-)

commit b6cd6faafcab427ba5d627d414a7fffb5f5e2a31
Author: Duarte Loreto <happyguy_pt@hotmail.com>
Date:	Sun Mar 21 01:31:28 2010 +0000

    Updated Portuguese translation

 po/pt.po | 2343
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1481 insertions(+), 862 deletions(-)

commit b81b3b92534ce3a0594e03315e3cdfe3b67fe1e3
Author: Fran Diéguez <frandieguez@ubuntu.com>
Date:	Sat Mar 20 20:20:18 2010 +0100

    Updated Galician translation

 po/gl.po | 387
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 213 insertions(+), 174 deletions(-)

commit ab919f20f4b0c9f72c3ea11ebb152176c9d65b92
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Sat Mar 20 20:26:51 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 396
 ++++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 396
 ++++++++++++++++++++++++++++++++----------------------------
 2 files changed, 428 insertions(+), 364 deletions(-)

commit f66a02a6fc21fa91bd8bb1d051ae891b41d41b09
Author: Christian Kirbach <Christian.Kirbach@googlemail.com>
Date:	Sat Mar 20 11:38:23 2010 +0100

    Updated German translation

 po/de.po | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

commit b3b0ed2f35dce09ba41adee1430005191e6e8f1c
Author: Changwoo Ryu <cwryu@debian.org>
Date:	Sat Mar 20 15:39:50 2010 +0900

    Updated Korean translation

 po/ko.po | 2322
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 1430 insertions(+), 892 deletions(-)

commit 8644b710942ce2358ee2345ceb6bf35326dab26b
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Mar 19 11:14:51 2010 -0700

    Make the account details pane scrollable, in case the Advanced
    section is too large to fit on the screen all at once. Fixes Gnome
    bug #613272.

 libempathy-gtk/empathy-account-widget-jabber.ui |  17 +-
 src/empathy-accounts-dialog.c			 |   4 +-
 src/empathy-accounts-dialog.ui			 | 203
 +++++++++++++-----------
 3 files changed, 119 insertions(+), 105 deletions(-)

commit aca0ef0b71041cd657486aad2ee65a6925cc226f
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Fri Mar 19 07:12:34 2010 +0200

    Updated Arabic translation

 po/ar.po | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

commit a656c296e38c884682a6eb68fc03f911a7f2a48e
Author: Daniel Nylander <po@danielnylander.se>
Date:	Fri Mar 19 00:10:31 2010 +0100

    Updated Swedish translation

 po/sv.po | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

commit 28002acf167557350bb3710e689f2d5167d6d567
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Thu Mar 18 18:53:30 2010 +0100

    Updated Italian translation

 po/it.po | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

commit 79bf5e0855c5b4271b8872dcccde7abf1ee3b2f4
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Thu Mar 18 18:44:20 2010 +0100

    Updated Polish translation

 po/pl.po | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

commit 35a28a5b61996dea0afd29349bef0c32075b4378
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Thu Mar 18 17:01:04 2010 +0200

    Estonian translation updated

 po/et.po | 65
 +++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 34 insertions(+), 31 deletions(-)

commit 16d2a4a8852d0dca6bb225adb922b83ad623a627
Author: Timo Jyrinki <timo.jyrinki@iki.fi>
Date:	Thu Mar 18 09:47:45 2010 +0200

    Updated Finnish translation by Jiri Grönroos. Via Launchpad.

 po/fi.po | 2706
 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 1819 insertions(+), 887 deletions(-)

commit 314a0a3b682031509ef72c1dbe0402829b510f01
Author: Leonid Kanter <leon@asplinux.ru>
Date:	Thu Mar 18 07:51:07 2010 +0200

    Updated Russian translation from Yury Kozlov

 po/ru.po | 57 ++++++++++++++++++---------------------------------------
 1 file changed, 18 insertions(+), 39 deletions(-)

commit 9919fd1de0bc1c8428bd3510ccbe38eb6b4be0c0
Author: Djavan Fagundes <djavan@comum.org>
Date:	Wed Mar 17 22:55:12 2010 -0300

    Updated Brazilian Portuguese translation

 po/pt_BR.po | 384
 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 207 insertions(+), 177 deletions(-)

commit c87beda2353d636075e88797b516be79dfb825c8
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Wed Mar 17 23:40:44 2010 +0100

    Updated French translation

 po/fr.po | 98
 ++++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 52 insertions(+), 46 deletions(-)

commit 5232733b0303a081c6050b538ca098771e3c7040
Author: Bruce Cowan <bcowan@fastmail.co.uk>
Date:	Wed Mar 17 22:23:20 2010 +0000

    Updated British English translation

 po/en_GB.po | 386
 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 208 insertions(+), 178 deletions(-)

commit 6686ef0069e2113446040abfa5c7a8204a41dc5e
Author: Christian.Kirbach <Christian.Kirbach@googlemail.com>
Date:	Wed Mar 17 17:57:50 2010 +0100

    Updated German translation

 po/de.po | 380
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 207 insertions(+), 173 deletions(-)

commit 5a3cce02732c0babacd63fdfa592ec7efcbbcf07
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Wed Mar 17 17:31:22 2010 +0100

    Updated Spanish translation

 po/es.po | 110
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

commit 230b2989b0ea8fa2e64e04a92f713ed111dcf099
Author: Alexander Shopov <ash@contact.bg>
Date:	Wed Mar 17 16:54:00 2010 +0200

    Updated Bulgarian translation

 po/bg.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit a48bc05ff7c4b56a875ff9942fc3ac168079bdb5
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Wed Mar 17 15:18:23 2010 +0100

    Updated Slovenian translation

 po/sl.po | 106
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 53 insertions(+), 53 deletions(-)

commit e9f383cf554f9b2b8370345044a69d48d2397b81
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Wed Mar 17 15:14:54 2010 +0100

    Updated Basque language

 po/eu.po | 124
 +++++++++++++++++++++++++--------------------------------------
 1 file changed, 49 insertions(+), 75 deletions(-)

commit 131b0099496470abddae9abda7fb50fedf6b4910
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 17 14:48:12 2010 +0100

    sidebar: fix assertion in empathy_sidebar_menu_position_under

    For some reason this assertion was done the wrong way. I checked in
    eog and
    it's supposed to be done that way (#612557).

 src/empathy-sidebar.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e7f1335e41ac72ac24684a8126151745a019c5a7
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Wed Mar 17 11:37:29 2010 +0100

    fix escaping of UTF-chars in ui file (#613117)

 libempathy-gtk/empathy-contact-widget.ui | 4 ++--
 src/empathy-accounts-dialog.ui		  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 7cd5db58862b57db5a1a67b6e2f5e61746e9fb07
Author: mrhappypants <aaron.j.brown@hotmail.com>
Date:	Wed Mar 17 08:30:16 2010 +1000

    Added gtk-keynav-wrap-around check before cycling tabs

 src/empathy-chat-window.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

commit 1d082229cc10c2fcf53f304b38780b125fd98c79
Author: A S Alam <aalam@users.sf.net>
Date:	Wed Mar 17 07:40:48 2010 +0530

    updating for Punjabi by A S Alam

 po/pa.po | 480
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 248 insertions(+), 232 deletions(-)

commit 3e1e37bfffbe0e81f036cc6cee11c5e720b71bb0
Author: simurg56 <simurg56@gmail.com>
Date:	Wed Mar 17 00:27:44 2010 +0100

    Updated Kurdish translation

 po/ku.po | 4328
 ++++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 3101 insertions(+), 1227 deletions(-)

commit 13cde1ee20456977630af54aff986a432bf81cd4
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Tue Mar 16 19:14:00 2010 +0100

    Updated Basque language

 po/eu.po | 112
 +++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 69 insertions(+), 43 deletions(-)

commit 354df7003597836171a1fa628b7924ba167f91f6
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Tue Mar 16 19:11:45 2010 +0100

    Updated Basque language

 po/eu.po | 386
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 190 insertions(+), 196 deletions(-)

commit 3c5a697f0941ac92fc8179bcdb17ec1a2b39efbc
Author: Alexander Shopov <ash@contact.bg>
Date:	Tue Mar 16 16:56:30 2010 +0200

    Updated Bulgarian translation

 po/bg.po | 465
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 237 insertions(+), 228 deletions(-)

commit 4bf2c8998e866162af3fa8d4884025b0432acd57
Author: Leonid Kanter <leon@asplinux.ru>
Date:	Tue Mar 16 15:00:59 2010 +0200

    Update Russian translation from Alexander Saprykin

 po/ru.po | 468
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 246 insertions(+), 222 deletions(-)

commit 59cb12b8740ce412c6488a4c988b834ba81d2232
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 16 11:15:41 2010 +0100

    start dev of next release

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cd62f0f8b13ec65077faa6dfc1552730ad0ceb7e
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Mon Mar 15 22:19:27 2010 +0100

    Revert "Updated Italian translation"

    This reverts commit dd8208c3597a234a62e3502f098d3c32fcedf70a.

 po/it.po | 6141
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 3050 insertions(+), 3091 deletions(-)

commit dd8208c3597a234a62e3502f098d3c32fcedf70a
Author: Francesco Marlatta <francesco.marletta@tiscali.it>
Date:	Mon Mar 15 22:16:23 2010 +0100

    Updated Italian translation

 po/it.po | 6141
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 3091 insertions(+), 3050 deletions(-)

commit 15474ed7e0781fbf7ca651592e2e9726e708ea2a
Author: Claude Paroz <claude@2xlibre.net>
Date:	Mon Mar 15 22:08:55 2010 +0100

    Updated French translation

 po/fr.po | 303
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 160 insertions(+), 143 deletions(-)

commit a53c8d302baeb2256b6a3250bd375e383a6be8fb
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Mon Mar 15 21:55:13 2010 +0100

    Updated Italian translation

 po/it.po | 484
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 247 insertions(+), 237 deletions(-)

commit a8760001a9a893f14f2b49f196dea0cf78be7114
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Mon Mar 15 20:07:14 2010 +0200

    Updated Arabic translation

 po/ar.po | 462
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 242 insertions(+), 220 deletions(-)

commit df721bdb355c5c2d8549fcd9bd288137b9afd1dc
Author: Daniel Nylander <po@danielnylander.se>
Date:	Mon Mar 15 18:40:05 2010 +0100

    Updated Swedish translation

 po/sv.po | 553
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 285 insertions(+), 268 deletions(-)

commit 8916885875f64feb520d029634c0d386197df94b
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Mar 15 18:23:03 2010 +0100

    Updated Spanish translation

 po/es.po | 111
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 58 insertions(+), 53 deletions(-)

commit d8407527e25ad3079cfd0da4cc6a5a86ec319c08
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 15 18:05:27 2010 +0100

    fix typo in release name

 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c88fa694db6c603fd01674591255ccfa830e30e5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 15 17:18:57 2010 +0100

    Prepare 2.29.93 release

 NEWS	      | 44 ++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 46 insertions(+), 2 deletions(-)

commit 07d220cd50802d5d7e21f7f339984e0f3a8eb74a
Merge: f3842fe b27315f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 15 18:03:25 2010 +0100

    Merge commit 'staz/dnd'

commit b27315f5de4084fff748ac12f54b6d23ee7260a7
Author: Olivier Le Thanh Duong <olivier@lethanh.be>
Date:	Mon Mar 15 17:47:00 2010 +0100

    DnD: add a text/path-list target to contact list windows too

 libempathy-gtk/empathy-contact-list-view.c | 2 ++
 1 file changed, 2 insertions(+)

commit c7085dce8076c1e98049adc7dbcb593b16ac5df8
Author: Olivier Le Thanh Duong <olivier@lethanh.be>
Date:	Fri Mar 5 00:45:01 2010 +0100

    DnD: add a new text/path-list target in chat window

    add a new text/path-list drop target to the chat window, it act like
    the text/uri-list target but is prioritized over it. This is mainly to
    circumvent Tomboy returning note:// uri in its uri-list.

 src/empathy-chat-window.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

commit f3842fe890a0819331c3a5901437c88b2e88d282
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Mon Mar 15 17:19:28 2010 +0100

    Updated Polish translation

 po/pl.po | 438
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 222 insertions(+), 216 deletions(-)

commit 4d2d5a1622f93b69af195d7e3c4d4cb424dbec6e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 11 14:52:59 2010 +0100

    empathy_window_present: use _NET_WM_USER_TIME only has a fallback

 libempathy-gtk/empathy-ui-utils.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit f22c92022672a78bead49aa44947bc9380ebf2b8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 11 14:32:57 2010 +0100

    empathy_window_present: use gdk_x11_display_get_user_time as timestamp

    Using G_MAXINT32 is wrong because X clock wraps every few weeks
    so G_MAXINT32
    is not garanteed to be in the past or future.
    Using gdk_x11_display_get_user_time should give us a good
    approximation of the
    actual time.

    Fixes bug #609001.

 libempathy-gtk/empathy-ui-utils.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit c1d6af1cfbb1801d26a0a550dc7ae9a81e642bc0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 11 10:35:25 2010 +0100

    empathy_window_present: remove useless 'steal_focus' arg

 libempathy-gtk/empathy-ui-utils.c | 3 +--
 libempathy-gtk/empathy-ui-utils.h | 3 +--
 src/empathy-chat-window.c	   | 2 +-
 src/empathy-main-window.c	   | 2 +-
 src/empathy-map-view.c		   | 4 ++--
 src/empathy-status-icon.c	   | 2 +-
 6 files changed, 7 insertions(+), 9 deletions(-)

commit cb0b0ee29fc08109b5180e7a0e468e6947ae0758
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 2 18:09:41 2010 +0100

    main_window_chat_quit_cb: release the reference on the chatroom mgr

 src/empathy-main-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 170e1d8999a460bb3c293188b4dcc7ea492ab509
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 11 12:34:16 2010 +0100

    call-window: display the 'audio input' page by default (#612450)

 src/empathy-call-window.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit 0d1cf12a9eae8334778e51934d5e6a3b0cb58b4a
Author: Brian Curtis <briancurtis.wx@gmail.com>
Date:	Mon Mar 15 13:47:51 2010 +0100

    idle: Only restore state but not status message when getting back
    from idle (#566832)

 libempathy/empathy-idle.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

commit a7d443e78a3c58d6d188432ada7f7706b3c10cf2
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Mon Mar 15 12:41:54 2010 +0100

    Updated Slovenian translation

 po/sl.po | 454
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 236 insertions(+), 218 deletions(-)

commit fd87c03fb0a0ae22d27e581bd46df84ac96a4c04
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 15 12:18:11 2010 +0100

    add COPYING-DOCS, COPYING.LGPL and COPYING.SHARE-ALIKE to EXTRA_DIST
    so they are shipped in tarballs

    Also sort EXTRA_DIST.

 Makefile.am | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

commit b91ab973ed932fc95357a0531e8c548edacce215
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 15 10:29:08 2010 +0100

    return correct value in g_return_val_if_fail

 libempathy-gtk/empathy-contact-selector-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c30bc2459bfdbd29f5607e48c9d94f1476defc80
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 15 10:25:42 2010 +0100

    contact-selector-dialog: unref filter_account when disposing

 libempathy-gtk/empathy-contact-selector-dialog.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 00a119d8f895506897c86165c5b7592c3ff4f787
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 15 10:24:14 2010 +0100

    contact_selector_dialog_account_changed_cb: cope with
    tp_account_get_connection being NULL

 libempathy-gtk/empathy-contact-selector-dialog.c | 3 +++
 1 file changed, 3 insertions(+)

commit f75ecac41ace8d80c9253e3f16fc5e068885a1f0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 12 18:06:10 2010 +0100

    invite-participant-dialog: filter contacts by account

    We can't invite contacts from other accounts so we shouldn't
    display them
    (#612718).

 src/empathy-chat-window.c		 | 4 +++-
 src/empathy-invite-participant-dialog.c | 7 +++++--
 src/empathy-invite-participant-dialog.h | 3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

commit e1e6e92bae0eac67637b06eca8860a88d29bd8b7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 12 18:18:58 2010 +0100

    contact-selector-dialog: Add a property to filter contacts by account

    This is useful when the account chooser is not displayed to filter
    contacts
    from one specific account.

 libempathy-gtk/empathy-contact-selector-dialog.c | 68
 ++++++++++++++++++++++--
 libempathy-gtk/empathy-contact-selector-dialog.h |  7 +++
 2 files changed, 72 insertions(+), 3 deletions(-)

commit 9f839398aa851f66bcd426f5a1754c7becb8c990
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 10 14:25:49 2010 +0100

    contact_widget_contact_update: don't call
    contact_widget_favourites_changed_cb if favorite support is disabled

 libempathy-gtk/empathy-contact-widget.c | 2 ++
 1 file changed, 2 insertions(+)

commit 8af9b4b15e86ed2d7307977ca1d2708d894baaf0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 10 14:19:58 2010 +0100

    Allow to unmark contacts as favorite using DnD

 libempathy-gtk/empathy-contact-list-view.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

commit 91c1a372d9b58a42fd57cc4ce98888771b273f8d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 10 14:19:25 2010 +0100

    Allow to remove contact from the 'Ungrouped' group using DnD

 libempathy-gtk/empathy-contact-list-view.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit 71ad0f9d2f6a6c35719fbd4d5315ef1104299e7e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 10 13:49:42 2010 +0100

    factor out group_can_be_modified

 libempathy-gtk/empathy-contact-list-view.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

commit 3cab7c229b83bd9668c45a60d562a2e2574dfc49
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 10 13:26:50 2010 +0100

    Support to tag contact as favorite using DnD

 libempathy-gtk/empathy-contact-list-view.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

commit 8ae91c9509dde4dea0bc735dd24c7e3a690b4c9a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 10 10:21:32 2010 +0100

    Don't allow moving contacts to fake groups using DnD

    Fake groups can't be modified.

 libempathy-gtk/empathy-contact-list-store.c | 8 +++++++-
 libempathy-gtk/empathy-contact-list-store.h | 3 ++-
 libempathy-gtk/empathy-contact-list-view.c  | 9 +++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

commit 10de86b4bf55d1b624adbb867854bb61df04fb19
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 10 10:05:50 2010 +0100

    add 'favorite' checkbox to the edit dialog

 libempathy-gtk/empathy-contact-dialogs.c |  3 +-
 libempathy-gtk/empathy-contact-widget.c  | 84
 ++++++++++++++++++++++++++++++--
 libempathy-gtk/empathy-contact-widget.h  |  1 +
 3 files changed, 82 insertions(+), 6 deletions(-)

commit d00ccf5d7f5da998dbcedcb6f420630e347cfe96
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 10 09:00:34 2010 +0100

    remove double ;

 libempathy-gtk/empathy-contact-list-view.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d1c7199036cf8006fc1da210c77f7b0787f682fa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 10 08:59:29 2010 +0100

    rephrase fake favorite group display name

 libempathy-gtk/empathy-contact-list-store.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2b8caddf10e90935b10748ea8c48e462bfc686ab
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 10 08:59:08 2010 +0100

    stop exporting FAVOURITE_CONTACTS_CFLAGS and FAVOURITE_CONTACTS_LIBS

 configure.ac		    | 2 --
 libempathy-gtk/Makefile.am | 2 --
 libempathy/Makefile.am     | 2 --
 3 files changed, 6 deletions(-)

commit 639c68cc074ea525cb769213939383c9ee57fb57
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 9 18:10:51 2010 +0100

    libtelepathy-logger has been renamed to telepathy-logger

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cd054461923a9c8c7d05fab2a5f7a88b9f2e6431
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 9 17:41:37 2010 +0100

    contact-list-store: remove EMPATHY_CONTACT_LIST_STORE_COL_IS_FAVOURITE

    We don't need it any more.

 libempathy-gtk/empathy-contact-list-store.c | 35
 -----------------------------
 libempathy-gtk/empathy-contact-list-store.h |	1 -
 2 files changed, 36 deletions(-)

commit b92ad3740762d958364d4f9421095b088f0d845b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 9 17:25:14 2010 +0100

    Don't display context menu when right clicking on a fake group

    Those can't be renamed.

 libempathy-gtk/empathy-contact-list-view.c | 16 ++++++++++++----
 libempathy-gtk/empathy-contact-list-view.h |  3 ++-
 2 files changed, 14 insertions(+), 5 deletions(-)

commit 39aeb13d19382b86d3b322a7cca13a72c5fac1b5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 9 17:20:39 2010 +0100

    compare_separator_and_groups: check that the group is actually a
    fake one

 libempathy-gtk/empathy-contact-list-store.c | 28
 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

commit 18c1a21f066f5077ff487ffb92554fd1539ff997
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 9 17:14:43 2010 +0100

    contact-list-store: add a column saying if a group is a fake one
    or not

 libempathy-gtk/empathy-contact-list-store.c | 14 +++++++++-----
 libempathy-gtk/empathy-contact-list-store.h |	1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

commit a1aabfa9396be10ba988a84d3e7aac0ec6f10ffa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 9 17:01:47 2010 +0100

    stop displaying favorite contacts on top of groups

    They are already displayed in a separated group on top of the
    contact list

 libempathy-gtk/empathy-contact-list-store.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

commit 28202c4333c27f360d9298427a9f196954cf8f9f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 9 16:31:59 2010 +0100

    Display icon near the favorite fake group

 libempathy-gtk/empathy-contact-list-view.c | 53
 ++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

commit d8d32209c69c82ebec704126c461abb9e39e1b8f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 9 15:42:18 2010 +0100

    Display the fake 'Favorites' group at the top of the contact list

 libempathy-gtk/empathy-contact-list-store.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 1accacab8c375482d6bd16de400529e333c8078f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 9 14:53:53 2010 +0100

    Create a fake 'Favorites People' group

 libempathy-gtk/empathy-contact-list-store.c | 19 ++++++++++++++++++-
 libempathy-gtk/empathy-contact-list-store.h |	1 +
 2 files changed, 19 insertions(+), 1 deletion(-)

commit a15866686e0851f4951144f0d7a6118e963b605d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 9 15:02:58 2010 +0100

    factor out add_contact_to_store

 libempathy-gtk/empathy-contact-list-store.c | 50
 ++++++++++++++---------------
 1 file changed, 24 insertions(+), 26 deletions(-)

commit 4ac942f53ca44bcfc1e3b8aa9329dddf014b44b8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 9 14:28:42 2010 +0100

    Move the 'Ungrouped' fake contact to the bottom of the contact list

 libempathy-gtk/empathy-contact-list-store.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 3828abfc717a381003c81119dc96ef93b3d69d50
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 9 14:20:21 2010 +0100

    factor out compare_separator_and_groups

 libempathy-gtk/empathy-contact-list-store.c | 86
 +++++++++++++++--------------
 1 file changed, 45 insertions(+), 41 deletions(-)

commit 256b001de17b36d197f21e202d82547510868a5b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 9 13:56:06 2010 +0100

    add 'Ungrouped' fake contact

 libempathy-gtk/empathy-contact-list-store.c | 15 ++++++++++++++-
 libempathy-gtk/empathy-contact-list-store.h |	2 ++
 2 files changed, 16 insertions(+), 1 deletion(-)

commit 3e47aa6e9b32793d878488d0344afb0ba9c09f2e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 9 13:28:09 2010 +0100

    Move the 'Favorite' menu item after 'Information'

 libempathy-gtk/empathy-contact-menu.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 9a912cfc5dfe0592d4e04c7da517383b49c99b95
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 9 11:59:07 2010 +0100

    remove EMPATHY_IMAGE_(UN)FAVOURITE

 libempathy-gtk/empathy-images.h | 2 --
 1 file changed, 2 deletions(-)

commit 40586f1a404d9e053ce4f282c50f3988e6976659
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 9 11:22:32 2010 +0100

    remove 'favorite' column in the contact list

    We can use the contact menu now.

 libempathy-gtk/empathy-contact-list-view.c | 88
 ------------------------------
 1 file changed, 88 deletions(-)

commit 8df2cf237283de1b049b4c24b0906384e45c4320
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 9 11:20:33 2010 +0100

    Add 'favorite' checkbox to the contact menu

 libempathy-gtk/empathy-contact-menu.c | 49
 +++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-contact-menu.h |  1 +
 2 files changed, 50 insertions(+)

commit 27591216de0bdbf8cfecd562414faa34138a1a52
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 8 16:39:29 2010 +0100

    check that logger is not NULL before unrefing it

 libempathy/empathy-contact-manager.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 52d2d0aff0c3a8bbbdd433bb63434207c2e74001
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 8 16:32:54 2010 +0100

    fix hash table leak

    priv->favourites takes the reference of the newly created hash table
    so we
    don't have to ref it.

 libempathy/empathy-contact-manager.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 01e4fe629f1861723d004daba9d190abe1e3ec00
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 8 16:32:03 2010 +0100

    factor out add_contacts_to_favourites

 libempathy/empathy-contact-manager.c | 61
 ++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 31 deletions(-)

commit 0117b6e07afbe6b05add3baba61aae8d36093051
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 8 16:14:27 2010 +0100

    Unref contact returned by empathy_contact_list_get_members

    empathy_contact_list_get_members return a list of reffed contacts.

 libempathy/empathy-contact-manager.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 6a74d80616929d756322a1cb61ab890d16c43e99
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 8 15:52:54 2010 +0100

    log an error if {Add,Remove}FavouriteContact failed

 libempathy/empathy-contact-manager.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

commit 1e8b4cff641adf7cd0a17a1fe429ada46f99907f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 8 15:52:41 2010 +0100

    document the favorites hash table

 libempathy/empathy-contact-manager.c | 2 ++
 1 file changed, 2 insertions(+)

commit 2f6934c6f206596cfffe0497adad83a231cc24d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 8 14:30:57 2010 +0100

    coding style fixes

 libempathy-gtk/empathy-contact-list-store.c | 33
 +++++++++++++++--------------
 libempathy-gtk/empathy-contact-list-view.c  | 20 ++++++++---------
 libempathy/empathy-contact-list.c	     | 12 +++++------
 libempathy/empathy-contact-list.h	     |	8 +++----
 libempathy/empathy-contact-manager.c	     | 32
 +++++++++++++++-------------
 5 files changed, 54 insertions(+), 51 deletions(-)

commit 5056bda77944ccee7a6bc4040a462590c16982b3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 8 13:15:26 2010 +0100

    Sync Unix_Timestamp64 definition with the spec

    It now has the 'x' type.

 extensions/generic-types.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit c66e6c536d776414f6bfada650dc25d97dc95803
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Mar 5 18:58:17 2010 -0800

    Rebase the favourites support upon the telepathy-logger instead of
    a specially-named favourites group.

 extensions/Logger.xml			     | 179 +++++++++++++++++
 extensions/Makefile.am			     |	 6 +-
 extensions/all.xml			     |	 2 +
 extensions/misc.xml			     |	 1 +
 libempathy-gtk/empathy-contact-list-store.c |	66 ++++++-
 libempathy-gtk/empathy-contact-list-view.c  |	10 +-
 libempathy/empathy-contact-list.c	     |	11 +-
 libempathy/empathy-contact-list.h	     |	19 +-
 libempathy/empathy-contact-manager.c	     | 291
 ++++++++++++++++++++++++++++
 9 files changed, 564 insertions(+), 21 deletions(-)

commit 79ef79c4d92cc4978dd12528d5bb6c3673a6b0f9
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Mar 5 17:45:44 2010 -0800

    Cut out the concept of a special Favourites group

 libempathy-gtk/empathy-contact-list-store.c | 60
 +----------------------------
 libempathy-gtk/empathy-contact-list-view.c  |	7 ----
 libempathy/empathy-contact-list.c	     | 41 +++++++++++++++-----
 libempathy/empathy-contact-list.h	     |	3 --
 4 files changed, 33 insertions(+), 78 deletions(-)

commit 50a0138f16ceabeecd1ee92f127684a9d50b3e70
Author: Travis Reitter <treitter@gmail.com>
Date:	Tue Feb 23 10:08:05 2010 -0800

    Add a favorite contacts build option and make Moblin support
    automatically turn it on.

 configure.ac				     | 32
 +++++++++++++++++++++++++++++
 libempathy-gtk/Makefile.am		     |	2 ++
 libempathy-gtk/empathy-contact-list-store.c | 22 ++++++++++++++++++++
 libempathy-gtk/empathy-contact-list-view.c  |	8 ++++++++
 libempathy/Makefile.am			     |	2 ++
 libempathy/empathy-contact-list.c	     |	2 ++
 6 files changed, 68 insertions(+)

commit b8657a61fe72be0da2d91325b0851dd4d7fd533c
Author: Travis Reitter <treitter@gmail.com>
Date:	Tue Feb 16 10:11:43 2010 -0800

    Add support for marking contacts as favorites (which gives them
    a highlighted
    star next to their name and adds them to the top of the contact list)

 libempathy-gtk/empathy-contact-list-store.c | 69 ++++++++++++++++++++--
 libempathy-gtk/empathy-contact-list-store.h |	3 +-
 libempathy-gtk/empathy-contact-list-view.c  | 89
 +++++++++++++++++++++++++++++
 libempathy-gtk/empathy-images.h	     |	2 +
 libempathy/empathy-contact-list.c	     | 17 ++++++
 libempathy/empathy-contact-list.h	     |	7 +++
 6 files changed, 181 insertions(+), 6 deletions(-)

commit 870983d8050e267e1894f36c7ab6fe7fe0295441
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Mar 15 09:27:15 2010 +0100

    Updated Spanish translation

 po/es.po | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

commit 1d6dbd3894044fb1d7240de3c8a36d6fe3591329
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Mar 15 09:25:06 2010 +0100

    Updated Spanish translation

 po/es.po | 425
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 221 insertions(+), 204 deletions(-)

commit 350d6eb6ab8dd109eb8250ebf8792ceb15eaa8b7
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Mar 10 16:00:25 2010 +1100

    empathy-accounts: set a title for the assistant

 src/empathy-account-assistant.c | 3 +++
 1 file changed, 3 insertions(+)

commit 6b55164a3957ac07824d2598f36e397686c62533
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 3 10:07:24 2010 +0100

    empathy-accounts: set "Empathy Accounts" as application name

    It's more friendly to translators.

 src/empathy-accounts.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 221f5f70a908aec35711448c78fcea87fa894fa1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 3 10:05:57 2010 +0100

    empathy-debugger: set "Empathy Debugger" as application name

    It's more friendly to translators.

 src/empathy-debugger.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8e638ddd817039c0b6cdf342ce657b1b1e975b45
Author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
Date:	Wed Feb 24 14:52:38 2010 -0600

    Separate the debug window into its own process.

 po/POTFILES.in		   |  1 +
 src/.gitignore		   |  1 +
 src/Makefile.am	   |  7 ++++++-
 src/empathy-debugger.c    | 50
 +++++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-main-window.c | 32 ++++++++++++++++++++++++++++--
 5 files changed, 88 insertions(+), 3 deletions(-)

commit df53944e1ba92732760d1cfe437b8b56edda526b
Merge: ba8f9b6 c448b89
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Mon Mar 15 08:09:56 2010 +0000

    Merge branch 'butterfly-networkid'

commit ba8f9b6182a9f85c7d081e571fae128dc6261d1d
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sun Mar 14 23:17:34 2010 +0100

    Updated Spanish translation

 help/es/es.po | 64
 +++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 43 insertions(+), 21 deletions(-)

commit 4623d70bbcac3aae9ef3df096128e2cb8423dcf2
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Mar 14 20:57:06 2010 +0100

    Updated Italian help translation

 help/it/it.po | 158
 +++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 91 insertions(+), 67 deletions(-)

commit 1f8dfaf0c19c173385b305466cf2de15669a01d5
Author: Fran Diéguez <frandieguez@ubuntu.com>
Date:	Sat Mar 13 21:09:26 2010 +0100

    Update Galician translation

 po/gl.po | 65
 ++++++++++++++++++++++++++--------------------------------------
 1 file changed, 26 insertions(+), 39 deletions(-)

commit d81fef008bfdc3de122c80f001e7eed6c4f064d8
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Fri Mar 12 23:02:21 2010 +0100

    Updated German doc translation

 help/de/de.po | 65
 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 21 deletions(-)

commit e8f3e042b0792106ce288d26bd19949f834300a2
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Fri Mar 12 22:02:19 2010 +0100

    [help] Updated the irc-join-pwd topic: password protected IRC room
    now works

 help/C/irc-join-pwd.page | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

commit c448b89bb4f18377818b7802f4cb66ba47e3fe04
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Mar 12 02:22:47 2010 +0000

    Migrate butterfly logs to remove the network ID suffix.

    Bug #612519 contains much more information about this change.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 data/empathy.schemas.in		|  14 +++
 libempathy-gtk/empathy-conf.h		|   1 +
 libempathy/empathy-log-store-empathy.c |   7 ++
 libempathy/empathy-log-store-empathy.h |   5 +
 src/Makefile.am			|   1 +
 src/empathy-main-window.c		|  18 +++
 src/empathy-migrate-butterfly-logs.c	| 213
 +++++++++++++++++++++++++++++++++
 src/empathy-migrate-butterfly-logs.h	|  32 +++++
 8 files changed, 291 insertions(+)

commit cb3e4ee7e0d7d20c95b0067abbff640c005bccc8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 12 13:50:08 2010 +0100

    set $HOME as default directory when sending a file

 libempathy-gtk/empathy-ui-utils.c | 3 +++
 1 file changed, 3 insertions(+)

commit c57f6e063efe334033061088263d246868477c88
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 12 13:45:27 2010 +0100

    Set XDG_DOWNLOAD_DIR as default directory when receiving a file
    (#612672)

 libempathy-gtk/empathy-ui-utils.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 2d9cbe355d22570bbc32d2cde0d7942adab355e0
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Thu Mar 11 23:48:11 2010 +0100

    Updated German doc translation

 help/de/de.po | 918
 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 455 insertions(+), 463 deletions(-)

commit 37a671b0f78ddd621041bb529edc7662f317cc86
Author: deniarnuad <denisarnuad@yahoo.fr>
Date:	Thu Mar 11 20:32:39 2010 +0100

    updated breton translation

 po/br.po | 3047
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1985 insertions(+), 1062 deletions(-)

commit d4843ddddb24f03451db3aed59a31d2158084171
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Thu Mar 11 18:41:43 2010 +0100

    Updated Spanish translation

 help/es/es.po | 151
 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 72 insertions(+), 79 deletions(-)

commit ac93e53085ee405164bc4f9f09ce2a39523727d5
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Thu Mar 11 18:23:23 2010 +0100

    [help] Removed the offline-contacts topic (bug 612448):
     * Created hide-contacts based on removed-contacts
     * Fixed the topic
     * Removed the old page from Makefile and added the new one

 help/C/hide-contacts.page    | 42 ++++++++++++++++++++++++++++++++++++
 help/C/offline-contacts.page | 51
 --------------------------------------------
 help/Makefile.am	      |  2 +-
 3 files changed, 43 insertions(+), 52 deletions(-)

commit c9fa45d605497da2c0d79262b4d6d42d0fff7c63
Author: Luca Ferretti <lferrett@gnome.org>
Date:	Thu Mar 11 15:16:47 2010 +0100

    Fix a small typo

 po/it.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 02141c6718553ad9bf05afee05e1ef834d3bdd62
Merge: c1dd662 2a98cb3
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Thu Mar 11 11:35:45 2010 +0000

    Merge branch 'butterfly-conference-misc'

commit 2a98cb3d4f7222097b4ec2f5343244d1b313eac1
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Mar 10 18:44:14 2010 +0000

    tp-chat: remove butterfly MSN HandleType=NONE workaround

    Newer versions of butterfly use the conference interface, so their 1-1
    chats don't implement the group interface. This patch changes nothing
    there, but now when butterfly gives a channel with
    TargetHandleType=NONE, it is actually a MUC, so act like that.

    Thanks to the addition of the conference interface with this change,
    we can check for its presence to decide whether this is old-school or
    new-school butterfly.

    This commit and 13a7c40c together fix bug #612461.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-tp-chat.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit c1dd662a2d2c94b19e431750ddc9109b5509e3b6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 11 11:12:52 2010 +0100

    Add a copy of the Attribution-ShareAlike 3.0 Unported licence

 COPYING.SHARE-ALIKE | 61
 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

commit c8516f4f6ea59ac596579dd55e16477d9f107f3e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 5 10:50:49 2010 +0100

    add a copy of the GNU Free Documentation License

 COPYING-DOCS | 451
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 451 insertions(+)

commit 6a35cfc707c5b64aed0a3eecdc0001df6078fa06
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 5 10:49:14 2010 +0100

    add a copy of the LGPLv2.1

 COPYING.LGPL | 504
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 504 insertions(+)

commit b168624ab6f99b6f4fe1778e8309ee264e18b336
Author: Maxim V. Dziumanenko <dziumanenko@gmail.com>
Date:	Thu Mar 11 11:45:00 2010 +0200

    Updated Ukrainian translation

 po/uk.po | 2284
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1262 insertions(+), 1022 deletions(-)

commit 13a7c40c5aaf9b6ff9d75073775472f413959033
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Mar 10 18:41:08 2010 +0000

    tp-chat: when seeing if a chat can be upgraded, don't worry about
    handle type

    When you upgrade a gtalk 1-1 chat to a PMUC, it moves from
    [ChannelType=TEXT, TargetHandleType=CONTACT] to [ChannelType=TEXT,
    TargetHandleType=ROOM].

    When you upgrade an MSN 1-1 chat to a multi-user chat in butterfly, it
    moves from [ChannelType=TEXT, TargetHandleType=CONTACT] to
    [ChannelType=TEXT, TargetHandleType=NONE].

    Both of these cases have the 1-1 chat properties set as fixed
    properties in a class in their connection's RCC. They both also have
    the upgraded set of properties as above fixed, and
    o.fd.Tp.Channel.Interface.Conference(.DRAFT) in the appropriate
    Allowed_Properties array.

    Empathy used to look for this said channel interface in the allowed
    properties of a TargetHandleType=ROOM class. As butterfly uses
    TargetHandleType=NONE, this isn't so useful, so let's not care about
    the handle type to fit around both gtalk and MSN.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-tp-chat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7d8f163d8dcb540f611b3581389e2c15971e479f
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Mar 10 18:34:34 2010 +0000

    dispatcher: allow not caring about handle type when looking up RCCs

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-dispatcher.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 70d4d71b08e3d8d5a0caaa051218180cd421187e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 10 16:48:12 2010 +0100

    Show offline contacts by default (#612448)

 data/empathy.schemas.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a814276b7d9222f2a3a8d556ffc2f86d4769d5fa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 10 16:47:44 2010 +0100

    Sort contacts by state by default (#612448)

 data/empathy.schemas.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 931c6e727885bdfab4f519ef7fcd7d90f30b3303
Author: Ken VanDine <ken.vandine@canonical.com>
Date:	Wed Mar 10 15:42:21 2010 +0100

    Window title for the accounts dialog should match the name in the
    launcher.

    Fixes bug #612433

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 77192dd163342a513b88618bd8a4d213574d40c1
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Mar 10 12:15:23 2010 +0100

    gtk_check_version() is returning a string error or NULL, not a boolean

    This actually invert the logic

 libempathy-gtk/empathy-string-parser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5601d115d7e74b78dc1a884902c08c23be7626a8
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Mar 10 11:41:29 2010 +0100

    Disable empathy_add_link_markup() if linked to an old GTK version

    Using links in labels could make a freeze, see GNOME #612066

 libempathy-gtk/empathy-string-parser.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 53a27a44ec3180efe29ed24f31091ecfd0bda3ad
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Mar 10 11:21:08 2010 +0100

    Revert "Revert "Make links clickable in presence message and topics""

    This reverts commit efb42513359f4db545e3312e3c583d07c6306418.

 libempathy-gtk/empathy-chat.c		 |  8 +++++++-
 libempathy-gtk/empathy-contact-widget.c | 12 ++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

commit 77c57d35a578027d6f5ffea14483ba8762ad995a
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Mar 10 15:54:51 2010 +1100

    empathy-accounts: make CcPage insensitive when assistant is being
    shown

    Also destroy assistant when CcPanel becomes inactive.

 src/cc-empathy-accounts-page.c  | 35 ++++++++++++++++++++++++++++++++---
 src/cc-empathy-accounts-page.h  |  1 +
 src/cc-empathy-accounts-panel.c | 26 +++++++++++++++++++++++++-
 src/empathy-account-assistant.c |  2 +-
 4 files changed, 59 insertions(+), 5 deletions(-)

commit c2cd8fbabc39ee82f28e9617a33c2ae603f711b7
Author: Leonid Kanter <leon@asplinux.ru>
Date:	Wed Mar 10 00:12:57 2010 +0200

    Updated Russian translation from Yury Myasoedov

 po/ru.po | 2431
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 1428 insertions(+), 1003 deletions(-)

commit 72ddf3a41e879b907b0e40f37e96468ce2d42f8e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 9 19:44:06 2010 +0100

    start dev of next release

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ae87026eae01dd6dbb34a2ae9c1f3a6dcf4b0f2f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 9 19:31:30 2010 +0100

    prepare 2.29.92

 NEWS	      | 28 ++++++++++++++++++++++++++++
 configure.ac |  6 +++---
 2 files changed, 31 insertions(+), 3 deletions(-)

commit 383e6e321139a49a17be2bb3025e0568957e48fb
Author: Jonas Bonn <jonas@southpole.se>
Date:	Mon Mar 8 10:30:02 2010 +0100

    chatroom-manager: Save correct room name

    When writing out the room name to the persistance file, the room
    name should
    properly be gotten with the get_room function.  This bug has
    probably not
    bitten too many users as the remote room name and the favorite
    chatroom name
    usually are usually the same; however, if the user were to change the
    favorite chatroom name then this bug would become apparent.

 libempathy/empathy-chatroom-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 656d02dd23d1b41cf1924ec3e5ae48c82b570851
Author: A S Alam <aalam@users.sf.net>
Date:	Tue Mar 9 07:17:27 2010 +0530

    updating Punjabi Translation

 po/pa.po | 1107
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 541 insertions(+), 566 deletions(-)

commit d2bb178a1f1b97d7b82f1654898b8d08ac8bd5b9
Author: Branko Kokanović <branko.kokanovic@gmail.com>
Date:	Mon Mar 8 22:13:37 2010 +0100

    Updated Serbian translations

 po/sr.po	| 2271
 +++++++++++++++++++++++++++++++++++---------------------
 po/sr@latin.po | 2271
 +++++++++++++++++++++++++++++++++++---------------------
 2 files changed, 2866 insertions(+), 1676 deletions(-)

commit dfb8d63e950c49a348c1d546b006a509df860e22
Author: Anita Reitere <nitalynx@gmail.com>
Date:	Mon Mar 8 22:09:13 2010 +0200

    Updated Latvian translation.

 po/lv.po | 2240
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1418 insertions(+), 822 deletions(-)

commit efb42513359f4db545e3312e3c583d07c6306418
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Mar 8 13:17:57 2010 +0100

    Revert "Make links clickable in presence message and topics"

    This reverts commit 00ab069a55f05f0203bf58f071fa7adc54b6e9ac.

    Conflicts:

	libempathy-gtk/empathy-contact-widget.c

 libempathy-gtk/empathy-chat.c		 |  8 +-------
 libempathy-gtk/empathy-contact-widget.c | 12 ++----------
 2 files changed, 3 insertions(+), 17 deletions(-)

commit 1feea908259b4555a08e5e90e0aaa99ef44bf70f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Mar 5 13:29:17 2010 +0100

    Import aim, icq and yahoo icons from gnome-icon-theme (#330394)

    They have been removed from gnome-icon-theme.

 data/icons/Makefile.am			       |  18 ++
 data/icons/hicolor_apps_16x16_im-aim.png      | Bin 0 -> 795 bytes
 data/icons/hicolor_apps_16x16_im-icq.png      | Bin 0 -> 936 bytes
 data/icons/hicolor_apps_16x16_im-yahoo.png    | Bin 0 -> 906 bytes
 data/icons/hicolor_apps_22x22_im-aim.png      | Bin 0 -> 1134 bytes
 data/icons/hicolor_apps_22x22_im-icq.png      | Bin 0 -> 1359 bytes
 data/icons/hicolor_apps_22x22_im-yahoo.png    | Bin 0 -> 1261 bytes
 data/icons/hicolor_apps_24x24_im-aim.png      | Bin 0 -> 1218 bytes
 data/icons/hicolor_apps_24x24_im-icq.png      | Bin 0 -> 1512 bytes
 data/icons/hicolor_apps_24x24_im-yahoo.png    | Bin 0 -> 1411 bytes
 data/icons/hicolor_apps_32x32_im-aim.png      | Bin 0 -> 1777 bytes
 data/icons/hicolor_apps_32x32_im-icq.png      | Bin 0 -> 2121 bytes
 data/icons/hicolor_apps_32x32_im-yahoo.png    | Bin 0 -> 1955 bytes
 data/icons/hicolor_apps_48x48_im-aim.png      | Bin 0 -> 2953 bytes
 data/icons/hicolor_apps_48x48_im-icq.png      | Bin 0 -> 3418 bytes
 data/icons/hicolor_apps_48x48_im-yahoo.png    | Bin 0 -> 3211 bytes
 data/icons/hicolor_apps_scalable_im-aim.svg   | 183 ++++++++++++++++++
 data/icons/hicolor_apps_scalable_im-icq.svg   | 200 +++++++++++++++++++
 data/icons/hicolor_apps_scalable_im-yahoo.svg | 266
 ++++++++++++++++++++++++++
 19 files changed, 667 insertions(+)

commit 071f93ad6cbb539bbf8546e3e3cd2b9486ec1616
Author: Adi Roiban <adi@roiban.ro>
Date:	Mon Mar 8 13:10:29 2010 +0200

    Update Romanian translation

 po/ro.po | 567
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 284 insertions(+), 283 deletions(-)

commit 35e2a6150395b18e684e17f22ff4315cba0a7b2c
Merge: 5bc1e2c 023e73e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 8 09:54:28 2010 +0100

    Merge commit 'maiku/bug-607626'

commit 5bc1e2cd937800e3dbd11067426632edfbfee0f6
Author: Christian Kirbach <Christian.Kirbach@googlemail.com>
Date:	Sat Mar 6 22:09:56 2010 +0100

    Updated German translation

 po/de.po | 486
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 244 insertions(+), 242 deletions(-)

commit 7cd269a090cf6e6e8dc150e6610614239e9d6488
Author: Claude Paroz <claude@2xlibre.net>
Date:	Sat Mar 6 16:18:08 2010 +0100

    Updated French translation

    Contributed by Bruno Brouard and Claude Paroz

 po/fr.po | 749
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 415 insertions(+), 334 deletions(-)

commit f787c71eeac5bba47bd101cb3b963956461288a5
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date:	Sat Mar 6 19:21:39 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 500
 ++++++++++++++++++++++++++++++------------------------------
 po/zh_TW.po | 500
 ++++++++++++++++++++++++++++++------------------------------
 2 files changed, 506 insertions(+), 494 deletions(-)

commit d8dd568c2c1fed4cb328c2a9afc148186fda12aa
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Mar 6 10:58:11 2010 +0000

    chat-manager: take an EmpathyChat instead of an EmpathyContact

    This way, we can support both 1-to-1 chats, *and* MUCs.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-chat-manager.c | 113
 +++++++++++++++++++++++++++++++++++++++------
 src/empathy-chat-manager.h |	4 +-
 src/empathy-chat-window.c  |	8 ++--
 3 files changed, 105 insertions(+), 20 deletions(-)

commit 9d544f9f89bc9a448722ec0f66ee9eb16e89e1e6
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Sat Mar 6 11:12:19 2010 +0100

    Updated Basque language

 po/eu.po | 104
 ++++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 70 insertions(+), 34 deletions(-)

commit 023e73e6c363e37de3f9306e0c81c9d255a1a880
Author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
Date:	Thu Mar 4 20:53:53 2010 -0600

    Prevent contact list tooltip from showing if context menu is shown.

    Previously, if you opened a context menu in the contact list,
    contact tooltips would still be capable of being shown and
    obscuring the context menu options. This patch prevents tooltips
    from being shown if a context menu is visible.

    Fixes #607626

 libempathy-gtk/empathy-contact-list-view.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 57961ab9946ed770f2dbf95504cac9ffe2d2d642
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Sat Mar 6 00:15:42 2010 +0100

    Updated German doc translation

 help/de/de.po | 1381
 ++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 769 insertions(+), 612 deletions(-)

commit 7415009e9f118174703834d95b91653f8de4e3f4
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Mon Mar 1 11:31:52 2010 +0000

    Add EmpathyChatManager::chats-changed signal and make the chat window
    listen to it.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-chat-manager.c | 31 +++++++++++++++++++++++++++++++
 src/empathy-chat-manager.h |  1 +
 src/empathy-chat-window.c  | 42
 +++++++++++++++++++++++++++++++++++-------
 3 files changed, 67 insertions(+), 7 deletions(-)

commit d95165b819c15207ad0a133ea38684043a3776fc
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sun Feb 28 19:08:43 2010 +0000

    Add chat manager which tracks chats closing and can respawn them
    (bug #609832)

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/Makefile.am	    |	1 +
 src/empathy-chat-manager.c | 137
 +++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-chat-manager.h |  69 +++++++++++++++++++++++
 src/empathy-chat-window.c  |  20 +++++++
 src/empathy-chat-window.ui |	8 +++
 src/empathy-main-window.c  |  20 +++++++
 src/empathy.c		    |	6 ++
 7 files changed, 261 insertions(+)

commit df799743c6e79136ffa44e22cb19dce0146ec422
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:	Thu Mar 4 23:55:20 2010 +0000

    Updated British English translation

 po/en_GB.po | 506
 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 257 insertions(+), 249 deletions(-)

commit d271e787a1445a23c7ecdbfb537a27799f3ceb64
Author: Fran Diéguez <frandieguez@ubuntu.com>
Date:	Fri Mar 5 00:23:22 2010 +0100

    Update Galician translation

 po/gl.po | 611
 +++++++++++++++++++++++++++------------------------------------
 1 file changed, 261 insertions(+), 350 deletions(-)

commit b6b0b1081d21f84235051424aa4f74c5e769f01d
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Thu Mar 4 23:03:39 2010 +0100

    Updated Basque language

 po/eu.po | 2071
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 1246 insertions(+), 825 deletions(-)

commit f0555970a6dd57a4494c295f1e29e42d8aafec2d
Author: Olivier Le Thanh Duong <olivier@lethanh.be>
Date:	Thu Mar 4 22:57:43 2010 +0100

    chat_window_drag_motion : search in all the drop targets

    Use gtk_drag_dest_find_target to search in all the drop targets
    instead
    of only the first one.

 src/empathy-chat-window.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

commit b80b4032b86e961fc967fabb9ccdb7775e2dec7b
Author: Jonh Wendell <jwendell@gnome.org>
Date:	Thu Mar 4 16:04:52 2010 -0300

    Updated Brazilian Portuguese translation

 po/pt_BR.po | 528
 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 267 insertions(+), 261 deletions(-)

commit 38e506af9cab3a8d1953f29dc0ca59efdee55d00
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Mar 4 19:53:27 2010 +0100

    Revert "Disable empathy-parser-test for now as it doesn't build
    any more"

    This reverts commit 400dc9cfed1e4ff95e10ecec47c51871332302a9.

 tests/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c1adb24c891c732119266475c5e4dc55de019d79
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Mar 4 19:41:47 2010 +0100

    Parser API is moved from empathy-ui-utils to empathy-string-parser

 tests/empathy-parser-test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2ea942c7645bbc3634a8d6a231cfed3f73fc9974
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 4 19:50:48 2010 +0100

    start dev of next release

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 400dc9cfed1e4ff95e10ecec47c51871332302a9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 4 19:38:54 2010 +0100

    Disable empathy-parser-test for now as it doesn't build any more

 tests/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 16555ecff5536c8be45b0d7001bb65eba0d11bee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 4 19:22:44 2010 +0100

    prepare 2.29.91.2 release

 NEWS	      | 26 ++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 28 insertions(+), 2 deletions(-)

commit 5275d797f7af1296fa9219394c4cf93de2a8d408
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Mar 4 18:02:21 2010 +0000

    Force windows to jump to the foreground if we present them

 libempathy-gtk/empathy-ui-utils.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit f79f134280bb47d7fd10b958ccf60ca10bd40757
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 4 18:38:24 2010 +0100

    set the server field of Google Talk account

    This should solve connection issue with buggy router (#601089).

 src/empathy-account-assistant.c | 16 ++++++++++++----
 src/empathy-accounts-dialog.c	 | 16 ++++++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)

commit 8dd1f0d5dfa09c1ddc29c85b9db472c2821c35fe
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Mar 4 17:23:10 2010 +0000

    Fix silly typo

 src/empathy-accounts-dialog.c | 2 +-
 src/empathy-accounts-dialog.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit ba5b7807abcbd86cc9d35440754b68a3fe970f18
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Mar 4 18:11:26 2010 +0100

    empathy_add_link_markup() is not NULL-safe

    Add a g_return_val_if_fail() to avoid crash, and avoid calling
    that func
    with NULL text.

 libempathy-gtk/empathy-contact-widget.c | 5 +++--
 libempathy-gtk/empathy-string-parser.c  | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

commit 02e330c0418f6b59abe193171d7adc75739bd8a2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 4 17:57:05 2010 +0100

    Popup the assistant when starting only if there is *no* account
    configured

 src/empathy.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 475ab0143677586dd29be933795e88c35b4a2706
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 4 17:52:37 2010 +0100

    add empathy_accounts_has_accounts

 src/empathy-accounts-common.c | 13 +++++++++++++
 src/empathy-accounts-common.h |  2 ++
 2 files changed, 15 insertions(+)

commit 8c8ad6b6959801d97881dba347ce8827d470c7a2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 4 17:31:40 2010 +0100

    remove the salut_created gconf key (#611817)

 data/empathy.schemas.in		 | 15 ---------------
 libempathy-gtk/empathy-conf.h		 |  1 -
 src/empathy-account-assistant.c	 |  6 ------
 src/empathy-auto-salut-account-helper.c | 19 -------------------
 4 files changed, 41 deletions(-)

commit 6cbff108ac6211bfdc3638f23f3226f6521449fc
Merge: 82d2397 b4d0635
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Mar 4 16:56:36 2010 +0000

    Merge branch 'tweaks'

commit b4d06351f186346bfc65204aa4057641bbde4649
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Mar 4 13:35:48 2010 +0000

    Cope with the favorite pixbuf not being available

    Not all icon themes have the favorite icon, so don't rely on it
    existing (if
    it's not there, just don't display a bookmark icon) Fixes: #611794

 libempathy-gtk/empathy-presence-chooser.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit 3550e13cd3e02e85962755851ce3ae2329ed02e3
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Mar 4 12:21:54 2010 +0000

    Connect to the accounts signals in one central place

 src/empathy-accounts-dialog.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

commit c15ddf6b53db97e61acd45da5fd8cc9f804d7625
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Mar 4 12:19:32 2010 +0000

    Cancel creation in the accounts dialog if the wizard is running

    If the account wizard is finished it should have created at least some
    accounts. Cancel any account creation that was going on in the
    accounts dialog
    so it nicely jumps showing the first real account :)

 src/cc-empathy-accounts-page.c | 24 +++++++++++++++++++++++-
 src/empathy-accounts-dialog.c	| 30 ++++++++++++++++++++++++++----
 src/empathy-accounts-dialog.h	|  4 ++++
 3 files changed, 53 insertions(+), 5 deletions(-)

commit 878756780bc822f5626101d6abd2157b99e9e3c8
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Mar 4 12:16:26 2010 +0000

    Don't assume there is always a settings widget available

    When we exit the assistant with just salut accounts there is no
    account widget
    for it in the normal sense, so don't crash if there isn't one. Fixes:
    #611792

 src/empathy-account-assistant.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

commit 82d23975943d3d1087c4c23ce88c78ae0dc468a0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Mar 4 15:19:12 2010 +0100

    Stop mapping 'B)' with the face-cool icon

    'B)' is a common pattern when explaining things or doing enumeration
    (#611753).

 libempathy-gtk/empathy-smiley-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 56872bd8f7c14cdb9a6cd303db3d21b008a6f07a
Merge: 3b09aca 7c9a7e0
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Mar 4 16:37:48 2010 +0100

    Merge branch 'clickable-link'

commit 7c9a7e0a126322fea64c7a4dfcd455400cafcbe8
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Mar 4 16:28:56 2010 +0100

    Add a comment explaining what does empathy_add_link_markup, and
    don't make parser list static

 libempathy-gtk/empathy-string-parser.c | 2 +-
 libempathy-gtk/empathy-string-parser.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 207c3bdd45e280beb019153ca6c844178f6e331a
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Mar 4 16:24:00 2010 +0100

    Also make links clickable in tooltip

    It is not clickable, but still nice looking

 libempathy-gtk/empathy-contact-widget.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

commit 1c9ef08484efd1596c57e1da7a17d3eb790d304d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Mar 3 16:51:48 2010 +0100

    Remove unused function empathy_toggle_button_set_state_quietly

 libempathy-gtk/empathy-ui-utils.c | 13 -------------
 libempathy-gtk/empathy-ui-utils.h |  6 ------
 2 files changed, 19 deletions(-)

commit 3b09acab5942361ac9ab12dc0a3bbbd10ffa42d7
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Wed Mar 3 22:15:52 2010 +0100

    Updated German translation

 po/de.po | 63
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 33 insertions(+), 30 deletions(-)

commit 2974961bd9d46886312db774fe5dfc86f133de17
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Wed Mar 3 19:42:43 2010 +0200

    Updated Arabic translation

 po/ar.po | 340
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 175 insertions(+), 165 deletions(-)

commit 62d4f1ef160e79dd0291959fb769432d3a2b0961
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 3 18:27:50 2010 +0100

    start dev of next release

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f2feaec269edf3af49eea8adc66788d856d6de05
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 3 14:00:08 2010 +0100

    prepare 2.29.91.1 release

 NEWS	      | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 50 insertions(+), 2 deletions(-)

commit 8b5548ea1250a6889856df24cd04e62ce65b9cc2
Author: vasudeven <agnihot3@gmail.com>
Date:	Wed Mar 3 21:32:27 2010 +0530

    updated Tamil translation

 po/ta.po | 342
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 175 insertions(+), 167 deletions(-)

commit 00ab069a55f05f0203bf58f071fa7adc54b6e9ac
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Mar 3 16:17:37 2010 +0100

    Make links clickable in presence message and topics

    Fixes bug #525576

 libempathy-gtk/empathy-chat.c		 |  8 +++++++-
 libempathy-gtk/empathy-contact-widget.c | 18 ++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

commit 2e9c6f70f0291f84b266915620930d97dec1a467
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Mar 3 15:48:07 2010 +0100

    New function empathy_add_link_markup() to be used with
    gtk_label_set_markup()

 libempathy-gtk/empathy-string-parser.c | 16 ++++++++++++++++
 libempathy-gtk/empathy-string-parser.h |  3 +++
 2 files changed, 19 insertions(+)

commit 3e4bea3436209cca9ce685fdbacec7fcc11f1388
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Mar 3 15:39:40 2010 +0100

    Make empathy_string_replace_link and empathy_string_replace_escaped
    public

    The code is moved from empathy-theme-adium.c

 libempathy-gtk/empathy-string-parser.c | 39 ++++++++++++++++++++++++++++
 libempathy-gtk/empathy-string-parser.h | 13 ++++++++++
 libempathy-gtk/empathy-theme-adium.c	| 46
 +++-------------------------------
 3 files changed, 56 insertions(+), 42 deletions(-)

commit 4f990cd2192a39f0b6111fc9aad1848aaeda11c4
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Mar 3 15:33:35 2010 +0100

    Reorganize code in empathy-ui-utils.ch to group related code

 libempathy-gtk/empathy-ui-utils.c | 26 +++++++++++++-------------
 libempathy-gtk/empathy-ui-utils.h | 19 ++++++++++++-------
 2 files changed, 25 insertions(+), 20 deletions(-)

commit e99f234b1e90869d04a17e300662b4be8c353bfe
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Mar 3 15:52:35 2010 +0100

    Move empathy_uri_regex_dup_singleton to be private inside
    empathy-string-parser.c

    Now that our code is correctly factored, that regex can be made
    private

 libempathy-gtk/empathy-string-parser.c | 25 ++++++++++++++++++++++++-
 libempathy-gtk/empathy-ui-utils.c	| 23 -----------------------
 libempathy-gtk/empathy-ui-utils.h	|  1 -
 3 files changed, 24 insertions(+), 25 deletions(-)

commit f48b89ce4d61d16843361636ad9f155451fde98d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Mar 3 15:31:45 2010 +0100

    Move empathy_string_parser API to its own file

 libempathy-gtk/Makefile.am		 |   2 +
 libempathy-gtk/empathy-chat-text-view.c |   1 +
 libempathy-gtk/empathy-string-parser.c  | 131
 ++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-string-parser.h  |  74 ++++++++++++++++++
 libempathy-gtk/empathy-theme-adium.c	 |   1 +
 libempathy-gtk/empathy-ui-utils.c	 | 104 -------------------------
 libempathy-gtk/empathy-ui-utils.h	 |  45 -----------
 7 files changed, 209 insertions(+), 149 deletions(-)

commit d6c60c80075fac5b34d23d37ec7826835fd02cd6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Mar 3 15:02:51 2010 +0000

    Use the right marshaller for account-created

    Don't try to marshal G_TYPE_OBJECT values with a _POINTER marshaller.
    Fixes: #611224

 libempathy-gtk/empathy-account-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 21ffdb809e2ce2f9a67977ccdc2527a887e54d33
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Wed Mar 3 14:44:29 2010 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 435
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 243 insertions(+), 192 deletions(-)

commit 73b1b8d04ee110d6f9f6f52ba62d26acec06f0f2
Author: Iswandi Basri <pedangsakti@yahoo.com>
Date:	Wed Mar 3 13:31:01 2010 +0100

    Update Malaj translation. Fixes bug 605878.

 po/ms.po | 4165
 +++++++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 3166 insertions(+), 999 deletions(-)

commit 0a7c5c811ceb721a16c69a010c50cd3e20be8f28
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Wed Mar 3 13:18:10 2010 +0100

    Updated Polish translation

 po/pl.po | 2246
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1420 insertions(+), 826 deletions(-)

commit 4728aaffa21812eb2e6bd8b9eeac0cceccb85437
Merge: 46adf4f 1dab115
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 3 11:54:57 2010 +0100

    Merge branch 'update-display-name-603463'

commit 1dab11523a8fffd546d154ca21c79a8c76d0c3c0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 3 11:46:30 2010 +0100

    update display name after editing if it hasn't been overridden
    (#603463)

 libempathy-gtk/empathy-account-widget.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit b0ef41dd204e2841a3f1eeb6c5dca709f2e725b1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 3 11:45:39 2010 +0100

    account-widget: try to guess if the display name has been manually
    changed by the user

 libempathy-gtk/empathy-account-widget.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit b31d50fb0533f178263d8ce111b56517dd0faf9a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 3 11:44:24 2010 +0100

    empathy_account_settings_set_display_name_async: don't do anything
    if not needed

 libempathy/empathy-account-settings.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit f4d060f23d99950a2686fc1dffa2101fd855e82a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 3 11:43:46 2010 +0100

    no need to call empathy_account_settings_is_ready in account-widget's
    dispose function

 libempathy-gtk/empathy-account-widget.c | 2 --
 1 file changed, 2 deletions(-)

commit 46adf4f15f0d9fee5b3b2e22e2cffca0d48a7184
Author: Alexander Shopov <ash@contact.bg>
Date:	Wed Mar 3 11:46:45 2010 +0200

    Updated Bulgarian translation

 po/bg.po | 329
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 166 insertions(+), 163 deletions(-)

commit 67308bd569a5a3884225b65b8514725fdf8f3117
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 3 10:23:01 2010 +0100

    accounts-dialog: set display-name before creating the account

    This saves us a D-Bus call.

 libempathy-gtk/empathy-account-widget.c | 13 +++++++++++++
 src/empathy-accounts-dialog.c		 |  9 ---------
 2 files changed, 13 insertions(+), 9 deletions(-)

commit 37ae70ceec9ead69d1584067ed9a489f309d1961
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 3 10:15:37 2010 +0100

    assistant: call empathy_account_widget_get_default_display_name
    before actually creating the account

    This saves us a D-Bus call.

 src/empathy-account-assistant.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit 46d00adb33b8b356e56f633d2ac25dfa06705bbe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Mar 3 09:48:23 2010 +0100

    assistant: always uses empathy_account_widget_get_default_display_name
    to get a better display name

    EmpathyAccountSettings is created with a default display name such as
    "New
    Jabber account". But once the account has been created we want to
    update it to
    a more relevant name. (#611675)

 src/empathy-account-assistant.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

commit 4a7553f1f6ab0f7675da83749ab91515450f9944
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Wed Mar 3 07:48:12 2010 +0100

    Updated Spanish translation

 po/es.po | 62
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 33 insertions(+), 29 deletions(-)

commit 36ea10ea3a0bdbd6300bea47cedeab4cc08751a2
Merge: 5697449 52d67df
Author: Travis Reitter <treitter@gmail.com>
Date:	Tue Mar 2 10:57:36 2010 -0800

    Merge branch 'more-accounts-fixes'

commit 56974492dc44aaa3b993e30b7338b58ab723afd3
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Tue Mar 2 19:08:29 2010 +0100

    Updated Italian translation

 po/it.po | 145
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 72 insertions(+), 73 deletions(-)

commit 52d67df161e27a893bc24a13a50d86bf251f5ad9
Author: Travis Reitter <treitter@gmail.com>
Date:	Tue Mar 2 09:06:12 2010 -0800

    Remove EmpathyAccountsPlugin's requirement that it be a singleton,
    so we can reset the embedded control panel to a sane state every
    time we open it.

 src/cc-empathy-accounts-page.c | 26 +++++++++++++++-----------
 src/empathy-accounts-dialog.c	| 27 ---------------------------
 2 files changed, 15 insertions(+), 38 deletions(-)

commit b3b45bb5fddd4a52fddf719ae6b79909d11632b0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 2 16:52:09 2010 +0100

    empathy-accounts: the TpDBusDaemon is not used any more

 src/empathy-accounts.c | 1 -
 1 file changed, 1 deletion(-)

commit d1aba86ad64035b92811b0c0a33b3409754c956f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 2 10:25:52 2010 +0100

    account-assistant: ensure that new accounts are connected (#611565)

 src/empathy-account-assistant.c | 2 ++
 1 file changed, 2 insertions(+)

commit b7329ee88d54447ed5b8a0de32a6b26a25ef5024
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 2 10:25:46 2010 +0100

    factor out empathy_connect_new_account

 libempathy-gtk/empathy-account-widget.c | 28 +------------------------
 libempathy/empathy-utils.c		 | 37
 +++++++++++++++++++++++++++++++++
 libempathy/empathy-utils.h		 |  4 ++++
 3 files changed, 42 insertions(+), 27 deletions(-)

commit 2af6c1375e1465566d57170d8090e1b425de88fa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Mar 2 10:03:40 2010 +0100

    account-widget: change presence to online when creating a new account

    account_widget_account_enabled_cb was forcing the presence by
    setting the
    current most available presence to the newly created account.
    But if user was starting Empathy for the first time, this presence
    was offline
    so the account wasn't connected. (#611565)

 libempathy-gtk/empathy-account-widget.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit b228ca8e3fd252d289f06699c0e1f6bc62f6ea5b
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Tue Mar 2 15:29:53 2010 +0100

    Updated Slovenian translation

 po/sl.po | 58 ++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 32 insertions(+), 26 deletions(-)

commit 41ca7cb4fea39f928976b7b69466a61c78a5f7ed
Merge: 74b2a16 3c8e671
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Mar 2 11:39:14 2010 +0000

    Merge branch 'accounts-wizard'

commit 3c8e671463630b94f8238ea8caaf6a03b2165278
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Mar 2 11:17:54 2010 +0000

    Remove code that will always fail and has no use

    libunique will already register a unique name and we have no
    other dbus
    services so we don't need to register a unique name ourselves. Also
    trying to register one which is the same as what we suggest to
    libunique
    will always fail and is thus pointless

 src/empathy-accounts.c | 20 --------------------
 1 file changed, 20 deletions(-)

commit 9a9ce40c7f0a6e5fc19e035dba5c1812a9d4434a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Mar 2 11:17:35 2010 +0000

    Improve debugging and don't use g_debug

 src/empathy-accounts-common.c | 2 +-
 src/empathy-accounts-dialog.c | 5 +++++
 src/empathy.c		       | 1 -
 3 files changed, 6 insertions(+), 2 deletions(-)

commit 0309966cb4998548e404c1d76bd6c94a5e0f4259
Author: Travis Reitter <treitter@gmail.com>
Date:	Mon Mar 1 15:54:13 2010 -0800

    Disable the Cancel button in the accounts dialog if there are no
    existing accounts to display (ie, we're creating our first account).

 libempathy-gtk/empathy-account-widget.c | 44 ++++++++++++++++++--
 libempathy-gtk/empathy-account-widget.h |  3 ++
 src/empathy-accounts-dialog.c		 | 73
 ++++++++++++++++++++++++++++++++-
 3 files changed, 116 insertions(+), 4 deletions(-)

commit 7210d151056d3c0a1b0469f7af1aee06b7805538
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Mar 1 19:01:54 2010 +0000

    Simplify empathy_accounts_import

 src/empathy-accounts-common.c | 25 ++++++-------------------
 src/empathy-accounts-common.h |  2 +-
 2 files changed, 7 insertions(+), 20 deletions(-)

commit b0de7c5d5d8c93dd7b74a77b4892c331f37f5441
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Mar 1 18:59:38 2010 +0000

    Make the empathy-account code be slightly more streamlined

    On every run of the accounts UI we should try to import MC4 accounts
    (if they
    weren't imported already). Also replace the --try-import option with
    --if-needed to better document the fact that it will only display
    the UI if
    needed.

 src/empathy-accounts-common.c | 56 +---------------------------
 src/empathy-accounts-common.h |  4 --
 src/empathy-accounts-dialog.c |  6 +--
 src/empathy-accounts-dialog.h |  2 +-
 src/empathy-accounts.c        | 85
 ++++++++++++++++++++++++-------------------
 src/empathy.c		       |  5 ++-
 6 files changed, 55 insertions(+), 103 deletions(-)

commit 886357ee6af17fe37523337209a09aa6f3112604
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Mar 1 18:32:28 2010 +0000

    Always popup the accounts wizard if we don't have salut accounts

 src/cc-empathy-accounts-page.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 8fb1b3a30ee4a9bc98087781cd6651cab8c4c96d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Mar 1 18:28:24 2010 +0000

    Only launch empathy-accounts if needed

 src/empathy.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 8254654ccb030f05cd72f1c011d02c4de8816589
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Mar 1 18:25:19 2010 +0000

    Also potentially popup the account dialog when activate by libunique

 src/empathy.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 74b2a167ce29bbda607b1b1a0ac8ef96c51a924c
Author: Jennie Petoumenou <epetoumenou@gmail.com>
Date:	Mon Mar 1 08:40:05 2010 -0800

    Updated Greek translation

 po/el.po | 771
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 402 insertions(+), 369 deletions(-)

commit 2f54d54b0f73b08de6be479eb62bf49b4a1162dc
Merge: 2af7013 5b1255d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Mar 1 13:41:46 2010 +0100

    Merge commit 'ka/tpl-0.1.1'

commit 2af7013df4478db4683da15582705da493cb4cef
Author: blueomega <blueomega.gmail.com>
Date:	Mon Mar 1 07:59:32 2010 +0200

    Updated Hebrew translation

 po/he.po | 1777
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 1022 insertions(+), 755 deletions(-)

commit 67c96f4177dfc04a36e853957b0bef7825fded55
Author: Daniel Nylander <po@danielnylander.se>
Date:	Sun Feb 28 21:04:03 2010 +0100

    Updated Swedish translation

 po/sv.po | 356
 ++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 159 insertions(+), 197 deletions(-)

commit 165cfca726200c8df42a031686301f86bc67f530
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 26 14:20:04 2010 +0000

    remove empathy-starred and empathy-unstarred icons

    We don't need those any more.

 data/icons/Makefile.am				     |	10 ----------
 data/icons/hicolor_apps_16x16_empathy-starred.png   | Bin 1468 -> 0 bytes
 data/icons/hicolor_apps_16x16_empathy-unstarred.png | Bin 1424 -> 0 bytes
 data/icons/hicolor_apps_22x22_empathy-starred.png   | Bin 2310 -> 0 bytes
 data/icons/hicolor_apps_22x22_empathy-unstarred.png | Bin 2390 -> 0 bytes
 data/icons/hicolor_apps_24x24_empathy-starred.png   | Bin 2634 -> 0 bytes
 data/icons/hicolor_apps_24x24_empathy-unstarred.png | Bin 2693 -> 0 bytes
 data/icons/hicolor_apps_32x32_empathy-starred.png   | Bin 3989 -> 0 bytes
 data/icons/hicolor_apps_32x32_empathy-unstarred.png | Bin 4086 -> 0 bytes
 data/icons/hicolor_apps_48x48_empathy-starred.png   | Bin 2658 -> 0 bytes
 data/icons/hicolor_apps_48x48_empathy-unstarred.png | Bin 2255 -> 0 bytes
 11 files changed, 10 deletions(-)

commit 379db3d78312b3159693d8c98a1b6ee0805702d1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 26 14:19:06 2010 +0000

    update the not-favorite icon when the theme is changed

 libempathy-gtk/empathy-presence-chooser.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit 96f6ab994f7631af1a478f0f625357976195ace0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 26 14:04:00 2010 +0000

    presence-chooser: Grey the 'favorite' icon when the status is not
    a favorite

    This is more coherent as the favorite icon is now theme dependent
    and fix the
    problem that the old unstarred icon was not really visible (#584629).

 libempathy-gtk/empathy-presence-chooser.c | 27
 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

commit a8afec3bb227e3a04a3cbb4d6b14f5ba5882654a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 26 13:42:43 2010 +0000

    presence-chooser: use 'emblem-favorite' instead of our own icon

    gnome-icon-theme has an icon for favorites; we should use it
    instead of
    re-inventing our own.

 libempathy-gtk/empathy-presence-chooser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 79df35b2f0c0d68ec60ae880c70b17cc014c684d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 26 13:35:53 2010 +0000

    accounts-dialog: update the status info when account when account
    is enabled

    If we are offline and we enable a disabled account, the info bar
    message
    should be updated from "Acconut Disabled" to "Status is set to
    Offline"
    (#610847).

 src/empathy-accounts-dialog.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 74be0ae5e7a1c1fe845a056cd38977c649e0989a
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Feb 26 15:13:36 2010 -0800

    When we're creating our first account, don't let the remove button
    become sensitive when we change the account protocol

 src/empathy-accounts-dialog.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit d5ae581b39fd3532e8a8e90d383164039b2fafc7
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Feb 26 12:08:27 2010 -0800

    Don't create some extra "ghost" account if we're creating our first
    account and we change protocols in the protocol combo box.

 src/empathy-accounts-dialog.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit a84e1e573eec373609ede78a56103dbab3da6046
Merge: 79c2194 08cf375
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Sat Feb 27 09:19:13 2010 +1100

    Merge branch 'show-assistant-611131'

commit 79c219478f9ace0c2a767771def2c81ddc6e1a3a
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Fri Feb 26 21:19:58 2010 +0100

    Updated Italian translation

 po/it.po | 187
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 95 insertions(+), 92 deletions(-)

commit 2bc424cbbdc47ddd1e8cc76273a8c09b782afbb6
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Fri Feb 26 21:18:26 2010 +0100

    Updated German translation

 po/de.po | 252
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 126 insertions(+), 126 deletions(-)

commit b847ad5c4af3920bed5fa880ae2c4416725fc3f9
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Fri Feb 26 15:24:30 2010 +0100

    Updated Slovenian translation

 po/sl.po | 256
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 129 insertions(+), 127 deletions(-)

commit b4bb3fb577d6eaddaa8ca90fff22ef96e37ad356
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Fri Feb 26 14:56:57 2010 +0100

    Updated Spanish translation

 po/es.po | 248
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 123 insertions(+), 125 deletions(-)

commit 5b1255d0e3e92635985aa058bdd87670e8891095
Author: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Date:	Fri Feb 26 13:52:36 2010 +0000

    Update to TPL 0.1.1

    Updated the the pkg-config version to 0.1.1
    Updated the the pkg-config dep name fom libtelepathy-logger to
    telepathy-logger
    Updated TPL's _finish() methods using one for each async API.

 configure.ac			     |	4 ++--
 libempathy-gtk/empathy-chat.c	     |	2 +-
 libempathy-gtk/empathy-log-window.c | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

commit f0b184b4100b558e418fb5879fed994c6d48fca2
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Fri Feb 26 13:30:51 2010 +0200

    Estonian translation updated

 po/et.po | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

commit 4baafa4a6c64a678e0f52a376d3907337297ac2f
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Fri Feb 26 13:10:10 2010 +0200

    Estonian translation updated

 po/et.po | 132
 +++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 91 insertions(+), 41 deletions(-)

commit 04a3f49597c3ffb367b48fe6c01f972bdd15ea11
Merge: e86aa10 28244a9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 26 08:49:16 2010 +0000

    Merge commit 'ka/empathy-tpl-20100225-ifdef'

commit e86aa1065dbf60d7a1e68bf50d9fbbccbb34312a
Author: Rob Bradford <rob@linux.intel.com>
Date:	Thu Feb 25 22:16:09 2010 +0000

    Remove the SKIP_TASKBAR hint when the main window is activated

 src/empathy.c | 1 +
 1 file changed, 1 insertion(+)

commit 3403dfda538c4ff2d3eacfb3b148602d493033ea
Author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
Date:	Mon Feb 22 21:23:43 2010 -0600

    Add the capability to search debug messages in the debug window.

 src/empathy-debug-window.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

commit 08cf375e793f4f9255e10ca61850af279a07ce1a
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Feb 26 11:56:24 2010 +1100

    empathy-accounts: Check to see if there are no accounts thus show
    the assistant

    Fixes: #611131

 src/empathy-accounts-common.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 28244a9c41e2c4274d2cb298c20b5e8909f7578a
Author: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Date:	Thu Feb 25 19:15:15 2010 +0000

    moving retrieving_backlog = FALSE right before
    empathy_chat_messages_read()

    or it will allow race conditions

 libempathy-gtk/empathy-chat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9010489b970c479609c095ec6b15b1e893e8b548
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Feb 25 12:30:56 2010 +0000

    Don't try to close channels thrice.

    Fixes: #611071

 libempathy/empathy-tp-chat.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 8d4d46e440c7a6bd321fc098265db8ede27c07de
Author: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Date:	Tue Feb 23 19:32:57 2010 +0000

    TPL Enabling patch, all-in-one.

    By default TPL is disabled, use --enable-tpl configure option to
    enable it.

 configure.ac				|  28 ++
 libempathy-gtk/Makefile.am		|   2 +
 libempathy-gtk/empathy-chat.c		| 183 +++++++++--
 libempathy-gtk/empathy-contact-menu.c	|  18 +-
 libempathy-gtk/empathy-log-window.c	| 533
 ++++++++++++++++++++++++++++++++-
 libempathy/Makefile.am			|  34 ++-
 libempathy/empathy-contact.c		|  30 ++
 libempathy/empathy-contact.h		|   7 +
 libempathy/empathy-log-manager.h	|   4 +
 libempathy/empathy-log-store-empathy.h |   4 +
 libempathy/empathy-log-store.h		|   4 +
 libempathy/empathy-message.c		|  78 +++++
 libempathy/empathy-message.h		|   6 +
 src/Makefile.am			|   2 +
 src/empathy-chat-window.c		|   2 +
 src/empathy.c				|  18 +-
 16 files changed, 909 insertions(+), 44 deletions(-)

commit 53271ff381e1908a6d99a188d6030e4f859e182d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 25 17:24:48 2010 +0000

    set empathy_released to 0

    I forgot to set it after latest release...

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 351da00be344cf578612ae5ef5eb2d708473dd77
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 25 15:46:00 2010 +0000

    show map license

 libempathy-gtk/empathy-contact-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d74946a42f83c5daaf0847011d722cf6138a4eed
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 25 09:51:23 2010 +0000

    contact-widget: increase zoom on map

 libempathy-gtk/empathy-contact-widget.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 8e24107b437f63d9b2ca93e0d5b7379ee87af98d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Feb 25 15:24:52 2010 +0000

    Cope with tp-glib calling the callback in sync

 libempathy/empathy-dispatcher.c | 45
 ++++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 16 deletions(-)

commit 0e74039b5cadb3e33aa01f5c2f3650b9d39f16ae
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Feb 25 15:18:10 2010 +0000

    No reason to get Channels from connections, that's MCs job

 libempathy/empathy-dispatcher.c | 27 ---------------------------
 1 file changed, 27 deletions(-)

commit 3e67f2f4f77ba1e59f69721f9821a482cba1678a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 25 09:42:07 2010 +0000

    contact-widget: display map even if contact only published his lat/lon

    We used to hide the whole location vbox if no field was displayed
    in the
    location table (such as street, city, etc).
    But if contact only publishes it's lat and lon, we can at least
    display the
    map widget. (#611062)

 libempathy-gtk/empathy-contact-widget.c | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

commit ed582f419d68c95dabfc26d4453c89d0d7f038a4
Merge: 81aeb65 0653070
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 24 20:14:24 2010 +0000

    Merge branch 'requests'. Fixes: #598905

commit 81aeb65dee8294293fca221cf72a63cefde67d07
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Wed Feb 24 20:36:52 2010 +0200

    Updated Arabic translation

 po/ar.po | 43 ++++++++++++++++---------------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

commit 065307088d490e8f8bc4c04d3981b047c9fb408f
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 24 16:50:54 2010 +0000

    Not using the weak object anymore, get the dispatcher request data
    from request data

 libempathy/empathy-dispatcher.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit c292475ad620051bc676321adfb832b8efca770c
Author: Sander Dijkhuis <sander.dijkhuis@gmail.com>
Date:	Tue Feb 23 23:08:21 2010 +0100

    Remove inset frame from contact list in main window

    This looks cleaner. (#610886)

 src/empathy-main-window.ui | 1 -
 1 file changed, 1 deletion(-)

commit 1e878d27797a90e0602180972f1727caed6c87eb
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 24 15:55:14 2010 +0000

    Use a appropriate unique name for Empathy unique app

 libempathy/empathy-utils.h | 2 --
 src/empathy-debug-window.c | 4 ++--
 src/empathy.c		    | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

commit b05a5abcc6842be084aa12632b8ddd8d11dfa485
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 24 14:44:09 2010 +0000

    Assert that the account exists

 libempathy/empathy-dispatcher.c | 2 ++
 1 file changed, 2 insertions(+)

commit 05caf0ff7d093fa342fbff5e7c0e681750bf1523
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Feb 24 14:43:56 2010 +0000

    Small coding style fix

 libempathy/empathy-dispatcher.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit c98d650deadd48624a6dba026aa466ddc5b58626
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Oct 12 16:33:45 2009 -0400

    Set ourselves as the preferred handler if there is a callback

 libempathy/empathy-dispatcher.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 0e9bd3f5a6c19512f088993bfac8cec6aaabff7b
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Oct 12 14:11:58 2009 -0400

    If we're asked to handle a channel twice, assume it's due to user
    action

 libempathy/empathy-dispatcher.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

commit eea99156d893167e6289906e4c237ad5210dbc99
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Sep 2 18:29:48 2009 +0100

    Add a debug message for when errors are signaled

 libempathy/empathy-ft-handler.c | 2 ++
 1 file changed, 2 insertions(+)

commit eb8a6e36a56cbc3342368baf8190e0ef17e9a8f7
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Sep 2 18:29:32 2009 +0100

    Add a convenience function to get the busname of a handler

 libempathy/empathy-handler.c | 10 +++++++++-
 libempathy/empathy-handler.h |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

commit 871cd053641dfb087db16e120c53c338cc442d4a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Sep 1 16:19:54 2009 +0100

    Output the path before trying to register it

 libempathy/empathy-handler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 09a20a4289d896f18360be9020c984876d55a29b
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Sep 1 16:18:10 2009 +0100

    Replace tabs with spaces

 libempathy/empathy-handler.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 696f7bdae93846bdf809ae7e19be5f2ea9913fe6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Sep 1 15:20:27 2009 +0100

    Remove dead code related to outstanding channels

    With the move to the ChannelDispatcher channels we've requested will
    either not
    be dispatched through HandleChannels (because we used the old way
    of directly
    requesting it on the MC) or will get passed after we've started the
    request and
    can thus be dispatched right away. The concept of oustanding channel
    is thus
    obsolete.

 libempathy/empathy-dispatcher.c | 98
 +----------------------------------------
 1 file changed, 2 insertions(+), 96 deletions(-)

commit 93aeafe92673b2e383fbfe3426c7ab918829d7ad
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Sep 1 14:18:42 2009 +0100

    Don't ever drop requested channels

    Before moving to the ChannelDispatcher we got channels either
    through the
    NewChannel(s) signal or as a result of requesting a channel from
    the CM. Now
    that we've moved to the ChannelDispatcher, we only get channels that
    we should
    handle through HandleChannels. So we shouldn't filter any of them.

 libempathy/empathy-dispatcher.c | 11 -----------
 1 file changed, 11 deletions(-)

commit 6c349195014a84995fa3283611eebd77f66046d3
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Sep 1 14:18:02 2009 +0100

    Check if channels we requested satisfy requests

 libempathy/empathy-dispatcher.c | 69
 ++++++++++++++++++++++++++++++-----------
 1 file changed, 51 insertions(+), 18 deletions(-)

commit 6298cb37bb9a2d5ba87be44733136f6f373c9941
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Sep 1 11:45:22 2009 +0100

    Request channels from the CD instead of the CM

 libempathy/empathy-dispatcher.c | 168
 +++++++++++++++++++++++++++++++++-------
 1 file changed, 141 insertions(+), 27 deletions(-)

commit d66105db6105b9ffc3ede09b2513f1243e0a426d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 24 15:05:15 2010 +0000

    empathy_account_settings_has_account: cope with priv->account
    being NULL

    priv->account is not garantee to be set so
    empathy_account_settings_has_account
    shouldn't assume it is (#610942).

 libempathy/empathy-account-settings.c | 3 +++
 1 file changed, 3 insertions(+)

commit 6ba961fc2bd6d0e1e5b58ad5509ed0b63c427c74
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Wed Feb 24 22:39:09 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 25 ++++++++++++-------------
 po/zh_TW.po | 25 ++++++++++++-------------
 2 files changed, 24 insertions(+), 26 deletions(-)

commit b40ac31881aeb905e0d7fde73f5ac4e5d1f50152
Author: Bruce Cowan <bcowan@fastmail.co.uk>
Date:	Wed Feb 24 13:54:00 2010 +0000

    Updated British English translation

 po/en_GB.po | 1131
 +++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 631 insertions(+), 500 deletions(-)

commit 25d5765846da294ca8b42e9ff4d2c25be84cf763
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Tue Feb 23 22:27:56 2010 +0100

    Updated German translation

 po/de.po | 853
 +++++++++++++++++----------------------------------------------
 1 file changed, 223 insertions(+), 630 deletions(-)

commit 775fecfd93f0df135771692526f1af3ac864819d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 23 14:39:10 2010 +0000

    contact-selector: EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS contains
    a pixbuf now

 libempathy-gtk/empathy-contact-selector.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1c9bb59ff2669b5778dfe551288b5f5af0676318
Author: Brian Pepple <bpepple@fedoraproject.org>
Date:	Mon Feb 22 19:39:31 2010 -0500

    Add missing libm linking (#610751)

 src/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit e11a543286c84b3c1cdd3d7c616ed555bbe715ee
Author: Alexander Shopov <ash@contact.bg>
Date:	Tue Feb 23 10:11:41 2010 +0200

    Updated Bulgarian translation

 po/bg.po | 389
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 226 insertions(+), 163 deletions(-)

commit 700fcc2dfb0d745b79e25f37828d63f8c3b828b4
Author: Daniel Nylander <po@danielnylander.se>
Date:	Mon Feb 22 22:42:11 2010 +0100

    Updated Swedish translation

 po/sv.po | 390
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 219 insertions(+), 171 deletions(-)

commit 510ac416e1e33ce0f655e47837e0e4e4202a46a5
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Mon Feb 22 22:31:18 2010 +0100

    Updated Italian translation

 po/it.po | 2058
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 1238 insertions(+), 820 deletions(-)

commit cbbc6043ad0ad96af8d0fb77712ac9431cf91585
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 22 14:14:35 2010 +0000

    prepare 2.29.91 release

 NEWS	      | 64
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 66 insertions(+), 2 deletions(-)

commit df4b9f7d0799110489721ee3d2c537ad2645a8e8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 22 09:15:43 2010 +0000

    Remove the --acounts CLI option

    We should use empathy-accounts directly now.

 src/empathy.c | 56
 +++++++++++++-------------------------------------------
 1 file changed, 13 insertions(+), 43 deletions(-)

commit 1b3ea6b00704d60166a1733894184105edf04586
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 22 13:08:37 2010 +0000

    define EMPATHY_CLIENT_NAME

 libempathy/empathy-utils.h | 2 ++
 src/empathy-debug-window.c | 2 +-
 src/empathy.c		    | 3 +--
 3 files changed, 4 insertions(+), 3 deletions(-)

commit 8cdf004d3b499cf73aaf6ceb92ec9f1c58331d7a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 22 09:14:03 2010 +0000

    remove old services from gitignore

 src/.gitignore | 3 ---
 1 file changed, 3 deletions(-)

commit 99ce33b5078ef5db9dcaf198a2c739fd88f8feb2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 22 09:12:04 2010 +0000

    Stop using org.gnome.Empathy

    We can use org.freedesktop.Telepathy.Client.Empathy to check if
    another
    Empathy instance is running.

 src/empathy.c | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

commit 8b7b49e0fa549ead1f7f8a62914f3c50576fac10
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 22 09:04:20 2010 +0000

    debug_window_fill_cm_chooser: use
    org.freedesktop.Telepathy.Client.Empathy

 src/empathy-debug-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 97334b2ceab261eb75f4eadbbb5acb51a59bf0eb
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date:	Sun Feb 21 19:46:11 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 298
 +++++++++++++++++++++++++++++++++--------------------------
 po/zh_TW.po | 302
 ++++++++++++++++++++++++++++++++++--------------------------
 2 files changed, 335 insertions(+), 265 deletions(-)

commit 520cdecad9de9f6c7ace28856d6089b45872377e
Author: Fran Diéguez <frandieguez@ubuntu.com>
Date:	Sat Feb 20 22:23:05 2010 +0100

    Updated Galician Translation

 po/gl.po | 233
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 116 insertions(+), 117 deletions(-)

commit 15d71955d6c65cc9f4a70a97979d109af3b72df1
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Sat Feb 20 22:30:22 2010 +0200

    Updated Arabic translation

 po/ar.po | 522
 ++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 313 insertions(+), 209 deletions(-)

commit d5a96cec5e4cf549a86f5b331f77c9c09abe02a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 19 16:02:31 2010 +0000

    always use empathy_tp_chat_leave instead of _close

 libempathy/empathy-tp-chat.c | 6 +++---
 libempathy/empathy-tp-chat.h | 1 -
 src/empathy-event-manager.c  | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

commit c8166c52a0b133c3af082277270d3f911f634163
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 19 15:43:17 2010 +0000

    empathy_tp_chat_leave: try to remove the self-handle instead of
    closing (#610461)

 libempathy/empathy-tp-chat.c | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

commit 998ef19cf8a2e546208d1fb0a835032a7e07e543
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 19 15:26:58 2010 +0000

    Introduce empathy_tp_chat_leave

 libempathy-gtk/empathy-chat.c | 2 +-
 libempathy/empathy-tp-chat.c  | 6 ++++++
 libempathy/empathy-tp-chat.h  | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

commit 6e6f54464f4fe105bbda956699a6fc130c72b8d0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 19 11:09:38 2010 +0000

    assistant: Fix creation of the last account created

    When user enters the details about his last account, the 'prepare'
    signal is
    not fired. So we should create the account in impl_signal_apply
    instead.
    Fixes bug #609995.

 src/empathy-account-assistant.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 95466c01c61e06f33c29b9a243789e6ef34335d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 19 10:14:39 2010 +0000

    assistant: check that the enter/create page isn't already valid when
    switching protocol

 src/empathy-account-assistant.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 96254dab84d19af25964e0d6a1a73b0872428222
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 19 09:59:45 2010 +0000

    assistant: set the salut page as complete if we pre-filled enough
    fields (#610380)

 src/empathy-account-assistant.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 8ce1c64808b2772e61be3f162defa22072117267
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Feb 19 09:15:00 2010 +1100

    Rename Moblin to Meego throughout Empathy

    At the request of Rob Bradford

 configure.ac				 | 34 ++++++++++++------------
 libempathy-gtk/Makefile.am		 |  4 +--
 libempathy-gtk/empathy-account-widget.c | 46
 ++++++++++++++++-----------------
 src/empathy-accounts-dialog.c		 | 12 ++++-----
 4 files changed, 48 insertions(+), 48 deletions(-)

commit 2917ac10a8a99e348648825990b7ae1088a3aacc
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Thu Feb 18 13:45:47 2010 +0100

    Updated Slovenian translation

 po/sl.po | 240
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 117 insertions(+), 123 deletions(-)

commit 7b03cea8d49bd2d09b4c93fe04fd5bb9dd542d53
Author: Djavan Fagundes <djavan@comum.org>
Date:	Wed Feb 17 22:46:48 2010 -0200

    Updated Brazilian Portuguese translation

 po/pt_BR.po | 3263
 ++++++++++++++++++++++++-----------------------------------
 1 file changed, 1335 insertions(+), 1928 deletions(-)

commit 4bc690a44edd3bbe18d321893fa21b1c23b5c216
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Wed Feb 17 22:07:58 2010 +0100

    Updated Italian help translation

 help/it/it.po | 2469
 ++++++++++++++++-----------------------------------------
 1 file changed, 703 insertions(+), 1766 deletions(-)

commit efba0ae450f343ba1eea5af8702c1910c672d40a
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Wed Feb 17 22:05:55 2010 +0100

    [help] Fixed two strings: now they are similar

 help/C/import-account.page    | 2 +-
 help/C/irc-nick-password.page | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit c4e99fdfefcfe81a8ddb41fba9cc8f56d95ef9bc
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Wed Feb 17 21:00:34 2010 +0100

    Updated Spanish translation

 help/es/es.po | 227
 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 110 insertions(+), 117 deletions(-)

commit 0625fb11e5a203dfe74df6b06df4035bc9fafef4
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Wed Feb 17 21:00:31 2010 +0100

    Updated Spanish translation

 po/es.po | 242
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 123 insertions(+), 119 deletions(-)

commit 399aaaeee55ad253dd39a99664558f8124ce842a
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Feb 17 18:43:26 2010 +0100

    Point Makefile.am to .lo files, to please some libtool deity

 tests/interactive/Makefile.am | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 32061585dc6be565457a19df27037bd91ff01210
Author: vasudeven <agnihot3@gmail.com>
Date:	Wed Feb 17 21:25:15 2010 +0530

    updated Tamil translation

 po/ta.po | 450
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 251 insertions(+), 199 deletions(-)

commit 93f0695d387c3cb939c052848aa4c002090ddc81
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 16 14:55:59 2010 +0000

    Don't display the 'respond' button in presence notifications (#610032)

    This button doesn't make anything as this event is not
    activatable. Plan is to
    display better button at some point (see bug 597124) but for now
    let's remove
    this button when it's useless.

 src/empathy-status-icon.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit a32038569c0eec120ef9ff0c75bcc12e98fde1fa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 16 14:45:04 2010 +0000

    remove EMPATHY_EVENT_TYPE_TUBE

    It's not used any more.

 src/empathy-event-manager.h | 1 -
 1 file changed, 1 deletion(-)

commit dd01b11f2a0cda9384ceb4ebdcbfac22c51a1981
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 16 17:09:16 2010 +0000

    account-assistant: remove '\n' from the salut error web page

    Wrapping the label will add them for us.

 src/empathy-account-assistant.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit a921a695e89f621cdd62e5dc9c003eb943b6ccd4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 16 17:07:50 2010 +0000

    account-assistant: Wrap secondary error message (#607908)

 src/empathy-account-assistant.c | 1 +
 1 file changed, 1 insertion(+)

commit 8429eac0cc68664c1c19ad99b8343fae5f03eefb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 16 17:54:50 2010 +0000

    main-window: use GTK_MESSAGE_ERROR for account error info bars

    The accounts dialog uses this message type in this case which makes
    more sense
    as that's an really an error (#609822).

 src/empathy-main-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 37aabc6b1e5b97747da6bb1b3070fa2fdaffa530
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Feb 16 16:38:21 2010 +0000

    Use TpDebugSender to publish debug messages (#607330)

 libempathy/Makefile.am        |   2 -
 libempathy/empathy-debug.c    |  14 ++-
 libempathy/empathy-debugger.c | 270
 ------------------------------------------
 libempathy/empathy-debugger.h |  88 --------------
 src/empathy-debug-window.c    |  27 +++--
 src/empathy.c		       |  41 ++-----
 6 files changed, 34 insertions(+), 408 deletions(-)

commit fd49fd64d74d56ae4e1cf514edfb1aec348832a4
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Tue Feb 16 18:38:00 2010 +0100

    [help] Fixed the Apply button on account creation
    * Added a small section about proxy configuration
    * Updated the errors topics
    * Fixed a capitalization glitch, at least now titles are all the same

 help/C/add-account.page	    |  2 +-
 help/C/audio-video.page	    |  2 +-
 help/C/prob-conn-acctdisabled.page |  2 +-
 help/C/prob-conn-auth.page	    | 12 +++++++-----
 help/C/prob-conn-name.page	    |  4 +++-
 help/C/prob-conn-neterror.page     | 25 +++++++++++++++++++------
 6 files changed, 32 insertions(+), 15 deletions(-)

commit 613e72b79f276b5258ca06eece2fc5fa11edf232
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 16 12:19:10 2010 +0000

    empathy_accounts_dialog_show_application: try to run
    "empathy-accounts" from source

    This fix starting the accounts dialog for people (testers mostly)
    using
    Empathy from a not installed build.

 src/empathy-accounts-dialog.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 4253e9ae71c3df9918e1ee4f81ecd1e90639edeb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 16 12:15:27 2010 +0000

    empathy_accounts_dialog_show_application: use g_build_filename

    That's cleaner to build a path.

 src/empathy-accounts-dialog.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 57f093617f28dea1a4d4ab948561579d3f623427
Merge: 4219fa9 c4bd37a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Feb 16 12:06:44 2010 +0000

    Merge branch 'ack-all'

commit c4bd37aa901a9cd8c6cc716508416daa6ae58fbc
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Feb 15 23:28:57 2010 +0000

    Remove duplicate and buggy bookkeeping of pending messages

 libempathy-gtk/empathy-chat.c | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

commit 94539737998972571a33af133ae91b2769f7cd99
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Feb 15 23:28:17 2010 +0000

    add API to TpChat to ack all pending messages in one go

 libempathy/empathy-tp-chat.c | 7 +++++++
 libempathy/empathy-tp-chat.h | 1 +
 2 files changed, 8 insertions(+)

commit 4219fa9dd2a048563bd6684a0bfba08dd1629759
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 16 11:53:41 2010 +0000

    dispatcher_connection_new_requested_channel: fix a use-after-free
    crash

    If an error occurs when requesting the channel, we call
    dispatcher_request_failed which as the side effect of destroying the
    DispatcherRequestData. When calling
    dispatcher_flush_outstanding_operations
    we used to deference this pointer.
    Fixes this crash by using the "self" pointer instead and reffing it
    to be sure
    it stays valid.

 libempathy/empathy-dispatcher.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 926bd94a134044ed2416537f02e55d7e4ef6cb1e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 15 15:58:15 2010 +0000

    Always use "Apply" button if we are not connected or editing an
    account

    For some reason we mixed up the "Apply" and "Save" button. "Apply"
    is clearer
    as hitting it as the side effect of reconnecting the account.

 libempathy-gtk/empathy-account-widget.c | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

commit 5db0929af3f0b94d57ff21938ed49e2cfb0f4b88
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 15 15:46:19 2010 +0000

    account-widget: don't display "Log in" button if we are modyfing
    an account

    Either the account is enabled and saving will reconnect, either it's
    not and
    that won't connect it.

 libempathy-gtk/empathy-account-widget.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 76f92daf5490a9fd5189862feaa067115d967d15
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Mon Feb 15 18:40:29 2010 +0100

    Updated Slovenian translation

 po/sl.po | 48 ++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 8 deletions(-)

commit 466a60d6bfc58a9fc4bd87f6e90fa8eff77caff6
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Feb 15 18:04:59 2010 +0100

    Updated Spanish translation

 help/es/es.po | 60
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

commit 0e7074dbf801ca17ab88c15e9d261b244d2ecdd5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 15 13:28:20 2010 +0000

    accounts-dialog: block the selection 'changed' signal while removing
    a row

    There is no need to call accounts_dialog_model_selection_changed
    while removing
    as we are going to call accounts_dialog_model_select_first right
    after which
    will update the selection.

    This has the nice side effect of letting the "remove" button
    sensitive after
    the account has been removed. The callback used to be called
    recursively twice:
    once during the removal of the row and once when calling
    accounts_dialog_model_select_first in accounts_dialog_update_settings.
    As accounts_dialog_model_selection_changed is checking if a row
    is selected
    *before* calling accounts_dialog_update_settings, the button was
    unsensitived
    at the end of the first call of the callback. (#609575)

 src/empathy-accounts-dialog.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit 1f08efd25771856f49285ea26e8a5056ff86763f
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Feb 14 20:57:07 2010 +0000

    Remove workaround for wrong drag behaviour

    Revert "chat_window_create_label: ref the widgets stored as data so
    we are sure they stay alive when doing DnD"

    This is not needed anymore as we handle dragging correctly now

    This reverts commit 183fa2e8a94d94a7098120fc43cde9ad83869de6.

 src/empathy-chat-window.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

commit 6b4d4954a4231209d261ced4ae0140ae11de6814
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Feb 15 12:05:09 2010 +0000

    Make the ChatWindow handle dropping items itself

    Both GtkNotebook and EmpathChatWindow take action when
    drag-data-received is
    signalled (moving the tab or adding a contact). Drag data is received
    after the
    program has asked for it, usually when a drop occurs. Now this can
    be done in
    two ways 0) Handle the drop signal yourself and call gtk_drag_get_data
    yourself
    or 1) set GTK_DEST_DEFAULT_DROP and let gtk call it for you.

    GtkNotebook takes option 0, EmpathyChatWindow decided to use option
    1.. This
    causes all kind of strange issues as the drag data is now requested
    twice and
    thus the signal handlers are called twice causing all kinds of
    fun issues
    (trying to move a tab that's already moved etc).

    Change the drag dest flags to GTK_DEST_DEFAULT_HIGHLIGHT which
    provides some
    extra visual clues but is other harmless and handle drops
    directly. Also remove
    some cases where ChatWindow meddles with tab dragging as GtkNotebook
    will
    handle these for us

 src/empathy-chat-window.c | 51
 ++++++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 20 deletions(-)

commit d132874edb6b5af1a2755e006db4c87355a0d206
Author: Theppitak Karoonboonyanan <thep@linux.thai.net>
Date:	Mon Feb 15 13:19:43 2010 +0700

    Updated Thai translation.

 po/th.po | 343
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 199 insertions(+), 144 deletions(-)

commit 267e4a1d3a1d79fc559386d807cb100fc5bd4f88
Author: Fran Diéguez <frandieguez@ubuntu.com>
Date:	Mon Feb 15 14:45:44 2010 +0100

    Updated Galician Translation

 po/gl.po | 68
 +++++++++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 52 insertions(+), 16 deletions(-)

commit 6cfaf6920953783e52db4000d5e5892654e25262
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Feb 15 13:16:08 2010 +0100

    Updated Spanish translation

 help/es/es.po | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

commit 12286b44fc0a2117d9268f8a770a9b4f1c3f6a95
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Feb 15 13:15:27 2010 +0100

    Updated Spanish translation

 po/es.po | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

commit 26222a532d619fd676554eea6b99ff44d99017a8
Merge: 8b27464 4dd044b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 15 11:25:21 2010 +0000

    Merge commit 'wjt/all'

commit 8b274648f9907a0b91d994a0b62b022dcdc03027
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Feb 15 12:14:47 2010 +0100

    Updated Spanish translation

 help/es/es.po | 66
 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

commit 3de8c425aa4d6d070be67dc31022dfe0e9ba7338
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Feb 15 11:49:12 2010 +0100

    Updated Spanish translation

 help/es/es.po | 1270
 +++++++++++++++++++++++++++++++++------------------------
 1 file changed, 727 insertions(+), 543 deletions(-)

commit 424556bda9542472a3546002b86d3564878cc652
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Feb 15 11:40:10 2010 +0100

    Updated Spanish translation

 help/es/es.po | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

commit 05d6231a5e3fc80dcbe3b5ec584ff83b5136d45c
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Feb 14 22:48:42 2010 +0100

    [help] Updated help against new upcoming version
    * Added logo to the front page
    * Added a new small topic on the /help IRC command
    * Added license page and license reference to all pages
    * Added some links group
    * Fixed validity errors
    * Removed legal.xml
    * Updated Makefile

 help/C/account-irc.page	     |	 7 +++--
 help/C/account-jabber.page	     |	 7 +++--
 help/C/accounts-window.page	     |	 5 ++-
 help/C/add-account.page	     |	36 +++++++++-------------
 help/C/add-contact.page	     |	 5 ++-
 help/C/audio-call.page		     |	18 ++++++-----
 help/C/audio-video.page	     |	11 ++++++-
 help/C/change-status.page	     |	 5 ++-
 help/C/create-account.page	     |	 5 ++-
 help/C/disable-account.page	     |	19 ++++++------
 help/C/favorite-rooms.page	     |	 8 +++--
 help/C/figures/empathy-logo.png     | Bin 0 -> 1813 bytes
 help/C/geolocation-not-showing.page |	 5 ++-
 help/C/geolocation-privacy.page     |	 5 ++-
 help/C/geolocation-supported.page   |	 5 ++-
 help/C/geolocation-turn.page	     |	 5 ++-
 help/C/geolocation-what-is.page     |	 5 ++-
 help/C/geolocation.page	     |	 5 ++-
 help/C/group-conversations.page     |	 5 ++-
 help/C/import-account.page	     |	 5 ++-
 help/C/index.page		     |	22 ++++++++------
 help/C/introduction.page	     |	 5 ++-
 help/C/irc-commands.page	     |	28 +++++++++++++++++
 help/C/irc-join-pwd.page	     |	 5 ++-
 help/C/irc-join-room.page	     |	 7 +++--
 help/C/irc-manage.page		     |	 8 +++--
 help/C/irc-nick-password.page	     |	 5 ++-
 help/C/irc-send-file.page	     |	 5 ++-
 help/C/irc-start-conversation.page  |	 7 +++--
 help/C/legal.xml		     |	 9 ------
 help/C/license.page		     |	59
 ++++++++++++++++++++++++++++++++++++
 help/C/offline-contacts.page	     |	 5 ++-
 help/C/prev-conv.page		     |	 5 ++-
 help/C/prob-conn-acctdisabled.page  |	 5 ++-
 help/C/prob-conn-auth.page	     |	 5 ++-
 help/C/prob-conn-name.page	     |	 5 ++-
 help/C/prob-conn-neterror.page      |	 5 ++-
 help/C/prob-conn.page		     |	 5 ++-
 help/C/remove-account.page	     |	 5 ++-
 help/C/salut-protocol.page	     |	 5 ++-
 help/C/send-file.page		     |	 5 ++-
 help/C/send-message.page	     |	 5 ++-
 help/C/set-custom-status.page	     |	 5 ++-
 help/C/share-desktop.page	     |	 5 ++-
 help/C/status-icons.page	     |	 5 ++-
 help/C/video-call.page		     |	17 ++++++-----
 help/Makefile.am		     |	 5 +--
 47 files changed, 308 insertions(+), 110 deletions(-)

commit 342c49d96ffdf18146d6f582d3fe1d55a6fc0562
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sun Feb 14 20:44:09 2010 +0100

    Updated Spanish translation

 po/es.po | 100
 ++++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 67 insertions(+), 33 deletions(-)

commit 4f6021eb06b9e5c6339e45ef87743033cca59d6d
Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
Date:	Sun Feb 14 15:04:19 2010 +0200

    Update Romanian translation

 po/ro.po | 1922
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1005 insertions(+), 917 deletions(-)

commit 82ee2cfb806cd91b6a58a1e3d4cceabbe736ee5a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Feb 13 16:44:39 2010 +0000

    Don't reinvent g_slist_foreach

 libempathy-gtk/empathy-chat.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

commit 0306a490cce67d9df54255cd8c7d1efea4c7377f
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Feb 13 16:43:35 2010 +0000

    Only act when the account got a connection

 src/empathy.c | 2 ++
 1 file changed, 2 insertions(+)

commit 26024d8ad63511ec46f928d12bc2689098480104
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Sat Feb 13 16:10:53 2010 +0000

    Don't crash when switching to a tab with no TpChat

    Fixes: #609843

 libempathy-gtk/empathy-chat.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit a0e6a68707d834fbae1cdf93dadc4674a665c032
Author: Travis Reitter <treitter@gmail.com>
Date:	Fri Feb 12 08:11:13 2010 -0800

    Update the FSF's mailing address in the new control center files.

 src/cc-empathy-accounts-page.c  | 3 +--
 src/cc-empathy-accounts-page.h  | 3 +--
 src/cc-empathy-accounts-panel.c | 3 +--
 src/cc-empathy-accounts-panel.h | 3 +--
 src/empathy-accounts-module.c	 | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

commit 4dd044b3c28320a935bfe0ead8fd1ef196587aac
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Feb 12 13:34:59 2010 +0000

    Ensure "All" is at the top of account selector.

    Fixes: #609737

 libempathy-gtk/empathy-account-chooser.c | 48
 +++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 16 deletions(-)

commit 8e3b113ee061ce053f7dff8f6d8b351a8ac2fb4d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 12 11:42:08 2010 +0000

    update data/.gitignore

 data/.gitignore | 2 ++
 1 file changed, 2 insertions(+)

commit 9ea6c05701eaff48caeafef2d10fe4ad5676893f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 12 11:42:00 2010 +0000

    update POTFILES.{in,skip}

 po/POTFILES.in   | 4 ++++
 po/POTFILES.skip | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

commit 73fe36dc22ca12d3e2c4670c2948f75e808bd964
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Fri Feb 12 13:00:55 2010 +0100

    Updated Slovenian translation

 po/sl.po | 167
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 93 insertions(+), 74 deletions(-)

commit f390cc946b33d2a22a2c47ec0f9b7470f254853e
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Feb 12 11:44:12 2010 +0000

    Remove weird maybe-null account special case.

    I'm pretty sure this is unnecessary. Consider the four cases:

	 value of data->account |   0	|   x	     |
	 value of	account | 0 | y | 0 |	y    |
    a. data->account == NULL	| t | f | t |	f    |
    b.	     account == NULL	| t | t | f |	f    |
    c.		   a != b	| f | t | t |	f    |
    d. data->account == account | t | f | f | x == y |
    e.			  equal | t | f | f | x == y |

    In all cases, the value of equal is identical to what it would
    have been
    if the else branch were always taken. So... let's just always take the
    else branch.

 libempathy-gtk/empathy-account-chooser.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

commit bc744cd293dc2b9b0884fd0d1af9cbc91dcfb7b4
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Feb 12 12:15:47 2010 +1100

    Port Moblin widgets to Mx

 configure.ac				 |  2 +-
 libempathy-gtk/empathy-account-widget.c | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

commit 8d2e9d517beed4f272bed7ae9a2f59b96688e6c6
Author: Fran Diéguez <frandieguez@ubuntu.com>
Date:	Fri Feb 12 10:22:34 2010 +0100

    Updated Galician Translation

 po/gl.po | 412
 ++++++++++++++++++++++++++-------------------------------------
 1 file changed, 170 insertions(+), 242 deletions(-)

commit ea639834be0504f90ca56a6993dfd8ba33edbd5e
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Fri Feb 12 08:14:24 2010 +0100

    Updated Spanish translation

 po/es.po | 229
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 126 insertions(+), 103 deletions(-)

commit 28bd41e002c64a01e7efbb0b47417e098533e93b
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Fri Feb 12 08:14:09 2010 +0100

    Updated Spanish translation

 help/es/es.po | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

commit 774efbddb7a480acb093d0a653fef0de7ecfd95e
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Feb 12 13:04:20 2010 +1100

    empathy-accounts-dialog: Prepend BIN_DIR to the binary name

 src/Makefile.am	       | 1 +
 src/empathy-accounts-dialog.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 2aa506e8a17ef67ddf43ee716b21afc780a9d0d2
Author: Travis Reitter <treitter@gmail.com>
Date:	Thu Feb 11 15:09:32 2010 -0800

    Separate the accounts dialog into its own program which works with
    the Gnome preferences and control center.

    Where available, this also supports embedding the preferences dialog
    in the
    "extensible-shell" control center (currently in development, but
    likely to be
    mainlined soon).

 configure.ac			       |  47 ++++++
 data/Makefile.am		       |   5 +-
 data/empathy-accounts.desktop.in.in   |  15 ++
 libempathy/empathy-account-settings.c |   7 +-
 src/Makefile.am		       | 103 ++++++++++--
 src/cc-empathy-accounts-page.c        | 207 ++++++++++++++++++++++++
 src/cc-empathy-accounts-page.h        |  55 +++++++
 src/cc-empathy-accounts-panel.c       | 134 ++++++++++++++++
 src/cc-empathy-accounts-panel.h       |  55 +++++++
 src/empathy-accounts-common.c	       | 216 +++++++++++++++++++++++++
 src/empathy-accounts-common.h	       |  39 +++++
 src/empathy-accounts-dialog.c	       |  56 +++++++
 src/empathy-accounts-dialog.h	       |   6 +
 src/empathy-accounts-module.c	       |  42 +++++
 src/empathy-accounts.c		       | 287
 ++++++++++++++++++++++++++++++++++
 src/empathy-accounts.h		       |  25 +++
 src/empathy-main-window.c	       |  12 +-
 src/empathy.c			       | 199 +++--------------------
 18 files changed, 1311 insertions(+), 199 deletions(-)

commit 1abde726f2920d166728b79cc6e2cdc5e72ea1df
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date:	Fri Feb 12 06:08:41 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 368
 +++++++++++++++++++++++++++++-----------------------------
 po/zh_TW.po | 375
 +++++++++++++++++++++++++++++-------------------------------
 2 files changed, 361 insertions(+), 382 deletions(-)

commit 4c56821d84e3dbd90108986c9a4347f7c460c4d1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 11 17:14:56 2010 +0000

    Rephrase the helper text and change "Login ID" to "Username"

    Thanks to Nick Richards for his suggestions.

 libempathy-gtk/empathy-account-widget-jabber.ui | 12 +++++++-----
 libempathy-gtk/empathy-account-widget.c	 |  3 +++
 2 files changed, 10 insertions(+), 5 deletions(-)

commit e8ceee61bcfd8c07ac243b1cef17d80434abbb61
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 11 16:38:37 2010 +0000

    embold the part of the Facebook URL showing the ID to make it clearer

 libempathy-gtk/empathy-account-widget-jabber.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6d2a11ac6fa575de2a4ed9e5f9fe239c2063e07f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 11 15:47:53 2010 +0000

    add a simple version of the Facebook widget

 libempathy-gtk/empathy-account-widget-jabber.ui | 93
 +++++++++++++++++++++++++
 libempathy-gtk/empathy-account-widget.c	 | 17 ++++-
 2 files changed, 109 insertions(+), 1 deletion(-)

commit 9be6f0a2e28b9719bceafbd95ed49d27363b33c0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 11 15:27:36 2010 +0000

    Improve default display name for Facebook accounts

 libempathy-gtk/empathy-account-widget.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 79718737e209ee469d5b0ea9b7cabf5e6d5adb87
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 11 15:17:03 2010 +0000

    add the '@chat.facebook.com' suffix to account but dont't display
    it in the widget

    Fixes bug #573194

 libempathy-gtk/empathy-account-widget.c | 77
 ++++++++++++++++++++++++++++++++-
 1 file changed, 76 insertions(+), 1 deletion(-)

commit 438199f57bc03b42aae12a18888c73597b04c1ec
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 11 14:26:36 2010 +0000

    assistant: filter out facebook from the new account page

 libempathy-gtk/empathy-protocol-chooser.c | 5 +++--
 libempathy-gtk/empathy-protocol-chooser.h | 1 +
 src/empathy-account-assistant.c	   | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

commit 0110d107dcb0539355ca634498bd133b0161d4f6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 11 12:46:14 2010 +0000

    Help user to understand what Facebook alias are and how to set it

 libempathy-gtk/empathy-account-widget-jabber.ui | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 457d59921b00b2acb008df1cd0428d4433ec981a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 11 12:41:47 2010 +0000

    hide the advanced options for Facebook accounts

 libempathy-gtk/empathy-account-widget-jabber.ui | 2 +-
 libempathy-gtk/empathy-account-widget.c	 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

commit 2f011b0419e1d37ce9eadba249fa11f6852e1d8e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 11 12:39:09 2010 +0000

    don't display the register options for Facebook accounts

 libempathy-gtk/empathy-account-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit aba09644412809a256dc1b8b570022c772e3009d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 11 12:35:53 2010 +0000

    account-widget: display facebook example label

 libempathy-gtk/empathy-account-widget.c | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

commit d5c50301939772d752c7f8789a9b5ae81334fab3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 11 12:34:09 2010 +0000

    add is_facebook arg to empathy_protocol_chooser_dup_selected

    So the assistant and accounts dialog can special case facebook
    accounts.

 libempathy-gtk/empathy-protocol-chooser.c | 10 +++++++++-
 libempathy-gtk/empathy-protocol-chooser.h |  3 ++-
 src/empathy-account-assistant.c	   | 18 ++++++++++++++----
 src/empathy-accounts-dialog.c		   | 19 ++++++++++++++-----
 4 files changed, 39 insertions(+), 11 deletions(-)

commit 0d6a5a8caef60613531a96f5f81b55c811200ec8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 11 12:28:44 2010 +0000

    empathy-protocol-chooser: add a column saying if a row is a facebook
    account or not

 libempathy-gtk/empathy-protocol-chooser.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

commit a2ca8c402f0d0be1f2f7c47b6159c92f44181bff
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 11 12:01:14 2010 +0000

    add example label for Facebook accounts

 libempathy-gtk/empathy-account-widget-jabber.ui | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit 73ad6627b646932f5af9754122521b3a904c9a97
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 11 11:41:58 2010 +0000

    account_widget_build_jabber: add few comments

 libempathy-gtk/empathy-account-widget.c | 3 +++
 1 file changed, 3 insertions(+)

commit 90480686db5a6f52b29abc6b9294428a347511da
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 11 10:57:16 2010 +0000

    Drop Haze's facebook implementation

    Everyone should use Gabble now.

 libempathy-gtk/empathy-protocol-chooser.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 894061fd27c27db5026c8d90bdb72339223f1798
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Feb 11 00:02:58 2010 +0100

    Add facebook in protocol chooser for gabble CM.

 libempathy-gtk/empathy-protocol-chooser.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit fe0619ea555d88ac4342d2b5172b4738a6836b02
Author: Fran Diéguez <frandieguez@ubuntu.com>
Date:	Thu Feb 11 15:42:10 2010 +0100

    Updated Galician Translation

 po/gl.po | 1823
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 1086 insertions(+), 737 deletions(-)

commit 307edc47ea9dc3abe2d4e6ab7e3778850a696faa
Author: Łukasz Jernaś <deejay1@srem.org>
Date:	Thu Feb 11 14:37:53 2010 +0100

    fixed typo in help

 help/C/video-call.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 488cf6f19faeb2fef4990a0d17f58efe0dadea99
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Thu Feb 11 15:00:07 2010 +0100

    Updated Slovenian translation

 po/sl.po | 230
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 117 insertions(+), 113 deletions(-)

commit b9a03b13e7dd8ef685362a3fbf8e09497f3f15b6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 11 11:20:04 2010 +0000

    do_show_accounts_ui: don't unref the EmpathyConnectionManagers

    We already unref it once the async callback is done.

 src/empathy.c | 2 --
 1 file changed, 2 deletions(-)

commit 3c1479077106c5afb4791f7c5f21574d737f4bf6
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Thu Feb 11 07:23:13 2010 +0100

    Updated Spanish translation

 help/es/es.po | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

commit ca16ccb91698c5e39675f72bc7b0352e03da85de
Author: vasudeven <agnihot3@gmail.com>
Date:	Thu Feb 11 08:16:13 2010 +0530

    updated Tamil translation

 po/ta.po | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 0fdb87b573e442e0690388d791a122eb05bd089d
Author: vasudeven <agnihot3@gmail.com>
Date:	Thu Feb 11 08:15:19 2010 +0530

    updated Tamil translation

 po/ta.po | 434
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 255 insertions(+), 179 deletions(-)

commit 1fda9ad7589e487885827f667e2253d5bd4dccb0
Author: vasudeven <agnihot3@gmail.com>
Date:	Thu Feb 11 07:37:23 2010 +0530

    updated Tamil translation

 po/ta.po | 1682
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 981 insertions(+), 701 deletions(-)

commit 1485f01d0fd8cc305d18825df32b4189d8072f9f
Author: vasudeven <agnihot3@gmail.com>
Date:	Sun Jan 24 05:25:58 2010 +0530

    updated Tamil translation

 po/ta.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e61dc7bebe7788d7a08c92f5d8f647ba0bffba3f
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Wed Feb 10 21:50:09 2010 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 337
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 192 insertions(+), 145 deletions(-)

commit 1c1c28d84322625bcd83aae9e705c00bbc2095d6
Merge: d6d5fd2 41f9f0a
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Feb 10 20:14:43 2010 +0100

    Merge branch 'menu'

commit 41f9f0a717f8519cf8c69cb043198980fe503ebc
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Feb 10 18:51:53 2010 +0100

    Fix leaked GtkMenu

    GtkMenu is initially unowned, which means ref_count is 1 and floating
    flag is set.
    gtk_menu_popup temporarily adds a ref, that will be dropped when
    the menu is popped
    down. So once the menu is popped up, we call g_object_ref_sink()
    to clear the floating
    flag, and g_object_unref() to drop the initial ref. Only the ref
    from gtk_menu_popup
    stay, and the menu will be finalized when it is popped down.

    Fixes bug #609567

 libempathy-gtk/empathy-contact-list-view.c | 4 ++++
 libempathy-gtk/empathy-contact-menu.c	    | 1 -
 libempathy-gtk/empathy-contact-widget.c    | 3 ++-
 libempathy-gtk/empathy-theme-adium.c	    | 2 ++
 src/empathy-debug-window.c		    | 2 ++
 src/empathy-map-view.c			    | 2 ++
 6 files changed, 12 insertions(+), 2 deletions(-)

commit d6d5fd2192dccbd51b83303dbbcd5cf83db66574
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Feb 10 20:00:34 2010 +0100

    Fix leaks, gtk_tree_model_get() returns a ref!

    COL_ACCOUNT_POINTER and COL_ACCOUNT_SETTINGS_POINTER are misleading,
    they are not POINTER but OBJECT, so we have to unref them.

 src/empathy-accounts-dialog.c | 53
 +++++++++++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 20 deletions(-)

commit 5e16c7dc88686748aa7a79a8d3e97f58736b4dee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 10 11:46:11 2010 +0000

    Fix creation of imported accounts (#609439)

    impl_signal_apply isn't called any more after the "import" page as
    this page
    as a 'next' button now.
    So we have to create the imported accounts when preparing the
    next page.

 src/empathy-account-assistant.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit 0ad091ed52c2818870dbfc3d7cd1aed573f5099f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 10 11:37:38 2010 +0000

    assistant: store the ID of the current page

    This will make easier to know from which page we are coming in
    impl_signal_prepare.

 src/empathy-account-assistant.c | 2 ++
 1 file changed, 2 insertions(+)

commit bb10972967005ad19d42287597ae52d1a11e543b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 10 13:55:00 2010 +0000

    accounts-dialog: wrap label status in info bar

    So the accounts doesn't become huge if user entered a ridiculously
    long
    message (#609537).

 src/empathy-accounts-dialog.c | 1 +
 1 file changed, 1 insertion(+)

commit 77a36e4b92c5f01bccd6c1f790c20b92e7452af3
Author: K.Vishnoo Charan Reddy <drkvi-a@yahoo.com>
Date:	Wed Feb 10 12:37:35 2010 +0000

    Add icon for the 'mxit' protocol (#609519)

    This icon won't be displayed while telepathy-haze won't have been
    released
    with a patch renaming the "loubserp-mxit" protocol to "mxit".

 data/icons/Makefile.am			      |   6 ++
 data/icons/hicolor_apps_16x16_im-mxit.png    | Bin 0 -> 560 bytes
 data/icons/hicolor_apps_22x22_im-mxit.png    | Bin 0 -> 828 bytes
 data/icons/hicolor_apps_24x24_im-mxit.png    | Bin 0 -> 767 bytes
 data/icons/hicolor_apps_32x32_im-mxit.png    | Bin 0 -> 998 bytes
 data/icons/hicolor_apps_48x48_im-mxit.png    | Bin 0 -> 1306 bytes
 data/icons/hicolor_apps_scalable_im-mxit.svg | 106
 +++++++++++++++++++++++++++
 7 files changed, 112 insertions(+)

commit ccb3964865cf65dcca05a145ceac91137746c331
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 10 13:06:19 2010 +0000

    Use the 'phone' icon for the 'sms' protocol

 libempathy/empathy-utils.c | 2 ++
 1 file changed, 2 insertions(+)

commit 3a3b095dd0f76eec019f424105e40d3d344a59e2
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Wed Feb 10 08:02:49 2010 +0100

    Updated Spanish translation

 help/es/es.po | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

commit 2253498a5c1a8edaab0296b752c3327fc7b4e1f3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 9 16:56:40 2010 +0000

    Create the account even when user chooses to not create other
    one after

    As the account is not created in impl_signal_apply() any more,
    we have to be
    smarter in impl_signal_prepare and call
    account_assistant_apply_account_and_finish in more cases.

    That also means that account_assistant_account_enabled_cb doesn't
    have to
    terminate the assistant if the salut account has not been created yet.

    Fixes bug #609220.

 src/empathy-account-assistant.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

commit a36df4571d37a9046e22e99d88e1a3642f612b8a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 9 16:45:43 2010 +0000

    impl_signal_apply: this function is not called after the create page
    any more

    The 'create account' page doesn't have a 'apply' button any more so
    this test
    never succeeds any more.

 src/empathy-account-assistant.c | 2 --
 1 file changed, 2 deletions(-)

commit ddbfc6ec6a3b2ffab1f83471dbf1f82630292f8a
Author: K.Vishnoo Charan Reddy <drkvi-a@yahoo.com>
Date:	Tue Feb 9 13:31:01 2010 +0000

    Replace SILC icon by one rendering better in 16x16 (#609352)

 data/icons/hicolor_apps_16x16_im-silc.png    | Bin 321 -> 359 bytes
 data/icons/hicolor_apps_22x22_im-silc.png    | Bin 391 -> 510 bytes
 data/icons/hicolor_apps_24x24_im-silc.png    | Bin 311 -> 476 bytes
 data/icons/hicolor_apps_32x32_im-silc.png    | Bin 475 -> 547 bytes
 data/icons/hicolor_apps_48x48_im-silc.png    | Bin 468 -> 749 bytes
 data/icons/hicolor_apps_scalable_im-silc.svg |  57
 ++++++++++++++++-----------
 6 files changed, 34 insertions(+), 23 deletions(-)

commit 6595e1660bb1dc21fc7fefb6fe6a9e925f9189c3
Merge: fe9e7dd 66dd2eb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 9 11:56:47 2010 +0000

    Merge branch 'zephyr'

commit 66dd2eb3f37e2ddb0b72f5a31683ca3a2f9b837b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 9 11:49:56 2010 +0000

    Add icon for the Zephyr protocol (#609343)

 data/icons/Makefile.am				|   6 +
 data/icons/hicolor_apps_16x16_im-zephyr.png	| Bin 0 -> 695 bytes
 data/icons/hicolor_apps_22x22_im-zephyr.png	| Bin 0 -> 995 bytes
 data/icons/hicolor_apps_24x24_im-zephyr.png	| Bin 0 -> 1049 bytes
 data/icons/hicolor_apps_32x32_im-zephyr.png	| Bin 0 -> 1500 bytes
 data/icons/hicolor_apps_48x48_im-zephyr.png	| Bin 0 -> 2303 bytes
 data/icons/hicolor_apps_scalable_im-zephyr.svg | 182
 +++++++++++++++++++++++++
 7 files changed, 188 insertions(+)

commit fe9e7dd4083299e534a1f82be51d4d092237f994
Author: Frédéric Péters <fpeters@0d.be>
Date:	Tue Feb 9 12:44:08 2010 +0100

    Disable sound notifications for login/logout of contacts (#609319)

 data/empathy.schemas.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 6bcd28a6ac046bdc612dbcf71f97fbbbe0038e12
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Tue Feb 9 08:21:34 2010 +0100

    Updated Spanish translation

 help/es/es.po | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

commit 607d9295b45f34d9328d247b0dbea49f0e6b440c
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Tue Feb 9 00:22:27 2010 +0100

    Updated Spanish translation

 po/es.po | 59 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 29 insertions(+), 30 deletions(-)

commit d927a3b3bb87953e0d1f429885e3c88e1cbb12a7
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Feb 8 23:52:14 2010 +0100

    Updated Spanish translation

 help/es/es.po | 212
 +++++++---------------------------------------------------
 1 file changed, 25 insertions(+), 187 deletions(-)

commit 7444974aba04059220371ca286e7205193a667ef
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Feb 8 23:51:56 2010 +0100

    Updated Spanish translation

 po/es.po | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

commit 4c184062d7d9d5e507c5fad23897b82cce6af795
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 8 20:31:06 2010 +0000

    start dev of next release

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 09a7a076bb941188de520241a5929b5cae6c363f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 8 13:12:28 2010 +0000

    prepare 2.29.90 release

 NEWS	      | 33 +++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 35 insertions(+), 2 deletions(-)

commit 8d186ba67e21afae30301944ab1f1069d2bbf886
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 8 15:52:23 2010 +0000

    Use the SIP icon for the SIMPLE protocol

    SIMPLE is a SIP extension.

 libempathy/empathy-utils.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 5e08c5298729a858681a2c211356eeee0d1d4399
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 8 19:46:55 2010 +0000

    Use a GSList instead of GList to store messages to ack

 libempathy-gtk/empathy-chat.c |  8 ++++----
 libempathy/empathy-tp-chat.c  | 12 ++++++------
 libempathy/empathy-tp-chat.h  |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

commit 6e30bb870bc9748dd39e3a29992c5fd057afb339
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Feb 5 09:24:01 2010 +1100

    empathy-chat: acknowledge pending messages on
    empathy_chat_messages_read() (#608979)

    Empathy displays this handy number of unread messages in the title
    bar, but
    you can't replicate this behaviour using an Observer because Empathy
    acknowledges the messages immediately. This patch makes it so
    that Empathy
    only acknowledges the messages when it decrements the unread
    messages count.

    N.B. EmpathyTpChat currently seems to assume that no other client
    is going to
    acknowledge messages for channels, it is handling. This seems
    valid enough,
    just pointing it out.

 libempathy-gtk/empathy-chat.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

commit 30d84cace706ad67081df9ac309190ba07aa7bac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 8 17:08:56 2010 +0000

    Add translation context for the "Edit" contact menu (#608690)

 libempathy-gtk/empathy-contact-menu.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit a05cdbc540f5b855fa01d55ed9c99cbd16fbf431
Author: Łukasz Jernaś <deejay1@srem.org>
Date:	Wed Feb 3 12:51:41 2010 +0100

    Fix typo in help (#608882)

 help/C/salut-protocol.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4ee728df4875d0f62e1953851a1eb01627eb9e9e
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Feb 5 11:06:13 2010 +1100

    Don't call SetAlias for subscription requests until the request has
    been acked (#608975)

 libempathy-gtk/empathy-contact-dialogs.c | 11 +++++++++++
 libempathy-gtk/empathy-contact-widget.c  | 23 ++++++++++++++++++++---
 libempathy-gtk/empathy-contact-widget.h  |  2 ++
 3 files changed, 33 insertions(+), 3 deletions(-)

commit 39a0c45a2d7cc77809e6a6e8e34ccd27fef325f3
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Feb 8 11:41:44 2010 +1100

    Don't assume that removing a user from 'stored' will remove them
    from all lists

    This doesn't appear to be correct for all CMs (at least, it doesn't
    appear to
    be correct for Gabble). At least it doesn't appear incorrect to
    attempt to
    remove the contact from the other lists anyway (#608974).

 libempathy/empathy-tp-contact-list.c | 2 --
 1 file changed, 2 deletions(-)

commit e14dedc9e30c2026eff27bb349eb810f5dc0de30
Author: Reimundo Heluani <rheluani@gmail.com>
Date:	Mon Feb 8 11:23:09 2010 +0000

    modifies tab-expand and tab-fill properties of child in chat-window
    (#608053)

 src/empathy-chat-window.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 7d2b2ea25261c064505c22dba1918bb781b215e6
Author: Travis Reitter <treitter@gmail.com>
Date:	Mon Feb 8 10:30:18 2010 +0000

    Ensure that the EmpathyIdle is not used in account_manager_ready_cb
    after being finalized

    Fixes #608813

 libempathy/empathy-idle.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

commit 47ce699f4a9b8bd726330c39995f508fa819b85d
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Feb 2 14:24:42 2010 +1100

    empathy.c: Initialise variable (#609030)

    Fixes bug introduced in 24db41f217eea1cbf929cc3e623c50ca626db4b

 src/empathy.c | 4 ++++
 1 file changed, 4 insertions(+)

commit d4088b6b8af17417b110927a73aa26c98680f208
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Feb 8 07:13:23 2010 +0100

    Updated Spanish translation

 help/es/es.po | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

commit 5eb4501d4236b5aa797d581aaf525e96753b25b6
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sun Feb 7 23:40:44 2010 +0100

    Updated Spanish translation

 help/es/es.po | 52 +++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 17 deletions(-)

commit 53f6566d9749f1a9a59dd6089f793df3f98411b8
Author: Daniel Nylander <po@danielnylander.se>
Date:	Sun Feb 7 18:21:44 2010 +0100

    Updated Swedish translation

 po/sv.po | 610
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 322 insertions(+), 288 deletions(-)

commit 10dda657fd472071163059d191899139cbec436f
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sun Feb 7 16:51:52 2010 +0100

    Updated Spanish translation

 help/es/es.po | 170
 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 87 insertions(+), 83 deletions(-)

commit 06debe05c85a0a3a12d121eef2a6e6003209cd08
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sun Feb 7 13:05:38 2010 +0100

    Updated Spanish translation

 help/es/es.po | 56
 +++++++++++++++++++++++---------------------------------
 1 file changed, 23 insertions(+), 33 deletions(-)

commit a1678761ea7647fe18ea51fc2bd2775f299d8bf4
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Feb 6 12:03:17 2010 +0100

    Modified Spanish screenshot

 help/es/figures/empathy-main-window.png | Bin 8904 -> 10432 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

commit 9b1ef69314edc0845a93c6b5502f285017f95457
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Feb 6 12:02:57 2010 +0100

    Updated Spanish translation

 help/es/es.po | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

commit dbbfdafd17ae6f3d45e79d45dc419fc32e846d28
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Fri Feb 5 20:13:47 2010 +0100

    Updated Spanish translation

 help/es/es.po | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

commit f49aadb2fde712a6b1cd3b1d808411c4bdd7809a
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Thu Feb 4 08:26:15 2010 +0100

    Updated Spanish translation

 help/es/es.po | 56
 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

commit 217938e7edb8c3f7609d6cba79bbf1a9bb0bcd71
Author: Christian Kirbach <Christian.Kirbach@googlemail.com>
Date:	Wed Feb 3 21:12:23 2010 +0100

    Updated German translation

 po/de.po | 2229
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 1374 insertions(+), 855 deletions(-)

commit 669bc587b32bce95ccb4edb85dc4a0161cb8f1a4
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Wed Feb 3 08:07:45 2010 +0100

    Updated Spanish translation

 help/es/es.po | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

commit 9bb7e5e6c0ef17449581e849da834394883f7163
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Feb 2 14:13:37 2010 +1100

    Adding myself to contributors

 src/empathy-about-dialog.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 866ea5bbf6e5dcfee81347d4fda5699bc54d3e64
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Feb 1 19:54:09 2010 +0100

    Updated Spanish translation

 help/es/es.po | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

commit d70eb48318c5f522a435facd2aca195630d28b2b
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Mon Feb 1 06:07:29 2010 +0200

    Updating Estonian translation

 po/et.po | 1021
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 647 insertions(+), 374 deletions(-)

commit 91f170a7f003a7f03a4941d08ee6303ccfba2fe5
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sun Jan 31 18:53:37 2010 +0100

    Updated Spanish translation

 help/es/es.po | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

commit 2d8c66e1b09b7c3f92b14ca1007a7e357e97c41d
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sun Jan 31 12:10:25 2010 +0100

    Updated Spanish translation

 help/es/es.po | 59
 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 31 insertions(+), 28 deletions(-)

commit e88ee48f30541e195ea3bfec5c836009067665a7
Author: Simos Xenitellis <simos@gnome.org>
Date:	Sun Jan 31 02:23:49 2010 +0200

    Updated Greek translation

 po/el.po | 2060
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1295 insertions(+), 765 deletions(-)

commit 065a0b9192346ba2faee48ac28b99686e0fadc68
Author: Alexander Shopov <ash@contact.bg>
Date:	Fri Jan 29 14:16:05 2010 +0200

    Updated Bulgarian translation

 po/bg.po | 1922
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 1129 insertions(+), 793 deletions(-)

commit 09df9c99325ce624c23ece42fedca852e8682e49
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Thu Jan 28 15:36:21 2010 +0100

    Updated Slovenian translation

 po/sl.po | 7102
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 3579 insertions(+), 3523 deletions(-)

commit 19f691a07f555c2f30989fd3951b6749fd8b8d4d
Author: Theppitak Karoonboonyanan <thep@linux.thai.net>
Date:	Wed Jan 27 23:40:38 2010 +0700

    Updated Thai translation.

 po/th.po | 1042
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 555 insertions(+), 487 deletions(-)

commit fb6bfe185cdf80fd572f6585cb281944f91d8058
Author: Jamil Ahmed <itsjamil@gmail.com>
Date:	Wed Jan 27 19:54:39 2010 +0600

    Updated Bengali translation

 po/bn.po | 2269
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 1367 insertions(+), 902 deletions(-)

commit 4f6e6ebe6c3213a71a6566e07f46921c1066e365
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date:	Tue Jan 26 05:59:53 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1095
 +++++++++++++++++++++++++++++-----------------------------
 po/zh_TW.po | 1098
 +++++++++++++++++++++++++++++------------------------------
 2 files changed, 1071 insertions(+), 1122 deletions(-)

commit f4b4db0395436b1cbeedd993a812a3be14d75880
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Jan 25 20:37:05 2010 +0100

    Updated Spanish translation

 po/es.po | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

commit 94a9c2b4e23654dea4fabd9651e881fa7ffc51f9
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Jan 25 19:40:30 2010 +0100

    Updated Spanish translation

 po/es.po | 220
 ++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 133 insertions(+), 87 deletions(-)

commit 643db91dd39701eeb7a3424732379d22427f756f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 25 17:08:37 2010 +0000

    start dev of 2.29.7

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit fed14b06f3a6625998ec5b7d46c9ef71c06799a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 25 16:46:36 2010 +0000

    prepare 2.29.6 release

 NEWS	      | 58
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)

commit e3496e8e45bc201a55f64c000933ca30df86e43a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 18 12:35:36 2010 +0000

    Show protocol in compat mode too

    There is no reason to not to (#607207).

 libempathy-gtk/empathy-contact-list-store.c | 8 ++------
 src/empathy-main-window.c		     | 3 ---
 2 files changed, 2 insertions(+), 9 deletions(-)

commit 99ff3fc5e1115987daffeb3ba3ea75bace884247
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 18 12:34:54 2010 +0000

    contact_list_store_update_list_mode_foreach: remove useless
    show_protocol variable

 libempathy-gtk/empathy-contact-list-store.c | 4 ----
 1 file changed, 4 deletions(-)

commit 3b3954e6e71f30324c88a2d70cbcc5375a19aaae
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 18 12:34:28 2010 +0000

    contact_list_store_contact_update: remove useless show_protocol
    variable

 libempathy-gtk/empathy-contact-list-store.c | 4 ----
 1 file changed, 4 deletions(-)

commit 2b6d806d6e22c20387f6cd9a9308c570dd4a7fb0
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Mon Jan 25 15:45:07 2010 +0000

    Ellipsize connection error infobars

    This prevents your contact list being forcibly expanded horizontally
    when an account with a long name fails to connect. Fixes: #608043

 src/empathy-main-window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit bbf4bebc4c243fb47d9e0698af88621f859a7449
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Mon Jan 25 15:44:56 2010 +0000

    Fix building nst plugin out of tree.

 nautilus-sendto-plugin/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit 386ee2dc8453117ff1a2042ff0428a34d646b952
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 25 14:57:09 2010 +0000

    accounts_dialog_accounts_setup: use
    empathy_connection_managers_prepare_async

    That way we are sure that the callback is called even if the
    managers is
    already ready (#607925).

 src/empathy-accounts-dialog.c | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

commit 6a09345e6cc8002dcb2da52da273c949107b9de3
Merge: 906f3a0 5c94274
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 25 14:19:05 2010 +0000

    Merge commit 'kaserf/buttons-infobar-606329'

commit 906f3a0b0c501c9878c7ad1f77d6d3b9a36361dc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 25 14:03:57 2010 +0000

    split strings to no translate markups

 src/empathy-account-assistant.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

commit 367020d3ffc220ced07c93c3cc13841ed2a383ab
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 25 12:48:31 2010 +0000

    there is no reasy why error would be NULL if e_book_get_self failed

 src/empathy-auto-salut-account-helper.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 95cd2370571dafcd4aab34ebb93499b915a70bcb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 25 12:43:10 2010 +0000

    remove create_salut_account_if_needed as it's done in the assistant
    now

 src/empathy-auto-salut-account-helper.c | 109
 --------------------------------
 src/empathy-auto-salut-account-helper.h |   2 -
 2 files changed, 111 deletions(-)

commit 3ee94f0e0e9c0757735f9bae72ce12ae9749d790
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 25 12:22:37 2010 +0000

    rephrase the salut error page

 src/empathy-account-assistant.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit b5b352cfbea1dd9ae47dbea05a37ab5fc523e9b6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 25 12:16:38 2010 +0000

    add a hint about how to reach the accounts dialog

 src/empathy-account-assistant.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 1b15b1d3623dd0f2fc584e50d8ae981aea50c9be
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 25 12:08:31 2010 +0000

    Split markups and translated string to make this easier for
    translators

 src/empathy-account-assistant.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit 0aaa3f2b2c4c6ad3e7d52d13a28103a6490c26ce
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 25 12:00:15 2010 +0000

    rename build_error_page to build_error_vbox

 src/empathy-account-assistant.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit ef60aa9e573bea328d0cad4b3619912b021d0d9b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 25 11:57:38 2010 +0000

    account_assistant_page_forward_func: never go forward after the
    salut page

    This fix a bug if user chooses to not create a salut account.

 src/empathy-account-assistant.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 1a42d308197d71aac322a61978eb5dce266bbe95
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 25 11:51:40 2010 +0000

    Display 'back' button in the import and create page

 src/empathy-account-assistant.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 001c1043c2670229dc379edf90d6f9041371d0d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 22 14:15:48 2010 +0000

    Fix account creation regression

    Each time we add a new account, a new page is added to the
    assistant. So
    checking if id equal PAGE_ENTER_CREATE is not enough as the next
    pages will
    have an id greater than that.

 src/empathy-account-assistant.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit 3bda80255069253fcb801673c3c81c8d1cd4a67e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 22 11:56:51 2010 +0000

    Don't display the salut page after the create one if there is no
    need to

 src/empathy-account-assistant.c | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

commit f1cca624fa83a3a1fe33a227edd4b8c6f0e0978c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 22 10:58:45 2010 +0000

    Don't display the salut page after the import one if there is no
    need to

 src/empathy-account-assistant.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit cc1003c0f40aa8165194c0412a63da672ce0e869
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 21 17:34:31 2010 +0000

    Display the salut page after the create one

 src/empathy-account-assistant.c | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

commit ebafe1dbc235b57e286fce9901ca65652fdc9898
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 21 16:38:31 2010 +0000

    Display the salut page after the import one

 src/empathy-account-assistant.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 933b597933edb8a02b4cda32fe08290dbb1e1903
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 21 15:33:10 2010 +0000

    rename should_create_salut_account to display_salut_page

 src/empathy-account-assistant.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 1943ad3113ef82a02f4c30b6f6ad8b19a56c3ee8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 21 15:28:58 2010 +0000

    Display an error message if Salut is not installed

    Please enter the commit message for your changes. Lines starting

 src/empathy-account-assistant.c | 40
 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

commit 5321b5a3fca104ceeb265c053da7460a1809a53f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 21 15:28:32 2010 +0000

    factor out build_error_page

 src/empathy-account-assistant.c | 52
 +++++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 20 deletions(-)

commit c4cdb393343d6c7a18364d01202f8b150233c145
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 21 14:46:59 2010 +0000

    assistant: move creation of the page from _init to _constructed

    We are going to need the connection managers received as a property.

 src/empathy-account-assistant.c | 41
 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

commit a24db41f217eea1cbf929cc3e623c50ca626db4b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 21 14:33:00 2010 +0000

    Pass a ready EmpathyConnectionManagers to
    empathy_account_assistant_show

    This kinda suck but we have to construct the assistant in a sync
    way so can't
    wait for the manager to become ready.

 src/empathy-account-assistant.c		    | 31 ++++++++++++++--
 src/empathy-account-assistant.h		    |  5 ++-
 src/empathy.c					    | 43
 ++++++++++++++++++----
 tests/interactive/test-empathy-account-assistant.c | 25 +++++++++++--
 4 files changed, 87 insertions(+), 17 deletions(-)

commit fcfdcc4011d7131d852d19474eb09eaa4a6e43d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 21 14:03:06 2010 +0000

    Move all the tests checking if we should display the the assistant
    to a single function

    We used to check that in a lot of different places. Refactor the
    code to make
    it clearer and easier to understand.

 src/empathy.c | 88
 ++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 63 insertions(+), 25 deletions(-)

commit 54190b275f2328e9e43ccfcfafaa63177fe1018f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 20 16:51:11 2010 +0000

    Don't display the salut page if there is no need to create the account

 src/empathy-account-assistant.c | 57
 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

commit 6328e566344f1f6bd83bc01f4951d2c1fd680f6e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 20 16:03:38 2010 +0000

    set the salut-account-created gconf key once the account has been
    created

 src/empathy-account-assistant.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

commit e18077ddd872c65bcca5f755fce4abceb0eebfab
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 20 15:54:24 2010 +0000

    don't set display name if there is already one defined

    Display name is already set for the salut account.

 src/empathy-account-assistant.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

commit a33e906abb007ae8f56377140c74db11dc1742ad
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 20 15:50:38 2010 +0000

    account-assistant: use existing code to create the salut account
    and respect the settings defined by user

 src/empathy-account-assistant.c | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

commit 9a0777b347b50e56840190472cda3d979c6f3045
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 20 14:58:14 2010 +0000

    account-assistant: add a page to configure the salut account

    This will let user filling his details if we failed to fetch them
    and so give
    him a chance to actually create the Salut account (#596575).

 src/empathy-account-assistant.c | 136
 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 124 insertions(+), 12 deletions(-)

commit 3e258d7e2a040df13320f34af03f034bc88008d9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 20 14:51:35 2010 +0000

    account-widget-salut: don't display advanced properties in simple mode

 libempathy-gtk/empathy-account-widget-local-xmpp.ui | 2 +-
 libempathy-gtk/empathy-account-widget.c	     | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

commit 17ea62102f51a9d6e50a12f516fec4af60ce0c88
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 20 14:50:44 2010 +0000

    factor out and export create_salut_account_settings

 src/empathy-auto-salut-account-helper.c | 113
 ++++++++++++++++++--------------
 src/empathy-auto-salut-account-helper.h |   3 +
 2 files changed, 68 insertions(+), 48 deletions(-)

commit b7936254660d147c7fb683a477b2db728ea72723
Author: Łukasz Jernaś <deejay1@srem.org>
Date:	Sat Jan 23 14:04:13 2010 +0100

    rename "Hidden" to "Invisible" in docs

 help/C/status-icons.page | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 5c94274e5bd070ea580716fe8dbaad32b901654e
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Sun Jan 24 22:58:13 2010 +0100

    remove custom style for buttons in infobar

    the custom style for the buttons in the infobar is not needed. fixes
    bug #606329

 src/empathy-main-window.c | 9 ---------
 1 file changed, 9 deletions(-)

commit 6ba051c2deb8c8b5f1148ac2173f6901d50d1a89
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 22 12:40:42 2010 +0000

    notify_ready_cb: use g_simple_async_result_complete instead of
    _in_idle

 libempathy/empathy-connection-managers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 07961d71bdc15756e355c701a02856dbcd801bdd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 22 12:35:35 2010 +0000

    replace empathy_connection_managers_call_when_ready by
    prepare_{async_finish} functions

 libempathy-gtk/empathy-protocol-chooser.c | 11 +++--
 libempathy/empathy-connection-managers.c  | 78
 +++++++++++++------------------
 libempathy/empathy-connection-managers.h  | 11 +++--
 src/empathy-import-widget.c		   | 11 +++--
 src/empathy.c				   | 12 +++--
 5 files changed, 57 insertions(+), 66 deletions(-)

commit 90d96b199a4f4e1912403d52f38581e8c86752a1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 21 12:23:50 2010 +0000

    empathy-protocol-chooser: use
    empathy_connection_managers_call_when_ready

 libempathy-gtk/empathy-protocol-chooser.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

commit 61caee80d36af8064a9c0953ce4ee7123bf6115d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 21 12:05:50 2010 +0000

    empathy.c: use empathy_connection_managers_call_when_ready

 src/empathy.c | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

commit 7ed6676eb0dc2c05718774fbc1939d6a8a5c6445
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 21 12:05:33 2010 +0000

    empathy-import-widget: use empathy_connection_managers_call_when_ready

 src/empathy-import-widget.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

commit f6d60f33a0ab2af025e7d13a8dea9a93c6eab3f9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 21 11:57:18 2010 +0000

    add empathy_connection_managers_call_when_ready

    That's easier to use than checking if ready and connecting a callback.

 libempathy/empathy-connection-managers.c | 63
 ++++++++++++++++++++++++++++++++
 libempathy/empathy-connection-managers.h | 10 +++++
 2 files changed, 73 insertions(+)

commit ec21e853954665c0f3ad8f7d16001a77e535715d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 22 10:23:34 2010 +0000

    spspps-interval has been renamed to config-interval

 data/element-properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7c0d4aca42f309b89684636ad84fd4969eac6943
Author: Thomas Meire <blackskad@gmail.com>
Date:	Thu Jan 21 01:20:08 2010 +0100

    Capture the escape key on the chat view and search bar, to make it
    hide the search bar

 libempathy-gtk/empathy-chat.c	     |	3 +++
 libempathy-gtk/empathy-search-bar.c | 34
 ++++++++++++++++++++++++++++------
 libempathy-gtk/empathy-search-bar.h |	1 +
 3 files changed, 32 insertions(+), 6 deletions(-)

commit cc0b2a8f267d1396ecae90452f4623d5b4c5ebb1
Author: Thomas Meire <blackskad@gmail.com>
Date:	Tue Jan 19 23:03:28 2010 +0100

    removed some trailing spaces

 libempathy-gtk/empathy-chat.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 0c011e92bb7f0d3d14117b0c2f6bf4b73a1a30e7
Author: Thomas Meire <blackskad@gmail.com>
Date:	Tue Jan 19 21:29:51 2010 +0100

    added a "find" menu item

 libempathy-gtk/empathy-chat.c | 17 ++++++++++++-----
 libempathy-gtk/empathy-chat.h |  1 +
 src/empathy-chat-window.c     | 16 ++++++++++++++++
 src/empathy-chat-window.ui    |  9 +++++++++
 4 files changed, 38 insertions(+), 5 deletions(-)

commit 6e4d8ededbb01dfd7bf5bbbb31fc05d6d6ca161a
Author: Thomas Meire <blackskad@gmail.com>
Date:	Tue Jan 19 18:39:52 2010 +0100

    improve behaviour of match_case callback

 libempathy-gtk/empathy-search-bar.c | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

commit ba2326210afd63d1ae622c57b76b3b1f56ab4e9e
Author: Thomas Meire <blackskad@gmail.com>
Date:	Tue Jan 19 17:25:36 2010 +0100

    add match_case option to find_abilities

 libempathy-gtk/empathy-chat-text-view.c | 49
 +++++++++++++++++++++++----------
 libempathy-gtk/empathy-chat-view.c	 |  2 ++
 libempathy-gtk/empathy-chat-view.h	 |  2 ++
 libempathy-gtk/empathy-log-window.c	 |  3 ++
 libempathy-gtk/empathy-search-bar.c	 | 11 +++++---
 libempathy-gtk/empathy-theme-adium.c	 |  1 +
 6 files changed, 49 insertions(+), 19 deletions(-)

commit 0f812eb93730b84b7cbb60aaacf803aabdd6f9c5
Author: Thomas Meire <blackskad@gmail.com>
Date:	Tue Jan 19 16:55:09 2010 +0100

    respect match_case in chat_text_view_highlight

 libempathy-gtk/empathy-chat-text-view.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

commit a60052ef99b114614a598bc6fd623ae4bd6b4d52
Author: Thomas Meire <blackskad@gmail.com>
Date:	Tue Jan 19 15:26:56 2010 +0100

    Use gtk_text_iter_[backward/forward]_search for case sensitive
    searches, keep
    the custom version for case insensitive searches

 libempathy-gtk/empathy-chat-text-view.c | 46
 ++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 12 deletions(-)

commit 20941452d76810e181d91510168a7204c986edbd
Author: Thomas Meire <blackskad@gmail.com>
Date:	Sun Jan 17 12:25:40 2010 +0100

    added checkbox callback

 libempathy-gtk/empathy-search-bar.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 1d1701965496cb0d66a759cb4f7996de44a02044
Author: Thomas Meire <blackskad@gmail.com>
Date:	Sun Jan 17 11:29:49 2010 +0100

    added case sensitive search for adium themes (reverted previous
    commit)

 libempathy-gtk/empathy-chat-text-view.c | 14 ++++++++++----
 libempathy-gtk/empathy-chat-view.c	 | 12 ++++++++----
 libempathy-gtk/empathy-chat-view.h	 | 12 ++++++++----
 libempathy-gtk/empathy-log-window.c	 |  9 +++++++--
 libempathy-gtk/empathy-search-bar.c	 | 11 ++++++++---
 libempathy-gtk/empathy-theme-adium.c	 | 18 ++++++++----------
 6 files changed, 49 insertions(+), 27 deletions(-)

commit a988a27966b67140d57695edd32b8563cb3a2d03
Author: Thomas Meire <blackskad@gmail.com>
Date:	Sun Jan 17 10:05:26 2010 +0100

    make the adium theme respect new_search

 libempathy-gtk/empathy-theme-adium.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit d128e3a36e43a08a9dfe4a2c42b9485e146faeae
Author: Thomas Meire <blackskad@gmail.com>
Date:	Sat Jan 16 23:41:32 2010 +0100

    added case sensitive highlighting for adium themes

 libempathy-gtk/empathy-chat-text-view.c | 4 +++-
 libempathy-gtk/empathy-chat-view.c	 | 5 +++--
 libempathy-gtk/empathy-chat-view.h	 | 6 ++++--
 libempathy-gtk/empathy-log-window.c	 | 4 ++--
 libempathy-gtk/empathy-search-bar.c	 | 6 +++---
 libempathy-gtk/empathy-theme-adium.c	 | 5 +++--
 6 files changed, 18 insertions(+), 12 deletions(-)

commit 993766233887be988d3864c64be85c83989d42ad
Author: Thomas Meire <blackskad@gmail.com>
Date:	Sat Jan 16 16:41:50 2010 +0100

    simple toggle button to match the case

 libempathy-gtk/empathy-search-bar.c  |  7 +++++++
 libempathy-gtk/empathy-search-bar.ui | 12 ++++++++++++
 2 files changed, 19 insertions(+)

commit aab9053d638c375560d8784eee995969b004b5ba
Author: Thomas Meire <blackskad@gmail.com>
Date:	Sat Jan 16 14:55:54 2010 +0100

    remove priv->last_search and factor out empathy_search_bar_search

 libempathy-gtk/empathy-search-bar.c | 87
 +++++++++++++++++--------------------
 1 file changed, 40 insertions(+), 47 deletions(-)

commit aa27406264f677978586a2f2ae583ab672b1029c
Author: Ken VanDine <ken.vandine@canonical.com>
Date:	Wed Jan 20 11:20:39 2010 +0000

    Make the "Edit Custom Messages" window 420px wide by default (#607463)

 libempathy-gtk/empathy-status-preset-dialog.ui | 1 +
 1 file changed, 1 insertion(+)

commit 4cbba43910919eac6cf0eda94988b7a5ae6563d1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 20 11:07:28 2010 +0000

    add empathy-auto-salut-account-helper.c to POTFILES.in

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit 12cf97ee46d91833368b27fa93c0da91e284e350
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Tue Jan 19 19:29:05 2010 -0500

    Re-send sps/pps regulary with H.264

 data/element-properties | 2 ++
 1 file changed, 2 insertions(+)

commit 38069d2a7ed386cc85876aaefaa0dee9cd2ee484
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 19 15:11:16 2010 +0000

    Call create_salut_account_if_needed when the assistant is closed

    That way we only try to create the account if the assistant properly
    terminates (#607436).

 src/empathy-account-assistant.c | 3 +++
 src/empathy.c			 | 1 -
 tests/interactive/Makefile.am	 | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

commit 902b24c56151985da6eadedc748803d686a07a62
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 19 14:54:46 2010 +0000

    Don't pass managers to create_salut_account_if_needed

    It can dup it itself.

 src/empathy-auto-salut-account-helper.c | 24 +++++++++++++++++++++---
 src/empathy-auto-salut-account-helper.h |  2 +-
 src/empathy.c				 |  3 +--
 3 files changed, 23 insertions(+), 6 deletions(-)

commit 452df1568e0a3e74a49c92c00840e15c788215ce
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 19 14:40:57 2010 +0000

    move create_salut_account_if_needed and should_create_salut_account
    to a new file

 src/Makefile.am			 |   1 +
 src/empathy-auto-salut-account-helper.c | 215
 ++++++++++++++++++++++++++++++++
 src/empathy-auto-salut-account-helper.h |  35 ++++++
 src/empathy.c				 | 182 +--------------------------
 4 files changed, 252 insertions(+), 181 deletions(-)

commit c4f65286eb3b7f82d25afa63c5204a98bd85408a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 19 14:03:11 2010 +0000

    account-assistant: disable Google Talk when creating a new account

    Google Talk doesn't support inband registration (#607455).

 src/empathy-account-assistant.c | 3 +++
 1 file changed, 3 insertions(+)

commit 8da0a6feaddfa5ab7df373f0f85c7124b31774e8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 19 14:01:26 2010 +0000

    Pass a boolean saying if the protocol is Google Talk or not to
    EmpathyProtocolChooserFilterFunc

    That's the only way to filter Google Talk if we want to.

 libempathy-gtk/empathy-protocol-chooser.c | 5 ++++-
 libempathy-gtk/empathy-protocol-chooser.h | 4 +++-
 src/empathy-account-assistant.c	   | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

commit 3241a32e5b7fc4ee8ae8907fbdde74d98660ebca
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 19 13:49:37 2010 +0000

    add_register_buttons: don't show the register buttons in simple mode

    We use another page in the assistant to create new accounts (#607455).

 libempathy-gtk/empathy-account-widget.c | 3 +++
 1 file changed, 3 insertions(+)

commit 48a4f5ec33f06f0e26017fcf7fc4c235a8e6d7df
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 19 13:42:12 2010 +0000

    account-widget: check that the apply button actually exist before
    modifying it

    It's not created in the 'simple' version of the widget. (#607455)

 libempathy-gtk/empathy-account-widget.c | 4 ++++
 1 file changed, 4 insertions(+)

commit f7cee33cf8bd3598f9d9869797d7d0737573b6c6
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Tue Jan 19 14:59:28 2010 +0100

    Make sure the column spacing is the same for all protocols.

 libempathy-gtk/empathy-account-widget-groupwise.ui | 2 +-
 libempathy-gtk/empathy-account-widget-msn.ui	    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit eefb547a9d4ea02155a5602802b6bf20fed23005
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Tue Jan 19 14:14:07 2010 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 159
 +++++++++++++++++++++++----------------------------------------
 1 file changed, 57 insertions(+), 102 deletions(-)

commit d9364ce3c97b72e1ff96a499ff6343e4efa49d05
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Jan 18 20:37:39 2010 +0100

    Add a remove button below the accounts treeview instead of the
    in-treeview icon.

 src/empathy-accounts-dialog.c	| 74
 +++++++++++++++++++++++++++++++++---------
 src/empathy-accounts-dialog.ui | 40 +++++++++++++++++++----
 2 files changed, 93 insertions(+), 21 deletions(-)

commit 73ac36ec1868e3000155ccf7c18a6b29e461984d
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Jan 18 19:07:44 2010 +0100

    Updated Spanish translation

 po/es.po | 153
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 72 insertions(+), 81 deletions(-)

commit fbb51c0510a2c4c21ac0ef1f846cb04510546005
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 18 17:10:16 2010 +0000

    all.xml: remove unused and redundant external-type

    They are either not used anymore or already defined in
    generic-types.xml

 extensions/all.xml | 26 --------------------------
 1 file changed, 26 deletions(-)

commit 2350876b533822606ad8080e53840fb55de83f3a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 18 16:59:45 2010 +0000

    remove Channel_Handler.xml; we don't use it since a while

 extensions/Channel_Handler.xml | 62
 ------------------------------------------
 extensions/Makefile.am		|  1 -
 extensions/misc.xml		|  1 -
 3 files changed, 64 deletions(-)

commit 602c58582b0e7add0585c7f8e708d16acaf25668
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 14 14:05:54 2010 +0000

    remove Tube_Handler.xml

 extensions/Makefile.am      |	1 -
 extensions/Tube_Handler.xml | 57
 ---------------------------------------------
 extensions/misc.xml	     |	1 -
 3 files changed, 59 deletions(-)

commit c30eaa7a26e66671c53c81f85296443e7c8198bd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 14 14:11:47 2010 +0000

    remove empathy-tube-handler.c and empathy-tube-dispatch

 libempathy/Makefile.am		   |   2 -
 libempathy/empathy-dispatcher.c   |   1 -
 libempathy/empathy-tube-handler.c | 288 -----------------------
 libempathy/empathy-tube-handler.h |  64 ------
 po/POTFILES.in			   |   1 -
 src/.gitignore			   |   3 -
 src/Makefile.am		   |   5 +-
 src/empathy-tube-dispatch.c	   | 467
 --------------------------------------
 src/empathy-tube-dispatch.h	   |  75 ------
 9 files changed, 1 insertion(+), 905 deletions(-)

commit edf04ad86a916e81ce13fda6c9544ea78eb6b809
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 14 14:31:54 2010 +0000

    stop dispatching tube channels (#599159)

    Tube applications should use the ChannelDispatcher.

 libempathy/empathy-dispatcher.c |   1 -
 src/empathy-event-manager.c	 | 123
 ----------------------------------------
 src/empathy.c			 |   6 --
 3 files changed, 130 deletions(-)

commit 7d9ef8cc5b24cb51018c37d81b686edb8a458823
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon Jan 18 17:30:46 2010 +0100

    Unify the infobar and the account name widgets.

 src/empathy-accounts-dialog.c	| 60
 +++++++++++++++++++++++++++++++-----------
 src/empathy-accounts-dialog.ui | 37 +-------------------------
 2 files changed, 46 insertions(+), 51 deletions(-)

commit 8a8ebfdbb3f7caf4a05d75a7530052d19ececabf
Author: G.Balaji <balajig81@gmail.com>
Date:	Mon Jan 18 20:40:02 2010 +0530

    Changed the return string of empathy_presence_get_default_message
    to Invisible so that we display Invisible to the user.

    This fix bug #603472

 libempathy/empathy-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit abe61c3e3f10ceeb911cfe6ee1ae16617adfac70
Author: Thomas Meire <blackskad@gmail.com>
Date:	Mon Jan 18 14:53:23 2010 +0000

    Fix /join command with one channel (#607306)

 libempathy-gtk/empathy-chat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 508ae6971b3b64e6f5db47cf1c452d70137993c9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 18 11:15:26 2010 +0000

    fix identation

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7a3f2ebca0e3b23f384a6173645e94b4a424704d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 15 12:15:27 2010 +0000

    Stop greysing and blinking the protocol icon

    We now have another icon showing the connection status so there is
    no point to
    display it (in an unclear way) in the protocol icon as well.

 src/empathy-accounts-dialog.c | 24 ------------------------
 1 file changed, 24 deletions(-)

commit 2680f3635db17529e00ea200a625c53e0a0b0209
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 15 11:27:16 2010 +0000

    update account in treeview when it's disabled

 src/empathy-accounts-dialog.c | 1 +
 1 file changed, 1 insertion(+)

commit efcf558673f83faf9621fe644ea1c20c78756d9f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 15 10:48:15 2010 +0000

    update treeview when account's status is changed

 src/empathy-accounts-dialog.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

commit e7dc37cd2c4be8c8ab892bfcebf57249c4a15460
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 14 16:02:43 2010 +0000

    accounts-dialog: display status of accounts in the treeview (#605309)

 src/empathy-accounts-dialog.c | 78
 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

commit d8a99a7d7f833b1e6fae18661d1fb54ef22133b1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 14 15:43:16 2010 +0000

    rename accounts_dialog_model_pixbuf_data_func to
    accounts_dialog_model_protocol_pixbuf_data_func

 src/empathy-accounts-dialog.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit c9b1a29662c4a681f7e53a4bdf7477e326b45298
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 15 16:13:49 2010 +0000

    accounts-dialog: remember the account and password param when changing
    protocol (#605532)

 src/empathy-accounts-dialog.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

commit f82cf307e75f0446b4e590b0036a179b64862939
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 15 16:13:24 2010 +0000

    account-widget: add
    empathy_account_widget_set_{account,password}_param

    This will be used to restore the account and password params when
    switching
    widgets.

 libempathy-gtk/empathy-account-widget.c | 32
 ++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-account-widget.h |  6 ++++++
 2 files changed, 38 insertions(+)

commit 3d2438bfc48b2858c2800feb9ca96fda3634a089
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Jan 18 06:19:10 2010 +0100

    Updated Spanish translation

 po/es.po | 163
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 79 insertions(+), 84 deletions(-)

commit f687777360a213c638374c1d497ca849717ce174
Author: Javier Jardón <jjardon@gnome.org>
Date:	Sun Jan 17 21:05:38 2010 +0100

    Support silent build rules with automake 1.11

    Support silent build rules, requires at least automake-1.11.
    Disable by either passing --disable-silent-rules to configure or
    passing V=1 to make.

    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=585364

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 .gitignore		    |  2 --
 configure.ac		    | 11 ++++---
 data/Makefile.am	    |  2 +-
 extensions/Makefile.am     | 30 ++++++++----------
 libempathy-gtk/Makefile.am | 15 ++++-----
 libempathy/Makefile.am     | 15 ++++-----
 m4/shave.m4		    | 77
 --------------------------------------------
 shave-libtool.in	    | 69 ----------------------------------------
 shave.in		    | 79
 ----------------------------------------------
 src/Makefile.am	    |  5 ++-
 tools/Makefile.am	    | 20 ++++++------
 tools/shave.mk		    |  1 -
 12 files changed, 46 insertions(+), 280 deletions(-)

commit 6a1aecd8b35cee47c56326d4babc46a146a91be0
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Sat Jan 16 16:15:31 2010 +0100

    set presence to offline when account is disabled

    else the presence is empty and no icon is shown in the infobar
    (#604706)

 src/empathy-accounts-dialog.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 605672f66eb239c2aed2de45cf737f9278374614
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 15 14:04:48 2010 +0000

    Consider connected account which doesn't implement presence as
    available (#604700)

 src/empathy-accounts-dialog.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 878db108e421ef8ed628ffb7e223b1ee6e031909
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 15 14:10:37 2010 +0000

    Rephrase the TP_CONNECTION_STATUS_REASON_REQUESTED message to make
    it clearer (#606510)

 libempathy/empathy-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2734f01164697128745c9a16e417521cff7a9370
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 14 12:58:38 2010 +0000

    No need to get RequestableChannelClasses if ContactCapability is
    implemented

    We use it only as a fallback if it's not.

 libempathy/empathy-tp-contact-factory.c | 38
 ++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 15 deletions(-)

commit a551a0d1cdf34a3f36d21d235257a652db264f7e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 14 12:48:22 2010 +0000

    factor out channel_classes_to_capabilities

 libempathy/empathy-tp-contact-factory.c | 122
 +++++++++++++++-----------------
 1 file changed, 58 insertions(+), 64 deletions(-)

commit b61b45cfe0862f75d7d60708484a588bb54c9cae
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 13 15:17:01 2010 +0000

    Use ContactCapabilities to get audio/video caps (#599163)

 libempathy/empathy-tp-contact-factory.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

commit 5d54cdabd84b5425e36596426dec5025e09f7de5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 13 14:49:14 2010 +0000

    Stop using the old Capabilities iface if ContactCapabilities is
    implemented

 libempathy/empathy-tp-contact-factory.c | 40
 ++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

commit 398f69f13a9c9ee415fba5b1b393f27984b558bc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 13 14:06:12 2010 +0000

    Claim that contacts support stream tube if it's announced in their
    contact capabilities

 libempathy/empathy-tp-contact-factory.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

commit 0fc14712b0e218d6ab5244eb995cc632d02f3b34
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 13 13:59:23 2010 +0000

    Claim that contacts support FT if it's announced in their contact
    capabilities (#599164)

 libempathy/empathy-tp-contact-factory.c | 91
 +++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

commit af80a92b8af244fff6567706d8a79010e2c21cc7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 13 13:55:24 2010 +0000

    Don't assume contacts support FT if ContactCapabilities is implemented

 libempathy/empathy-tp-contact-factory.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

commit 49c0ca0a3327016e3b4b64490c6494ef0383ce7e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 14 11:38:18 2010 +0000

    account-widget: use empathy_account_widget_changed

 libempathy-gtk/empathy-account-widget.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

commit 6dfc3153eb4551778f2cdbb6f9acc48013c7ddc4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 14 11:31:03 2010 +0000

    account-widget-irc: Call empathy_account_widget_changed when network
    combobox is changed

    By calling this function we'll activate the connect button and record
    that the
    widget contains pending changes (#606642).

 libempathy-gtk/empathy-account-widget-irc.c | 1 +
 1 file changed, 1 insertion(+)

commit 7f3762d3676e2b0711793f82f6cd789ba237106a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jan 14 11:30:37 2010 +0000

    add empathy_account_widget_changed as protected method

 libempathy-gtk/empathy-account-widget.c | 10 ++++++++++
 libempathy-gtk/empathy-account-widget.h |  3 +++
 2 files changed, 13 insertions(+)

commit b4cac9d1b0e95f27e294b71d6aa653d86f1a9287
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Thu Jan 14 13:18:04 2010 +0200

    Updated Arabic translation

 po/ar.po | 917
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 475 insertions(+), 442 deletions(-)

commit 89ca489b3fd31b1faf3ff85c37dd30b89bce3cf0
Author: Claude Paroz <claude@2xlibre.net>
Date:	Wed Jan 13 21:40:22 2010 +0100

    Updated French translation

 po/fr.po | 1892
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 1115 insertions(+), 777 deletions(-)

commit 03e17755a77004fca9cabd9213123fc8c498fc4e
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Wed Jan 13 18:53:19 2010 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 476
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 252 insertions(+), 224 deletions(-)

commit 2ea53064d10dfe8ab13f6a7af3355a3f56d2d56f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 13 10:28:29 2010 +0000

    Call xmlCleanupParser() only once when exiting (#600693)

    This function should only be called when exiting the application as
    it cleans
    up the memory allocated by the library itself.

    Thanks to Lennart for pointing this out.

 libempathy-gtk/empathy-plist.c		  | 2 --
 libempathy/empathy-chatroom-manager.c	  | 1 -
 libempathy/empathy-contact-groups.c	  | 1 -
 libempathy/empathy-irc-network-manager.c | 1 -
 src/empathy.c				  | 1 +
 5 files changed, 1 insertion(+), 5 deletions(-)

commit 4ec913aeb99b71c85da47e47490954a22465babc
Merge: 23bfa8e e4337e5
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Jan 13 11:59:24 2010 +0100

    Merge branch 'contact'

commit e4337e5c450842abd65f7c2fb7d233c2cc1105df
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Jan 13 11:53:46 2010 +0100

    Remove the "Contact" alignment from contat widget

 libempathy-gtk/empathy-contact-dialogs.c   |	1 +
 libempathy-gtk/empathy-contact-list-view.c |	2 +
 libempathy-gtk/empathy-contact-widget.c    |	5 +-
 libempathy-gtk/empathy-contact-widget.ui   | 194
 ++++++++++++-----------------
 4 files changed, 85 insertions(+), 117 deletions(-)

commit 23bfa8e617322d97832303492b03ddfef9184ef7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 13 10:12:03 2010 +0000

    Use the proper enum value when checking FsMediaType

    FS_MEDIA_TYPE_VIDEO and TP_MEDIA_STREAM_TYPE_VIDEO have actually
    the same
    value but newer versions of gcc are smarter and detect this kind
    of bug.

 src/empathy-call-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f6aaf7478dd61a3696cc27a225a206ec89076a16
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Tue Jan 12 20:22:12 2010 +0100

    Added initial Spanish translation

 help/es/es.po | 84
 ++++++++++++++++-------------------------------------------
 1 file changed, 22 insertions(+), 62 deletions(-)

commit e684a3eff7d6f4ab3e50bd75047a1dc83ace7910
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Tue Jan 12 20:22:04 2010 +0100

    Updated Spanish translation

 po/es.po | 415
 ++++++++++++++++++++++++++-------------------------------------
 1 file changed, 169 insertions(+), 246 deletions(-)

commit 939f04e4a193187fb4bc79a0ecf2ab3c580dc661
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 12 17:05:09 2010 +0000

    Revert "Escape the header of the notification (#599431)"

    This reverts commit 4363fe7a71208ee2d696211838f028ef97700b45.

    According to the notification spec, headers should not be escaped.
    Escaping them leads to displaying escaped text in the notification
    with some
    daemon (#603498).

    The bug #599431 was probably due to a bug in the notification-daemon
    and seems
    to work fine now.

 src/empathy-status-icon.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

commit 0ee842ac627f30fa14d75b06cd7147a67090731e
Author: Thomas Meire <blackskad@gmail.com>
Date:	Tue Jan 12 15:34:39 2010 +0000

    Add search bar in chat text views (#585168)

 libempathy-gtk/Makefile.am		 |   5 +-
 libempathy-gtk/empathy-chat-text-view.c |   5 +-
 libempathy-gtk/empathy-chat.c		 |  17 ++-
 libempathy-gtk/empathy-search-bar.c	 | 263
 ++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-search-bar.h	 |  64 ++++++++
 libempathy-gtk/empathy-search-bar.ui	 | 110 +++++++++++++
 libempathy-gtk/empathy-theme-manager.c  |   3 +
 po/POTFILES.in				 |   1 +
 8 files changed, 463 insertions(+), 5 deletions(-)

commit 183fa2e8a94d94a7098120fc43cde9ad83869de6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 21 11:20:02 2009 +0000

    chat_window_create_label: ref the widgets stored as data so we are
    sure they stay alive when doing DnD

 src/empathy-chat-window.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

commit 7e1c5b16b61c68e536c005b5286fbe9823db5d2f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 12 11:17:05 2010 +0000

    start dev of next version

 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 477531547e3e8d8b93f32944ca9bfc61ee372277
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 12 10:46:03 2010 +0000

    prepare 2.29.5.1

 NEWS	      | 11 +++++++++++
 configure.ac |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

commit 0edaeea06e7f2f213fc27b7d40377d00efb81ec0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 12 10:41:07 2010 +0000

    Revert "added si to LINGUAS file"

    This reverts commit 26f31d66832b7ec72aa5544de15cd99cbf90640e.
    This commit accidentally removed the po/LINGUAS file.

 po/LINGUAS | 75
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

commit 522f9fa9e51b1e2e6f011c6b34a829f1c245111f
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Jan 12 08:29:47 2010 +0100

    Reorder functions to not declare them on top

 libempathy-gtk/empathy-contact-widget.c | 2101
 +++++++++++++++----------------
 1 file changed, 1028 insertions(+), 1073 deletions(-)

commit 178900e51fac46c1bb8d6ecbaba45ca40bb62e28
Author: A S Alam <aalam@users.sf.net>
Date:	Tue Jan 12 08:33:33 2010 +0530

    updating for Punjabi by A S Alam

 po/pa.po | 2166
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1378 insertions(+), 788 deletions(-)

commit 58fe2a2c2568044544c18d353cb8fef83192a09b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 11 18:32:02 2010 +0000

    start dev of 2.29.6

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c4b3eac5b0ee4c3c3df23908e0e1b566305bdce5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 11 17:55:29 2010 +0000

    add Channel_Interface_Conference.xml to EXTRA_DIST

 extensions/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 54ec2ae71ed911aac17e2da5565b842fb95a0f04
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 11 17:16:58 2010 +0000

    prepare 2.29.5 release

 NEWS	      | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 57 insertions(+), 2 deletions(-)

commit 62ba54af21d4f9ca133824a7fda636ab9a80a139
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 11 17:02:43 2010 +0000

    contact_list_store_get_contact_status_icon_with_icon_name: early
    return if icon_name is NULL

 libempathy-gtk/empathy-contact-list-store.c | 3 +++
 1 file changed, 3 insertions(+)

commit ad84d268b925a1950625ad85221bb8e9007bb55b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 11 17:02:15 2010 +0000

    empathy_pixbuf_contact_status_icon_with_icon_name: icon_name is not
    supposed to be NULL

 libempathy-gtk/empathy-ui-utils.c | 1 +
 1 file changed, 1 insertion(+)

commit 2de6e5e0bb4d5d6c68fc44bd4ac7e6c1949364df
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 11 15:59:45 2010 +0000

    listen for the "account-validity-changed" so new account are added
    to the dispatcher (#605689)

 libempathy/empathy-dispatcher.c | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

commit efa437ce79b0df44f5595c6006a355a209b3608f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 11 15:59:36 2010 +0000

    store status-changed sig handler in a hash table

 libempathy/empathy-dispatcher.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

commit 5fc16e172814745c2f40dffb35bb04c3d4f75f2b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 11 15:57:16 2010 +0000

    factor out connect_account

 libempathy/empathy-dispatcher.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

commit eab24ccdd00311bd06ce47c36ac388489237ae12
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 6 14:27:36 2010 +0000

    empathy_dispatcher_join_muc: assert than connection_data is not NULL

 libempathy/empathy-dispatcher.c | 1 +
 1 file changed, 1 insertion(+)

commit 3a96a951349e51717785605fcb32aecf0b8a96e4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 11 14:58:59 2010 +0000

    Wait that the pipeline has been started before enabling camera

    The v4l2src element doesn't work properly if the pipeline has not
    been started
    (#605549).

 src/empathy-call-window.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

commit f9f6639f8f1cee0cb49fbe607cb00bb59fc02208
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 11 14:47:47 2010 +0000

    factor out start_call

 src/empathy-call-window.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

commit 3c31c5f856635a1a50c4fb107abd6d1871b48df7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 11 14:01:13 2010 +0000

    empathy_call_window_constructed: no need to call display_video_preview

    The callback fired when tool_button_camera_on will call it for us.

 src/empathy-call-window.c | 2 --
 1 file changed, 2 deletions(-)

commit 9dd268d147b52e7bcb1beaebf3ab5fd13cf5e73a
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Sat Jan 9 13:22:55 2010 +0100

    remember handler ids to prevent double invokation

    the handler ids for the status-changed signals are remembered to
    prevent registration more than once on newly created accounts

 src/empathy-main-window.c | 41 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 4 deletions(-)

commit a4f5f649d912e3726b568fd7e67ded887f92587b
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Sat Jan 9 12:47:34 2010 +0100

    use G_TYPE_OBJECT instead of G_TYPE_POINTER

    in the signature of the account-created signal

 libempathy-gtk/empathy-account-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7a8efe86d8f47d911b15a9ad3f56c52ba66de41f
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Mon Dec 28 14:39:57 2009 +0100

    connect to val-changed signal in contact manager

    new accounts have to be registered for status-changed signals, that
    can only be done if the account-validity-changed signal is handled.
    fixes bug #604628

 libempathy/empathy-contact-manager.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit 32f691f2a35bce50b8167b7de32ba357f3e40343
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Mon Dec 28 13:53:29 2009 +0100

    connect to status-changed signal of new accounts

    the main window has to listen for status-changed signals of newly
    created accounts to display error-infobar

 src/empathy-main-window.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit b7fd289a92a01ba588ce29b9499f220d6d6c342f
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Mon Dec 28 13:03:12 2009 +0100

    connect to signals when account has been created

    when a new account is created the signals presence-changed and
    status-changed of the account are connected to update the treeview
    icon and status infobar

 libempathy-gtk/empathy-account-widget.c |  6 +++---
 src/empathy-accounts-dialog.c		 | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

commit 374c27a1f5f71a1ed8f9a1cfd05bab58ba8a8fc9
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Sat Jan 9 16:04:31 2010 +0100

    don't make add-button sensitive on protocol change

    when creating an account the treeview and add/import buttons should
    be insensitive. when during creating the protocol was altered via
    protocol-chooser the add-button became sensitive. this should be
    fixed with this commit

 src/empathy-accounts-dialog.c | 1 -
 1 file changed, 1 deletion(-)

commit 6129abad0d991e8cb7d8aa8f582e8427fd96c5c5
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Sun Dec 27 11:06:19 2009 +0100

    disable treeview when creating an account

    fixes bug 604154

 src/empathy-accounts-dialog.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 1f682ae31e796c0da98665416b2981b004a58ecf
Author: Claude Paroz <claude@2xlibre.net>
Date:	Mon Jan 11 12:12:19 2010 +0000

    Convert the context info to a translator comment (#606513)

 src/empathy-new-chatroom-dialog.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit b24ca484fb47cc6acc7585fb56377e7b3e6a71cf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 17 12:16:31 2009 +0000

    accounts-dialog: inherit from GtkDialog (#600023)

 src/empathy-accounts-dialog.c	| 156 +++++++++--------
 src/empathy-accounts-dialog.h	|   4 +-
 src/empathy-accounts-dialog.ui | 376
 +++++++++++++++++------------------------
 3 files changed, 244 insertions(+), 292 deletions(-)

commit 309dc2bba3edec26b99cb9cce97802d280090916
Author: Daniel Nylander <po@danielnylander.se>
Date:	Sat Jan 9 18:22:09 2010 +0100

    Updated Swedish translation

 po/sv.po | 2595
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1181 insertions(+), 1414 deletions(-)

commit 15e0f47f2039c05737a5613f913b725d5cfef697
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Sun Dec 27 10:48:35 2009 +0100

    remove box around advanced settings

    in generic-widget, fixes bug 605529

 libempathy-gtk/empathy-account-widget-generic.ui | 38
 +++++++-----------------
 1 file changed, 11 insertions(+), 27 deletions(-)

commit 44ecf9f2153aaf5e8d51fb915af8bba120ea3a66
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Fri Jan 8 20:51:55 2010 +0100

    Updated Spanish translation

 help/es/es.po | 3243
 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 2302 insertions(+), 941 deletions(-)

commit d9b76661b133461f2ca816328902f5de1efe06f2
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Wed Jan 6 20:06:23 2010 +0100

    Updated Spanish translation

 po/es.po | 46 ++++++----------------------------------------
 1 file changed, 6 insertions(+), 40 deletions(-)

commit 027aa3f769422d5cb1a4c09541f0f2928028464b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 23 12:41:59 2009 +0000

    contact-list-view: merge the audio and vido call column

    Now that we display a context menu allowing to start audio and
    video call
    there is no point to keep the 2 icons. Merge them to one column as
    they are
    not just a hint saying that the contact supports audio and/or video.

 libempathy-gtk/empathy-contact-list-view.c | 52
 +++---------------------------
 1 file changed, 5 insertions(+), 47 deletions(-)

commit 6ebf46cb5048e90de75dceead5df6052e776a3a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 23 12:09:45 2009 +0000

    Display a context menu when clicking on audio/video icons (#590051)

 libempathy-gtk/empathy-contact-list-view.c | 69
 ++++++++++++++----------------
 1 file changed, 32 insertions(+), 37 deletions(-)

commit 63c518d5469107144ad3c6ba8cc8c4c7f066747e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 6 17:17:39 2010 +0000

    hash_job_done: set hash_data->error to NULL when cleaning it

    This avoid to try to clean it at second time in hash_data_free
    (#606220).

 libempathy/empathy-ft-handler.c | 1 +
 1 file changed, 1 insertion(+)

commit 52d8bb2ebe6ef009d2adccbacfb3acbcca0a30c3
Author: Thomas Meire <blackskad@gmail.com>
Date:	Sat Jan 2 21:35:05 2010 +0100

    allow multiple rooms with /join (bug #604347)

 libempathy-gtk/empathy-chat.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

commit 772d724cb68633175ece7439ae0cc2a672ba7e10
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Wed Jan 6 17:02:33 2010 +0100

    Updated Spanish translation

 po/es.po | 237
 ++++++++++++++++++++++++++-------------------------------------
 1 file changed, 96 insertions(+), 141 deletions(-)

commit 06adc78c2ea964c5cc993916b7ccdaf1d1067dd4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 6 15:30:08 2010 +0000

    remove debug message when creating or retrieving a status icon from
    the cache

 libempathy-gtk/empathy-contact-list-store.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 6137828a9955f5e571a08f503ba46308568fb4e0
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Jan 6 16:37:47 2010 +0100

    Add the protocol icon in EmpathyContactWidget. That's displayed for
    contact list tooltip too.

 libempathy-gtk/empathy-contact-widget.c | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

commit a8260d4f1de4ab185922be3b7713c15f55f1f0a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 6 15:25:39 2010 +0000

    rename 'location' to 'loc' to fix shadow declaration

 libempathy-gtk/empathy-contact-widget.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit e38cc7c99febaf760bc07e118c8ce3f2d1ffe615
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:	Fri Jan 1 13:02:23 2010 +0000

    Remove Pango markup from translatable strings where possible

    Use GtkBuilder attributes on labels instead, and change one instance
    of code
    to automatically add markup to the translated string.

 libempathy-gtk/empathy-account-widget-aim.ui	    | 10 +++++--
 libempathy-gtk/empathy-account-widget-groupwise.ui | 10 +++++--
 libempathy-gtk/empathy-account-widget-icq.ui	    | 10 +++++--
 libempathy-gtk/empathy-account-widget-jabber.ui    | 20 ++++++++++---
 libempathy-gtk/empathy-account-widget-msn.ui	    | 10 +++++--
 libempathy-gtk/empathy-account-widget-sip.ui	    | 34
 +++++++++++++++-------
 libempathy-gtk/empathy-account-widget-yahoo.ui     | 10 +++++--
 libempathy-gtk/empathy-contact-widget.c	    |  6 +++-
 8 files changed, 85 insertions(+), 25 deletions(-)

commit 909a8b53b6ef8ec6e4a9e5bed8bbb5226dc061f4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 6 15:10:58 2010 +0000

    show_protocols should be disabled by default (#605822)

 data/empathy.schemas.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 528eeaea5097034456fd5b322924c5301e92e9cd
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Wed Jan 6 16:07:15 2010 +0100

    Updated Spanish translation

 po/es.po | 584
 ++++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 392 insertions(+), 192 deletions(-)

commit f65faee618844e60b0910107b683f7e74f4523bb
Author: Thomas Meire <blackskad@gmail.com>
Date:	Wed Jan 6 11:47:29 2010 +0000

    Print autocompletion suggestions to chatview (#599779)

 libempathy-gtk/empathy-chat.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit 35c99e3a75272c03b71e04c3e1bf1944167295ee
Author: Thomas Meire <blackskad@gmail.com>
Date:	Wed Jan 6 11:03:23 2010 +0000

    Fix autocompletion for non-alphanumeric nicknames

    This bug is caused by the behaviour of
    gtk_text_iter_backward_word_start. It
    searches the text for delimiters, based on languages in pango. Numbers
    and
    characters as | and [ are not considered to be part of a word in most
    languages, while they are a part of nicknames. Therefore, empathy
    fails to get
    the typed part of the nickname.
    The attached patch will instead search backwards for a space
    character. The
    text that needs to be completed, is the text between the caret and
    the first
    space before that. (#554767)

 libempathy-gtk/empathy-chat.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 7b2c1fab3ca841fcf54cfb10d21eb0cc3fbbc7a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jan 6 11:01:12 2010 +0000

    POTFILES.in: add empathy-invite-participant-dialog.c

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit 94c432662adf5e77b8f49441c84899ff8a83d06e
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Wed Jan 6 11:06:20 2010 +0100

    Updated Norwegian bokmål translation.

 po/nb.po | 783
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 401 insertions(+), 382 deletions(-)

commit 1d68331dcfd8fde3efe3b7bde82e808c3a59ba67
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Sat Jan 2 10:22:54 2010 +0100

    Updated Slovenian translation

 po/sl.po | 6945
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 3523 insertions(+), 3422 deletions(-)

commit 89d36ccc021bd173e95e62326cb84b7f873c123f
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:	Thu Dec 31 18:08:40 2009 +0000

    Miscellaneous string fixes

    Lots of small spelling and grammar fixes, as well as some terminology
    cleanups.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 data/empathy.schemas.in			     | 8 ++++----
 libempathy-gtk/empathy-account-widget-icq.ui	     | 2 +-
 libempathy-gtk/empathy-account-widget-irc.ui	     | 2 +-
 libempathy-gtk/empathy-account-widget-local-xmpp.ui | 2 +-
 libempathy-gtk/empathy-account-widget-msn.ui	     | 2 +-
 libempathy-gtk/empathy-account-widget-yahoo.ui      | 8 ++++----
 libempathy-gtk/empathy-avatar-chooser.c	     | 2 +-
 libempathy-gtk/empathy-chat.c			     | 2 +-
 libempathy-gtk/empathy-contact-menu.c		     | 2 +-
 libempathy-gtk/empathy-contact-widget.ui	     | 6 +++---
 nautilus-sendto-plugin/empathy-nautilus-sendto.c    | 4 ++--
 src/empathy-account-assistant.c		     | 8 ++++----
 src/empathy-accounts-dialog.c			     | 2 +-
 src/empathy-call-window.c			     | 2 +-
 src/empathy-chat-window.ui			     | 2 +-
 src/empathy-event-manager.c			     | 4 ++--
 src/empathy-preferences.ui			     | 2 +-
 src/empathy-tube-dispatch.c			     | 2 +-
 18 files changed, 31 insertions(+), 31 deletions(-)

commit 3fa03d64274f3fa8b939991e3e61d9cdeeffb5ff
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:	Thu Dec 31 17:56:30 2009 +0000

    Punctuation fixes in translatable strings

    Fix punctuation in the IRC command help messages. Use proper Unicode
    ellipses
    throughout Empathy, and proper em-dashes where appropriate.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy-gtk/empathy-chat.c		   | 24 ++++++++++++------------
 libempathy-gtk/empathy-contact-menu.c	   |  2 +-
 libempathy-gtk/empathy-contact-widget.ui  |  4 ++--
 libempathy-gtk/empathy-presence-chooser.c | 10 +++++-----
 src/empathy-accounts-dialog.c		   | 12 ++++++------
 src/empathy-accounts-dialog.ui		   |  4 ++--
 src/empathy-call-window.c		   |  2 +-
 src/empathy-chat-window.ui		   |  2 +-
 src/empathy-main-window.ui		   |  8 ++++----
 src/empathy-status-icon.ui		   |  4 ++--
 10 files changed, 36 insertions(+), 36 deletions(-)

commit 0388884a0add8538dec7c661d079495da4f834cf
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:	Thu Dec 31 17:48:53 2009 +0000

    Correct unnecessary use of the phrase "whether or not"

    Also correct use of nouns in place of verbs in a few areas, and
    make the
    consistent the terminology of signing in/out.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 data/empathy.schemas.in | 72
 ++++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

commit 6ea47f6e2806d7187afb7fe0c6ad0bbab0d54fbe
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Fri Jan 1 15:06:48 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 392
 ++++++++++++++++++++++--------------------------------------
 po/zh_TW.po | 391
 +++++++++++++++++++++++------------------------------------
 2 files changed, 291 insertions(+), 492 deletions(-)

commit 26f31d66832b7ec72aa5544de15cd99cbf90640e
Author: Danishka Navin <danishka@gmail.com>
Date:	Fri Jan 1 23:41:11 2010 +0530

    added si to LINGUAS file

 po/LINGUAS | 75
 --------------------------------------------------------------
 1 file changed, 75 deletions(-)

commit cb8864ec7666cc8e67494a46cab2202071d063c7
Author: Danishka Navin <danishka@gmail.com>
Date:	Fri Jan 1 23:38:59 2010 +0530

    added si.po file

 po/si.po | 3108
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 3108 insertions(+)

commit 33044833c1081d18f9e6d15825220cb70b9b8424
Author: Danishka Navin <danishka@gmail.com>
Date:	Fri Jan 1 23:37:24 2010 +0530

    added si to LINGUAS file

 po/LINGUAS | 1 +
 1 file changed, 1 insertion(+)

commit c17337f0c17f721a10e108a683fd26ba21301660
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:	Thu Dec 31 17:37:58 2009 +0000

    Updated British English translation

 po/en_GB.po | 1775
 +++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1108 insertions(+), 667 deletions(-)

commit d034683efc6d614ce6f07c78911a4cc2c5e63919
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Dec 28 02:11:52 2009 +0100

    Updated Spanish translation

 po/es.po | 87
 ++++++++++++++++++++++++++++++----------------------------------
 1 file changed, 41 insertions(+), 46 deletions(-)

commit 4b314d711658cee9f98cf55b83506755e33cfbeb
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Dec 28 02:06:08 2009 +0100

    Updated Spanish translation

 po/es.po | 308
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 165 insertions(+), 143 deletions(-)

commit c487338c1247c8bac23ddd90410c126b09196461
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Sat Dec 26 13:35:38 2009 +0200

    Updated Arabic translation

 po/ar.po | 1696
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1092 insertions(+), 604 deletions(-)

commit 8e342c724ef0eed52fc08e04dd4589bb02b41f89
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:	Sat Dec 26 19:01:50 2009 +0800

    Updated Traditional Chinese(Hong Kong and Taiwan)

 po/zh_HK.po | 1759
 +++++++++++++++++++++++++++++++++++++++--------------------
 po/zh_TW.po | 1759
 +++++++++++++++++++++++++++++++++++++++--------------------
 2 files changed, 2316 insertions(+), 1202 deletions(-)

commit 153800e9804c5d032e5c8c6e1b15c3090e3c349a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 22 17:46:43 2009 +0000

    Remove the protocol selection screen when adding a new account

    Instead, display the protocol chooser on the top of the account widget
    (#599182).

 src/empathy-accounts-dialog.c	| 162
 ++++++++++++++++-------------------------
 src/empathy-accounts-dialog.ui | 157
 +++++++--------------------------------
 2 files changed, 92 insertions(+), 227 deletions(-)

commit a748e3cf4d08a94a674b4f675dc3a0457ab7c4e9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 22 15:34:22 2009 +0000

    account-settings: use empathy_signal_connect_weak to connect the
    ready signal on managers

    If for some reason this signal is fired after the settings has
    been destroyed,
    we shouldn't crash.

 libempathy/empathy-account-settings.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b2d926ba67fcb7bfbd7f5039e28e0d1bb5b2d6f0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 22 17:59:57 2009 +0000

    account-widget: presence_changed_cb: early return if widget has
    been destroyed

    The callback needs to manipulate widgets but can't do it if the
    account widget
    has already been destroyed.

 libempathy-gtk/empathy-account-widget.c | 3 +++
 1 file changed, 3 insertions(+)

commit 9ee5a2d0ec80e655cb834f8f95603f572c2f87f9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 22 15:37:15 2009 +0000

    account-widget: ensure that the object stays alive during the
    tp_account_manager_prepare_async call

 libempathy-gtk/empathy-account-widget.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 50f96722448f152b8bfe0c24501c4b1eb0136359
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 23 15:53:15 2009 +0000

    status_icon_update_tooltip: display the custom status msg, if any
    (#604481)

 src/empathy-status-icon.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

commit 3e44a8a3c4268a401f4a2869ee4b8a806d23c51a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 23 15:45:33 2009 +0000

    status_icon_update_tooltip: display a translated version of the
    default status string

 src/empathy-status-icon.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

commit 61aac31cb18ef645661c89c49f01bd9caca0124e
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:	Thu Dec 24 12:38:30 2009 +0700

    po/vi.po: Updated Vietnamese translation

 po/vi.po | 3533
 +++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 2550 insertions(+), 983 deletions(-)

commit 54faf210b72c259a0e2ab102f99c82d7f6755933
Author: Theppitak Karoonboonyanan <thep@linux.thai.net>
Date:	Wed Dec 23 17:54:53 2009 +0700

    Updated Thai translation.

 po/th.po | 121
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 64 insertions(+), 57 deletions(-)

commit 129fb769bbaff17cff505c9249d513828454a9d2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 23 10:36:58 2009 +0000

    Use clutter_get_option_group instead of gtk_clutter_init

    clutter_get_option_group will initialize clutter during arguments
    parsing.
    This avoid to call g_set_prgname twice as it's called once by
    g_option_context_parse and once when initializing clutter.

 src/empathy.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit 084d6772c28d3191af02cc86fd0b27f92f585edf
Author: Theppitak Karoonboonyanan <thep@linux.thai.net>
Date:	Wed Dec 23 10:56:17 2009 +0700

    Updated Thai translation.

 po/th.po | 1570
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 994 insertions(+), 576 deletions(-)

commit 57eaa86ef594878efcc160ece99c375f5ee0dcbf
Author: Laurent Bigonville <bigon@bigon.be>
Date:	Tue Dec 22 23:15:31 2009 +0100

    libempathy/empathy-irc-network-manager.c: Fix typo similiar -> similar

 libempathy/empathy-irc-network-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1d1f5f138931c698a5ca07c6377278210d36d31c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 21 17:22:01 2009 +0000

    Add register buttons to the account widget

 libempathy-gtk/empathy-account-widget.c | 52
 +++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

commit 6886131ed1c93f39dc8d961dbcd52ef85c64c18c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 21 17:21:18 2009 +0000

    factor out account_widget_is_gtalk

 libempathy-gtk/empathy-account-widget.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

commit 047a96316d388258fcff299ac4bea1bc3881ecae
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 21 17:01:13 2009 +0000

    add empathy_account_settings_get_tp_protocol

 libempathy/empathy-account-settings.c | 8 ++++++++
 libempathy/empathy-account-settings.h | 3 +++
 2 files changed, 11 insertions(+)

commit 2cf8e876c22f6f7af9aa1701061d2624cbc0b5d3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 21 16:23:20 2009 +0000

    remove register radio buttons in the create account frame

    They should be part of the account widget as we plan to kill this
    frame
    (#605213).

 src/empathy-accounts-dialog.c	|  35 -----------
 src/empathy-accounts-dialog.ui | 130
 +++++++++++++----------------------------
 2 files changed, 40 insertions(+), 125 deletions(-)

commit 36f39b9b545339768891665a5151540d6bc543a7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 22 10:47:56 2009 +0000

    reorder moblin specific code

    An #ifdef/#else structur is easier to read than #ifndef/#else. Change
    all the
    moblin tests to fit this structur.

 libempathy-gtk/empathy-account-widget.c | 54
 ++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 27 deletions(-)

commit 2cde466847cf06b8c0c276503464190b7ec1f2de
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 21 15:14:02 2009 +0000

    account-widget: move the 'Enable' checkbox to the top of the widget
    (#593268)

    This change doesn't affect the Moblin version.

 libempathy-gtk/empathy-account-widget.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 5be13a29a3e4afc3f10542ba0982cb57e97d785e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 21 14:41:55 2009 +0000

    account-widget: factor out add_enable_checkbox

 libempathy-gtk/empathy-account-widget.c | 131
 +++++++++++++++++---------------
 1 file changed, 69 insertions(+), 62 deletions(-)

commit 10bb432035ea43ab4ea7af7479fa0bc416cf7a59
Merge: d8a2cee fa65881
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Dec 22 21:56:31 2009 +1100

    Merge branch 'pmuc'

commit fa658816077d8dfcd59978bcb69b00b789f12636
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Dec 22 14:15:05 2009 +1100

    Remove FIXME

 src/empathy-chat-window.c | 2 --
 1 file changed, 2 deletions(-)

commit d07d688e26fc68890ec6a640090ddece560bb495
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Dec 22 14:03:17 2009 +1100

    [EmpathyContactSelectorDialog] add contact filtering support

 libempathy-gtk/empathy-contact-selector-dialog.c | 63
 ++++++++++++++++++++----
 libempathy-gtk/empathy-contact-selector-dialog.h |  2 +
 2 files changed, 55 insertions(+), 10 deletions(-)

commit 72034a8daf617d2a02d80f8a19d05d8be792ce6d
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Dec 22 11:29:08 2009 +1100

    Remove unneeded private struct

 src/empathy-invite-participant-dialog.c | 12 ------------
 1 file changed, 12 deletions(-)

commit d8a2cee1b7e31dc7d415bdfe6cf73c639e84cf7d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 21 17:53:37 2009 +0000

    start dev of 2.94.5

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 314fd3df8e43b2a97678f8b6133dd9cbd8a6d024
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 21 17:36:54 2009 +0000

    prepare 2.29.4

 NEWS	      | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  2 +-
 2 files changed, 54 insertions(+), 1 deletion(-)

commit 582759cb421b0095a82179a8e81de9a6da650178
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 21 14:00:55 2009 +0000

    account-widget-sip: re-add tooltips

    They have been accidentally removed in
    eed9993f70997795d52828ebe56e5831c9566206.

 libempathy-gtk/empathy-account-widget-sip.ui | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit c80fb17f32ce997a631e228a7b6fd89d2120a09d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 1 15:53:58 2009 +0000

    event-manager: remove the auto-remove timer when the event is
    destroyed

    This avoid to crash when trying to re-remove an old event (#603485).

 src/empathy-event-manager.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit 4d26e574b71c760e752a70eb5f2eb448b63f93e4
Author: Pascal Potvin <pascal.potvin@gmail.com>
Date:	Tue Dec 8 00:22:06 2009 -0500

    presence-chooser: Ellipsize long status messages (#576434)

 libempathy-gtk/empathy-presence-chooser.c     | 1 +
 libempathy-gtk/empathy-status-preset-dialog.c | 2 ++
 2 files changed, 3 insertions(+)

commit 2840411971e6e2a25a75b05a4ab0a0d8922b7fcb
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Dec 21 13:05:10 2009 +1100

    Make Invite Participant menu entry sensitive only when available

 src/empathy-chat-window.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

commit eb36cae56aec0cd245d693ebf2bcb4ce20fb458b
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Dec 21 12:51:02 2009 +1100

    Refactor MUC upgrading to be a feature of TpChat->add()

    Add a method to be able to tell whether a given TpChat supports
    you calling
    add() on it.

 libempathy/empathy-tp-chat.c | 109
 +++++++++++++++++++++++++++++++++++++------
 libempathy/empathy-tp-chat.h |   1 +
 src/empathy-chat-window.c    |  84 ++++-----------------------------
 3 files changed, 107 insertions(+), 87 deletions(-)

commit 901c4d9b608d764a894c4a4a9df803c3e06a6ab3
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Dec 21 11:04:39 2009 +1100

    [EmpathyContactMenu] Replace raw Tp call with existing abstraction

    This was the place I'd copied my code from. However it makes a lot
    of sense to
    use the same abstraction here too.

 libempathy-gtk/empathy-contact-menu.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

commit 79074c4ba575f4b01782f6f498a3e9f91cd7ba21
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Dec 21 10:21:11 2009 +1100

    Replace raw Tp call with existing abstraction in EmpathyTpChat

 src/empathy-chat-window.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

commit 845c851672bb392dd265cd63afde325ed1dfad49
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Sat Dec 19 13:16:02 2009 +1100

    Port EmpathyInviteParticipantDialog over to
    EmpathyContactSelectorDialog

 src/empathy-chat-window.c		 | 64
 ++++++++++++++++++++++--------
 src/empathy-invite-participant-dialog.c | 70
 +++++++++------------------------
 src/empathy-invite-participant-dialog.h |  8 ++--
 3 files changed, 70 insertions(+), 72 deletions(-)

commit acff8e6eece48cbe0915ca60166923afc5aa774b
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Dec 17 08:54:59 2009 +1100

    Bump tp-glib version to 0.9.2

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 91b6954805de2541dad743256cc3f9e9c6f65943
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Thu Dec 17 08:50:33 2009 +1100

    Don't destroy the request properties, EmpathyDispatcher now owns them

    This is not the same as tp-glib semantics
    (e.g. tp_..._call_create_channel).
    Add some docs to EmpathyDispatcher to explain this, for the next
    person.

 libempathy/empathy-dispatcher.c | 13 +++++++++++++
 src/empathy-chat-window.c	 |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

commit 041b5b174f64ddde0f400843ed2a8b89b52ba18d
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Dec 16 20:21:44 2009 +1100

    Add support for inviting to MUCs

 src/empathy-chat-window.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit b39e12f74ac06de310870a54b08e7fb32d2d2fe0
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Wed Dec 16 18:09:55 2009 +1100

    Add a rudimentry UI to select a 3rd contact to invite

    Needs support for inviting in MUCs added

 src/Makefile.am			 |   1 +
 src/empathy-chat-window.c		 |  67 +++++++++++++++----
 src/empathy-invite-participant-dialog.c | 111
 ++++++++++++++++++++++++++++++++
 src/empathy-invite-participant-dialog.h |  46 +++++++++++++
 4 files changed, 213 insertions(+), 12 deletions(-)

commit d8d74645987b0188f437b967c7d88dd3fda2db13
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Dec 14 14:48:08 2009 +1100

    Use EmpathyDispatcher to create the PMUC channel

 src/empathy-chat-window.c | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

commit 0ad2641ae9ac96dc082d79feef619ce9572eda63
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Dec 11 21:50:17 2009 +1100

    Don't leak GPtrArray

 src/empathy-chat-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 5dcbaaf03567a2aede850bf17e4d595126ea98b4
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Dec 11 16:59:56 2009 +1100

    Add an Invite Participants menu item and make it request the Conf
    channel

 src/empathy-chat-window.c  | 76
 ++++++++++++++++++++++++++++++++++++++++++++--
 src/empathy-chat-window.ui |  7 +++++
 2 files changed, 81 insertions(+), 2 deletions(-)

commit 6211cadb6d83d8130505ec045b80d5390339eda7
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Dec 11 16:59:08 2009 +1100

    Include Channel.Interface.Conference draft from tp-spec

 extensions/Channel_Interface_Conference.xml | 400
 ++++++++++++++++++++++++++++
 extensions/misc.xml			     |	 1 +
 2 files changed, 401 insertions(+)

commit 4a9ec5b513a5e7c183cfcb55b1b2bcda1e5f2f52
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Sat Dec 19 12:42:25 2009 +1100

    [EmpathyContactSelectorDialog] remove got_response vcall

    The got_response vcall method wasn't generic enough. It assumed
    that your
    response code was always GTK_RESPONSE_ACCEPT, and doesn't allow for
    the dialog
    to be used with gtk_dialog_run.

    Instead dialogs now use the regular response() vcall provided by
    GtkDialog,
    and an additional API method
    empathy_contact_selector_dialog_get_selected()
    provides the information content of the dialog.

 libempathy-gtk/empathy-contact-selector-dialog.c | 56
 +++++++++++-------------
 libempathy-gtk/empathy-contact-selector-dialog.h |  7 ++-
 libempathy-gtk/empathy-new-call-dialog.c	  | 24 +++++++---
 libempathy-gtk/empathy-new-message-dialog.c	  | 25 ++++++++---
 4 files changed, 65 insertions(+), 47 deletions(-)

commit c56343b28433a6285ad3d954cb276f03e0a6d665
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Sat Dec 19 12:40:44 2009 +1100

    [EmpathyContactSelectorDialog] initialise priv->show_account_chooser
    correctly

 libempathy-gtk/empathy-contact-selector-dialog.c | 1 +
 1 file changed, 1 insertion(+)

commit afa788702e58636d3f05845dc7b7a750300a7348
Author: Christian Kirbach <Christian.Kirbach@googlemail.com>
Date:	Sun Dec 20 18:40:39 2009 +0100

    Updated German help translation

 help/de/de.po | 834
 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 402 insertions(+), 432 deletions(-)

commit ee8585d60d8ec1b6d1ffe494fdccb0d9220be398
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Dec 19 13:43:29 2009 +0100

    Updated Spanish translation

 po/es.po | 752
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 429 insertions(+), 323 deletions(-)

commit d9406c1b700fdc1fcd4a4030b9013a4d999e8808
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Dec 18 17:53:51 2009 +1100

    [EmpathyContactSelectorDialog] normalise case in match function

 libempathy-gtk/empathy-contact-selector-dialog.c | 36
 ++++++++++++++----------
 1 file changed, 21 insertions(+), 15 deletions(-)

commit ef8f800b78bcf4795a9d9c01e21390c62663524b
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Dec 18 17:32:30 2009 +1100

    [EmpathyContactSelectorDialog] tweak padding

 libempathy-gtk/empathy-contact-selector-dialog.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 2afe25753afb3279629a1e63c9340a4738c9bfa9
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Dec 18 17:28:42 2009 +1100

    [EmpathyContactSelectorDialog] switch from table_contents to VBox

    This makes it more flexible to add other contents to the dialog.

 libempathy-gtk/empathy-contact-selector-dialog.c | 11 ++++++++---
 libempathy-gtk/empathy-contact-selector-dialog.h |  2 +-
 libempathy-gtk/empathy-new-call-dialog.c	  |  4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

commit 270d39eae11b2723a086e10e5dd9c358d1e90ade
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Dec 18 16:34:38 2009 +1100

    [EmpathyContactSelectorDialog] make the Account Chooser optional

 libempathy-gtk/empathy-contact-selector-dialog.c  | 115
 ++++++++++++++++++++--
 libempathy-gtk/empathy-contact-selector-dialog.h  |   6 ++
 libempathy-gtk/empathy-contact-selector-dialog.ui |   2 +-
 3 files changed, 115 insertions(+), 8 deletions(-)

commit 51b0e60035f1125428148dee926e8085a9ba571c
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Dec 18 16:33:16 2009 +1100

    [EmpathyContactSelectorDialog] make this an abstract type

    i.e. a type that must be inherited and can't be created directly

 libempathy-gtk/empathy-contact-selector-dialog.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 4d8f47ca8199f166c7eb5b0bdf5981652055ac12
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Fri Dec 18 13:53:24 2009 +1100

    [EmpathyContactSelectorDialog] Add missing include

 libempathy-gtk/empathy-contact-selector-dialog.h | 1 +
 1 file changed, 1 insertion(+)

commit 4979eef6c9ba13e8050c15ed99f72e7ed650f675
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 3 13:09:55 2009 +0000

    block/unblock the right signals on menu actions

 src/empathy-call-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 6cc05c13a047c904df1b615075c826a12b351359
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 18 13:58:56 2009 +0000

    tp-call: set debug domain to voip

 libempathy/empathy-tp-call.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 650117104f4e23cd2739e2e623dce070c0e02c33
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 18 13:45:33 2009 +0000

    save the geometry of the call window

 src/empathy-call-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit 499b394d0033da606c04e13afae4052818d9a431
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 17 15:37:53 2009 +0000

    Display the audio or video icon in incoming call dialog

    This is more useful than the question mark icon as it can be used
    to easily
    see if we are receiving an audio or video call.

 src/empathy-event-manager.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit 3860bc951676c103e145a4a9403eb750f73e84c7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 17 16:09:31 2009 +0000

    add im-groupwise.svg

    Seems I forgot to add the svg version.

 data/icons/hicolor_apps_scalable_im-groupwise.svg | 215
 ++++++++++++++++++++++
 1 file changed, 215 insertions(+)

commit 5f00c9a99a1c1ecf9ebd08f0bda58bbfed0f052f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 17 14:55:05 2009 +0000

    no need to export contact_list_store_get_contact_status_icon any more

 libempathy-gtk/empathy-contact-list-store.c | 33
 ++++++++++++++---------------
 libempathy-gtk/empathy-contact-list-store.h |	3 ---
 2 files changed, 16 insertions(+), 20 deletions(-)

commit beb0b7e42281f326f379bd9233297e855e5ad020
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 17 14:51:55 2009 +0000

    main-window: don't add the protocol icon on top of event icons

 src/empathy-main-window.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 3fbe87fc0d91b765ac55c1ad683e328af446110b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 17 10:38:43 2009 +0000

    contact-selector-dialog: set a border of 12 as defined in the HIG

 libempathy-gtk/empathy-contact-selector-dialog.c | 2 ++
 1 file changed, 2 insertions(+)

commit 5a7cfe477ccf6c5280c0281046d277b4f14740af
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 16 12:04:49 2009 +0000

    new-message-dialog: filter out CM which doesn't support 1-1 chat

 libempathy-gtk/empathy-new-message-dialog.c | 35
 +++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

commit c4ffa18abd28523741b079ab2913fcdff7f39865
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 16 12:00:11 2009 +0000

    new-call-dialog: filter out CM which doesn't support calls

 libempathy-gtk/empathy-new-call-dialog.c | 35
 ++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

commit 0af3c68b4c8c9392174d780712f5d4a12d0e13e6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 16 11:18:37 2009 +0000

    contact-selector-dialog: add API for subclass to redefine the accoutn
    filter function

 libempathy-gtk/empathy-contact-selector-dialog.c | 18 ++++++++++++++++--
 libempathy-gtk/empathy-contact-selector-dialog.h |  3 +++
 2 files changed, 19 insertions(+), 2 deletions(-)

commit 5631f4f5e4a4d446d5e4d81acd94b69567f9dcfa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 15 19:32:38 2009 +0000

    new-call-dialog: add 'Send Video' check button

 libempathy-gtk/empathy-new-call-dialog.c | 33
 ++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

commit 43e69eaeb5ea47d0e4a8a75a95ed537696a2639b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 15 19:28:36 2009 +0000

    contact-selector-dialog: make table_contact a protected member

    So subclass can easily add widgets.

 libempathy-gtk/empathy-contact-selector-dialog.c | 7 +++----
 libempathy-gtk/empathy-contact-selector-dialog.h | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 6101004ea39c479f048d8bdc4f3ce4296fb3dba6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 15 19:06:28 2009 +0000

    contact-selector-dialog: emit response when the entry is activated

 libempathy-gtk/empathy-contact-selector-dialog.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit 59f03a7aef175ffa8792eb0fbf825346cf5d5c4a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 15 18:48:48 2009 +0000

    status-icon: add "New Call" entry in the context menu

 src/empathy-status-icon.c  | 9 +++++++++
 src/empathy-status-icon.ui | 8 ++++++++
 2 files changed, 17 insertions(+)

commit c5b4c8eedb2f1f28cc8fedf21ceb42eadfcf1162
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 15 18:48:19 2009 +0000

    main-window: add "New Call" menu entry (#582599)

 src/empathy-main-window.c  | 10 ++++++++++
 src/empathy-main-window.ui |  9 +++++++++
 2 files changed, 19 insertions(+)

commit 83d23c5c7c31616c36a2c1dd6f1cb422f5d4d36b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 15 18:47:20 2009 +0000

    add empathy-new-call-dialog

 libempathy-gtk/Makefile.am		  |   2 +
 libempathy-gtk/empathy-new-call-dialog.c | 177
 +++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-new-call-dialog.h |  65 ++++++++++++
 po/POTFILES.in				  |   1 +
 4 files changed, 245 insertions(+)

commit f143221d55b5139588f7f6ba55b7a6fe21dadb4c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 15 18:09:25 2009 +0000

    rename empathy-new-message-dialog.ui to
    empathy-contact-selector-dialog.ui

 libempathy-gtk/Makefile.am			   |  2 +-
 libempathy-gtk/empathy-contact-selector-dialog.c  |  2 +-
 libempathy-gtk/empathy-contact-selector-dialog.ui | 52
 +++++++++++++++++++++++
 libempathy-gtk/empathy-new-message-dialog.ui	   | 52
 -----------------------
 po/POTFILES.in					   |  2 +-
 5 files changed, 55 insertions(+), 55 deletions(-)

commit b650895f8d148260d1220342692b834eebb0038b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 15 18:03:36 2009 +0000

    empathy-new-message-dialog: port to TP coding style

    We rewrote most of this file any way.

 libempathy-gtk/empathy-new-message-dialog.c | 104
 ++++++++++++++--------------
 libempathy-gtk/empathy-new-message-dialog.h |	 1 -
 2 files changed, 53 insertions(+), 52 deletions(-)

commit bd731dbfa05556c02013ed8453b10ac57b218306
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 15 17:58:21 2009 +0000

    new-message-dialog: inherit from EmpathyContactSelectorDialog

 libempathy-gtk/empathy-new-message-dialog.c | 277
 ++--------------------------
 libempathy-gtk/empathy-new-message-dialog.h |	 6 +-
 2 files changed, 22 insertions(+), 261 deletions(-)

commit 30e07ec329817c5ef360645aa2dd80cd1cff9eeb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 15 17:56:26 2009 +0000

    add empathy-contact-selector-dialog

    EmpathyContactSelectorDialog is an abstract class to helping to
    implement
    dialog such as the "new message" dialog.

 libempathy-gtk/Makefile.am			  |   2 +
 libempathy-gtk/empathy-contact-selector-dialog.c | 320
 +++++++++++++++++++++++
 libempathy-gtk/empathy-contact-selector-dialog.h |  72 +++++
 3 files changed, 394 insertions(+)

commit 3aadcbead0634ad2a9ef6f182b75fda18758fafb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 15 15:41:26 2009 +0000

    new-message-dialog: remove the call button

    We are about to create a new dialog for it.

 libempathy-gtk/empathy-new-message-dialog.c | 43
 ++---------------------------
 1 file changed, 3 insertions(+), 40 deletions(-)

commit fbaeb693027d63d94488702635630644971dfc2f
Author: chantra <chantra@debuntu.org>
Date:	Wed Dec 16 16:20:36 2009 +0000

    contact_list: displays an icon showing the protocol by the contact
    (#603877)

 data/empathy.schemas.in		     |	15 +++
 libempathy-gtk/empathy-conf.h		     |	 1 +
 libempathy-gtk/empathy-contact-list-store.c | 143
 +++++++++++++++++++++++++++-
 libempathy-gtk/empathy-contact-list-store.h |	 8 ++
 libempathy-gtk/empathy-contact-list-view.c  |	14 +--
 libempathy-gtk/empathy-contact-selector.c   |	 2 +-
 libempathy-gtk/empathy-ui-utils.c	     | 112 ++++++++++++++++++++++
 libempathy-gtk/empathy-ui-utils.h	     |	 9 ++
 src/empathy-main-window.c		     |	63 +++++++++++-
 src/empathy-main-window.ui		     |	 7 ++
 10 files changed, 360 insertions(+), 14 deletions(-)

commit d6152461b68592397130f5df2dd285b5651eb460
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Wed Dec 16 12:21:09 2009 +0100

    Updated Norwegian bokmål translation.

 po/nb.po | 407
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 218 insertions(+), 189 deletions(-)

commit 6f0ca35e45900f91aa7a0960a478fcf7e062d0dc
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Wed Dec 16 11:28:42 2009 +0100

    remove duplicate expression

    probably the product of a faulty merge in 4bca2228

 src/empathy-accounts-dialog.c | 2 --
 1 file changed, 2 deletions(-)

commit 5217557e08ac29fb01bfe92dd901d92502154135
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 14 17:32:59 2009 +0000

    say if incoming call are video or not (#582596)

 src/empathy-event-manager.c | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

commit 33999734f01e9f8d3a85532904bb04dcb3271f0b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 14 17:32:24 2009 +0000

    add empathy_tp_call_has_initial_video

 libempathy/empathy-tp-call.c | 22 ++++++++++++++++++++++
 libempathy/empathy-tp-call.h |  2 ++
 2 files changed, 24 insertions(+)

commit 594e7fee5d0fc22e385da905e1db93829553f0ed
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 15 12:28:57 2009 +0000

    empathy_protocol_icon_name: use the Yahoo icon for Yahoo Japan
    (#604567)

 libempathy/empathy-utils.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 881ee2e637f50afaaba49447d428632233676279
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Dec 15 13:28:28 2009 +0100

    dont show infobar when creating an account

 src/empathy-accounts-dialog.c | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

commit efa5be890a30290f23e0d460932ebd41504fa973
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Mon Dec 14 09:42:21 2009 +0100

    get connectivity only when needed

 src/empathy-accounts-dialog.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit 53aeb4caa6e0927a1c4be687675701d4bebb360f
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Mon Dec 14 09:22:15 2009 +0100

    fixed a crash when creating account

    the infobar in accounts dialog provoked a crash when creating a new
    account because TpAccount *account was NULL

 src/empathy-accounts-dialog.c | 40
 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

commit ca5fc936fb56cb00ebb436872697585d46d2c0df
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Thu Dec 10 00:28:34 2009 +0100

    update infobar only on selected account

    previously the infobar contained wrong statuses sometimes, if the
    auto reconnect on a faulty account triggered the update

 src/empathy-accounts-dialog.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit b54fd8c9d094ff6fc162b1d30b118185207d9f04
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Thu Dec 10 00:22:35 2009 +0100

    updated status messages

    small updates on the status messages

 src/empathy-accounts-dialog.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

commit fbce68e65c37e7f004bdfd6cfeb59e7ea2a67b07
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Dec 8 20:01:03 2009 +0100

    set infobar message to no network connection

    if the account is disconnected and there is no internet connection
    at all.

 src/empathy-accounts-dialog.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit 0a39af61f6bab052ead17918ab372e0cbb8eab3c
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Dec 8 19:41:57 2009 +0100

    refactor friendly status reason messages

    the friendly status reason can be asked from empathy-utils

 libempathy/empathy-utils.c    | 37 ++++++++++++++++++++++++++
 libempathy/empathy-utils.h    |  1 +
 src/empathy-accounts-dialog.c | 62
 +++++++++----------------------------------
 src/empathy-main-window.c     | 45 +------------------------------
 4 files changed, 51 insertions(+), 94 deletions(-)

commit 78eed901305de30ff164012604045bacf5cc38b6
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Dec 8 19:08:28 2009 +0100

    added case for requested disconnection

 src/empathy-accounts-dialog.c | 3 +++
 1 file changed, 3 insertions(+)

commit 76af01fa4ced883f28b8464d835522b3f0af1cb6
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Dec 8 18:50:55 2009 +0100

    handle presence changes

    some refactoring was neccesary to handl correctly the presence
    changes. all information about the connection status and reason and
    presence are gathered explicitly in update_status_infobar and not
    passed by the callbacks.

 src/empathy-accounts-dialog.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

commit 904a7310bff53399f126a343741bc3812a2c4864
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Dec 8 18:22:01 2009 +0100

    show infobar when connected

    the infobar should be visible when connected, not only when an
    error occured

 src/empathy-accounts-dialog.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

commit 4480008a770cd2039eec01a97ca4d83877311a43
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Dec 8 13:08:38 2009 +0100

    set expand of infobar to false

    the infobar should not be expanded when the window is resized

 src/empathy-accounts-dialog.ui | 1 +
 1 file changed, 1 insertion(+)

commit de7b6beeaff6ad9d6ed9d52d40adb35b739af288
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Dec 8 12:57:58 2009 +0100

    added case for disabled account

    if the account is disabled the status-infobar shows as disconnected
    reason "disabled"

 src/empathy-accounts-dialog.c | 180
 +++++++++++++++++++++++-------------------
 1 file changed, 100 insertions(+), 80 deletions(-)

commit 9da3da13b18e1b72800f355297beda52e2822f46
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Dec 8 12:13:30 2009 +0100

    added reson to status infobar

 src/empathy-accounts-dialog.c | 68
 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 57 insertions(+), 11 deletions(-)

commit f9d025086633f300da83d1222609cea3953fe20d
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Dec 8 11:48:36 2009 +0100

    added spinner to connecting infobar

 src/empathy-accounts-dialog.c | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

commit 693487af854d750c32700ef6622473a7953e6643
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Dec 8 09:59:37 2009 +0100

    added status image to infobar

    when disconnected the infobar shows the offline icon

 src/empathy-accounts-dialog.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

commit 220c7e08dbcce8325c8695573643e7448d98b9e1
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Thu Dec 3 00:18:16 2009 +0100

    change position of the infobar

 src/empathy-accounts-dialog.c	|  7 ++++---
 src/empathy-accounts-dialog.ui | 39
 +++++++++++++++++++--------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

commit aca1d575ff5caf0eb8ae1fc401eca1c7f7d620d9
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Wed Dec 2 23:59:22 2009 +0100

    use different message types in infobar

 src/empathy-accounts-dialog.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit fe04111c230ccccc78fd14153cf3faa059f495a8
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Wed Dec 2 23:55:08 2009 +0100

    show the infobar when not connected

    fixes bug #599153

 src/empathy-accounts-dialog.c | 39
 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

commit 0346b097ed20b5617d6b2cf4c0e0dc498e7b1516
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Wed Dec 2 23:37:41 2009 +0100

    added infobar with empty label

 src/empathy-accounts-dialog.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 1a85521a5acf30995d71b86d733ef56c17e619e6
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Wed Dec 2 23:11:51 2009 +0100

    added vbox for the status-infobar

    the vbox should hold the infobar which shows the connection status
    in accounts-dialog

 src/empathy-accounts-dialog.c	|  2 ++
 src/empathy-accounts-dialog.ui | 26 +++++++++++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

commit b2f25f9f70969bf3d872780becb4f73137c268d1
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Mon Dec 14 10:34:05 2009 +0100

    refactoring - use main_window_remove_error

    use remove_error function everywhere the error is removed

 src/empathy-main-window.c | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

commit 8a0d77c2ad1908136329d8ebe5348136e4e49387
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Dec 8 22:43:39 2009 +0100

    remove error infobars if account disabled/removed

    fixes bug #601379

 src/empathy-main-window.c | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

commit 3291e323833f781ba858801a0ebeeb22bc7f712d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 14 17:43:35 2009 +0000

    add im-silc icon (#604554)

    Thanks to K.Vishnoo Charan Reddy for the icon.

 data/icons/Makefile.am			      |   6 ++
 data/icons/hicolor_apps_16x16_im-silc.png    | Bin 0 -> 321 bytes
 data/icons/hicolor_apps_22x22_im-silc.png    | Bin 0 -> 391 bytes
 data/icons/hicolor_apps_24x24_im-silc.png    | Bin 0 -> 311 bytes
 data/icons/hicolor_apps_32x32_im-silc.png    | Bin 0 -> 475 bytes
 data/icons/hicolor_apps_48x48_im-silc.png    | Bin 0 -> 468 bytes
 data/icons/hicolor_apps_scalable_im-silc.svg |  92
 +++++++++++++++++++++++++++
 7 files changed, 98 insertions(+)

commit e39a5b99f4bc566ddce8c6e441afb40b98733cb9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 14 13:40:30 2009 +0000

    add empathy-new-message-dialog.c to POTFILES.in

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit f04b86652a33b9182e04b20efe4be4fa35789e8a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 14 10:34:27 2009 +0000

    add myself to AUTHORS

 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

commit 06e9054f40ad9660325c87181f597c3039f767cf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 14 10:33:46 2009 +0000

    add K.Vishnoo Charan Reddy as an artist contributor

 CONTRIBUTORS		    | 2 +-
 src/empathy-about-dialog.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 357abe46ebdc57f29037d12350c06d7fd14581b3
Merge: 0e98e5f 2e7c1dd
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Mon Dec 14 08:18:19 2009 +0100

    Merge branch 'create-cancel-crash'

commit 0e98e5f539964a4c854c7e1b68139222e00e3e48
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 11 14:12:14 2009 +0100

    connect the 'group-members-changed' on groups once they are ready

    The previous code was racy. If the 'group-members-changed' was
    fired before
    the channel was ready, the group didn't exist yet in Empathy and
    so the
    contact didn't appear in the group.

    We fix that by connecting this signal once the group channel is
    ready and
    adding current members manually.

 libempathy/empathy-tp-contact-list.c | 140
 ++++++++++++++++++++---------------
 1 file changed, 81 insertions(+), 59 deletions(-)

commit 2767e7bb07bcb8f4e9349955c42efd58df176c63
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Dec 10 08:59:40 2009 +0100

    Use EnsureChannel to get Stored/Publish/Subscribe channels

 libempathy/empathy-tp-contact-list.c | 181
 +++++++++--------------------------
 1 file changed, 47 insertions(+), 134 deletions(-)

commit 13d43c86bb62e15b78f61058a3003b30eae9caf1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 11 11:00:30 2009 +0100

    empathy_spell_check: remove debug message if there is no languages
    configured

    It floods debug logs.

 libempathy-gtk/empathy-spell.c | 1 -
 1 file changed, 1 deletion(-)

commit 2e7c1dd9ccb1b67b19393fdfd2fe32a2b4727f42
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Wed Dec 9 11:22:58 2009 +0100

    changed way of tracking pending changes

    fixes bug #603490, we track pending changes explicitly now. before
    they were connected to the sensitivity of the control buttons (if
    buttons sensitive -> pending changes). When an account is about to
    be created and the user hits "Cancel" we don't show the "are you
    sure" dialog any more because the action of the user is clear and
    not accidental. When closing the window during creation the dialog
    still shows up.

 libempathy-gtk/empathy-account-widget.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

commit 194a6d0d636eb62add7719edc48b60906081a3ba
Merge: 0ff7162 7190ca9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 9 17:28:43 2009 +0000

    Merge branch 'enabled-first-604166'

commit 0ff7162d2f3b141a89d551663593c804f529945d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 9 16:18:53 2009 +0000

    use tp_asv_new

 libempathy/empathy-tp-contact-list.c | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

commit db0b0f0ad369618f8204bbdf918aa574ccb25c8c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 9 16:15:09 2009 +0000

    tp_contact_list_remove: add FIXME about potential race

 libempathy/empathy-tp-contact-list.c | 2 ++
 1 file changed, 2 insertions(+)

commit 7b4335bd88919c0d377ee0f67f1158d4f6b7dc2d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 9 15:53:51 2009 +0000

    tp_contact_list_remove: remove from the stored list if possible
    (#604181)

 libempathy/empathy-tp-contact-list.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 311cd30ad1aa251d029e37be4dd4ff96482d46db
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 9 15:23:22 2009 +0000

    tp-contact-list: request the 'stored' channel

 libempathy/empathy-tp-contact-list.c | 67
 +++++++++++++++++++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

commit 7190ca926a151a3fa1fec7ec9faf6a490a378b8e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 9 11:59:33 2009 +0000

    account-chooser: display enabled accounts first (#604166)

 libempathy-gtk/empathy-account-chooser.c | 40
 ++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

commit d7a4689a729cbd5da40d34d532f4b61f2e3aeadb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 9 11:06:23 2009 +0000

    new-message-dialog: inherit from GtkDialog (#604097)

 libempathy-gtk/empathy-new-message-dialog.c  | 204
 +++++++++++++++++++--------
 libempathy-gtk/empathy-new-message-dialog.h  |  33 ++++-
 libempathy-gtk/empathy-new-message-dialog.ui | 167 ++++++----------------
 3 files changed, 223 insertions(+), 181 deletions(-)

commit d2a7455e20bfbf9787e69c60af8877205c5cd982
Author: Aron Xu <aronxu@gnome.org>
Date:	Wed Dec 9 13:06:45 2009 +0800

    Updated Simplified Chinese translation.

 po/zh_CN.po | 743
 +++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 465 insertions(+), 278 deletions(-)

commit cce0608573b9a8f675cd948622322f4f1ef2e947
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 8 14:56:38 2009 +0000

    chat: don't display pending messages before messages from logs

    empathy_chat_set_tp_chat has a comment saying that
    show_pending_messages is a
    no-op when calling during object construction. This now is now
    actually true
    as we added a boolean saying if we can display pending messages
    or not.

    This is to avoid displaying pending messages *before* the messages
    fetched
    from logs (#603980).

 libempathy-gtk/empathy-chat.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 9a2a6a34682af3eb6ff1741e45a0c1b5cd4d386f
Author: ranjiao <ranjiao@gmail.com>
Date:	Tue Dec 8 09:29:25 2009 +0800

    remember the chat window's paned width (#586290)

 libempathy-gtk/empathy-chat.c | 24 ++++++++++++++++++++++++
 libempathy-gtk/empathy-conf.h |  1 +
 2 files changed, 25 insertions(+)

commit ff031d276cc1ae2cb16fa700e84497fc599624b8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 7 17:34:51 2009 +0000

    remove useless cast

 libempathy-gtk/empathy-chat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ce76a397628746402c494ee8aec6e14a7d8322c7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 7 15:40:18 2009 +0000

    chat: wait that connection is ready before re-requesting the channel
    (#603976)

 libempathy-gtk/empathy-chat.c | 67
 ++++++++++++++++++++++++++++---------------
 1 file changed, 44 insertions(+), 23 deletions(-)

commit 3f3d218978d49b77f18464977f3b92c5d644bc1b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 7 16:19:30 2009 +0000

    chat-window: ref the contact stored as a data in the chat

 src/empathy-chat-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 206b3a79c8b5d941d20a65f258a5beb0b7b32270
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 7 17:13:24 2009 +0000

    Separate geometry of private and muc chat windows (#604003)

 src/empathy-chat-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit 23414db5acced9ab25ca012e86b4efbd1653bbcc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 7 16:52:26 2009 +0000

    change empathy_chat_window_get_nb_rooms to get_chats_type

    That way we can implement the semantic we meant to. Muc and 1-1
    chat are
    handled the same way.

 src/empathy-chat-window.c | 23 +++++++++++++++--------
 src/empathy-chat-window.h |  4 +++-
 2 files changed, 18 insertions(+), 9 deletions(-)

commit 208e7858319b6b10c592b615fd5ef1559cf44b5b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 7 16:35:18 2009 +0000

    fix comments

 src/empathy-chat-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 247a7866ebdf6f51f357c89a3ffb6e801188f683
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 7 16:32:27 2009 +0000

    empathy_chat_window_get_default: rename room_filter to room

 src/empathy-chat-window.c | 6 +++---
 src/empathy-chat-window.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 784b5bd127a9cb1bb725f6c3e1e5338015383037
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 7 15:15:03 2009 +0000

    empathy_chat_window_get_default: check if the window has at least
    one room

    Also, check if the window has a least one 1-1 chat before adding a
    new one.
    That way we won't mix 1-1 and muc chat if user doesn't want to
    (he can still
    re-arrange the tabs manually).

 src/empathy-chat-window.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

commit bc50bd062a3a9bb85e6c3e0228571c670532fdf9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 7 15:14:46 2009 +0000

    add empathy_chat_window_get_nb_rooms

 src/empathy-chat-window.c | 14 ++++++++++++++
 src/empathy-chat-window.h |  1 +
 2 files changed, 15 insertions(+)

commit 487f4d0fc504b9c0cb77a030869893054c907d6d
Author: Abner Silva <abner.silva@collabora.co.uk>
Date:	Thu Jul 16 16:55:31 2009 -0300

    Grouping all 1-to-1 chats in one window and MUC's in another
    one. (Fixes #588812)

 src/empathy-chat-window.c | 9 ++++++---
 src/empathy-chat-window.h | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

commit b8698934662ff2f97b6d1d68f409650878bbcad6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 7 14:42:12 2009 +0000

    chat_destroy_cb: use chat_update_contacts_visibility instead of
    empathy_chat_set_show_contacts

    That way priv->show_contacts is not changed and we'll redisplay
    the contact
    list when reconnecting if needed (#598964).

 libempathy-gtk/empathy-chat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 31b467503ba8705c32b3de475f543a2fabd6cba6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Dec 7 14:39:54 2009 +0000

    explicitely pass the show state to empathy_chat_set_show_contacts

    This will allow us to show/hide the contact list without changing
    priv->show_contacts.

 libempathy-gtk/empathy-chat.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit eecff5c85657bd20626ad9cb426a79a66eb771a6
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Fri Dec 4 21:48:09 2009 +0100

    Updated Norwegian bokmål translation.

 po/nb.po | 810
 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 517 insertions(+), 293 deletions(-)

commit 26da2e88c968de373b15c127173d6d79b86a4b81
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Fri Dec 4 20:04:09 2009 +0100

    Updated Slovenian translation

 po/sl.po | 304
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 164 insertions(+), 140 deletions(-)

commit 2a89ad8bcc909d2b4e8651c6eccb3a0de4da2ea5
Author: Yaron Sharabani <sh.yaron@gmail.com>
Date:	Fri Dec 4 18:46:27 2009 +0200

    Updated Hebrew translation

 po/he.po | 1501
 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 992 insertions(+), 509 deletions(-)

commit 52898e966ab9d41e6016ae5ca58f1dbf7fa7dbe3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 3 11:05:47 2009 +0000

    add im-groupwise icon (#603634)

    Thanks to K.Vishnoo Charan Reddy for the icon.

 data/icons/Makefile.am				|   6 ++++++
 data/icons/hicolor_apps_16x16_im-groupwise.png | Bin 0 -> 865 bytes
 data/icons/hicolor_apps_22x22_im-groupwise.png | Bin 0 -> 1330 bytes
 data/icons/hicolor_apps_24x24_im-groupwise.png | Bin 0 -> 1494 bytes
 data/icons/hicolor_apps_32x32_im-groupwise.png | Bin 0 -> 2164 bytes
 data/icons/hicolor_apps_48x48_im-groupwise.png | Bin 0 -> 3817 bytes
 6 files changed, 6 insertions(+)

commit 3d2adf9323509792856a56a75eca2ad2f14ac7b3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 2 13:05:38 2009 +0000

    chat_new_connection_cb: don't try to reconnect chats if the account
    is not connected

    We should wait that the account is connected before reconnecting chats
    (#603593).

 libempathy-gtk/empathy-chat.c | 3 +++
 1 file changed, 3 insertions(+)

commit cf81786242c9143e0c8cb4956006ff29f1309d8d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Dec 2 12:42:50 2009 +0000

    Don't highlight scrollback messages (#602288)

 libempathy/empathy-message.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 52376d81c4c2d29ac6845070efbc0785d7989d28
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 1 17:04:03 2009 +0000

    tp-chat: set the flags of the message

 libempathy/empathy-tp-chat.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit 8d1543fd36e67823e390477548dfa43f86afa2e2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 1 17:03:51 2009 +0000

    empathy-message: add message flags

 libempathy/empathy-message.c | 35 +++++++++++++++++++++++++++++++++++
 libempathy/empathy-message.h |  4 ++++
 2 files changed, 39 insertions(+)

commit 623c7ba6130a483a2581dadce6f674755cdf44d3
Author: Brian Pepple <bpepple@fedoraproject.org>
Date:	Tue Dec 1 19:20:05 2009 -0500

    Hide state image in contact widget until the presense state is
    notified. (#603545)

 libempathy-gtk/empathy-contact-widget.c  | 1 +
 libempathy-gtk/empathy-contact-widget.ui | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

commit cf5b53f8292a03fddb4894eb8f50db70a84ab287
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 1 18:11:05 2009 +0000

    add im-sametime icon (#603508)

    Thanks to K.Vishnoo Charan Reddy for the icon.

 data/icons/Makefile.am				  |   6 ++
 data/icons/hicolor_apps_16x16_im-sametime.png	  | Bin 0 -> 817 bytes
 data/icons/hicolor_apps_22x22_im-sametime.png	  | Bin 0 -> 1225 bytes
 data/icons/hicolor_apps_24x24_im-sametime.png	  | Bin 0 -> 1398 bytes
 data/icons/hicolor_apps_32x32_im-sametime.png	  | Bin 0 -> 1994 bytes
 data/icons/hicolor_apps_48x48_im-sametime.png	  | Bin 0 -> 3417 bytes
 data/icons/hicolor_apps_scalable_im-sametime.svg | 127
 +++++++++++++++++++++++
 7 files changed, 133 insertions(+)

commit 4fb2cbb8ecc681614dbc6729a5c9b4d9fb550024
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 1 17:53:49 2009 +0000

    add 24x24 and 32x32 versions of the im-meanwhile icon

 data/icons/Makefile.am				|   2 ++
 data/icons/hicolor_apps_24x24_im-meanwhile.png | Bin 0 -> 1423 bytes
 data/icons/hicolor_apps_32x32_im-meanwhile.png | Bin 0 -> 2086 bytes
 3 files changed, 2 insertions(+)

commit eb8cb1d761372e0a5732f205d0f6ce20243d5bac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 1 17:51:27 2009 +0000

    add im-myspace icon (#603502)

    Thanks to K.Vishnoo Charan Reddy for the icon.

 data/icons/Makefile.am				 |   6 ++
 data/icons/hicolor_apps_16x16_im-myspace.png	 | Bin 0 -> 624 bytes
 data/icons/hicolor_apps_22x22_im-myspace.png	 | Bin 0 -> 884 bytes
 data/icons/hicolor_apps_24x24_im-myspace.png	 | Bin 0 -> 799 bytes
 data/icons/hicolor_apps_32x32_im-myspace.png	 | Bin 0 -> 1174 bytes
 data/icons/hicolor_apps_48x48_im-myspace.png	 | Bin 0 -> 1619 bytes
 data/icons/hicolor_apps_scalable_im-myspace.svg | 109
 ++++++++++++++++++++++++
 7 files changed, 115 insertions(+)

commit bf5f6a6ca78beb479a1e7c1f1e7a1f12cfdc1c16
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 1 17:33:39 2009 +0000

    chat: don't display latest logs in room

 libempathy-gtk/empathy-chat.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 3e6fc17bc72bb426af351e0cfc33abb775ada155
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Dec 1 17:04:30 2009 +0100

    added destroyed flag

    the destroyed flag indicates if the widgets in empathy-account-widget
    have already been destroyed. this is important for some async calls.

 libempathy-gtk/empathy-account-widget.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

commit 19d28abca284a7a85a98f8bdd01aeb0ff54860e7
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Dec 1 13:53:24 2009 +0100

    fixed problem with destroyed widget in async call

    with all the async calls the widget needed in one of the callbacks
    was destroyed before the callback was called.

 libempathy-gtk/empathy-account-widget.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 02c70cf6746cd909a873f54dd320772160f9ec13
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Nov 24 18:45:46 2009 +0100

    update presence when account is enabled

    the problem was that disabling accounts forced their requested
    presence to _offline_, when the account was re-enabled the r-s stayed
    offline and the account did not try to reconnect. this was introduced
    with TpAccount. fixes bug #602821

 libempathy-gtk/empathy-account-widget.c | 49
 ++++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 10 deletions(-)

commit 53a0fc1ae74070e6268173294ba986bc2c7e3e07
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Nov 24 18:13:17 2009 +0100

    emit account-created signal outside enabled_cb

    the account-created signal should be emitted independently from
    enabled-callback. the signal should be emitted even if for some
    reason the account could not be enabled.

 libempathy-gtk/empathy-account-widget.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

commit 5d472d0d977e00de90039af2e67a785721da5d51
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 1 15:29:22 2009 +0000

    rephrase the 'redial' tooltip

 src/empathy-call-window.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 891a40763f86c9e2ad2b7c2306e8a24a038f2c99
Author: Laurent Bigonville <bigon@bigon.be>
Date:	Tue Dec 1 15:18:32 2009 +0100

    Link libempathy-gtk against libnotify

 libempathy-gtk/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

commit 93adac828a2e0465c0a4d77051856e9602a5e6b0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 1 12:41:20 2009 +0000

    add tooltips on the hang-up, redial and audio buttons (#576542)

 src/empathy-call-window.ui | 3 +++
 1 file changed, 3 insertions(+)

commit c193319ca0b9d130abb525e88ac87c4293e2fb0b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 1 12:46:44 2009 +0000

    rename update_join_button_sensitivy to update_join_button_sensitivity

 src/empathy-new-chatroom-dialog.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit d7a092467227ecdcfb5173a1f26a6207606c2154
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 1 12:03:42 2009 +0000

    new-chatroom-dialog: unsensitive the join button when account is
    disconnected

    Trying to join a room with a not connected account leads to crash
    (#603393).

 src/empathy-new-chatroom-dialog.c | 37
 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

commit 63824875083611f8503deaff302887dd6c47a603
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 1 11:57:02 2009 +0000

    factor out update_join_button_sensitivy

 src/empathy-new-chatroom-dialog.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

commit 832c7689e8060ec508f4dbae53d51f7200ddf2ad
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 1 11:44:57 2009 +0000

    new-chatroom-dialog: store the currently selected account

 src/empathy-new-chatroom-dialog.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

commit 1805af473647ce9cdde47ae7ed37b1d3fd37d74d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Dec 1 12:05:27 2009 +0000

    dep on nautilus-sendto is actually 2.28.1

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a7f2c69cc15e8e971928ef8012d61f45442da8ca
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Dec 1 11:38:37 2009 +0100

    Use \s to match spaces, it is the same as [ \t\n\r\f\v]

 libempathy-gtk/empathy-ui-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 35f5ca3376db3a641d4deb0f1eedd76a0ca2cd15
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 30 16:40:55 2009 +0000

    start dev of 2.29.4

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 5f1d509ea8e964df5ea439f855892b4530566fce
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 30 16:17:30 2009 +0000

    prepare 2.29.3 release

 NEWS	      | 44 ++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  2 +-
 2 files changed, 45 insertions(+), 1 deletion(-)

commit c2fc41220152f8907f8511fb59d1c8153ddad5d6
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Mon Nov 30 17:16:45 2009 +0100

    Updated Slovenian translation

 po/sl.po | 436
 ++++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 290 insertions(+), 146 deletions(-)

commit 6e1756e9eafd1fb88c0e09fbb80a31185c6c13ff
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 30 16:03:58 2009 +0000

    debug-window: don't disconnect the new debug msg signal once the
    proxy has been invalidated

    According to tp_proxy_signal_connection_disconnect's documentation
    it's not
    safe to disconnect a signal after its proxy has been invalidated
    (#603384).

 src/empathy-debug-window.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

commit 740a34efd932ad1bf6d5cd1d4580fd3b6af0eacc
Merge: 8d21537 9ec54fd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 30 15:08:24 2009 +0000

    Merge commit 'shaunm/dndfiles2'

commit 8d21537a22e1e4a1e6224d5e70190e0be2ef9a40
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 30 14:11:47 2009 +0000

    contact_manager_status_changed_cb: ignore disconnected account

    There is no point to start tracking an account which is about to
    be removed.
    Furthemore, this avoid to re-add previoulsy invalidated connections
    (#603361).

 libempathy/empathy-contact-manager.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 75bbe2b4d9e2dfbc0706fcad8bc77cae2579dfa0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 30 11:33:45 2009 +0000

    add tooltips on the camera buttons

 src/empathy-call-window.ui | 3 +++
 1 file changed, 3 insertions(+)

commit 3d8a5d2b45d490142b021b43fb4ef1b232ed7910
Author: Brian Pepple <bpepple@fedoraproject.org>
Date:	Fri Nov 27 16:56:22 2009 -0500

    Add check for new NetworkManager-glib pkgconfig file.

    Fixes bug #599315.

 configure.ac | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit ad74851368bf2a5b355696f4ad8f55f184070179
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Sat Nov 28 20:16:45 2009 +0100

    use conn-status-reason instead of conn-status

    a hardcoded callback call used TP_CONNECTION_STATUS_DISCONNECTED
    where a TP_CONNECTION_STATUS_REASON should have been, changed to
    TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED.

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 297ebd5f9415f444b2bc6db3e30a1ab8c2654a22
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Sat Nov 28 12:08:59 2009 +0100

    Updated Hungarian translation

 po/hu.po | 826
 ++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 506 insertions(+), 320 deletions(-)

commit 476130b2add6244a24be51ce32393a095df4a4ef
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Nov 28 10:54:10 2009 +0100

    Updated Spanish translation

 po/es.po | 287
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 166 insertions(+), 121 deletions(-)

commit a59cf9be7760bdbcadbdca2922c777878b9d960a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 27 17:11:50 2009 +0000

    Set the stock-person icon for contact online/offline notification

    This one makes more sense than the info icon as notifications are
    obviously an
    information (#590700).

 src/empathy-event-manager.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 865a820252f569238f53a5a401836a1925acd2f9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 27 16:27:50 2009 +0000

    Capitalize first letter of debug msg

 src/empathy-call-window.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 68cdcde0b0a029379d3a0b9e0e62bfda7e0bcf7f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 25 13:45:45 2009 +0000

    Disable video preview when there is no call

    This is a workaround until bug 602937 is fixed.

 src/empathy-call-window.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit 9e048d003178ce72ca6599cb8d847dd64427a2da
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 25 13:08:09 2009 +0000

    enable the camera-off button if call doens't have initial video

 src/empathy-call-window.c | 5 +++++
 1 file changed, 5 insertions(+)

commit d7fa9cd2d46574d739d0ad78f7accf7410481ec6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 25 12:56:32 2009 +0000

    enable the camera-off button when call is disconnected

    Disabling the camera on button doesn't make sense any more.

 src/empathy-call-window.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit e0a94c57e1266deadd58f158989980c91d7ab4ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 25 11:44:17 2009 +0000

    empathy_call_window_set_send_video: don't request video stream if
    the call is not connected yet

 src/empathy-call-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit 76a7dfdf4fcd250f7787c166da87e1bfa6b70761
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 25 11:32:30 2009 +0000

    disable_camera: disable send video only if we were sending it

 src/empathy-call-window.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 015746e131559133730f2112777d26c581c6ac50
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 25 11:26:29 2009 +0000

    update toggle buttons when the camera state is changed because of
    radio buttons

 src/empathy-call-window.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 8d1e30bfa8cacadaf2411c03396bd01ad41332c3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 25 11:22:46 2009 +0000

    hook the camera radio buttons

 src/empathy-call-window.c | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

commit 0961715329c70614a83e874c3c8a5b64cea5691b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 25 11:20:10 2009 +0000

    make disable_camera, enable_preview and enable_camera no-op if we
    are already in the desired state

 src/empathy-call-window.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

commit 90c8334a4a0c8e84fdd430c44fffb54fa8623b7c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 24 17:51:26 2009 +0000

    update radio actions when a button is pressed

 src/empathy-call-window.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit 21c54ffdc6d8ff5c47a7a7768aca6bc213075f7f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 24 17:22:55 2009 +0000

    add video menu containing radio actions to control video

 src/empathy-call-window.ui | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

commit 46d8c4965781a2327c6f6206b233f6d72f88b8bb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 24 17:04:49 2009 +0000

    remove the "send video" menu item

    We're going to replace it by radio buttons.

 src/empathy-call-window.c  | 35 -----------------------------------
 src/empathy-call-window.ui |  8 --------
 2 files changed, 43 deletions(-)

commit 05cfdd280b8a53948d3c2c38c8dc74cfd8672909
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 24 16:58:50 2009 +0000

    empathy_call_window_set_send_video: add a debug msg

 src/empathy-call-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 76a44dbf5a997548cc5e2377041d5081369a4c8a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 24 16:58:43 2009 +0000

    stop sending video when 'camera off' or 'preview' is enabled

 src/empathy-call-window.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

commit fe97bdb9c202f40f57b1438df9d0045fad8f40c8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 24 16:28:49 2009 +0000

    early return if the camera_state is already the one we want

 src/empathy-call-window.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit c2b043aa2094b697ce903186ea06038f24e1ef4b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 24 16:26:15 2009 +0000

    disable the others button when 'camera on' is enabled

 src/empathy-call-window.c | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

commit 05d1a875137abbbefdb249aa02de0d582fe9f3e5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 24 16:01:07 2009 +0000

    rename camera to camera_on

    Also move down tool_button_camera_on_toggled_cb so it doesn't need a
    prototype.

 src/empathy-call-window.c  | 75
 ++++++++++++++++++++++------------------------
 src/empathy-call-window.ui |  2 +-
 2 files changed, 37 insertions(+), 40 deletions(-)

commit f20562cc1586506750e33b7751e5c3b494d43399
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 24 15:53:58 2009 +0000

    remove the "Always Show Video Preview" menuitem

    We use buttons for that now.

 src/empathy-call-window.c  | 25 -------------------------
 src/empathy-call-window.ui |  8 --------
 2 files changed, 33 deletions(-)

commit 5432a3fc4003e8285ef230c707ffdfe70b38be90
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 24 15:51:48 2009 +0000

    connect the 'camera off' and 'preview' buttons

 src/empathy-call-window.c | 121
 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 121 insertions(+)

commit 3d6c558cf87c2a7144c40edecd8cebbfac9a1596
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 24 14:37:02 2009 +0000

    set the icon of the camera_off button

 src/empathy-call-window.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit 49df4fbadf79b918a67356647e586bf76cd1f0b7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 24 13:55:18 2009 +0000

    add "camera off" and "preview" buttons to the toolbar

    Also rename "send video" to "camera on"

 src/empathy-call-window.ui | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

commit 374054f9c4525fb6da432ab82e89d62d78f0e7a9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 23 16:43:07 2009 +0100

    call-window: check box labels should use sentence capitalization

 src/empathy-call-window.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5b1fa500d7047b6759f1c6e2a090c84a1a81c483
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 10 12:02:23 2009 +0000

    We should display the avatar/preview when call is disconnected

 src/empathy-call-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit 71b1700af75c01dc9ead0621c7b52e460383fcaa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 10 11:34:28 2009 +0000

    call-window: add some debug msg

 src/empathy-call-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit a8f35052d171a1dff4be5eae80f4532ae735da7b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 10 11:10:09 2009 +0000

    disable video preview when we turn off video sending

 src/empathy-call-window.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 4db67c186241cca03b2f4002ac592b4d86601eb8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 9 18:05:28 2009 +0000

    Enable 'send video' buttons and display the preview if call has
    'initial video' (#601288)

 src/empathy-call-window.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit af3cc2af6c30341cc2a12f63b397d733d3de8a6f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 9 17:51:57 2009 +0000

    Don't display the video preview when the sink is added

    We should dislpay it since we started the sending video process so
    there is no point to enforce it at this stage.

 src/empathy-call-window.c | 10 ----------
 1 file changed, 10 deletions(-)

commit ba1c519dde7bede7ea44d94246b41d909265c04c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 9 17:46:59 2009 +0000

    we don't want to hide the self frame anymore

 src/empathy-call-window.c | 3 ---
 1 file changed, 3 deletions(-)

commit ee4c91ff7f14c4f1249ee271cd56faae92ce96be
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 9 17:42:07 2009 +0000

    remove empathy_call_window_update_self_avatar_visibility

    This function is wrong. We should disable the preview only when
    we stop
    sending video.

 src/empathy-call-window.c | 24 ------------------------
 1 file changed, 24 deletions(-)

commit f4b6d60a4b454233cac3fb5b5e1c407e7496baa6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 9 17:37:24 2009 +0000

    call-window: factor out display_video_preview to display/hide the
    video preview

 src/empathy-call-window.c | 51
 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 14 deletions(-)

commit cac3a717a5e34df4439ec5a0660d5ffdc76a27c5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 9 16:35:17 2009 +0000

    add 'voip' debug domain

 libempathy/empathy-debug.c | 1 +
 libempathy/empathy-debug.h | 1 +
 2 files changed, 2 insertions(+)

commit 50f433180ff289b9933860527f00800f77096505
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 9 17:23:07 2009 +0000

    call-window: change the semantic of the "Video Preview" menu item
    (#601288)

    Change it to "Always Show Video preview". We should always display the
    preview when we are sending video. So by changing the semantic of this
    menu it won't be possible to disable the preview while we are sending
    video.

    This mean that this menu isn't changed automatically anymore when the
    preview is displayed.

 src/empathy-call-window.c  | 40 +++++++---------------------------------
 src/empathy-call-window.ui | 10 +++++-----
 2 files changed, 12 insertions(+), 38 deletions(-)

commit 09fa4f08f6477da1b4b371d50e9ddaa48b3eafa7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 27 15:25:54 2009 +0000

    change 'unread from everyone' to 'unread from all'

 src/empathy-chat-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c925d2a550ebbe3e90eac80cf3340714c2c9cb4b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 26 10:40:31 2009 +0000

    fix typo in comments

 src/empathy-chat-window.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 9764ef80a02af7894a38c396d5d57e8b760a8f2a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 25 17:25:24 2009 +0000

    update the window title when a new message is received

 src/empathy-chat-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit 761a836a296d32c4af5200d8efc80f3fa9cb33e0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 25 17:25:07 2009 +0000

    display the number of unread message in the window title (#548701)

 src/empathy-chat-window.c | 67
 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 62 insertions(+), 5 deletions(-)

commit 06dc17735c9966d9b2ecab4f0257bfa9c2eb1742
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 25 17:03:52 2009 +0000

    call empathy_chat_messages_read when messages have been read in a tab

 src/empathy-chat-window.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit b01de2f8b4e0ba170e1194615290e3d80865083f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 25 17:03:00 2009 +0000

    empathy-chat: keep count of the number of unread messages

 libempathy-gtk/empathy-chat.c | 23 +++++++++++++++++++++++
 libempathy-gtk/empathy-chat.h |  3 +++
 2 files changed, 26 insertions(+)

commit 8b5eb07207e7aa74a0e9081a73502f71d1be58c1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 25 16:33:35 2009 +0000

    display the number of other tabs

 src/empathy-chat-window.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

commit c09471eb2c996367eb023f430b4fa3e599c9df09
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 25 16:12:02 2009 +0000

    factor out empathy_chat_get_name

    Dup the string as we are going to use g_strdup_printf

 src/empathy-chat-window.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit 02fa89520bb3b2ca00af8307f476973e8cad83c0
Author: Adi Roiban <adi@roiban.ro>
Date:	Fri Nov 27 04:54:21 2009 +0200

    Update Romanian translations

 po/ChangeLog |    4 +
 po/ro.po     | 1202
 ++++++++++++++++++++++++++++++++++++----------------------
 2 files changed, 759 insertions(+), 447 deletions(-)

commit 2473550861afe14de48efe174e44073405a195c4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 26 11:38:07 2009 +0000

    chat-text-view: override GtkTextView copy_clipboard

    This allow us to hook our copy_clipboard function as so have pretty
    pasting
    when copying using the text view context menu (#603031).

 libempathy-gtk/empathy-chat-text-view.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit 6b90cf0b018fa420e46ce23f17b2dfca3168b44b
Author: Antón Méixome <meixome@mancomun.org>
Date:	Thu Nov 26 14:41:49 2009 +0100

    Updated Galician Translation

 po/gl.po | 1259
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 745 insertions(+), 514 deletions(-)

commit 38fb31535052089c55fc012d3356758363ae7bb3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 25 17:50:01 2009 +0000

    Always display the 'Room' column (#586678)

    There is no reason to only display it when an account is selected.

 src/empathy-chatrooms-window.c | 15 ---------------
 1 file changed, 15 deletions(-)

commit 1e3bb1380521ae6bb0b16ceb98e36834aeba70d8
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Nov 23 17:14:28 2009 +0100

    Remember the geometry of debug window

 src/empathy-debug-window.c | 2 ++
 1 file changed, 2 insertions(+)

commit 0ab9a70d10856dd6876b9a4b31bcf7f5f1663495
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Nov 26 09:35:42 2009 +0000

    gssize isn't an int on various platforms

 libempathy-gtk/empathy-theme-adium.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9ff14672ab605f20789a2db6f9f89673cf8f2c4b
Merge: 078aa4b 0b86e86
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Nov 26 10:20:40 2009 +0100

    Merge branch 'adium-events'

    Conflicts:
	libempathy-gtk/empathy-theme-adium.c

commit 078aa4b28cbca7e5a77701fcbcaf0237e6e717ab
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Nov 26 10:18:31 2009 +0100

    Clean how we insert smileys in adium themes

 libempathy-gtk/empathy-theme-adium.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

commit 02ca446606c2c9f2673188b811891dd107c21e19
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Nov 26 10:16:39 2009 +0100

    Clean how we insert link in adium themes

 libempathy-gtk/empathy-theme-adium.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

commit 12924ec3e9b06460c5ec6ccb5e84a58ab64cd762
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Nov 25 10:19:55 2009 +0100

    Rework the link regex to have "(user@server.com)" case work.

 libempathy-gtk/empathy-ui-utils.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

commit fe57de44b370951c5e0a5de0aa78e0bb0fca9849
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Nov 25 10:19:21 2009 +0100

    Add some more tests, and fail only after all have run, it's easier
    to debug

 tests/empathy-parser-test.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

commit 2d9bbb26709398a1211312306ce5bee4b639f2a3
Author: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Date:	Tue Nov 24 15:28:59 2009 -0200

    Escape what is put inside <a> tags

    We should be careful here, and make sure whatever is put enclosed by
    <a> tags is correctly encoded. What caused bug #597049 is that what
    was being liked to looked like a tag, so the browser ignored it, but
    this is potentially a security vulnerability.

    Bug #597049

 libempathy-gtk/empathy-theme-adium.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 9ec54fdc072173c6676ec2d8ea0b8eabe6936cef
Author: Shaun McCance <shaunm@gnome.org>
Date:	Tue Nov 24 11:26:45 2009 -0600

    Some improvements to file drag-and-drop based on comments on #595226

 src/empathy-chat-window.c | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

commit 89bc747b15ff519b81b8b153bcf94c8cd19245b1
Author: Shaun McCance <Shaun McCance>
Date:	Wed Oct 7 10:47:41 2009 -0500

    [empathy-contact-list-view] Don't accept file drags to offline/non-FT
    contacts

 libempathy-gtk/empathy-contact-list-view.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit bcc824a40f40c86e87cfdd84c00652ada111fdaa
Author: Shaun McCance <Shaun McCance>
Date:	Tue Oct 6 17:56:47 2009 -0500

    [empathy-chat-window] Cleanup DND, don't accept drags to offline
    contacts

 src/empathy-chat-window.c | 82
 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 62 insertions(+), 20 deletions(-)

commit adade63c475294db24a422c3a0e5f6b3879641b6
Author: Shaun McCance <Shaun McCance>
Date:	Mon Oct 5 15:09:46 2009 -0500

    Move GtkTargetLists into priv so they're no longer static

 libempathy-gtk/empathy-contact-list-view.c | 16 +++++++++-------
 src/empathy-chat-window.c		    | 19 +++++++++++++------
 2 files changed, 22 insertions(+), 13 deletions(-)

commit bbe8c4eadaf0aadd45b3f70cb55dfad44bd4ba49
Author: Shaun McCance <Shaun McCance>
Date:	Mon Oct 5 14:52:46 2009 -0500

    [empathy-chat-window] Documented MOVE/COPY selection in drag_motion

 src/empathy-chat-window.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 43390cb381e1dd4b68771c3c285bc1f5326a5b74
Author: Shaun McCance <Shaun McCance>
Date:	Mon Oct 5 14:48:24 2009 -0500

    Fixed leak in drag motion and added comments for bug #595226

 libempathy-gtk/empathy-contact-list-view.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

commit f167ec2d92a526d19f1faf8320d9ff975ae1e502
Author: Shaun McCance <Shaun McCance>
Date:	Mon Oct 5 14:22:32 2009 -0500

    Utilitiy function to send files from a URI list, for dnd
    implementations

 libempathy-gtk/empathy-chat.c		    |  5 +++++
 libempathy-gtk/empathy-contact-list-view.c | 20 ++------------------
 libempathy-gtk/empathy-ui-utils.c	    | 30
 ++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-ui-utils.h	    |  2 ++
 src/empathy-chat-window.c		    | 27
 ++-------------------------
 5 files changed, 41 insertions(+), 43 deletions(-)

commit cfb4283d66005aa2f12b15ce0d5aefde965d815a
Author: Shaun McCance <Shaun McCance>
Date:	Mon Oct 5 13:37:23 2009 -0500

    Split contact_list_view_drag_data_received into smaller functions

 libempathy-gtk/empathy-contact-list-view.c | 259
 ++++++++++++++++-------------
 1 file changed, 141 insertions(+), 118 deletions(-)

commit 85e7ae3c96ccc9734f5f09371cd44817ff751ce6
Author: Shaun McCance <Shaun McCance>
Date:	Fri Sep 18 14:11:44 2009 -0500

    Setting reorderable on the contact list view to get row previews as
    drag icons

    This is a hack.  There's a comment explaining the hack.  Read it.

 libempathy-gtk/empathy-contact-list-view.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 18be92ecfb97887044867643e130ee0ee7c6b3f8
Author: Shaun McCance <Shaun McCance>
Date:	Thu Sep 17 17:11:11 2009 -0500

    Allow contacts to be dragged anywhere in a group, or dragged to
    the non-group

 libempathy-gtk/empathy-contact-list-view.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

commit 3cbb3a10e138e1f777427311bf33f30cb6d4839e
Author: Shaun McCance <Shaun McCance>
Date:	Thu Sep 17 16:17:49 2009 -0500

    Implemented file drags to contact list, along with row highlights

 libempathy-gtk/empathy-contact-list-view.c | 252
 ++++++++++++++++++++---------
 src/empathy-chat-window.c		    |	4 +-
 2 files changed, 175 insertions(+), 81 deletions(-)

commit d068663d7d73c7dc54b560b3ed9846c218dd8f35
Author: Shaun McCance <Shaun McCance>
Date:	Tue Sep 15 15:57:51 2009 -0500

    Handle MOVE and COPY drags better, change contact-id drags to COPY

 src/empathy-chat-window.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 42185f1d38082579ca113d612000c670eac76869
Author: Shaun McCance <Shaun McCance>
Date:	Tue Sep 15 15:10:24 2009 -0500

    Always prefer GDK_ACTION_COPY for text/uri-list drags

 src/empathy-chat-window.c | 39 +++++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

commit 810fc88802d72b880ff9472be7374f72a34df748
Author: Shaun McCance <Shaun McCance>
Date:	Tue Sep 15 12:47:09 2009 -0500

    Don't try to offer file transfers to MUCs

 src/empathy-chat-window.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit df2e42c11963a62c729ca592c3fb291a82ccedb9
Author: Shaun McCance <Shaun McCance>
Date:	Mon Sep 14 21:31:58 2009 -0500

    Call gtk_drag_finish when we get a file transfer drag on a chat window

 src/empathy-chat-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 2e2fdd45ae2d7fac58c9cc40b48c84ffc6b3f48e
Author: Shaun McCance <Shaun McCance>
Date:	Mon Sep 14 21:15:06 2009 -0500

    Implementing drag and drop file sending on chat windows

 libempathy-gtk/empathy-chat.c	   |  1 +
 libempathy-gtk/empathy-ui-utils.c | 36 ++++++++++++++++++++------------
 libempathy-gtk/empathy-ui-utils.h |  2 ++
 src/empathy-chat-window.c	   | 44
 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 13 deletions(-)

commit b253440c84091dd88e619171330e895507abe40d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 24 18:38:38 2009 +0100

    Add test for bug #597049

 tests/empathy-parser-test.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit 0b86e861b20e3c083baa04bb9e0fa2df31df8e8d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 24 18:25:22 2009 +0100

    Do not escape twice /me messages with adium theme.

 libempathy-gtk/empathy-theme-adium.c | 47
 +++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 20 deletions(-)

commit 9863c689d9dab2772bb6ffda97d7376702142394
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 24 16:44:29 2009 +0100

    Add more test cases and fix some found issues in link regex.

 libempathy-gtk/empathy-ui-utils.c |  2 +-
 tests/empathy-parser-test.c	   | 72
 ++++++++++++++++++++++++++++-----------
 2 files changed, 53 insertions(+), 21 deletions(-)

commit 9c1e21c7ad3ba913ebf144b498aa2de6d22a7797
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 24 15:54:21 2009 +0100

    Replace GString param with a generic gpointer user_data, and port
    EmpathyChatTextView to new parser API.

 libempathy-gtk/empathy-chat-text-view.c | 147
 ++++++++++++++------------------
 libempathy-gtk/empathy-theme-adium.c	 |  78 ++++++++++-------
 libempathy-gtk/empathy-ui-utils.c	 |  63 +++++++-------
 libempathy-gtk/empathy-ui-utils.h	 |  39 +++++----
 tests/empathy-parser-test.c		 |  26 ++++--
 5 files changed, 184 insertions(+), 169 deletions(-)

commit ebaadd93adf03514e9e629b6ae7b065803b046e7
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 24 14:37:32 2009 +0100

    Also parse smileys in tests

 tests/empathy-parser-test.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit 3ad67fbdadb2b1da16c53a34fb04489a2acf1def
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 24 14:37:21 2009 +0100

    Init GTK from test_init()

 tests/test-helper.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 8ab216aca28acaa857b4b7faa606cd3af26b6cd9
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 24 14:32:00 2009 +0100

    Add parser tests

 tests/.gitignore	     |	1 +
 tests/Makefile.am	     |	6 ++++-
 tests/empathy-parser-test.c | 66
 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 1 deletion(-)

commit 2fc34dbe48ff603b99b6e56ce4ea94d6a3a8c450
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 24 14:31:13 2009 +0100

    Call empathy_init() from test_init()

 tests/test-helper.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit c4eea520c7ed8adaf378e9424f199aa49efbccc7
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 24 14:30:50 2009 +0100

    Add Test debug domain

 libempathy/empathy-debug.c | 1 +
 libempathy/empathy-debug.h | 1 +
 2 files changed, 2 insertions(+)

commit ce6f2983d99033c0144a622295ae72ec567e2582
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 24 14:29:45 2009 +0100

    Make possible to define different replace function for parsers

 libempathy-gtk/empathy-theme-adium.c | 92
 +++++++++++++++++-------------------
 libempathy-gtk/empathy-ui-utils.c    | 79 ++++++++++++++++++++++---------
 libempathy-gtk/empathy-ui-utils.h    | 46 +++++++++++++-----
 3 files changed, 133 insertions(+), 84 deletions(-)

commit 7731e5f2031462707a4e774d6ebe38d32641a6e5
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 24 11:41:05 2009 +0100

    Accept any foo:// URL Schemes

 libempathy-gtk/empathy-ui-utils.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 212ea18a107e8ddfda82b3b754a1df2b7db9735f
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Nov 16 09:27:50 2009 +0100

    start and end positions in EmpathySmileyHit struct can't be
    negative. Change them to guint.

 libempathy-gtk/empathy-chat-text-view.c | 2 +-
 libempathy-gtk/empathy-smiley-manager.h | 4 ++--
 libempathy-gtk/empathy-theme-adium.c	 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

commit e83c0814113515cdd5a3dc511f7e29cbe51651e8
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Nov 16 09:23:12 2009 +0100

    Add comments to explain empathy_smiley_manager_parse_len(), it is
    non-trivial function.

 libempathy-gtk/empathy-smiley-manager.c | 32
 +++++++++++++++++++++++++++++++-
 libempathy-gtk/empathy-smiley-manager.h |  6 +++---
 2 files changed, 34 insertions(+), 4 deletions(-)

commit 1af4342a53358f23f71fabd0012a0d868a13c194
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Nov 1 11:24:35 2009 +0100

    Optimisation: Do not fetch use-smiley gconf key for each substring.

 libempathy-gtk/empathy-theme-adium.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit 1d42b9fde60750fab76d7af606388bc28b1083ad
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Nov 1 11:19:57 2009 +0100

    Extract empathy_string_parser_link and empathy_string_parser_escape
    from empathy-theme-adium.c

 libempathy-gtk/empathy-theme-adium.c | 66
 ++----------------------------------
 libempathy-gtk/empathy-ui-utils.c    | 62
 +++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-ui-utils.h    | 12 +++++++
 3 files changed, 76 insertions(+), 64 deletions(-)

commit 6ea436c8b313974d94eb9fe97974edcf4f47e46d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Nov 1 11:04:00 2009 +0100

    Create API for generic string parser

 libempathy-gtk/empathy-theme-adium.c | 41
 ++++++++++++++++++++++++------------
 libempathy-gtk/empathy-ui-utils.c    | 14 ++++++++++++
 libempathy-gtk/empathy-ui-utils.h    | 12 +++++++++++
 3 files changed, 54 insertions(+), 13 deletions(-)

commit b15f926089b6b718004467c8bb2ddf6f6cd3a9ac
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Oct 26 13:09:38 2009 +0100

    Remove dead code from EmpathySmileyManager

 libempathy-gtk/empathy-smiley-manager.c | 101
 ++++----------------------------
 libempathy-gtk/empathy-smiley-manager.h |   4 --
 2 files changed, 10 insertions(+), 95 deletions(-)

commit 591c58b68cb39c62d22d76f394c30481b0821018
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Oct 26 12:59:09 2009 +0100

    Use new smiley parser in EmpathyChatTextView.

 libempathy-gtk/empathy-chat-text-view.c | 29
 ++++++++++++++++++-----------
 libempathy-gtk/empathy-smiley-manager.h |  4 ++--
 2 files changed, 20 insertions(+), 13 deletions(-)

commit 954545eee55262449162dd8d0aa10ce6f9c8d036
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Oct 26 11:53:28 2009 +0100

    exclude " and ' from links.

 libempathy-gtk/empathy-ui-utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e4b5562ff59eeab1c5b8d72d72cb5d935cd7d765
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Oct 26 11:53:06 2009 +0100

    Rework the way message parsing and escaping is done.

 libempathy-gtk/empathy-theme-adium.c | 216
 ++++++++++++++++++++---------------
 1 file changed, 126 insertions(+), 90 deletions(-)

commit c2a7ae14574cd90f98f97cf84966152ab6023ace
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Oct 26 11:52:27 2009 +0100

    Introduce a new smiley parser that can parse only a part of a string.

 libempathy-gtk/empathy-smiley-manager.c | 83
 +++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-smiley-manager.h | 11 +++++
 2 files changed, 94 insertions(+)

commit 783fe36cb4d096a9ed17078e8ddc36b3542b638b
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Tue Nov 24 17:57:30 2009 +0100

    Updated Spanish translation

 po/es.po | 177
 ++++++++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 136 insertions(+), 41 deletions(-)

commit d6c023acb730fd74dab269fd3f5883b0e655de5f
Author: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Date:	Tue Nov 24 14:27:58 2009 -0200

    Make sure double quotes are not considered part of URIs

    The fact that the URI regex we use to detect URIs in chat
    conversations does not exclude double quotes causes it to pick up more
    of the text than it should, in some cases.

    Bug #598381

 libempathy-gtk/empathy-ui-utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d7737fbc077b6e1a5af4446cbda759cad0e22e95
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 24 10:59:02 2009 +0000

    add empathy-account-widget-sip.c to POTFILES.in

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit a5881d0c3bce92cee5fa0f81d6c0313db5537747
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Nov 23 16:58:27 2009 +0100

    Clarify macro names

 libempathy-gtk/empathy-geometry.c | 36
 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

commit 496598a1d17599b809d981c5c3016f90eec15376
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Nov 23 16:30:26 2009 +0100

    Create EMPATHY_RECT_IS_ON_SCREEN macro instead of duplicating
    its code.

 libempathy-gtk/empathy-geometry.c | 5 ++---
 libempathy-gtk/empathy-ui-utils.c | 4 +---
 libempathy-gtk/empathy-ui-utils.h | 5 +++++
 3 files changed, 8 insertions(+), 6 deletions(-)

commit 5a09311ed6bc01870413327addfd0337d7296a7e
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Nov 23 14:35:19 2009 +0100

    Drop workaround that restore window position when it gets deiconified

    It breaks with metacity because windows are all iconified/deiconified
    when switching workspace, and it seems reposition on map is enough.

 src/empathy-main-window.c | 16 ----------------
 1 file changed, 16 deletions(-)

commit 2035a59cc1d1a7b28d3fd583f49ca74c9b3db503
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Nov 23 14:34:35 2009 +0100

    Restore position of window if it gets remapped.

 libempathy-gtk/empathy-geometry.c | 65
 ++++++++++++++++++++++++++++++---------
 1 file changed, 51 insertions(+), 14 deletions(-)

commit 18f7718773d305ea2c83918c82ea938e2ff55ef3
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Nov 23 14:31:30 2009 +0100

    Make empathy_present_window() also move to current desktop with
    compiz. Fixes bug #602649

 libempathy-gtk/empathy-ui-utils.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

commit 05ecb3d3c81446517a71eaa884076efb9d3ae35a
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Nov 23 08:50:12 2009 +0100

    Make sure to not save offscreen positioning. It happens with compiz.

 libempathy-gtk/empathy-geometry.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit cca12d5ca2612c344dd395da63a63c5a8c0a7969
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 23 16:36:05 2009 +0100

    Don't set the accounts dialog transient when running empathy -a

    This will avoid to display the contact list if it has been hidden
    (#581626).

 src/empathy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a0dc8b43d0776ae123cd7d6dfaeef7b4bd1672a6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 23 16:09:54 2009 +0100

    account-widget-sip: translate all the labels in combo box

 libempathy-gtk/empathy-account-widget-sip.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

commit e400d3cf3fee67202427344a74d51f92300c08cb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 18 17:49:55 2009 +0000

    empathy-account-widget-private: fix coding style

 libempathy-gtk/empathy-account-widget-private.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 0aee963e52e7432567e664a385f4b0658fe8993c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 18 17:48:26 2009 +0000

    rename account_widget_setup_widget empathy_account_widget_setup_widget

    This function is exported now.

 libempathy-gtk/empathy-account-widget-private.h | 2 +-
 libempathy-gtk/empathy-account-widget-sip.c	 | 4 ++--
 libempathy-gtk/empathy-account-widget.c	 | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

commit adf5302cd8c725cd3d6c5948481839da6b911d45
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 18 15:10:13 2009 +0000

    fix position of the 2 combo boxes

 libempathy-gtk/empathy-account-widget-sip.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit cf5c186c7350a1fe174d202e72833352e4385903
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 18 14:58:41 2009 +0000

    move port settings to the same line as the host

 libempathy-gtk/empathy-account-widget-sip.ui | 211
 ++++++++++++++-------------
 1 file changed, 106 insertions(+), 105 deletions(-)

commit 4a2c2ba5f988b0f716f85cfcde22f67663b4984a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 18 14:48:13 2009 +0000

    indent the STUN Server/Port label under the checkbox

 libempathy-gtk/empathy-account-widget-sip.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 02f43d5ef0ed93d0699b3093e13c46bb129256ef
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 18 14:44:01 2009 +0000

    rephrase subsection titles and their labels

 libempathy-gtk/empathy-account-widget-sip.ui | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit eed9993f70997795d52828ebe56e5831c9566206
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 18 14:40:37 2009 +0000

    add indentation so subsections are clearer

 libempathy-gtk/empathy-account-widget-sip.ui | 324
 ++++++++++++++++-----------
 1 file changed, 194 insertions(+), 130 deletions(-)

commit 7cf2b5ad033f1929e2e0697d72e22cb9d4a8442d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 18 14:19:25 2009 +0000

    rephrase the discover-stun checkbox label

 libempathy-gtk/empathy-account-widget-sip.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d37455f3e8525d70ec792a78319be8b398b38641
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 18 14:18:30 2009 +0000

    rename Misc section to Miscellaneous

 libempathy-gtk/empathy-account-widget-sip.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6df549df80d1a2cede9a09d0523a09c892900640
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 17 15:45:07 2009 +0000

    account-widget-sip: add subsections in the advanced section

 libempathy-gtk/empathy-account-widget-sip.c  |   2 +-
 libempathy-gtk/empathy-account-widget-sip.ui | 125
 +++++++++++++++++++--------
 2 files changed, 90 insertions(+), 37 deletions(-)

commit acd34840d001a4bba556886d4675832f9c4c29a0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 17 11:27:13 2009 +0000

    account-widget-sip: fix typo in variable name

 libempathy-gtk/empathy-account-widget-sip.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 4679f53f051665acb601de4516eb7d7f9e173f44
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 17 11:26:01 2009 +0000

    account-widget-sip: unsensitive the STUN labels as well when STUN
    is disabled

 libempathy-gtk/empathy-account-widget-sip.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 76ece46082b1a487acca4abea728c296b586824e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 17 11:09:28 2009 +0000

    account_widget_combobox_changed_cb: check that param has a default

 libempathy-gtk/empathy-account-widget.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 6738d193bf3e30d0befaa3e8183cc75ffe607982
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 17 11:05:41 2009 +0000

    Set explicitely the model of combo box

    The value of the param has to be in the first column as a string. This
    allow
    us to display translated strings in the combo box.

 libempathy-gtk/empathy-account-widget-sip.c | 81
 +++++++++++++++++++++--------
 libempathy-gtk/empathy-account-widget.c     | 13 ++++-
 2 files changed, 69 insertions(+), 25 deletions(-)

commit db4180342c107e1641ae528739409e4168ba7d91
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 16 18:00:02 2009 +0000

    unsensitive the keep-alive spin button if keep-alive is disabled

 libempathy-gtk/empathy-account-widget-sip.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

commit 8c92880ac4be339e9047cb03f981c7ec5de9cbfb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 16 17:51:42 2009 +0000

    account-widget-sip: add UI to configure the keepalive-mechanism and
    keepalive-interval params

 libempathy-gtk/empathy-account-widget-sip.c  | 22 +++++++++++++
 libempathy-gtk/empathy-account-widget-sip.ui | 46
 +++++++++++++++++++++++++++-
 2 files changed, 67 insertions(+), 1 deletion(-)

commit aa9f5c39b0600d7cba3d63124d8d7018e63209f1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 16 17:36:11 2009 +0000

    account-widget-sip: add UI to configure the discover-binding param

 libempathy-gtk/empathy-account-widget-sip.c  |  1 +
 libempathy-gtk/empathy-account-widget-sip.ui | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

commit b212a106ec0395c312ea9e1242d6ed684729ff9f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 16 17:32:08 2009 +0000

    account-widget-sip: add UI to configure the loose-routine param

 libempathy-gtk/empathy-account-widget-sip.c  |  1 +
 libempathy-gtk/empathy-account-widget-sip.ui | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

commit 03b6a5b020c9c2f7cc3a2bf5240368ced685f1bc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 16 16:31:00 2009 +0000

    account-widget-sip: add UI to configure the transport param

 libempathy-gtk/empathy-account-widget-sip.c  | 24
 ++++++++++++++++++++++++
 libempathy-gtk/empathy-account-widget-sip.ui | 16 +++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)

commit 5443218a889c1866d8fbe29f5d74e76eb038e37e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 16 16:27:30 2009 +0000

    account_widget_setup_widget: add support for GtkComboBox

 libempathy-gtk/empathy-account-widget.c | 64
 +++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

commit 03fb46a62ffebee924f1c610bfab31458df920de
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 16 15:56:22 2009 +0000

    empathy-account-widget: export account_widget_setup_widget

    This function can be useful if a account widget wants to map a
    widget not
    created in the GtkBuilder file.

 libempathy-gtk/empathy-account-widget-private.h | 4 ++++
 libempathy-gtk/empathy-account-widget.c	 | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

commit 3528c4dd9364d2b178e49b259affc50022ed9af3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 16 14:11:26 2009 +0000

    account-widget-sip: Add UI to configure auth-user, proxy-host and
    port params (#601697)

 libempathy-gtk/empathy-account-widget-sip.c  |  3 +
 libempathy-gtk/empathy-account-widget-sip.ui | 85
 +++++++++++++++++++++++++++-
 2 files changed, 87 insertions(+), 1 deletion(-)

commit 14e27827e307997db9ec5ad216900cd5282c2864
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 19 11:46:04 2009 +0000

    empathy_tp_contact_factory_get_from_{id,handle} shouldn't pass the
    ref of the contact to the cb

    This match the behaviour of
    empathy_tp_contact_factory_get_from_{ids,handles}
    and tp_connection_get_contacts_by_handle.

 libempathy/empathy-tp-contact-factory.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 9da605b25b64e25bc6a1b7651d001ea451fbeac9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 19 11:10:15 2009 +0000

    event-manager: event_manager_ft_got_contact_cb: ref the contact

    empathy_tp_contact_factory_get_from_handle is not supposed to give
    a reference
    to the callback.

 src/empathy-event-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 250f2c784601f83fb5d0ccdd02d64d607ae0a385
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 19 11:09:29 2009 +0000

    ft-handler: contact_factory_contact_cb: ref the contact

    empathy_tp_contact_factory_get_from_handle is not supposed to give
    a reference
    to the callback.

 libempathy/empathy-ft-handler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 493d8e1b341aae18d3d94ff9fbe0187cd100a60d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 19 10:53:53 2009 +0000

    tp-contact-factory: document that
    empathy_tp_contact_factory_get_from_{ids,handles} don't give a ref
    to the cb

 libempathy/empathy-tp-contact-factory.c | 2 ++
 1 file changed, 2 insertions(+)

commit 228087733091adf20dcf31c9a4f305aa1152e163
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Fri Nov 20 14:05:23 2009 +0100

    Updated Slovenian translation

 po/sl.po | 100
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 48 insertions(+), 52 deletions(-)

commit ba7b628e94f952f6e8692e275e1e8098430fadb9
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Thu Nov 19 20:09:19 2009 +0100

    Updated Spanish translation

 po/es.po | 130
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 68 insertions(+), 62 deletions(-)

commit eaf0587c3c9d674eca2350dec5a2f5c87705f402
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 18 23:09:53 2009 +0000

    notify-manager: unref the account mgr when disposing

 libempathy-gtk/empathy-notify-manager.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit 0805caad8bb48b83e74648dbb3be85fd2869b541
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 18 12:32:12 2009 +0000

    account-widget: use the account-manaer instead of idle

    Also ensure that the 'apply' button is correctly updated when the
    status is
    changed.

 libempathy-gtk/empathy-account-widget.c | 88
 +++++++++++++++++++++------------
 1 file changed, 56 insertions(+), 32 deletions(-)

commit 5e6b2ce12834a5b9a39ebfda3347377a52d00fac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 18 11:47:13 2009 +0000

    idle: make empathy_idle_get_status static

    It's not used anymore and other components should use the account
    manager
    directly.

 libempathy/empathy-idle.c | 36 ++++++++++++++++++------------------
 libempathy/empathy-idle.h |  1 -
 2 files changed, 18 insertions(+), 19 deletions(-)

commit 6d44631feaef9003a77b9854764549afee839a27
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 17 17:18:15 2009 +0000

    empathy.c: use tp_account_manager_get_most_available_presence instead
    of empathy_idle_get_state

 src/empathy.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 31e4f59e7c16016d0279070a711147fb6b460af1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 17 17:09:22 2009 +0000

    notify-manager: use the account mgr directly instead of
    empathy_check_available_state

 libempathy-gtk/empathy-notify-manager.c | 40
 ++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

commit 0a24fbcba90ec2b36ede035ec6d9a9915a740e1a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 18 11:44:55 2009 +0000

    status-icon: use the account-manager directly to get our state
    and status

    Also wait that he AM is ready before trying to get the
    status. Partially fix
    bug #601235.

 src/empathy-status-icon.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit aadb68944951a49704d0bf4a018b22041432a25e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 18 11:38:33 2009 +0000

    presence-chooser: use the account-manager directly to get our state
    and status

    Also wait that the AM is ready before trying to get the
    status. Partially fix
    bug #601235.

 libempathy-gtk/empathy-presence-chooser.c | 65
 +++++++++++++++++++++++--------
 1 file changed, 48 insertions(+), 17 deletions(-)

commit 91f13bff713e208272ad93d36c2faf0737cdd32c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 18 14:06:15 2009 +0000

    tp-chat: copy the rename message

 libempathy/empathy-tp-chat.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 8a149be5cabca92862b84dff0642ee44ea16dfa3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 18 13:55:42 2009 +0000

    coding style fixes

 libempathy/empathy-tp-chat.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit fa08a8879c77e99f706ee805df0e2821f202e9de
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 18 13:53:25 2009 +0000

    don't mix code and variable declarations

 libempathy-gtk/empathy-chat.c | 8 ++++----
 libempathy/empathy-tp-chat.c  | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

commit ea9f4b06393425e7496a3494e084520da3de7618
Author: Jonathon Jongsma <jonathon.jongsma@collabora.co.uk>
Date:	Fri Feb 13 11:35:42 2009 -0600

    Fixed some of Gillaume's review comments from Bug #571642

    The following comments should be fixed in this commit:
    - tp_group_update_members: add "old" and "new" in comments so we
    known which
      contact we are talking about.
    - Always use TpHandle instead of guint when storing handles in
    variables.
    - contact_list_store_member_renamed_cb: would be good to share the
    common code
      with contact_list_store_members_changed_cb in a common function

    One comment about the last one: I split out common code into two
    new functions:
    contact_list_store_add_contact_and_connect(), and the matching
    contact_list_store_remove_contact_and_disconnect().  I wondered
    whether the
    signal connection/disconnection should just be added to the
    _add_contact() and
    _remove_contact() functions directly, but they do seem to be used
    in other
    places without connecting to signals, so i thought it would be safer
    to simply
    add some wrapper functions.

 libempathy-gtk/empathy-contact-list-store.c | 82
 +++++++++++++----------------
 1 file changed, 38 insertions(+), 44 deletions(-)

commit 500093ef89387aead8be8086e33c05fa250446e9
Author: Jonathon Jongsma <jjongsma@gnome.org>
Date:	Wed Jan 7 15:49:08 2009 -0600

    Handle the case where a user's id changes in a chatroom

    Telepathy-glib has a enum value for the MembersChanged signal to
    signify that a
    user's ID has changed.  Previously, empathy was simply interpreting
    this as if a
    user with the old name had left the chat and a different user with
    the new name
    had entered the chat.  This change handles this case more gracefully
    by updating
    the contact's id (and name) when this change reason is present

    One thing that does not yet work with this patch is if you are
    engaged in a
    private chat with a person and they change their nick in the middle
    of the chat.
    Then the EmpathyContact* that you are chatting with is no longer the
    EmpathyContact* representing the remote user, so messages won't
    be delivered
    properly.  When we detect that a user has been 'renamed', we probably
    need to
    somehow go through all of the private chats with that person and
    swap out the
    old (invalid) EmpathyContact* and replace it with the new one so
    that the chat
    can continue without interruption.

 libempathy-gtk/empathy-chat.c		     | 29 +++++++++
 libempathy-gtk/empathy-contact-list-store.c | 56 +++++++++++++++++
 libempathy/empathy-contact-list.c	     |	9 +++
 libempathy/empathy-tp-chat.c		     | 95
 +++++++++++++++++++++++++++++
 4 files changed, 189 insertions(+)

commit 79fcbc9965a60f8099ea355188b954ae2444eddc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 18 18:35:54 2009 +0000

    tp-chat: no need to connect twice on the ChatStateChanged signal

 libempathy/empathy-tp-chat.c | 4 ----
 1 file changed, 4 deletions(-)

commit c0619e8382aa29b5cbc872481abd7422ecc9b25b
Author: Bastien Nocera <hadess@hadess.net>
Date:	Wed Nov 18 17:06:34 2009 +0000

    Fix nautilus-sendto plugin's linking

    No need to link to both libempathy-gtk and libempathy, the former
    already links to the latter.

    https://bugzilla.gnome.org/show_bug.cgi?id=602324

 nautilus-sendto-plugin/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

commit db67069547cedf5728d0015b1c207da6bd5445f0
Author: Laurent Bigonville <bigon@bigon.be>
Date:	Wed Nov 18 16:57:24 2009 +0100

    Move empathy-log to tests/interactive and don't install it anymore

 src/.gitignore			  |  1 -
 src/Makefile.am		  |  5 +---
 src/empathy-logs.c		  | 60
 ----------------------------------------
 tests/interactive/.gitignore	  |  1 +
 tests/interactive/Makefile.am	  |  2 ++
 tests/interactive/empathy-logs.c | 60
 ++++++++++++++++++++++++++++++++++++++++
 6 files changed, 64 insertions(+), 65 deletions(-)

commit d2da82d9684bd97038c95be1cef8cedf07e6df32
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Wed Nov 18 07:03:15 2009 +0100

    Updated Slovenian translation

 po/sl.po | 257
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 141 insertions(+), 116 deletions(-)

commit b80b6e34115b8f2e483e89fa2dcd89fc7c4dfdcc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 17 17:36:07 2009 +0000

    remove empathy_idle_{get,set}_flash_state

 libempathy/empathy-idle.c | 46
 ----------------------------------------------
 libempathy/empathy-idle.h |  3 ---
 2 files changed, 49 deletions(-)

commit 526e1430353d4a371d98bdd6a3064499c6a286e4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 17 17:35:34 2009 +0000

    presence-chooser: remove icon blinking support

    This code is broken and unused since a while.

 libempathy-gtk/empathy-presence-chooser.c | 92
 ++-----------------------------
 1 file changed, 4 insertions(+), 88 deletions(-)

commit 7cd2009c0869188a6968e64fd9b92981181ed129
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 17 11:36:29 2009 +0000

    account-widget-jabber: increase spacing in the 'Override Server
    Settings' section

    The frame was too close from the other widgets.

 libempathy-gtk/empathy-account-widget-jabber.ui | 2 ++
 1 file changed, 2 insertions(+)

commit 0e5d455892166362053c3d65549fc181bf664724
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Nov 17 11:04:07 2009 +0000

    We should ensure, not create muc channels

 libempathy/empathy-dispatcher.c | 1 +
 1 file changed, 1 insertion(+)

commit 8bc927ba13e76d0d3955acb71651449bbab90591
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 17 11:27:58 2009 +0100

    Disable single include

 configure.ac | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 6f9fe3b417a3870ce48288f1273843af05d39624
Author: Javier Jardón <jjardon@gnome.org>
Date:	Fri Nov 13 06:29:35 2009 +0100

    Use accessor functions instead direct access.

    Some functions still remaining because there is not API
    in GTK+ 2.19.0 yet.

    http://bugzilla.gnome.org/show_bug.cgi?id=586476

    Reviewed-By: Danielle Madeley <danielle.madeley@collabora.co.uk>

 libempathy-gtk/empathy-avatar-image.c		 |  6 ++++--
 libempathy-gtk/empathy-cell-renderer-expander.c |  4 +++-
 libempathy-gtk/empathy-chat.c			 | 10 ++++++----
 libempathy-gtk/empathy-contact-dialogs.c	 |  6 +++---
 libempathy-gtk/empathy-contact-menu.c		 |  2 +-
 libempathy-gtk/empathy-kludge-label.c		 |  9 ++++++---
 libempathy-gtk/empathy-presence-chooser.c	 |  6 +++---
 libempathy-gtk/empathy-status-preset-dialog.c	 |  2 +-
 libempathy-gtk/empathy-ui-utils.c		 |  4 ++--
 libempathy-gtk/empathy-video-widget.c		 |  6 ++++--
 src/empathy-call-window.c			 | 21
 ++++++++++++++-------
 src/empathy-chat-window.c			 |  4 ++--
 src/empathy-chatrooms-window.c			 |  2 +-
 src/empathy-sidebar.c				 | 12 ++++++++----
 src/ephy-spinner.c				 | 18 ++++++++++--------
 15 files changed, 68 insertions(+), 44 deletions(-)

commit e836a987945a601d70082eef2c6f2fd6796c4fd3
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Nov 16 19:59:19 2009 +0100

    Updated Spanish translation

 po/es.po | 141
 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 89 insertions(+), 52 deletions(-)

commit d992856fae759eed04e9ae78e5242259462416f1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 16 17:19:09 2009 +0000

    log_store_empathy_search_hit_new: don't unref accounts

    tp_account_manager_get_valid_accounts does *not* ref the accounts
    (#600800).

 libempathy/empathy-log-store-empathy.c | 1 -
 1 file changed, 1 deletion(-)

commit 60a1441ea328c9001ec1433be4d06fb363d34a42
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 16 17:08:14 2009 +0000

    start dev of 2.29.3

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e9ee0e454f2eb341f7b1a4abfa614ccb65079855
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 16 16:55:18 2009 +0000

    prepare 2.29.2 release

 NEWS	      | 83
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  2 +-
 2 files changed, 84 insertions(+), 1 deletion(-)

commit 2db2d8648b9f1ef1529c0b83fae9b47af504d63a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 16 12:20:07 2009 +0000

    geometry: port to TP coding style

    Most of the file has been rewrite anyway.

 libempathy-gtk/empathy-geometry.c | 301
 +++++++++++++++++++-------------------
 libempathy-gtk/empathy-geometry.h |   7 +-
 2 files changed, 156 insertions(+), 152 deletions(-)

commit 13b916845f7bd4762e2709a99456986bde12b3d9
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Nov 15 21:38:57 2009 +0100

    Reload the main window geometry when deiconify to workaround WM bugs.

 src/empathy-main-window.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit 441909cbcd7c740f49b714b61e31a5236d808538
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Nov 15 19:45:36 2009 +0100

    Correctly store/restore maximized state of windows.

 libempathy-gtk/empathy-geometry.c | 267
 +++++++++++++++++++++++---------------
 libempathy-gtk/empathy-geometry.h |  21 +--
 src/empathy-chat-window.c	   |  85 ++----------
 src/empathy-ft-manager.c	   |  59 +--------
 src/empathy-main-window.c	   |  59 +--------
 5 files changed, 184 insertions(+), 307 deletions(-)

commit 9bfe3cdd27190113f8da56cf718c3af7ff9da5d9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 13 12:04:50 2009 +0000

    media_stream_error_to_txt: display a link to the fdo bugzilla

 src/empathy-call-window.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

commit ff55f4aeee822b9533668ecdee722b4e5f6f2d89
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 13 11:46:40 2009 +0000

    rephrase the TP_MEDIA_STREAM_ERROR_NO_CODECS error

 src/empathy-call-window.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 8512bd90845bb5eace68704c65203238587500f5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 9 12:04:37 2009 +0000

    Display the name of the CM in the
    TP_MEDIA_STREAM_ERROR_INVALID_CM_BEHAVIOR msg

 src/empathy-call-window.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

commit 3fa2b952c259dc6b44ce3f7e1e599e6ce9350b59
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 9 12:03:53 2009 +0000

    add empathy_tp_call_get_connection_manager

 libempathy/empathy-tp-call.c | 21 +++++++++++++++++++++
 libempathy/empathy-tp-call.h |  2 ++
 2 files changed, 23 insertions(+)

commit a13ed429f988ec7ce1e473e8975fa65447cae309
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 6 15:35:24 2009 +0000

    media_stream_error_to_txt: add a msg for
    TP_MEDIA_STREAM_ERROR_NETWORK_ERROR

 src/empathy-call-window.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit f9674144fc2cb0a672cf3aa697eaea956d6a0e4f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 6 15:28:31 2009 +0000

    media_stream_error_to_txt: add a msg for
    TP_MEDIA_STREAM_ERROR_MEDIA_ERROR

 src/empathy-call-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit dc7b032347dac5fd9043f8243910b67cbdd7d28c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 6 15:25:11 2009 +0000

    media_stream_error_to_txt: add a msg for
    TP_MEDIA_STREAM_ERROR_INVALID_CM_BEHAVIOR

 src/empathy-call-window.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 6ada60b8764cd0d202fd962e8ed96a6c84037a80
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 6 15:10:06 2009 +0000

    media_stream_error_to_txt: add a msg for
    TP_MEDIA_STREAM_ERROR_NO_CODECS

 src/empathy-call-window.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 5bbac6517b4b111ca377922d3a1ddee6e895f016
Author: Aron Xu <aronxu@gnome.org>
Date:	Mon Nov 16 19:37:27 2009 +0800

    Updated Simplified Chinese translation.

 po/zh_CN.po | 73
 ++++++++++++++++++++++++++++---------------------------------
 1 file changed, 33 insertions(+), 40 deletions(-)

commit 9dd7983e14f8e726ca3e1ffa01d2385e5c40c671
Author: Aron Xu <aronxu@gnome.org>
Date:	Mon Nov 16 19:25:08 2009 +0800

    Updated Simplified Chinese translation.

 po/zh_CN.po | 1187
 ++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 719 insertions(+), 468 deletions(-)

commit 28c8aaa95db1f26e18f8542458d6ff690fd2da49
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 13 15:44:46 2009 +0000

    log-window: check if the account chooser isn't already ready

    If not we could wait forever if the chooser became ready right away.

 libempathy-gtk/empathy-log-window.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit edf18bab031a39dfa79d54833f774b5acce64ba8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 13 15:43:44 2009 +0000

    add empathy_account_chooser_is_ready

 libempathy-gtk/empathy-account-chooser.c | 10 ++++++++++
 libempathy-gtk/empathy-account-chooser.h |  1 +
 2 files changed, 11 insertions(+)

commit dc392002e18aad2efd7806f84ac94a94fa28cd61
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 13 15:37:03 2009 +0000

    log-window: wait that the accounts chooser is ready before selecting
    the chat

    If we don't wait, the combobox is empty and so
    log_window_chats_set_selected can't find the chat (#601807).

 libempathy-gtk/empathy-log-window.c | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

commit 2b60435f91564f1d3848cb054599ecfe62a004b4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 13 15:35:24 2009 +0000

    account-chooser.c: add a 'ready' signal

    This can be useful to know when the combobox has been populated by the
    accounts.

 libempathy-gtk/empathy-account-chooser.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

commit 95fb98c0a53a1f69f9ef97c21fc890e61b74544b
Merge: 1da83a9 8523d53
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Nov 16 10:15:07 2009 +0100

    Merge branch 'nick'

commit 1da83a90e90795c1e3b04813d6645c0c40e7b51d
Author: vasudeven <agnihot3@gmail.com>
Date:	Sun Nov 15 16:14:42 2009 +0530

    updated Tamil translation

 po/ta.po | 219
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 118 insertions(+), 101 deletions(-)

commit 3509fd39bc66c9d623850a9dc26faabf95c6075c
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Sat Nov 14 11:32:53 2009 +0100

    Updated Slovenian translation

 po/sl.po | 214
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 114 insertions(+), 100 deletions(-)

commit 8523d53b5c5a88c2581ca15d92e253c9d3bc38bf
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Nov 13 22:36:48 2009 +0100

    Implement /nick command

 libempathy-gtk/empathy-chat.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

commit a9c15cf0385c3c7d3a73ab18e7fdced3365440bb
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Fri Nov 13 18:44:00 2009 +0100

    Updated Spanish translation

 po/es.po | 228
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 118 insertions(+), 110 deletions(-)

commit 9af13416f222189ce0a4006375740544d6965570
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 13 17:17:53 2009 +0000

    contact.h: remove empathy_contact_hash as it's not defined (#580254)

 libempathy/empathy-contact.h | 1 -
 1 file changed, 1 deletion(-)

commit dfa84f1d4f1c0a6147d3c57570d4bad8757a3fa8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 13 17:04:04 2009 +0000

    account_widget_build_salut: focus the first name entry by default

    All the fields are mandatory so we should focus the first one.

 libempathy-gtk/empathy-account-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d7e43c8e57ef7e164b77823983acb16bb2026672
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri Nov 13 16:15:17 2009 +0100

    Respect indentation style.

 libempathy-gtk/empathy-chat.c | 28 ++++++++++++++--------------
 libempathy/empathy-tp-chat.c  | 32 +++++++++++++++++---------------
 libempathy/empathy-tp-chat.h  | 16 ++++++++--------
 3 files changed, 39 insertions(+), 37 deletions(-)

commit 77cd05e44a390273974fbb53266b0173a9ac7368
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 11 15:16:29 2009 +0000

    empathy-chat: watch for password-needed property changes

    This is needed when we are invited to a protected room. The channel is
    created without the password requiered flag and then is updated
    once we
    accept the invitation.

 libempathy-gtk/empathy-chat.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

commit 279e787b1634fdd3269cb28f0562b9bcca79e496
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 11 15:15:39 2009 +0000

    tp-chat: update the 'password-needed' property when password flags
    changes

 libempathy/empathy-tp-chat.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

commit 1b95421ff7aff636a202763d996fd247d3b73ee3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 11 15:13:33 2009 +0000

    empathy-tp-chat: add 'password-needed' property

 libempathy/empathy-tp-chat.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 39c7d6c0773722c2af928a0faad15c4341336a5b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 11 14:24:43 2009 +0000

    ask for password when joining a protected room (#579341)

 libempathy-gtk/empathy-chat.c | 152
 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 152 insertions(+)

commit fe838cf55249bf53c3f42098feb55edd5318bf34
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 11 13:26:33 2009 +0000

    add empathy_tp_chat_provide_password_{async,finish}

 libempathy/empathy-tp-chat.c | 54
 ++++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-tp-chat.h |  9 ++++++++
 2 files changed, 63 insertions(+)

commit a6a3c811cbd2bdd64f6d49702bf1ad2f2fdf027c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 11 12:15:51 2009 +0000

    tp_chat_check_if_ready: deal with password protected room

    The TpChat is not ready if we are fetching the password flags.
    But once it's fetched, the chat is ready if it's protected as we won't
    be able to get the members of the room.

 libempathy/empathy-tp-chat.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

commit dd2c190bbbdbeec07e3923eb9d99af7d0e84b055
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 11 12:07:39 2009 +0000

    tp-chat: add API to check if a password is required

 libempathy/empathy-tp-chat.c | 36 ++++++++++++++++++++++++++++++++++++
 libempathy/empathy-tp-chat.h |  2 ++
 2 files changed, 38 insertions(+)

commit 07e4c25c4a39705b7b6ecaaac6c8e001d611a713
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 11 11:58:55 2009 +0000

    tp_chat_check_if_ready: split the test checking if the TpChat is ready

 libempathy/empathy-tp-chat.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit 04840e3d006887d8c3909a8397b982a8b68d5252
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 11 11:48:13 2009 +0000

    empathy-chat: don't grab focus on the input entry is it's insensitive

 libempathy-gtk/empathy-chat.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 223e02f1160189dc76b91a38ca3cb10085688b73
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 10 17:40:37 2009 +0000

    chat-ui: add info_bar_vbox on the top of the widget

    This VBox will be used to display info bars.

 libempathy-gtk/empathy-chat.ui | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

commit ef9f82c085a018e3959800ad010f47da62d9b364
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 13 14:31:34 2009 +0000

    accounts-dialog: wait that account is prepared before calling
    accounts_dialog_add_account

    This ensure that EmpathyAccountSettings has been updated and so
    we don't
    add a new row in the model for this account (#601796).

 src/empathy-accounts-dialog.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

commit 9355fec8db2944c7d32a0e0ba3e1632d8088c88e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 13 11:34:57 2009 +0000

    change 'capa' to 'cap'

 libempathy-gtk/empathy-notify-manager.c | 10 ++++-----
 libempathy-gtk/empathy-notify-manager.h | 36
 ++++++++++++++++-----------------
 src/empathy-status-icon.c		 |  2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)

commit ba1efb5e0580e0c11da14eae4b85b1e9913bb6bf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 13 11:03:29 2009 +0000

    remove old comment

 src/empathy-status-icon.c | 1 -
 1 file changed, 1 deletion(-)

commit ba58113720953da388390515cca8f83cbd4440ef
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 13 11:02:58 2009 +0000

    empathy_notify_manager_init: no need to cast the return value of
    g_object_new

 libempathy-gtk/empathy-notify-manager.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit b176e4b26a65bcc92b9e38b0ef1ce1ecc6229749
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 13 11:02:14 2009 +0000

    remove notify_manager_dispose as it doesn't do anything

 libempathy-gtk/empathy-notify-manager.c | 16 ----------------
 1 file changed, 16 deletions(-)

commit 2585245b3a13d640ac9988e7ecff2039ad9275c6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 13 11:01:14 2009 +0000

    notify-manager: fetch capabilities in _init instead of _constructor

 libempathy-gtk/empathy-notify-manager.c | 29
 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

commit e5b71631aacf92ba8d242e0a3e3763555b8c751c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 12 13:25:23 2009 +0000

    change empathy_notification_is_enabled to
    empathy_notify_manager_notification_is_enabled

    Making it a method of EmpathyNotifyManager would allow us to cache the
    gconf values if we want to.

 libempathy-gtk/empathy-notify-manager.c | 2 +-
 libempathy-gtk/empathy-notify-manager.h | 3 ++-
 src/empathy-chat-window.c		 | 2 +-
 src/empathy-status-icon.c		 | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

commit ab3c9ccb3c468f03ddc790bb2e5a84845684bfc5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 12 12:53:57 2009 +0000

    change empathy_misc_get_pixbuf_for_notification to
    empathy_notify_manager_get_pixbuf_for_notification

    Making this function a method of EmpathyNotifyManager would allow
    us to
    tweak the size of the icon depending on the notifications server as
    suggested in bug 588054.

 libempathy-gtk/empathy-notify-manager.c | 3 ++-
 libempathy-gtk/empathy-notify-manager.h | 6 ++++--
 src/empathy-chat-window.c		 | 7 ++++++-
 src/empathy-status-icon.c		 | 3 ++-
 4 files changed, 14 insertions(+), 5 deletions(-)

commit 31ffe0cd7670a9c31402443587dbe7d12f8561e0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 12 12:46:42 2009 +0000

    move empathy-misc to empathy-notify-manager

    All its code was related to notifications.

 libempathy-gtk/empathy-notify-manager.c | 44 +++++++++++++++++++
 libempathy-gtk/empathy-notify-manager.h | 14 ++++++
 src/Makefile.am			 |  1 -
 src/empathy-chat-window.c		 |  2 +-
 src/empathy-misc.c			 | 77
 ---------------------------------
 src/empathy-misc.h			 | 49 ---------------------
 src/empathy-status-icon.c		 |  1 -
 7 files changed, 59 insertions(+), 129 deletions(-)

commit b5b5db79ae1c2fef783c415fbf577e8dc34e6b5d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 12 12:32:55 2009 +0000

    define constants for notify capabilities

 libempathy-gtk/empathy-notify-manager.h | 19 +++++++++++++++++++
 src/empathy-status-icon.c		 |  3 ++-
 2 files changed, 21 insertions(+), 1 deletion(-)

commit 9237fdc11b953a9201f9123789517b2d11c3bf34
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 12 12:20:12 2009 +0000

    status-icon: use EmpathyNotifyManager to check if the server supports
    the 'actions' capa

 src/empathy-status-icon.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

commit 73729806f2214306477756690ebbf8469d4ffe17
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 12 12:14:16 2009 +0000

    add empathy_notify_manager_has_capability

 libempathy-gtk/empathy-notify-manager.c | 9 +++++++++
 libempathy-gtk/empathy-notify-manager.h | 3 +++
 2 files changed, 12 insertions(+)

commit f349f9df875a373dd4070a1e7f5d5a81cc02b230
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 12 12:11:55 2009 +0000

    notify-manager: fetch capabilities of the notification server

 libempathy-gtk/empathy-notify-manager.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

commit 4c0ea57b6d3a4c77a27326c83ebaaffec194dd18
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 12 12:05:14 2009 +0000

    add stub EmpathyNotifyManager (#601691)

 libempathy-gtk/Makefile.am		 |   2 +
 libempathy-gtk/empathy-notify-manager.c | 112
 ++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-notify-manager.h |  56 ++++++++++++++++
 3 files changed, 170 insertions(+)

commit e02025bf48c753213d2a5af7cc2c38823f2d13dc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 13 11:30:25 2009 +0000

    src/Makefile.am: sort files

 src/Makefile.am | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 839f4703a9c01289cc986c1c9d7206300f858493
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 13 11:30:16 2009 +0000

    libempathy-gtk/Makefile.am: sort files

 libempathy-gtk/Makefile.am | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

commit 762166d52a3ca78bfbf0c6485cbe0f987c59c170
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 13 11:30:09 2009 +0000

    libempathy/Makefile.am: sort files

 libempathy/Makefile.am | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

commit 8135adab4b538a6aa70f49652806f2eabaeb94d6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 12 16:01:00 2009 +0000

    remove --enable-gtk-doc from DISTCHECK_CONFIGURE_FLAGS as we drop
    gtk-doc

 Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit eac0b572a73559e88be8da3d62f15cf26d3bb1e1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 12 17:19:51 2009 +0000

    account-assistant: set default display name to newly created accounts
    (#600705)

 src/empathy-account-assistant.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 2969485fc42fed028d1e8506534469b97cd5a283
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 12 17:15:51 2009 +0000

    empathy_account_widget_get_default_display_name: special case should
    be done in specialized widgets

    This requiers to refactor widget to actually inherit from
    EmpathyAccountWidget.

 libempathy-gtk/empathy-account-widget.c | 1 +
 1 file changed, 1 insertion(+)

commit 07cb259462d9958e65d2f94aef6e5728e83ccf29
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 12 17:13:21 2009 +0000

    move code generating the default display name of new account to
    account-widget

    This will allow us to:
    - Use this function from other places, like in the assistant.
    - Delegate special cases to the specialized versions of the widget.

 libempathy-gtk/empathy-account-widget.c | 52
 ++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-account-widget.h |  3 ++
 src/empathy-accounts-dialog.c		 | 53
 ++-------------------------------
 3 files changed, 57 insertions(+), 51 deletions(-)

commit 801db029900423dd230edfda4731205c3c2a91a3
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Fri Nov 13 10:21:48 2009 +0100

    Updated Slovenian translation

 po/sl.po | 255
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 137 insertions(+), 118 deletions(-)

commit b74721f9d85a253e1a6279b1ad7a7ecfef919aa7
Author: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Date:	Thu Nov 12 15:00:12 2009 -0200

    Call g_object_unref instead of gtk_rc_style_unref

 src/empathy-main-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6642c2d63dcb8e99e0c094e3d3fb93237a67b752
Author: vasudeven <agnihot3@gmail.com>
Date:	Thu Nov 12 21:16:49 2009 +0530

    Added Tamil translation

 po/ta.po | 644
 ++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 390 insertions(+), 254 deletions(-)

commit 11a5ae372e20e9f053a4a9a46895c36b9f4e075b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 12 15:27:34 2009 +0000

    empathy-call-window: display_error: simplify showing of the widgets

 src/empathy-call-window.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 49d4f11079e86ef8e17922bf32f19def10088df7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 12 15:24:33 2009 +0000

    empathy-call-window: display_error: align the main message on
    the right

 src/empathy-call-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 7220c2cc93f1e0bb09bf9b27ef3e4e91c37b39b1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 12 15:23:36 2009 +0000

    empathy-call-window: display_error: put the image and vbox in a hbox

    That way the image doesn't expand and stay on the right.

 src/empathy-call-window.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

commit 245e0dec111026b6f68e1ef5731a0c57e72d4248
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 12 14:49:24 2009 +0000

    empathy-call-window: display_error: wrap the translated error msg
    as well

 src/empathy-call-window.c | 1 +
 1 file changed, 1 insertion(+)

commit 8907e9a0664b82148c1ecae6fdeed0cdd6c91140
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Thu Aug 20 16:02:40 2009 -0400

    Make location labels selectable

 libempathy-gtk/empathy-contact-widget.c | 3 +++
 1 file changed, 3 insertions(+)

commit efb9104e6c9ea50eea6ee4a820f1ab20c574200d
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Thu Aug 20 15:54:34 2009 -0400

    Add missing location field in ordering

 libempathy-gtk/empathy-contact-widget.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit d5070182fd31bf85a4129e8f3b8677c3af78772b
Author: Frederic Peters <fpeters@0d.be>
Date:	Thu Aug 20 15:54:02 2009 -0400

    Order location fields

 libempathy-gtk/empathy-contact-widget.c | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

commit 1020f57c4a8ea74b7738b6a8e20d299cdd65115d
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Thu Nov 12 10:58:34 2009 +0000

    Force an unset presence type to appear as offline in the presence
    chooser and status icon.

    An unset presence type *does* make sense, but not in these
    contexts. As an aside, there is no icon for an unset presence, so
    nothing is displayed, which is bad.

    Fixes bug #597819

 libempathy-gtk/empathy-presence-chooser.c | 6 ++++++
 src/empathy-status-icon.c		   | 7 +++++++
 2 files changed, 13 insertions(+)

commit 4950a9c2e79b6c92510c738283a2b40c936570d6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 11 15:58:37 2009 +0000

    empathy-tp-contact-factory: ensure that
    empathy_tp_contact_factory_get_from_handle always return an error
    if the contact hasn't been created

 libempathy/empathy-tp-contact-factory.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

commit 3a1d17fbbf289577c8849d6c087f864907e99a1a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 11 16:20:01 2009 +0000

    empathy_dispatch_operation_dispose: fix crash when disconnecting
    the ready signal

    We were trying to disconnect the wrong signal and it should be
    disconnected before unrefing channel_wrapper.

 libempathy/empathy-dispatch-operation.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

commit e22569b44b12df70532e12997fc15d3c2b507f79
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Tue Nov 10 21:04:49 2009 +0100

    Updated Spanish translation

 po/es.po | 129
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 71 insertions(+), 58 deletions(-)

commit b51918d47bda93b4c4cbbc6763f64bd1fdf7e5f0
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Nov 10 14:04:18 2009 +0100

    use new tpAccount api

 src/empathy-main-window.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit c408acfee13af60ac62f3f2d51b35c3fc6a9f128
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Nov 10 13:40:48 2009 +0100

    added tooltips to buttons

 src/empathy-main-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit 9d4730f96d07c5f320640e8a5fc74a1b248c0902
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Nov 10 11:45:43 2009 +0100

    ui change: added 3 buttons to infobar

    the current ui shows 3 buttons next to the error message: retry,
    edit, close

 src/empathy-main-window.c | 110
 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 97 insertions(+), 13 deletions(-)

commit 8beb22ec2d4977bc1fc45260840188fdd793f0aa
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Nov 10 09:58:30 2009 +0100

    two line message

    the message is now two lined, one line for the accountname and one
    for the error

 src/empathy-main-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 53ef8f9b779e5f97f71c6fead1078c7bd4961637
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Nov 10 09:54:14 2009 +0100

    removed double code

    removed one of two identical lines of code

 src/empathy-main-window.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit 1cccce497a62d381c69a20c116739d39b93eeea3
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Fri Oct 30 15:26:21 2009 +0100

    make the infobar smaller

 src/empathy-main-window.c | 1 -
 1 file changed, 1 deletion(-)

commit 815f0ae2dc1aef40831a83e9ce758b5015a28fc2
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Fri Oct 30 15:15:42 2009 +0100

    use only one button in error-infobar

 src/empathy-main-window.c | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

commit a8a0b7d81176d5d151149df7be45b168a00b3fd5
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Fri Oct 30 10:18:23 2009 +0100

    use smaller account icons for error message

 src/empathy-main-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a86078b935d07e5a741159e015c615149855e5a1
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Fri Oct 30 10:17:35 2009 +0100

    use one lined error notifications

 src/empathy-main-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 64886f0504b7dd883cb1f1566df78fdf17306033
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Thu Oct 29 11:33:18 2009 +0100

    use gtk_box_pack_start

    instead of gtk_container_add we should use gtk_box_pack_start

 src/empathy-main-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit bb3eb6c8c7dbe59445f40d14de67889781adb015
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Thu Oct 29 11:30:04 2009 +0100

    use account icon instead of warning sign

    the infobar should use the account icon and not a generic warning sign

 src/empathy-main-window.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 3e7a401084b4dced0bb3b16fae4b38fd54c455b7
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Thu Oct 29 10:23:36 2009 +0100

    added set message type to infobar

 src/empathy-main-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 863ca0ae5fcebf39d2fc8a5d051642720731fcba
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Thu Oct 29 10:05:34 2009 +0100

    refactoring

    refactoring some names and calls

 src/empathy-main-window.c | 46
 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

commit cb72a333828e186384cc82ac3774deee9bd5f358
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Thu Oct 29 09:55:31 2009 +0100

    bumped gtk-dep version to 2.18.0

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 152f79da724481c6e0ea203bb1c048d3bc7ab1a7
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Thu Oct 29 09:50:21 2009 +0100

    changed variable name

    changed child into info_bar

 src/empathy-main-window.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

commit 94b2ac2c22c580eb6df70349c6cbd793f361f885
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Thu Oct 29 09:46:49 2009 +0100

    removed trailing whitespaces

 src/empathy-main-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f18e8e83287ac7056e6960a97740542e173a64a8
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Oct 27 14:48:26 2009 +0100

    Added GtkInfobar and Retry button

    Susbstituted the table/vbox/hbox thing with a infobar when an account
    failes to connect.
    Added a button to retry a connection.

 src/empathy-main-window.c | 149
 +++++++++++++++-------------------------------
 1 file changed, 48 insertions(+), 101 deletions(-)

commit b8ad0668749e8f1da95ce8060aac26905d8a8782
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 10 14:06:05 2009 +0000

    empathy_accounts_dialog_show: check if priv->cms is not NULL before
    using it

    priv->cms is initalized in accounts_dialog_accounts_setup once the
    account manager is ready. So it's not garanteed to be set in
    empathy_accounts_dialog_show anymore.

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 79823a12c3ddd74cea17164db13e16a21dd81ab3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 10 13:39:02 2009 +0000

    set 'R' as accelerator for the preferences dialog

    'P' is already used for "Personnal Information. I looked in
    different
    GNOME applications and it seems the accelerator for the preferences
    dialog is not standarized.  (#601336)

 src/empathy-main-window.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3df77a02867b34fb2ecefd2df1e91362db552123
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 10 13:34:12 2009 +0000

    set 'C' as accelerator for the Contact menu as 'C' is already used
    by Conversation (#601336)

 src/empathy-chat-window.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4a8a45fd6495f06a8fef623192cf8674baca71cb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 9 14:14:04 2009 +0000

    accounts-dialog: set the ypad on the "Name" cell

    Some accounts don't have an icon so we shouldn't use the icon cell to
    set this padding (#601150).

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 27bf66610d8229978421fd9d0c0b0ddc7cded40f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Nov 10 08:20:54 2009 +1100

    Fix race where UI sensitivity was being set before the AM was ready

 src/empathy-main-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 920f6e2d9865b72baf76bff3ac26c6a26e260a03
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Nov 10 08:17:55 2009 +1100

    Warn if accessing connection status before AM is ready

 libempathy/empathy-utils.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 2ae61d037649fc6206b5aa47c9722e7ef24ffb02
Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:	Mon Nov 9 19:29:17 2009 +0200

    Updated Latvian translation.

 po/lv.po | 3039
 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 1998 insertions(+), 1041 deletions(-)

commit 7fecd09b8b4fab7a7c30ffd8121820dda847a78a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 9 17:07:00 2009 +0000

    empathy-tp-call: we are not sending or receiving video if the video
    stream doesn't exist

 libempathy/empathy-tp-call.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 513b764e2f6a6e26ff0046f2bbbecacfc3dec749
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 9 12:32:32 2009 +0000

    main-window: save the size of the window when destroyed

 src/empathy-main-window.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 6b1512f94a9d211a7bab9ae44f1fd67b94d8e92d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 9 12:24:32 2009 +0000

    empathy-ft-manager: save the size of the window when disposing

 src/empathy-ft-manager.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 9280234db0c507bcaee37841fa2f129ccfa87b0b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 9 12:20:51 2009 +0000

    chat-window: save the size of the window when disposing

    The size wasn't saved when the window was closed before the timeout
    was
    fired (#601190).

 src/empathy-chat-window.c | 1 +
 1 file changed, 1 insertion(+)

commit cb117f3038211d0ca8fe416c77fe47b588d8304f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 4 18:49:15 2009 +0000

    TpContactFactory: wait that the connection is ready before using it

 libempathy/empathy-tp-contact-factory.c | 48
 ++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 13 deletions(-)

commit d2d8c7d06ac924b2b4113b46cda916bbf2fb7b98
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 4 18:47:17 2009 +0000

    dispatcher_init_connection_if_needed: wait that the connection is
    ready before using it (#600713)

 libempathy/empathy-dispatcher.c | 43
 ++++++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 11 deletions(-)

commit 6aafcb1c58ef0f8a5407cce2820d8bc30effc5b7
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Nov 9 21:46:38 2009 +1100

    Don't leak references to dup'ed objects

 src/empathy.c | 3 +++
 1 file changed, 3 insertions(+)

commit 4a2917a052f26751f18df7865a444c001555826b
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Nov 9 20:38:32 2009 +1100

    Move the call to empathy_idle_get_state() to once the AM is ready

    Removes a race where the presence gets wiped because we check whether
    to go
    online before our connection to the AccountManager is ready.

 src/empathy.c | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

commit a74847a856efacde2142507fde3f7278e04a2f7c
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Nov 9 20:21:00 2009 +1100

    [EmpathyIdle] track whether the AccountManager is ready, warn if it
    is not

 libempathy/empathy-idle.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit 43f1111b8d907d5b5b2ab2dc665f896055483138
Author: Thomas Thurman <tthurman@Dorothy.plexq.com>
Date:	Sat Nov 7 18:31:27 2009 +0000

    Shavian translation

 po/en@shaw.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 4a84e78ed798f0700eadebd066c0c9cc9115d6a9
Author: Thomas Thurman <tthurman@Dorothy.plexq.com>
Date:	Sat Nov 7 18:30:41 2009 +0000

    Shavian translation

 po/LINGUAS    |    1 +
 po/en@shaw.po | 2631
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 2632 insertions(+)

commit 543006c90b020c671a375a0fbb3e7bf48dde8faa
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sat Nov 7 12:21:15 2009 +0100

    Added Norwegian bokmål translation.

 po/nb.po | 729
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 403 insertions(+), 326 deletions(-)

commit 9f6f43ad9643118291f59db3705a1d9a3edf3442
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Fri Nov 6 21:50:58 2009 +0100

    Updated Spanish translation

 po/es.po | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

commit 72bf0c495eae881203eaa15ce839a77ce9034968
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Fri Nov 6 21:35:17 2009 +0100

    Updated Italian translation

 po/it.po | 10 ----------
 1 file changed, 10 deletions(-)

commit e2c78e7f0f11378774c4afe40fc796ccdbc32634
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Fri Nov 6 21:35:17 2009 +0100

    Updated Italian translation

 po/it.po | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

commit 39401a49473e8e202d91b9d43ea6ccbb9fca101c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Nov 6 16:26:44 2009 +0000

    Disable codecs not meant for general purpose conferencing

 data/codec-preferences | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 872a7cc1b2a01c921817a77ad8c5d7b07189b8bc
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Fri Nov 6 16:11:51 2009 +0100

    Updated Spanish translation

 po/es.po | 229
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 123 insertions(+), 106 deletions(-)

commit 5f2ad64b11e2c09682456141fdf5c851fb314f17
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 6 15:07:24 2009 +0000

    media_stream_error_to_txt: correct the error message if the error
    was an audio one

 src/empathy-call-window.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

commit 91dfb1ed94816eb894eaeeba639b8f26a9e5aaba
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 6 13:56:45 2009 +0000

    accounts-dialog: display the 'remove' icon only on the selected row

    This used to be a Moblin specific change but it makes sense for
    GNOME as
    well (#600962).

 src/empathy-accounts-dialog.c | 2 --
 1 file changed, 2 deletions(-)

commit 9ce289096e73d8310b0ec80287fe8d9047c93ef6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 6 13:54:49 2009 +0000

    accounts-dialog: set the 'ypad' of cells in the account treeview to 4

    It looks nicer this way.
    This used to be a Moblin specific change but it makes sense for
    GNOME as
    well (#600962).

 src/empathy-accounts-dialog.c | 2 --
 1 file changed, 2 deletions(-)

commit 97712b427cbef669192d1399718e22250b9bdcb2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 6 13:53:38 2009 +0000

    accounts-dialog: simplify the remove acount confirmation dialog

    This used to be a Moblin specific change but it makes sense for
    GNOME as
    well (#600962).

 src/empathy-accounts-dialog.c | 15 ---------------
 1 file changed, 15 deletions(-)

commit cc66599afc20a641f264565593de4075eb86810b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 6 13:51:59 2009 +0000

    account-widget: Change the label of the Connect button to 'Login'.

    This used to be a Moblin specific change but it makes sense for
    GNOME as
    well (#600962).

 libempathy-gtk/empathy-account-widget.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

commit 6d6b41a31fb589cfa6b176c8935771c341099934
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 6 13:11:06 2009 +0000

    rephrase the TP_MEDIA_STREAM_ERROR_CODEC_NEGOTIATION_FAILED message

 src/empathy-call-window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 66155c621416a455adfbc9c548f71c6c00820554
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Fri Nov 6 14:45:43 2009 +0100

    Updated Slovenian translation

 po/sl.po | 446
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 260 insertions(+), 186 deletions(-)

commit 087e9a69efcec032b6ba181a3f03f1d9bd03cf28
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Nov 6 13:35:31 2009 +0000

    nautilus-sendto: don't dup the account manager; it's not needed
    (closes bug #600961)

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 nautilus-sendto-plugin/empathy-nautilus-sendto.c | 36
 ------------------------
 1 file changed, 36 deletions(-)

commit e6e01ab41d84a9b8a8e415cc3705f6d64b9344c1
Author: Pascal Terjan <pterjan@linuxfr.org>
Date:	Fri Nov 6 13:08:40 2009 +0000

    Fix --enable-nautilus-sendto

 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 26a92d6afa86dd70736863352682889d720587d5
Author: Pascal Terjan <pterjan@linuxfr.org>
Date:	Thu Nov 5 17:38:13 2009 +0000

    debug-window: format timestamp in a readable way

    Signed-off-by: Pascal Terjan <pterjan@linuxfr.org>

 src/empathy-debug-window.c | 67
 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 59 insertions(+), 8 deletions(-)

commit 7fb2dbc92e83fb1054e733c5007a6c774ece5f29
Author: Ryan LaBelle <traxdagamer@gmail.com>
Date:	Thu Nov 5 14:19:15 2009 -0500

    Better reorganization of chat_window_update (#600732)

 src/empathy-chat-window.c | 100
 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 76 insertions(+), 24 deletions(-)

commit 7a89f0e836e77d50b63cbf7aee35b1f3dc0a3e34
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 5 14:58:05 2009 +0000

    empathy-call-window: add a friendly message for
    TP_MEDIA_STREAM_ERROR_CONNECTION_FAILED (#575763)

 src/empathy-call-window.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 1b75b0f65fad1a388a59d4562c3700b7ac1ebc98
Author: Reşat SABIQ <tilde.birlik@gmail.com>
Date:	Fri Nov 6 01:59:09 2009 -0600

    Updated Crimean Tatar (Crimean Turkish) translation

 po/crh.po | 89
 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 75 insertions(+), 14 deletions(-)

commit 0f4640b918b8b1c4f6ba54a605be361f59f6ef90
Author: Reşat SABIQ <tilde.birlik@gmail.com>
Date:	Fri Nov 6 01:48:30 2009 -0600

    Added Crimean Tatar (Crimean Turkish) translation

 po/LINGUAS |	 1 +
 po/crh.po  | 2912
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 2913 insertions(+)

commit c5dc13e2fd6126415d01e6035d74bf8cf2cb3792
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 5 14:27:40 2009 +0000

    use 'Technical Details' as title of the expander

 src/empathy-call-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f01e82a81513ca159ed4e806deb80c4baaf88d07
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 5 14:27:05 2009 +0000

    pass NULL to gtk_label_new when creating an empty label

 src/empathy-call-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e88cfe1ffae499dac6fc2b19a7485c839e887b03
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 5 14:02:36 2009 +0000

    Display the error message in a expander

    This message is not localised but can contain useful informations.

 src/empathy-call-window.c | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

commit cfa3f7aa8cc30c3a0056e2185e99a928460be568
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 5 12:41:13 2009 +0000

    use the error message if we don't have a nice description

 src/empathy-call-window.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

commit 20777152d7bfeca11a1477e4b472e3a3606c9de9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 5 12:38:28 2009 +0000

    factor out empathy_call_window_stream_error

 src/empathy-call-window.c | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

commit ada2797e29180cea03fbb5c2a7d6c74d022b14c2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 5 12:32:20 2009 +0000

    fix typo in comment

 src/empathy-call-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a410ade02281b10da83840f2782071935130ba3f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 5 12:31:39 2009 +0000

    call_handler_notify_tp_call_cb: return if call is NULL

 src/empathy-call-window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 512fe980bc5c90b54d37ae1ecf85cdf4dc0c787e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 5 10:49:26 2009 +0000

    empathy-call-window: fix phrasing of the codec negotation failed
    msg and mark it as translatable

 src/empathy-call-window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit a01a1fdaa1c642739af034faf1d107bebacf7f14
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 4 16:39:40 2009 +0000

    empathy-call-window: display an error message when codec negotiation
    failed (#581789)

 src/empathy-call-window.c | 136
 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 136 insertions(+)

commit 434fbe68174c188d9f3b4994147656a8c2d5f40d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 4 14:37:33 2009 +0000

    empathy-call-window: add a VBox to display errors

 src/empathy-call-window.ui | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

commit 784b5b8dae5d2844c65c4fc6904dbd421a34c2e0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 4 19:34:01 2009 +0000

    empathy_call_handler_request_cb: notify when the tp-call property
    is set

 libempathy/empathy-call-handler.c | 1 +
 1 file changed, 1 insertion(+)

commit 812c19a6c3c96b089cfe5be40d6fbd09e8b3e013
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 4 14:39:01 2009 +0000

    TpCall: add {audio,video}-stream-error signals

 libempathy/empathy-tp-call.c | 58
 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

commit 424ded372a1884c12d9dce47199be00b3de531e4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 5 12:08:18 2009 +0000

    ensure that the "Previous Conversations" menu entry stays sensitive
    if there are valid accounts

    We have to wait until the account manager is ready before checking
    if there are valid accounts (#600798).

 src/empathy-main-window.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 85e5ade1f6c54dfac5d45011c299e49bf21a1bdb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Nov 5 11:26:22 2009 +0000

    contact-menu: rename "View Previous Conversations" menu entry to
    "Previous Conversations"

    This label was too long and looked weird comparing of the other
    entries
    of this menu. Futhermore, the same entry in the "View" menu is called
    "Previous Conversations".

 libempathy-gtk/empathy-contact-menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 489c8957f4edc936eb9ee1bf31cd14220959c2d8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 4 16:59:31 2009 +0000

    Empathy should link on Farsight2

    Empathy uses some Farsight2 API but doesn't explicitely link on it
    (#600671).

 configure.ac | 1 +
 1 file changed, 1 insertion(+)

commit 583adbaf8dd535855e3f0ceb05234c38f9c6564b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 4 11:53:06 2009 +0000

    debug window shouldn't be transient

 src/empathy-debug-window.c | 2 +-
 src/empathy-main-window.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 4c0bd51ff00d5e1c2a93f7c617a246cd63cd9f14
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 3 17:07:14 2009 +0000

    debug-window: debug level names shouldn't be translated

    They are meant to be used by developpers, not users.

 src/empathy-debug-window.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 816751a458d19c3e80eb0b16d09c48ea9fd1e0e8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Nov 4 11:27:01 2009 +0000

    empathy-chat-window: always display the title of the current tab

    This is more coherent as the web browsers do the same. Thanks to Ryan
    LaBelle for his help. (#600473)

 src/empathy-chat-window.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

commit 8c1094bd3c37fa787ebd4800f88a821f7b59df18
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Tue Nov 3 20:47:18 2009 +0100

    Updated Spanish translation

 po/es.po | 496
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 282 insertions(+), 214 deletions(-)

commit 666672b3fcba8d463f0c12aebbbbf98e29aaedca
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Tue Nov 3 19:56:15 2009 +0100

    Fix an error

 po/hu.po | 486
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 255 insertions(+), 231 deletions(-)

commit 941457df386b447ba7ecfb928f1184c6c8eb25d3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 3 16:41:25 2009 +0000

    empathy-dispatch-operation: ensure that the operation stays alive
    while tp_channel_call_when_ready is running

 libempathy/empathy-dispatch-operation.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

commit 33a2f0c2162dfd7ba4e3b77f579c43d5eeb5c8bd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 3 16:33:50 2009 +0000

    empathy-dispatch-operation: ensure that the operation stays alive
    while tp_connection_call_when_ready is running (#600551)

 libempathy/empathy-dispatch-operation.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 937c7947b3ae29cfafc3b6f3f07cf201edfea26c
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 3 17:37:37 2009 +0100

    Print "Unknown command" when typing "/help unknown"

 libempathy-gtk/empathy-chat.c | 3 +++
 1 file changed, 3 insertions(+)

commit 03d787f23201acdd662ad24a42c12695e07c4165
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 3 17:31:12 2009 +0100

    Make parsing of commend with no args work again

 libempathy-gtk/empathy-chat.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 22c06bcfd832f65fe2de6e44657e22decf2f523d
Merge: 2fdf428 e31c0e3
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 3 17:15:50 2009 +0100

    Merge branch 'irc-command'

commit e31c0e3f3b9a12dcf280a1ec05fc58463a020d71
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 3 17:11:07 2009 +0100

    Optimisation: Remove of the duplicated check for the command prefix.

 libempathy-gtk/empathy-chat.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit 59e8855f553fdcd3d23d3f0788ec6628192f0892
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 3 17:10:06 2009 +0100

    Make clear that for(foo); does nothing.

 libempathy-gtk/empathy-chat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 2fdf42815677e4e7f41a73f77997af87d5ae5eb2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 3 15:15:08 2009 +0000

    get_default_display_name: use the real protocol name to check if
    it's IRC or not

 src/empathy-accounts-dialog.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit f66a2306e3b29591cc4fce485afbc12f3221e459
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 3 14:38:08 2009 +0000

    new-chatroom-dialog: swap the position of the 'Room' and 'Server'
    entries.

    The 'Server' entry is optionnal and it looks weird to display it first
    (#597678).

 src/empathy-new-chatroom-dialog.ui | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit 219e27e8fb0dd0be1514af3d30b35d95472245ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 2 17:23:25 2009 +0000

    empathy_account_widget_contains_pending_changes: return TRUE if we
    are creating a new account which is not created yet

 libempathy-gtk/empathy-account-widget.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 24a3d8e3e4cee7272cc26d17ca3bdb8029581304
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 2 17:08:27 2009 +0000

    Allow accounts_dialog_has_pending_change to return a NULL TpAccount

    That way we can warn user when he is about to lose his newly created
    account (#598550).

 src/empathy-accounts-dialog.c | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

commit f72e6ddce1c1fd2ac17e11b3fcd285d08ba787dd
Merge: 8b15780 ede64d4
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Nov 3 23:55:26 2009 +1100

    Merge branch 'fix-586098'

    Conflicts:
	libempathy-gtk/empathy-chat.c

commit 8b15780d062dfb9263a173ff486fd767f6d47d2c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 2 16:33:49 2009 +0000

    empathy-account-widget: update apply button when our state changes

 libempathy-gtk/empathy-account-widget.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

commit 51c871d17949a1366f09eb16e74aac0cae653086
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 2 16:33:15 2009 +0000

    empathy-account-widget: replace the 'Connect' buton by a 'Save' one when we are offline (#600427)

 libempathy-gtk/empathy-account-widget.c | 38
 +++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

commit 64e877879a95dda07645726acb0b4881e3280093
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Nov 3 12:40:03 2009 +0000

    Use call-{start,stop} icons in the incoming call dialog

 src/empathy-event-manager.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 6ae8ca560dad6a96e614e564543643e2afb56fa7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 29 16:36:42 2009 +0100

    remove check.mak

 rules/check.mak | 120
 --------------------------------------------------------
 1 file changed, 120 deletions(-)

commit d5c310f183d31c529f26d31ef79ac7e02662d4ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 29 16:21:05 2009 +0100

    No need to check for the 'check' framework any more

 Makefile.am  |  6 +-----
 configure.ac | 24 ------------------------
 2 files changed, 1 insertion(+), 29 deletions(-)

commit c0796c470597870b3b821aad1ea352d666153e83
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 29 16:04:12 2009 +0100

    rename check-irc-helper to test-irc-helper

 tests/Makefile.am			  |  6 +--
 tests/check-irc-helper.c		  | 80
 --------------------------------
 tests/check-irc-helper.h		  | 24 ----------
 tests/empathy-irc-network-manager-test.c |  2 +-
 tests/empathy-irc-network-test.c	  |  2 +-
 tests/empathy-irc-server-test.c	  |  2 +-
 tests/test-irc-helper.c		  | 80
 ++++++++++++++++++++++++++++++++
 tests/test-irc-helper.h		  | 24 ++++++++++
 8 files changed, 110 insertions(+), 110 deletions(-)

commit d948dd18d07e799223057134557312885d0cad42
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 29 16:01:44 2009 +0100

    merge check-empathy-helpers to test-helper

 tests/Makefile.am			  |   3 +-
 tests/check-empathy-helpers.c		  | 169
 -------------------------------
 tests/check-empathy-helpers.h		  |  32 ------
 tests/empathy-chatroom-test.c		  |   1 -
 tests/empathy-irc-network-manager-test.c |   1 -
 tests/test-helper.c			  | 159
 +++++++++++++++++++++++++++++
 tests/test-helper.h			  |  28 +++++
 7 files changed, 188 insertions(+), 205 deletions(-)

commit b3e65f73b24b69f3c6acd0dd662393259e13fc2d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 29 15:51:27 2009 +0100

    remove check-*

 tests/.gitignore	       |  1 -
 tests/Makefile.am	       | 30 +------------------
 tests/check-empathy-helpers.c |  1 -
 tests/check-helpers.c	       | 67
 -------------------------------------------
 tests/check-helpers.h	       | 43 ---------------------------
 tests/check-irc-helper.h      |  3 --
 tests/check-libempathy.h      |  5 ----
 tests/check-main.c	       | 40 --------------------------
 8 files changed, 1 insertion(+), 189 deletions(-)

commit fe119ac9b883091e0ed3e0b3cbbb64bca753baad
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 29 15:40:01 2009 +0100

    port check-empathy-chatroom-manager.c to GTest

    The tests have not been ported yet as they are currently
    disabled.

 tests/.gitignore			|   1 +
 tests/Makefile.am			|   9 +-
 tests/check-empathy-chatroom-manager.c | 402
 --------------------------------
 tests/check-libempathy.h		|   1 -
 tests/check-main.c			|   2 -
 tests/empathy-chatroom-manager-test.c	| 410
 +++++++++++++++++++++++++++++++++
 6 files changed, 417 insertions(+), 408 deletions(-)

commit f90aaa6e6f9dfa16dd3d6b6c526857f987862c99
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 29 15:31:23 2009 +0100

    port check-empathy-chatroom.c to GTest

    The tests have not been ported yet as they are currently
    disabled.

 tests/.gitignore		|   1 +
 tests/Makefile.am		|   7 +-
 tests/check-empathy-chatroom.c | 159
 ---------------------------------------
 tests/check-libempathy.h	|   1 -
 tests/check-main.c		|   1 -
 tests/empathy-chatroom-test.c	| 165
 +++++++++++++++++++++++++++++++++++++++++
 6 files changed, 171 insertions(+), 163 deletions(-)

commit 3b0ccc3b5889e511190924a1f5f8df85de61e2bd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 29 10:27:49 2009 +0100

    port check-empathy-irc-network-manager.c to GTest

 tests/.gitignore			   |   1 +
 tests/Makefile.am			   |   9 +-
 tests/check-empathy-helpers.c		   |   4 +-
 tests/check-empathy-irc-network-manager.c | 838
 -----------------------------
 tests/check-libempathy.h		   |   1 -
 tests/check-main.c			   |   1 -
 tests/empathy-irc-network-manager-test.c  | 851
 ++++++++++++++++++++++++++++++
 7 files changed, 861 insertions(+), 844 deletions(-)

commit d3d64970aca1fa3cf19632843b27b2a88b0e8acd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 27 16:18:10 2009 +0000

    port check-empathy-irc-network.c to GTest

 tests/.gitignore		   |   1 +
 tests/Makefile.am		   |   8 +-
 tests/check-empathy-irc-network.c | 240
 ------------------------------------
 tests/check-libempathy.h	   |   1 -
 tests/check-main.c		   |   1 -
 tests/empathy-irc-network-test.c  | 247
 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 254 insertions(+), 244 deletions(-)

commit 85268449651286df02e6da607abd98828fd68a6a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 27 16:10:41 2009 +0000

    port check-empathy-irc-server.c to GTest

 tests/.gitignore		  |  1 +
 tests/Makefile.am		  |  8 +++-
 tests/check-empathy-irc-server.c | 93
 --------------------------------------
 tests/check-irc-helper.c	  | 24 +++++-----
 tests/check-libempathy.h	  |  1 -
 tests/check-main.c		  |  1 -
 tests/empathy-irc-server-test.c  | 98
 ++++++++++++++++++++++++++++++++++++++++
 7 files changed, 117 insertions(+), 109 deletions(-)

commit 2a974fc78e833d232a6203d5a807b0ee5efb396a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 27 15:51:11 2009 +0000

    move test_init/test_deinit to test-helper.c

 tests/Makefile.am	    |  3 ++-
 tests/empathy-utils-test.c | 17 +----------------
 tests/test-helper.c	    | 19 +++++++++++++++++++
 tests/test-helper.h	    |  9 +++++++++
 4 files changed, 31 insertions(+), 17 deletions(-)

commit f053694701a9cb6c35fa0250c1a0b3374bd54395
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 27 15:44:59 2009 +0000

    port check-empathy-utils.c to GTest

 tests/.gitignore	     |	2 ++
 tests/Makefile.am	     | 25 ++++++++++++++++++++---
 tests/check-empathy-utils.c | 29 ---------------------------
 tests/check-libempathy.h    |	1 -
 tests/check-main.c	     |	1 -
 tests/empathy-utils-test.c  | 48
 +++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 72 insertions(+), 34 deletions(-)

commit a97016255a79a5b26af59411eab907d2881bc63e
Author: Justin Forest <justin.forest@gmail.com>
Date:	Mon Nov 2 17:54:01 2009 +0300

    Autocomplete for offline contacts. Closes bug #583919.

 libempathy-gtk/empathy-new-message-dialog.c | 32
 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 17 deletions(-)

commit d06aae89f84d7bee74815879047e049aa99f39d7
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Nov 3 12:09:57 2009 +0000

    account-chooser: allow for a non-prepared account manager (fixes
    bug #600537)

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-account-chooser.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 1529840ddfa801111b2292c99de75d7e32272324
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Nov 3 10:38:19 2009 +0000

    accounts-dialog: don't always select the first account automatically

    Sometimes it takes a while to get all account details, but getting the
    account names is fairly quick. What tends to happen is that the tree
    view of account names is populated immediately, but the account widget
    is just grey until all details are retrieved. This time is enough to
    select an account in the tree view for editing.

    However, previously, once all details are retrieved, the first account
    is automatically selected. This is of course sensible if the user has
    not selected an account, but it's pretty annoying if you've already
    selected your seventeenth jabber account and then it plonks you back
    to number one.

    This patch only selects the first account if there is not one already
    selected.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-accounts-dialog.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit 83edf41df3eb8a7925939756b4d6650700dbf75a
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Nov 3 13:59:23 2009 +1100

    Remove LIBPANELAPPLET entry from configure.ac

 configure.ac | 1 -
 1 file changed, 1 deletion(-)

commit 6100324f8be22975716366ae34fc9c7046e05bc2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Nov 2 16:16:51 2009 +0000

    empathy-accounts-dialog: account-validity-changed signal now has a
    'valid' argument (#600446)

 src/empathy-accounts-dialog.c | 1 +
 1 file changed, 1 insertion(+)

commit 8c4fe70aad3622138957c49732fa612b1e2e9eb7
Merge: 1b4acf8 b6bb173
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Mon Nov 2 10:41:20 2009 +0000

    Merge branch 'accountz'

commit 1b4acf8fcf47d928f525a4640f27323e13fd25ea
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Nov 1 21:22:08 2009 +0100

    Updated Italian translation of the help
     * Updated the screenshot

 help/it/figures/empathy-main-window.png |  Bin 9768 -> 10232 bytes
 help/it/it.po				 | 4963
 ++++++++++++++++++++++++-------
 2 files changed, 3945 insertions(+), 1018 deletions(-)

commit af69bde2866b6d219ae2f88bef748be2526c1604
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Nov 1 15:41:45 2009 +0100

    In case of unknown command, suggest /help

 libempathy-gtk/empathy-chat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 018af67a500b8bab6b8b374c32a887f399339834
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Oct 27 14:26:14 2009 +0100

    Move /me and /say support from EmpathyMessage to EmpathyChat.
    Also make commands not case sensitive and use g_ascii_isspace to
    detect spaces.

 libempathy-gtk/empathy-chat.c | 83
 +++++++++++++++++++++++++++++++++++--------
 libempathy/empathy-message.c  | 56 -----------------------------
 libempathy/empathy-message.h  |  1 -
 3 files changed, 69 insertions(+), 71 deletions(-)

commit a732461a6458478703b769b3ab5c6fb5d30c90a4
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Oct 27 13:22:41 2009 +0100

    Add support for /help command without arg, to list all available
    commands.
    Also improve a bit the support for optional args.

 libempathy-gtk/empathy-chat.c | 86
 +++++++++++++++++++++++--------------------
 1 file changed, 47 insertions(+), 39 deletions(-)

commit 894adf8d1f1763c6334c026fb46f7780a49405a3
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Oct 25 19:20:16 2009 +0100

    Add support for /help command and fix review comments

    https://bugzilla.gnome.org/show_bug.cgi?id=573407

 libempathy-gtk/empathy-chat.c | 256
 +++++++++++++++++++++++++++---------------
 1 file changed, 165 insertions(+), 91 deletions(-)

commit 104502ee87c5eb9de5accb96fb837f6c73f889f4
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Oct 11 21:49:47 2009 +0200

    Refactor chat commands.

    https://bugzilla.gnome.org/show_bug.cgi?id=573407

 libempathy-gtk/empathy-chat.c | 212
 +++++++++++++++++++++++++-----------------
 1 file changed, 127 insertions(+), 85 deletions(-)

commit 06f81e690da1a60ee385c9486bf59e221259fd1a
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Oct 11 15:25:52 2009 +0200

    Add support for /msg command

    https://bugzilla.gnome.org/show_bug.cgi?id=573407

 libempathy-gtk/empathy-chat.c | 76
 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 74 insertions(+), 2 deletions(-)

commit a24f350a5e3423913f3456ddf7d5f5c6d3ad3300
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sat Oct 10 09:57:10 2009 +0200

    Add support for /query command

    https://bugzilla.gnome.org/show_bug.cgi?id=573407

 libempathy-gtk/empathy-chat.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

commit d283411b3f1ba3685b329a7a41d59ae153bd15ba
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sat Oct 10 09:48:23 2009 +0200

    Add support for /join command

    https://bugzilla.gnome.org/show_bug.cgi?id=573407

 libempathy-gtk/empathy-chat.c | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

commit 940f9b60e27fe79d64357c651525cbf50a936567
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sat Oct 10 00:28:26 2009 +0200

    Fix topic not always shown, and add /topic command support.

    https://bugzilla.gnome.org/show_bug.cgi?id=573407

 libempathy-gtk/empathy-chat.c | 51 +++++++++++++++++++++++++++---
 libempathy/empathy-tp-chat.c  | 73
 +++++++++++++++++++++++++++++--------------
 libempathy/empathy-tp-chat.h  | 11 +++++++
 3 files changed, 108 insertions(+), 27 deletions(-)

commit ede64d4975a1fca4a562e4635dc43856610788ed
Author: Jerzy Mansarliński <manjur87@gmail.com>
Date:	Sat Oct 31 17:08:00 2009 +0100

    empathy-chat.c: input history - Using GList pointer instead of
    gint index.

 libempathy-gtk/empathy-chat.c | 192
 ++++++++++++++++++++++++------------------
 1 file changed, 109 insertions(+), 83 deletions(-)

commit b6bb173fe0840ec0857a145e265853e2a9083ee6
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Oct 30 11:34:28 2009 +0000

    Upped dependency on tp-glib

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6996bc2efb7643418baf090e9c158906724e2633
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Oct 30 10:51:18 2009 +0000

    contact-list-view: added note about waiting for manager to be come
    ready bug

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-contact-list-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 61dae5c0f483835085509792200f39da28ef38c1
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Oct 30 10:41:16 2009 +0000

    empathy: when creating salut account, be sure to wait for the
    account manager

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy.c | 51 +++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 14 deletions(-)

commit e6da8954b005318b6e438a9306374cf07bd54030
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Oct 30 10:31:48 2009 +0000

    log-store-empathy: refer to "make logs async" bug

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-log-store-empathy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 17fa8e8c29b51a350babb894aad6acab11bea0e5
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Oct 30 10:30:28 2009 +0000

    dispatcher: refer to EmpathyHandler bug

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-dispatcher.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1659a34e6b8cce932348b51c55db3ff33947f32f
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Oct 30 10:27:45 2009 +0000

    idle: added a comment to explain _is_just_connected

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-idle.c | 3 +++
 1 file changed, 3 insertions(+)

commit a44cb2b8c74dab9135448dfa04a45c624cb59611
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Oct 30 10:26:05 2009 +0000

    idle: don't hardcode 10 seconds as the "just connected" time

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-idle.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 0e5b0eca677e4aa60cebdaec8e289192b39b5017
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Oct 30 10:24:15 2009 +0000

    idle: add comment about the connect_times hash table types

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-idle.c | 2 ++
 1 file changed, 2 insertions(+)

commit d299fc2bd39cabadfd6a1753f8e22b1d029a6ed9
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Oct 30 10:22:12 2009 +0000

    idle: updated comment

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-idle.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 9447a3e1a68867e52ae22f22324dece3be70e8db
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Oct 30 10:15:35 2009 +0000

    utils: remove FIXME

    Although still true, the comment above the function will suffice and
    this can't really be changed without lots of making-async of other
    places in Empathy.

    I also don't think this is a problem in practice as everywhere in
    Empathy we use the account manager should have a _prepare called
    beforehand.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-utils.c | 2 --
 1 file changed, 2 deletions(-)

commit f2435188ed801faab430b40582e7dbd4cd8a0d56
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Oct 30 10:11:04 2009 +0000

    location-manager: keep a ref to self during preparation to make sure
    we stay alive

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-location-manager.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit d5f2776bacfe750f02782cef348e984ed68916af
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Oct 30 10:10:26 2009 +0000

    all: log error messages if preparing the account manager fails

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-account-chooser.c  |  8 +++++++-
 libempathy-gtk/empathy-chat.c		   |  5 ++++-
 libempathy-gtk/empathy-location-manager.c | 18 ++++++++++++++----
 libempathy-gtk/empathy-log-window.c	   |  5 ++++-
 libempathy-gtk/empathy-presence-chooser.c |  5 ++++-
 libempathy/empathy-account-settings.c	   | 18 ++++++++++++++----
 libempathy/empathy-chatroom-manager.c	   |  9 +++++++--
 libempathy/empathy-contact-manager.c	   |  5 ++++-
 libempathy/empathy-dispatcher.c	   |  9 +++++++--
 libempathy/empathy-idle.c		   |  5 ++++-
 src/empathy-accounts-dialog.c		   |  9 +++++++--
 src/empathy-import-widget.c		   |  9 +++++++--
 src/empathy-main-window.c		   |  5 ++++-
 src/empathy-status-icon.c		   |  5 ++++-
 src/empathy.c				   | 27
 +++++++++++++++++++++------
 15 files changed, 112 insertions(+), 30 deletions(-)

commit c415943206357644af15d4dfd3d8fa3f610ef3c8
Author: Jerzy Mansarliński <manjur87@gmail.com>
Date:	Thu Oct 29 23:44:14 2009 +0100

    Fix coding style

 libempathy-gtk/empathy-chat.c | 73
 ++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 36 deletions(-)

commit a1e67bd4feaab4ac44d9df618059f4b5fccfd447
Author: Jerzy Mansarliński <manjur87@gmail.com>
Date:	Fri Jul 31 22:38:06 2009 +0200

    Add terminal-like chat input history. Fixes bug #586098.

 libempathy-gtk/empathy-chat.c | 248
 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 211 insertions(+), 37 deletions(-)

commit e00d3a20de6603e927f4c977492052701cc0a988
Author: Rômulo Fernandes Machado <romulo@castorgroup.net>
Date:	Thu Oct 29 17:03:11 2009 +0100

    Fixes cycling tab bug in chat window (#589263)

 src/empathy-chat-window.c | 61
 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 49 insertions(+), 12 deletions(-)

commit c6494847b87a4fbd7d1409f5a7b717a125745466
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 29 14:56:51 2009 +0100

    empathy-accounts-dialog: do_constructor: always return a new reference

    This fix is cleaner than the previous commmit. The constructor now
    always returns a new reference to the caller. It also now has an extra
    reference that it will release once the dialog as been destroyed.

 src/empathy-accounts-dialog.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit e76ce986941f3f95b3d35b23b77a0434991975f4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 29 14:18:51 2009 +0100

    empathy-accounts-dialog: do_constructor: don't ref the dialog if it
    already exists (#600023)

    This breaks the concept of a constructor but the caller isn't supposed
    to unref it itself anyway (it's unreffed in
    accounts_dialog_destroy_cb).

 src/empathy-accounts-dialog.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 4363fe7a71208ee2d696211838f028ef97700b45
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 29 12:17:04 2009 +0100

    Escape the header of the notification (#599431)

 src/empathy-status-icon.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit 4c2eb652ef61dd0f5ccac27e47f261417793aa73
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 27 15:22:55 2009 +0000

    move test app needing user interaction to interactive/

    tests/ should be used only for automatic unit tests.

 configure.ac					    |  1 +
 tests/.gitignore				    |  8 --
 tests/Makefile.am				    | 25 +-----
 tests/contact-manager.c			    | 44 -----------
 tests/empetit.c				    | 88
 ----------------------
 tests/interactive/.gitignore			    |  8 ++
 tests/interactive/Makefile.am			    | 35 +++++++++
 tests/interactive/contact-manager.c		    | 44 +++++++++++
 tests/interactive/empetit.c			    | 88
 ++++++++++++++++++++++
 tests/interactive/test-empathy-account-assistant.c | 25 ++++++
 tests/interactive/test-empathy-presence-chooser.c  | 56 ++++++++++++++
 tests/interactive/test-empathy-protocol-chooser.c  | 31 ++++++++
 .../test-empathy-status-preset-dialog.c	    | 49 ++++++++++++
 tests/test-empathy-account-assistant.c		    | 25 ------
 tests/test-empathy-presence-chooser.c		    | 56 --------------
 tests/test-empathy-protocol-chooser.c		    | 31 --------
 tests/test-empathy-status-preset-dialog.c	    | 49 ------------
 17 files changed, 338 insertions(+), 325 deletions(-)

commit fb12577193262ad17ef2fc49d2324a7b23458610
Author: Rodolphe <rodolphe@damsy.net>
Date:	Tue Oct 27 10:42:22 2009 +0000

    Add new smileys available in the last Icon Naming Spec (#593327)

 libempathy-gtk/empathy-smiley-manager.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

commit 5dd0de4c39cb752c26b86b3415c20c6a6c2588a0
Merge: 546cd4d b251e6f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Oct 27 20:29:42 2009 +1100

    Merge branch 'mc5-debug'

commit 546cd4df21e3fe96e7d2bf4f18afa749804a8f47
Author: drtvasudevan <agnihot3@gmail.com>
Date:	Tue Oct 27 13:19:33 2009 +0530

    Updated Tamil translation

 po/ta.po | 285
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 135 insertions(+), 150 deletions(-)

commit b251e6fa7c1c90cabd7f03cf2e37bfa1ed3ffe63
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Tue Oct 27 16:39:51 2009 +1100

    Add MissionControl to the debug window

 src/empathy-debug-window.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 32a099f4cd44a8ac22c34dc0c6db1e0ad41ef5d6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 26 16:53:28 2009 +0000

    release.py: update last_tag_patern

 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 63e967acace88aab74b4b781758313ded94648bb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 26 16:52:31 2009 +0000

    start dev of 2.29.2

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 4b9ac33d7edfa5fd301519a07806ef61ea26e335
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 26 16:30:47 2009 +0000

    prepare 2.29.1 release

 NEWS	      | 128
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |   2 +-
 2 files changed, 129 insertions(+), 1 deletion(-)

commit 8bc370bcaf9d03ec49368b18f84e539e6b89e13b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 26 15:21:55 2009 +0000

    dispatcher_request_handles_cb: use request_data->dispatcher to get
    the self pointer

    We don't pass a weak pointer to tp_cli_connection_call_request_handles
    so we can't rely on it (#599612).

 libempathy/empathy-dispatcher.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cac9e049ba6a99b80aa1247cb33e1853b7bd7010
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 26 14:40:37 2009 +0000

    theme_adium_parse_body: escape text between links

 libempathy-gtk/empathy-theme-adium.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit b0bab86aebbb9cdf0935c9cb78244f6674c3a2da
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 26 14:03:58 2009 +0000

    theme_adium_parse_body: escape all the text if smileys are disabled
    (#599640)

 libempathy-gtk/empathy-theme-adium.c | 2 ++
 1 file changed, 2 insertions(+)

commit d5a8dbc1f792a965b4a4ec42ffab464465340293
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Oct 26 12:58:11 2009 +0000

    theme_adium_append_event: escape text

 libempathy-gtk/empathy-theme-adium.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 25db009b027a9c6ef1497924787a7eee3a0fbc69
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Mon Oct 26 14:42:49 2009 +0100

    Updated Slovenian translation

 po/sl.po | 472
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 237 insertions(+), 235 deletions(-)

commit be81b40879b405f5baff65c885cb564bdf2404ca
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Oct 25 17:54:49 2009 +0100

    Fix crash when joining a chat, GTK_WIDGET_VISIBLE is not NULL-safe

 src/empathy-chat-window.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 71e0ec07afa999e30a85439eb7103939d557edf5
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 19:14:51 2009 +0100

    check-empathy-irc-network-manager: fix shadow declarations

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 tests/check-empathy-irc-network-manager.c | 6 ------
 1 file changed, 6 deletions(-)

commit 12fcf479a49d90c34a203d1c93050fac762956f3
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 19:14:11 2009 +0100

    check-empathy-chatroom-manager: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 tests/check-empathy-chatroom-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 18010cbf53463aa968b99eb718916de094fbb532
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 19:06:55 2009 +0100

    tests: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 tests/check-empathy-helpers.c | 2 +-
 tests/check-empathy-helpers.h | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

commit aec12412098619da1301cfb445cc93a849d31c8c
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 19:06:38 2009 +0100

    po: removed empathy-account.c from POTFILES.in

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 po/POTFILES.in | 1 -
 1 file changed, 1 deletion(-)

commit 2bfbe483b3403238bfcbb5e1eefd265fa5783e05
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 18:52:57 2009 +0100

    contact-manager, dispatcher: renamed _new_connection_cb to
    _status_changed_cb

    https://bugzilla.gnome.org/show_bug.cgi?id=599169#c2

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-contact-manager.c | 6 +++---
 libempathy/empathy-dispatcher.c      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

commit c4fdd8511467729baed7df2db9b40d8eea16a38a
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 18:52:02 2009 +0100

    idle: use the TpAccount pointer as key to the hash table, and remove
    values on disconnect

    https://bugzilla.gnome.org/show_bug.cgi?id=599169#c2

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-idle.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

commit 3109ed5adee0f039b9010f23ae6cd84ef464a046
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 16:03:33 2009 +0100

    empathy: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy.c | 161
 +++++++++++++++++++++++++++-------------------------------
 1 file changed, 76 insertions(+), 85 deletions(-)

commit 2b7894262b4e647760477a9e8b6f8add5b321128
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 16:02:52 2009 +0100

    status-icon: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-status-icon.c | 57
 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 21 deletions(-)

commit b126bcf946e65de4e061d89481166fd6894ef44a
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 16:01:53 2009 +0100

    new-chatroom-dialog: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-new-chatroom-dialog.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit eb593876a497fec9d0c1fd182af5d15a29fc1194
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 16:01:33 2009 +0100

    main-window: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-main-window.c | 135
 +++++++++++++++++++++++++++++-----------------
 1 file changed, 87 insertions(+), 48 deletions(-)

commit 968589cc9a491fd60aeb46ba2eb8ac3f789e8b7a
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 16:01:06 2009 +0100

    import-widget: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-import-widget.c | 57
 ++++++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 27 deletions(-)

commit 24031b2130a2143f100588d1d62ea2d21326f664
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 16:00:34 2009 +0100

    import-mc4-accounts: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-import-mc4-accounts.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 94afc1026dce7dc92d12196cc61a320509080762
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 16:00:07 2009 +0100

    event-manager: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-event-manager.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

commit 8cf5bd07af7bcc53a115ff7cf7145c62b3d7dca6
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:59:37 2009 +0100

    chatrooms-window: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-chatrooms-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 395e69cf663ec73e2041ab458ab3afaf862e55f4
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:59:03 2009 +0100

    chat-window: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-chat-window.c | 27 +++++++++++++++------------
 src/empathy-chat-window.h |  5 +++--
 2 files changed, 18 insertions(+), 14 deletions(-)

commit ad49c874bb6fcdd91a319f6e886846a33c4ee61e
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:58:25 2009 +0100

    accounts-dialog: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-accounts-dialog.c | 211
 ++++++++++++++----------------------------
 src/empathy-accounts-dialog.h |   4 +-
 2 files changed, 70 insertions(+), 145 deletions(-)

commit f4619e5b640b2f6c05ded981042da44aa5e4d29c
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:57:31 2009 +0100

    account-assistant: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-account-assistant.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit d23b04b4fce73fe16b5073b7d79c0ca8a9d64616
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:57:07 2009 +0100

    ui-utils: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-ui-utils.h | 1 -
 1 file changed, 1 deletion(-)

commit 613e2bef219387d3089c3c583ae2047fc37f30e7
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:56:57 2009 +0100

    theme-adium: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-theme-adium.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 7a3e1db6e3a795a3bbf85c9d2489c43a9e6537e2
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:56:30 2009 +0100

    presence-chooser: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-presence-chooser.c | 56
 +++++++++++++++++++++++--------
 1 file changed, 42 insertions(+), 14 deletions(-)

commit ed1550ec4ce29466e6c4b840ee37f2d78862c3d9
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:55:43 2009 +0100

    new-message-dialog: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-new-message-dialog.c | 1 -
 1 file changed, 1 deletion(-)

commit 2beb2a7609f6534697a8874aaa9fc33f3bd115d8
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:55:30 2009 +0100

    log-window: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-log-window.c | 76
 +++++++++++++++++++++++--------------
 libempathy-gtk/empathy-log-window.h |	4 +-
 2 files changed, 50 insertions(+), 30 deletions(-)

commit f14693f2d70ff34f6a34477d64b85dfc92d53f04
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:54:36 2009 +0100

    location-manager: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-location-manager.c | 93
 +++++++++++++++++++++++++------
 1 file changed, 77 insertions(+), 16 deletions(-)

commit d0285beb26e058b793d85ea9fef1d5f32558120b
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:53:54 2009 +0100

    irc-network-dialog: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-irc-network-dialog.c | 1 -
 1 file changed, 1 deletion(-)

commit 62a7a3ea40c946f981d41f9ee338dc52b9bd8292
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:53:19 2009 +0100

    contact-widget: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-contact-widget.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit ce89ecf9f79cb6f2a57f8d279d6bff8cfff10283
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:52:43 2009 +0100

    contact-list-view: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-contact-list-view.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

commit 4cd4787acbbd265f95b9e777ae9e3d2050f8c968
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:49:50 2009 +0100

    contact-dialogs: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-contact-dialogs.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 1f321d962150e7071a2b2757eb011e87766e65ad
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:48:57 2009 +0100

    chat-text-view: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-chat-text-view.c | 1 -
 1 file changed, 1 deletion(-)

commit 6159fe788283ddafade12e0f24e34091a4fb9279
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:48:12 2009 +0100

    chat: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-chat.c | 65
 ++++++++++++++++++++++++++++---------------
 libempathy-gtk/empathy-chat.h |  2 +-
 2 files changed, 44 insertions(+), 23 deletions(-)

commit 35fe02be20f42c1c38db365570f382630b274f7c
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:44:44 2009 +0100

    account-widget: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-account-widget.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

commit 38d2cb938c3b91f6cbc89b825d720bdf35fb8e5f
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:43:38 2009 +0100

    account-chooser: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-account-chooser.c | 171
 ++++++++++++++++++-------------
 libempathy-gtk/empathy-account-chooser.h |  10 +-
 2 files changed, 102 insertions(+), 79 deletions(-)

commit 5d0242ce18d39faed5fc2924cb58e8963150504c
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:42:51 2009 +0100

    tp-roomlist: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-tp-roomlist.c | 10 ++++------
 libempathy/empathy-tp-roomlist.h |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

commit e7833bc3849245d26de70b13e94405fc682ed9ca
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:42:26 2009 +0100

    log-store: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-log-store.c | 12 ++++++------
 libempathy/empathy-log-store.h | 26 +++++++++++++-------------
 2 files changed, 19 insertions(+), 19 deletions(-)

commit 9fcc517087e2c9515092e52a792097190c009bfc
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:41:58 2009 +0100

    log-store-empathy: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-log-store-empathy.c | 36
 ++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

commit a751ea6b71abacbfebe72f3e5b4444372afa328e
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:35:19 2009 +0100

    log-manager: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-log-manager.c | 10 +++++-----
 libempathy/empathy-log-manager.h | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

commit aecaf4269593a29ca5234f6fcd07bb7f0ab0a120
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:34:59 2009 +0100

    dispatcher: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-dispatcher.c | 75
 ++++++++++++++++++++++++++---------------
 1 file changed, 48 insertions(+), 27 deletions(-)

commit 753bdcb584f780ce3b6891782eca0e19ed598774
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:33:53 2009 +0100

    contact: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-contact.c | 24 ++++++++++--------------
 libempathy/empathy-contact.h |  6 +++---
 2 files changed, 13 insertions(+), 17 deletions(-)

commit 33793bb3219aa45e0fced3ea5e0266fc4ad6226d
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:33:13 2009 +0100

    contact-manager: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-contact-manager.c | 68
 ++++++++++++++++++++++++------------
 1 file changed, 46 insertions(+), 22 deletions(-)

commit effa229f70dd19601ea90edb3185cd984546658e
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:30:09 2009 +0100

    chatroom: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-chatroom.c | 16 ++++++++--------
 libempathy/empathy-chatroom.h | 11 ++++++-----
 2 files changed, 14 insertions(+), 13 deletions(-)

commit 9a4f28b016985fa303959032182bdbdf2c69c481
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:29:42 2009 +0100

    chatroom-manager: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-chatroom-manager.c | 57
 +++++++++++++----------------------
 libempathy/empathy-chatroom-manager.h | 11 ++++---
 2 files changed, 27 insertions(+), 41 deletions(-)

commit dba0a67fd1ea3c7bdfd4d5069b4b9f2a43d622b6
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:28:28 2009 +0100

    account-settings: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-account-settings.c | 146
 +++++++++++++++++-----------------
 libempathy/empathy-account-settings.h |   8 +-
 2 files changed, 77 insertions(+), 77 deletions(-)

commit e8894e6a663fe524a4d6282befa4a224c16180d5
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:26:31 2009 +0100

    Add empathy_idle_account_is_just_connected function.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-idle.c | 68
 +++++++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-idle.h |  2 ++
 2 files changed, 70 insertions(+)

commit d133b3b80a6a7fd4911905a077be21dabe0ef4bb
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 15:26:09 2009 +0100

    idle: port to new tp-glib account API

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-idle.c | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

commit bb173d8e042303ab7a0d9ec15c7a07f752cde200
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 14:47:04 2009 +0100

    Add empathy_account_manager_get_accounts_connected function.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-utils.c | 34 ++++++++++++++++++++++++++++++++++
 libempathy/empathy-utils.h |  2 ++
 2 files changed, 36 insertions(+)

commit 25fe1de65572fecd8b369f4c01df32e47d5afc28
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 24 01:20:25 2009 +0100

    Add empathy_get_account_for_connection function.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-utils.c | 35 ++++++++++++++++++++++++++++++++++-
 libempathy/empathy-utils.h |  2 ++
 2 files changed, 36 insertions(+), 1 deletion(-)

commit 1d66bb9bffcb1e9d6eb034be4bf7c5eaea839a5d
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Oct 23 18:37:45 2009 +0100

    Add empathy_idle_get_requested_presence function.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-idle.c | 51
 ++++++++++++++++++++++++++++++++++++-----------
 libempathy/empathy-idle.h |  5 +++++
 2 files changed, 44 insertions(+), 12 deletions(-)

commit 24fb016e872b01bc3e4b8b3a36e99d60f2273784
Author: Rob Bradford <rob@linux.intel.com>
Date:	Fri Oct 23 17:18:05 2009 +0100

    empathy-chat-window: Don't update the Contact menu if visible

    If the Contact menu is currently visible do not update it. Instead
    update it
    once the menu is hidden.

    Fixes: #591360

 src/empathy-chat-window.c | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

commit a7b6b344618cceca174eea62954373edf84543ac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 22 17:28:38 2009 +0100

    empathy.c: document how the reference on the newly created EmpathyChat
    is managed

 src/empathy.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit 9750a6735d088fa5c1930f2ac581619ff31c8491
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Oct 23 13:46:56 2009 +0100

    Removed EmpathyAccount{,Manager}.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/Makefile.am		      |    4 -
 libempathy/empathy-account-manager.c | 1060 ---------------------------
 libempathy/empathy-account-manager.h |  111 ---
 libempathy/empathy-account.c	      | 1305
 ----------------------------------
 libempathy/empathy-account.h	      |  124 ----
 5 files changed, 2604 deletions(-)

commit f4e6cbe11974883a3883536461c0be08f75cdd39
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Oct 23 13:33:39 2009 +0100

    ft-manager: allow closing the dialog with C-w or Esc

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-ft-manager.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit 7c5ac57b9aafe95d159c2a96410a0afa76408678
Author: Matěj Cepl <mcepl@redhat.com>
Date:	Fri Oct 23 12:00:13 2009 +0200

    Set default font from Gnome system if not set in the style.

    If the font family and font size is not set in the style, we set style
    based on the Gnome default settings.

    Signed-off-by: Matěj Cepl <mcepl@redhat.com>
    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-theme-adium.c | 82
 ++++++++++++++++++++++++++++++++----
 1 file changed, 73 insertions(+), 9 deletions(-)

commit 4dce79a6d7b56185edfe19cf2803f1b71c8ddc74
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 22 11:47:42 2009 +0100

    use empathy_released to check if we are releasing or not

    This allow us to release a 2.x.y.1 release without enabling Werror.

 configure.ac | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

commit f366c52d4a8d41312424799c36178065fe0a814f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 15:53:58 2009 +0100

    Enable extra error CFLAGS in tests/

 tests/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit 94fedc82f978087ed83e3ecb1af6c674064bc6bb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 20 16:30:08 2009 +0100

    Enable extra error CFLAGS in libempathy/

 libempathy/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit ced861778e7511c2300f03b0816fb18f800b8c56
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 20 16:29:56 2009 +0100

    Enable extra error CFLAGS in libempathy-gtk/

 libempathy-gtk/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit 4998da97b7d884670b5167a2ee9f04a1b3fdca1c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 25 13:21:46 2009 +0100

    Enable extra error CFLAGS in src/

 src/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit bf79f1c56928a7270b679e5c35bff860440c077e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 20 16:18:37 2009 +0100

    disable -Wstrict-prototypes as some GTK+ headers are bugged

 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit cc88cb87e38a54bb73926a2dbe67be416ef1cbd6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 25 12:47:57 2009 +0100

    remove m4/acinclude.m4

    We have our own errors management now.

 m4/acinclude.m4 | 65
 ---------------------------------------------------------
 1 file changed, 65 deletions(-)

commit c5abfdfed55676136808fea854d9ad3ed7bd458e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 25 12:14:59 2009 +0100

    copy error flags from Gabble

 configure.ac | 41 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

commit be027f7002d11677cf32601acd1370c45f2d2c57
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 25 12:14:34 2009 +0100

    add m4/as-compiler-flag.m4

 m4/as-compiler-flag.m4 | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

commit 601e416af2bafa2b890b045139c9d50ed5aa9c65
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 25 12:02:36 2009 +0100

    copy version management from Gabble

 configure.ac | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

commit 6931154a620290ec29a50c017d427586fe6d8a3f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 23 11:17:23 2009 +0100

    empathy-protocol-chooser: don't cache TpConnectionManagerProtocol
    in the store

    TpConnectionManagerProtocol are not garanteed to stay valid so we
    shouldn't cache them in the store. Instead, we cache the protocol name
    and call tp_connection_manager_get_protocol each time we need it.
    This should fix crashers as the ones reported in #599386.

 libempathy-gtk/empathy-protocol-chooser.c | 75
 +++++++++++++++++++------------
 1 file changed, 47 insertions(+), 28 deletions(-)

commit 6843cf006192fecf2382b1dd87a2fb8531a34b5f
Merge: a6eb75f a28c3a4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 22 14:37:26 2009 +0100

    Merge branch 'trivia'

commit a28c3a40ece7da5304ca084e1f30d26dbf006b56
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 22 14:35:29 2009 +0100

    empathy-avatar-chooser.c: fix identation

 libempathy-gtk/empathy-avatar-chooser.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit a6eb75f8fddea5331c938c1ce42d08f962275f97
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 22 12:08:50 2009 +0100

    fix a comment so the style checker is happy (#599243)

 libempathy-gtk/empathy-avatar-chooser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 74f0c713470d3b94b93536d6e60a9747ec923933
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 22 10:43:30 2009 +0100

    empathy-utils.c: fix casting issues

 libempathy/empathy-utils.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit 6e414d115637bf307d16140ca3eff8c473d4e5a6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 22 10:43:13 2009 +0100

    empathy-tp-contact-list.c: fix shadow declaration and uint comparaison

 libempathy/empathy-tp-contact-list.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit a691a12763667768333cbdd30be75a2b09f69266
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 22 10:42:41 2009 +0100

    empathy-tp-contact-factory.c: fix casting issue

 libempathy/empathy-tp-contact-factory.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1f391b975297fc276073fd48406b2b02eed61277
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 22 10:42:27 2009 +0100

    empathy-time.c: fix shadow declaration

 libempathy/empathy-time.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 80dac46f3765ba8328bc563cba3fe49417680476
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 22 10:42:06 2009 +0100

    empathy-status-presets.c: fix casting issues

 libempathy/empathy-status-presets.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit d3ebcb8302c5fa7e02af594cee984ab122c130ab
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 22 10:41:49 2009 +0100

    empathy-log-store-empathy.c: fix casting issues

 libempathy/empathy-log-store-empathy.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

commit 06788aad0559de0d79a8e8353bc49fccbcaf8551
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Oct 22 10:41:32 2009 +0100

    empathy-irc-network-manager.c: fix casting issues

 libempathy/empathy-irc-network-manager.c | 51
 ++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 22 deletions(-)

commit fc4c32d681fd53c804c20b1e76d454a08821bbaa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 18:19:04 2009 +0100

    empathy-dispatcher.c: fix shadow declarations

 libempathy/empathy-dispatcher.c | 245
 ++++++++++++++++++++--------------------
 1 file changed, 122 insertions(+), 123 deletions(-)

commit 3dcd2bd00c3120b97c3fcc93983e21a22f301020
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 18:18:38 2009 +0100

    empathy-contact-groups.c: fix casting issues

 libempathy/empathy-contact-groups.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

commit 73ae73a1e6d938abf206035910f6b4de8572a8fc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 18:18:12 2009 +0100

    empathy-connection-managers.c: fix shadow declarations

 libempathy/empathy-connection-managers.c | 28
 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

commit d55286dab59129bd56b8fee99a22b69e731f9f65
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 18:17:53 2009 +0100

    empathy-chatroom-manager.c: fix casting issues

 libempathy/empathy-chatroom-manager.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

commit d5a1765f414f04f81922603af16f18d7c84f87a0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 17:58:06 2009 +0100

    empathy-account-settings.c: fix uint comparaison

 libempathy/empathy-account-settings.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 5f6e2d5c91cf79cdcec6de941db2393563bb0f82
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 17:25:19 2009 +0100

    empathy-nautilus-sendto.c: fix shadow declaration

 nautilus-sendto-plugin/empathy-nautilus-sendto.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 17c8536264198291326446270faf84f6e00e399d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 17:24:56 2009 +0100

    totem-subtitle-encoding.c: fix shadow declarations

 libempathy-gtk/totem-subtitle-encoding.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

commit 62754283f2d0904b9f57cc291e4a4e1d4490f288
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 17:24:36 2009 +0100

    empathy-ui-utils.c: fix shadow declaration

 libempathy-gtk/empathy-ui-utils.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit c77666dd4ec3151b2a3f2fdb1d6b75253bf09f43
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 17:24:14 2009 +0100

    empathy-theme-manager.c: fix shadow declarations

 libempathy-gtk/empathy-theme-manager.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 05f02c1a884c7a6fd31cff468534a55f9bc248b2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 17:24:01 2009 +0100

    empathy-theme-boxes.c: fix shadow declarations

 libempathy-gtk/empathy-theme-boxes.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit b4d5fc6e7190ef220edd48f0b77a5591a5b20b7b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 17:23:42 2009 +0100

    empathy-theme-adium.c: fix uint comparaisons

 libempathy-gtk/empathy-theme-adium.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e007409aae5aa30c28ef14761e55e73b52b8e113
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 17:23:25 2009 +0100

    empathy-status-preset-dialog: fix uint comparaisons

 libempathy-gtk/empathy-status-preset-dialog.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit dd2c71fd1667a2237981f937230f7a2022fc6eac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 17:23:09 2009 +0100

    empathy-contact-widget.c: fix shadow declarations

 libempathy-gtk/empathy-contact-widget.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

commit 812da360eeda6ed787ad3e15a740f9936371d5b9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 17:22:44 2009 +0100

    empathy-chat-text-view.c: fix shadow declarations and uint
    comparaisons

 libempathy-gtk/empathy-chat-text-view.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit c5c492f8ec371626affed5b5e940cc7b31245f95
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 17:22:10 2009 +0100

    empathy-avatar-image.c: fix a casting issue

 libempathy-gtk/empathy-avatar-image.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 28c32abddcb9ae4863fa562c1bb97025db9d1d79
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 17:21:02 2009 +0100

    empathy-avatar-chooser.c: fix casting issues

 libempathy-gtk/empathy-avatar-chooser.c | 34
 +++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

commit 5c830b1f8defeeddc2ecef58310d23f07720b49f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 17:20:42 2009 +0100

    empathy-account-widget.c: fix uint comparaison

 libempathy-gtk/empathy-account-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8e579dd7aea165cd3ca9b8e1f278fda16d94131f
Author: Theppitak Karoonboonyanan <thep@linux.thai.net>
Date:	Thu Oct 22 08:26:08 2009 +0700

    Updated Thai translation.

 po/th.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit d8a3034999ca213ac75b4110a875d688b75fed5f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 18:00:00 2009 +0100

    empathy-account-settings: fix CLAMP usage

    CLAMP syntax is (x, low, high), not (low, x, high). Also add some cast
    to fix compiler warnings.

 libempathy/empathy-account-settings.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

commit 0f12ed5628589596f4a2c02648ee66a9413c3f2a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 15:46:02 2009 +0100

    empathy-location-manager.c: fix shadow declarations

 libempathy-gtk/empathy-location-manager.c | 90
 +++++++++++++++----------------
 1 file changed, 45 insertions(+), 45 deletions(-)

commit 61f9d49b442ea64baa1f86a4121c1bce3daa30f9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 15:45:36 2009 +0100

    empathy-contact-list-view.c: fix shadow declarations and uint
    comparaisons

 libempathy-gtk/empathy-contact-list-view.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 167595e8a0108f2763949b6a1188dafcf99f276d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 15:45:17 2009 +0100

    empathy-contact-list-store.c: fix shadow declarations

 libempathy-gtk/empathy-contact-list-store.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit a94bffadcc27ac011a8b5d8472d907f23c129955
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 15:41:01 2009 +0100

    empathy-tp-chat.c: fix shadow declaration

 libempathy/empathy-tp-chat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 10e8eb34e3ae90897bf2c2f1c08fa581e6394550
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 15:40:46 2009 +0100

    empathy-contact: cast data pointers

 libempathy/empathy-contact.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit ceabd0c25b48fc983066781d70d4fc6bd5905943
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 15:40:24 2009 +0100

    empathy-account-manager.c: fix uint comparaison

 libempathy/empathy-account-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a5e022f8e6251feafdfa8a2de50e02369ed215cc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 25 13:39:46 2009 +0100

    empathy-irc-server: the port is a guint

 libempathy/empathy-irc-server.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 56fedf2764bef7f4a98c30b2e302daee975f8b1d
Author: Žygimantas Beručka <zygis@gnome.org>
Date:	Wed Oct 21 12:39:47 2009 +0300

    Updated Lithuanian translation.

 po/lt.po | 175
 ++++++++++++++++++++++++++-------------------------------------
 1 file changed, 73 insertions(+), 102 deletions(-)

commit 366373ccbc26bd0ea6dd494b7514b1a148b88b78
Merge: 7abf768 8c1e755
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 21 10:21:41 2009 +0100

    Merge commit 'kaserf/master'

commit 7abf768e7296a95e42f0fd31a5459e065ca921e6
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Oct 21 09:50:06 2009 +0100

    Also allow Esc to close debug window and map view.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-debug-window.c | 3 ++-
 src/empathy-map-view.c     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

commit 1aacf68f38e8169d9753b1e1f25d2613437f7611
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Wed Oct 21 09:40:06 2009 +0100

    Add Ctrl-w keybinding to close map window.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-map-view.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit 8c1e75542e1ac90bcd0dc167a2d89aeb54e9f12a
Author: Felix Kaser <f.kaser@gmx.net>
Date:	Tue Oct 20 10:20:02 2009 +0200

    Ignoring non installed languages

    Languages which are in the gconf setting but are not installed any
    more are ignored, fixes bug #598954

 libempathy-gtk/empathy-spell.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 8e9aa89166cf774b6d7efe83db68ac2d6540e840
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Oct 20 19:16:58 2009 +0100

    Stop building libempathy{,-gtk} as a shared library. Closes bug
    #599086

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 .gitignore			     |	 1 -
 configure.ac			     |	21 --------
 libempathy-gtk/Makefile.am	     |	49 +++++++----------
 libempathy-gtk/libempathy-gtk.pc.in |	13 -----
 libempathy/Makefile.am		     | 103
 ++++++++++++++++--------------------
 libempathy/libempathy.pc.in	     |	13 -----
 6 files changed, 65 insertions(+), 135 deletions(-)

commit e99bb6f9e596bbc33cefdcae5da76802424504ab
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Oct 20 19:26:32 2009 +0100

    Stop building gtk-doc documentation. Closes bug #599087

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 Makefile.am				      |  2 +-
 autogen.sh				      |  9 ----
 configure.ac				      |  7 ---
 docs/.gitignore			      |  8 ---
 docs/Makefile.am			      |  2 -
 docs/README				      |  8 ---
 docs/libempathy-gtk/.gitignore		      |  6 ---
 docs/libempathy-gtk/Makefile.am	      | 60 ----------------------
 docs/libempathy-gtk/libempathy-gtk-docs.sgml | 76
 ----------------------------
 docs/libempathy-gtk/libempathy-gtk.types     | 37 --------------
 docs/libempathy-gtk/version.xml.in	      |  1 -
 docs/libempathy/.gitignore		      |  6 ---
 docs/libempathy/Makefile.am		      | 59 ---------------------
 docs/libempathy/libempathy-docs.sgml	      | 72
 --------------------------
 docs/libempathy/libempathy.types	      | 41 ---------------
 docs/libempathy/version.xml.in		      |  1 -
 16 files changed, 1 insertion(+), 394 deletions(-)

commit 3a1bca56854b66d288c875c86756ae913cb80e60
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 20 15:56:40 2009 +0100

    src/ephy-spinner.c: remove useless guint comparaisons

 src/ephy-spinner.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 0edac04163ea89ac3ae0375dbd8e60a013a7a8d6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 20 15:56:11 2009 +0100

    src/empathy.c: fix uint comparaison

 src/empathy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3061cee2096b47945445367c87b6d2cf146dcc31
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 20 15:55:55 2009 +0100

    src/empathy-sidebar.c: fix shadow declarations

 src/empathy-sidebar.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

commit 2cb90d9082371198bdb18831d1f18759b9ed5b09
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 20 15:55:22 2009 +0100

    src/empathy-main-window.c: fix shadow declarations and uint
    comparaisons

 src/empathy-main-window.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

commit 4e1bf5a7cbd03f934a74ebdc1d1bc1da9fe0b429
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 20 15:54:57 2009 +0100

    src/empathy-preferences.c: fix shadow declarations and uint
    comparaisons

 src/empathy-preferences.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 1f9ec7bc79c1aa3cc002f0afaf0f518f0b6ab455
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 20 15:54:06 2009 +0100

    src/empathy-import-pidgin: cast strings to (xmlChar *) when needed

 src/empathy-import-pidgin.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 77803a3f4cc6adc42552fd823a43cd09474b0c3f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 20 15:52:45 2009 +0100

    src/empathy-import-mc4-accounts.c: fix uint comparaison

 src/empathy-import-mc4-accounts.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit be4654da13c2c957c72637678ad3a9f07a4b4e9d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 20 15:52:22 2009 +0100

    src/empathy-debug-window: fix shadow declarations and uint
    comparaisons

 src/empathy-debug-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9f0ae2a124ecb68b8a553783002a2b01c02d5fb4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 20 15:52:06 2009 +0100

    src/empathy-chat-window: fix shadow declarations and uint comparaisons

 src/empathy-chat-window.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

commit a7f9ee4d7aeb8869d8ec0f86a1e3bdfb190bb037
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 20 15:51:34 2009 +0100

    empathy-call-window: fix shadow declarations

 src/empathy-call-window.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 6eedc10b7367d6455aede5e74788b6a1ca608ea0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 20 14:43:56 2009 +0100

    Don't display any icon if we have been disconnected

 src/empathy-chat-window.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

commit 7d2255306d8c07e760917b1e8a4351c78ee302ed
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Sun Oct 11 21:47:09 2009 +0100

    empathy-chat-window: update the tab icon when the TpChat is
    disconnected (#597680)

 src/empathy-chat-window.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit 729145dbf0039db5763533d046eb53f5de38a419
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Oct 20 14:02:00 2009 +0100

    Re-add python.m4 as it may be needed for AM_PATH_PYTHON.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 m4/python.m4 | 66
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

commit 105cc83e67ef41c35998aaaaae8bf18c56be65c0
Merge: 6496713 da50094
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Oct 20 14:00:51 2009 +0100

    Merge branch 'slatez-applets'

    Conflicts:
	Makefile.am
	configure.ac

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

commit 6496713f0997ab90e7ee686819640b22b4911aea
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Oct 20 12:59:15 2009 +0100

    Remove python bindings. (Closes bug #599039)

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 Makefile.am				   |	4 -
 configure.ac				   |   39 -
 m4/python.m4				   |   66 -
 python/.gitignore			   |	2 -
 python/Makefile.am			   |	2 -
 python/example.py			   |   32 -
 python/pyempathy.patch			   |   18 -
 python/pyempathy/Makefile.am		   |   48 -
 python/pyempathy/pyempathy.defs	   | 3767
 -----------------------------
 python/pyempathy/pyempathy.override	   |   71 -
 python/pyempathy/pyempathymodule.c	   |   28 -
 python/pyempathygtk.patch		   |   18 -
 python/pyempathygtk/Makefile.am	   |   49 -
 python/pyempathygtk/pyempathygtk.defs	   | 2108 ----------------
 python/pyempathygtk/pyempathygtk.override |   87 -
 python/pyempathygtk/pyempathygtkmodule.c  |   27 -
 python/update-binding.sh		   |  114 -
 17 files changed, 6480 deletions(-)

commit da500948288ec5e9e675502151e5305bdf063592
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Tue Oct 20 13:07:52 2009 +0100

    Remove the panel applets. (Closes bug #599042)

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 Makefile.am					    |	8 -
 configure.ac					    |  62 ---
 megaphone/.gitignore				    |	4 -
 megaphone/Makefile.am				    |	2 -
 megaphone/data/GNOME_Megaphone_Applet.schemas.in   |  30 --
 megaphone/data/GNOME_Megaphone_Applet.server.in.in |  25 -
 megaphone/data/GNOME_Megaphone_Applet.xml	    |	9 -
 megaphone/data/Makefile.am			    |  36 --
 megaphone/src/Makefile.am			    |  17 -
 megaphone/src/megaphone-applet.c		    | 592
 ---------------------
 megaphone/src/megaphone-applet.h		    |  54 --
 nothere/.gitignore				    |	4 -
 nothere/Makefile.am				    |	2 -
 nothere/data/GNOME_NotHere_Applet.server.in.in     |  25 -
 nothere/data/GNOME_NotHere_Applet.xml		    |	7 -
 nothere/data/Makefile.am			    |  36 --
 nothere/src/Makefile.am			    |  17 -
 nothere/src/nothere-applet.c			    | 136 -----
 nothere/src/nothere-applet.h			    |  52 --
 po/POTFILES.in					    |	9 -
 po/POTFILES.skip				    |	2 -
 21 files changed, 1129 deletions(-)

commit 90469882929d06151352d3d8e8b0e6a1f5229905
Author: Leonid Kanter <leon@asplinux.ru>
Date:	Tue Oct 20 14:26:02 2009 +0300

    Updated Russian translation

 po/ru.po | 2412
 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 1613 insertions(+), 799 deletions(-)

commit c865d84deb0bb7c49f59ff6cd77064b6da86ff7f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Oct 20 11:56:47 2009 +0100

    release.py: stop hardcoding the GNOME username used for uploads

 release.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

commit 725ab93e1b5b3e6ecdbbf3413b57d499ba6f23d9
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Oct 20 12:30:17 2009 +0200

    Correctly lookup project page for release notes

 release.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d52fd187091518977636b0844a98021775eaf0aa
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Tue Oct 20 10:41:10 2009 +0300

    Updating Estonian translation

 po/et.po | 84
 ++++++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 61 insertions(+), 23 deletions(-)

commit 028f83c3e8adf7755846643cee6114cf6d063893
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Tue Oct 20 08:38:28 2009 +0200

    Updated Spanish translation

 po/es.po | 76
 ++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

commit e200b330a1d364da4ad87b7de5f6fcec6b03f312
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Oct 19 22:40:24 2009 +0100

    Use the contacts alias in the information dialog

 libempathy-gtk/empathy-contact-dialogs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 6ae71080bf117f76345e2d868d1e346c6021a0c1
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Sep 1 16:20:35 2009 +0100

    Ensure we don't try to register invalid bus names

 libempathy/empathy-handler.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 82063856bf2a278db370af8807c97e4e9c289afc
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Oct 19 16:58:43 2009 +0100

    Unset pending_call explicitly instead of implicitly

 libempathy/empathy-dispatcher.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

commit 0da8cbd3fe50e4eba859f93600a4da9c07ea751c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 19 14:42:42 2009 +0100

    empathy_call_window_setup_avatars: pass a weak object to
    empathy_tp_contact_factory_get_from_handle

    Pass the call window as weak object to
    empathy_tp_contact_factory_get_from_handle so the callback won't be
    called if the window is destroyed (#598453).

 src/empathy-call-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 95580f110cf428940866d348447cee18062a468d
Merge: 80a7e18 21236da
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 19 14:32:53 2009 +0100

    Merge commit 'maiku/bug_598332'

commit 80a7e18a8f783db81140aed9cefcd08f6b33e330
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 19 14:26:42 2009 +0100

    rename contact_list_store_finalize to contact_list_store_dispose

    This method just disconnect signals, release references and remove
    idle
    callbacks so it should really be a dispose, not a finalize.

 libempathy-gtk/empathy-contact-list-store.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit 2ca081a4e27d46599053779c641e4646046f42ae
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 19 13:54:34 2009 +0100

    empathy-contact-list-store: remove the setup idle cb when store
    is destroyed

    This ensures that the setup cb isn't called on a destroyed object
    (#598452).

 libempathy-gtk/empathy-contact-list-store.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 09a5b716473a7f57f438b913c4d889798b084461
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 19 11:33:48 2009 +0100

    empathy-call-window: use empathy_signal_connect_weak to connect the
    peak-level-changed signal

    That way the callback won't be called once the call window has been
    destroyed (#598432).

 src/empathy-call-window.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 057159903dc48bfd304bd8e157c446122c880a0d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 19 12:06:17 2009 +0100

    empathy_account_settings_get_tp_params: don't raise an error if
    tp_protocol is NULL

 libempathy/empathy-account-settings.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

commit 98241a08a60d0741e6d00f52775ccad85d6693c3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 19 11:58:52 2009 +0100

    empathy-account-settings: don't cache the TpConnectionManagerProtocol

    The result of tp_connection_manager_get_protocol isn't garanteed to be
    valid after the main loop re-entered. We can't cache it in the account
    settings and so have to request it each time we need it.

 libempathy/empathy-account-settings.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

commit 395532bc9175deaac84c5ebbea9e6fc2b215286f
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Oct 15 19:19:50 2009 -0400

    Make calling empathy without options idempotent

    When empathy is started without any accounts the account assistant
    shows up,
    but if empathy is already running and is called again nothing
    happens. Fixed
    by always showing the account assistant if empathy is called and
    there are
    no non-salut accounts

 src/empathy.c | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

commit 990d6cd96616a31eaa7adc4325f86c16538c8e7f
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Oct 15 11:50:37 2009 -0400

    Explain the -h option better

 src/empathy.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit a7439d664bed1547019591dee97b4ed5fa09f434
Author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
Date:	Wed Oct 14 17:47:16 2009 -0500

    Fix assertion when closing a call window after CM crashed.

    g_object_unref was called on a NULL pointer.

 src/empathy-call-window.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 03d7564f4936a56034bab91a5963ccab34fc5321
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Mon Oct 19 01:10:30 2009 +0200

    Updated Hungarian translation

 po/hu.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bfc5410cb6460d745105c5e8dffb9d44533af851
Author: Jennie Petoumenou <epetoumenou@gmail.com>
Date:	Sat Oct 17 18:16:21 2009 +0300

    Updated Greek documentation translation

 help/el/el.po | 4529
 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 3606 insertions(+), 923 deletions(-)

commit 4480f731fddb58b0fc68072f4096727d912d2261
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 17 15:09:47 2009 +0100

    idle: work around the case if the session doesn't tell us when we
    go idle (fixes bug #594619)

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-idle.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

commit 4e360483d0a8dedc613faee420b8ace496243b05
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Sat Oct 17 13:13:54 2009 +0100

    debug-window: add C-w keybinding to close the window

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-debug-window.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit 5c1565562c5d71d7b4d2fa1a2b7aca040e0eb0ce
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Oct 17 11:16:35 2009 +0200

    Updated Spanish translation

 po/es.po | 118
 ++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 52 insertions(+), 66 deletions(-)

commit 2dc1a0df073d06fce26efd748ea3619339d90aa5
Merge: c0110e0 2d2dee0
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Oct 16 23:01:25 2009 +0100

    Merge branch 'trrrrrrrrrrrrrivia'

commit 2d2dee09f6f816b1c7669baad8162b06ba2b1dcb
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Oct 16 22:48:10 2009 +0100

    empathy-import-mc4-accounts: no need to add newlines to DEBUG calls

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 src/empathy-import-mc4-accounts.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 98bcced9ad8b35ce00666b9c8e08f0192bad0346
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Oct 16 18:30:59 2009 +0100

    connectivity: small fix to a debug message

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy/empathy-connectivity.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c0110e0dcaa72035bae2d7d3aff6d4609efb3df8
Author: André Gondim <andregondim@ubuntu.com>
Date:	Fri Oct 16 08:56:11 2009 -0400

    Updated Brazilian Portuguese translation.

 po/pt_BR.po | 269
 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 138 insertions(+), 131 deletions(-)

commit 7c95b31d12c54097edb493891f86d28cfb1f4089
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Oct 16 13:12:13 2009 +0100

    presence-chooser: remove "\n"s from DEBUG calls

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-presence-chooser.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit fbef69ba66c085d504fd2ea4ad3159d14023f789
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:	Fri Oct 16 13:00:05 2009 +0100

    presence-chooser: make the entry not editable when we are offline

    The idea behind this is that you can't set a custom status when you
    are offline. It just doesn't make sense.

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-presence-chooser.c | 5 +++++
 1 file changed, 5 insertions(+)

commit f7c8902cbc25a7f41483422062974af47175db1d
Author: Daniel Nylander <po@danielnylander.se>
Date:	Thu Oct 15 22:02:27 2009 +0200

    Updated Swedish translation

 po/sv.po | 884
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 761 insertions(+), 123 deletions(-)

commit 9c841cbcbe833a6dbfc5361935ba0bfd9158ef91
Author: Daniel Nylander <po@danielnylander.se>
Date:	Thu Oct 15 18:23:31 2009 +0200

    Updated Swedish translation

 po/sv.po | 117
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 59 insertions(+), 58 deletions(-)

commit e2edcdccd7e02adf6d684ad66a25f8f2e75616ea
Author: Claude Paroz <claude@2xlibre.net>
Date:	Thu Oct 15 18:04:55 2009 +0200

    Updated French translation (and merged from gnome-2-28)

 po/fr.po | 358
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 204 insertions(+), 154 deletions(-)

commit f98941e85d145915344bc158e48609b6d25e6014
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Oct 15 11:43:10 2009 -0400

    Make sure -h is respected when there were no mc4 accounts to import

 src/empathy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ad55f6268d5b940ff1e3a7bd966c757cd8879c4c
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Oct 15 16:56:07 2009 +0200

    Factor out free-ing the message list.

 src/empathy-debug-window.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

commit 109e8841508f423be4e096bc02bef211282938ba
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Sep 25 12:57:15 2009 +0200

    Implement a cache for debug logs (#596101).

    The cache is useful when a CM disappears and we don't want to lose its
    debug output.

 src/empathy-debug-window.c | 274
 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 220 insertions(+), 54 deletions(-)

commit 31c55199d35be7341de91a47b13feddaba20404b
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Oct 15 13:43:44 2009 +0200

    Don't try to double free the avatar data (#598423).

    Also, simplify the code for loading the avatar data from the file.

 libempathy-gtk/empathy-avatar-chooser.c | 42
 +++++++++------------------------
 1 file changed, 11 insertions(+), 31 deletions(-)

commit 6703efaad20fd368471e43dc9eeed272f848e39a
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Oct 15 13:43:04 2009 +0200

    Use new API in the test.

 tests/test-empathy-account-assistant.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 21236da0d1d89af62dd4e11e883b553af658f41a
Author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
Date:	Wed Oct 14 16:59:04 2009 -0500

    Move destruction of connections from finalize to dispose.

    Code can potentially be run between the dispose and finalize
    methods. This
    moves the destruction of connections and subsequently
    outstanding_requests
    into the dispose function so the request callback can't be fired
    between
    unreffing the EmpathyDispatcher and cancelling the pending request.

 libempathy/empathy-dispatcher.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

commit eeafe98a27dbccc08a6023b7c73f7bd537c5e39c
Author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
Date:	Wed Oct 14 16:23:43 2009 -0500

    Remove the weak_object parameter when requesting channels.

    Use the EmpathyDispatcher pointed to in the DispatcherRequestData
    instead of
    the weak_object. Outstanding channel requests were being cancelled
    in the
    EmpathyDispatcher's finalize method. This had the potential to
    double-cancel
    the requests when the weak_object (EmpathyDispatcher) was unreffed,
    causing a
    segmentation fault.

 libempathy/empathy-dispatcher.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

commit 98e2adadb7d8439ab5fb6e3035336979f8fd9b63
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Oct 14 11:25:12 2009 -0400

    Make sure the account manager is completely unreffed when exiting

 src/empathy.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit a4dda5a12f49ea63efddec3cd4e81585e5816c00
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Oct 13 19:57:07 2009 -0400

    Let empathy -a show the assistant if applicable

 src/empathy.c | 63
 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 52 insertions(+), 11 deletions(-)

commit 4dce4c7c7f6282d06aceef5d63d3e653ac3b24cd
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Oct 13 19:38:21 2009 -0400

    When starting hidden don't show the assistant

 src/empathy.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit e288bb38a4f04cf4ce00e77b5b81937eda2f0a12
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Oct 13 19:22:40 2009 -0400

    Show the assistant if there are no non-salut accounts

 src/empathy-account-assistant.c | 18 +++++++++++++++---
 src/empathy-account-assistant.h |  2 +-
 src/empathy.c			 | 31 +++++++++++++++++++++++++------
 3 files changed, 41 insertions(+), 10 deletions(-)

commit dd33e47cf95d374d9dfb9d0346cf2977c9393a21
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Oct 14 12:44:11 2009 -0400

    Use a nicer callback name

 libempathy-gtk/empathy-presence-chooser.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 882784309a8bce349edff3632877f62f77003d01
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Oct 14 12:15:17 2009 -0400

    Use empathy_signal_connect_weak

 libempathy-gtk/empathy-presence-chooser.c | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

commit 0eb14eeb66bbec5985a12c0be24bf45d00ed311c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Oct 13 20:25:04 2009 -0400

    make the presence chooser insensitive no accounts are enabled

    When there are no accounts enabled, there isn't really any point in
    setting a
    presence and it's a bit confusing to the user as their action
    doesn't actually
    have a result

    Fixes #598354

 libempathy-gtk/empathy-presence-chooser.c | 61
 +++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 3 deletions(-)

commit 85c083ccf5ecdb66d13a597e9306a08dbeed3237
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 14 15:34:01 2009 +0100

    accounts_dialog_add_account: connect notify::display-name using
    empathy_signal_connect_weak

    empathy_signal_connect_weak will disconnect the signal when the
    accounts
    dialog is disposed. (#598408)

 src/empathy-accounts-dialog.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

commit c8d648fff1a1f130baab6838a4aab2c6f2162d66
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Oct 14 15:20:20 2009 +0100

    copy empathy_signal_connect_weak from telepathy-gabble

 libempathy/empathy-utils.c | 85
 ++++++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-utils.h |  5 +++
 2 files changed, 90 insertions(+)

commit a99138d9d745e0269f9a9a8182f8df92dcb61bda
Author: Kostas Papadimas <pkst@gnome.org>
Date:	Wed Oct 14 18:54:17 2009 +0300

    Updated Greek translation.

 po/el.po | 1449
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 809 insertions(+), 640 deletions(-)

commit b3cc80d48c1bb913de1907e1664a0f720c8e900a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Oct 13 16:34:59 2009 -0400

    Use the protocol display name for new account names

    As the default display name for new accounts use the pretty
    human-readable
    version instead of the telepathy protocol names

    Fixes #598355

 src/empathy-accounts-dialog.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 1e0632dcffc06127e9919fcd4dfa3571108ff0de
Author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
Date:	Tue Oct 13 18:40:52 2009 -0500

    Cancel outstanding channel requests if connection to the CM is lost.

    When the connection to a given channel manager was lost (such as
    it crashed),
    any outstanding channel requests were freed, but then the request
    callback
    fired with an invalid (already freed) DispatcherRequestData
    parameter. It
    subsequently used this invalid data and crashed.

    This patch cancels all outstanding channel requests when they are
    freed so the
    callback isn't called with invalid data. Fixes #598332

 libempathy/empathy-dispatcher.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

commit 03f2b62039ae8df84b138185a32bfdf0cc857581
Author: Petr Kovar <pknbe@volny.cz>
Date:	Tue Oct 13 23:17:09 2009 +0200

    Updated Czech translation by Marek Cernocky

 po/cs.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 365a1187423217048c946f6efc7e824571c00b2c
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Oct 12 15:51:33 2009 +0200

    Fix typo, correctly set the description of the sound being played.

 libempathy-gtk/empathy-sound.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3dbc53992c5223dfc30a482350fc5189c9ff3909
Merge: db580fd 5219271
Author: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Date:	Mon Oct 12 09:50:58 2009 -0300

    Merge branch 'refactor-context-menu'

commit db580fd745ba2783d3bf0e8fbc0a3b0627c754df
Author: drtvasudevan <agnihot3@gmail.com>
Date:	Sun Oct 11 12:01:46 2009 +0530

    Updated Tamil translation

 po/ta.po | 495
 ++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 296 insertions(+), 199 deletions(-)

commit 16177e2cc6f4f8c6eaf71793f34bb71aa578028c
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Sun Oct 11 00:40:55 2009 +0200

    Updated Hungarian translation

 po/hu.po | 251
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 128 insertions(+), 123 deletions(-)

commit 408a1e568dd72653450f6c83bd950254cf8bc1af
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Sat Oct 10 23:59:59 2009 +0200

    Updated Hungarian translation

 po/hu.po | 94
 +++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 60 insertions(+), 34 deletions(-)

commit 4ce5d89720ae7d2bcf0831e964d61884b4a992b5
Author: Petr Kovar <pknbe@volny.cz>
Date:	Sat Oct 10 17:39:57 2009 +0200

    Updated Czech translation by Jan Drabek

    Reviewed by: Lucas Lommer & Petr Kovar.

 po/cs.po | 1637
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 869 insertions(+), 768 deletions(-)

commit d3f1aba8f57f9ecbe34126763c3982896b692dbc
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Oct 10 12:01:15 2009 +0200

    Updated Spanish translation

 po/es.po | 270
 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 171 insertions(+), 99 deletions(-)

commit 06f661b296a12ba89569d7b51b681f9215cf667c
Author: Claude Paroz <claude@2xlibre.net>
Date:	Fri Oct 9 23:16:45 2009 +0200

    Improved French translation

 po/fr.po | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

commit 681bf89f5749a65f11e85697db089582a8aac380
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Fri Oct 9 21:53:57 2009 +0200

    Updated Italian translation

 po/it.po | 215
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 124 insertions(+), 91 deletions(-)

commit 52192715c5ea4dddd6bd42b8874fbb28412606ee
Author: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Date:	Fri Oct 9 11:52:24 2009 -0300

    Refactor context menu code to use new HitTestResult API

    This is a big cleanup of the context menu code. The current API in
    WebKit is still not perfect, but we are now able to avoid lots of
    hacks and work-arounds.

 configure.ac			      |   2 +-
 libempathy-gtk/empathy-theme-adium.c | 246
 +++++++++++++++++------------------
 2 files changed, 122 insertions(+), 126 deletions(-)

commit ec9d9d8779bd3e8a18fdd210bc0d317dc120f91e
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Oct 8 21:30:44 2009 +0200

    Add missing ; to make it build.

 libempathy-gtk/empathy-chat-text-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 72a91aa96ff999c6140e8d1ba8521fdfa03b38f3
Author: Alexander Shopov <ash@contact.bg>
Date:	Wed Oct 7 07:39:24 2009 +0300

    Updated Bulgarian translation

 po/bg.po | 245
 +++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 153 insertions(+), 92 deletions(-)

commit 4b78d56f3ccf51285cac55e236ae371adcb436da
Author: Gil Forcada <gforcada@gnome.org>
Date:	Tue Oct 6 17:12:58 2009 +0200

    Updated Catalan translation

 po/ca.po | 1733
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 987 insertions(+), 746 deletions(-)

commit ff1393e672b5e10fd7589a25349188ac6e9bbc73
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Tue Oct 6 10:24:52 2009 +0200

    Removed leak with g_string_free, added comment for 0xFFFC

 libempathy-gtk/empathy-chat-text-view.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 90f62ff1b5f9077482744ec8e218089d07fb8dc2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 5 15:07:15 2009 +0100

    accounts_dialog_account_display_name_changed_cb: check that
    accounts_dialog_model_get_selected_settings didn't return NULL
    (#597416)

    All the other callers of this function cope with setting being NULL so
    this one should do as well.

 src/empathy-accounts-dialog.c | 3 +++
 1 file changed, 3 insertions(+)

commit 30d4036989990a22b4c40ffc2b805b57291b5548
Author: Theppitak Karoonboonyanan <thep@linux.thai.net>
Date:	Mon Oct 5 22:24:40 2009 +0700

    Updated Thai translation.

 po/th.po | 2472
 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 1686 insertions(+), 786 deletions(-)

commit e6188730e17ae1e60bdc61034f0c31e015c6ccb9
Merge: 4f1c664 a6e2a62
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 5 13:37:47 2009 +0100

    Merge branch 'fix-headers-597293'

commit 4f1c664ee53ae1579be089d936371b22a06f123b
Merge: c168aa5 7d22a2c
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Oct 5 13:29:02 2009 +0200

    Merge branch 'contact-info'

commit a6e2a62fbd49bd25f87ed3862e4c33b6f35b838b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 5 12:27:48 2009 +0100

    upgrade Python bindings

 python/pyempathy/pyempathy.defs | 15 ---------------
 1 file changed, 15 deletions(-)

commit 627db1c8bfa9b635ad01eb4c6eef64c6ac7378dd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 5 12:25:57 2009 +0100

    remove empathy_account_manager_remove from header; function has
    been removed

 libempathy/empathy-account-manager.h | 3 ---
 1 file changed, 3 deletions(-)

commit 2acfc164bf9a1adb92e7cbb64328218132cce940
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Oct 5 12:25:29 2009 +0100

    remove empathy_tp_contact_list_can_add from header; function has
    been removed

 libempathy/empathy-tp-contact-list.h | 1 -
 1 file changed, 1 deletion(-)

commit c168aa58726f74d6df293ebbe18b62d4585a7017
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Oct 5 12:07:21 2009 +0200

    Rename HAVE_NBTK to HAVE_MOBLIN.

 configure.ac				 | 16 +++++++++-------
 libempathy-gtk/empathy-account-widget.c | 30
 +++++++++++++++---------------
 src/empathy-accounts-dialog.c		 | 20 ++++++++++----------
 3 files changed, 34 insertions(+), 32 deletions(-)

commit 7d22a2c47ec6e49a44af8a73199ec16e46870401
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Oct 5 09:53:07 2009 +0200

    Fix the contact information dialog's window.

 libempathy-gtk/empathy-contact-dialogs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f1a94b70df51d6fe024865b78f02141134ff491f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Sun Oct 4 17:31:36 2009 +0100

    add myself as maintainer

 MAINTAINERS  | 3 +++
 empathy.doap | 6 ++++++
 2 files changed, 9 insertions(+)

commit cda1b2ba728779cc0728d1ed62619cefc22dec7b
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Sun Oct 4 09:40:14 2009 +0200

    Updated Slovenian translation

 po/sl.po | 98
 ++++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 62 insertions(+), 36 deletions(-)

commit bf3271455ff554df3e0ae8e9323cb8f141c196e5
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Sat Oct 3 16:04:05 2009 +0200

    Updated German doc translation

 help/de/de.po | 845
 +++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 577 insertions(+), 268 deletions(-)

commit fb6105962feb0455c0899fc04582678d42112197
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sat Oct 3 14:01:12 2009 +0200

    Updated italian translation

 po/it.po | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit c2bb927bab8cba3fe9ca3e6a95eae88657cb4911
Author: Daniel Nylander <po@danielnylander.se>
Date:	Sat Oct 3 10:14:08 2009 +0200

    Updated Swedish translation

 po/sv.po | 311
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 179 insertions(+), 132 deletions(-)

commit 3338f6365114f19790944d4e0f4741a8a3e50e72
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Fri Oct 2 22:08:29 2009 +0200

    Updated Italian translation

 po/it.po | 171
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 101 insertions(+), 70 deletions(-)

commit c176057160c98197146fcfcd1c354b6c890dc707
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Fri Oct 2 20:21:55 2009 +0200

    Updated German translation

 po/de.po | 249
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 136 insertions(+), 113 deletions(-)

commit dff401109e3c25a4ce72ca59505aa08a841718cc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 2 17:23:52 2009 +0100

    empathy-accounts-dialog: 'Create' button should be 'Next' on Moblin

 src/empathy-accounts-dialog.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit b32ef40cc7c4dfbc6376c37989e8203f744bc6de
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri Oct 2 12:30:01 2009 +0200

    Remove the logic that re-applies the original enabled value.

    Now that we instant-apply the setting, this is not needed anymore.
    Also, this fixes a crasher.

 libempathy-gtk/empathy-account-widget.c | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

commit 675a9ca2afc1f3ab506bc7b24d3fabf4b9c0ab7f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 2 17:01:51 2009 +0100

    empathy-account-widget: document that the 'Account:' string is
    moblin specific

 libempathy-gtk/empathy-account-widget.c | 1 +
 1 file changed, 1 insertion(+)

commit 9617b1fa7265ee6d1bda4bfba591107fb11a8df2
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri Oct 2 18:04:41 2009 +0200

    Fix a typo in a string.

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5087ba96c4c93f03784c92eab3ffc212ef551b88
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri Oct 2 15:08:49 2009 +0200

    Change strings for the remove dialog on the moblin build.

 src/empathy-accounts-dialog.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit fce1e0c10e9d02a010eceb1e5f3734b67a38b641
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri Oct 2 14:51:15 2009 +0200

    Rename the Connect button to "Log in" on Moblin.

 libempathy-gtk/empathy-account-widget.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit abb123fcefb5ca1ecdeeb8ca2813de20da9f7e09
Author: Rob Bradford <rob@linux.intel.com>
Date:	Fri Oct 2 16:04:10 2009 +0100

    Bring up notifications until the conversation is accepted (#597125)

    Rather than filter out message received signals for new conversations
    that have already been tried to be initiated let them pass
    through. This
    results in you getting notifications repeatedly until you open
    accept the
    conversation and open the conversation window with the user.

 src/empathy-event-manager.c | 7 -------
 1 file changed, 7 deletions(-)

commit ce8d523beb33cd57df62715ae1cf1fad6a601366
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 2 14:12:34 2009 +0100

    fix coding styles

 src/empathy-status-icon.c | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

commit 817bde504ebb05cfefb136ba77450eab0c374dfa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 2 13:02:25 2009 +0100

    empathy-status-icon: check if notification daemon supports actions

 src/empathy-status-icon.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

commit d734b80c282ebb9120c630e1d6e7a8bad289daff
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 2 12:50:48 2009 +0100

    initialize libnotify earlier in main()

    The status icon will have to query the notify daemon during its
    construction so libnotify has to be already initialized.

 src/empathy.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit ea995fbc6cc94712a4d10d931f48121c939db437
Author: Rob Bradford <rob@linux.intel.com>
Date:	Fri Oct 2 12:27:23 2009 +0100

    Add a "Respond" button to notifications to provide a positive action
    (#589408)

    The positive action is the same positive action that would be
    accomplished by clicking on the status icon.

 src/empathy-status-icon.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

commit 34010895cf8b0915b5f6bb162ba6165271b48c3c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 2 15:16:27 2009 +0100

    add event type to EmpathyEvent (#589409)

 src/empathy-event-manager.c | 52
 +++++++++++++++++++++++++++------------------
 src/empathy-event-manager.h | 20 ++++++++++++-----
 2 files changed, 46 insertions(+), 26 deletions(-)

commit 6b6983badfeb96c351829fc72816de849edbd5ad
Merge: 908127a 0f0f74b
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Oct 1 17:59:04 2009 +0200

    Merge branch 'chain'

commit 908127a87ff5647ff00aa54ece3ec85c48c7ffe3
Merge: 267e769 0e914b5
Author: Dafydd Harries <daf@rhydd.org>
Date:	Thu Oct 1 15:32:28 2009 +0100

    Merge commit 'gabriel/fix-581488'

commit 0f0f74b2f7c25b8436c5394c7ba9cfc8125fb274
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Oct 1 13:05:12 2009 +0200

    Chain up to the parent class render, instead of copying it.

 libempathy-gtk/empathy-cell-renderer-activatable.c | 148
 +--------------------
 1 file changed, 3 insertions(+), 145 deletions(-)

commit 267e769eda9406c324b19c308330143fde287cc8
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Oct 1 12:14:53 2009 +0200

    Return if the renderer has no pixbuf.

 libempathy-gtk/empathy-cell-renderer-activatable.c | 3 +++
 1 file changed, 3 insertions(+)

commit 991f4ed92181fae6c92a4d1b3506bc8d901b4a6c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 8 14:23:09 2009 +0100

    empathy.schemas.in: s/criterium/criterion (#594308)

 data/empathy.schemas.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b62fa5c1f53e4bc8554e4071ed8249c5f5b49e4f
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Thu Oct 1 10:04:26 2009 +0100

    Rephrase geolocation preferences (#585957)

 src/empathy-preferences.ui | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 0e914b5142f3ca7c6f283edbbfda986dd570deaa
Author: Gabriel Millaire <gabriel.millaire@collabora.co.uk>
Date:	Wed Sep 30 14:17:05 2009 -0400

    Fixed a leak of str

 libempathy-gtk/empathy-chat-text-view.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d7cd12a662172eca0276c8bbe13fc1257e0d0609
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Tue Sep 29 17:57:53 2009 -0400

    Fix after review
    - Early return if no selection
    - Now uses a for-loop with gtk_text_iter_equal
    - Renamed flag_return to ignore_newlines, same meaning
    - Improvement to string_append

 libempathy-gtk/empathy-chat-text-view.c | 59
 ++++++++++++++++-----------------
 libempathy-gtk/empathy-theme-boxes.c	 |  8 ++---
 2 files changed, 33 insertions(+), 34 deletions(-)

commit 3f4adb1dc22d89c35b56ea5fa99a5976cfc101bb
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Wed Jul 1 13:17:00 2009 -0400

    Fix copy clipboard to show smileys and to show name and time when
    using themes other than Classic
    Adds an association string to hbox for name and time in themes,
    adds an association string to pixbuf smiley

 libempathy-gtk/empathy-chat-text-view.c | 47
 ++++++++++++++++++++++++++++++++-
 libempathy-gtk/empathy-smiley-manager.c |  2 ++
 libempathy-gtk/empathy-theme-boxes.c	 | 11 ++++++++
 3 files changed, 59 insertions(+), 1 deletion(-)

commit d038bcbb47ea96e4c128f85f64897d557ea380b9
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Sep 30 09:40:16 2009 +0200

    Even if Next*.html are missing, we have to use the appendNextMessage
    js function for consecutive message.

 libempathy-gtk/empathy-theme-adium.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit 1d51095fdf7beea98a0a89c89d19b1dd1efec927
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Sep 28 09:52:41 2009 +0200

    Respect "DisableCombineConsecutive" adium theme setting. Fixes
    bug #596317

 libempathy-gtk/empathy-theme-adium.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 942b989926d9a4ebecafc1ecd0586be19ee4aeda
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Sep 28 09:44:30 2009 +0200

    Make the correct fallbacks in case of missing html files in an Adium
    theme. Fixes bug #596303

 libempathy-gtk/empathy-theme-adium.c | 101
 ++++++++++++++++++-----------------
 1 file changed, 51 insertions(+), 50 deletions(-)

commit b1661630396060bff43ce5f4e2aeefb7e292ea65
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 30 15:06:13 2009 +0200

    Don't rely on EmpathyAccountManager to be ready.

    This fixes a crash when Empathy is launched with the '--accounts'
    option.

 src/empathy-accounts-dialog.c | 99
 +++++++++++++++++++++++++++----------------
 1 file changed, 62 insertions(+), 37 deletions(-)

commit 67fdffb909d907b62a4900b605c53f1288f31053
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 30 12:24:30 2009 +0200

    Rename the Create button to Add on moblin.

 src/empathy-accounts-dialog.c | 3 +++
 1 file changed, 3 insertions(+)

commit 2a27b9a4f94d08614be03d915dbc261f30da9f42
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 30 12:24:18 2009 +0200

    Disable account creation on moblin.

 src/empathy-accounts-dialog.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit ace52fb8ffdadc6795d1305de212e044a3625b19
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 30 11:57:45 2009 +0200

    Add a spacing of 6 between the buttons.

 src/empathy-accounts-dialog.ui | 1 +
 1 file changed, 1 insertion(+)

commit 150f031eb2d56c88a528bfc97650f2190b9822fd
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 30 11:44:46 2009 +0200

    Make sure the Add and Import buttons are always the same height.

 src/empathy-accounts-dialog.ui | 46
 +++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 19 deletions(-)

commit a1f8c26fcebd859e23dc4ee72b8215153aa728db
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 30 11:33:44 2009 +0200

    Don't expand/fill the import button.

 src/empathy-accounts-dialog.ui | 2 ++
 1 file changed, 2 insertions(+)

commit 20c14adfb956e9354ce7757fdd7647de8e7641a0
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 30 11:07:46 2009 +0200

    Hide the action area if we're on moblin.

 src/empathy-accounts-dialog.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 78a64f4405ed0a6e690d5d165f4e3e13618c3db6
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 30 10:55:16 2009 +0200

    Add a vertical padding to the rows.

 src/empathy-accounts-dialog.c | 3 +++
 1 file changed, 3 insertions(+)

commit 86cbe5d53c2826192741f179e3b434491f09c4a9
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Sep 29 17:31:14 2009 +0200

    Use the property in the accounts dialog.

 src/empathy-accounts-dialog.c | 3 +++
 1 file changed, 3 insertions(+)

commit 20d67de0b67588163800b633174d245dfd509f2e
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Sep 29 17:30:23 2009 +0200

    Add a "show-on-select" property.

    This implies copying the render function from gtkcellrendererpixbuf.c
    and modifying it slightly.

 libempathy-gtk/empathy-cell-renderer-activatable.c | 342
 +++++++++++++++++----
 libempathy-gtk/empathy-cell-renderer-activatable.h |	1 +
 2 files changed, 283 insertions(+), 60 deletions(-)

commit 3896a68d0f8f86350794afc06db6b8de640adddc
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Tue Sep 29 21:25:30 2009 +0200

    Updated German doc translation

 help/de/de.po | 3041
 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 1573 insertions(+), 1468 deletions(-)

commit 32726fae58b90a02f3c6cdb7435d15966684cc37
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 28 17:11:55 2009 +0200

    Add an import button back to the accounts dialog.

    The button is only shown when there are actually accounts to import.

 src/empathy-accounts-dialog.c	| 17 ++++++++++++++++-
 src/empathy-accounts-dialog.ui | 11 +++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

commit c637daaf5750c1809e05ff39fa2070591410aac3
Merge: ea2be64 51e36d3
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 28 16:39:59 2009 +0200

    Merge branch 'moblin'

    Conflicts:
	libempathy-gtk/empathy-account-widget.c

commit ea2be64bc7b7e5a7c2c15c38fe6f61b27ca2fb14
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 28 12:18:40 2009 +0200

    Instant-apply the "enabled" setting.

 libempathy-gtk/empathy-account-widget.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 51e36d3edfb6557c4cbafd81c534e6e633f393aa
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 28 12:18:40 2009 +0200

    Instant-apply the "enabled" setting.

 libempathy-gtk/empathy-account-widget.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

commit c0c510473a1ac11e1718c7893f9276701b784eb6
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Sun Sep 27 20:17:50 2009 +0200

    Add configure switches for nbtk (off by default).

 configure.ac		    | 28 ++++++++++++++++++++++++++++
 libempathy-gtk/Makefile.am |  2 ++
 2 files changed, 30 insertions(+)

commit 05b934b4c03aa24f3be3ac493b7c7485756f6383
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Sun Sep 27 20:16:50 2009 +0200

    Add an optional NbtkGtkLightSwitch.

    Use an optional NbtkGtkLightSwitch instead of a GtkToggleButton to set
    an account enabled/disabled.

 libempathy-gtk/empathy-account-widget.c | 75
 ++++++++++++++++++++++++++++++---
 1 file changed, 70 insertions(+), 5 deletions(-)

commit 125644f65e893c4f6922a7d0e88dbf08ebe08221
Author: Kentaro Kazuhama <kazken3@gmail.com>
Date:	Sun Sep 27 12:44:12 2009 +0900

    Updated Japanese translation

 po/ja.po | 2465
 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 1678 insertions(+), 787 deletions(-)

commit 75d394d797214cd4bd5c2ff812d31c28fedd0eae
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sat Sep 26 16:21:39 2009 +0200

    Updated Italian translation

 po/it.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 731b466318ee38df8917521ad99011225d5ff84e
Author: Tomasz Dominikowski <dominikowski@gmail.com>
Date:	Fri Sep 25 01:05:07 2009 +0200

    Updated Polish translation

 po/pl.po | 363
 ++++++++++++++++++++-------------------------------------------
 1 file changed, 117 insertions(+), 246 deletions(-)

commit 15fafb1a011fa2672712d7b8df4a2f59e25bc3ef
Author: Bastien Nocera <hadess@hadess.net>
Date:	Thu Sep 24 16:44:47 2009 +0100

    Update POTFILES to match new nst plugin name

 po/POTFILES.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0cd0ad2142e6722ffc620824e424277e1f622ce1
Author: Bastien Nocera <hadess@hadess.net>
Date:	Wed Sep 23 14:17:57 2009 +0100

    Add nautilus-sendto plugin

    As nautilus-sendto now exports its plugin API.

    https://bugzilla.gnome.org/show_bug.cgi?id=596075

 Makefile.am					  |   4 +
 configure.ac					  |  26 ++
 nautilus-sendto-plugin/Makefile.am		  |  19 ++
 nautilus-sendto-plugin/empathy-nautilus-sendto.c | 290
 +++++++++++++++++++++++
 po/POTFILES.in					  |   2 +
 5 files changed, 341 insertions(+)

commit 3b1dc603c5f7174904bc1c6c01566700f0bab894
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 23 18:43:43 2009 +0200

    Don't rely on the widget allocation to be != 0.

    This should fix bug #595945.

 src/empathy-call-window.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

commit afc13fa1d9a600647fa806a0b7c40446aca26658
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Thu Sep 24 10:28:46 2009 +0200

    Updated Spanish translation

 po/es.po | 108
 ++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 48 insertions(+), 60 deletions(-)

commit 360a16647a4fff130ab0c4c957adb28ddd71a3db
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Sep 18 11:29:29 2009 +0200

    Fix little coding style

 src/empathy-chat-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 129fd234d566682e2ea839aa7a55f13cf3a72fb7
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Sep 24 09:08:56 2009 +0200

    Bump GLib requirement to 2.22.0

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit aebda6a7210c525cdbd6e878c508fed99b4ab7ab
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Sep 24 09:05:51 2009 +0200

    Revert "Revert "Remove deprecated call to g_mapped_file_free()""

    This reverts commit 0343c43f77ab5e59c614af0c0fa60d518d78a774.

 libempathy/empathy-log-store-empathy.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

commit 0e34ca788bcf7edd644139166175145b12ca037c
Merge: 428ac42 e1d5864
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 23 18:24:24 2009 +0200

    Merge branch 'missing-icon'

commit e1d586491b6dff96f88e9311390162d1d2798df7
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 23 18:10:43 2009 +0200

    Don't show the "missing" image (#595921).

    If the icon theme doesn't have the protocol icon for the account we
    currently selected, show a default icon.

 src/empathy-accounts-dialog.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 428ac420a4d6ccc2b7468c59232c98e05619f5fa
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 23 17:51:22 2009 +0200

    Don't always show the main window (#596044).

 src/empathy-main-window.c | 2 --
 1 file changed, 2 deletions(-)

commit eff3dea95f6aac46d5d4dda80d225c3464b403af
Merge: d30b840 ea226b2
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Sep 23 15:36:39 2009 +0200

    Merge branch 'contact-id'

commit ea226b276392e05c8da9273d5e0dd3793362bf27
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Sep 23 15:29:15 2009 +0200

    Init contact_id to NULL to silent some stupid compilators. It can't
    really be used not initialized anyway.

 libempathy-gtk/empathy-contact-list-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d30b840853d62cc54574372aeee1dd85d9b04aab
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Sep 22 15:24:04 2009 +0100

    Cancel existing group animation before starting another

    Fixes Gnome bug #595962.

 libempathy-gtk/empathy-cell-renderer-expander.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit cf5784fe3e77bedfe25f3b31dff6eb92e7a580ee
Author: Olivier Le Thanh Duong <olivier@lethanh.be>
Date:	Thu Sep 3 16:18:39 2009 +0200

    Add a Best fit button to the map view (#584034)

    Add a button to the contact map view which show all the contacts
    at once.

 src/empathy-map-view.c  | 23 +++++++++++++++++++++++
 src/empathy-map-view.ui | 10 ++++++++++
 2 files changed, 33 insertions(+)

commit 775ad4a575d720ef964d08e1ab12099da2f3af71
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Sep 22 10:14:55 2009 +0200

    Do not use math.h for trunc(). It is useless and it does not build
    because we don't link with -lm.

 libempathy-gtk/empathy-location-manager.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit e1ac09b63ec657e8665540d4806a8d3cadef77ce
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Sep 21 19:35:04 2009 +0200

    Bump version to 2.29.1

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 06d54b8496a7878bcc98b59ac74da61bac816735
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Sep 21 19:22:56 2009 +0200

    Update python bindings

 python/pyempathy/pyempathy.defs       | 116
 ++++++++++++++++++++++++++++++++++
 python/pyempathygtk/pyempathygtk.defs |  22 +++++++
 2 files changed, 138 insertions(+)

commit 387058612889428532f1c7f6a9792e0d4aa7f1e5
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Sep 21 19:07:22 2009 +0200

    Update NEWS

 NEWS | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

commit 1f8c4430ca3b1e97c52e8bb76e2d2d2411fccd10
Author: Shaun McCance <shaunm@gnome.org>
Date:	Mon Sep 21 11:57:40 2009 -0500

    [help] Commenting out copyright info for now

 help/C/account-irc.page	     | 2 ++
 help/C/account-jabber.page	     | 2 ++
 help/C/accounts-window.page	     | 2 ++
 help/C/add-account.page	     | 2 ++
 help/C/add-contact.page	     | 2 ++
 help/C/audio-call.page		     | 2 ++
 help/C/audio-video.page	     | 2 ++
 help/C/change-status.page	     | 2 ++
 help/C/create-account.page	     | 2 ++
 help/C/disable-account.page	     | 2 ++
 help/C/favorite-rooms.page	     | 2 ++
 help/C/geolocation-not-showing.page | 2 ++
 help/C/geolocation-privacy.page     | 2 ++
 help/C/geolocation-supported.page   | 2 ++
 help/C/geolocation-turn.page	     | 2 ++
 help/C/geolocation-what-is.page     | 2 ++
 help/C/geolocation.page	     | 2 ++
 help/C/group-conversations.page     | 2 ++
 help/C/import-account.page	     | 2 ++
 help/C/index.page		     | 2 ++
 help/C/introduction.page	     | 2 ++
 help/C/irc-join-pwd.page	     | 2 ++
 help/C/irc-join-room.page	     | 2 ++
 help/C/irc-manage.page		     | 2 ++
 help/C/irc-nick-password.page	     | 2 ++
 help/C/irc-send-file.page	     | 2 ++
 help/C/irc-start-conversation.page  | 2 ++
 help/C/offline-contacts.page	     | 2 ++
 help/C/prev-conv.page		     | 2 ++
 help/C/prob-conn-acctdisabled.page  | 2 ++
 help/C/prob-conn-auth.page	     | 2 ++
 help/C/prob-conn-name.page	     | 2 ++
 help/C/prob-conn-neterror.page      | 2 ++
 help/C/prob-conn.page		     | 2 ++
 help/C/remove-account.page	     | 2 ++
 help/C/salut-protocol.page	     | 2 ++
 help/C/send-file.page		     | 2 ++
 help/C/send-message.page	     | 2 ++
 help/C/set-custom-status.page	     | 2 ++
 help/C/share-desktop.page	     | 2 ++
 help/C/status-icons.page	     | 2 ++
 help/C/video-call.page		     | 2 ++
 42 files changed, 84 insertions(+)

commit db0a8206853d58375960fabe1ae38267ba0576ec
Merge: 3f69fec 1ca52da
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Sep 20 21:53:14 2009 +0200

    Merge commit 'istaz/handle_none'

commit 1ca52da13f25b623adb55127aee61c6ea2f68bea
Author: Olivier Le Thanh Duong <olivier@lethanh.be>
Date:	Sun Sep 20 18:42:20 2009 +0200

    Fallback to the contact id if present when there is no room id for
    empathy_tp_chat

 libempathy-gtk/empathy-chat.c |  7 +++----
 libempathy/empathy-tp-chat.c  | 11 ++++++++++-
 src/empathy.c		       | 11 +----------
 3 files changed, 14 insertions(+), 15 deletions(-)

commit 3f69fecb7d8405f7a9e3c8e7b34665e536b7de0c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Sep 20 12:58:06 2009 +0100

    Add StreamMedia channelfilters with InitialAudio and InitialVideo

 src/empathy.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

commit 0863264ba49fbc3561084cac8c68e01748c7764c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Sep 20 12:55:25 2009 +0100

    Set the ice-udp capability directly as well

 libempathy/empathy-dispatcher.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 2a68a8beb9a0cf4493f0370df175286603840144
Author: Yavor Doganov <yavor@gnu.org>
Date:	Sun Sep 20 09:04:10 2009 +0300

    Updated Bulgarian translation

 po/bg.po | 992
 +++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 654 insertions(+), 338 deletions(-)

commit 86b5fef59a5adca9a15f3743bbbea7bbe0adf8ad
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Fri Sep 18 21:17:26 2009 +0300

    Updating Estonian translation

 po/et.po | 40 +++++++++++++++-------------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

commit 672166485bba1419dfc167a170a8bd9a6afe9b8e
Author: Rajesh Ranjan <rranjan@rranjan.csb>
Date:	Fri Sep 18 17:26:20 2009 +0530

    maithili update

 po/LINGUAS |	 1 +
 po/mai.po  | 2815
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 2816 insertions(+)

commit f06b2c8323486f70643218e13b6ae9bc4206019e
Merge: 5694ed5 ea8355c
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Fri Sep 18 11:52:23 2009 +0100

    Merge branch 'idle-state'

commit 5694ed583c63202600812a0f19dc2a250e7ef2ae
Author: Maxim V. Dziumanenko <dziumanenko@gmail.com>
Date:	Fri Sep 18 10:06:44 2009 +0300

    Added Ukrainian translation

 po/uk.po | 1059
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 680 insertions(+), 379 deletions(-)

commit ea8355c99dc527d7602ce7b0c5bf3a83b2a8adaa
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Sep 17 23:45:03 2009 +0100

    presence-chooser: only listen to EmpathyIdle::notify::state

    Previously, when the global presence changed in EmpathyIdle, it would
    notify for "state" and "status", so the state change callback would be
    called twice.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy-gtk/empathy-presence-chooser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 362089ad2d09b2992453e567c6c39fb4bb356dbc
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Sep 17 23:43:00 2009 +0100

    idle: wait for the account manager to be ready before setting
    initial state

    Also, if we can get the global presence from the account manager
    straight away (in _init), then don't bother signalling the
    change. Otherwise, do signal the initial setting so things like the
    presence chooser and status icon will be updated with the initial
    presence.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-idle.c | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

commit eba6377a41b2b4780850465f61a07d3030693269
Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
Date:	Thu Sep 17 22:23:36 2009 +0300

    Updated Romanian translation

 po/ro.po | 2767
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1785 insertions(+), 982 deletions(-)

commit 5c9327240c2c1498a3441a8462d13ae479a0fae2
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Sep 17 14:04:25 2009 +0200

    Don't paste if the remote contact is disconnected (#595417).

 libempathy-gtk/empathy-chat.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 847aa7cd822ea23d0619ebfdfcbee61ad374c42c
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Sat Aug 22 18:30:46 2009 +0100

    Iterate avatar tokens with a GHashTableIter

 libempathy/empathy-tp-contact-factory.c | 49
 +++++++++++++--------------------
 1 file changed, 19 insertions(+), 30 deletions(-)

commit 7eb816f6c5ce610f767a40f387f0b4aef2a6e153
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Sat Aug 22 18:24:13 2009 +0100

    Get rid of the last two _run_ calls in Empathy

    Hooray! Also, don't try to get known avatar tokens or capabilities if
    the CM doesn't support them. This reduces the outrageous Debug spam
    when I connect to a Haze account or (worse) a big IRC channel.

    Fixes Gnome bug #532737

 libempathy/empathy-tp-contact-factory.c | 60
 ++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 31 deletions(-)

commit 8dfca8c1e51261928a12bcf62014927ebd279206
Author: Žygimantas Beručka <zygis@gnome.org>
Date:	Wed Sep 16 19:18:00 2009 +0300

    Updated Lithuanian translation

 po/lt.po | 1266
 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 833 insertions(+), 433 deletions(-)

commit bc3deb13a79fa311f9b0926f916673db3a8868e9
Author: Ilkka Tuohela <hile@iki.fi>
Date:	Wed Sep 16 18:47:10 2009 +0300

    Updated Finnish translation

 po/fi.po | 1183
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 657 insertions(+), 526 deletions(-)

commit e560183ac77e780c9ee732a2daf8d75cf0d823ca
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Sep 16 15:30:16 2009 +0200

    Fix indentation of previous patch

 libempathy/empathy-contact.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 59741e29701de30b3cdb34a38cab4b48dd2384e7
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Sep 16 15:20:36 2009 +0200

    empathy_avatar_new takes ownership of arguments. Do not free filename.

 libempathy/empathy-contact.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit bbcee82de3ff150cf51c3cefa945e8ababcde4d7
Author: Tomasz Dominikowski <dominikowski@gmail.com>
Date:	Wed Sep 16 15:23:52 2009 +0200

    Update Polish translation

 po/pl.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 064115126f2af7b527c05bdfc1935257105e581e
Author: Tomasz Dominikowski <dominikowski@gmail.com>
Date:	Wed Sep 16 15:23:04 2009 +0200

    Update Polish translation

 po/pl.po | 54 +++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

commit b3a02f8d04f843a508b1671782d2c63a5e89b170
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Wed Sep 16 15:06:09 2009 +0200

    Updated Polish translation

 po/pl.po | 79
 ++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 40 insertions(+), 39 deletions(-)

commit b1cd5c5bfaa4b0e8095bf35d6c2dd31d4967f619
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Sun Sep 13 19:44:31 2009 +0200

    Updated Polish translation

 po/pl.po | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

commit f217cea60098ef05e1e3cc34464688b1c0610f4f
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Wed Sep 16 14:17:05 2009 +0200

    Updated Slovenian translation

 po/sl.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 178f99d48523f37ee95cf21384b52874047d4e9b
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Wed Sep 16 14:15:18 2009 +0200

    Updated Slovenian translation

 po/sl.po | 2755
 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 1831 insertions(+), 924 deletions(-)

commit 69115f671d48fc76e4fb033268062a815bfe957e
Author: Antón Méixome <meixome@mancomun.org>
Date:	Wed Sep 16 14:48:37 2009 +0200

    Updated Galician Translation

 po/gl.po | 1038
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 669 insertions(+), 369 deletions(-)

commit d18a42aba704a59875a95ecb51838c77722a8990
Author: Amitakhya Phukan <aphukan@fedoraproject.org>
Date:	Wed Sep 16 17:47:24 2009 +0530

    Adding as to LINGUAS and adding new Assamese translations.

 po/LINGUAS |	 1 +
 po/as.po   | 2854
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 2855 insertions(+)

commit e1d2138e205e9e86a6046a00db184c5d25805b62
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Sep 15 15:49:11 2009 +0200

    Only handle manually text channels.

 libempathy/empathy-dispatcher.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 3c3d82a778c7f085bb0f9250c8ea109019a7a5e1
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Sep 15 15:33:54 2009 +0200

    Dispatch existing channels once we initialize the connection.

 libempathy/empathy-dispatcher.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

commit 324a3823750279b14a6251c793bf36a7a821faa6
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Wed Sep 16 12:36:50 2009 +0200

    Updated Hungarian translation

 po/hu.po | 166
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 92 insertions(+), 74 deletions(-)

commit 197cdb5ad8eddc57cd99c29790e71aa684915569
Author: Runa Bhattacharjee <runab@redhat.com>
Date:	Wed Sep 16 14:49:26 2009 +0530

    Updated Bengali India Translations

 po/bn_IN.po | 175
 ++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 105 insertions(+), 70 deletions(-)

commit 92d9677c07a4591869cab86b27e21676221cf614
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Tue Sep 15 22:53:00 2009 +0300

    Updated Hebrew translation

 po/he.po | 283
 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 128 insertions(+), 155 deletions(-)

commit f1e62154f1e4469f7c4aad118b5e751a3e28a495
Author: krishnababu k <kkrothap@redhat.ocm>
Date:	Tue Sep 15 20:13:58 2009 +0530

    Updated Telugu Translation

 po/te.po | 1645
 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 860 insertions(+), 785 deletions(-)

commit faa44db1d31171e757d52338b6f549476a2917c5
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Sep 15 12:12:55 2009 +0200

    Fix long lines.

 libempathy/empathy-dispatcher.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit 36fcf8ff5514a2e2d941a0f9544098db25b3d8d4
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Sep 15 12:12:16 2009 +0200

    Always call _ensure_channel for text chats.

    So we can catch opened channels as well, e.g. if we crashed.

 libempathy/empathy-dispatcher.c | 52
 +++++++++++++++++++++++++++++++++--------
 1 file changed, 42 insertions(+), 10 deletions(-)

commit 93bc2c62fc9ae522b2d23d7354d0881936c72faa
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Sep 15 12:11:16 2009 +0200

    Release the busname on disposal.

 libempathy/empathy-handler.c | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

commit c490644841baa24bb39e6078ebd121f3883c1b2f
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Tue Sep 15 09:19:13 2009 +0200

    [help] Fixed MSN support of audio/video call, chenged to Yes

 help/C/audio-video.page | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 0b235f9223d30ea4a62c692cac65fa509f824635
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Sep 14 23:27:21 2009 +0100

    Use : instead of / to seperate account and contact id

 megaphone/src/megaphone-applet.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

commit c1b66fcb4e53cfa4207510541f2144ca605a5d98
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Sep 14 23:21:17 2009 +0100

    Correctly split and sanity check dropped contacts

 libempathy-gtk/empathy-contact-list-view.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

commit c5f8856f80196642a8df35af72160ce9b260efdd
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Sep 14 23:12:38 2009 +0100

    Ignore the drop if we can't get the right information from it

 src/empathy-chat-window.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

commit dea33b57496a4aa8f5c3d6a9e541c95b54196fb3
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 14 18:05:14 2009 +0200

    Don't use "/" to separate account and contact.

 libempathy-gtk/empathy-contact-list-view.c | 2 +-
 src/empathy-chat-window.c		    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 9600d59c5317b692e3549e0bcc293607cda5fb4e
Author: Steve Frécinaux <code@istique.net>
Date:	Mon Sep 14 21:10:36 2009 +0200

    Fix previous patch.

    Sometimes, reworking trivial patches goes bad...

 libempathy-gtk/empathy-ui-utils.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit ff5b9397a4a2ca0e1b918b196cc14f9c6634d013
Author: Steve Frécinaux <code@istique.net>
Date:	Mon Sep 14 20:31:23 2009 +0200

    Ensure the Contact List is moved to the current workspace when shown.

    The new metacity/mutter 2.27 only moves windows to current workspace
    on
    present() when the window is a dialog. The Contact List isn't one,
    so we
    try to be smart and move explicitely the window's toplevel GdkWindow
    on
    the current workspace before trying to present it.
    This has been tested successfully with mutter 2.27 and metacity 2.26.

    This fixes Bug 593883 - Empathy misbehaviour within gnome-shell.

 libempathy-gtk/empathy-ui-utils.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

commit 590428c77768377bcc5678364380b136fda96f35
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@novopia.com>
Date:	Mon Sep 14 14:11:36 2009 -0400

    Depend on released libchamplain 0.4

 configure.ac | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit fe0dd31c143abf6fa1e9a0a9c14f92508617d218
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 14 17:16:15 2009 +0200

    Plug some leaks

 libempathy/empathy-account-settings.c | 3 +++
 libempathy/empathy-contact.c	       | 2 ++
 2 files changed, 5 insertions(+)

commit 178e57939162526089e56b8bd033ca2dcbb8f943
Author: Astur <malditoastur@gmail.com>
Date:	Mon Sep 14 16:40:33 2009 +0200

    Added Asturian translation

 po/LINGUAS |	 1 +
 po/ast.po  | 2940
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 2941 insertions(+)

commit f3b365193241950efbe62737bcf049ac7d66d9c4
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 14 16:29:26 2009 +0200

    Check for NULL sink.

 src/empathy-call-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit e6193d56618533455724a7ec82e4f275a81967c0
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 14 16:24:43 2009 +0200

    Fix long lines.

 src/empathy-call-window.c | 55
 ++++++++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 22 deletions(-)

commit 1d14dfb12afb8f2cdd8db903573665799b4c7311
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 14 16:24:16 2009 +0200

    Move the toolbar setup after we initialize the audio output

 src/empathy-call-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b49a67f96c17eed32be230bf8b6e59eb54ca595f
Author: Runa Bhattacharjee <runab@redhat.com>
Date:	Mon Sep 14 18:14:50 2009 +0530

    Updated Bengali India Translations

 po/bn_IN.po | 2099
 ++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 1140 insertions(+), 959 deletions(-)

commit ba50e508b7552acf9c1652bd7a8ccb6e1ea6a6b7
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 14 12:10:40 2009 +0200

    Fix a long line.

 src/empathy-import-pidgin.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 3a91ef0255c807c3e60f0a153b81ea3b1b427343
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 14 12:09:50 2009 +0200

    Watch the DBus signature of the param.

    We used to hardcode UINT, but this does not work for haze CMs.

 src/empathy-import-pidgin.c | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

commit 6f1ccfd73f5bc6446b50f1d557691b90b1024210
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 14 12:09:25 2009 +0200

    Move accounts assignment after the CMS are ready

 src/empathy-import-widget.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 3ee3162a25751ce528cf84661b2d515820b15cfb
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 14 12:08:59 2009 +0200

    Move protocol_is_supported() to empathy-import-utils

 src/empathy-import-utils.c  | 44
 ++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-import-utils.h  |	4 ++++
 src/empathy-import-widget.c | 31 +++++--------------------------
 3 files changed, 53 insertions(+), 26 deletions(-)

commit ddcb7848002b70bc8950d45a9079582a8787c394
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:	Mon Sep 14 11:33:06 2009 +1000

    [EmpathyVideoWidget] fix X crash when using Empathy with GTK+ c-s-w

    In client-side-windows enabled GTK+, a call to GDK_WINDOW_XID()
    implicitly calls
    gdk_window_ensure_native() so that a native X11 window exists
    serverside to
    have an XID for.

    Calling gdk_window_ensure_native() from a thread is not awesome
    and causes
    Empathy to abort with one of several X errors. The fix is to call
    GDK_WINDOW_XID() as soon as the widget is realized, before the XID
    is requested
    from a thread (it would be neater to call gdk_window_ensure_native()
    here,
    but that would force us to require GTK+ 2.18, which we don't want
    to do).

    Fixes gnome bug #594890

 libempathy-gtk/empathy-video-widget.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 38cf0499b0329c0556cb2adc2460fb234c596a43
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Sep 13 16:58:46 2009 +0100

    Assert that we get a non-null account passed when creating a contact
    for a log

 libempathy/empathy-contact.c | 1 +
 1 file changed, 1 insertion(+)

commit 6d7f7edd8ee8290d0e07441523d6c9e44ed0a38d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Sep 13 16:57:48 2009 +0100

    When getting messages for a file, pass the account as we already
    know it

 libempathy/empathy-log-store-empathy.c | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

commit c558a5ee937d50332885003c87a1b8c8520a412a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Sep 13 15:34:55 2009 +0100

    Ensure we don't add the same contact twice at the top-level

 libempathy-gtk/empathy-contact-list-store.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit cbe0d0b4ecbffe71334fa7c25ff49612c521cf3d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Sep 13 15:13:11 2009 +0100

    Check if the remote-contact is actually there before putting it on
    the list

 libempathy/empathy-tp-chat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 074c63227fd6bd3ce7bae43135d0ff7e2bf37ba8
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Sep 13 15:01:16 2009 +0100

    Ensure the notification callback data is always freed

 src/empathy-chat-window.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

commit 733da7c7268c0c77b7cb39701b4f9f1f15d63fd2
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Sep 13 11:10:47 2009 +0100

    Fix potential usage of an unitialized value

 src/empathy-import-mc4-accounts.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0c620b73bc183858e16e859c66ab5c04baf176b8
Author: Ask H. Larsen <asklarsen@gmail.com>
Date:	Sun Sep 13 13:58:59 2009 +0200

    Updated Danish translation

 po/da.po | 227
 +++++++++++++++++++++++++--------------------------------------
 1 file changed, 88 insertions(+), 139 deletions(-)

commit 966524dc7fa0f85616f6b92714d10e39e652b2fc
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date:	Sun Sep 13 19:39:43 2009 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 216
 ++++++++++++++++++++++++++++++------------------------------
 po/zh_TW.po | 216
 ++++++++++++++++++++++++++++++------------------------------
 2 files changed, 216 insertions(+), 216 deletions(-)

commit a25a901fe2999b7f1af294ffc527b4d5373499fa
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:	Sat Sep 12 18:31:26 2009 +0100

    Updated British English translation

 po/en_GB.po | 2604
 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 1752 insertions(+), 852 deletions(-)

commit 0975d0897b78e859f6f4cd94e258f45840ca20e8
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date:	Sat Sep 12 17:39:30 2009 +0200

    Updated Danish translation

 po/da.po | 2806
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1800 insertions(+), 1006 deletions(-)

commit 3f86788bd5ce08cfd5e77c25881ac42c4d2d54c0
Author: Jamil Ahmed <itsjamil@gmail.com>
Date:	Sat Sep 12 18:42:53 2009 +0700

    Added Bengali translation

 po/LINGUAS |	 1 +
 po/bn.po   | 2965
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 2966 insertions(+)

commit 16c2a05f2036683dad271d89ab2b338c96506752
Author: Frédéric Péters <fpeters@0d.be>
Date:	Fri Sep 11 10:47:43 2009 +0200

    remove duplicated id in yahoo account ui file (GNOME bug 594776)

 libempathy-gtk/empathy-account-widget-yahoo.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 54884e32bd264b2519ff3d3172f2b25791bb9e3c
Author: Duarte Loreto <happyguy_pt@hotmail.com>
Date:	Fri Sep 11 08:59:49 2009 +0100

    Updated Portuguese translation

 po/pt.po | 2617
 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 1725 insertions(+), 892 deletions(-)

commit fbbd61a878ebb1f0384b63370d202b70a9360a48
Author: Shankar Prasad <svenkate@redhat.com>
Date:	Fri Sep 11 10:57:08 2009 +0530

    Updated Kannada(kn) translation

 po/kn.po | 239
 ++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 146 insertions(+), 93 deletions(-)

commit ec08c46daf6963fe7f9d28dc581973686c4f2c1e
Author: Rajesh Ranjan <rranjan@rranjan.csb>
Date:	Thu Sep 10 13:23:13 2009 +0530

    hindi update by Rajesh Ranjan

 po/hi.po | 2587
 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 1708 insertions(+), 879 deletions(-)

commit aae4d7884219746b0a572ce4f19d7358e716e8ad
Author: Baris Cicek <baris@teamforce.name.tr>
Date:	Thu Sep 10 00:00:09 2009 +0300

    Updated Turkish translation.

 po/tr.po | 310
 ++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 188 insertions(+), 122 deletions(-)

commit 0c24d4c40532127dba6f197b8e3f59ddbc12781b
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Wed Sep 9 20:09:10 2009 +0200

    Updated German doc translation

 help/de/de.po | 4023
 ++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 2971 insertions(+), 1052 deletions(-)

commit 2a6b5684bd4e73e284b743af665322252f4a8649
Author: Shaun McCance <shaunm@gnome.org>
Date:	Wed Sep 9 12:21:53 2009 -0500

    [help] Adding geolocation note about servers supporting PEP

 help/C/geolocation-not-showing.page | 8 ++++++++
 1 file changed, 8 insertions(+)

commit d8e6d9a444325fa428fb27faabdbd605ce91e8d5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 9 17:36:46 2009 +0100

    dispatcher_request_failed: check if conn_data is not NULL

    Trace attached on lp #392678 seems to indicate that the
    priv->connections hash table doesn't have a ConnectionData associated
    with the connection. A possible explanation could be that this
    connection has been invalidated before the RequestChannel call is
    terminated.

    Check if ConnectionData so Empathy won't crash in such case.

 libempathy/empathy-dispatcher.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit a64a6378eb3098be9e51d1dda253f7fb0c4c1fa3
Author: Shaun McCance <shaunm@gnome.org>
Date:	Wed Sep 9 11:38:39 2009 -0500

    [help] Minimal proofreading, deferring some reviews to after 2.28.0

 help/C/geolocation-not-showing.page | 11 ++++++++---
 help/C/geolocation-privacy.page     | 15 ++++++++++-----
 help/C/geolocation-supported.page   | 11 ++++++++---
 help/C/geolocation-turn.page	     | 11 ++++++++---
 help/C/geolocation-what-is.page     | 29 ++++++++++++++++-------------
 help/C/geolocation.page	     | 12 ++++++++----
 help/C/group-conversations.page     | 11 ++++++++---
 help/C/salut-protocol.page	     |	7 ++++++-
 help/C/send-file.page		     | 13 +++++++++----
 help/C/send-message.page	     | 13 +++++++++----
 10 files changed, 90 insertions(+), 43 deletions(-)

commit 589b9b1d4e4fada570004c9f9d8b9e1b85501cda
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Sep 9 16:55:21 2009 +0100

    empathy_account_settings_get_uint32: check if
    empathy_account_settings_get returned NULL (#594653)

 libempathy/empathy-account-settings.c | 2 ++
 1 file changed, 2 insertions(+)

commit 46db0404512f9970483af8878ed826c43693c1b3
Author: Shaun McCance <shaunm@gnome.org>
Date:	Wed Sep 9 10:12:43 2009 -0500

    [help] Changing "Salut" to "People Nearby"

 help/C/audio-video.page	 |  5 -----
 help/C/group-conversations.page |  2 +-
 help/C/salut-protocol.page	 | 11 ++++++++---
 help/C/send-file.page		 |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

commit fccb4a20106376e026c614f6b848fa04d938a00a
Author: Shaun McCance <shaunm@gnome.org>
Date:	Wed Sep 9 10:09:11 2009 -0500

    [help] Removing start-conversation page

    We no doubt need to provide some sort of help for the New Conversation
    dialog, but this isn't the way to do it.

 help/C/start-conversation.page | 71
 ------------------------------------------
 help/Makefile.am		|  1 -
 2 files changed, 72 deletions(-)

commit 45c141e27c6b99bf6824157e597ea379bf45c90c
Author: Kostas Papadimas <pkst@gnome.org>
Date:	Wed Sep 9 18:00:32 2009 +0300

    Updated Greek translation.

 po/el.po | 2674
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1682 insertions(+), 992 deletions(-)

commit 9f82d7f6c050d574c1e9f48de05b7feb44f1b78b
Author: Praveen Arimbrathodiyil <pravi.a@gmail.com>
Date:	Wed Sep 9 00:24:46 2009 -0700

    Malayalam translations updated.

 po/ml.po | 2487
 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 1694 insertions(+), 793 deletions(-)

commit c8b0380c6788d5682f511734ba54ae808fafded3
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed Sep 9 01:05:33 2009 +0200

    Bump telepathy-glib requirement to 0.7.35

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ec8548b264514c8d999ad6cb66c80805857943ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 8 17:42:37 2009 +0100

    start dev of 2.28.0

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9a55fa969dd580a88f271478d1a6077e034d7022
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Sep 8 17:22:58 2009 +0100

    upgrade NEWS for 2.27.92

 NEWS | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

commit 0c16a75d15e2dd16011f615406176711613a93fa
Author: Shaun McCance <shaunm@gnome.org>
Date:	Tue Sep 8 11:18:26 2009 -0500

    [help] Fixing validity errors

    Mostly due to broken external-namespace defs in the Mallard spec

 help/C/account-irc.page	    | 2 ++
 help/C/account-jabber.page	    | 2 ++
 help/C/accounts-window.page	    | 2 ++
 help/C/add-account.page	    | 2 ++
 help/C/add-contact.page	    | 2 ++
 help/C/audio-call.page		    | 2 ++
 help/C/audio-video.page	    | 4 +++-
 help/C/change-status.page	    | 2 ++
 help/C/create-account.page	    | 2 ++
 help/C/disable-account.page	    | 2 ++
 help/C/import-account.page	    | 2 ++
 help/C/index.page		    | 2 ++
 help/C/introduction.page	    | 2 +-
 help/C/irc-join-pwd.page	    | 2 ++
 help/C/irc-join-room.page	    | 2 ++
 help/C/irc-manage.page		    | 2 ++
 help/C/irc-nick-password.page	    | 2 ++
 help/C/irc-send-file.page	    | 2 ++
 help/C/irc-start-conversation.page | 2 ++
 help/C/offline-contacts.page	    | 2 ++
 help/C/prev-conv.page		    | 2 ++
 help/C/remove-account.page	    | 2 ++
 help/C/status-icons.page	    | 2 ++
 help/C/video-call.page		    | 2 ++
 24 files changed, 48 insertions(+), 2 deletions(-)

commit 469e38c1578332e3cff6ceea9bf0940f9965ff04
Merge: 0cfd64b 923bb82
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Sep 8 16:22:00 2009 +0100

    Merge branch 'auto-connect'

commit 923bb82f3aa66ac7b24168b5b69541268bf9d055
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Sep 8 16:16:03 2009 +0100

    empathy: no need to connect to status-changed; notify::connection
    will do

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy.c | 86
 ++++++++++++++++++++---------------------------------------
 1 file changed, 29 insertions(+), 57 deletions(-)

commit 0cfd64b658e967d9e2257bb21aa43dce4762ee29
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Sep 8 15:36:44 2009 +0100

    Bump the libempathy and libempathy-gtk sonames again

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit bad3a4a0e80429a37eb02c2c59c3a60541ef41e0
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Sep 8 15:43:57 2009 +0100

    fix typo

 src/empathy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e423acc109dbfce1c34a23769c385dd38410f1f5
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Sep 8 14:25:16 2009 +0100

    empathy: auto-connect to chatrooms where appropriate

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy.c | 123
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 123 insertions(+)

commit b2ef2b768c2dbf77ff8647243862f183bb52cce0
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Sep 8 14:22:09 2009 +0100

    chatroom-manager: add a ready property

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-chatroom-manager.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit abc3ceffca882c47c1b8678deb304f4d7d60955e
Author: Sandeep Shedmake <sshedmak@redhat.com>
Date:	Tue Sep 8 14:45:03 2009 +0530

    Updated Marathi Translations

 po/mr.po | 306
 ++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 187 insertions(+), 119 deletions(-)

commit 475604709d371c12f256f3c4b65280a1fa0c0e43
Author: Sweta Kothari <swkothar@redhat.com>
Date:	Tue Sep 8 11:17:28 2009 +0530

    Updated Gujarati Translations

 po/gu.po | 246
 ++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 148 insertions(+), 98 deletions(-)

commit d8eccd299879640268f1ec96222991644dd5ba3e
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Mon Sep 7 17:51:14 2009 +0200

    Updated Polish translation

 po/pl.po | 3697
 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1663 insertions(+), 2034 deletions(-)

commit 1f5c37347a4d759b8f3b56e3e9986a3f255b893c
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Mon Sep 7 11:09:06 2009 +0200

    Updated Basque language

 po/eu.po | 40 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

commit 472ce530b4bc8d225ed9e579fbe1a8f6f6d98c4a
Author: Ivar Smolin <okul@linux.ee>
Date:	Mon Sep 7 11:23:44 2009 +0300

    Updating Estonian translation

 po/et.po | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

commit b65f80f53709c7dd9235612d7277c282f9193e81
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Sun Sep 6 17:34:04 2009 +0100

    tp-contact-factory: allow _get_from_handles to call with no handles.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-tp-contact-factory.c | 5 +++++
 1 file changed, 5 insertions(+)

commit ef621c236f7127f984e5796394264f2babd1920d
Author: Branko Kokanović <branko.kokanovic@gmail.com>
Date:	Sun Sep 6 15:21:26 2009 +0000

    Updated Serbian translation

 po/sr.po	| 2314
 +++++++++++++++++++++++++++++++++++++-------------------
 po/sr@latin.po | 2314
 +++++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 3066 insertions(+), 1562 deletions(-)

commit ef2cd4e8f0e24cf9e023fc10e8c61315e2734b63
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Sep 4 13:25:13 2009 +0200

    Convert Pidgin's int values to uints

 src/empathy-import-pidgin.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit e0c20c667a0a15a07b7cab30337f1078038968f3
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Sep 1 13:05:12 2009 +0200

    Fix a long line

 src/empathy-accounts-dialog.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 36809360e48fef7729b43ccc4416ed2b118fa459
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Sep 1 13:04:55 2009 +0200

    Manually handle delete events.

 src/empathy-accounts-dialog.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

commit 3f5b50c88c4e87fcf6a2b340655179764fe07848
Author: A S Alam <aalam@users.sf.net>
Date:	Sun Sep 6 14:06:20 2009 +0530

    Updating Translation for Gurmukhi by A S Alam

 po/pa.po | 1537
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 942 insertions(+), 595 deletions(-)

commit b6c586b2b29bf4a402da525a538430a99871d253
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Sep 6 10:34:18 2009 +0200

    Updated Italian translation

 po/it.po | 206
 +--------------------------------------------------------------
 1 file changed, 2 insertions(+), 204 deletions(-)

commit 650e90377f5cbd976ead1e1c3171ac69566fc9f4
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Sun Sep 6 00:20:18 2009 +0100

    chatroom-manager: only parse xml file once the account manager
    is ready

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-chatroom-manager.c | 32
 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

commit 9e50c6c125ae7db79ce1c79c50403ba8e9670d4c
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sat Sep 5 19:36:03 2009 +0200

    [help]	Created the Contact Management section in the index page
	Moved the contact related tasks in the new section

 help/C/add-contact.page      | 3 ++-
 help/C/index.page	      | 5 +++++
 help/C/offline-contacts.page | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

commit 409eb9169459db7a7fd51db47d22453a88d4987a
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Sat Sep 5 16:01:30 2009 +0200

    Hungarian translation updated

 po/hu.po | 2309
 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 1521 insertions(+), 788 deletions(-)

commit 994ead0a4635d7aef920ea04e5bc23c5dfb4598f
Author: Ivar Smolin <okul@linux.ee>
Date:	Sat Sep 5 09:10:58 2009 +0300

    Updating Estonian translation

 po/et.po | 114
 ++++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 77 insertions(+), 37 deletions(-)

commit 7ad87858b7d15ec184149023a3278d0a26d47171
Author: Shaun McCance <shaunm@gnome.org>
Date:	Fri Sep 4 15:47:35 2009 -0500

    [help] Some small corrections

 help/C/audio-video.page | 12 ++++++++++--
 help/C/prev-conv.page	 |  4 +---
 2 files changed, 11 insertions(+), 5 deletions(-)

commit 5b1df78b245d1e603d2ffa333b11bd636c69f1b2
Author: Shaun McCance <shaunm@gnome.org>
Date:	Fri Sep 4 11:51:12 2009 -0500

    [help] Updates to instructions for audio and video conversations

 help/C/audio-call.page  |  64 ++++++++++-------------
 help/C/audio-video.page | 132
 +++++++++++++++++++++++++++++++++++-------------
 help/C/video-call.page  |  57 +++++++++------------
 3 files changed, 148 insertions(+), 105 deletions(-)

commit 539195fab693e734688827d70934df5ef983092c
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Thu Sep 3 20:46:03 2009 +0200

    [help] Fixed a wrong full stop on a title

 help/C/irc-start-conversation.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 54efd9ec89f13ef8fc53744c0218c3a4dd8a8a61
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Thu Sep 3 19:01:04 2009 +0200

    Updated Italian translation

 po/it.po | 2476
 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 1676 insertions(+), 800 deletions(-)

commit f520ac2a3b78567276d0a531a7517afdb1142d67
Author: Christian Kirbach <christian.kirbach@googlemail.com>
Date:	Thu Sep 3 17:56:07 2009 +0200

    Updated German translation

 po/de.po | 247
 +++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 154 insertions(+), 93 deletions(-)

commit 430f4ef62308439a0e2edb29e6c08165ceff4d8e
Author: Guillaume Desmottes <gdesmott@gnome.org>
Date:	Mon Mar 2 23:07:51 2009 +0000

    add facebook icon

 data/icons/Makefile.am			       |   3 +++
 data/icons/hicolor_apps_16x16_im-facebook.png | Bin 0 -> 552 bytes
 data/icons/hicolor_apps_22x22_im-facebook.png | Bin 0 -> 731 bytes
 data/icons/hicolor_apps_48x48_im-facebook.png | Bin 0 -> 1521 bytes
 4 files changed, 3 insertions(+)

commit 2778b79973dfd9a99cc049950f6c4c3546564b86
Author: Mark Krapivner <mark125@gmail.com>
Date:	Thu Sep 3 00:52:03 2009 +0300

    Updated Hebrew translation

 po/he.po | 1203
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 740 insertions(+), 463 deletions(-)

commit 785daf06de0021a59694d0d5a7b697d60777064b
Author: Shaun McCance <shaunm@gnome.org>
Date:	Wed Sep 2 15:50:26 2009 -0500

    [help] Changing select to choose where appropriate, per GDP Style
    Guide

 help/C/audio-call.page		    | 4 ++--
 help/C/group-conversations.page    | 2 +-
 help/C/irc-start-conversation.page | 2 +-
 help/C/prev-conv.page		    | 2 +-
 help/C/send-file.page		    | 2 +-
 help/C/send-message.page	    | 2 +-
 help/C/video-call.page		    | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

commit 77ed87bfe603dc8c932ae5584b25d611410fe41f
Author: Shaun McCance <shaunm@gnome.org>
Date:	Wed Sep 2 15:48:24 2009 -0500

    [help] Updates to create-account, import-account, and offline-contacts

 help/C/create-account.page   | 83
 ++++++++++++++++++++++----------------------
 help/C/import-account.page   | 71 ++++++++++++-------------------------
 help/C/offline-contacts.page | 37 ++++++++------------
 3 files changed, 79 insertions(+), 112 deletions(-)

commit 6a04c225af7afca9643aa6c792f79b2c65857beb
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Wed Sep 2 18:26:32 2009 +0200

    Updated Basque language

 po/eu.po | 164
 +++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 106 insertions(+), 58 deletions(-)

commit 2bbaffa8f49b4490a65411012393c5576b631ac5
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Tue Sep 1 21:29:11 2009 -0400

    Limit the x264enc bitrate

 data/element-properties | 1 +
 1 file changed, 1 insertion(+)

commit 6488514c86e32c4f2f3914cf8f4b77c3388b0ce6
Author: Fábio Nogueira <fnogueira@gnome.org>
Date:	Tue Sep 1 22:35:44 2009 -0400

    Updated Brazilian Portuguese translation by Fábio Nogueira
    <fnogueira@gnome.org> and Og Maciel <ogmaciel@gnome.org>.

 po/pt_BR.po | 1575
 ++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 854 insertions(+), 721 deletions(-)

commit b5cb6b662d66c8230f406c5da0697793d271e8d3
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Tue Sep 1 15:22:04 2009 -0400

    Stop the sink on stream close to prevent deadlock

 src/empathy-call-window.c | 48
 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

commit b7c5ae7a1ae29b6acedfffde3d4319d3cfe15bc9
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Tue Sep 1 15:12:25 2009 -0400

    Add stream-closed signal to EmpathyCallHandler for when a stream
    is closed

 libempathy/empathy-call-handler.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit cd494555f232b36409361f4a35cdd8b35cd9ed63
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Tue Sep 1 14:59:51 2009 -0400

    callback is for handler no TfChannel

 src/empathy-call-window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 43ce322dd93f7294affa1847c6f311f7be176d67
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Thu Aug 27 18:13:03 2009 -0400

    Use GOptionContext to parse options

    Use GOptionContext directly to the help for gst options is also
    displayed.

 src/empathy.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

commit 6288040da442c9e7cc7c2f1b8bfab13515a3d4a1
Author: Shaun McCance <shaunm@gnome.org>
Date:	Tue Sep 1 14:30:58 2009 -0500

    [help] More reviews and updates for account management topics

 help/C/add-contact.page     |	32 ++++-----
 help/C/change-status.page   |	28 ++++----
 help/C/disable-account.page |	62 ++++++++---------
 help/C/figures/offline.png  | Bin 0 -> 405 bytes
 help/C/index.page	     |	22 +++---
 help/C/prev-conv.page	     | 159
 ++++++++++++++++++--------------------------
 help/C/remove-account.page  |	62 +++++++----------
 help/C/status-icons.page    | 128 ++++++++++++++---------------------
 help/Makefile.am	     |	 6 +-
 9 files changed, 211 insertions(+), 288 deletions(-)

commit 8103a1764926a892a748aa04697245509ba672cd
Author: Shaun McCance <shaunm@gnome.org>
Date:	Mon Aug 31 15:46:51 2009 -0500

    [help] Completed review of some pages

 help/C/accounts-window.page	    |  5 ++++-
 help/C/add-account.page	    |  5 ++++-
 help/C/irc-join-pwd.page	    |  9 ++++++---
 help/C/irc-join-room.page	    |  5 ++++-
 help/C/irc-manage.page		    | 25 +++++++++++++++---------
 help/C/irc-nick-password.page	    |  9 ++++++---
 help/C/irc-send-file.page	    | 28 +++++++++++++++++++++++++++
 help/C/irc-sending-file.page	    | 25 ------------------------
 help/C/irc-start-conversation.page | 39
 +++++++++++++++-----------------------
 help/Makefile.am		    |  2 +-
 10 files changed, 84 insertions(+), 68 deletions(-)

commit 13449aa445e442cc8f182f8ddb02ecb219d4f7f3
Author: Shaun McCance <shaunm@gnome.org>
Date:	Mon Aug 31 15:28:11 2009 -0500

    [help] Adding Google Talk notes, review information

 help/C/account-irc.page    |  6 +++++-
 help/C/account-jabber.page | 11 ++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

commit ffe919b7e6e98b923d4ecdc5fda726d639426108
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Sep 1 15:52:20 2009 +0200

    Fix long lines.

 libempathy/empathy-dispatcher.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 3e83992d52dcde84723dc31129546d4e78877f15
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Sep 1 15:51:15 2009 +0200

    Be sure that FindChannelRequest has a ref to the Dispatcher

    It has to own a reference, as it will unref when free-ing the struct.

 libempathy/empathy-dispatcher.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 182f1d1d62275355fa248fcdb9ea9b9a09a60e08
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Sep 1 15:48:59 2009 +0200

    Don't set empty values for the default EmpathyHandler

    This implies the following:
    - have an empty default handler when the Dispatcher is used directly
      with the singleton
    - autogenerate the name for the default handler
    - set priv->filters in the handler to an empty GPtrArray in this case,
      as that can't be NULL.

 libempathy/empathy-dispatcher.c |  3 +++
 libempathy/empathy-handler.c	 | 11 +++++++++++
 2 files changed, 14 insertions(+)

commit 834d75c763532d104e21a9add828d4a10afb799b
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Tue Sep 1 12:36:09 2009 +0200

    Update Norwegian bokmål translation.

 po/nb.po | 942
 +++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 609 insertions(+), 333 deletions(-)

commit fdc260402b8cebded24053eb50dc09c3cc8a1608
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Tue Sep 1 14:15:25 2009 +1000

    Fix duplicate XML ids in GtkBuilder file that stopped it from loading

 libempathy-gtk/empathy-account-widget-jabber.ui | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 577518e4c14b563c32d8486592f2c670acb9b857
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Tue Sep 1 14:11:47 2009 +1000

    [empathy_builder_get_file] NULL out passed GObj ptrs if GtkBuilder
    file broken

    If the GtkBuilder file passed to empathy_builder_get_file is
    broken, it
    returns NULL, but doesn't touch the contents of any pointers passed
    to retrieve
    GObjects. In several places we start using these pointers without
    checking
    whether the file was actually setup, which causes Empathy to crash.

    Ideally callers of empathy_builder_get_file() should check whether
    or not
    the function returned correctly before using any of the passed
    pointers, but
    in case they don't, make sure we're not passing pointers to random
    memory.

 libempathy-gtk/empathy-ui-utils.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit 08c465a2d1b55d42834d338c562e7fde42273d0f
Author: Daniel Nylander <po@danielnylander.se>
Date:	Tue Sep 1 00:11:16 2009 +0200

    Updated Swedish translation

 po/sv.po | 320
 ++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 192 insertions(+), 128 deletions(-)

commit ab8b4d3b38e0baa79268bab514a7836b7db474c8
Author: Louis-Francis Ratté-Boulianne
<louis-francis.ratte-boulianne@collabora.co.uk>
Date:	Mon Aug 31 14:59:56 2009 -0400

    Changed dialog constructor calls to use a string literal with format
    arguments

 src/empathy-accounts-dialog.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 687f31af1f31e84b52202a044353c442a0d0138f
Author: Claude Paroz <claude@2xlibre.net>
Date:	Mon Aug 31 22:16:28 2009 +0200

    Updated French translation

    Contributed by Bruno Brouard and Claude Paroz

 po/fr.po | 1551
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 879 insertions(+), 672 deletions(-)

commit 158af0ec152bc4d8037e1f08890abaf6625b06af
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Aug 31 20:40:58 2009 +0200

    Updated Spanish translation

 po/es.po | 248
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 147 insertions(+), 101 deletions(-)

commit 1b161e754f1aafd32ec477d24341684fd97adfca
Author: Shaun McCance <shaunm@gnome.org>
Date:	Mon Aug 31 13:05:45 2009 -0500

    [help] Remove irc-account from Makefile.am

 help/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

commit 97332942b44691aaa9105e63188145699af674b1
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 31 17:33:08 2009 +0100

    Always try to use the Requests interface before calling RequestChannel

 libempathy/empathy-dispatcher.c | 53
 +++++++++++++++++++++++++++++++++--------
 1 file changed, 43 insertions(+), 10 deletions(-)

commit 75544880821487471da44423eca14e2d16a112fb
Author: Shaun McCance <shaunm@gnome.org>
Date:	Mon Aug 31 11:17:58 2009 -0500

    [help] More info about IRC passwords and file sending

 help/C/irc-join-pwd.page      |  8 ++---
 help/C/irc-nick-password.page | 78
 ++++++++++++-------------------------------
 help/C/irc-sending-file.page  |  8 ++---
 3 files changed, 28 insertions(+), 66 deletions(-)

commit e278f6cc7233bb0439c0346e97fa6d39c68d03b3
Author: Shaun McCance <shaunm@gnome.org>
Date:	Mon Aug 31 11:02:45 2009 -0500

    [help] Updating IRC instructions, removing irc-account.page

 help/C/create-account.page |	1 -
 help/C/irc-account.page    | 129
 ---------------------------------------------
 help/C/irc-join-room.page  |  14 +++--
 help/C/irc-manage.page     |	1 -
 4 files changed, 9 insertions(+), 136 deletions(-)

commit a8c565888d02711513742eded5a0846601042437
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Mon Aug 31 18:04:59 2009 +0200

    Updated Arabic translation

 po/ar.po | 180
 +++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 111 insertions(+), 69 deletions(-)

commit 4f50ef89674ae7404f58a06cc78e00841e1c4d65
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 31 16:05:00 2009 +0100

    Only set the icon name to gtalk for gtalk accounts

 src/empathy-account-assistant.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit ffdee1a18641e764b04485417b96b0e21f50d9f0
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 31 15:49:38 2009 +0100

    Sort Gtalk after jabber

 libempathy-gtk/empathy-protocol-chooser.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit e4bddb2bcc2376056c9d24c634f8a30d31c047c1
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 28 14:43:14 2009 +0200

    Add display name for "gtalk"

 libempathy/empathy-utils.c | 1 +
 1 file changed, 1 insertion(+)

commit 75d28a9ddb083210eddf98e40b420c366fc1d805
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 28 14:42:42 2009 +0200

    Use the new APIs in the assistant and the dialog

 src/empathy-account-assistant.c | 10 ++++++++--
 src/empathy-accounts-dialog.c	 | 25 +++++++++++++++++--------
 2 files changed, 25 insertions(+), 10 deletions(-)

commit 2a59b87c17d5bc66a72d3509247a3e2650559a67
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Aug 28 14:40:47 2009 +0200

    GTalk-enable the protocol chooser

 libempathy-gtk/empathy-protocol-chooser.c | 37
 ++++++++++++++++++++++++++-----
 libempathy-gtk/empathy-protocol-chooser.h |  4 ++--
 2 files changed, 34 insertions(+), 7 deletions(-)

commit 61398dbbf1b7dc364c54e999fa983ce6fb078e3b
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 28 14:39:42 2009 +0200

    Construct the GTalk widget according to the icon name

 libempathy-gtk/empathy-account-widget.c | 29
 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

commit 032af43881ddaac3de000207ee73eec0d0448dd8
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 28 14:39:04 2009 +0200

    Add a specialized GTalk widget UI in glade

 libempathy-gtk/empathy-account-widget-jabber.ui | 119
 +++++++++++++++++++++++-
 1 file changed, 114 insertions(+), 5 deletions(-)

commit 8df108603d829a98f2c9cb99f5394200ea7c6972
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Aug 31 02:07:19 2009 +0200

    Fix a long line

 libempathy/empathy-account-settings.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit d603aec278728520651ea5aa8d918d0f745cdeca
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Aug 31 02:05:54 2009 +0200

    Use empathy_protocol_icon_name()

 libempathy/empathy-account-settings.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0897839d5bffb9458abd5d2de2dcf0c1d09707ab
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Sat Aug 29 16:19:23 2009 +0200

    Fall back to the default icon if an empty icon name is set

 libempathy/empathy-account.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 3c59ec5f8fc6de5c9be1fdd1638859a151bb6537
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Sat Aug 29 16:19:10 2009 +0200

    Always set the icon name on account creation.

 libempathy/empathy-account-settings.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

commit 35aa8545a7ba5d6bef718206f11d3b391dcfc4e4
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 28 14:36:44 2009 +0200

    Implement setting icon name to the account and to the settings.

 libempathy/empathy-account-settings.c | 81
 ++++++++++++++++++++++++++++++++++-
 libempathy/empathy-account-settings.h | 11 +++++
 libempathy/empathy-account.c	       | 70 ++++++++++++++++++++++++++++++
 libempathy/empathy-account.h	       |  6 +++
 4 files changed, 166 insertions(+), 2 deletions(-)

commit 5ca188be7636eec84c5a20be11fb7d137c0efbc1
Author: Brian Pepple <bpepple@fedoraproject.org>
Date:	Wed Aug 26 15:04:41 2009 -0400

    Use valid desktop category.

 data/empathy.desktop.in.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7792a4798c934d8871e4b8b4223c5aead10cc164
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Aug 31 16:17:08 2009 +0200

    Always update the control buttons sensitivity on creation.

 libempathy-gtk/empathy-account-widget.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

commit 8852aeef8fa4d6a76dfc030d8f337fab118dc463
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Fri Aug 28 13:26:15 2009 -0400

    Fixed some of the EmpathyAccountWidget's control button behaviour.

    - When creating an IRC account, we are now making sure that the
    control
      buttons have the correct state.
    - When creating an account, the "Cancel" button is always sensitive.
    - Fixed a style error in EmpathyAccountsDialog.

 libempathy-gtk/empathy-account-widget.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

commit 647858dc34ec9786c88b22fea74fc45ff3bb14f6
Merge: 5a1342e cd277c0
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Aug 31 15:55:39 2009 +0200

    Merge commit 'jtellier/confirm-lose-accounts-settings'

commit 5a1342eb769353967062163bad6258edf18e460a
Merge: 00b3c7e 4757ddf
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Aug 31 15:37:19 2009 +0200

    Merge commit 'jtellier/set-account-name-translator-hint'

commit 00b3c7e1e6655a31463c9d966db34d0d5b40b42d
Author: Shankar Prasad <svenkate@redhat.com>
Date:	Mon Aug 31 16:00:26 2009 +0530

    Updated Kannada(kn) translation

 po/kn.po | 186
 ++++++++++++++++++++++++---------------------------------------
 1 file changed, 70 insertions(+), 116 deletions(-)

commit 9eebd23f8a4a83cef5b13204a1bb377d59160bbf
Merge: d181f7b e92cc2a
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Mon Aug 31 10:59:21 2009 +0100

    Merge branch 'send-errors'

commit e92cc2a571051be566895ed3f09faebd8c56716f
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Mon Aug 31 10:43:36 2009 +0100

    Be consistent with EmpathyMessage style.

 libempathy/empathy-message.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

commit d181f7ba0031ad758911e6f0c6f6530d3833b76e
Author: Shaun McCance <shaunm@gnome.org>
Date:	Mon Aug 31 01:00:37 2009 -0500

    [help] Updating add-account and create-account

 help/C/accounts-window.page	|   1 +
 help/C/add-account.page	|  22 +++++--
 help/C/create-account.page	| 145
 +++++++++++++++++++++--------------------
 help/C/irc-nick-password.page	|   1 +
 help/C/prob-conn-neterror.page |   7 +-
 5 files changed, 97 insertions(+), 79 deletions(-)

commit dd1f87d55d4b233ae2118fac82de51fb4dc8588f
Author: Sweta Kothari <swkothar@redhat.com>
Date:	Mon Aug 31 11:08:47 2009 +0530

    Updated Gujarati Translations

 po/gu.po | 283
 +++++++++++++++++++++++----------------------------------------
 1 file changed, 103 insertions(+), 180 deletions(-)

commit ad59f77dfdba77af558ae2d278c92b0a7ab747d7
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Mon Aug 31 01:15:41 2009 +0100

    Ack received messages from ourself.

    Sumana Harihareswara reported that she had started a conversation with
    herself, sent a message, and then tried to close the window, but
    whenever she did so it reappeared.

    This was because Empathy did not acknowledge "incoming" messages from
    the user themself; hence, when it Close()d the channel, Gabble
    respawned
    it, because it still had pending messages.

 libempathy/empathy-message.c | 32 ++++++++++++++++++++++++++++++++
 libempathy/empathy-message.h |  4 ++++
 libempathy/empathy-tp-chat.c | 10 ++++++++--
 3 files changed, 44 insertions(+), 2 deletions(-)

commit 2150f8ae4242fe2a26f29c96ddeb27ace1fe90fd
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Mon Aug 31 00:17:55 2009 +0100

    Handle SendError signal correctly, not as a message

    Fixes Gnome bug #593095 - Send errors are printed as normal messages.

 libempathy/empathy-tp-chat.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

commit a0ee1ca8fbbbe6d34c123eb46b32fc4f1e75779b
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Mon Aug 31 01:13:00 2009 +0100

    Use char* not EmpathyMessage in TpChat:send-error

    The only consumer of this signal just extracts the body from the
    EmpathyMessage. It will be easier to handle the SendError D-Bus signal
    if we don't have to construct an EmpathyMessage from it.

 libempathy-gtk/empathy-chat.c | 4 ++--
 libempathy/empathy-tp-chat.c  | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

commit 04fbe6bf259fd8fb75c8ed4c4e135fb4187045f5
Author: ifelix <ifelix@redhat.com>
Date:	Mon Aug 31 02:13:34 2009 +0530

    Updated Tamil Translations

 po/ta.po | 165
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 97 insertions(+), 68 deletions(-)

commit 817de24eacc3265b8a8c0ff19eb581d9aea5cc46
Author: Shaun McCance <shaunm@gnome.org>
Date:	Sun Aug 30 11:54:09 2009 -0500

    [help] Updates to 'Add an account' topic

 help/C/add-account.page | 72
 +++++++++++++++++++------------------------------
 1 file changed, 27 insertions(+), 45 deletions(-)

commit 533b73a6a80807838ed40245d6761691f47221ff
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Aug 29 17:33:46 2009 +0100

    Add basic media-signalling capabilities

    Add basic capabilities for media-signalling so future CM's will
    still advertise
    support for them. Currently we announce:
      org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/ice-udp
      org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/gtalk-p2p

    Fixes #593041

 src/empathy.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 43c0f0769a5117d7acdc07f22d4c73a2f06de0fe
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Aug 29 17:13:04 2009 +0100

    Add the filters not in the Client file to a second Handler

    A Dispatcher isn't guaranteed to ask the Handlers D-Bus interface
    for the
    filter after launching it. So have our main handler match what is
    defined in
    the client file and add an extra head which contains the complete list

 src/empathy.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

commit 40f2188129d8fc2d8d718adea0bb3c417013465d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Aug 29 17:10:04 2009 +0100

    Add functions on the dispatcher to add/remove extra handlers

 libempathy/empathy-dispatcher.c | 70
 +++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-dispatcher.h | 11 +++++++
 2 files changed, 81 insertions(+)

commit b3acc55a8c6401de41cfc320081e1aa0be17c27a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Aug 29 00:01:47 2009 +0100

    Add a simple abstraction for implementing handlers

    Implement an EmpathyHandler object which can be used to easily
    add extra
    Client.Handler heads on D-Bus.

 libempathy/Makefile.am		 |   2 +
 libempathy/empathy-dispatcher.c | 215 +++++++++++------------
 libempathy/empathy-dispatcher.h |   7 +-
 libempathy/empathy-handler.c	 | 369
 ++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-handler.h	 |  89 ++++++++++
 src/empathy.c			 |  59 ++++++-
 6 files changed, 615 insertions(+), 126 deletions(-)

commit 943dbb3303c06cfa35d0d89a5765ce5430dfba69
Author: Michael Kanis <mkanis@gmx.net>
Date:	Sun Aug 30 14:13:50 2009 +0200

    Updated German translation

 po/de.po | 1086
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 665 insertions(+), 421 deletions(-)

commit e20b4f1a90f521ff23aa464a2d068f040a578069
Author: Ivar Smolin <okul@linux.ee>
Date:	Sun Aug 30 13:41:51 2009 +0300

    Updating Estonian translation

 po/et.po | 267
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 232 insertions(+), 35 deletions(-)

commit b5bfa796bda08430dc579985798980db7a6ac0c9
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Sat Aug 29 15:54:29 2009 +0200

    Updated Arabic translation

 po/ar.po | 988
 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 622 insertions(+), 366 deletions(-)

commit 2069b38305e90d63cbb93242802842dfc4e66f6b
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Aug 29 15:05:18 2009 +0200

    Updated Spanish translation

 po/es.po | 884
 +++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 572 insertions(+), 312 deletions(-)

commit fa36fdfd63ffe148a5dd43d216a024e3419ca86f
Author: Changwoo Ryu <cwryu@debian.org>
Date:	Sat Aug 29 22:01:29 2009 +0900

    Update Korean translation

 po/ko.po | 2336
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1476 insertions(+), 860 deletions(-)

commit f94874bcca81964baddb29eb1e7c7c90481f61a4
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date:	Sat Aug 29 16:24:42 2009 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1152
 +++++++++++++++++++++++++++++++++++-----------------------
 po/zh_TW.po | 1157
 ++++++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 1403 insertions(+), 906 deletions(-)

commit ca952f9e959c8a994fadc4ab472edc2fef4a475c
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Sat Aug 29 09:40:34 2009 +0200

    Updated Basque language

 po/eu.po | 198
 ++++++++++++++++++++++++++-------------------------------------
 1 file changed, 83 insertions(+), 115 deletions(-)

commit 7f14fdcabedcebe0a0c313dee05569de6a4078d8
Author: Alexander Nyakhaychyk <nyakhaychyk@gmail.com>
Date:	Sat Aug 29 04:11:43 2009 +0300

    Updated Belarusian translation

 po/be.po | 123
 +++++++++++++++++++++++++++------------------------------------
 1 file changed, 53 insertions(+), 70 deletions(-)

commit cd277c0c7cbe0389c242abb58b995389000f3e53
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Fri Aug 28 14:55:27 2009 -0400

    Fixed style

 src/empathy-accounts-dialog.c | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

commit 6600e6d9ff8505c9ef1765c1ca2ba17faad6f837
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Fri Aug 28 14:50:30 2009 -0400

    Marked strings for translation.

 src/empathy-accounts-dialog.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 4bca222891fc950ce1f18de66a86f1a9ace6eba5
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Fri Aug 28 14:36:45 2009 -0400

    Merged with master

 src/empathy-accounts-dialog.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit e84021944cfde5665a5286b1dbabe296a67f7231
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Fri Aug 28 14:19:47 2009 -0400

    Fixed bug which would occur when deleting account with pending changes

    - When the selected account was NULL,
      accounts_dialog_has_pending_change() would not check its state
      correctly. That function is working with a pointer on a pointer
      to the
      account and was not dereferencing properly.
    - The pointer to the account we pass to
      accounts_dialog_has_pending_change() is now properly initialized to
      NULL.
    - When deleting an account, the COL_ACCOUNT_POINTER column is now
      properly set to NULL.

 src/empathy-accounts-dialog.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

commit 0f70b1bfb5714c98aa70d062b5ac7ec0e5a03dac
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Fri Aug 28 11:23:44 2009 -0400

    Using GtkTreeRowReference instead of a string path.

    - When the user selects another account and has pending changes to the
      currently selected account, we need to keed track of the destination
      row. Instead of saving that information as the string representation
      of a GtkTreePath, we now use a GtkTreeRowReference.

 src/empathy-accounts-dialog.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

commit 9b845e9ce1fe88006335f73a02ff68853757bd30
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Fri Aug 28 11:06:14 2009 -0400

    Simplified the code that checks if selected account has pending
    changes

 src/empathy-accounts-dialog.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

commit cb75a2c77a35fbf7ace246d5c45d7ecda8ae8ab1
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Fri Aug 28 10:45:54 2009 -0400

    Improved confirmation dialog shown to the user before discarding
    changes

    - Split the confirmation dialog's text into a primary and secondary
      section.
    - Changed the button label to "Cancel" and "Discard" instead of "Yes"
      and "No".
    - Added a accounts_dialog_show_question_dialog() function to show
      question dialogs related to the accounts dialog and connect to its
      "response" signal.
    - Removed the empathy_show_yes_no_question_dialog() function since it
      was added for this specific patch but is no longer used.

 libempathy-gtk/empathy-ui-utils.c |  28 -------
 libempathy-gtk/empathy-ui-utils.h |   6 --
 src/empathy-accounts-dialog.c	   | 153
 +++++++++++++++++++++++---------------
 3 files changed, 94 insertions(+), 93 deletions(-)

commit 8a6993197695c0b8448754d5389811a6d72e0009
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Thu Aug 27 13:15:56 2009 -0400

    Fixed style

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4c9f8ec9fb3173f3641ca344d3c743f582965a02
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Thu Aug 27 13:03:03 2009 -0400

    Fixed crash when checking if an account has pending changes

 src/empathy-accounts-dialog.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 1855aa4b32cc4bf06f9dd748b5c1a24c25129f0b
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Thu Aug 27 11:57:18 2009 -0400

    Minor changes to EmpathyAccountWidget and EmpathyAccountsDialog

    - account_widget_entry_changed_common is not called when an entry
    loses
      focus. Since this function is called on every keystroke, it was
      unnecessary to call it again on focus-out-event.
    - The EmpathyAccountWidget's control buttons' sensitivity (and
      contains_pending_changes member) is not altered when the state
      of the
      "Enabled" checkbox is changed due to an event which was not
      initiated
      by the user.
    - Fixed capitalization error in a comment in empathy-accounts-dialog.c

 libempathy-gtk/empathy-account-widget.c | 19 +++----------------
 src/empathy-accounts-dialog.c		 |  2 +-
 2 files changed, 4 insertions(+), 17 deletions(-)

commit 435a811e440c3a5a79f504fa6f2850e63673f49a
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Wed Aug 26 12:52:45 2009 -0400

    Asking for confirmation before losing pending accounts changes.

    If an account has pending changes, we now ask for a confirmation
    before:
    - Adding a new account
    - Closing the accounts dialog
    - Selecting a new account.
    Those are all options which discard pending changes.

 libempathy-gtk/empathy-account-widget.c |  33 ++++-
 libempathy-gtk/empathy-account-widget.h |   5 +
 libempathy-gtk/empathy-ui-utils.c	 |  28 ++++
 libempathy-gtk/empathy-ui-utils.h	 |   6 +
 src/empathy-accounts-dialog.c		 | 243
 +++++++++++++++++++++++++++++---
 5 files changed, 294 insertions(+), 21 deletions(-)

commit 36e602e834790033aed3c8b82a93404efb1585ad
Author: Shaun McCance <shaunm@gnome.org>
Date:	Fri Aug 28 12:31:26 2009 -0500

    Point to a help topic that exists from Accounts window

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d058ec42f339ff9ca62c729496030e6efa7edc19
Author: Shaun McCance <shaunm@gnome.org>
Date:	Fri Aug 28 12:24:42 2009 -0500

    [help] Adding information about the Accounts window and IRC

 help/C/account-irc.page       | 145
 ++++++++++++++++++++++++++++++++++++++++++
 help/C/account-jabber.page    |  62 ++++++++++++++++++
 help/C/accounts-window.page   |  38 +++++++++++
 help/C/figures/gtk-add.png    | Bin 0 -> 400 bytes
 help/C/figures/gtk-edit.png   | Bin 0 -> 744 bytes
 help/C/figures/gtk-remove.png | Bin 0 -> 215 bytes
 help/C/prob-conn-name.page    |   6 +-
 help/Makefile.am	       |   3 +
 8 files changed, 252 insertions(+), 2 deletions(-)

commit 74a34883df84726ad94359675f3c65a624619dc9
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Fri Aug 28 10:49:07 2009 -0400

    Add empathy_make_absolute_url_len to limit the lenght of url string

    Related to http://bugzilla.gnome.org/show_bug.cgi?id=593207

 libempathy-gtk/empathy-theme-adium.c |  2 +-
 libempathy-gtk/empathy-ui-utils.c    | 37
 ++++++++++++++++++++++++------------
 libempathy-gtk/empathy-ui-utils.h    |  2 ++
 3 files changed, 28 insertions(+), 13 deletions(-)

commit e388248780b01e51a5a1515cefc0240064620e74
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Fri Aug 28 18:17:57 2009 +0200

    [help] Fixed a warning, was using id not style

 help/C/add-account.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bb509e1840a7e1ab999c92c7a018fc69657643cf
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Aug 27 17:00:03 2009 +0100

    Update python bindings

 python/pyempathy/pyempathy.defs       | 6 ++++++
 python/pyempathygtk/pyempathygtk.defs | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

commit 189fc785879e90f39ff720e51ec7891833bfdf79
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Aug 27 16:59:23 2009 +0100

    Make the protocol property read-only

 libempathy-gtk/empathy-account-widget.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

commit 91c325aabdb286f44729cb5ee7f69afd717dcca6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Aug 27 16:56:42 2009 +0100

    Base the selected widget both on the CM and the protocol

    Previously Empathy would select the custom account widget purely
    based on the
    protocol, the problem here is that these widgets assume one specific
    connection
    manager and its set of parameters. Which triggered bugs if the
    intended cm for a
    protocol isn't installed, but haze is and provides the protocol.

 libempathy-gtk/empathy-account-widget.c | 103
 ++++++++++++++++++++------------
 libempathy-gtk/empathy-account-widget.h |   1 -
 src/empathy-account-assistant.c	 |   3 +-
 src/empathy-accounts-dialog.c		 |  33 ++--------
 4 files changed, 70 insertions(+), 70 deletions(-)

commit 04434d6dd476e0613685adecfbad9b03eb4c2e4e
Merge: a624437 2099caa
Author: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Date:	Fri Aug 28 09:54:09 2009 -0300

    Merge branch 'fix-navigation-handling'

commit a6244374ab84c026e99c0b6386a5281a6746308e
Author: Luca Ferretti <elle.uca@libero.it>
Date:	Fri Aug 28 14:38:23 2009 +0200

    Add missing ;

 src/empathy-account-assistant.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9488760608fb66ac49951fb39741d524cf009c02
Merge: b81c0c4 c2cbd1d
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Aug 28 13:18:44 2009 +0100

    Merge branch 'do-say-me-think'

    Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

commit b81c0c48ad7bf68583c08e38f8a2a90c7c7dce4b
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Aug 26 21:31:11 2009 +0200

    Fix .desktop file (GNOME bug 592737)

 data/empathy.desktop.in.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit a72c1e74b5865aed5a132dc568c01038f4050281
Author: Frédéric Péters <fpeters@0d.be>
Date:	Thu Aug 27 10:27:35 2009 +0200

    Do not construct a sentence for an assistant error string (GNOME
    bug 593257)

 src/empathy-account-assistant.c | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

commit 9e9c41e83b05829519a4ed5fe1cadd288b74ac8d
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri Aug 28 11:16:46 2009 +0200

    Only unref the AccountManager if it's not NULL

 libempathy/empathy-account-manager.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 29ce35b69e1727a0f5f6bd1a1fa2c72da5f7a56a
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Fri Aug 28 12:19:22 2009 +0200

    Word 'wizard' should not be used, fixes bug 593285

 src/empathy-account-assistant.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit de9b0f034c3132adf869aba67c006bc9bf243914
Author: Sandeep Shedmake <sshedmak@redhat.com>
Date:	Fri Aug 28 15:40:08 2009 +0530

    Updated Marathi Translations

 po/mr.po | 198
 +++++++++++++++++++--------------------------------------------
 1 file changed, 59 insertions(+), 139 deletions(-)

commit b4779c949d7abca68e9e7cdabee5038ed0102369
Author: Sandeep Shedmake <sshedmak@redhat.com>
Date:	Fri Aug 28 15:09:14 2009 +0530

    Updated Marathi Translations

 po/mr.po | 50 ++++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

commit 6ea36010c99e50731601d783e3fff395d9492945
Author: Shankar Prasad <svenkate@redhat.com>
Date:	Fri Aug 28 12:45:52 2009 +0530

    Updated Kannada(kn) translation

 po/kn.po | 1314
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 744 insertions(+), 570 deletions(-)

commit f249e699dcaf497b4e03ec93d75f85184d61c3b8
Author: Branko Kokanović <branko.kokanovic@gmail.com>
Date:	Fri Aug 28 00:24:51 2009 +0200

    Updated Serbian translation

 po/sr.po	| 13962
 ++++---------------------------------------------------
 po/sr@latin.po | 13962
 ++++---------------------------------------------------
 2 files changed, 2042 insertions(+), 25882 deletions(-)

commit 32dcb071cac5ba5d9bb9a66445d43d2047f450f4
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Fri Aug 28 00:00:31 2009 +0200

    [help]	Fixed some topics against the new UI
	Topics fixed: add-account, disable-account, remove-account,
	irc-account
	Added irc-account to irc-manage
	Used 2column for irc-manage

 help/C/add-account.page     | 54
 ++++++++++++++++++++-------------------------
 help/C/disable-account.page | 10 +++++++--
 help/C/irc-account.page     |	1 +
 help/C/irc-manage.page      |	2 ++
 help/C/remove-account.page  |	7 +++---
 5 files changed, 39 insertions(+), 35 deletions(-)

commit 37f4764acb3c231cb3ed089a90b34e8499fd0989
Author: Alexander Nyakhaychyk <nyakhaychyk@gmail.com>
Date:	Fri Aug 28 00:07:43 2009 +0300

    Updated Belarusian translation

 po/be.po | 1387
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 777 insertions(+), 610 deletions(-)

commit c2cbd1de858c0a8a994358fc717054ce32c8b895
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Aug 26 19:51:49 2009 +0100

    Remove validation from chat_send.

    Instead, call empathy_message_new_from_entry (), which parses the
    entered text for us.

 libempathy-gtk/empathy-chat.c | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

commit c74685b02308c82d355fc59e1aa8491c84a2f114
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Aug 26 19:47:49 2009 +0100

    Don't parse message in EmpathyMessage:body setter

    This fixes a bug where the message (Type_Action, "/me wooo yay") is
    printed as " ! wjt woo yay" rather than as " ! wjt /me woo yay".

    This also fixes Gnome bug #593101 (Empathy exits sending empty /me
    message), which was caused by this deleted code walking off the end of
    the string "/me".

 libempathy/empathy-message.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

commit dec9d4dcf8c7611862221be9eadb53ef52a5bc3b
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Aug 26 19:46:39 2009 +0100

    Add empathy_message_new_from_entry()

    This will be the sole place that user input is parsed for special
    commands like /me; the parsing logic will be removed from
    EmpathyMessage
    and chat_send().

 libempathy/empathy-message.c | 56
 ++++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-message.h |  1 +
 2 files changed, 57 insertions(+)

commit cd9d7d1ef951ab85bf87e7ff56b1180169d053c2
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Aug 26 19:46:20 2009 +0100

    /clearly shouldn't clear the window.

 libempathy-gtk/empathy-chat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1c6faef3890bc3819bcc44299cff20e021fc3717
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Aug 25 16:07:49 2009 +0100

    Fall back to protocol name in Adium themes

    Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

 libempathy-gtk/empathy-theme-adium.c | 2 ++
 1 file changed, 2 insertions(+)

commit aad78d378231d1a8a3c44ffda2ada5e63560a58a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Aug 27 18:29:51 2009 +0100

    When not connected don't apply !offline states but save them

    When we're not connected to a network don't allow setting the
    status to
    anything else then offline, but when a status is set do save it so
    it can be
    applied as soon as soon as we get network connectivity

 libempathy/empathy-idle.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 4c9b885598161f7ab91888c07c1a557249ce3c77
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Aug 27 17:52:15 2009 +0100

    ->connected always has the right status, so use that instead of
    specialcasing

 libempathy/empathy-connectivity.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

commit 09a260ea67ff01a17877c53e43ff1af6f28a59b6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Aug 27 17:01:57 2009 +0100

    Only assume connected when we have neither Connman or NM

 libempathy/empathy-connectivity.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 698b2c1a3ba1f5d9a27d5c30520e0dd0e8bb92bf
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Aug 27 17:01:05 2009 +0100

    Slightly improve debug info

 libempathy/empathy-connectivity.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 4757ddf6444718f9d627579e793fa2429e8b4822
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Thu Aug 27 13:33:12 2009 -0400

    Improved the comment related to the IRC default display name.

    - Added more indication intended to translators
    - Added the possibility to swap the parameted in the string "%s on %s"
      (where the first argument in the login id and the second one is the
      server)

 src/empathy-accounts-dialog.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit e816bc40c79fed01bc9c8d13d45c5a51f2434239
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Thu Aug 27 21:34:38 2009 +0200

    Updated Basque language

 po/eu.po | 40 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

commit b9f2dcb8ef38192fe56c78b157cdc9da12ac250c
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Thu Aug 27 20:59:06 2009 +0200

    Updated Basque language

 po/eu.po | 110
 ++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 49 insertions(+), 61 deletions(-)

commit 2099caae0f5a46fc9ababbbb1749886863b9592f
Author: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Date:	Thu Aug 27 15:39:42 2009 -0300

    Fix assumption about navigation-request not being called for HTML
    string load

    This bug was exposed by the WebKitGTK+ bug that prevented
    navigation-request from being emitted in various situations being
    fixed.

 libempathy-gtk/empathy-theme-adium.c | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

commit 461d3fa83d2608eccc5013e3af5669fa6b11e33c
Merge: 607bea5 c66fa12
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Aug 27 17:08:25 2009 +0200

    Merge branch 'master'; commit 'jtellier/set-account-name'

commit 607bea527c91d369b6f0d16b1bb63699310d71ed
Merge: c8eb875 8dba395
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 27 14:41:32 2009 +0100

    Merge commit 'jtellier/reconnect-account'

commit c66fa1223a902be9b51cf1568b07870e6f2dd402
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Thu Aug 27 09:18:10 2009 -0400

    - Added information intented to translators.
    - Fixed leak of the the display name.

 src/empathy-accounts-dialog.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

commit 5a9bf924644f14f67a62717eeca98a0dfbce60d7
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Wed Aug 26 15:37:39 2009 -0400

    Using a new logic to set the default display name:
    * If irc use "[account] on [server]"
    * If there is an account property use "[account]"
    * If there is no account property use "[protocol] Account"

 src/empathy-accounts-dialog.c | 49
 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 10 deletions(-)

commit 28c3c1f834345cf6da157262841e2731feaf85ed
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Wed Aug 26 14:36:19 2009 -0400

    Only setting the display name to the Login ID for protocol which have
    this property.

 src/empathy-accounts-dialog.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 5a464a08117785832583bdf720288502410952aa
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Tue Aug 25 13:18:56 2009 -0400

    - The account display gets updated in the account list and in the
      account name label.
    - By default, the account default display name is set to the login id.

 src/empathy-accounts-dialog.c | 55
 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

commit c8eb8757721031aba99238804896881f2182bd9e
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Wed Aug 26 16:44:47 2009 -0400

    Remove libmissioncontrol deps

    and remove trailing spaces

 libempathy-gtk/libempathy-gtk.pc.in | 4 ++--
 libempathy/libempathy.pc.in	     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 7110cbc2e450bb00522acdeb22aa3831cc3b37ad
Author: Claude Paroz <claude@2xlibre.net>
Date:	Wed Aug 26 21:59:42 2009 +0200

    Update POTFILES.in after file renaming

 po/POTFILES.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 45808d25bd1565d811a1cebb6d74af5318c9ec95
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 26 19:57:57 2009 +0200

    Only request presence when the account is enabled (#593161).

 libempathy/empathy-account.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

commit 2d3e3cdf6e8cf6753b9fb1167399c68f90b55c75
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Aug 26 16:57:16 2009 +0100

    Ensure we call the empathy_sound_stop from the main thread

    The canberra gtk context is stored in thread-local storage, so we
    need to
    ensure that we start and stop the sounds from the same thread.

 src/empathy-call-window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit cb4361a992c348f7c57ec75afb1c642fba20fb15
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 26 13:00:24 2009 +0200

    Ensure all accounts when getting all properties

    This introduces a check on the number of accounts, as MC5 could come
    back advertising less accounts than we have. In that case, we find the
    one which have gone and remove them from our cache.

 libempathy/empathy-account-manager.c | 80
 ++++++++++++++++++++++++++++++++----
 1 file changed, 71 insertions(+), 9 deletions(-)

commit 151a069b2039195a33d0e0540deec1803ddd3d23
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 26 12:59:12 2009 +0200

    Implement empathy_account_refresh_properties()

 libempathy/empathy-account.c | 25 ++++++++++++++++++-------
 libempathy/empathy-account.h |  2 ++
 2 files changed, 20 insertions(+), 7 deletions(-)

commit f4252ca490492759fcc8942bd8605a15caa195f2
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 26 02:25:23 2009 +0200

    Fix long lines.

 libempathy/empathy-account-manager.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 2defc6dbbe38216941d4fa6f7462627154059de7
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 26 02:25:01 2009 +0200

    Restart MC5 when it quits or crashes (#593018).

 libempathy/empathy-account-manager.c | 75
 ++++++++++++++++++++++--------------
 1 file changed, 47 insertions(+), 28 deletions(-)

commit 8dba3957946252b622ba9c09e209f007d5961199
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Tue Aug 25 15:57:41 2009 -0400

    - Added a utility function (empathy_account_reconnect_async) to easily
      reconnect an account.
    - When we apply changes to an account, instead of disconnecting and
      reconnecting it, we use the new empathy_account_reconnect_async
      function.

 libempathy-gtk/empathy-account-widget.c | 63
 ++++++++++++++-------------------
 libempathy/empathy-account.c		 | 43 ++++++++++++++++++++++
 libempathy/empathy-account.h		 |  7 ++++
 3 files changed, 76 insertions(+), 37 deletions(-)

commit df5323f845906bf4cdb85fc430f5412d5956b4c7
Author: Sandeep Shedmake <sshedmak@redhat.com>
Date:	Wed Aug 26 17:27:39 2009 +0530

    Updated Marathi Translations

 po/mr.po | 2479
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1581 insertions(+), 898 deletions(-)

commit c3046adb6683638ce2d1aae9068ad09018f70cdd
Author: ifelix <ifelix@redhat.com>
Date:	Wed Aug 26 16:22:38 2009 +0530

    Updated Tamil Translations

 po/ta.po | 54 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 23 deletions(-)

commit a7f2adbcc0600e073766459152f56d2b61b752ce
Author: Sweta Kothari <swkothar@redhat.com>
Date:	Wed Aug 26 14:26:43 2009 +0530

    Updated Gujarati Translations

 po/gu.po | 2436
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1561 insertions(+), 875 deletions(-)

commit 79b5a3f46d6466d72eb77cef87300a80135d475e
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Wed Aug 26 10:47:40 2009 +0200

    Updated Basque language

 po/eu.po | 985
 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 622 insertions(+), 363 deletions(-)

commit ff6420aecaf02a50c3ea07e01f4c2a0cafaa7af0
Author: ifelix <ifelix@redhat.com>
Date:	Wed Aug 26 14:07:42 2009 +0530

    Updated Tamil Translations

 po/ta.po | 842
 +++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 522 insertions(+), 320 deletions(-)

commit 1669cc99bae84e2506bb6b671843bd980f16b2bc
Merge: fbaa610 13c650f
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Aug 26 09:54:29 2009 +0200

    Merge branch 'debug-window'

    Conflicts:
	src/empathy-debug-window.c

commit 13c650f07be34d376c9ef4e7966e470198cedf52
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Aug 21 15:16:12 2009 +0200

    Rename EmpathyDebugDialog to EmpathyDebugWindow

 src/Makefile.am	    |	 2 +-
 src/empathy-debug-dialog.c | 1251
 --------------------------------------------
 src/empathy-debug-dialog.h |	63 ---
 src/empathy-debug-window.c | 1251
 ++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-debug-window.h |	63 +++
 src/empathy-main-window.c  |	 4 +-
 6 files changed, 1317 insertions(+), 1317 deletions(-)

commit 5b06953566c13a940f69933868541e4a43200e90
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Aug 21 14:39:03 2009 +0200

    Make EmpathyDebugDialog be a GtkWindow subclass rather than a
    GtkDialog.

    This is because:
    1) There are no actions, so it's not a dialog
    2) We want to hide the seperator for the action area
    3) To be able to maximize the window

 src/empathy-debug-dialog.c | 8 +++++---
 src/empathy-debug-dialog.h | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

commit fbaa6100736ae6fd627b7f299bc9fab421a33e0f
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 25 19:59:33 2009 +0200

    Request presence again when an account is enabled

 libempathy/empathy-account.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit 7df0207fe8f3f28c00068d50b39a7fb0527d30d9
Author: Daniel Nylander <po@danielnylander.se>
Date:	Tue Aug 25 20:36:14 2009 +0200

    Updated Swedish translation

 po/sv.po | 851
 ++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 520 insertions(+), 331 deletions(-)

commit 24ddbb54827d18a0b1d51aef9436cb4b576463a6
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Aug 25 19:10:44 2009 +0200

    Bump version

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ffc481bca5abef41fe88b080066bb1ca5aaf0b85
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Aug 25 18:50:54 2009 +0200

    Update NEWS

 NEWS | 1 +
 1 file changed, 1 insertion(+)

commit e4b630b944fa4ae434bc615777d73798ddb3d601
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Aug 25 18:48:32 2009 +0200

    remove trailing spaces

 libempathy-gtk/empathy-account-widget-private.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f9481eacf1f60d8ec361f009773b2cfea077f80e
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Aug 25 18:45:41 2009 +0200

    Remove the generate .service file

 data/Makefile.am | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit d8c01c6adc1c97570bf414898eef9f913596fb5b
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Aug 25 17:43:53 2009 +0200

    Prepare for 2.27.91.1 release

 NEWS	      | 5 +++++
 configure.ac | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

commit 97192df58084dadcbce48efc2e75e38377f86d46
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Aug 25 17:41:31 2009 +0200

    We require gnome-doc-utils 0.17.3

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f72b24607c9d457d83f4d1eb4f197d876010d0ca
Author: Baris Cicek <baris@teamforce.name.tr>
Date:	Tue Aug 25 18:25:34 2009 +0300

    Updated Turkish translation.

 po/tr.po | 1628
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 760 insertions(+), 868 deletions(-)

commit 52848f117b58fc4d95ca5ae87c9d264c5ced737b
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Aug 25 17:03:35 2009 +0200

    Ship empathy-account-widget-private.h within the tarball.

 libempathy-gtk/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 55860699cea38c5df7a624ee394da7a5f89bd891
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Aug 25 17:03:07 2009 +0200

    Add a note to NEWS that we added libunique dependency and MC5 will
    get keyring support rsn.

 NEWS | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit ee852bfb67fa679091edfabbace9eedf33bf3318
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Aug 25 16:42:24 2009 +0200

    Update GtkDoc

 docs/libempathy-gtk/libempathy-gtk-docs.sgml | 9 +++++++--
 docs/libempathy-gtk/libempathy-gtk.types     | 5 ++++-
 docs/libempathy/libempathy-docs.sgml	      | 5 +++++
 docs/libempathy/libempathy.types	      | 6 ++++++
 4 files changed, 22 insertions(+), 3 deletions(-)

commit 0f409b69e73a7ec78126afa06ee2edcb17b7769b
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Aug 25 16:23:00 2009 +0200

    Update python bindings

 python/pyempathy/pyempathy.defs	   | 634
 ++++++++++++++++++++++++++++++
 python/pyempathy/pyempathy.override	   |   4 +
 python/pyempathygtk/pyempathygtk.defs	   | 121 ++++++
 python/pyempathygtk/pyempathygtk.override |   6 +
 python/update-binding.sh		   |  10 +
 5 files changed, 775 insertions(+)

commit 98d56a7c21f8723e03f55415937376f7cde1087b
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Aug 25 16:22:32 2009 +0200

    Fix alignment

 libempathy/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 341e9618ce2a2ccd5f361749990b62ae1ffb40a9
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Aug 25 16:20:01 2009 +0200

    Update NEWS file

 NEWS | 94
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)

commit db9fe18c0a3462d9e6cf7147538efbcac6822c74
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Aug 25 16:11:01 2009 +0200

    Bump ABI versions

 configure.ac | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit cc0e441c674b44fbc83f53be98a4d72cb995a3d0
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Aug 25 16:10:23 2009 +0200

    Bump version to 2.27.91

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f36e15d51645589811bb5ed1d973ec49d534e7eb
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Aug 25 14:40:46 2009 +0100

    Don't display 'null' in accounts UI for unknown protocols

 src/empathy-accounts-dialog.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

commit d3ab5e2272f7fa5f20657c386cdc1cc80880e1ed
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Aug 25 14:37:57 2009 +0100

    Add human-readable names for Yahoo! Japan and Facebook Chat

    These are both marked for translation. Obviously the first should be
    localized in its target market, and the latter probably wants
    translating too (perhaps "Clavardage de Facebook"?).

 libempathy/empathy-utils.c | 2 ++
 1 file changed, 2 insertions(+)

commit 8f8d69de56449b6259d6567652dea8e9ac7930a8
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Aug 25 14:34:30 2009 +0100

    Call gettext for translated protocol names

 libempathy/empathy-utils.c | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

commit 19ccd0e26d96beaeb2c649004aaa04110d1d8d4a
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Mon Aug 24 11:42:53 2009 -0400

    Workaround for Clutter bug

    Use a GtkFrame instead of a GtkViewport
    Bugs: http://bugzilla.openedhand.com/show_bug.cgi?id=1751
    http://bugzilla.gnome.org/show_bug.cgi?id=590692

 libempathy-gtk/empathy-contact-widget.ui | 4 +++-
 src/empathy-map-view.ui		  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

commit 24bba52bf2faf446ecd7b0f5fd2feef05bc80ffa
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Aug 25 13:57:08 2009 +0100

    Use datadir instead of the dir suggested in the dbus pkgfile

 data/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4ddcac7537e2fb2404f95d45349b64e93d906724
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Aug 25 13:24:06 2009 +0100

    Add client and service file for o.fd.Tp.Client.Empathy.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 data/.gitignore					  |  1 +
 data/Empathy.client					  |  6 ++++++
 data/Makefile.am					  | 14
 +++++++++++++-
 data/org.freedesktop.Telepathy.Client.Empathy.service.in |  3 +++
 4 files changed, 23 insertions(+), 1 deletion(-)

commit 0b21afc9c0dd2b3944637449cc36f3229e29275f
Author: Manoj Kumar Giri <mgiri@mgiri.csb>
Date:	Tue Aug 25 18:07:02 2009 +0530

    Updated Oriya Translation

 po/or.po | 1060
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 640 insertions(+), 420 deletions(-)

commit 84f127d075d2f2de415e777064680b58014ac3ff
Author: Aron Xu <aronxu@gnome.org>
Date:	Tue Aug 25 19:32:22 2009 +0800

    Updated Simplified Chinese translation.

 po/zh_CN.po | 1166
 +++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 703 insertions(+), 463 deletions(-)

commit fefe898e2ccbca4a0aa75d849073faef5d37bb65
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Aug 25 11:40:16 2009 +0100

    Wait for the connection to be ready before requesting contacts
    from it.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-dispatch-operation.c | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

commit c2967dfd3643cd14dde26ad7e1a08479c0d6ee1f
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Aug 25 12:01:56 2009 +0100

    Remove unused variable

 libempathy-gtk/empathy-protocol-chooser.c | 4 ----
 1 file changed, 4 deletions(-)

commit 6ea9a50172bdee58bf7edae22ed1ee419e22996c
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 25 11:58:21 2009 +0200

    Use the display name in hte adium parser

 libempathy-gtk/empathy-theme-adium.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit c4e5e4b975463d6f5d596afd3aa5623b63ece9a0
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 25 11:51:01 2009 +0200

    Add a missing include

 libempathy-gtk/empathy-protocol-chooser.c | 2 ++
 1 file changed, 2 insertions(+)

commit 1522b80f3f6c2f0ac3cef0def5b4df362550c6b2
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 25 11:50:51 2009 +0200

    Use the new function in the accounts dialog

 src/empathy-accounts-dialog.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 073dc5b0186057f6f30818c3fc50d2070b1743a1
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 25 11:50:26 2009 +0200

    Make empathy_protocol_name_to_display_name public

 libempathy-gtk/empathy-protocol-chooser.c | 31
 +------------------------------
 libempathy/empathy-utils.c		   | 30
 ++++++++++++++++++++++++++++++
 libempathy/empathy-utils.h		   |  1 +
 3 files changed, 32 insertions(+), 30 deletions(-)

commit 13d33b5782508968119610517af99d8312a39f45
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 25 11:35:58 2009 +0200

    Rename Salut to People Nearby

 libempathy-gtk/empathy-protocol-chooser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4822aa271618d166b48062fa21ab3fc99532c35e
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 25 11:28:11 2009 +0200

    Use correct names in the chooser

    XMPP->Jabber
    Yahoo->Yahoo!

 libempathy-gtk/empathy-protocol-chooser.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 48a3c02a73569956acbc4c9e90e52910dfba7452
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 25 02:56:40 2009 +0200

    Fix coding style

 libempathy-gtk/empathy-protocol-chooser.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 5faa01e8bd1609409490e9620f910c6c35d62f69
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 25 02:56:21 2009 +0200

    Use the correct protocol name for the sorting

 libempathy-gtk/empathy-protocol-chooser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5256f84f04342be01b5f15d0730fecccbf3e4083
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 25 02:54:59 2009 +0200

    Filter haze elements in the protocol chooser

    The rule is: free protocols on top and the rest is alphabetical.

 libempathy-gtk/empathy-protocol-chooser.c | 84
 ++++++++++++++++++++++++++++---
 1 file changed, 77 insertions(+), 7 deletions(-)

commit aee5f035ce319f43a541bcf0cbdc536d648192eb
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 25 02:50:53 2009 +0200

    Check for NULL values returned by dup_selected()

 src/empathy-accounts-dialog.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit 3702cb89aa2fe19bea22e280b55fc71e677e9568
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Aug 25 11:10:27 2009 +0100

    Fix a crash caused by tp-glib emitting invalidated in dispose

    When an TpProxy is disposed tp-glib emits the invalidated signal. This
    meant
    that when EmpathyAccount disposed its TpConnection as a result of
    the account
    manager saying the connection was gone, the invalidated signal was
    emitted. As
    a result of which the TpConnection would get disposed again...

 libempathy/empathy-account.c | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

commit 15066163b889c48346948a9b0b963c37ec124d1c
Author: ifelix <ifelix@redhat.com>
Date:	Tue Aug 25 16:06:46 2009 +0530

    Updated Tamil Translations

 po/ta.po | 435
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 242 insertions(+), 193 deletions(-)

commit 2e6d8132394680ea42a3ebdc1daad33ff5e07b86
Merge: 7cfb268 d7f82b0
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Aug 25 11:18:05 2009 +0100

    Merge branch 'mc5', fixes bug #590165

commit d7f82b00ea09c62be272ed2d0c98e9120a722ca9
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 24 19:44:28 2009 +0100

    Rename empathy_profile_chooser_get_type to	_protocol_

 docs/libempathy-gtk/libempathy-gtk.types | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit de0881ae79de1418b8a2400ab1b8c5df64efff30
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 24 19:42:46 2009 +0100

    Remove non-existing file from POTFILES.in

 po/POTFILES.in | 1 -
 1 file changed, 1 deletion(-)

commit db8e44564590cc422920d83ed80fda900400abc0
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Aug 24 18:43:04 2009 +0100

    Fallback to setting the global presence to offline if no account
    has a better presence.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-account-manager.c | 1 +
 1 file changed, 1 insertion(+)

commit 7cfb268c7d96f929646c5eb093e6f07aa8b1abea
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Mon Aug 24 10:44:13 2009 -0400

    Update marker's label every second

    This is necessary for the time indication to stay accurate

 src/empathy-map-view.c | 96
 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 66 insertions(+), 30 deletions(-)

commit 2b0b994dca5c7fe90f26befab4fd01d92908edef
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon Aug 24 14:08:50 2009 +0200

    Add example labels to all protocols

    Also, fix padding and make the label prettier.

 libempathy-gtk/empathy-account-widget-aim.ui	    | 33
 ++++++++++++++++++----
 libempathy-gtk/empathy-account-widget-groupwise.ui | 28
 ++++++++++++++----
 libempathy-gtk/empathy-account-widget-icq.ui	    | 33
 ++++++++++++++++++----
 libempathy-gtk/empathy-account-widget-jabber.ui    |  3 +-
 libempathy-gtk/empathy-account-widget-msn.ui	    | 28
 ++++++++++++++----
 libempathy-gtk/empathy-account-widget-sip.ui	    | 26 ++++++++++++++---
 libempathy-gtk/empathy-account-widget-yahoo.ui     | 33
 ++++++++++++++++++----
 7 files changed, 151 insertions(+), 33 deletions(-)

commit cdf5ef7743814ca18104d5dba1a04e79a3554d0e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 24 12:01:52 2009 +0100

    empathy-accounts-dialog: remove the hardcoded Gmail label

 src/empathy-accounts-dialog.ui | 1 -
 1 file changed, 1 deletion(-)

commit 532d0bd9055bdc5ff75eba8568953022ffa6e6df
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 24 12:00:23 2009 +0100

    empathy-account-widget: don't expand and fill vertically the
    'Activate' checkbox

 libempathy-gtk/empathy-account-widget.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 153573554bde794ee8fe60b5115ac9bce01c0dd8
Author: Denis Arnaud <darnaud@src.gnome.org>
Date:	Mon Aug 24 12:41:33 2009 +0200

    Updated breton translation

 po/br.po | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

commit 1cd5827a7e47c76834ed22ab4548a564623d3245
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 24 11:37:23 2009 +0100

    Free the allocated dirname after usage

 libempathy/empathy-log-store-empathy.c | 2 ++
 1 file changed, 2 insertions(+)

commit f421f61bb5e2ef7e8067b5874e0230961be389d5
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 24 11:35:00 2009 +0100

    Fix several coding style issues

 libempathy/empathy-log-store-empathy.c | 2 +-
 src/empathy-import-mc4-accounts.c	| 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 82c599881220294274e047813bd060e73fe45718
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 24 11:34:45 2009 +0100

    Add empathy-import-mc4-accounts to POTFILES

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit 7a6984c4afb6d7080b833c4cbd9c7f500ff7693e
Author: Denis Arnaud <darnaud@src.gnome.org>
Date:	Mon Aug 24 06:18:21 2009 +0200

    Updated breton translation

 po/br.po | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

commit 276a8e15dae658c49849aed43ac3094a0f6225e1
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 24 00:23:27 2009 +0100

    Don't use a custom function to build the log dir

 libempathy/empathy-log-store-empathy.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit f23c28d9775e5679fa17568cb49e296b8251e0ea
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 24 00:22:54 2009 +0100

    Have log_store_empathy_search_hit_new lookup accounts properly

 libempathy/empathy-log-store-empathy.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

commit aa0487edef4dc671e99a9e4dc6a1895c0fdaca4a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 24 00:21:27 2009 +0100

    Split out the account name to dirname translation

 libempathy/empathy-log-store-empathy.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

commit 7894d6060831bbb8134386cb24e1cf741a146ace
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 23:15:29 2009 +0100

    Ensure that the connection data is setup when handle channels

 libempathy/empathy-dispatcher.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

commit 25bd33610962da0a8ff8dba645ac84e9f84d7e4f
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 23:13:12 2009 +0100

    Add a new _ensure_account API

    Have one call which only gets the account if it exists and a
    different one
    which creates the account on the given path when needed.

 libempathy/empathy-account-manager.c | 16 +++++++++++++---
 libempathy/empathy-account-manager.h |  3 +++
 libempathy/empathy-dispatcher.c      |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

commit 74bba154cc8476d831140e27148d4897633e2d18
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 22:52:40 2009 +0100

    When empathy_account_settings_apply_finish returns false the error
    is always set

 src/empathy-import-mc4-accounts.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 05deeddf094d51dfdfc6133850f40e3e1d5591ca
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 22:51:52 2009 +0100

    Put string up for translation

 src/empathy-import-mc4-accounts.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 81ad518058d0ae188c1dc229c55d6c8f71f84dbe
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 22:51:32 2009 +0100

    Fix use after free

 src/empathy-import-mc4-accounts.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 93e0d79fad604f7b0494f738f65cd5c6c46ecc8c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 22:51:02 2009 +0100

    Fix copyright date

 src/empathy-import-mc4-accounts.c | 2 +-
 src/empathy-import-mc4-accounts.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 6d77d369532c3806c8bba9ab2374d7b795657c0d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 22:50:36 2009 +0100

    Fix some broken english

 data/empathy.schemas.in	   | 4 ++--
 src/empathy-import-mc4-accounts.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 35d058ac2d105c9c77aa378e4dc4a9e7abae8597
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 22:43:14 2009 +0100

    Move the logs to the new location after creating the account

 src/empathy-import-mc4-accounts.c | 96
 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 92 insertions(+), 4 deletions(-)

commit a71220d4f3f8c5acec4e17b18573225dd0a5c125
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 21:26:17 2009 +0100

    Make the dir names for the logs look nicer

 libempathy/empathy-log-store-empathy.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 96ae3367ff3aca2ef4c33e7e1f4790c7d5cc6fe3
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 18:55:54 2009 +0100

    Refactor the startup sequence a bit

    On initial start the following should happen:
      * If we haven't tried to import mc4 accounts, do so
      * If there were no mc4 accounts imported and there are no accounts
      defined
	show the account creation assistant.
      * If we haven't created a salut account, do so

 src/empathy.c | 67
 +++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 37 insertions(+), 30 deletions(-)

commit 97ce0c3a078943c1c25ad8e2411482ffc9edc8c8
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 18:53:33 2009 +0100

    Always set the mc4 imported gconf key

 src/empathy-import-mc4-accounts.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

commit 3cdcb21a13d11a2026d242c242704b0581a7b475
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 18:52:17 2009 +0100

    Fix debug strings, don't unref the gconf client twice

 src/empathy-import-mc4-accounts.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit 9d3432812718541748315d119b22960c190a2ffd
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 18:45:13 2009 +0100

    Add api to ask if we have importer our mc4 accounts

 src/empathy-import-mc4-accounts.c | 14 ++++++++++++++
 src/empathy-import-mc4-accounts.h |  1 +
 2 files changed, 15 insertions(+)

commit afd7de0052654752aa60edc8dddfd628eaa49ce6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 18:24:46 2009 +0100

    Return TRUE if we imported any mc4 accounts

 src/empathy-import-mc4-accounts.c | 30 +++++++++++++++++++-----------
 src/empathy-import-mc4-accounts.h |  2 +-
 2 files changed, 20 insertions(+), 12 deletions(-)

commit f4cd87f5aba95e2c20cb4af10f9de8e1d62b3702
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 18:16:24 2009 +0100

    Grab passwords from the keyring if needed

 configure.ac			   |  2 ++
 src/empathy-import-mc4-accounts.c | 47
 ++++++++++++++++++++++++++++++++++-----
 2 files changed, 44 insertions(+), 5 deletions(-)

commit 95cddd4f98544e4526a08cc25e5dd3fce0ed2a33
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 17:51:58 2009 +0100

    Overhaul the importer slightly

 src/empathy-import-mc4-accounts.c | 516
 +++++++++++++-------------------------
 src/empathy-import-mc4-accounts.h |   6 +-
 2 files changed, 179 insertions(+), 343 deletions(-)

commit 6e879827478efe7a4cb8d03101840cbff32188b1
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 17:37:25 2009 +0100

    Don't override the display_name when creating the account

 libempathy/empathy-account-settings.c | 6 ------
 1 file changed, 6 deletions(-)

commit 9498d6a67a0085d0bab3e49cd11288daa6474771
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 15:00:28 2009 +0100

    Use g_str_has_prefix convenience function for clarity

 src/empathy-import-mc4-accounts.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 4b5fa08436333e571186c991496549be520f21eb
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 14:57:32 2009 +0100

    Make the gconf entry be false by default

 data/empathy.schemas.in	   | 17 +++++++----------
 src/empathy-import-mc4-accounts.c | 15 ++++++++-------
 2 files changed, 15 insertions(+), 17 deletions(-)

commit 8781e7c615d1f233a530cff66cfe47aa54fddd2f
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 14:55:53 2009 +0100

    Don't unref the account object as we don't own it

 src/empathy-import-mc4-accounts.c | 1 -
 1 file changed, 1 deletion(-)

commit b466c826795481a46c47f74773689633d9bb0b6c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 14:55:17 2009 +0100

    Use new async enable api

 src/empathy-import-mc4-accounts.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 50a7def3f5ba311a0e5f8725d6ccaa1215742db6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 14:51:18 2009 +0100

    Return the correct object when querying the dbus-daemon property

 libempathy/empathy-account.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 047eaa1027bc50f98f0980f0169b3ccbdda34238
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Aug 23 14:31:46 2009 +0100

    Remove unused finalize

 libempathy/empathy-connection-managers.c | 16 ----------------
 1 file changed, 16 deletions(-)

commit 53077973f94837e583296a2d4c93db84317e1913
Author: Arnaud Maillet <arnaud.maillet@collabora.co.uk>
Date:	Sat Aug 22 14:55:49 2009 +0200

    Instantiate the mc4 account importer in empathy.c

 src/empathy.c | 2 ++
 1 file changed, 2 insertions(+)

commit 5b34b46eb22ab9b178144959a23ca99d5b20f3ac
Author: Arnaud Maillet <arnaud.maillet@collabora.co.uk>
Date:	Sat Aug 22 14:54:49 2009 +0200

    Add the mc4 account importer files in the makefile

 src/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit cd4e69ec454107edd7e6ef4b36d75a28e7588c77
Author: Arnaud Maillet <arnaud.maillet@collabora.co.uk>
Date:	Sat Aug 22 14:54:06 2009 +0200

    Add a new DEBUG domain for the mc4 account importer

 libempathy/empathy-debug.c | 1 +
 libempathy/empathy-debug.h | 1 +
 2 files changed, 2 insertions(+)

commit 4e9b2251c70bd47c52806963a7cd9f6389240798
Author: Arnaud Maillet <arnaud.maillet@collabora.co.uk>
Date:	Sat Aug 22 14:53:34 2009 +0200

    Add a new gconf value to know if mc4 accounts have to be imported

 data/empathy.schemas.in | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit 1173e9d086df6304f2436edf0d8cc6c1540414f9
Author: Arnaud Maillet <arnaud.maillet@collabora.co.uk>
Date:	Sat Aug 22 14:52:15 2009 +0200

    Add empathy-import-mc4-accounts files

 src/empathy-import-mc4-accounts.c | 555
 ++++++++++++++++++++++++++++++++++++++
 src/empathy-import-mc4-accounts.h |  31 +++
 2 files changed, 586 insertions(+)

commit f2ab339f3d092ac3b666e66fb3b1d50352e1c999
Author: Alexander Shopov <ash@contact.bg>
Date:	Sun Aug 23 23:22:39 2009 +0300

    Updated Bulgarian translation

 po/bg.po | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

commit 0f44e04c0dc6b8c0cb67246f6af58c36c6bff3bc
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Aug 23 21:20:03 2009 +0200

    [help] Used figure for the image in the introduction

 help/C/introduction.page | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 9a0b883ee43536dfd302526f60e5396ff9e7fa72
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Aug 23 20:58:24 2009 +0200

    Ignore tests/test-empathy-account-assistant

 tests/.gitignore | 1 +
 1 file changed, 1 insertion(+)

commit 69587b5167623c9c73a06ab9c86695019c2146c6
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Aug 23 20:55:18 2009 +0200

    Use better avatar location: ~/.cache/<cm>/<protocol>/<token>

 libempathy/empathy-contact.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

commit c0bb2a5ad81932cb761f99495324701af2bae10b
Author: Alexander Shopov <ash@contact.bg>
Date:	Sun Aug 23 12:19:06 2009 +0300

    Updated Bulgarian translation

 po/bg.po | 1989
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 1220 insertions(+), 769 deletions(-)

commit 45a6ac022bc86f649bb49f909f95b9311eec57c9
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Aug 22 19:43:38 2009 +0100

    Use the right default answer if we're not importing accounts

 src/empathy-account-assistant.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit f984475cb967427790466d21b42b6e703fa55a26
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Aug 22 18:33:58 2009 +0100

    When creating an account use a connect button instead of an apply
    button

 libempathy-gtk/empathy-account-widget.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit fe39c811b7ef600c0262b905683f3a8966311129
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Aug 22 18:20:53 2009 +0100

    Clean up the dialog a bit

 src/empathy-accounts-dialog.ui | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

commit 1eda75c91abf01bc7fe25d4eb41465a21f042596
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Aug 22 18:20:32 2009 +0100

    Make the layout more consistent with the other widgets

 libempathy-gtk/empathy-account-widget-jabber.ui | 22
 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

commit c10e3fbca90c684a3f0988a119cfad3d14def218
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Aug 22 17:44:14 2009 +0100

    Fix some leaks in _settings_discard

    Prevent leaking the unset parameter names when unsetting the array.
    Also use it as a general utility function in other parts of the code

 libempathy/empathy-account-settings.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

commit 4174547fb3fcc5d9447b20728a3fb086cf90b9e0
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Aug 22 17:31:15 2009 +0100

    If the parameter wasn't known return NULL for the dbus signature

 libempathy/empathy-account-settings.c | 3 +++
 1 file changed, 3 insertions(+)

commit b72ead7076cd2ba308d32f0ae42fc50efc82bd51
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Aug 22 17:22:23 2009 +0100

    Remove dead code and fix some coding style issues

 libempathy-gtk/empathy-account-widget.h | 3 ---
 src/empathy-accounts-dialog.c		 | 4 +---
 2 files changed, 1 insertion(+), 6 deletions(-)

commit bd062af39b10bb87d86b9561001f4ab9184e037d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Aug 22 17:21:09 2009 +0100

    Don't leak a ref to EmpathyAccountSettings

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0888975ccb8c6ead5761659677d18991c53fe23a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Aug 22 16:14:20 2009 +0100

    Make the alignment names in the sip.ui file unique

 libempathy-gtk/empathy-account-widget-sip.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 75787cf5aabb97b37bacbb86d0acd0dfcd2e3350
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sat Aug 22 17:53:57 2009 +0200

    [help] Fixed some indentation

 help/C/import-account.page | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit d2b306d115c9c7b46da2e2018e061aa38e6397bf
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Aug 22 16:04:26 2009 +0100

    Don't free the icon name that we don't own

 src/empathy-accounts-dialog.c | 2 --
 1 file changed, 2 deletions(-)

commit f454a43c73519864fde157ce1ba5e61139c98ee6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat Aug 22 15:53:07 2009 +0100

    Update python bindings

 python/pyempathygtk/pyempathygtk.defs | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

commit d047670385b7dcc65ccdb89969f0e43deea7c93e
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Fri Aug 21 16:08:29 2009 -0400

    Every protocols should now have an "Enabled" checkbox in "edit" mode.

 libempathy-gtk/empathy-account-widget-irc.c  |  4 +++-
 libempathy-gtk/empathy-account-widget-irc.h  |  3 ++-
 libempathy-gtk/empathy-account-widget-sip.c  |  4 +++-
 libempathy-gtk/empathy-account-widget-sip.h  |  3 ++-
 libempathy-gtk/empathy-account-widget-sip.ui |  2 +-
 libempathy-gtk/empathy-account-widget.c      | 17 +++++++++++++++--
 6 files changed, 26 insertions(+), 7 deletions(-)

commit 17ae7af66b0baa2b898445dee8e79a670e588891
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Fri Aug 21 15:11:32 2009 -0400

    Fix errors revealed by make check

    - Added missing files in po/POTFILES.in
    - Fixed style

 libempathy-gtk/empathy-account-widget.c   |  2 +-
 libempathy-gtk/empathy-protocol-chooser.c |  2 +-
 po/POTFILES.in				   |  1 +
 src/empathy-account-assistant.c	   | 10 +++++-----
 src/empathy-accounts-dialog.c		   |  4 ++--
 src/empathy-import-dialog.c		   |  4 ++--
 src/empathy-import-widget.c		   |  4 ++--
 7 files changed, 14 insertions(+), 13 deletions(-)

commit adc79c5d0574f548cfe2b89cb0e04d74a5d1e40e
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Thu Aug 13 08:56:02 2009 -0400

    First part of an overhaul of the accounts dialog

 libempathy-gtk/empathy-account-widget-jabber.ui |  53 ++-
 libempathy-gtk/empathy-account-widget.c	 | 302 ++++++++++++++---
 libempathy-gtk/empathy-account-widget.h	 |  16 +-
 libempathy/empathy-account-manager.c		 |   9 +-
 libempathy/empathy-account-settings.c		 |  49 ++-
 libempathy/empathy-account-settings.h		 |   3 +
 src/empathy-account-assistant.c		 |   5 +-
 src/empathy-accounts-dialog.c			 | 416
 ++++++++++++------------
 src/empathy-accounts-dialog.ui			 | 137 +++-----
 9 files changed, 628 insertions(+), 362 deletions(-)

commit ea7a91dfc098c8ed3a0e9a12f5a7030a090f9efa
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sat Aug 22 17:43:17 2009 +0200

    [help] Added the new topic to Makefile.am

 help/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit e4d23c49aa343b07db175dbcea5bc164d6fa737a
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sat Aug 22 17:40:48 2009 +0200

    [help] Added one more step to the import-account topic

 help/C/import-account.page | 7 +++++++
 1 file changed, 7 insertions(+)

commit b5c1bfbf253614882a22a2050ff1961860c3f015
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sat Aug 22 17:30:43 2009 +0200

    [help] Added a seealso link to import-account

 help/C/import-account.page | 1 +
 1 file changed, 1 insertion(+)

commit 18630f95cd3df91201132602b6147a38b33cd4e9
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sat Aug 22 17:26:42 2009 +0200

    [help] Updated the import-account topic

 help/C/import-account.page | 66
 ++++++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 32 deletions(-)

commit 8bd06a9a817724cf109e8c4a7def1f6ac7300077
Author: Peter Haslam <peter.haslam@freenet.de>
Date:	Sat Aug 22 17:23:25 2009 +0200

    [help] Added the import-account topic

 help/C/import-account.page | 78
 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

commit 165945e35293556ba6d133f5f90a7251de8d8e4b
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 11 17:48:59 2009 +0200

    Enable entering more than an account from the wizard.

 src/empathy-account-assistant.c | 167
 +++++++++++++++++++++++++++++++---------
 1 file changed, 131 insertions(+), 36 deletions(-)

commit f77948f72bf1863ed85d903c9a6f28353f36b175
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Aug 10 17:20:17 2009 +0200

    Add example labels to the simple widgets

 libempathy-gtk/empathy-account-widget-aim.ui	    | 28
 +++++++++++++++++++---
 libempathy-gtk/empathy-account-widget-groupwise.ui | 28
 +++++++++++++++++++---
 libempathy-gtk/empathy-account-widget-icq.ui	    | 28
 +++++++++++++++++++---
 libempathy-gtk/empathy-account-widget-jabber.ui    | 28
 +++++++++++++++++++---
 libempathy-gtk/empathy-account-widget-msn.ui	    | 28
 +++++++++++++++++++---
 libempathy-gtk/empathy-account-widget-sip.ui	    | 28
 +++++++++++++++++++---
 libempathy-gtk/empathy-account-widget-yahoo.ui     | 28
 +++++++++++++++++++---
 7 files changed, 175 insertions(+), 21 deletions(-)

commit 0e5397ae0e6cc3d75f8e9db19ca872cf28cf41be
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Sun Aug 9 17:48:57 2009 +0200

    Make the import system more future-proof

    Split the utilities from the widget and the dialog; we now have
    an enum
    for supported applications, with a special value which means "all
    applications", which is the only one which triggers showing the
    "Source"
    column in EmpathyImportWidget. We need this to avoid being redundant
    in
    the EmpathyAccountAssistant, as we already choose there the
    application
    from which to import.

 src/Makefile.am		 |  1 +
 src/empathy-account-assistant.c |  7 ++--
 src/empathy-accounts-dialog.c	 |  3 +-
 src/empathy-import-dialog.c	 | 44 +---------------------
 src/empathy-import-dialog.h	 | 18 ---------
 src/empathy-import-pidgin.c	 |  2 +-
 src/empathy-import-utils.c	 | 76
 ++++++++++++++++++++++++++++++++++++++
 src/empathy-import-utils.h	 | 56 ++++++++++++++++++++++++++++
 src/empathy-import-widget.c	 | 82
 +++++++++++++++++++++++++++++++++--------
 src/empathy-import-widget.h	 |  4 +-
 tests/Makefile.am		 |  2 +-
 11 files changed, 213 insertions(+), 82 deletions(-)

commit 350ed3dbdba49253b6a94c8066c45ae81e95bed1
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Sun Aug 9 17:15:51 2009 +0200

    Remove useless includes

 src/empathy-account-assistant.c | 1 +
 src/empathy-import-dialog.c	 | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

commit 7bbf2dfc7a29041ab5efeb1683fab7d213d480df
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 7 21:08:12 2009 +0200

    The assistant should not be resizable

 src/empathy-account-assistant.c | 2 ++
 1 file changed, 2 insertions(+)

commit 34f824dd1b1642afab7474d32b53e65074a5495c
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 7 21:06:49 2009 +0200

    Don't hardcode new lines

 src/empathy-account-assistant.c | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

commit fdb4edb101b73e0860c37570e877f8c2a57b3b76
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 7 17:24:42 2009 +0200

    Update the test

 tests/Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

commit 5f31f7e68a4d8e132aa9c1d0c6305e1546368666
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 7 17:24:06 2009 +0200

    Hook the import UI in the assistant

 src/empathy-account-assistant.c | 92
 +++++++++++++++++++++++++++++++----------
 1 file changed, 70 insertions(+), 22 deletions(-)

commit 72ade92677b8c069b2933b76c64e340222a31254
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 7 17:23:24 2009 +0200

    Adapt to the new API

 src/empathy-accounts-dialog.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit a7e5be33b8ff0bf0cdeaf4672d967e14f80c54eb
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 7 17:22:55 2009 +0200

    Add the new files to the Makefile.am

 src/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit 2f019885754917e5130b35d167cadb4c5ca966d5
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Aug 7 17:21:56 2009 +0200

    Split EmpathyImportDialog and EmpathyImportWidget

    Also, take this as a chance to GObject-ify everything.

 src/empathy-import-dialog.c  | 493
 ++++++++++++++-----------------------------
 src/empathy-import-dialog.h  |  39 +++-
 src/empathy-import-dialog.ui |  78 ++-----
 src/empathy-import-widget.c  | 464
 ++++++++++++++++++++++++++++++++++++++++
 src/empathy-import-widget.h  |  68 ++++++
 5 files changed, 739 insertions(+), 403 deletions(-)

commit 1ca4a9ee58260df26a03bc6565867b7958333f4c
Author: Arnaud Maillet <arnaud.maillet@collabora.co.uk>
Date:	Tue Jul 28 15:07:53 2009 +0200

    Remove the hardcode

 src/empathy-accounts-dialog.c | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

commit b047c404615a4137ced83c40d214f1092fbc733b
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Aug 6 21:17:16 2009 +0200

    Emit the close signal only after we are done with the async machinery.

 src/empathy-account-assistant.c | 53
 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 45 insertions(+), 8 deletions(-)

commit 85883a63be4daae817ed194ba6fa014266d27c09
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Aug 6 21:13:31 2009 +0200

    Port to new API

 src/empathy-accounts-dialog.c | 2 +-
 src/empathy.c		       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 23d4544855656cfdc9cf65ed94801191002e86ce
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Aug 6 21:13:09 2009 +0200

    Make the set_enabled API async

 libempathy/empathy-account.c | 57
 +++++++++++++++++++++++++++++++++-----------
 libempathy/empathy-account.h |  7 ++++--
 2 files changed, 48 insertions(+), 16 deletions(-)

commit a4f73e80b9f3015356fd0ee7d33fc0c7a8a21c8c
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Aug 6 19:55:36 2009 +0200

    Implement close and cancel;

    Also, move to implementing GTK+ signals rather than connecting

 src/empathy-account-assistant.c | 101
 ++++++++++++++++++++++++----------------
 1 file changed, 61 insertions(+), 40 deletions(-)

commit 2cfd3d52a13089bd00c863a2ff2a721ec04190b5
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Aug 6 19:20:28 2009 +0200

    Add a comment over the window type hint

 src/empathy-account-assistant.c | 1 +
 1 file changed, 1 insertion(+)

commit 1d0f90da95786ef6143460ed7234156ec9c46936
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Aug 6 19:19:56 2009 +0200

    Enable newly created accounts

 src/empathy-account-assistant.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit f9cbc778a336d3a891d67914d289841222fb679b
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Aug 6 19:19:49 2009 +0200

    Implement dispose

 src/empathy-account-assistant.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

commit b264035637b60c6fc09839f2a58f2bc16f573113
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Aug 6 15:39:00 2009 +0200

    Report errors during creation

 src/empathy-account-assistant.c | 118
 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 117 insertions(+), 1 deletion(-)

commit 9aafbf8e9f92b270036f61622ece41461342a279
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 5 16:39:57 2009 +0200

    Fix long lines

 src/empathy.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 84fbdb813bbb7f29aceedbd7293dcb10c499d660
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 5 16:39:47 2009 +0200

    Don't forward anymore after the end

 src/empathy-account-assistant.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit ce3eb60be50a9571bde936eccecc800ee54080f1
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 5 16:39:20 2009 +0200

    Report back errors (right now just on stdout)

 src/empathy-account-assistant.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

commit bca9fa60a556e96dbad090afcfd407dab7a4532d
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 5 16:38:55 2009 +0200

    Add a parent window property to the assistant

 src/empathy-account-assistant.c	| 71
 +++++++++++++++++++++++++++++++++-
 src/empathy-account-assistant.h	|  2 +-
 src/empathy.c				| 10 ++++-
 tests/test-empathy-account-assistant.c |  2 +-
 4 files changed, 79 insertions(+), 6 deletions(-)

commit 665eea7db24e59db641803d5d778f0fbc58eebe7
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 5 12:08:17 2009 +0200

    Fix long line

 libempathy/empathy-account-settings.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 06c242f4125d7a48667b069ac53902894cbcdf10
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 5 12:06:29 2009 +0200

    Unref settings when changing the protocol

 src/empathy-account-assistant.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 3962f6f8d1680b6a304577dbc1ed366c33f6b206
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Aug 5 12:02:39 2009 +0200

    Change labels when creating an account

 libempathy-gtk/empathy-account-widget-jabber.ui | 28
 +++++++++++++++++++++----
 libempathy-gtk/empathy-account-widget.c	 | 14 +++++++++++++
 src/empathy-account-assistant.c		 |  4 ++++
 3 files changed, 42 insertions(+), 4 deletions(-)

commit 877ca07d5b79400863997df5c31180feec7103db
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 4 20:01:30 2009 +0200

    Unify the enter and create page.

    Refactor a lot the surrounding code.
    Missing piece: adapting labels for the EmpathyAccountWidget in case of
    creation vs. entering details.

 src/empathy-account-assistant.c | 319
 ++++++++++++++++++++++++++--------------
 1 file changed, 205 insertions(+), 114 deletions(-)

commit bc7cb0959c31644d271fc9945d17cd961dece03d
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 4 20:00:54 2009 +0200

    Support changing the filter func on the fly

 libempathy-gtk/empathy-protocol-chooser.c | 36
 +++++++++++++++++--------------
 1 file changed, 20 insertions(+), 16 deletions(-)

commit caa57e8e5e3fbbad790e3825597a5b3ddd2f3175
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 4 18:22:32 2009 +0200

    React to entry changes immediately

 libempathy-gtk/empathy-account-widget.c | 40
 +++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 9 deletions(-)

commit fa77756bd1db1c0b657fc784508890330bd5bfb3
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 4 18:21:47 2009 +0200

    Remove the parameters from the unset pool when we set them again

 libempathy/empathy-account-settings.c | 36
 ++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

commit c037c417937a5a77a8c8bc168103cb3c5a19a659
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 4 15:22:36 2009 +0200

    Filter out IRC and local-xmpp in the wizard

 src/empathy-account-assistant.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 3f21eaf356b78cd1e0a8c7d43818e85c7bc12e4a
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 4 15:22:29 2009 +0200

    Implement a generic simple widget

 libempathy-gtk/empathy-account-widget-generic.ui |  2 +-
 libempathy-gtk/empathy-account-widget.c	  | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

commit f75d35f22aa745688f9fd932a5de6a6903b3db04
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 4 15:21:46 2009 +0200

    Implement a simple SIP widget

 libempathy-gtk/empathy-account-widget-sip.c | 81
 ++++++++++++++++++-----------
 1 file changed, 51 insertions(+), 30 deletions(-)

commit 712f5f9f45105ce66f0f8d4fff40857924943ae8
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 4 13:20:52 2009 +0200

    Add simple implementations for many widgets

 libempathy-gtk/empathy-account-widget-aim.ui	    |  66 +++++++
 libempathy-gtk/empathy-account-widget-groupwise.ui |  66 +++++++
 libempathy-gtk/empathy-account-widget-icq.ui	    |  66 +++++++
 libempathy-gtk/empathy-account-widget-jabber.ui    |  66 +++++++
 libempathy-gtk/empathy-account-widget-msn.ui	    |  66 +++++++
 libempathy-gtk/empathy-account-widget-sip.ui	    |  66 +++++++
 libempathy-gtk/empathy-account-widget-yahoo.ui     |  66 +++++++
 libempathy-gtk/empathy-account-widget.c	    | 218
 +++++++++++++++------
 8 files changed, 615 insertions(+), 65 deletions(-)

commit b69cd1fb3e9c4f2ffe87e1be5e165cc168cc60c9
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 4 11:46:24 2009 +0200

    Update label layout and add an "apply" logic

 src/empathy-account-assistant.c | 66
 +++++++++++++++++++++++++++++++++++------
 1 file changed, 57 insertions(+), 9 deletions(-)

commit f274e990d552235090b689071f5d464007948d52
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 4 11:45:42 2009 +0200

    Add a way to hook up to the apply sensitivity

 libempathy-gtk/empathy-account-widget.c | 27 ++++++++++++++++++++++++---
 libempathy-gtk/empathy-account-widget.h |  3 ++-
 2 files changed, 26 insertions(+), 4 deletions(-)

commit 7f784aadcfcadc05128b783a4e8d5f8499887b9d
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 4 02:40:04 2009 +0200

    Add the details page to the assistant

    Also, add a sketched version of the other pages

 src/empathy-account-assistant.c | 170
 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 165 insertions(+), 5 deletions(-)

commit 008fe6aa33bcc251a83b4670ead7eff5f552c268
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 4 02:39:47 2009 +0200

    Add an API to filter protocols

 libempathy-gtk/empathy-protocol-chooser.c | 81
 ++++++++++++++++++++++++++-----
 libempathy-gtk/empathy-protocol-chooser.h | 11 ++++-
 2 files changed, 78 insertions(+), 14 deletions(-)

commit f6a4501ee0965a8353b9ed638d37367f7068b34a
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Aug 4 02:39:25 2009 +0200

    Add the concept of simple account widget

 libempathy-gtk/empathy-account-widget.c | 113
 +++++++++++++++++++++++---------
 libempathy-gtk/empathy-account-widget.h |   3 +
 2 files changed, 85 insertions(+), 31 deletions(-)

commit f36945737307c6de7d5c8c66fb117dbdc170a758
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Aug 3 18:01:48 2009 +0200

    Fix long lines

 libempathy-gtk/empathy-account-widget.c | 35
 +++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 13 deletions(-)

commit 7ec689852cca3280e48f1d6cba3f5c358575844c
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Aug 3 18:00:41 2009 +0200

    Remove dead code

 libempathy-gtk/empathy-protocol-chooser.h | 4 ----
 1 file changed, 4 deletions(-)

commit 63b3a10e4b442ef9865885f590f3d251ac006f04
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Aug 3 11:32:19 2009 +0200

    Add private struct and responses to first page

 src/empathy-account-assistant.c | 62
 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 3 deletions(-)

commit 91feedc5c6b02468fc029f83157445a9c6d8b7d4
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Aug 3 11:32:05 2009 +0200

    Style fixes

 src/empathy-account-assistant.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 01e526b8b694869c81996f9e817cc3e3a559c161
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Aug 3 10:34:48 2009 +0200

    Fix style

 src/empathy-account-assistant.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

commit 3ac8eb4e2f6909d6c54718d6910b156359e10b42
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Sat Aug 1 19:11:33 2009 +0200

    Move back the account assistant to src/

 libempathy-gtk/Makefile.am		    |	2 -
 libempathy-gtk/empathy-account-assistant.c | 116
 -----------------------------
 libempathy-gtk/empathy-account-assistant.h |  60 ---------------
 src/Makefile.am			    |	1 +
 src/empathy-account-assistant.c	    | 116
 +++++++++++++++++++++++++++++
 src/empathy-account-assistant.h	    |  60 +++++++++++++++
 tests/Makefile.am			    |	5 ++
 tests/test-empathy-account-assistant.c     |	2 +-
 8 files changed, 183 insertions(+), 179 deletions(-)

commit 73a995007e5a417b0e1e0ebf13bdcfdf4dae7c7c
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Sat Aug 1 19:02:52 2009 +0200

    Implement first page in the assistant

 libempathy-gtk/Makefile.am		    |	2 +
 libempathy-gtk/empathy-account-assistant.c | 116
 +++++++++++++++++++++++++++++
 libempathy-gtk/empathy-account-assistant.h |  60 +++++++++++++++
 src/Makefile.am			    |	1 -
 src/empathy-account-assistant.c	    |  75 -------------------
 src/empathy-account-assistant.h	    |  60 ---------------
 tests/test-empathy-account-assistant.c     |	2 +-
 7 files changed, 179 insertions(+), 137 deletions(-)

commit a1382ef236e65efb2443268d3ed406229e747381
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Sat Aug 1 17:33:32 2009 +0200

    Add a first page to the assistant

 src/Makefile.am		 |  1 +
 src/empathy-account-assistant.c | 32 ++++++++++++++++++++++++++++++++
 src/empathy-account-assistant.h |  1 +
 3 files changed, 34 insertions(+)

commit 1b1ba53e2b64a4e5b3f9e27a54b3b863f5be0d4a
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Sat Aug 1 17:33:21 2009 +0200

    Add a test for the assistant

 tests/Makefile.am			|  2 ++
 tests/test-empathy-account-assistant.c | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

commit 8bccbdc3d107c019ef858d0ad15c769c31028731
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat Aug 1 17:00:30 2009 +0200

    Skeleton of EmpathyAccountAssistant

 src/empathy-account-assistant.c | 43 ++++++++++++++++++++++++++++++
 src/empathy-account-assistant.h | 59
 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+)

commit 74209eb1b8b0cf9df87e66e2e028cae885b39a5f
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat Aug 1 16:54:23 2009 +0200

    Port empathy.c to telepathy-style

 src/empathy.c | 1072
 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 546 insertions(+), 526 deletions(-)

commit 158dad3e3108fab76a64d9aac22b6d9306ce3d4f
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Aug 22 12:06:00 2009 +0200

    Updated Spanish translation

 po/es.po | 168
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 90 insertions(+), 78 deletions(-)

commit 1c989a207a5ef27f88b1c4a1a1b68cfcfd1d6efe
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Fri Aug 21 16:50:09 2009 -0400

    Properly register video source gstreamer element too

 libempathy-gtk/empathy-video-src.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

commit 3245c197d95c326372323addde9f62ca96167a33
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Aug 21 18:51:24 2009 +0100

    Fix a small memory leak

 src/empathy-import-pidgin.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit f51d76329d1f2994c450aa0c8bf3a37412512581
Author: Arnaud Maillet <arnaud.maillet@collabora.co.uk>
Date:	Tue Jul 28 15:57:41 2009 +0200

    Instantiate mc5 pidgin account importer in empathy-accounts-dialog

 src/empathy-accounts-dialog.c | 15 ---------------
 1 file changed, 15 deletions(-)

commit 6da962b47b8a9b6bba3aecf8fda82d1e58d547cf
Author: Arnaud Maillet <arnaud.maillet@collabora.co.uk>
Date:	Tue Jul 28 15:55:28 2009 +0200

    Add empathy-import-dialog and empathy-import-pidgin to the makefile

 src/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

commit 5e48d35061335282d7cf64e00dcf932dffcdfb54
Author: Arnaud Maillet <arnaud.maillet@collabora.co.uk>
Date:	Tue Jul 28 14:49:53 2009 +0200

    Port empathy-import-pidgin to mc5

 src/empathy-import-pidgin.c | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

commit 735481c7e2d0d2180d5970b83722452f8aa99ae9
Author: Arnaud Maillet <arnaud.maillet@collabora.co.uk>
Date:	Tue Jul 28 14:49:26 2009 +0200

    Port empathy-import-dialog to mc5

 src/empathy-import-dialog.c | 143
 +++++++++++++++++++++++++++-----------------
 src/empathy-import-dialog.h |	 7 ++-
 2 files changed, 93 insertions(+), 57 deletions(-)

commit f1394c92c71040e26bf6ec204c3eb9d8bb11ba25
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Aug 21 18:08:30 2009 +0100

    fix critical errors in the .hr translation

 po/hr.po | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 0ccf92f2b7b27dd85e722188cab07041f1083314
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Aug 21 18:03:23 2009 +0100

    Update python bindings

 python/pyempathy/pyempathy.defs       |  10 +++
 python/pyempathygtk/pyempathygtk.defs | 143
 ++++++----------------------------
 2 files changed, 33 insertions(+), 120 deletions(-)

commit fee38f8b6bb302fafb9e506cf7522c6071f76a55
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Aug 21 18:03:10 2009 +0100

    Fix trailing spaces

 libempathy-gtk/empathy-protocol-chooser.c | 1 -
 1 file changed, 1 deletion(-)

commit 10d2be90115f126fbc0a31050ee8555bf822ef89
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Aug 21 18:01:34 2009 +0100

    Add new files to the POTFILES

 po/POTFILES.in | 3 +++
 1 file changed, 3 insertions(+)

commit 84e30dab1428affe335ef904377d07f8b5fdeb66
Merge: fd8e9c5 3803736
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Aug 21 17:37:48 2009 +0100

    Merge back from master

commit fd8e9c5dc2584055177c7a79021cdd53ca431c22
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Aug 21 17:23:48 2009 +0100

    Rename empathy_account_get_connection_for to
    empathy_account_get_connection_for_path

 libempathy/empathy-account.c	 | 4 ++--
 libempathy/empathy-account.h	 | 2 +-
 libempathy/empathy-dispatcher.c | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

commit 4b3de48f8648402437053f01296ff596cfdbf38a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Aug 21 17:14:55 2009 +0100

    Don't hook up to invalidated when creating the connection failed

 libempathy/empathy-account.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

commit 0f736265600a180423b1640841923f560fba70c2
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Aug 21 16:11:17 2009 +0100

    Let the cached parameters asv own the key strings

 libempathy/empathy-account-settings.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

commit 3803736b4326d4bc00d58ccd25f910907f0b4521
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Aug 21 16:35:13 2009 +0200

    Revert "Don't use deprecated g_mapped_file_free()"

    This reverts commit 5a89234873d5c709ee852e2b43220f9c8c0a2033.

 libempathy/empathy-log-store-empathy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a1f79e1c8bb3613005f5fe158e23d22290d27403
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Aug 21 15:40:09 2009 +0200

    Use g_strdup instead of casting a const gchar* to a gchar*.

 libempathy/empathy-account-settings.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 62e639c4f638eee069d73d3929af121a65bb9c84
Author: Ivar Smolin <okul@linux.ee>
Date:	Fri Aug 21 16:50:45 2009 +0300

    Updating Estonian translation

 po/et.po | 51 ++++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

commit 5a89234873d5c709ee852e2b43220f9c8c0a2033
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Fri Aug 21 15:47:47 2009 +0200

    Don't use deprecated g_mapped_file_free()

 libempathy/empathy-log-store-empathy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 68bfadf58864571de7be1d9f3c7532b563483eb3
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Fri Aug 21 15:46:03 2009 +0200

    Updated Norwegian bokmål translation.

 po/nb.po | 402
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 196 insertions(+), 206 deletions(-)

commit a198698ff45b4b4fd214dbf45b9eb6d348984bac
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Fri Aug 21 15:19:53 2009 +0200

    [help] Reworked the send-file topic

 help/C/send-file.page | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

commit f0675e594614857d8b5396aa584d7e8b08ff161c
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Fri Aug 21 12:13:41 2009 +0200

    [help]	Added topic about favorite rooms
	Added new file to Makefile.am
	Removed some useless spaces from add-contact

 help/C/add-contact.page    |  10 ++--
 help/C/favorite-rooms.page | 135
 +++++++++++++++++++++++++++++++++++++++++++++
 help/Makefile.am	    |	1 +
 3 files changed, 141 insertions(+), 5 deletions(-)

commit 889874e15d3c5848e89af1b488f1e31be8813da8
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Fri Aug 21 10:35:43 2009 +0200

    [help]	Set a fixed 2column style even for the index page
	Converted some notes into tips

 help/C/add-account.page	 | 12 +++++++-----
 help/C/audio-call.page		 |  2 +-
 help/C/create-account.page	 |  2 +-
 help/C/geolocation-what-is.page |  2 +-
 help/C/index.page		 |  1 +
 help/C/introduction.page	 |  2 +-
 help/C/irc-account.page	 |  2 +-
 help/C/irc-join-room.page	 |  2 +-
 help/C/set-custom-status.page	 |  2 +-
 help/C/share-desktop.page	 |  2 +-
 help/C/video-call.page		 |  2 +-
 11 files changed, 17 insertions(+), 14 deletions(-)

commit cd8ff6a009f3e9cb41cc6b13f6d89e2e81dcb1b7
Author: Daniel Nylander <po@danielnylander.se>
Date:	Thu Aug 20 23:40:05 2009 +0200

    Updated Swedish translation

 po/sv.po | 169
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 86 insertions(+), 83 deletions(-)

commit d458f689738ad5a94b3355fe73c167e469bce2dc
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Aug 20 20:29:41 2009 +0100

    Use new api to get connections

 libempathy/empathy-dispatcher.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit 8bd008f556dcab022cceb2eaceb3080cb7198efc
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Aug 20 20:29:26 2009 +0100

    Add API to get teh TpConnection for an account on a certain path

 libempathy/empathy-account.c | 90
 +++++++++++++++++++++++++++++---------------
 libempathy/empathy-account.h |  2 +
 2 files changed, 61 insertions(+), 31 deletions(-)

commit 7982aefa5551c0aea59e85f9cef68b40016ad329
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Thu Aug 20 21:00:29 2009 +0200

    [help] Modified the description of a topic, removed useless spaces

 help/C/set-custom-status.page | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

commit 15dda78fbc8c5fa6e942b8e6098689678914b7c5
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Aug 20 19:49:12 2009 +0100

    When getting an account for an unknown path automagically create
    the new account object

 libempathy/empathy-account-manager.c | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

commit baa418e11bf914a99a5ce40d12c964cb394e0e63
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Aug 20 18:04:49 2009 +0100

    Set the RequestedPresence when creating a new command

    When we create a new account set the initial value of
    RequestedPresence to the
    global requested presence, but don't enable it by default. This will
    cause its
    requested presence to always be in sync with the rest of empathy.

 libempathy/empathy-account-settings.c | 37
 ++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

commit dcb2ab438c8b9d02e6eef6a53d93242836db2ae7
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Aug 20 17:58:48 2009 +0100

    Only set the current global requested on the initial set of accounts

    Stop setting the presence automagically when an account gets enabled
    or becomes
    ready, in both cases this account might be created or be enabled by
    some other
    UI and that UI should make the decisions about it's requested
    presence.

 libempathy/empathy-account-manager.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

commit 6a6c9006908cb43e0cacca34cc22862582aadba6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Aug 20 17:57:17 2009 +0100

    Add a function to get the requested global presence from the account
    manager

 libempathy/empathy-account-manager.c | 16 ++++++++++++++++
 libempathy/empathy-account-manager.h |  5 +++++
 2 files changed, 21 insertions(+)

commit 64715cc98c7d507f9a291fe4d467bfda526fad26
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 20 16:30:55 2009 +0100

    empathy-contact-list-view.h: include empathy-enum-types.h

    Python bindings need to use EMPATHY_TYPE_CONTACT_LIST_FLAGS which is
    defined in empathy-enum-types.h.

 libempathy-gtk/empathy-contact-list-view.h | 1 +
 1 file changed, 1 insertion(+)

commit 8d679cc2bb5dc81ce82e427e8818d253ece05476
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 20 16:17:21 2009 +0100

    upgrade Python bindings

 python/pyempathy/pyempathy.defs       | 73
 ++++++++++++++++++++++++--------
 python/pyempathygtk/pyempathygtk.defs | 78
 +++++++++++++++++------------------
 2 files changed, 92 insertions(+), 59 deletions(-)

commit 92954d703c6fa0eefe4b0963c9d28842c06fc10d
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Thu Aug 20 17:03:19 2009 +0200

    [help] Moved license from US version to unported one

 help/C/legal.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 900bb42ee52f895dd7c6ce252e7f6104968d1bf8
Merge: f6b001d 3336ae4
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Aug 20 14:44:10 2009 +0100

    Merge branch 'connman'

commit f6b001dd6a0ef2dd1ae6bf071c3334d934c30628
Author: Antón Méixome <meixome@mancomun.org>
Date:	Thu Aug 20 14:42:27 2009 +0200

    Updated Galician Translation

 po/gl.po | 54 ++++++++++++++++++++++++------------------------------
 1 file changed, 24 insertions(+), 30 deletions(-)

commit b22a4ae1998207e136d4e1c85e10cf159d82d8bc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 20 10:49:25 2009 +0100

    empathy-chat: reformat 2 strings to allow translaters to reverse
    the order of the args if needed (#587803)

 libempathy-gtk/empathy-chat.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit c0a80fc3e49e9235cc6cabbab091e68293eb7d0e
Author: Christian Kirbach <christian.Kirbach@googlemail.com>
Date:	Thu Aug 20 10:42:01 2009 +0100

    stock button labels should not be translatable

 libempathy-gtk/empathy-status-preset-dialog.ui | 4 ++--
 src/empathy-call-window-fullscreen.ui		| 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 8bbfd2d8f92eb025364b9f8cda055259a6fd15ce
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Wed Aug 19 23:15:24 2009 +0200

    [help] Wrote the previous conversations and the geolocation topics
     * Added al the new pages to Makefile
     * Fixed a typo in irc-manage

 help/C/geolocation-not-showing.page | 37 +++++++++++++++
 help/C/geolocation-privacy.page     | 89
 +++++++++++++++++++++++++++++++++++++
 help/C/geolocation-supported.page   | 47 ++++++++++++++++++++
 help/C/geolocation-turn.page	     | 59 ++++++++++++++++++++++++
 help/C/geolocation-what-is.page     | 58 ++++++++++++++++++++++++
 help/C/geolocation.page	     | 33 ++++++++++++++
 help/C/irc-manage.page		     |	2 +-
 help/C/prev-conv.page		     | 44 ++++++++++++++----
 help/Makefile.am		     |	7 +++
 9 files changed, 366 insertions(+), 10 deletions(-)

commit 3336ae452410f53254957b48b72460978f3b990a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 19 17:34:03 2009 +0100

    configure: code clean up when choosing the connectivity

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 configure.ac | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

commit 98bdc25304295c21761ee6d5547273d5f077f61b
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 19 16:54:10 2009 +0100

    empathy-connectivity: assume status is offline if GetState fails

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-connectivity.c | 2 ++
 1 file changed, 2 insertions(+)

commit 4be054d9317f3f35c5fc799556f85f880e1761bf
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 19 14:45:48 2009 +0100

    empathy-connectivity: add ConnMan support

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-connectivity.c | 122
 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 120 insertions(+), 2 deletions(-)

commit 094a490dac0da29d685e5f1cbb06bc6caa588d3a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 19 13:31:21 2009 +0100

    configure: enable connectivity building with nm, connman, auto or none

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 configure.ac		| 56
 ++++++++++++++++++++++++++++++++++++++------------
 libempathy/Makefile.am |  6 ++++--
 2 files changed, 47 insertions(+), 15 deletions(-)

commit 4b87ece33144d35023b713d8e7d1be9262bc272a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 19 17:08:49 2009 +0100

    empathy-connectivity: small style fix

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-connectivity.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 8e549e268287120c56eb2dbc25b9d70dadb895f2
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 19 17:07:48 2009 +0100

    all: save the signal id and use that to disconnect from the signal

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy-gtk/empathy-presence-chooser.c | 11 +++++++----
 libempathy/empathy-connectivity.c	   |  9 ++++++---
 libempathy/empathy-idle.c		   | 10 ++++++----
 3 files changed, 19 insertions(+), 11 deletions(-)

commit 4459108d4cc646d447c6a2548dfc02f4e4327cff
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Wed Aug 19 12:04:02 2009 -0400

    Turn reduced accuracy mode by default

    There is a 10 seconds delay before any information is sent
    when enabling location publishing.	Still, enabling the
    privacy mode by default can only make sure that precise
    location is never sent for people who want privacy.

 data/empathy.schemas.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c98e85dcf635914dc66755d6a8560e2d370cfffe
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 19 16:50:14 2009 +0100

    empathy-connectivity: only send the new state in the state-change
    signal

    It can be assumed that the old state was always the opposite to the
    new state, because the signal is only ever fired if the new state
    differs from the old state.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy-gtk/empathy-presence-chooser.c |  3 +--
 libempathy/empathy-connectivity.c	   | 31
 +++++++++++++++++++++----------
 libempathy/empathy-idle.c		   |  5 ++---
 3 files changed, 24 insertions(+), 15 deletions(-)

commit c777b477a4003b4f49285500736f0c91767c76cb
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 19 15:57:35 2009 +0100

    empathy: unref Connectivity object at the end of the application life

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy.c | 1 +
 1 file changed, 1 insertion(+)

commit 363e6b81d004687f286fcd30322e94bd15c14e8f
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 19 15:22:05 2009 +0100

    empathy-idle: no need to listen to use-conn

    If use_conn is set to FALSE, then EmpathyConnectivity will signal
    status-change with a new online status of TRUE, which will do the
    right thing.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-idle.c | 20 --------------------
 1 file changed, 20 deletions(-)

commit 6d55ee1e5cfce1655ed34b8e36ef23167a7d9818
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 19 15:15:59 2009 +0100

    empathy-connectivity: remove dispose_run

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-connectivity.c | 10 ----------
 1 file changed, 10 deletions(-)

commit 6f47d10791dac97495b73200e05122b6406ea74b
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Aug 19 12:59:06 2009 +0100

    Cache the icon inside EmpathyAccountSettings

    At some point we should set the Icon property in the account manager,
    for now just cache it in the settings so we can pass it by reference
    instead of needing to dup it as that's the API we want to have in
    the future

 libempathy/empathy-account-settings.c | 16 +++++++++-------
 src/empathy-accounts-dialog.c	       |  4 ----
 2 files changed, 9 insertions(+), 11 deletions(-)

commit 73a5b1104ef2ede807ae856134f075e11b7c90c1
Merge: fe0d5cd dab45aa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Aug 19 15:44:54 2009 +0100

    Merge commit 'lfrb/added'

commit 1b6dc82801e05a9afe5495e05e4918e19a44bdfe
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 19 15:08:52 2009 +0100

    empathy-connectivity: be sure to get the initial presence on init

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-connectivity.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 1f9772288086230ec9b8ac63380ad90d413b73c0
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 19 15:01:16 2009 +0100

    empathy-connectivity: init priv->connected to TRUE if we're not
    using NM

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-connectivity.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit 6013dce0de5f8046d0b1318b7d01d672eac45b91
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 19 14:40:26 2009 +0100

    empathy-connectivity: remove useless assignment

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-connectivity.c | 1 -
 1 file changed, 1 deletion(-)

commit bbe5b582755870e4e3d4865f49d8ef9bb5db0b8d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 19 14:39:55 2009 +0100

    empathy-connectivity: stop using the name "manager" when I mean
    "connectivity"

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-connectivity.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit fe0d5cdd8602bebff90d27f4fd84dbf1790b418f
Author: Antón Méixome <meixome@mancomun.org>
Date:	Wed Aug 19 14:47:42 2009 +0200

    Updated Galician Translation

 po/gl.po | 171
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 92 insertions(+), 79 deletions(-)

commit 0d6ea34bb155e74a5ceac71cea9c550d7baaa85a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 19 13:40:13 2009 +0100

    empathy-connectivity: disconnect from NM state change signal on
    finalize

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-connectivity.c | 2 ++
 1 file changed, 2 insertions(+)

commit d12645619d0fcf721d9edcdb8b7893e27364e17f
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 19 13:30:23 2009 +0100

    empathy-connectivity: only unref the NM client if we're using NM

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-connectivity.c | 2 ++
 1 file changed, 2 insertions(+)

commit eaac8d0b0724b90e6891ae69c3c8937861b8cdc9
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Aug 19 12:22:58 2009 +0100

    Don't automagically remove invalid accounts

    Automagic removal is slightly terrifying, if the user succeeded in
    creating the
    account it must have been valid at some point. So leave it there,
    the UI should
    indicate that there is a problem with the account so that the user
    can fix it
    instead.

 src/empathy-accounts-dialog.c | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

commit d183b3dbbdd4bf1aea48eff08ae33ddd27f23e57
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 19 12:00:50 2009 +0100

    empathy-connectivity: handle changes in use_conn correctly

    This is so that the presence chooser can get notified if use_conn
    turns to false, and NM still reports us as offline, so it can become
    sensitive again.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-connectivity.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit 4080b07d140362f0d2888d0baf6a4ecf60e8ea2a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 19 11:51:47 2009 +0100

    empathy-presence-chooser: make chooser insensitive when there's
    no connection

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy-gtk/empathy-presence-chooser.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

commit 394527fe9f0394c41fcf980bba3668d84434040f
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Aug 19 11:51:27 2009 +0100

    empathy-idle: disconnect from connectivity signals before unreffing

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-idle.c | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

commit ac4264815de204513483ab37135daf92a6d6a912
Author: Michael Kanis <mkanis@gmx.de>
Date:	Wed Aug 19 00:34:12 2009 +0200

    Updated German translation

 po/de.po | 2237
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1413 insertions(+), 824 deletions(-)

commit 2492382f950439be2e9b44362e091155b0589616
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Tue Aug 18 23:21:44 2009 +0200

    [help] Wrote most of the previous conversations topic, needs more work

 help/C/prev-conv.page | 103
 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)

commit deb6b846017739eab6f148aed544688dc7515af5
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Tue Aug 18 15:45:22 2009 -0400

    Animate show in and out of markers

 src/empathy-map-view.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b9d913aced1b76300ce6b18b53878b4f40cf2264
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Tue Aug 18 15:43:18 2009 -0400

    Don't create a marker for contacts with empty location

 src/empathy-map-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8b9afe55dba0cb3dc7c20d714574e8c85f9fdb11
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Tue Aug 18 13:00:57 2009 -0400

    Use empathy_make_absolute_url to fix URLs that have no scheme

 libempathy-gtk/empathy-theme-adium.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit c5cf2e489ecda8e8f2f53f29120388ba15e635c8
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Tue Aug 18 13:03:24 2009 -0400

    Make empathy_make_absolute_url visible

 libempathy-gtk/empathy-ui-utils.c | 21 ++++++++++++---------
 libempathy-gtk/empathy-ui-utils.h |  2 ++
 2 files changed, 14 insertions(+), 9 deletions(-)

commit dab45aa28b1b60bc2407dc11a652aeb06a8655d4
Author: Louis-Francis Ratté-Boulianne
<louis-francis.ratte-boulianne@collabora.co.uk>
Date:	Thu Aug 6 13:24:42 2009 -0400

    Always add to publish list

 libempathy/empathy-tp-contact-list.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit 04a8b6b56f3beaabbbc17fe7e54983325df2a8ea
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Tue Aug 18 16:01:58 2009 -0400

    Dim at 75% markers for location data older than a week

 src/empathy-map-view.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

commit 34eecfb2542a01913f038616dbf8fe1563fe3e42
Author: Maxim V. Dziumanenko <dziumanenko@gmail.com>
Date:	Tue Aug 18 22:50:16 2009 +0300

    Added Ukrainian translation

 po/uk.po | 2589
 ++++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 1838 insertions(+), 751 deletions(-)

commit 27e11ea6e41c5b2498307d581caa751936de30f1
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Aug 18 19:33:10 2009 +0100

    replace UNIQUE_NAME_PREFIX by TP_ACCOUNT_OBJECT_PATH_BASE

 libempathy/empathy-account.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit eafc0f2bb66f45dbc2d79482c9c0caaf9c6f0c00
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Aug 18 19:13:14 2009 +0100

    the status in EmpathyIdle is the status_message not the status string

 libempathy/empathy-idle.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 84a60506e5b1cf6cdbf0e2838c0c37eeb3b4a480
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Aug 18 19:12:12 2009 +0100

    Add a debug message for tracking global status

 libempathy/empathy-account-manager.c | 3 +++
 1 file changed, 3 insertions(+)

commit c1d7093754507c971b61633f51b7a80f2dcb4c7d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Aug 18 18:25:13 2009 +0100

    empathy: create a new EmpathyConnectivity object on startup

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy.c | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

commit 21eba5b7a86ad221efd3738d415cd56eb0ee98b8
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Aug 18 18:24:48 2009 +0100

    empathy-idle: use EmpathyConnectivity instead of messing with
    NM itself

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-idle.c | 172
 +++++++++++++---------------------------------
 libempathy/empathy-idle.h |   3 -
 2 files changed, 49 insertions(+), 126 deletions(-)

commit e3279de0b6781be33abf59a7d4efcb728765a9fc
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Aug 18 18:23:54 2009 +0100

    empathy-connectivity: add signals, properties and hook in NM

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-connectivity.c | 192
 +++++++++++++++++++++++++++++++++++---
 libempathy/empathy-connectivity.h |   6 ++
 2 files changed, 186 insertions(+), 12 deletions(-)

commit 77363aa431aaa9a2938bf547500a3c2ce2cd17c2
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Aug 11 18:02:51 2009 +0100

    Don't assume that 'subscribe' exists.

    This fixes bug #591468, which is a crash when you open a tab to a
    contact from the user list in an IRC channel. Idle doesn't have a
    'subscribe' list, so priv->subscribe is NULL, so this crashed. But if
    you don't have a subscribe list, obviously you can't add the
    contact to
    subscribe, so we can just guard this appropriately.

    Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

 libempathy/empathy-tp-contact-list.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

commit f0a0befc9453c490d9db7c820708b49481c30f96
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Mon Aug 17 20:16:18 2009 -0400

    Don't check for smileys in urls

    Moving the smiley detection after the url detection and
    only if not url is found. (similar to what regular themes
    do)

 libempathy-gtk/empathy-theme-adium.c | 53
 ++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

commit fbec34e1aa516010e9aa037c8203dd2dbe6f1cee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Aug 18 17:30:17 2009 +0100

    empathy-call-window: add 2 translators comments (#592052)

 src/empathy-call-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit 37dd3c3001f54daf3b2f41c2360bc2f46dcf00e8
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Fri Jul 31 14:29:23 2009 +1000

    displatcher -> dispatcher

 libempathy/empathy-dispatcher.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 8daae9d4540406968b405c850586b26ca2a1699c
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Aug 18 16:57:49 2009 +0100

    empathy-conf: rename use_nm to use_conn

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 data/empathy.schemas.in       | 8 ++++----
 libempathy-gtk/empathy-conf.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

commit 266a064e053e0e5795167e47d3c1bb026e303284
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Aug 18 16:47:04 2009 +0100

    Get the DisplayName when the account is ready

 libempathy/empathy-account-settings.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit ac3c718ca603a8261dfd02536e5a75bc60edfb4a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Aug 18 16:32:38 2009 +0100

    Fix indentation

 libempathy-gtk/empathy-account-widget.c | 39
 +++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 17 deletions(-)

commit 58da89ed39904ba96f085fbc18b3a7cdad54ac57
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Aug 18 16:32:27 2009 +0100

    Rename empathy_settings_get_dbus_signature to
    empathy_account_settings_get_dbus_signature

 libempathy-gtk/empathy-account-widget.c | 3 ++-
 libempathy/empathy-account-settings.c	 | 2 +-
 libempathy/empathy-account-settings.h	 | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

commit 72d258b32eddaae77992e30a127882cbaaab0be0
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Aug 18 10:58:59 2009 +0100

    keep a ref on the selected account

 src/empathy-accounts-dialog.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

commit b6385d57ac531ea4dde4e6bf5478fc47924bcb07
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Aug 18 16:56:54 2009 +0100

    empathy-debug: add connectivity debug key

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-debug.c | 1 +
 libempathy/empathy-debug.h | 1 +
 2 files changed, 2 insertions(+)

commit 381d68e40a9ead2b8217c4f4da856c972d5d3228
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Aug 18 15:34:41 2009 +0100

    empathy-connectivity: add initial stubs

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/Makefile.am		   |   2 +
 libempathy/empathy-connectivity.c | 129
 ++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-connectivity.h |  65 +++++++++++++++++++
 3 files changed, 196 insertions(+)

commit 447b48d17a454ccf32ab21f7426cdd28b1399979
Author: Shaun McCance <shaunm@gnome.org>
Date:	Tue Aug 18 10:02:01 2009 -0500

    [help] Fixed validity errors in audio-video and salut-protocol

 help/C/audio-video.page    | 54
 +++++++++++++++++++++++-----------------------
 help/C/salut-protocol.page |  4 ++--
 2 files changed, 29 insertions(+), 29 deletions(-)

commit 5586d8a26f0491766976471829dccabddce20a1a
Author: Denis Arnaud <darnaud@src.gnome.org>
Date:	Tue Aug 18 15:32:35 2009 +0200

    Updated breton translation

 po/br.po | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

commit d8d8f1c750979f016fbd0f43e5c292a2479bba9c
Author: Denis Arnaud <darnaud@src.gnome.org>
Date:	Tue Aug 18 15:31:32 2009 +0200

    Updated breton translation

 po/br.po | 257
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 136 insertions(+), 121 deletions(-)

commit 1e19000ef22ebfadf394ef823d6562bbac3ecb57
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Mon Aug 17 23:01:18 2009 +0200

    [help] Reworked two topics, added a new one
     * introduction: some wordings
     * group-conversations: moved from advanced to text conversations
     section
       reworked the topic
     * prev-conv: added stub topic for searching previous conversations

 help/C/group-conversations.page | 62
 +++++++++++++++++++++++++++++++++++++----
 help/C/introduction.page	 |  9 +++---
 help/C/prev-conv.page		 | 24 ++++++++++++++++
 3 files changed, 86 insertions(+), 9 deletions(-)

commit 3e59547e23fbd7d91f5b96ffc52270084dce5b79
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Mon Aug 3 22:58:08 2009 -0400

    Port to Clutter 1.0 and libchamplain 0.3.6

 configure.ac		| 8 ++++----
 src/empathy-map-view.c | 5 +++--
 src/empathy.c		| 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

commit 07a2794768ee8fbfb2d7b5a71ea22a9ea17d7b43
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 17 17:56:53 2009 +0100

    Set gui to NULL after unreffing it

 libempathy-gtk/empathy-account-widget.c | 1 +
 1 file changed, 1 insertion(+)

commit 6c2a10287ca173821152889963efdd6bc66e7a26
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 17 17:56:32 2009 +0100

    Rename desired presence to requested presence

 libempathy/empathy-account-manager.c | 38
 ++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

commit acd0172ff0bcc511ec646f8859742542c0cd5393
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 17 17:56:05 2009 +0100

    Remove dead code

 libempathy/empathy-account-manager.c | 8 --------
 1 file changed, 8 deletions(-)

commit 955e5f31d9cf3056777ceaf321b8ed4dc33b06cd
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 17 17:55:33 2009 +0100

    rename status-reason to connection-status-reason and notify
    connection-status{-reason,} when changes happen

 libempathy/empathy-account.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 31ef7d012ce3fe7ab4872f4864deaf4230feede1
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 17 17:54:25 2009 +0100

    Use the remove function account

 src/empathy-accounts-dialog.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit d7ad9a427fa8c11bcee8628a0bb5f56602fc84b3
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 17 17:12:55 2009 +0100

    _new for a signleton needs to return a ref

 src/empathy-accounts-dialog.c | 1 +
 1 file changed, 1 insertion(+)

commit 40ee5f34184be738a4f9f31456480c62a9ad3bb9
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 17 17:12:23 2009 +0100

    Fix identation

 src/empathy-accounts-dialog.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit cc4b0254397717079f7d53391560952a8b1992a5
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 17 16:40:24 2009 +0100

    Notify when display-name is updated

 libempathy/empathy-account.c | 1 +
 1 file changed, 1 insertion(+)

commit 65e338cadaca67c77e418903d6887ee0f0196827
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 17 16:37:28 2009 +0100

    No need to check if create_results exists in dispose

 libempathy/empathy-account-manager.c | 32
 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

commit ad9ed2451356457afaceddc7d0dc6b8b74a83bf6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 17 16:36:51 2009 +0100

    Plug some leaks

 libempathy/empathy-account.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 665ec36c0690f5247e4803d7f5513097b2cf2bb4
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 17 16:36:20 2009 +0100

    Removed dead code

 libempathy/empathy-account-settings.c | 10 ----------
 1 file changed, 10 deletions(-)

commit 8a384ab9928c7d1a460b0233036edaa86010b444
Author: Andre Klapper <a9016009@gmx.de>
Date:	Mon Aug 17 15:37:56 2009 +0200

    Update Czech translation

 po/cs.po | 2158
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1412 insertions(+), 746 deletions(-)

commit 80796607c55a6e27e051cd6ca0d43df43ddcb238
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Mon Aug 17 14:38:43 2009 +0200

    [help] Wrote the group conversations topic
    Removed one image from the Makefile, image removed yesterday

 help/C/group-conversations.page | 75
 +++++++++++++++++++++++++++++++++++++++--
 help/Makefile.am		 |  3 +-
 2 files changed, 74 insertions(+), 4 deletions(-)

commit 0c3cd08bfeadc61d4f679e9f36732e49d6500418
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 17 13:19:25 2009 +0100

    Only cancel the name owner watch if the dbus proxy still exists

 libempathy/empathy-account-manager.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit af5442e540b7913f382e7691053c91472b867254
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 17 13:18:18 2009 +0100

    Fix coding style (tabs vs. spaces

 libempathy/empathy-account-manager.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit b7bc2ba10f00bf35fb6615e9565e69618b1528d3
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 17 13:18:03 2009 +0100

    no need to check for the size of the hash table

 libempathy/empathy-account-manager.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 9b497ff832bbffab66eb193ebae190161db55757
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 17 13:11:46 2009 +0100

    Remove double check for connection == NULL

 libempathy-gtk/empathy-contact-dialogs.c | 4 ----
 1 file changed, 4 deletions(-)

commit 8b24044e2bdeec4e282339c78d4eff9050cf964c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Aug 17 13:11:20 2009 +0100

    If there is a failure in recognizing the protocol name, fallback to
    the generic UI

 libempathy-gtk/empathy-account-widget.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

commit bc0428f6f77805811fd5b43f05196925313dbacb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 17 11:14:16 2009 +0100

    Use tp-glib Location stable API (#585843)

 libempathy/empathy-tp-contact-factory.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 9b528dc51ee3fb403e46aae06a2fa6c6e531657b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 17 11:08:16 2009 +0100

    remove Location from extensions

 extensions/Connection_Interface_Location.xml | 330
 ---------------------------
 extensions/Makefile.am			      |   1 -
 extensions/misc.xml			      |   1 -
 3 files changed, 332 deletions(-)

commit 73d00714bc45edbe8a668b08e82fce28460a13e5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 17 11:06:28 2009 +0100

    bump tp-glib dep to 0.7.34: we need for stable Location API

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b1cc0a7eab8600d414199091da8d1d942f19bda0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 17 10:54:14 2009 +0100

    sync Debug interface with undrafted version in spec (#585844)

 extensions/Debug.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit e7fc72be1c9584700ab05e24addfbefda811b944
Author: Tommi Vainikainen <thv@iki.fi>
Date:	Sun Aug 16 23:32:50 2009 +0300

    Updated Finnish translation

 po/fi.po | 2120
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1355 insertions(+), 765 deletions(-)

commit af580dfdb1095e9fa76fdc5b8c9f548e1463a3ab
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Aug 16 22:25:37 2009 +0200

    [help] Removed unused picture (extended-away)

 help/C/figures/extended-away.png | Bin 752 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

commit 432cd81fa944fad28041c93c3ad519fca407ca05
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Aug 16 22:23:41 2009 +0200

    [help] Added new topic: small introduction
    Updated the pictures of the main window
    Added the new file to help Makefile

 help/C/figures/empathy-main-window.png | Bin 8902 -> 7703 bytes
 help/C/introduction.page		|  45
 +++++++++++++++++++++++++++++++++
 help/Makefile.am			|   1 +
 3 files changed, 46 insertions(+)

commit 824b3e64ef7bfc63a8a4833ab5c0f093bd1bde9d
Author: Ivar Smolin <okul@linux.ee>
Date:	Sun Aug 16 18:13:34 2009 +0300

    Updating Estonian translation

 po/et.po | 52 ++++++++++++++++++++++------------------------------
 1 file changed, 22 insertions(+), 30 deletions(-)

commit f7cdf7d41863dae74dbda842c3cfb02aaa206477
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Aug 15 14:22:20 2009 +0200

    Updated Spanish translation

 help/es/es.po | 3115
 +++++++++++++++------------------------------------------
 1 file changed, 792 insertions(+), 2323 deletions(-)

commit f3ba3b59992a2fcaba14b65393a8362e2ea87f83
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Aug 15 14:22:13 2009 +0200

    Updated Spanish translation

 po/es.po | 114
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 55 insertions(+), 59 deletions(-)

commit ea77d5da730a088e280f0c318c5bb519ec472afb
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Sat Aug 15 13:01:51 2009 +0300

    Updated Arabic translation

 po/ar.po | 206
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 101 insertions(+), 105 deletions(-)

commit 1b68597e6f4da4c6cdf6e6567aa70b0844dfaf04
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Fri Aug 14 21:56:01 2009 +0200

    [help] Fixed last revision sections
     * Fixed some revision sections
     * Added credit and copyright where missing

 help/C/audio-call.page		 | 10 +++++++++-
 help/C/audio-video.page	 | 11 ++++++++++-
 help/C/group-conversations.page |  2 ++
 help/C/index.page		 |  6 ++----
 help/C/irc-join-pwd.page	 |  2 --
 help/C/irc-nick-password.page	 |  1 -
 help/C/salut-protocol.page	 | 13 ++-----------
 help/C/send-file.page		 |  1 -
 help/C/send-message.page	 |  5 ++---
 help/C/set-custom-status.page	 |  5 ++++-
 help/C/share-desktop.page	 |  1 -
 help/C/status-icons.page	 |  1 +
 help/C/video-call.page		 | 11 ++++++++++-
 13 files changed, 42 insertions(+), 27 deletions(-)

commit 07df348bb50c2e259c881762e09efa8ff52c4fd4
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Fri Aug 14 21:31:12 2009 +0200

    Updated Spanish translation

 help/es/es.po | 783
 ++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 542 insertions(+), 241 deletions(-)

commit 0f931106903b01f7ec5a56e357dc704e913ab720
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Fri Aug 14 21:29:00 2009 +0200

    [help] Remove comment sections
     * Removed comment sections as they show up in the po
     * Fixed some revision sections

 help/C/add-contact.page      |  6 -----
 help/C/irc-manage.page       |  9 -------
 help/C/offline-contacts.page | 13 ++--------
 help/C/prob-conn-auth.page   | 11 ++-------
 help/C/prob-conn.page	      | 56
 +++++++++++++++-----------------------------
 help/C/status-icons.page     | 12 ----------
 6 files changed, 23 insertions(+), 84 deletions(-)

commit 975de4f843f4fa2dda99597e162d064a536c95a4
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Fri Aug 14 21:20:46 2009 +0200

    Updated Spanish translation

 help/es/es.po | 92
 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 75 insertions(+), 17 deletions(-)

commit 7a91c985c8e9b96764e29948de83fb016da9beda
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Fri Aug 14 21:09:26 2009 +0200

    [help]

    irc-nick-password:
     * wordings
     * added a note
    irc-start-conversation:
     * added topic for starting a private IRC conversation
    irc-send-file:
     * added topic for sending files via IRC (it's not possible)
    start-conversation:
     * added topic describing the Ctrl+N way to start a conversation
    prob-conn-neterror:
     * reworked the page adding the IRC problem
    prob-conn-name:
     * reworked the page
    prob-conn-acctdisabled:
     * reworked the page
    audio-video:
     * added a note
     * added table for supported services/protocols
    Makefile.am:
     * added new pages

 help/C/audio-video.page	    | 70 ++++++++++++++++++++++++++++++++
 help/C/irc-join-room.page	    |  5 +--
 help/C/irc-manage.page		    | 11 +++--
 help/C/irc-nick-password.page	    | 19 +++++----
 help/C/irc-sending-file.page	    | 27 +++++++++++++
 help/C/irc-start-conversation.page | 62 ++++++++++++++++++++++++++++
 help/C/prob-conn-acctdisabled.page | 68 +++++++++++++++++++------------
 help/C/prob-conn-auth.page	    | 52 +++++++++++++++---------
 help/C/prob-conn-name.page	    | 45 +++++++++++----------
 help/C/prob-conn-neterror.page     | 83
 +++++++++++++++++++++-----------------
 help/C/send-file.page		    | 16 ++++----
 help/C/start-conversation.page     | 71 ++++++++++++++++++++++++++++++++
 help/Makefile.am		    |  3 ++
 13 files changed, 403 insertions(+), 129 deletions(-)

commit 7b2b0bf17f28dffc39de8482989a72c401c6e263
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Fri Aug 14 20:10:54 2009 +0200

    Updated Spanish translation

 help/es/es.po | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

commit bf265a7b5ab8dadbc2e7227dffa858ef115d220a
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Fri Aug 14 20:01:26 2009 +0200

    Updated Spanish translation

 help/es/es.po | 150
 +++++++++++++++++++++++-----------------------------------
 1 file changed, 58 insertions(+), 92 deletions(-)

commit 22c2deb643eef980ce94831a70fdb0614799abaa
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Fri Aug 14 18:39:34 2009 +0200

    Updated Spanish translation

 help/es/es.po | 45 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 38 insertions(+), 7 deletions(-)

commit 83ed195c1e8eb5d7a4d5e1491598e2cd722bc8ca
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Fri Aug 14 18:12:55 2009 +0200

    Updated Spanish translation

 help/es/es.po | 236
 +++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 136 insertions(+), 100 deletions(-)

commit 1f0c078c1540453a3747a58f3e7a236944e73975
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Fri Aug 14 18:12:51 2009 +0200

    Updated Spanish translation

 po/es.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 8156f7589c1790f7b0a9b241265e4780b954285c
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Fri Aug 14 14:33:24 2009 +0200

    Updated Spanish translation

 help/es/es.po | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

commit 2645adeb5be91331fe6b3e989ea6daf5ac79f78a
Author: krishnababu k <kkrothap@redhat.ocm>
Date:	Fri Aug 14 17:38:52 2009 +0530

    Added entry for Telugu [te] in LINGUAS file

 po/LINGUAS | 1 +
 1 file changed, 1 insertion(+)

commit b1b8ff996e3283deb17d57b8e43fb75ea9be4727
Author: krishnababu k <kkrothap@redhat.ocm>
Date:	Fri Aug 14 17:34:41 2009 +0530

    Updated telugu translation

 po/te.po | 2813
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 2813 insertions(+)

commit b15c53e7e8b21fcfb4e6c43e0740866a6c2a5130
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Aug 13 12:10:01 2009 +0100

    Only call SetChatState if the Channel supports it

    I'm sick of seeing spurious debug messages about this whenever I type
    anything into an IRC channel.

 libempathy/empathy-tp-chat.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

commit e3636c7d43ab2a0ab059def183d10a2fb7867418
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Fri Aug 14 10:17:52 2009 +0200

    Fixed documentation link with for the new Mallard structure
     * Colses bug 591602

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8231bae19efd93b161c03c5638e9cc0ca9b07e0b
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Thu Aug 13 19:35:10 2009 +0200

    Updated Spanish translation

 help/es/es.po | 3392
 +++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 2340 insertions(+), 1052 deletions(-)

commit ce4494fe1b9387bd5cb959e36828a638c10d478f
Author: Baris Cicek <baris@teamforce.name.tr>
Date:	Thu Aug 13 19:27:01 2009 +0300

    Updated Turkish translation.

 po/ChangeLog |    4 +
 po/tr.po     | 2508
 +++++++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 1706 insertions(+), 806 deletions(-)

commit bf81413efc948ff14be2236c6e668db773bc2bb5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 13 10:57:57 2009 +0100

    empathy-preferences: use tp_strdiff instead of strcmp

    This should prevent the crash #591612

 src/empathy-preferences.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

commit cceeda115ec00094fd59d26fdbbb30a5e54bb47a
Author: Daniel Nylander <po@danielnylander.se>
Date:	Thu Aug 13 09:39:56 2009 +0200

    Updated Swedish translation

 po/sv.po | 156
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 78 insertions(+), 78 deletions(-)

commit 19ac35f900dcb22c2a272ee751bccd76f64676f1
Author: Mattias Põldaru <mahfiaz gmail com>
Date:	Wed Aug 12 22:27:37 2009 +0300

    Updating Estonian translation

 po/et.po | 625
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 297 insertions(+), 328 deletions(-)

commit c359242189bc96481f63fbdcecbf8a3218f608d7
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Aug 12 18:41:45 2009 +0200

    Add streamingprefs_DATA to EXTRA_DIST (GNOME bug 591582)

 data/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit 1a4735d843a9d2757d73cdce9b0c2a0a2fb9d1b1
Merge: 03480a1 553761a
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Aug 12 18:40:34 2009 +0200

    Merge branch 'mallard-to-merge'

commit 03480a1e9b3e6886bef8346c4b73d8dd93b8e238
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Aug 12 16:43:45 2009 +0100

    Don't leak a ref when updating notification bubble

    This meant that if a notification bubble for a tab had ever been
    updated, closing the tab would not destroy the EmpathyChat, or indeed
    close the Channel. New messages would be logged, but not presented to
    the user. Reopening a tab to the same channel would work, but
    sending a
    message would assert.

    I'm pretty sure this fixes #588840.

 src/empathy-chat-window.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 553761acd191a6879caab2a8943b5aae50f46290
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Aug 12 18:29:52 2009 +0200

    [help] remove trailing whitespaces

 help/C/add-account.page	    |  4 ++--
 help/C/add-contact.page	    |  4 ++--
 help/C/audio-call.page		    | 14 +++++++-------
 help/C/audio-video.page	    |  4 ++--
 help/C/create-account.page	    |  4 ++--
 help/C/disable-account.page	    |  6 +++---
 help/C/index.page		    |  4 ++--
 help/C/irc-account.page	    | 20 ++++++++++----------
 help/C/irc-join-pwd.page	    |  4 ++--
 help/C/irc-join-room.page	    | 10 +++++-----
 help/C/irc-manage.page		    |  6 +++---
 help/C/irc-nick-password.page	    | 22 +++++++++++-----------
 help/C/prob-conn-acctdisabled.page | 10 +++++-----
 help/C/prob-conn-auth.page	    | 18 +++++++++---------
 help/C/prob-conn-name.page	    | 18 +++++++++---------
 help/C/prob-conn-neterror.page     | 12 ++++++------
 help/C/prob-conn.page		    |  2 +-
 help/C/salut-protocol.page	    |  8 ++++----
 help/C/send-file.page		    | 16 ++++++++--------
 help/C/send-message.page	    | 14 +++++++-------
 help/C/set-custom-status.page	    |  6 +++---
 help/C/share-desktop.page	    |  2 +-
 help/C/status-icons.page	    |  4 ++--
 help/C/video-call.page		    | 12 ++++++------
 24 files changed, 112 insertions(+), 112 deletions(-)

commit bdeb60bbdd89e51d4c9cce413c5c466cd6f122bb
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Aug 12 18:27:48 2009 +0200

    [help] let git ignore translated Mallard pages

 help/.gitignore | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit 9d41af181cc388a5ee02f3eaa5681ca0bd33566b
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Aug 12 18:27:23 2009 +0200

    [help] set required attributes on revision element

 help/C/salut-protocol.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0a88eb69853c26ec9a79a26950b906eb5d9b2403
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Aug 12 18:26:47 2009 +0200

    [help] embed answer to comment in another <comment> element

 help/C/prob-conn.page | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 0354a7cd79699a75b6d603fef2f6aa7a0cdcc244
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Aug 12 18:26:05 2009 +0200

    [help] fixed attribute name (versione -> version)

 help/C/offline-contacts.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ce43ae4e797fd7ff4157185782b08f550578193d
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Aug 12 18:25:40 2009 +0200

    [help] remove invalid type attribute on <link> element

 help/C/create-account.page | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit d91fef0b1a6c3d9bed0746b81cf044ababbd76f0
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Aug 12 18:25:13 2009 +0200

    [help] add missing <tbody> to <table> containing <thead>

 help/C/audio-video.page  | 2 ++
 help/C/status-icons.page | 2 ++
 2 files changed, 4 insertions(+)

commit d437af598ae190650f5f7fb3aab5a79c9758e6bd
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Aug 12 18:24:24 2009 +0200

    [help] move <comment> below <title>, to validate against current
    schema

 help/C/add-contact.page      | 4 ++--
 help/C/irc-manage.page       | 4 ++--
 help/C/offline-contacts.page | 4 ++--
 help/C/prob-conn-auth.page   | 4 ++--
 help/C/salut-protocol.page   | 6 +++---
 help/C/status-icons.page     | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

commit 567309e7e26dc92e7cbb9e1be2cde466ffcacc9e
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Aug 12 18:22:11 2009 +0200

    [help] update <comment>/<cite> tag contents to match current
    Mallard spec

 help/C/add-contact.page      | 2 +-
 help/C/irc-manage.page       | 2 +-
 help/C/offline-contacts.page | 2 +-
 help/C/prob-conn-auth.page   | 2 +-
 help/C/prob-conn.page	      | 6 +++---
 help/C/salut-protocol.page   | 2 +-
 help/C/status-icons.page     | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

commit 8fcdca98439362cc9c714e62970e028404674a91
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Aug 12 18:16:31 2009 +0200

    [help] remove duplicated revision entry

 help/C/send-file.page | 1 -
 1 file changed, 1 deletion(-)

commit e236e08f5276ff4923f58b3fdcecc296137ac001
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Mon Aug 10 21:32:30 2009 +0200

    * wrote share-desktop * rewrote set-custom-status * some rewrote
    here and there, mostly small fixes

 help/C/add-account.page       |  75 +++++++++++------------
 help/C/add-contact.page       |  34 +++++------
 help/C/change-status.page     |   9 ++-
 help/C/create-account.page    |  20 +++---
 help/C/disable-account.page   |  56 +++++++----------
 help/C/irc-account.page       |   7 +--
 help/C/irc-join-pwd.page      |   6 +-
 help/C/irc-nick-password.page |   6 +-
 help/C/remove-account.page    |  58 +++++++-----------
 help/C/send-file.page	       |   8 +++
 help/C/set-custom-status.page | 138
 ++++++++++++++++++++++++++++++++++++------
 help/C/share-desktop.page     |  75 ++++++++++++++++++++++-
 12 files changed, 320 insertions(+), 172 deletions(-)

commit 2ca0f50c4917a7c5fd5ad8c91a92793f35f90baa
Author: Frédéric Péters <fpeters@0d.be>
Date:	Mon Aug 10 15:43:25 2009 +0200

    use DOC_INCLUDES for included files, not DOC_ENTITIES

 help/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f415a8566619b951cc0cf804d20ba66fbf33c457
Author: Frédéric Péters <fpeters@0d.be>
Date:	Mon Aug 10 13:57:28 2009 +0200

    update build system for the new Mallard help

 help/Makefile.am | 42 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

commit a984f5c1916a33edf8145491e57aa3faa08865fd
Author: Frédéric Péters <fpeters@0d.be>
Date:	Mon Aug 10 13:56:47 2009 +0200

    remove invalid <license/> tag, and update legal.xml to cc by-sa

 help/C/add-account.page	    |  2 -
 help/C/add-contact.page	    |  2 -
 help/C/change-status.page	    |  2 -
 help/C/create-account.page	    |  5 +--
 help/C/disable-account.page	    |  2 -
 help/C/index.page		    |  2 -
 help/C/irc-account.page	    |  2 -
 help/C/irc-join-pwd.page	    |  2 -
 help/C/irc-join-room.page	    |  2 -
 help/C/irc-manage.page		    |  2 -
 help/C/irc-nick-password.page	    |  2 -
 help/C/legal.xml		    | 85
 ++++----------------------------------
 help/C/offline-contacts.page	    |  2 -
 help/C/prob-conn-acctdisabled.page |  1 -
 help/C/prob-conn-auth.page	    |  2 -
 help/C/prob-conn-name.page	    |  1 -
 help/C/prob-conn-neterror.page     |  1 -
 help/C/prob-conn.page		    |  2 -
 help/C/remove-account.page	    |  5 +--
 help/C/salut-protocol.page	    |  2 -
 help/C/send-file.page		    |  2 -
 help/C/send-message.page	    |  2 -
 help/C/set-custom-status.page	    |  2 -
 help/C/status-icons.page	    |  2 -
 24 files changed, 11 insertions(+), 123 deletions(-)

commit 5e6fc11a838de8923e5d494eb40ee3e65e8a0f5c
Author: Frédéric Péters <fpeters@0d.be>
Date:	Mon Aug 10 13:56:33 2009 +0200

    remove obsolete help file

 help/C/empathy.xml | 1395
 ----------------------------------------------------
 1 file changed, 1395 deletions(-)

commit 23a733f9087d62e802571a8000c9d3ec37b3e47a
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sat Aug 8 18:33:58 2009 +0200

    Added stub topic for password protected IRC channels Wrote the audio
    call topic Some work on the video call topic Added a seealso link
    in create account

 help/C/audio-call.page     | 18 ++++++++++--------
 help/C/create-account.page |  4 +++-
 help/C/irc-join-pwd.page   | 27 +++++++++++++++++++++++++++
 help/C/video-call.page     | 43
 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 83 insertions(+), 9 deletions(-)

commit 5751765ea330898b76ca1e5f1dd62a3e14de2761
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Wed Aug 5 23:21:30 2009 +0200

    Modified the audio-call page Written some contents for the audio-call
    page Reworked a little bit some seealso links

 help/C/audio-call.page        | 41
 +++++++++++++++++++++++++++++++++++++++++
 help/C/audio-video.page       |  7 ++-----
 help/C/set-custom-status.page |  7 ++++---
 help/C/status-icons.page      | 23 ++---------------------
 4 files changed, 49 insertions(+), 29 deletions(-)

commit 25724cfdbcccf201460efc83757c9927c98472d4
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Aug 2 23:38:56 2009 +0200

    Added seealso links to audio and video call pages

 help/C/audio-call.page | 1 +
 help/C/video-call.page | 1 +
 2 files changed, 2 insertions(+)

commit 254f9b868d3176b15d79808bf747580185bd6509
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Aug 2 23:34:52 2009 +0200

    Added two new figures: * The icon for audio conversation * The icon
    for video conversation Wrote the audio-video page

 help/C/audio-video.page		   |  59
 +++++++++++++++++++++++++++++-
 help/C/figures/audio-input-microphone.png | Bin 0 -> 650 bytes
 help/C/figures/camera-web.png		   | Bin 0 -> 881 bytes
 3 files changed, 57 insertions(+), 2 deletions(-)

commit 57753450bb5c3885ffcc64f02595624b7c894a0e
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Aug 2 17:27:25 2009 +0200

    Fixed the note in the IRC nickname password Fixed pkgversion and
    version of a document

 help/C/irc-nick-password.page | 2 +-
 help/C/send-file.page	       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 874528bf52d76adba91fe7a5cf2dfcef78dcde48
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Aug 2 16:32:50 2009 +0200

    Reworked the index page to insert new topics Added stub pages for
    the new topics Fixed the xref of various topics to move them in the
    new index page

 help/C/add-contact.page	 |  4 ++--
 help/C/audio-call.page		 | 15 +++++++++++++++
 help/C/audio-video.page	 | 15 +++++++++++++++
 help/C/change-status.page	 |  2 +-
 help/C/group-conversations.page | 15 +++++++++++++++
 help/C/index.page		 | 22 +++++++++++-----------
 help/C/irc-account.page	 |  4 ++--
 help/C/irc-manage.page		 |  2 +-
 help/C/send-file.page		 |  4 ++--
 help/C/send-message.page	 |  2 +-
 help/C/share-desktop.page	 | 15 +++++++++++++++
 help/C/video-call.page		 | 15 +++++++++++++++
 12 files changed, 95 insertions(+), 20 deletions(-)

commit b3cbd871359e6ce20473a67d8018f65292bbf380
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Aug 2 15:41:31 2009 +0200

    Modified terminology

 help/C/send-message.page | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 50d34cf70f763703db33061d74cac6ca9de6cb32
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Tue Jul 28 21:32:11 2009 +0200

    Small typos and corrections

 help/C/add-account.page    | 2 +-
 help/C/irc-account.page    | 2 +-
 help/C/prob-conn-name.page | 4 ++--
 help/C/send-message.page   | 3 ++-
 help/C/status-icons.page   | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

commit 248776956fb2348ab2a77e38f023fc6da3b6989c
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Jul 26 17:43:34 2009 +0200

    * New topic: prob-conn-name for handling the "Name in use" IRC error *
    New topic: irc-nick-password on setting the password for a registered
    nickname * New topic: irc-join-room on how to enter an IRC channel *
    Added the new topic in the IRC account page * Reworked the title of
    the guide page for common problems * Added a small paragraph to the
    add-account page

 help/C/add-account.page	|  6 +++
 help/C/irc-account.page	| 24 +++++++----
 help/C/irc-join-room.page	| 57 +++++++++++++++++++++++++
 help/C/irc-nick-password.page	| 94
 ++++++++++++++++++++++++++++++++++++++++++
 help/C/prob-conn-name.page	| 60 +++++++++++++++++++++++++++
 help/C/prob-conn-neterror.page |  6 +--
 help/C/prob-conn.page		| 16 ++++---
 7 files changed, 247 insertions(+), 16 deletions(-)

commit 694c11f5e271d1af097cb013881cfdbd829a20ac
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sat Jul 25 17:03:43 2009 +0200

    Add TODO comment on prob-conn-neterror.page * need to talk about
    IRC problem

    Added new pages:
    * irc-manage: guide page for all IRC topics
    * irc-account: topic on how to set up an IRC account

    Linked the prob-conn-neterror topic from the irc-manage page

    Modified dialog instead of window for the account page

 help/C/add-account.page	|   2 +-
 help/C/irc-account.page	| 123
 +++++++++++++++++++++++++++++++++++++++++
 help/C/irc-manage.page		|  45 +++++++++++++++
 help/C/prob-conn-neterror.page |   8 ++-
 4 files changed, 176 insertions(+), 2 deletions(-)

commit 036c51af56a5f2a7d9a65c132b5d7a28831c7eb5
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Thu Jul 23 20:55:35 2009 +0200

    Reworked the topics, now whould be more consistent and coherent with
    each other Added a couple of seealso links

 help/C/change-status.page    |  2 +-
 help/C/create-account.page   | 86
 ++++++++++++++++++++++----------------------
 help/C/offline-contacts.page | 28 ++++++++-------
 help/C/prob-conn-auth.page   | 63 +++++++++++++++++++-------------
 help/C/send-message.page     | 29 ++++++++-------
 help/C/status-icons.page     |  6 ++--
 6 files changed, 116 insertions(+), 98 deletions(-)

commit 2a17a62f8634b95cebf3df6763cb064c9f749634
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Tue Jul 21 23:24:21 2009 +0200

    Removed the SVG files of the status icons Reworked the send a file
    topic Completed the status icons topic Completed and added into
    index the offline contacts topic Removed the comment from the add
    account page

 help/C/add-account.page	  |   5 --
 help/C/figures/available.svg	  | 104 -----------------------------
 help/C/figures/away.svg	  |  93 --------------------------
 help/C/figures/busy.svg	  | 140
 ---------------------------------------
 help/C/figures/extended-away.svg | 120 ---------------------------------
 help/C/offline-contacts.page	  |  55 ++++++++-------
 help/C/send-file.page		  | 123 +++++++++++++++++++++-------------
 help/C/status-icons.page	  |  55 ++++++++++++---
 8 files changed, 149 insertions(+), 546 deletions(-)

commit 85ba725ccfd7b18a325c3bfa900a0bccff3e1e88
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Jul 19 00:23:44 2009 +0200

    Added a new stub file about description of the status icons Added a
    seealso link in another document Added the status icons, taken from
    Empathy data/icons directory * Added SVG and PNG format

 help/C/add-account.page	  |  28 ++++----
 help/C/change-status.page	  |  29 ++++----
 help/C/figures/available.png	  | Bin 0 -> 689 bytes
 help/C/figures/available.svg	  | 104 +++++++++++++++++++++++++++++
 help/C/figures/away.png	  | Bin 0 -> 538 bytes
 help/C/figures/away.svg	  |  93 ++++++++++++++++++++++++++
 help/C/figures/busy.png	  | Bin 0 -> 616 bytes
 help/C/figures/busy.svg	  | 140
 +++++++++++++++++++++++++++++++++++++++
 help/C/figures/extended-away.png | Bin 0 -> 752 bytes
 help/C/figures/extended-away.svg | 120 +++++++++++++++++++++++++++++++++
 help/C/index.page		  |  18 ++---
 help/C/status-icons.page	  |  92 +++++++++++++++++++++++++
 12 files changed, 586 insertions(+), 38 deletions(-)

commit d0210bf39425cc75021a1d7a06f5068ffa4ca0c5
Author: Jim Campbell <jwcampbell@ubuntu.com>
Date:	Wed Jul 1 18:02:33 2009 +0200

    Added set-custom-message.page: * Added first draf of how to set a
    custom message for your status

 help/C/set-custom-status.page | 62
 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

commit 4ee5fa135f9ccb5ffee78c4eaf4eb2451801b486
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Wed Jun 24 23:22:15 2009 +0200

    Update all the status of the document: * index.page is at incomplete
    * the majority of the topics are draft * the salut-protocol is
    now review

 help/C/add-contact.page	    | 2 +-
 help/C/change-status.page	    | 7 +++++--
 help/C/index.page		    | 2 +-
 help/C/prob-conn-acctdisabled.page | 2 +-
 help/C/prob-conn-auth.page	    | 2 +-
 help/C/prob-conn-neterror.page     | 2 +-
 help/C/prob-conn.page		    | 2 +-
 help/C/remove-account.page	    | 2 +-
 help/C/salut-protocol.page	    | 2 +-
 help/C/send-file.page		    | 2 +-
 help/C/send-message.page	    | 2 +-
 11 files changed, 15 insertions(+), 12 deletions(-)

commit d99dc3b2b2eb43afc53208bebdeefaf550b256c1
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Wed Jun 24 23:03:55 2009 +0200

    Work on add-contact file: * Reworked the procedure in a numbered list
    * Checked terminology with the app * Added a note about the connection
    * Added a seealso link Add a new topic offline-contacts: * Small
    topic on how to see offline contacts and hide them * Inserted only
    in the add-contact page as seealso Update the license line with the
    3.0 number as talked via email Update some topic form stub to draft

 help/C/add-account.page	    |	7 ++-
 help/C/add-contact.page	    | 107
 ++++++++++++++++++++++++-------------
 help/C/change-status.page	    |	2 +-
 help/C/disable-account.page	    |	7 ++-
 help/C/index.page		    |	2 +-
 help/C/offline-contacts.page	    |  58 ++++++++++++++++++++
 help/C/prob-conn-acctdisabled.page |	2 +-
 help/C/prob-conn-auth.page	    |	2 +-
 help/C/prob-conn-neterror.page     |	2 +-
 help/C/prob-conn.page		    |	2 +-
 help/C/remove-account.page	    |	2 +-
 help/C/salut-protocol.page	    |  33 ++++++------
 help/C/send-file.page		    |	2 +-
 help/C/send-message.page	    |	2 +-
 14 files changed, 160 insertions(+), 70 deletions(-)

commit 60c866ec8d72d4976bc54bb4e21ea9d450357470
Author: Paul Cutler <pcutler@gnome.org>
Date:	Sun Jun 21 21:53:28 2009 -0500

    Fixed minor typos

 help/C/create-account.page  | 4 ++--
 help/C/disable-account.page | 2 +-
 help/C/salut-protocol.page  | 8 ++++----
 help/C/send-file.page	     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

commit aad2e7ea743988393c5f8023929ab69700d24860
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Jun 21 20:22:15 2009 +0200

    New file salut-protocol.page: * Wrote small description of what the
    protocol is Work on the create account topic: * Checked all the links
    to service registration forms * Removed FWD, service closed up *
    Reworked terminology: avoided SIP in favor of Telephony * Created
    another section for Salut * Added link to salut-protocol

 help/C/create-account.page | 97
 ++++++++++++++++++++++++++++------------------
 help/C/salut-protocol.page | 55 ++++++++++++++++++++++++++
 2 files changed, 114 insertions(+), 38 deletions(-)

commit c8c2ab42b1b7fff88b9bfe9ec942e56324dc5ca7
Author: Phil Bull <philbull@gmail.com>
Date:	Fri Jun 19 23:35:38 2009 +0100

    Use a different title style for each topic. The "How can I..." bit
    at the start of each title was reducing readability.

 help/C/add-account.page     | 2 +-
 help/C/add-contact.page     | 2 +-
 help/C/change-status.page   | 2 +-
 help/C/create-account.page  | 5 +++--
 help/C/disable-account.page | 5 +++--
 help/C/remove-account.page  | 4 ++--
 help/C/send-file.page	     | 2 +-
 help/C/send-message.page    | 2 +-
 8 files changed, 13 insertions(+), 11 deletions(-)

commit bf2830cb6131a70e549399b38a9a6c994aff39ff
Author: Phil Bull <philbull@gmail.com>
Date:	Fri Jun 19 23:29:06 2009 +0100

    * Restructure problems-connecting into a guide and shorten names to
    "prob-conn" * Update xmlns where missed * Use the page type hint
    (topic/guide) correctly

 help/C/add-contact.page	    |	2 +-
 help/C/change-status.page	    |	2 +-
 help/C/prob-conn-acctdisabled.page |  52 +++++++++++++++++
 help/C/prob-conn-auth.page	    |  51 +++++++++++++++++
 help/C/prob-conn-neterror.page     |  62 ++++++++++++++++++++
 help/C/prob-conn.page		    |  38 +++++++++++++
 help/C/problems-connecting.page    | 113
 -------------------------------------
 help/C/send-file.page		    |	2 +-
 help/C/send-message.page	    |	2 +-
 9 files changed, 207 insertions(+), 117 deletions(-)

commit 73980629d8f011acb0bd2441c53776153e2a348e
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Thu Jun 18 23:49:17 2009 +0200

    Updated xmlns links * Updated the xmlns links in all pages to reflect
    the new Mallard spec URL

 help/C/add-account.page	 | 2 +-
 help/C/add-contact.page	 | 2 +-
 help/C/change-status.page	 | 2 +-
 help/C/create-account.page	 | 2 +-
 help/C/disable-account.page	 | 2 +-
 help/C/index.page		 | 2 +-
 help/C/problems-connecting.page | 2 +-
 help/C/remove-account.page	 | 2 +-
 help/C/send-file.page		 | 2 +-
 help/C/send-message.page	 | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

commit 016a69a83d9a20aeaa93bcdf20faeef968a888a8
Author: Phil Bull <philbull@gmail.com>
Date:	Mon Jun 15 21:19:47 2009 +0100

    Added "add contact" page. Needs work.

 help/C/add-contact.page | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

commit 88ed5023f2167d1a8ec40ba773ea69be8103e2ca
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Jun 14 23:32:03 2009 -0400

    * Add a custom-message topic for setting a custom presence message
    (needs more work) * Modified the change-status topic

 help/C/change-status.page | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

commit 5ea557b78b99877f78ab56ccb5df508f9b100dc9
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Jun 14 23:10:34 2009 -0400

    Fixed the naming convention of files: use dash, not underscores

 help/C/change-status.page	 |  39 ++++++++++++++
 help/C/change_status.page	 |  39 --------------
 help/C/problems-connecting.page | 113
 ++++++++++++++++++++++++++++++++++++++++
 help/C/problems_connecting.page | 113
 ----------------------------------------
 help/C/send-file.page		 |  54 +++++++++++++++++++
 help/C/send-message.page	 |  54 +++++++++++++++++++
 help/C/send_file.page		 |  54 -------------------
 help/C/send_message.page	 |  54 -------------------
 8 files changed, 260 insertions(+), 260 deletions(-)

commit 1141d65da420328c1f6ba7373c53a2bf554abcc9
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Jun 14 22:51:52 2009 -0400

    Rework some sections

 help/C/change_status.page  | 59 +++++++++++++++++++-------------------
 help/C/create-account.page |  4 +--
 help/C/send_message.page   | 70
 +++++++++++++++++++++++++++++++---------------
 3 files changed, 80 insertions(+), 53 deletions(-)

commit 8514fdd6e08d327e01e904de666fbb4414029d61
Author: Phil Bull <philbull@gmail.com>
Date:	Mon Jun 15 03:49:10 2009 +0100

    Add common problems section

 help/C/index.page		 | 4 ++++
 help/C/problems_connecting.page | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

commit 6ee9ba692824d3abb9cf010692d3880a863b57c2
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Jun 14 22:32:17 2009 -0400

    Fixed description of disable-account topic

 help/C/disable-account.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b4e70b513a9c0307c84dc9210b8b7f3dde1a984d
Author: Phil Bull <philbull@gmail.com>
Date:	Mon Jun 15 03:22:39 2009 +0100

    * Change links to reflect index page categories * Add sentence on
    automatic status change to change_status

 help/C/add-account.page     |	4 ++--
 help/C/change_status.page   | 13 +++++++++++--
 help/C/create-account.page  |	2 +-
 help/C/disable-account.page |	4 ++--
 help/C/index.page	     | 10 +++++++++-
 help/C/remove-account.page  |	4 ++--
 help/C/send_file.page	     |	2 +-
 help/C/send_message.page    |	2 +-
 8 files changed, 29 insertions(+), 12 deletions(-)

commit a5a227c8abb1bb0f7208f797f3bfde3953d29a68
Author: Phil Bull <philbull@gmail.com>
Date:	Mon Jun 15 03:08:15 2009 +0100

    Added page on connection problems.

 help/C/problems_connecting.page | 113
 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)

commit f09080299c239dd1602365cebd98af5a457e2a6d
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Jun 14 21:49:20 2009 -0400

    Added remove and disable account topics Added link to the add-account
    topic

 help/C/add-account.page     |	1 +
 help/C/disable-account.page | 78
 +++++++++++++++++++++++++++++++++++++++++
 help/C/remove-account.page  | 85
 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 164 insertions(+)

commit 5dad754128ba85483b02e87784c17ae678141779
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Jun 14 19:55:37 2009 -0400

    Added the add-account topic Some cleaning of the index.page (empty
    line)

 help/C/add-account.page | 96
 +++++++++++++++++++++++++++++++++++++++++++++++++
 help/C/index.page	 |  2 --
 2 files changed, 96 insertions(+), 2 deletions(-)

commit e649179a02b95836fcbfe376e2bb3b111a6f7606
Author: Phil Bull <philbull@gmail.com>
Date:	Mon Jun 15 00:42:30 2009 +0100

    Add "send_message" topic

 help/C/send_message.page | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

commit 8429d0c1dff0036ea65a75ee35651816f8544d07
Author: Phil Bull <philbull@gmail.com>
Date:	Mon Jun 15 00:20:46 2009 +0100

    Change title, add link to index

 help/C/create-account.page | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 530793478eeedac93f25f69c45f207f943c3c274
Author: Phil Bull <philbull@gmail.com>
Date:	Mon Jun 15 00:18:03 2009 +0100

    Change links

 help/C/index.page     | 4 +---
 help/C/send_file.page | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

commit f9b0f6cd161a10e2fead1f367e00d5d0215b50ff
Author: Phil Bull <philbull@gmail.com>
Date:	Mon Jun 15 00:08:06 2009 +0100

    Change capitalisation

 help/C/send_file.page | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c0f96feb8f7ae82662b950729effac4046ca83cc
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Jun 14 18:51:33 2009 -0400

    Added topic on creating accounts

 help/C/create-account.page | 119
 +++++++++++++++++++++++++++++++++++++++++++++
 help/C/index.page	    |  56 +++++++++++----------
 2 files changed, 150 insertions(+), 25 deletions(-)

commit 1f1a155079ad5f878297e77020c4202134cdc3e3
Author: Phil Bull <philbull@gmail.com>
Date:	Sun Jun 14 23:32:55 2009 +0100

    Add topic on changing your status

 help/C/change_status.page | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

commit 63af18d35fc97a5396701f8c5c536980fceaebd3
Author: Phil Bull <philbull@gmail.com>
Date:	Sun Jun 14 23:07:23 2009 +0100

    * Added topic on sending files (send_file) * Fix broken link on
    index page

 help/C/send_file.page | 54
 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

commit 293a30500849034931fe560fb40fd057e9d9556a
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sun Jun 14 16:10:42 2009 -0400

    Added the index.page start page

 help/C/index.page | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

commit df40da35e0abb3446b83b7950805aa62718dfff4
Author: Shankar Prasad <svenkate@redhat.com>
Date:	Wed Aug 12 17:47:48 2009 +0530

    Updated Kannada(kn) translation

 po/kn.po | 2184
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 1338 insertions(+), 846 deletions(-)

commit b65d672d2d0bd196de434634332b3cb42316a37f
Author: Manoj Kumar Giri <mgiri@mgiri.csb>
Date:	Wed Aug 12 14:57:53 2009 +0530

    Updated Oriya Translation

 po/or.po | 706
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 409 insertions(+), 297 deletions(-)

commit c7ae775429b35ff06ea3bbb29ebaac5e5bc80bc3
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	Tue Aug 11 15:29:09 2009 +0200

    Updated Basque language

 po/eu.po | 1919
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 1166 insertions(+), 753 deletions(-)

commit 34388b53bf884a5eff30c0dbf2add84e9043096d
Author: Frédéric Péters <fpeters@0d.be>
Date:	Sun Aug 9 18:18:40 2009 +0200

    Always show icons in presence chooser (GNOME bug 591247)

 libempathy-gtk/empathy-presence-chooser.c | 1 +
 1 file changed, 1 insertion(+)

commit 61d13bbf3bf40d196ed727c6b79205ca0aaa94ff
Merge: cb95d7e a3a2495
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Aug 10 16:03:18 2009 +0100

    Merge commit 'ksz/rfb'

commit cb95d7e6f594f2144d11bf3b2c1e81c69e0e5099
Author: Antón Méixome <meixome@mancomun.org>
Date:	Mon Aug 10 16:46:33 2009 +0200

    Updated Galician translation

 po/gl.po | 314
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 172 insertions(+), 142 deletions(-)

commit a3a24957f7638ff5e0a27d4a09b67717b62479d7
Author: Arnaud Maillet <arnaud.maillet@collabora.co.uk>
Date:	Mon Aug 10 13:30:39 2009 +0200

    fix bug #590756 - Renamed x_vnc service to rfb

 libempathy-gtk/empathy-share-my-desktop.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 13e0cbdf5f7bb6ace292a5c875edfd41e31af988
Author: Gil Forcada <gforcada@gnome.org>
Date:	Sun Aug 9 11:23:19 2009 +0200

    Minor fixes to Catalan translation

 po/ca.po | 2362
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1490 insertions(+), 872 deletions(-)

commit 96231a42f2ee0dcdcb33b67edc5e1ecee80dfc8e
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:	Sun Aug 9 11:17:45 2009 +0200

    Added Catalan (Valencian) translation

 po/LINGUAS	   |	1 +
 po/ca@valencia.po | 2873
 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 2874 insertions(+)

commit 486ac5b8ddef3e47f7050e6b70fb3555292ee796
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Fri Aug 7 18:57:06 2009 +0200

    Updated Spanish translation

 po/es.po | 75
 ++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 38 insertions(+), 37 deletions(-)

commit 822589779b6ca45df0ad2b7cee175de706307ee8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 7 16:59:10 2009 +0100

    chat_window_help_contents_activate_cb: documentation doesn't have a
    'chat' section anymore (#590029)

 src/empathy-chat-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c266347e297660bb665abfcdfc3d6568fd8e4294
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 7 16:12:21 2009 +0100

    empathy_send_file_with_file_chooser: allow to send files from network
    locations (#591058)

    Empathy can send file from network locations so there is no reason to
    not allow users to.

 libempathy-gtk/empathy-ui-utils.c | 2 ++
 1 file changed, 2 insertions(+)

commit a90f1f5cb840c43a60a5da2e5d6daa884ba8dd2c
Author: Frédéric Péters <fpeters@0d.be>
Date:	Tue Jul 28 10:36:47 2009 +0200

    Let messages with two slashes without spaces in between pass

    This makes it possible to send /unix/path (GNOME bug 589335)

 libempathy-gtk/empathy-chat.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

commit 09c7ee275295bcfc31c9ee76d8ef235c73821621
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 10 12:19:47 2009 +0100

    Use the official MSN icon (#576467)

 data/icons/hicolor_apps_16x16_im-msn.png    | Bin 762 -> 835 bytes
 data/icons/hicolor_apps_22x22_im-msn.png    | Bin 1086 -> 1281 bytes
 data/icons/hicolor_apps_24x24_im-msn.png    | Bin 1203 -> 1407 bytes
 data/icons/hicolor_apps_32x32_im-msn.png    | Bin 1734 -> 1660 bytes
 data/icons/hicolor_apps_48x48_im-msn.png    | Bin 2876 -> 2778 bytes
 data/icons/hicolor_apps_scalable_im-msn.svg | 380
 +++++++++-------------------
 6 files changed, 126 insertions(+), 254 deletions(-)

commit afb052be39a6ea5e3f5858f69aaf47d27995ec3e
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Fri Aug 7 09:19:19 2009 -0400

    Setting priv->bus_message_source_id to 0 to make sure that
    g_source_remove is not called twice on it.

 src/empathy-call-window.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

commit 044a71d3ffd3788c1f2f8060448b536eff62d6f0
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Thu Aug 6 10:46:59 2009 -0400

    Now removing the bus watch when destroying the pipeline.

 src/empathy-call-window.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

commit b90d0d4a041ce3753b51a3cbf36142838d9e2876
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Thu Aug 6 15:01:09 2009 -0400

    Fixed a bug that caused the application to crash when input volume was
    changed on a disconnected call.

 src/empathy-call-window.c | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

commit ec6cebc3342d4b8777f690df0f687fc00d3d7122
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Aug 7 12:21:08 2009 +0100

    status_icon_update_notification: don't crash if event->message is NULL

    g_markup_escape_text isn't NULL-safe so we should be sure that
    event->message is not NULL before calling it.

 src/empathy-status-icon.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 61281d748f97710b1561ab81cdc1ce33d47f0b78
Author: Seán de Búrca <leftmostcat@gmail.com>
Date:	Fri Aug 7 02:45:26 2009 -0600

    Updated Irish translation

 po/ga.po | 403
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 206 insertions(+), 197 deletions(-)

commit 5b03fadebc0191b901d27e7506848c18a25691a0
Merge: eccbc31 1edab7c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Aug 6 22:39:51 2009 +0100

    Merge commit 'jtellier/empathy-contact-widget-style'

commit eccbc315b01b7030653191ac1e2b4475dc682fd1
Author: Louis-Francis Ratté-Boulianne
<louis-francis.ratte-boulianne@collabora.co.uk>
Date:	Thu Aug 6 13:26:38 2009 -0400

    Move contact when drag'n'dropped (Fix #585443)

 libempathy-gtk/empathy-contact-list-view.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit bb29218b8ad4e92e03f8b87236c9843392c5c0d9
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Tue Aug 4 15:43:53 2009 -0400

    Force skew method of clock slaving for alsa/osssrc

 data/element-properties | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit 21be2be89095c754e8ddc96a666735eb48f7e7ee
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Fri Jul 31 20:10:34 2009 -0400

    Move the FsElementElementAddedNotifier over the main pipeline

 libempathy/empathy-call-handler.c | 32 --------------------------------
 src/empathy-call-window.c	   | 31 ++++++++++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 33 deletions(-)

commit b1508d71bf814939e9b9818377b4fef95c6470b2
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Fri Jul 31 20:10:09 2009 -0400

    Correctly register the src/sink elements

 libempathy-gtk/empathy-audio-sink.c | 10 +++++++++-
 libempathy-gtk/empathy-audio-src.c  | 12 +++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

commit a885bc90fd4c27676090a59bb615b14258ff8579
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Fri Jul 10 15:41:27 2009 +0100

    Make it possible to set element properties from a config file

 data/Makefile.am		   |  3 ++-
 data/element-properties	   | 17 +++++++++++++
 libempathy/empathy-call-handler.c | 50
 +++++++++++++--------------------------
 3 files changed, 36 insertions(+), 34 deletions(-)

commit b1642e68a321a80d7557863409455375906c14ba
Author: Olivier Crête <olivier.crete@collabora.co.uk>
Date:	Fri Jul 10 15:21:16 2009 +0100

    Put codec preferences in a configuration file

 data/Makefile.am		   |  4 +++
 data/codec-preferences		   | 36 ++++++++++++++++++++++++++
 libempathy/empathy-call-handler.c | 53
 +++++++++------------------------------
 3 files changed, 52 insertions(+), 41 deletions(-)

commit 1edab7cb3e0c6de74d22849c904bcde2168c2854
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Thu Aug 6 10:51:35 2009 -0400

    Fixed style

 libempathy-gtk/empathy-contact-widget.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2fe171b03ebf6e2a4f726e456527cacafa1c4194
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Thu Aug 6 10:37:57 2009 -0400

    Remove redundant == TRUE/FALSE

 libempathy-gtk/empathy-location-manager.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 713fb600634add0e0abe35489402e5ed8d5fde10
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Thu Jul 2 14:25:48 2009 -0400

    Fix reduced accuracy concerns

    As pointed out by users, the previous reduced accuracy mode
    was not the best.  It is better to trunkate the coordinates
    rather than adding a random value to it.

    This patch also replaces strcmp by tp_strdiff

 libempathy-gtk/empathy-location-manager.c | 36
 +++++++++++++++----------------
 src/empathy-preferences.ui		   |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

commit 52a4fda0785b6e49be175221350c8f90d7982527
Merge: 0d01019 faef888
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Aug 6 13:02:52 2009 +0100

    Merge branch 'escape-notifications'

    Fixes #580134

    Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

commit 0d01019a5c90edb5dd7b97037e49bdd508d2f9f9
Author: alinrus <netblock@gmail.com>
Date:	Thu Aug 6 13:09:41 2009 +0200

    Set selectable status information

 libempathy-gtk/empathy-contact-widget.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 6226d30cae6450daa2d930a52dc002ab8bcbee7c
Author: Denis Arnaud <darnaud@src.gnome.org>
Date:	Thu Aug 6 09:58:04 2009 +0200

    Updated breton translation

 po/br.po | 293
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 162 insertions(+), 131 deletions(-)

commit e59bb30923e3643b57bace4c01d2cf28e67b659d
Author: Denis Arnaud <darnaud@src.gnome.org>
Date:	Thu Aug 6 06:14:57 2009 +0200

    Updated breton translation and added br in Linguas file.

 po/br.po | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

commit c03672a10644fc36352657e9b66e9d3e2e47ecf5
Author: Denis Arnaud <darnaud@src.gnome.org>
Date:	Thu Aug 6 06:13:40 2009 +0200

    Updated breton translation and added br in Linguas file.

 po/LINGUAS |	 1 +
 po/br.po   | 2507
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 2508 insertions(+)

commit 70b4decf86fd6df867eb2805782582ef3b5931db
Author: Rodrigo L. M. Flores <mail@rodrigoflores.org>
Date:	Wed Aug 5 12:55:42 2009 -0400

    Updated Brazilian Portuguese translation.

 po/pt_BR.po | 2354
 ++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 1527 insertions(+), 827 deletions(-)

commit 54e803983afeeffe0a46ed0cd43f929859434aff
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Wed Aug 5 18:08:52 2009 +0300

    Updated Arabic translation

 po/ar.po | 254
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 133 insertions(+), 121 deletions(-)

commit 7e8cf5368fc2d51a270f6507a146f0b87bae0e03
Author: Mark Krapivner <mark125@gmail.com>
Date:	Wed Aug 5 15:39:14 2009 +0300

    Updated Hebrew translation

 po/he.po | 1255
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 718 insertions(+), 537 deletions(-)

commit 7d7bc4c67767952b926eb9c3431e485d1e59b6b2
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Aug 5 11:08:44 2009 +0100

    Embolden tab labels when you're highlighted

    This is in addition to en-reddening them, which might not be enough if
    you can't distinguish red and black, and matches how names are
    highlighted in the conversation window.

    Ideally this would be theme-able, but this is a start.

 src/empathy-chat-window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit faef8889c4331af839cbec91691fe97ade60f9f7
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Aug 4 22:29:56 2009 +0100

    Don't try to free NULL pixbufs.

    It's all very well to ensure that we don't pass a NULL pixbuf to
    libnotify, but we shouldn't then try to g_object_unref () the pointer
    without checking it's not NULL.

 src/empathy-chat-window.c | 16 +++++++---------
 src/empathy-status-icon.c | 15 ++++++++-------
 2 files changed, 15 insertions(+), 16 deletions(-)

commit 485ccb5ac65dc8beccd511c9575c3f58ae52d047
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Aug 4 22:15:38 2009 +0100

    Escape markup in notifications and icon tooltip

    7730ffd fixed this for the notifications that are produced by the chat
    window, but not for the ones produced by the status icon. Why
    these are
    separate code paths eludes me.

 src/empathy-status-icon.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

commit e7cfecf66b0620de55633444855999d974acd6f2
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Tue Aug 4 21:49:13 2009 +0200

    Updated German translation

 help/de/de.po | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit 6b4edecdd8924a13855ef0cdad4cf9baa814df17
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Tue Aug 4 20:37:36 2009 +0200

    Updated Spanish translation

 help/es/es.po | 422
 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 209 insertions(+), 213 deletions(-)

commit 25695252172715884b1a1d94188120498142952a
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Tue Aug 4 19:07:07 2009 +0200

    Updated Spanish translation

 po/es.po | 227
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 122 insertions(+), 105 deletions(-)

commit 8ef6b63b1ce2f906b9cfe74ad49e2981c435bd9c
Author: Daniel Nylander <po@danielnylander.se>
Date:	Mon Aug 3 12:34:54 2009 +0200

    Updated Swedish translation

 po/sv.po | 202
 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 116 insertions(+), 86 deletions(-)

commit ddd1d7859f1b4b757e1091a816863d8f53b244d7
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Mon Aug 3 00:48:56 2009 +0200

    Updated Norwegian bokmål translation.

 po/nb.po | 1139
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 659 insertions(+), 480 deletions(-)

commit 800532eb93ab4fc40280705e969f5db8a2e548c0
Author: Ivar Smolin <okul@linux.ee>
Date:	Sun Aug 2 18:41:32 2009 +0300

    Updating Estonian translation

 po/et.po | 282
 +++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 174 insertions(+), 108 deletions(-)

commit 771b69208c4c3bb4b32057e53f97d4c79995a5cc
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date:	Sun Aug 2 16:11:05 2009 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 2051
 ++++++++++++++++++++++++++++++++++------------------------
 po/zh_TW.po | 2054
 +++++++++++++++++++++++++++++++++++------------------------
 2 files changed, 2423 insertions(+), 1682 deletions(-)

commit d72ca1549ebfe0648060f12416a44530566c066b
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat Aug 1 16:23:17 2009 +0200

    Set presence on accounts when they become ready

 libempathy/empathy-account-manager.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 9f9890593181c881b09773d7f8e68a402d8ce7fa
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat Aug 1 15:12:42 2009 +0200

    Port to libunique

 configure.ac			|   1 +
 src/Makefile.am		|   1 -
 src/bacon-message-connection.c | 412
 -----------------------------------------
 src/bacon-message-connection.h |  51 -----
 src/empathy.c			| 151 ++++-----------
 5 files changed, 38 insertions(+), 578 deletions(-)

commit af5cee20d84c3ef3ebf31f7e19b4108f9607aa14
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat Aug 1 13:24:42 2009 +0200

    Make sure we always show the main window

 src/empathy-main-window.c | 2 ++
 1 file changed, 2 insertions(+)

commit 0c6cc061e45dd68827a8bbc28b96df4b753c29fd
Author: Seán de Búrca <leftmostcat@gmail.com>
Date:	Sat Aug 1 02:53:05 2009 -0600

    Updated Irish translation

 po/ga.po | 2828
 ++++++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 2119 insertions(+), 709 deletions(-)

commit de42661f2e27d8bffb4c9ed3e921c85a8fe27add
Author: Seán de Búrca <leftmostcat@gmail.com>
Date:	Sat Aug 1 02:42:54 2009 -0600

    Add type to UI file to catch missing strings

 po/POTFILES.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8dcbfe163b293dda9bc0481e846db3bdd4e0ea98
Merge: 3e8f251 c62744a
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat Aug 1 10:33:18 2009 +0200

    Merge branch 'master' into mc5

commit 3e8f25168aadd741ecc0fe8da4d1847eece5ff83
Merge: 41e5b31 87070d2
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat Aug 1 10:32:39 2009 +0200

    Merge branch 'sjoerd-mc5' into mc5

    Conflicts:
	libempathy-gtk/empathy-account-widget.c
	libempathy-gtk/empathy-protocol-chooser.c

commit 41e5b31c1918f40c3ba47bff2dc9ab682fe0391f
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Jul 31 12:11:58 2009 +0200

    Use proper display names in the chooser

 libempathy-gtk/empathy-protocol-chooser.c | 46
 +++++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 6 deletions(-)

commit c62744a26535b8778e6053e5d7c544ca9ccc1e5f
Author: Aron Xu <aronxu@gnome.org>
Date:	Fri Jul 31 18:03:44 2009 +0800

    Updated Simplified Chinese translation.

 po/zh_CN.po | 82
 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 42 insertions(+), 40 deletions(-)

commit 0279ad1b9504f81dbe6773eab9fdbd6ffdbfca3d
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Jul 31 11:44:35 2009 +0200

    Make protocol icons work also with account == NULL

 libempathy/empathy-account-settings.c |  7 +++++--
 libempathy/empathy-account-settings.h |  2 +-
 src/empathy-accounts-dialog.c	       | 11 ++++++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

commit 8d2d494e21dd76251ce3fff3301bf007eb514f53
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Jul 31 11:44:12 2009 +0200

    Don't try to lookup NULL connections

 libempathy-gtk/empathy-contact-dialogs.c | 4 ++++
 1 file changed, 4 insertions(+)

commit e0f2c0a49153280c723a293f2dcda0dffd931ec2
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Jul 30 20:00:01 2009 +0200

    Change the name to Empathy IM Client, which is more recognizable

 data/empathy.desktop.in.in | 6 +++---
 empathy.doap		    | 4 ++--
 help/C/empathy.xml	    | 2 +-
 src/empathy.c		    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

commit 87070d25c5f2d9a0ecba73e8ce913eca7f183c79
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Jul 30 19:35:03 2009 +0200

    Fix some coding style issues

 libempathy/empathy-account-manager.c  | 11 +++++++----
 libempathy/empathy-account-settings.c | 33
 ++++++++++++++++++---------------
 libempathy/empathy-account.c	       |  8 +++++---
 libempathy/empathy-dispatcher.c       |  1 -
 4 files changed, 30 insertions(+), 23 deletions(-)

commit f54c1834d7a8dc0de0f6f4c1ae60910a38944d05
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Jul 30 19:30:25 2009 +0200

    add some slightly nicer debug messages

 libempathy/empathy-account.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 4e38b2c3eab6a2a19906db5c4933870beb6ce626
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Jul 30 19:29:35 2009 +0200

    Add a small comment about emp_account_manager_update_global_presence

 libempathy/empathy-account-manager.c | 3 +++
 1 file changed, 3 insertions(+)

commit ef19c477deba879906da074361527c7885db35ee
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Jul 30 19:25:24 2009 +0200

    Fix typo

 libempathy/empathy-idle.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 586a307e56f2bce203e80de9f9f9d5a15e34bec6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Jul 30 17:37:45 2009 +0200

    Update python bindings

 python/pyempathy/pyempathy.defs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit c9ef23052d2e5007e6120dcc881d6c382fcf48d3
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Jul 30 17:35:38 2009 +0200

    Chang the API of AccountManager to have the get lookup the account
    by name

    EmpathyAccountManager used to have a _lookup function that looked
    up accounts
    by name and a _get function that lookup up accounts by
    connection. This is
    confusing, as looking up an account for a connection is less common
    rename have
    the _get_account be the same _lookup (but without returning a ref)
    and add a
    _get_account_for_connection function lookup by account

 libempathy-gtk/empathy-chat.c		    |  6 ++++--
 libempathy-gtk/empathy-contact-list-view.c |  2 +-
 libempathy/empathy-account-manager.c	    | 15 +++++----------
 libempathy/empathy-account-manager.h	    |  4 ++--
 libempathy/empathy-chatroom-manager.c	    |  8 ++++----
 libempathy/empathy-contact.c		    |  3 ++-
 libempathy/empathy-dispatcher.c	    |  4 +---
 libempathy/empathy-log-store-empathy.c     |  4 +++-
 megaphone/src/megaphone-applet.c	    |  3 ++-
 src/empathy-chat-window.c		    |  4 +---
 src/empathy.c				    |  2 +-
 11 files changed, 26 insertions(+), 29 deletions(-)

commit 237c4ac2d8d1b008a0c34aa24fc63eb3a1c0c91d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Jul 30 17:18:30 2009 +0200

    explicitely include libempathy/empathy-enum-types.h

 python/pyempathygtk/pyempathygtk.override | 1 +
 1 file changed, 1 insertion(+)

commit 89108da0875495e3b832db3a6db264b25c6ffe81
Author: lyper <lyp069@gmail.com>
Date:	Thu Jul 30 14:01:52 2009 +0800

    Updated Simplified Chinese translation.

 po/zh_CN.po | 133
 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 67 insertions(+), 66 deletions(-)

commit bf6b5979152190e78ca913c6cfd0b91e204c60fd
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Jul 30 00:44:36 2009 +0200

    Fix trailing whitespace

 libempathy-gtk/empathy-account-widget.c | 18 +++++++++---------
 libempathy/empathy-account-manager.c	 |  6 +++---
 src/empathy-accounts-dialog.c		 | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

commit 6d753b4f94a7fd35a727f5a2359087379e8288b1
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Jul 30 00:44:27 2009 +0200

    Update POTFILES.in

 po/POTFILES.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 20438b5175f16e9b78b68a89b5da3fdd3aadad45
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Jul 29 23:38:19 2009 +0200

    Don't try to unref the GtkBuilder object in _dispose

    We take care of unreffing it before getting to dispose, as the object
    can have a variable lifecycle

 libempathy-gtk/empathy-account-widget.c | 6 ------
 1 file changed, 6 deletions(-)

commit c8fc859d6d2bda4110e0dcb5fa4e213162d1c1c4
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Jul 29 23:38:00 2009 +0200

    Hook up to the destroy signal in EmpathyAccountWidget

 libempathy-gtk/empathy-account-widget.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit 25ee209b2d033ca91f23a818636926285030945d
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Jul 29 23:21:40 2009 +0200

    Set the sensitivity to the forget button

 libempathy-gtk/empathy-account-widget.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 6bd8c2d7d8589d3d0019599c75de05b20ae18f44
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Jul 29 23:11:07 2009 +0200

    Ignore default value for required params

    Parameters should never have both the default and the required flags
    set, as required means the user has to fill in a value. When this
    happens anyway, the default dlag should be ignored, so we can avoid
    looking up the default value when checking for an account settings'
    validity.

 libempathy/empathy-account-settings.c | 4 ----
 1 file changed, 4 deletions(-)

commit 3c966e213e602fc6bb289a30b62f12122dcbdee9
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Jul 29 23:06:35 2009 +0200

    Make account creation non-exclusive

    As it's valid to create more than an account at the same time,
    we should
    permit it with subsequent calls to EmpathyAccountManager.

 libempathy/empathy-account-manager.c | 68
 ++++++++++++++++++++++++------------
 1 file changed, 46 insertions(+), 22 deletions(-)

commit 10439722fe6985ff89c61e8c7488113e1a52806e
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Jul 29 22:44:22 2009 +0200

    Rename empathy_account_settings_owns_account()

    Call it empathy_account_settings_has_account() instead

 libempathy/empathy-account-settings.c | 2 +-
 libempathy/empathy-account-settings.h | 2 +-
 src/empathy-accounts-dialog.c	       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 9980b694fec4e3d205555a88040571365416455b
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Jul 27 11:52:06 2009 +0200

    Implement dispose and finalize

 libempathy-gtk/empathy-account-widget.c | 106
 ++++++++++++++++++++++----------
 1 file changed, 75 insertions(+), 31 deletions(-)

commit 7f58866b6d20c71e21af8d90dc714f32de077af5
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Jul 27 01:24:53 2009 +0200

    Set apply button sensitivity on creation

 libempathy-gtk/empathy-account-widget.c | 1 +
 1 file changed, 1 insertion(+)

commit 207d7ac4384915a0fd3a65f609a04eeb59cb98e0
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Jul 27 01:24:42 2009 +0200

    Remove debug output

 src/empathy-accounts-dialog.c | 1 -
 1 file changed, 1 deletion(-)

commit 68f828614636f87c93af780960954c923cf2faf6
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Jul 27 01:18:31 2009 +0200

    Add a cosmetic comment to separate public and non-public methods.

 libempathy-gtk/empathy-account-widget.c | 2 ++
 1 file changed, 2 insertions(+)

commit c6e40cfec95a7f0bef133a96b74220a9bd295c72
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Jul 27 01:17:25 2009 +0200

    Use telepathy style

 libempathy-gtk/empathy-account-widget.c | 1289
 ++++++++++++++++---------------
 1 file changed, 657 insertions(+), 632 deletions(-)

commit 9e9bc5b2eebee732b8012cbcd649ebba1c320b65
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Jul 27 01:17:14 2009 +0200

    Update copyright and author

 libempathy-gtk/empathy-account-widget.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 000a7c0ca4dc343b42e628323ddd1ca0f2a08e3f
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon Jul 27 00:54:23 2009 +0200

    First cut at GObject-ifying EmpathyAccountWidget

 libempathy-gtk/Makefile.am			    |	3 +-
 libempathy-gtk/empathy-account-widget-irc.c	    |  79 ++-
 libempathy-gtk/empathy-account-widget-irc.h	    |	5 +-
 .../empathy-account-widget-local-xmpp.ui	    | 219 +++++++
 libempathy-gtk/empathy-account-widget-private.h    |  47 ++
 libempathy-gtk/empathy-account-widget-salut.ui     | 219 -------
 libempathy-gtk/empathy-account-widget-sip.c	    |  42 +-
 libempathy-gtk/empathy-account-widget-sip.h	    |	5 +-
 libempathy-gtk/empathy-account-widget.c	    | 642
 ++++++++++++---------
 libempathy-gtk/empathy-account-widget.h	    |  52 +-
 src/empathy-accounts-dialog.c			    |  29 +-
 11 files changed, 732 insertions(+), 610 deletions(-)

commit a84e75c56b59533a551a411ff7a2aa7d88659cd4
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sun Jul 26 17:09:06 2009 +0200

    Add empathy_account_settings_is_valid ()

 libempathy/empathy-account-settings.c | 60
 +++++++++++++++++++++++++++++++++++
 libempathy/empathy-account-settings.h |  1 +
 2 files changed, 61 insertions(+)

commit 72ae76e34c0c57b326be53f860bbc12cadf1ceb8
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sun Jul 26 17:08:47 2009 +0200

    Fix a typo.

 libempathy-gtk/empathy-account-widget.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 88723038185c9f7b1402153f0a3009ea883fc250
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat Jul 25 18:24:54 2009 +0200

    Even more cleanup + update header

 src/empathy-accounts-dialog.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

commit 0613221d61c564e4931cf3f62cc95109e71f4c6c
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Sat Jul 25 18:20:40 2009 +0200

    Adapt to the current telepathy style

 src/empathy-accounts-dialog.c | 2318
 ++++++++++++++++++++---------------------
 1 file changed, 1146 insertions(+), 1172 deletions(-)

commit ab51e3524e667dce95c9b792a9cd051f4070d668
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat Jul 25 17:23:38 2009 +0200

    Use the right property name when getting the connection status.

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 604cd696cf2af3995a3bba6317b3684255a08fc2
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat Jul 25 17:02:20 2009 +0200

    Fix a typo in dispose()

 libempathy/empathy-account-manager.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 8159c9cf091d3474702df58b04dcd11783109ab7
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat Jul 25 17:01:33 2009 +0200

    Cancel the creation thread in dispose()

 libempathy/empathy-account-manager.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit b3970ee62ba17348a793cc2d2e617f403216f728
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat Jul 25 16:46:32 2009 +0200

    Emit the ACCOUNT_CREATED signal at the right time

    I.e. emit it only after the account has been added to the relevant
    EmpathyAccountSettings object.

 libempathy/empathy-account-manager.c | 67
 +++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 36 deletions(-)

commit 7823b045d9b6a00102a44b40943d7d2188412521
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat Jul 25 16:45:01 2009 +0200

    Use the new API when getting the account iter.

 src/empathy-accounts-dialog.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit 7f8d4b20123d1f3f48ddaf404b022bdeeba5d99a
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat Jul 25 16:44:14 2009 +0200

    Add empathy_account_settings_owns_account()

 libempathy/empathy-account-settings.c | 14 ++++++++++++++
 libempathy/empathy-account-settings.h |  3 +++
 2 files changed, 17 insertions(+)

commit 6d59456848be4257df0724a610ef224d8c1d2e84
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Jul 24 21:24:38 2009 +0200

    Make sure the account dialog respects the initial selection

 src/empathy-accounts-dialog.c | 64
 +++++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 30 deletions(-)

commit e3ed5ba84d20da177070d4708bca4bdb9d0ee149
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Jul 24 15:52:29 2009 +0200

    Implement _set_display_name

 libempathy/empathy-account-settings.c | 46 +++++++++++++++++++++++++++
 libempathy/empathy-account.c	       | 59
 +++++++++++++++++++++++++++++++++++
 libempathy/empathy-account.h	       |  7 +++--
 3 files changed, 110 insertions(+), 2 deletions(-)

commit 45c7f5469ed08aeda3d54bf375d129cab5194cde
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Jul 24 01:45:59 2009 +0200

    When an account is enabled, always align it to the global presence.

    Before, this was only done for newly created accounts, and not every
    time any account was enabled.

 libempathy/empathy-account-manager.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

commit 113d262b56effb7927d310ca90db3da5840e2dc9
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Jul 23 19:23:27 2009 +0200

    Make remove work

 src/empathy-accounts-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9b7a3c09518ca7fee43c0c8941a0c1d49261871e
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Jul 23 19:23:04 2009 +0200

    Plug some leaks

 libempathy/empathy-account-manager.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 68d69476f586e377ce45af014f7e4eeb8acd3b8d
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Jul 23 19:22:30 2009 +0200

    Respect the global presence when enabling an account

 libempathy/empathy-account-manager.c | 39
 +++++++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

commit d5c41662829057e80268b6771fbe7452aa36a814
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Jul 23 16:27:36 2009 +0200

    Unref the dialog when destroying

 src/empathy-accounts-dialog.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 5a729c2ae7018c491216eedc93129fa483cab181
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Jul 23 16:22:38 2009 +0200

    Chain up dispose and remove useless finalize

 src/empathy-accounts-dialog.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

commit 43208e2ee8fe2371d0562f37d817173857a91268
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Jul 23 16:21:12 2009 +0200

    Move some code off dispose

 src/empathy-accounts-dialog.c | 49
 +++++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 18 deletions(-)

commit 010828ac98b604438cd0edace9263cd120f4ad10
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Jul 23 12:32:23 2009 +0200

    GObject-ify and clean-up the code; still WIP

 src/empathy-accounts-dialog.c | 545
 ++++++++++++++++++++++++++++--------------
 src/empathy-accounts-dialog.h |  27 ++-
 2 files changed, 387 insertions(+), 185 deletions(-)

commit 9dfae3e6a3b7ca4751c2249590eca8317768e9b9
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Jul 23 12:31:27 2009 +0200

    Add an API to get the num of CMs

 libempathy/empathy-connection-managers.c | 12 ++++++++++++
 libempathy/empathy-connection-managers.h |  2 ++
 2 files changed, 14 insertions(+)

commit 4b6db27ff05428dda571c5e60bc7229a4dd91d5f
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed Jul 22 14:15:01 2009 +0200

    Synchronize EmpathyProtocolChooser and EmpathyAccountsDialog

    Synchronize the two objects with the help of
    EmpathyConnectionManagers,
    so that we can get a consistent list of the CMs when using the
    chooser.

 libempathy-gtk/empathy-protocol-chooser.c | 77
 ++++++++++++++-----------------
 libempathy-gtk/empathy-protocol-chooser.h |  6 ++-
 tests/test-empathy-protocol-chooser.c	   |  8 ++--
 3 files changed, 43 insertions(+), 48 deletions(-)

commit ac4f16973341bb7b0d9af0e668bf1c9c13a49431
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 29 20:38:38 2009 +0200

    Update python bindings

 python/pyempathy/pyempathy.defs       | 158
 +++++++++++++++++++++++++---------
 python/pyempathygtk/pyempathygtk.defs | 120 ++++++++++++++++++++------
 2 files changed, 212 insertions(+), 66 deletions(-)

commit 97d122d36a2e387ccdba9689052b0397bbe42a76
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 29 20:38:13 2009 +0200

    remove usage of empathy_account_equal

 libempathy-gtk/empathy-account-chooser.c |  8 +++-----
 libempathy-gtk/empathy-chat.c		  |  2 +-
 libempathy-gtk/empathy-log-window.c	  |  2 +-
 libempathy/empathy-chatroom-manager.c	  | 11 ++++-------
 libempathy/empathy-chatroom.c		  |  3 +--
 libempathy/empathy-utils.c		  |  7 -------
 libempathy/empathy-utils.h		  |  2 --
 megaphone/src/megaphone-applet.c	  |  2 +-
 src/empathy-chat-window.c		  |  2 +-
 src/empathy-chatrooms-window.c		  |  2 +-
 10 files changed, 13 insertions(+), 28 deletions(-)

commit a5a46b1dc612eb29b86f4bdfa3b3d80cb35f8893
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 29 20:20:57 2009 +0200

    Remove empathy_account_hash

 libempathy/empathy-utils.c | 8 --------
 libempathy/empathy-utils.h | 1 -
 src/empathy-main-window.c  | 4 ++--
 3 files changed, 2 insertions(+), 11 deletions(-)

commit bb2d63c7d3964a3cd68e6667a19907aa72bb686b
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 29 19:28:56 2009 +0200

    Unref the connection if it fails to become ready or is invalidated

 libempathy/empathy-account.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

commit 68cf4c663ae37ef031adfbe4afaecc218df235e6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 29 16:50:17 2009 +0200

    Fix some coding style issues

 libempathy-gtk/empathy-protocol-chooser.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 4c97b5730fd6c27376c6e2079262038e87fdc6c9
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 29 16:48:08 2009 +0200

    Fix some leaks

 libempathy-gtk/empathy-account-widget.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 1bcccdbc977cc35af2edccc9b222d53a63a8c0b6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 29 16:46:24 2009 +0200

    Add a utility function to may protocols to their icons

 libempathy-gtk/empathy-protocol-chooser.c | 3 +--
 libempathy/empathy-account.c		   | 2 +-
 libempathy/empathy-utils.c		   | 6 ++++++
 libempathy/empathy-utils.h		   | 2 ++
 4 files changed, 10 insertions(+), 3 deletions(-)

commit 7d0365eab1fa74ddf72d89d997740f809290b7aa
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Jul 29 14:21:45 2009 +0200

    Bump version

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d36c32cd4b3e2e4fcfcef169c129830a95af6d9a
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Jul 29 13:36:38 2009 +0200

    Update ABI version

 configure.ac | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 0fa9490a74e7c13d8270ff99a2bfed98a7ddcc72
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Jul 29 13:36:32 2009 +0200

    Update NEWS

 NEWS | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

commit ce183d1c5407ddeae0cb31e30c687101a3f2e190
Author: Nicolò Chieffo <84yelo3@gmail.com>
Date:	Tue Jul 28 18:12:32 2009 +0100

    Wrap text in contact label status (#589846)

 libempathy-gtk/empathy-contact-widget.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 6b432eaf1f72dc42f0adf7bb7b60c5956d4e7cd0
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jul 24 13:28:56 2009 +0200

     - Define EMPATHY_PREFS_CHAT_WEBKIT_DEVELOPER_TOOLS instead of
     hardcoding the gconf key everywhere.
     - Code cleanup in EmpathyThemeAdium

 libempathy-gtk/empathy-conf.h	      |  1 +
 libempathy-gtk/empathy-theme-adium.c | 84
 ++++++++++++++++++++----------------
 2 files changed, 49 insertions(+), 36 deletions(-)

commit f5a270ba2b59c64b37ceb730e800bb0db5991c36
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jul 24 13:20:35 2009 +0200

    Wrap too long line.

 libempathy-gtk/empathy-contact-dialogs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit e6b82c8297942483750028db51846180e225e35d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jul 24 13:20:02 2009 +0200

    Init flags to 0 to make sure it is never undefined

 libempathy-gtk/empathy-contact-list-store.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit e5574c03936d59e2fc0077fcad318ad008c09d92
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jul 24 13:19:27 2009 +0200

    Accept gibing NULL widget to empathy_url_show()

 libempathy-gtk/empathy-ui-utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 1036277e3c369afe3a1fba9aeaf3552fcd5a20aa
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jul 24 13:18:30 2009 +0200

    Do not have too complex code in var initialization.

 src/empathy-call-window.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 4da463c098708dd0b52a82195bad5ac537a9197b
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jul 24 13:18:06 2009 +0200

    Little coding style cleanup

 src/empathy-chat-window.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit 0c107f3a4fcd0f655deeff94d2e168361cda7a37
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jul 24 09:11:47 2009 +0200

    Set default for enable_webkit_developer_tools gconf key

 data/empathy.schemas.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 94aad8894c20e4a1b87fde25bd6b970b35343ec9
Author: Priit Laes <plaes@plaes.org>
Date:	Wed Jul 29 12:18:52 2009 +0300

    Added Estonian translation.

 po/LINGUAS |	 1 +
 po/et.po   | 1917
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1918 insertions(+)

commit e5a8856fbc12280af273c8329ee08ba4e6e3a044
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jul 24 14:38:13 2009 +0200

    Update gitignore

 tests/.gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a410e0a8e2d745a94ebb96c98d63651a3f06a6dc
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jul 24 14:34:44 2009 +0200

    Add missing includes in empathy-share-my-desktop.c

 libempathy-gtk/empathy-share-my-desktop.c | 2 ++
 1 file changed, 2 insertions(+)

commit 1d153c1cf91edce537bc64efb01b5a496b35518e
Merge: b50b703 6df1c4b
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 28 11:20:27 2009 +0200

    Merge commit 'upstream/master' into mc5

    Conflicts:
	libempathy-gtk/empathy-account-widget.c
	src/empathy.c

commit 6df1c4bdd81fbbb288b8e49c3bea9a1dd2e005a6
Author: Frédéric Péters <fpeters@0d.be>
Date:	Mon Jul 27 22:58:01 2009 +0200

    Set status text first in presence chooser widget model.

    ATK will take the first column of the model to get the textual value
    of a row, so make it something useful (instead of icon-name); also
    fill that cell with a value for "custom message" commands, so they
    are also known to ATK.  (GNOME bug 589830)

 libempathy-gtk/empathy-presence-chooser.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit fdd1174c22b2de215c0a4fd0b33051a3b44f5661
Author: Frédéric Péters <fpeters@0d.be>
Date:	Mon Jul 27 18:08:02 2009 +0200

    correctly display contact names in a11y tools (GNOME bug 545282)

 libempathy-gtk/empathy-contact-list-view.c | 4 ++++
 1 file changed, 4 insertions(+)

commit fb8b6e57e460565b24427ea524ff38520fc51bc2
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Sat Jul 18 08:38:36 2009 +0300

    Updated Arabic translation

 po/ar.po | 66
 ++++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

commit 037b9278b0ecdf12eb1446b2deab4f898db0d3c0
Author: Žygimantas Beručka <zygis@gnome.org>
Date:	Mon Jul 27 15:10:59 2009 +0300

    Updated Lithuanian translation

 po/lt.po | 616
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 329 insertions(+), 287 deletions(-)

commit 2b2c8d1e7e6ab59baf79de2658bfe809e0f500e4
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Sun Jul 26 17:58:09 2009 +0200

    Updated German translation

 help/de/de.po | 780
 +++++++++++++++++++++++++++-------------------------------
 1 file changed, 360 insertions(+), 420 deletions(-)

commit 04aee1294618e5571390080fc5a1bd6f993c64f5
Author: Aron Xu <aronxu@gnome.org>
Date:	Sun Jul 26 17:48:04 2009 +0800

    Updated Simplified Chinese translation.

 po/zh_CN.po | 2392
 +++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1487 insertions(+), 905 deletions(-)

commit dc402735567b460c9c1ec4afa6baa5bafc10742c
Author: Alexander Nyakhaychyk <nyakhaychyk@gmail.com>
Date:	Sat Jul 25 10:50:56 2009 +0300

    Updated Belarusian translation

 po/be.po | 85
 +++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 39 insertions(+), 46 deletions(-)

commit b81a88aa387f00c467ffad7865a61acb5692e01a
Author: Alexander Nyakhaychyk <nyakhaychyk@gmail.com>
Date:	Sat Jul 25 02:54:49 2009 +0300

    Updated Belarusian translation

 po/be.po | 2687
 ++++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 1937 insertions(+), 750 deletions(-)

commit 66f198c160fd6a8c1f3cce1a5e6237aeb1b20c99
Author: Louis-Francis Ratté-Boulianne
<louis-francis.ratte-boulianne@collabora.co.uk>
Date:	Thu Jul 23 10:56:42 2009 -0400

    Fixed copy/paste mistake (Remove members from the right set)

 libempathy/empathy-tp-contact-list.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9422fb338f29d3fb764f3237b12096d6b98012ba
Author: Daniel Nylander <po@danielnylander.se>
Date:	Wed Jul 22 23:53:20 2009 +0200

    Updated Swedish translation

 po/sv.po | 48 ++++++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

commit b50b7039d3b52f33df94e5a3526d9f43a51401ad
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 22 19:28:28 2009 +0100

    Ensure EmpathyConnectionManagers stays alive when still emitting
    signals

 libempathy/empathy-connection-managers.c | 2 ++
 1 file changed, 2 insertions(+)

commit 2ca42ded917d24b66628c40cf2f4e2b4aa5b518b
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Jul 22 17:15:52 2009 +0200

    remove trailing tabulation

 src/empathy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f3e15cee01791e3e6a4b624450fea6167aa02c31
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 22 00:16:23 2009 +0100

    Allow stop to be called if there isn't a backing channel

 libempathy/empathy-tp-roomlist.c | 4 ++++
 1 file changed, 4 insertions(+)

commit df1cf218c8a219caa68fc2f95aed1df84a95382e
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 22 00:07:03 2009 +0100

    Don't try to update the widgets if no account was selected

 src/empathy-new-chatroom-dialog.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 0b269dddf9534936735567c8f23519f0f88c949d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 22 00:06:14 2009 +0100

    Get the connection status, not the presence status string

 libempathy-gtk/empathy-account-chooser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5fcaf2ec834ebd542ee6f434705acdfaf8a05368
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 22 00:00:33 2009 +0100

    If the requested property is missing, assume we didn't request it

    MC5 tries to handle channels only signalled by the old NewChannel
    signal, but
    the Requested property isn't set in that case. Assume that we didn't
    request it
    in that case

 libempathy/empathy-dispatcher.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 36bfa50660b97ad74678e3cde0f6195154135fef
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 21 19:42:40 2009 +0100

    Add the Apply widget to the IRC account settings dialog

 libempathy-gtk/empathy-account-widget-irc.c  |  13 +-
 libempathy-gtk/empathy-account-widget-irc.ui | 339
 ++++++++++++++-------------
 2 files changed, 181 insertions(+), 171 deletions(-)

commit 80e9b255ca7f39d17034475f52479e5199ce5f93
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 21 19:28:08 2009 +0100

    Add apply button for salut accounts

 libempathy-gtk/empathy-account-widget.c | 1 +
 1 file changed, 1 insertion(+)

commit 6d2d940c7946eafb807e325af4c87a03570ef383
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 21 19:27:43 2009 +0100

    Correctly implement empathy_account_is_valid

 libempathy/empathy-account.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit d46b6d50cedf6babe686d8a13dea36d5cbc4394f
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 21 19:12:01 2009 +0100

    Hook up removing accounts in the accounts dialog

 src/empathy-accounts-dialog.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 2e87bc47e7c03fa0d2145b2c3904df545b941a76
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 21 19:11:50 2009 +0100

    Add api to remove accounts

 libempathy/empathy-account.c | 48
 ++++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-account.h |  5 +++++
 2 files changed, 53 insertions(+)

commit 067e77dceb1e0c01f33ce4c743e88c7214403b8a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 21 19:02:37 2009 +0100

    Add removed signal on EmpathyAccount

 libempathy/empathy-account-manager.c | 17 +++++++++++++
 libempathy/empathy-account.c	      | 47
 ++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)

commit 08c068fc1b90777c3a2b9c313e282f93f24b3f71
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 21 18:45:20 2009 +0100

    Make the account manager listen to AccountValidityChanged

 libempathy/empathy-account-manager.c | 35
 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

commit 68dcc8dcce232a4e8c803bd6cc71052c473f9203
Author: Marco Barisione <marco@barisione.org>
Date:	Mon Jul 20 13:25:23 2009 +0100

    Use the account manager when the service is running, not when we
    receive NameOwnerChanged

 libempathy/empathy-account-manager.c | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

commit 1ddf26795e74abafdcc8468894cf1617007c579b
Author: Fran Diéguez <fran.dieguez@glug.es>
Date:	Tue Jul 21 19:17:58 2009 +0200

    Updated Galician Translation.

 po/gl.po | 1847
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 1112 insertions(+), 735 deletions(-)

commit e9266689e7b55d9be53afc46c5b3d131ba9837cd
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 21 18:14:51 2009 +0100

    Disable tests that try to use MC4 related code

 tests/check-empathy-chatroom-manager.c | 4 ++++
 tests/check-empathy-chatroom.c		| 4 ++++
 tests/check-empathy-helpers.c		| 2 ++
 3 files changed, 10 insertions(+)

commit 183bea15838e2ad9dc16f6d86eedb820831a8d7f
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 21 18:06:47 2009 +0100

    Coding style fixes

 libempathy/empathy-account-manager.c	  | 2 +-
 libempathy/empathy-account-settings.h	  | 4 ++--
 libempathy/empathy-account.c		  | 6 +++---
 libempathy/empathy-account.h		  | 2 +-
 libempathy/empathy-connection-managers.c | 2 +-
 libempathy/empathy-connection-managers.h | 4 ++--
 libempathy/empathy-log-store-empathy.c   | 2 +-
 src/empathy.c				  | 8 ++++----
 8 files changed, 15 insertions(+), 15 deletions(-)

commit 7ba6375cdfa00bc0871e4958076398e82f92c2b5
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 21 18:02:47 2009 +0100

    Unescape _ and _2d in the protocol from mission-control

 libempathy/empathy-account.c | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

commit e24b064cc562a89abf8facba5b9085d4aee862ed
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 21 18:02:21 2009 +0100

    Port creating of of a salut account to then new apis

 src/empathy.c | 134
 +++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 90 insertions(+), 44 deletions(-)

commit 9c3db97dcf9bd237784d401ae3215326a1d77ae2
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 21 16:56:22 2009 +0100

    Port to using EmpathyAccountSettings

 libempathy-gtk/empathy-account-widget-irc.c |	61 +++--
 libempathy-gtk/empathy-account-widget-irc.h |	 4 +-
 libempathy-gtk/empathy-account-widget-sip.c |	22 +-
 libempathy-gtk/empathy-account-widget-sip.h |	 4 +-
 libempathy-gtk/empathy-account-widget.c     | 264 +++++++++++---------
 libempathy-gtk/empathy-account-widget.h     |	25 +-
 src/empathy-accounts-dialog.c		     | 363
 +++++++++++++++++++---------
 7 files changed, 475 insertions(+), 268 deletions(-)

commit aeb06b95274c6c22501c752b9fb8864af6f1bc29
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 21 16:54:05 2009 +0100

    Make empathy_account_set_enable call out over d-bus

 libempathy/empathy-account.c | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

commit 10b85cf1e8161c7f3392f50dc329c89f3bb87512
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 21 16:50:43 2009 +0100

    Add API to Update an accounts parameters

 libempathy/empathy-account.c | 51
 ++++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-account.h |  8 +++++++
 2 files changed, 59 insertions(+)

commit b81f5d599018df2378b489f080b5a2a64a8f9c9a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 21 16:48:58 2009 +0100

    Remove the API to change the account parameters one by one

 libempathy/empathy-account.c | 67
 ++++++--------------------------------------
 libempathy/empathy-account.h | 17 ++---------
 2 files changed, 10 insertions(+), 74 deletions(-)

commit f8d5873483b65c9d3d6577b3490d0ed21e7f4a21
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 21 16:43:31 2009 +0100

    Add an abstraction to buffer up changes to an account

 libempathy/Makefile.am		       |   2 +
 libempathy/empathy-account-settings.c | 964
 ++++++++++++++++++++++++++++++++++
 libempathy/empathy-account-settings.h | 156 ++++++
 3 files changed, 1122 insertions(+)

commit 0d4c1f6c049f0f08f7f323b7d8924783e0b1f608
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 21 16:33:26 2009 +0100

    Correct usage of priv

 libempathy/empathy-connection-managers.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit 96445f9768c9dee5e375522aa3bb3a9a01df7280
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 21 16:32:44 2009 +0100

    Put (Haze) behind all protocols coming from haze

 libempathy-gtk/empathy-protocol-chooser.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b53f011fbab2a1efbb2ba229195da8ec8e1fc7dc
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 21 16:27:22 2009 +0100

    Add API to add accounts

 libempathy/empathy-account-manager.c | 115
 +++++++++++++++++++++++++++++------
 libempathy/empathy-account-manager.h |  14 +++--
 2 files changed, 106 insertions(+), 23 deletions(-)

commit 6fa59ef0e20828af6404821b198468ae3a9ef158
Author: Frédéric Péters <fpeters@0d.be>
Date:	Mon Jul 20 19:13:37 2009 +0200

    migrate configuration files to XDG config directory

 src/empathy.c | 63
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

commit e1fa17399fc137a508f195aa6976b5f32189de96
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Jun 17 10:01:52 2009 +0200

    Put configuration data in XDG_CONFIG_DIRS (GNOME bug 494007)

 libempathy-gtk/empathy-account-widget-irc.c | 2 +-
 libempathy-gtk/empathy-geometry.c	     | 2 +-
 libempathy/empathy-chatroom-manager.c	     | 2 +-
 libempathy/empathy-contact-groups.c	     | 4 ++--
 libempathy/empathy-status-presets.c	     | 4 ++--
 src/empathy-main-window.c		     | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

commit 4bdda84105d2e83a551b6c1caa919df221fc2244
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jul 21 16:25:36 2009 +0100

    reformat macros a bit

 libempathy/empathy-account-manager.h | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

commit 6af3cdc16ef3e4a35524b4e076e9c8c99469814c
Author: drtvasudevan <agnihot3@gmail.com>
Date:	Tue Jul 21 20:26:11 2009 +0530

    Updated Tamil translation

 po/ta.po | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

commit 31ad856080bddfd38d997549382f4218bd7a661d
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Mon Jul 20 20:16:59 2009 +0200

    Updated Spanish translation

 po/es.po | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

commit 719ae62b7c7a33e8338470b386386c7fd807b560
Author: Arnaud Maillet <arnaud.maillet@collabora.co.uk>
Date:	Mon Jul 20 16:06:57 2009 +0200

    Add EMPATHY_DEBUG_SHARE_DESKTOP in libempathy/empathy-debug.h

 libempathy/empathy-debug.h | 1 +
 1 file changed, 1 insertion(+)

commit 16f43e0a4d7bd7597694bca7f9f48ef2a20da5a5
Author: Arnaud Maillet <arnaud.maillet@collabora.co.uk>
Date:	Mon Jul 20 16:41:15 2009 +0200

    Instantiate ShareMyDesktop feature in the contact menu of Empathy

 libempathy-gtk/empathy-contact-menu.c | 31
 +++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-contact-menu.h |  1 +
 2 files changed, 32 insertions(+)

commit 4c748f51e9ce75c711ec15ef54a473b735d32e89
Author: Arnaud Maillet <arnaud.maillet@collabora.co.uk>
Date:	Fri Jul 17 20:48:07 2009 +0200

    Add the new files in Makefile.am

 libempathy-gtk/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

commit 2e50e3145e5bbd85366da1c97d94c785bc8c7ef4
Author: Arnaud Maillet <arnaud.maillet@collabora.co.uk>
Date:	Fri Jul 17 20:46:12 2009 +0200

    Add ShareMyDesktop files

 libempathy-gtk/empathy-share-my-desktop.c | 245
 ++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-share-my-desktop.h |  28 ++++
 2 files changed, 273 insertions(+)

commit cd822950695cd4d0589559924703badf9d4771df
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Jul 20 11:30:54 2009 +0100

    Add singleton to cache TpConnectionManagers

 libempathy/Makefile.am			  |   2 +
 libempathy/empathy-connection-managers.c | 296
 +++++++++++++++++++++++++++++++
 libempathy/empathy-connection-managers.h |  75 ++++++++
 3 files changed, 373 insertions(+)

commit e4c629b216459740a76cb51b329be445c6a86a3e
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Jul 19 14:45:31 2009 +0100

    remove dead code

 libempathy/empathy-account.c | 58
 --------------------------------------------
 1 file changed, 58 deletions(-)

commit cfa3ead3f5ee00789c784edfef0379f2bf82bfd8
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Jul 18 14:06:27 2009 +0200

    Updated Spanish translation

 po/es.po | 271
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 143 insertions(+), 128 deletions(-)

commit 63dee7284d16ab5ed587d6e7a402e53236a97833
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Sat Jul 18 13:44:52 2009 +0200

    Updated Spanish translation

 po/es.po | 286
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 148 insertions(+), 138 deletions(-)

commit 2e1d3db14849dbd52fc3dfdaa9a0861f4926d531
Author: drtvasudevan <agnihot3@gmail.com>
Date:	Sat Jul 18 13:48:51 2009 +0530

    Updated Tamil translation

 po/ta.po | 477
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 251 insertions(+), 226 deletions(-)

commit 98655aa5cae4870b377cf21b9b442fb08c4d003d
Author: Matthias Clasen <mclasen@redhat.com>
Date:	Sat Jul 18 01:39:02 2009 -0400

    Respect the button-images setting

    Streamline the construction of some buttons, with the nice side-effect
    that they now obey the button-images setting. See bug 588810.

 libempathy-gtk/empathy-new-message-dialog.ui | 84
 +++++-----------------------
 src/empathy-accounts-dialog.ui		      | 43 +++-----------
 src/empathy-new-chatroom-dialog.ui	      | 43 +++-----------
 3 files changed, 28 insertions(+), 142 deletions(-)

commit 96bfc42462ed8e297b010a57e1be8bfc6986a180
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:	Sat Jul 18 08:20:52 2009 +0300

    Updated Arabic translation

 po/ar.po | 2265
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1441 insertions(+), 824 deletions(-)

commit 9a3e0650a445d9eff8006a577558503944292938
Author: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Date:	Fri Jul 17 17:07:38 2009 +0100

    Only consider what's clicked a link when priv->hovered_uri is non-NULL
    (Fixes: #588886)

 libempathy-gtk/empathy-theme-adium.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

commit 6e60fdb3583e4072961a72148fe396885d037dcb
Author: Nicolò Chieffo <nicolo.chieffo@gmail.com>
Date:	Fri Jul 17 17:58:08 2009 +0200

    Validate parameters to fixup_url() and empathy_url_show()

    Using g_return{_val,}_if_fail(). Extra validation added by Davyd
    Madeley.

 libempathy-gtk/empathy-ui-utils.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 1246403f33f502ad3959f56d5ec1c2674b1b4ac8
Author: Daniel Nylander <po@danielnylander.se>
Date:	Fri Jul 17 11:01:32 2009 +0200

    Updated Swedish translation

 po/sv.po | 467
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 242 insertions(+), 225 deletions(-)

commit 21127f20e2fe1254757e6bd5ee63ad71689fc4c6
Author: Nicolò Chieffo <84yelo3@gmail.com>
Date:	Thu Jul 16 18:00:29 2009 +0100

    Escape window names before saving them in geometry.ini

    Fixes #586967

 libempathy-gtk/empathy-geometry.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

commit 19cc09b10307b7d5a03a48cd455c958a7419750f
Merge: 133a7e7 9ba6430
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jul 16 16:30:10 2009 +0100

    Merge commit 'bigon/mc_free'

commit 133a7e7512781f4b1ad84ac97918547894b68f81
Author: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Date:	Wed Jul 1 10:07:24 2009 -0300

    Make WebKit web inspector available, when using Adium themes.

 data/empathy.schemas.in	      |  14 ++++
 libempathy-gtk/empathy-theme-adium.c | 125
 +++++++++++++++++++++++++++++++++--
 2 files changed, 135 insertions(+), 4 deletions(-)

commit 9ba64303ca4bd6f4cbdf268713c0af02a98b1afb
Author: Laurent Bigonville <bigon@bigon.be>
Date:	Thu Jul 16 17:10:11 2009 +0200

    Free params glist with mc_protocol_free_params_list instead of
    g_slist_free

 libempathy-gtk/empathy-account-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e8f72606c7fc3ff48916c27a3e8d776618fe6f93
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Jul 16 15:39:25 2009 +0100

    Escape unique names by replacing / by %

 libempathy/empathy-log-store-empathy.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

commit 9309c89a6ce064223dc2879d5b61baf69472a334
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Jul 16 15:38:46 2009 +0100

    Ignore a log when the account it isn't found

 libempathy/empathy-log-store-empathy.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit e700d8f398b27a98ef24476e3909570aa91c329a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Jul 16 14:54:45 2009 +0100

    Put the logs in XDG_DATA_HOME instead of ~/.gnome2

 libempathy/empathy-log-store-empathy.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit f8043f3f6ebdd8acee896f0b50f78f62b35d0fdf
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Jul 16 14:53:18 2009 +0100

    Default to OFFLINE instead of UNSET for the global presence

 libempathy/empathy-account-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 758bc33318e81709f4a64ea99c0629e9c522258a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Jul 16 12:41:26 2009 +0100

    Escape the unique account name

 libempathy/empathy-log-store-empathy.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 1c95c220ca3830e83ed436d840528126e9ba9d15
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu Jul 16 11:41:15 2009 +0100

    Move the responsibility of popping up the empathy accounts dialog
    out of the status icon

 src/empathy-status-icon.c | 17 -----------------
 src/empathy.c		   | 21 ++++++++++++++++++---
 2 files changed, 18 insertions(+), 20 deletions(-)

commit 7cded0b0190dac119d3e7bb6882b2a2a93293db8
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 15 18:19:31 2009 +0100

    Add a concept of ready to the account manager

 libempathy/empathy-account-manager.c | 74
 +++++++++++++++++++++++++++++++++++-
 libempathy/empathy-account-manager.h |  2 +
 2 files changed, 74 insertions(+), 2 deletions(-)

commit 17b571acbdbe5219c9b7c468006dda616cb7bb0a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 15 18:18:27 2009 +0100

    Check the right variable for setting the ready property

 libempathy/empathy-account.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3546af6b2b14fa640c1a86e6a975eef6fcb37a00
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 15 15:24:48 2009 +0100

    Remove last references to mission-control 4

 configure.ac				 |  9 +---
 libempathy/empathy-call-handler.c	 |  1 +
 libempathy/empathy-chatroom-manager.c	 |  2 +
 libempathy/empathy-dispatcher.c	 |  4 +-
 libempathy/empathy-ft-handler.c	 |  1 +
 libempathy/empathy-idle.c		 |  4 --
 libempathy/empathy-log-manager.c	 |  1 +
 libempathy/empathy-tp-chat.c		 |  1 +
 libempathy/empathy-tp-contact-factory.c |  2 +
 libempathy/empathy-tp-contact-list.c	 |  1 +
 libempathy/empathy-tp-file.c		 |  1 +
 libempathy/empathy-tp-roomlist.c	 |  1 +
 libempathy/empathy-utils.c		 | 15 -------
 libempathy/empathy-utils.h		 |  3 --
 src/empathy-accounts-dialog.c		 |  3 --
 src/empathy-debug-dialog.c		 |  4 --
 src/empathy-event-manager.c		 |  1 +
 src/empathy-main-window.c		 |  3 --
 src/empathy-tube-dispatch.c		 |  1 +
 src/empathy.c				 | 76
 +--------------------------------
 20 files changed, 18 insertions(+), 116 deletions(-)

commit ec439e852438565122a2d5a5dc322db8567d6c7d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 15 15:24:16 2009 +0100

    Remove profiles, they're not used anymore

 data/Makefile.am	| 21 ---------------------
 data/aim.profile	| 10 ----------
 data/ekiga.profile	| 14 --------------
 data/fwd.profile	| 15 ---------------
 data/gadugadu.profile	| 11 -----------
 data/groupwise.profile | 11 -----------
 data/gtalk.profile	| 16 ----------------
 data/icq.profile	| 11 -----------
 data/irc.profile	|  9 ---------
 data/jabber.profile	| 12 ------------
 data/msn-haze.profile	| 13 -------------
 data/msn.profile	| 13 -------------
 data/qq.profile	| 11 -----------
 data/salut.profile	|  9 ---------
 data/sametime.profile	| 11 -----------
 data/sipphone.profile	| 16 ----------------
 data/sofiasip.profile	| 10 ----------
 data/yahoo.profile	| 11 -----------
 18 files changed, 224 deletions(-)

commit 5dc89d6d5a3f5e47ea7b65fdfdbd84ff178625c5
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 15 15:14:17 2009 +0100

    Temporarily disable account importing as it still depends on profiles

 src/Makefile.am	       |  2 --
 src/empathy-accounts-dialog.c | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

commit 565bab5296d9114543318ff453c6c2a878da417e
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 15 15:00:26 2009 +0100

    Use default status identifiers when setting the presence

 libempathy/empathy-idle.c | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

commit 7c4c3fb9a2de1711a7a76abc48d6ac540b70d4d0
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 15 14:58:26 2009 +0100

    Get the presence from the AccountManager instead of MC4

 libempathy/empathy-idle.c | 59
 ++++++-----------------------------------------
 1 file changed, 7 insertions(+), 52 deletions(-)

commit aafc27b739884d4c9e5fe0d9cabee52445eaa4ba
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 15 14:53:29 2009 +0100

    Keep track of ``global'' presence of all accounts

 libempathy/empathy-account-manager.c | 304
 ++++++++++++-----------------------
 libempathy/empathy-account-manager.h |   5 +
 libempathy/empathy-account.c	      |  69 ++++++--
 libempathy/empathy-account.h	      |   1 -
 4 files changed, 163 insertions(+), 216 deletions(-)

commit c004e520157141ca939e32ac5ef18390304e1d9e
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 15 14:44:10 2009 +0100

    Remove dead code

 libempathy/empathy-account-manager.c | 118
 +----------------------------------
 libempathy/empathy-account-manager.h |   3 -
 2 files changed, 2 insertions(+), 119 deletions(-)

commit 41ad88801dbd0efbfe82bd5c5ba3cb595c9151ab
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Jul 10 16:07:10 2009 +0100

    Implement HandledChannels D-Bus property

 libempathy/empathy-dispatcher.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

commit 2e6c79d649630038440d47da78fc6905aea4d36c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jul 10 13:33:52 2009 +0100

    empathy-account-manager.c: remove obsolte empathy-account-priv.h
    include

 libempathy/empathy-account-manager.c | 1 -
 1 file changed, 1 deletion(-)

commit aedb2729fa86eafc2891bc522cad68285d41b8a5
Merge: 2a6048e 9fe1942
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Wed Jul 15 16:45:12 2009 +0100

    Merge commit 'jtellier/video-call-button-sensitivity'

commit 2a6048e015b83b22eb2c771412b2e4770c4ada01
Author: Abner Silva <abner.silva@collabora.co.uk>
Date:	Mon Jul 13 18:41:09 2009 -0300

    Chat window's tab label changes the font color when got an incoming
    msg. (Fixes #588498)

 src/empathy-chat-window.c | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

commit 3db15a0c3a67d8f5c03ac88468b107dbabb7c8ef
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 15 13:32:10 2009 +0100

    start dev of 2.27.5

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ae0aef1928e4cac049f0a9165ee3ebd5489f588f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 15 11:47:30 2009 +0100

    upgrade NEWS for 2.27.4

 NEWS | 66
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

commit 0343c43f77ab5e59c614af0c0fa60d518d78a774
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Wed Jul 15 12:38:55 2009 +0100

    Revert "Remove deprecated call to g_mapped_file_free()"

    This commit breaks older GLib. When we're ready to bump our
    requirement to
    GLib 2.22, simply revert this commit.

    This reverts commit 0ade362fb9343ec984c396a202565c4e5faa1f12 but
    with an
    extra comment to explain what the hell is going on.

 libempathy/empathy-log-store-empathy.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 8dd36644a68e297429a8a8a486df467a0d5d755c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 15 11:40:09 2009 +0100

    Bump sonames for libempathy and libempathy-gtk

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit a55d556e43624ced7d3c55863078669cfeebde84
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Wed Jul 15 10:58:17 2009 +0100

    Small style fixes

 libempathy-gtk/empathy-contact-dialogs.h | 3 ---
 libempathy/empathy-tp-contact-list.c	  | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

commit ce74b001af76af82c3bc448784ce7826b99d378f
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Tue Jul 14 11:47:47 2009 +0100

    Check CAN_ADD before returning an Add Contact... menu item

 libempathy-gtk/empathy-contact-menu.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit 81f7d9001ac4da0f72b81d1c3d4861a011e62a1d
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Tue Jul 14 11:45:46 2009 +0100

    Handle the case where priv->list is not an EmpathyContactManager

 libempathy-gtk/empathy-contact-list-store.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 0ce1b4664b5706744f7d295f34b726fb61fd636a
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Tue Jul 14 10:30:15 2009 +0100

    Small coding style fix

 libempathy-gtk/empathy-contact-menu.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 0ade362fb9343ec984c396a202565c4e5faa1f12
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Tue Jul 14 10:11:03 2009 +0100

    Remove deprecated call to g_mapped_file_free()

    Change to g_mapped_file_unref()

 libempathy/empathy-log-store-empathy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 234ee3923f26d46219410a4561a0516b7efaf3b3
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Wed Feb 25 13:55:56 2009 +0900

    have EmpathyContactWidget set the account on the account chooser

 libempathy-gtk/empathy-contact-menu.c	 | 1 -
 libempathy-gtk/empathy-contact-widget.c | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

commit fa028af2e446e6246b43c887f42099d60ad6c219
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Wed Feb 25 13:47:15 2009 +0900

    Don't override empathy_account_chooser_set_account when setting
    filtering

 libempathy-gtk/empathy-account-chooser.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

commit 8571c54004e9cf8d2729a03d712210ab0ba0cd3b
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Tue Feb 24 17:55:33 2009 +0900

    Set parent for new contact dialog

 libempathy-gtk/empathy-contact-menu.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit 4e13ee5ecdbeb71559b76ee2080c9e58385c3ad8
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Tue Feb 24 14:56:26 2009 +0900

    Hook up the callback to throw up the standard Add Contact dialog

 libempathy-gtk/empathy-contact-dialogs.c |  9 ++++++++-
 libempathy-gtk/empathy-contact-dialogs.h |  7 ++++++-
 libempathy-gtk/empathy-contact-menu.c	  | 17 ++++++++++++++---
 3 files changed, 28 insertions(+), 5 deletions(-)

commit fac3f031d33d41237ec86e810ffad81cd63c6ec3
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Tue Feb 24 14:34:26 2009 +0900

    Determine if the contact is not in the Contact List and add a menu
    item as appropriate

 libempathy-gtk/empathy-contact-menu.c | 43
 +++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-contact-menu.h |  1 +
 2 files changed, 44 insertions(+)

commit 76af883334b3ae82e718c65d74484cc327501cde
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Sun Apr 26 11:01:00 2009 +0800

    Implement CAN_GROUP by looking at RequestableChannelClasses

 libempathy/empathy-tp-contact-list.c | 54
 +++++++++++++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

commit 015e7e34ba24114d48352f4f5b0dc1a3073625fe
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Sun Apr 26 10:33:32 2009 +0800

    Only enable the 'Edit' menu option when the CAN_ALIAS or CAN_GROUP
    are set

 libempathy-gtk/empathy-contact-list-view.c |  1 -
 libempathy-gtk/empathy-contact-menu.c	    | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

commit 24f3f86b2bd9c42a9ea9f498980f0d255e35bb32
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Sat Apr 25 09:39:55 2009 +0800

    Add empathy_contact_manager_initialized()

 libempathy/empathy-contact-manager.c | 17 +++++++++++++++++
 libempathy/empathy-contact-manager.h |  1 +
 2 files changed, 18 insertions(+)

commit 4afeb994e1fb9bdef315d0eaa24c3821536e30c1
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Fri Apr 24 15:16:46 2009 +0800

    call GetAliasFlags() to determine if an alias can be set on a
    ContactList

    Pending FIXMEs:
     - need to lookup RequestableChannelClasses to see if Groups can be
       requested on this connection
     - need to work out the best way to pass ContactListFlags to
       empathy_contact_menu_new()

 libempathy-gtk/empathy-contact-list-view.c |  1 +
 libempathy/empathy-contact-list.h	    |  2 ++
 libempathy/empathy-tp-contact-list.c	    | 37
 +++++++++++++++++++++++++++++-
 3 files changed, 39 insertions(+), 1 deletion(-)

commit 8b3f04ee2d55d07d298c0183c355e9e41e868c2a
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Wed Apr 22 14:26:49 2009 +0800

    Look up flags to determine whether or not to display the 'Remove' item

 libempathy-gtk/empathy-contact-list-view.c | 54
 +++++++++++++++++++++---------
 libempathy-gtk/empathy-contact-list-view.h |  1 +
 2 files changed, 40 insertions(+), 15 deletions(-)

commit 5b001b1130224ac3400dc8f3432cedf43eaf5d0c
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Fri Apr 24 14:47:31 2009 +0800

    Add a FLAGS column to EmpathyContactListStore

 libempathy-gtk/empathy-contact-list-store.c | 40
 +++++++++++++++++++----------
 libempathy-gtk/empathy-contact-list-store.h |	1 +
 2 files changed, 28 insertions(+), 13 deletions(-)

commit 98d43b78d70e1a2ff6a0b931ad1b8e11790daff0
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Fri Apr 24 14:36:23 2009 +0800

    Convert empathy_contact_manager_can_add() to
    empathy_contact_manager_get_flags_for_connection()

 libempathy-gtk/empathy-contact-dialogs.c | 2 +-
 libempathy/empathy-contact-manager.c	  | 9 +++++----
 libempathy/empathy-contact-manager.h	  | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

commit 0c0c427ea240b0615cc08658fc318516d4259d3e
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Fri Apr 24 14:26:19 2009 +0800

    Remove redundant empathy_tp_contact_list_can_add()

 libempathy/empathy-contact-manager.c |  9 ++++++---
 libempathy/empathy-tp-contact-list.c | 17 -----------------
 2 files changed, 6 insertions(+), 20 deletions(-)

commit 736807e3c658aee559cb3d41413e775023d29c51
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Fri Apr 24 14:25:27 2009 +0800

    Expose channel group flags via EmpathyContactList iface

 libempathy/empathy-contact-list.c    | 11 +++++++++++
 libempathy/empathy-contact-list.h    | 10 ++++++++++
 libempathy/empathy-tp-contact-list.c | 25 +++++++++++++++++++++++++
 3 files changed, 46 insertions(+)

commit b39c5448563fe1313203884c9da04471817a999e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jul 15 11:05:06 2009 +0100

    add empathy-theme-adium.c to POTFILES.in

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit 6f218a6bf13f09a0995fa2c704fadca392798f7c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 13 17:51:25 2009 +0100

    empathy.doap: add bug-database element (#587958). Thanks to Florian
    Ludwig.

 empathy.doap | 1 +
 1 file changed, 1 insertion(+)

commit 0e863df2164f231255175745e092c803c56ade2a
Merge: 69a72d6 c157ac3
Author: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Date:	Tue Jul 14 10:30:05 2009 +0100

    Merge branch 'fix-585882'

commit 69a72d65e8c5341230965098b38dea4c632efca7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 13 18:05:07 2009 +0100

    empathy-message.c: remove a trailing space

 libempathy/empathy-message.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ad1cc3ce5f2e21766e7cd0f05669e3510048eacb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 13 18:04:56 2009 +0100

    empathy-main-window.c: remove a trailing space

 src/empathy-main-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ecdfee8677647e73662dd86e512c9c36772a282f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jul 13 18:04:37 2009 +0100

    empathy-theme-adium.c: remove trailing spaces

 libempathy-gtk/empathy-theme-adium.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

commit 972532d4223b01ae12fcae945620615fbc9f5ccd
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Fri Jul 10 12:55:43 2009 -0400

    Minor changes

 src/empathy-main-window.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 3a3e74fe6ca8e99e11d54a1c43ec87cc2e6b02c4
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Fri Jul 10 11:48:39 2009 -0400

    Remove old code

 src/empathy-preferences.c | 69
 -----------------------------------------------
 1 file changed, 69 deletions(-)

commit 2a5d562c839106c2edacd58cbdc003e0aead635b
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Fri Jul 10 11:28:54 2009 -0400

    Regrouped similar functions, uses enum instead of define

 src/empathy-main-window.c | 118
 +++++++++++++++++++++-------------------------
 1 file changed, 55 insertions(+), 63 deletions(-)

commit c74b8f99f8b3c706d18cc280c35748d8e5282660
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Mon Jun 29 22:37:23 2009 -0400

    Changed menu label and various review fixes

 src/empathy-main-window.c  | 34 ++++++++++++++++------------------
 src/empathy-main-window.ui | 18 +++++++++---------
 2 files changed, 25 insertions(+), 27 deletions(-)

commit 40869ce43c263c1e20f79ec342415fea749cc9a7
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Fri Jun 19 15:22:19 2009 -0400

    Added notification for confs Show avatar, Compact Size and Sort
    criterium
    Now checks for wrong string in Sort criterium

 src/empathy-main-window.c | 124
 ++++++++++++++++++++++++++++------------------
 1 file changed, 77 insertions(+), 47 deletions(-)

commit 4fa12b80765dcb6059017a43e1c419f6bf2c9b3f
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Fri Jun 19 16:11:14 2009 -0400

    Move Compact List and Sort Contacts from Preferences to View menu

 src/empathy-main-window.c  | 155
 ++++++++++++++++++---------------------------
 src/empathy-preferences.c  | 133 +++++++++++++++++++++-----------------
 src/empathy-preferences.ui |  94 ---------------------------
 3 files changed, 135 insertions(+), 247 deletions(-)

commit 29cbf3a2b4c6c2a73b04d4e369a4ffc35a5dcfb2
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Wed Jun 10 21:43:19 2009 -0400

    Work in progress : move preferences to View menu
    Moving Sort by name / by status and Show Avatars / Compact contact
    list preferences to View menu : Sort by name / Sort by status and
    Normal Size / Normal Without Icons / Compact Size

 src/empathy-main-window.c  | 145
 +++++++++++++++++++++++++++++++++++----------
 src/empathy-main-window.ui |  57 ++++++++++++++++++
 2 files changed, 172 insertions(+), 30 deletions(-)

commit 589c90fbf211b4d9c43bec975462d4075ed6dd3d
Merge: 7deb4ea 43b22a3
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Fri Jul 10 15:51:21 2009 +0100

    Merge branch 'label-align'

commit 7deb4ea20b08eab10473f2620c90f6b896d5af10
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Sat Jun 20 17:27:06 2009 +0100

    Use accessor functions instead direct access (Fixes #586476)

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy-gtk/empathy-avatar-chooser.c	 | 10 +++----
 libempathy-gtk/empathy-avatar-image.c		 |  2 +-
 libempathy-gtk/empathy-cell-renderer-expander.c | 38
 ++++++++++++++++++-------
 libempathy-gtk/empathy-chat-text-view.c	 |  6 ++--
 libempathy-gtk/empathy-chat.c			 | 31 ++++++++++++--------
 libempathy-gtk/empathy-contact-dialogs.c	 |  8 +++---
 libempathy-gtk/empathy-contact-list-view.c	 |  4 +--
 libempathy-gtk/empathy-status-preset-dialog.c	 |  4 +--
 libempathy-gtk/empathy-ui-utils.c		 |  4 +--
 libempathy-gtk/empathy-video-widget.c		 |  6 ++--
 megaphone/src/megaphone-applet.c		 |  2 +-
 src/empathy-call-window-fullscreen.c		 |  6 ++--
 src/empathy-chat-window.c			 |  6 ++--
 src/empathy-debug-dialog.c			 |  4 +--
 src/empathy-sidebar.c				 |  2 +-
 src/empathy.c					 |  2 +-
 src/ephy-spinner.c				 |  4 +--
 17 files changed, 83 insertions(+), 56 deletions(-)

commit db59070855af10bc2ac8ac7355f80a27f6f91d3d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Jul 10 11:51:39 2009 +0100

    Implement a first minimal version of a Client.Handler

 libempathy/empathy-dispatcher.c | 290
 ++++++++++++++++++++++++----------------
 libempathy/empathy-dispatcher.h |   2 +
 2 files changed, 176 insertions(+), 116 deletions(-)

commit fb43069972c8eccefcf1beb28251d1ed23c4a20c
Author: Ken VanDine <kvandine@gnome.org>
Date:	Fri Jul 10 10:09:23 2009 +0100

    Fixed a copy/paste bug in configure.ac

    This fixes bug #588021.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ee5227403193fe7b5dae7d5c15e33d8a9c385c3f
Author: Nicolò Chieffo <84yelo3@gmail.com>
Date:	Wed Jul 8 16:39:17 2009 +0100

    Support for history message in Adium themes. Use context HTMLs.

 libempathy-gtk/empathy-theme-adium.c	| 131
 +++++++++++++++++++++++++++------
 libempathy/empathy-log-store-empathy.c |   1 +
 libempathy/empathy-message.c		|  36 +++++++++
 libempathy/empathy-message.h		|   3 +
 4 files changed, 150 insertions(+), 21 deletions(-)

commit aff75bcc97abac0173dfd4cc6f9a959fbd493ae6
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Jul 8 16:36:57 2009 +0100

    Use atomic operations to manage EmpathyAdiumData refcount

 libempathy-gtk/empathy-theme-adium.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 8022c4d5692acc7406f3fa3cb8cacb443c2b96d4
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 8 16:19:48 2009 +0100

    Use the account manager to set the presence

 libempathy/empathy-idle.c | 35 +++++++++++------------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

commit 5182ada04ef43baabccfcc46b1ff0ea754f572b0
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 8 16:19:18 2009 +0100

    Add a utility to set the presence on all requested accounts

 libempathy/empathy-account-manager.c | 29 ++++++++++++++++++++++++++++-
 libempathy/empathy-account-manager.h |  6 ++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

commit 6389342273e991e9b4c17d15fe82b709801a6983
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 8 16:18:56 2009 +0100

    Add api to set the requested presence

 libempathy/empathy-account.c | 43
 +++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-account.h |  4 ++++
 2 files changed, 47 insertions(+)

commit 96fad6a1159582a3e8792dd3308ce1fbeb178234
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 8 11:35:43 2009 +0100

    Initial port of Account and AccountManager to MC5

 libempathy-gtk/empathy-account-widget-irc.c |	13 +-
 libempathy-gtk/empathy-account-widget.c     |	 9 +-
 libempathy/Makefile.am			     |	 1 -
 libempathy/empathy-account-manager.c	     | 185 ++++++++++----
 libempathy/empathy-account-priv.h	     |	44 ----
 libempathy/empathy-account.c		     | 368
 +++++++++++++++++++++++-----
 libempathy/empathy-account.h		     |	 6 +-
 src/empathy-accounts-dialog.c		     |	 3 +-
 8 files changed, 457 insertions(+), 172 deletions(-)

commit e98ae9bde97e290c0f54593af1cb30905bb9055e
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 8 11:35:02 2009 +0100

    Add an GType of ao

 libempathy/empathy-utils.c | 10 ++++++++++
 libempathy/empathy-utils.h |  3 +++
 2 files changed, 13 insertions(+)

commit d19d09875e8cf3d77bc464c07d2bb70354b9ae50
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jul 7 14:01:31 2009 +0100

    can_add_contact_to_account: early return if connection is NULL
    (#587817)

 libempathy-gtk/empathy-contact-dialogs.c | 2 ++
 1 file changed, 2 insertions(+)

commit 3b848301b06feddc82cbf667876ae502b95bbe6e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Sun Jul 5 16:29:09 2009 +0100

    empathy_contact_manager_can_add: raise an error if connection is NULL

 libempathy/empathy-contact-manager.c | 1 +
 1 file changed, 1 insertion(+)

commit a2315ff447331af909d5bef8d2e26c7e56fd9184
Author: Daniel Nylander <po@danielnylander.se>
Date:	Tue Jul 7 15:39:09 2009 +0200

    Updated Swedish translation

 po/sv.po | 2815
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 1344 insertions(+), 1471 deletions(-)

commit 43b22a36646ac97e2c1f599369156d3aa56eac6c
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Tue Jul 7 11:09:05 2009 +0100

    Make EmpathyContactWidget use EmpathyKludgeLabel

 libempathy-gtk/Makefile.am		  |  2 ++
 libempathy-gtk/empathy-contact-widget.c  |  8 +++++++-
 libempathy-gtk/empathy-contact-widget.ui | 12 +-----------
 3 files changed, 10 insertions(+), 12 deletions(-)

commit 700a8e8096468491466c0e2c70fab525d66016dd
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Tue Jul 7 11:05:04 2009 +0100

    EmpathyKludgeLabel is a child of GtkLabel

    EmpathyKludgeLabel sets the PangoLayout width to the width of the
    GtkAllocation.
    It then fudges the allocation in the expose to make the alignment work
    correctly.

 libempathy-gtk/empathy-kludge-label.c | 89
 +++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-kludge-label.h | 53 +++++++++++++++++++++
 2 files changed, 142 insertions(+)

commit 9f496e2f0a5f0baf935b6f3aa26f66386b5df97e
Author: A S Alam <aalam@users.sf.net>
Date:	Tue Jul 7 06:28:52 2009 +0530

    updating translation for Punjabi

 po/pa.po | 1060
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 604 insertions(+), 456 deletions(-)

commit 13f92652db89b2c15c3302b4af7560a4e4ee22c9
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Jul 6 11:56:14 2009 +0100

    Remove useless mission-control includes

 libempathy-gtk/empathy-account-chooser.c    | 2 --
 libempathy-gtk/empathy-account-widget-irc.c | 2 --
 libempathy-gtk/empathy-account-widget-sip.c | 2 --
 libempathy-gtk/empathy-contact-dialogs.c    | 2 --
 libempathy-gtk/empathy-irc-network-dialog.c | 2 --
 libempathy-gtk/empathy-new-message-dialog.c | 2 --
 libempathy-gtk/empathy-theme-adium.c	     | 1 -
 libempathy-gtk/empathy-ui-utils.c	     | 2 --
 libempathy-gtk/empathy-ui-utils.h	     | 2 --
 libempathy/empathy-dispatcher.c	     | 2 --
 libempathy/empathy-idle.h		     | 2 +-
 libempathy/empathy-log-manager.h	     | 2 --
 megaphone/src/megaphone-applet.c	     | 2 --
 nothere/src/nothere-applet.c		     | 1 -
 src/empathy-chat-window.c		     | 1 -
 src/empathy-main-window.c		     | 2 --
 src/empathy-new-chatroom-dialog.c	     | 3 ---
 src/empathy.c				     | 1 -
 18 files changed, 1 insertion(+), 32 deletions(-)

commit e4c5612c5e28f5c1afcf212602da3c531fe28909
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Jul 6 11:31:00 2009 +0100

    Update python bindings

 python/pyempathy/pyempathy.defs	   | 11 ++++
 python/pyempathygtk/pyempathygtk.defs	   | 86
 +++++++------------------------
 python/pyempathygtk/pyempathygtk.override |  2 +-
 python/update-binding.sh		   |  2 +-
 4 files changed, 31 insertions(+), 70 deletions(-)

commit 0ddbfabe32f0d02a63a21fca5bfb015f4e56bf97
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Jul 6 11:29:55 2009 +0100

    Transform profile chooser into a protocol chooser

 libempathy-gtk/Makefile.am		   |   4 +-
 libempathy-gtk/empathy-profile-chooser.c  | 324
 ----------------------------
 libempathy-gtk/empathy-profile-chooser.h  |  69 ------
 libempathy-gtk/empathy-protocol-chooser.c | 339
 ++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-protocol-chooser.h |  70 ++++++
 src/empathy-accounts-dialog.c		   |  81 ++++---
 src/empathy-accounts-dialog.ui		   |   2 +-
 tests/Makefile.am			   |   4 +-
 tests/test-empathy-profile-chooser.c	   |  31 ---
 tests/test-empathy-protocol-chooser.c	   |  31 +++
 10 files changed, 484 insertions(+), 471 deletions(-)

commit afc9f191f25ac192f89fc1cd1ea4a93ab8356332
Author: Claude Paroz <claude@2xlibre.net>
Date:	Mon Jul 6 12:06:33 2009 +0200

    Updated French translation

 po/fr.po | 2119
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 1335 insertions(+), 784 deletions(-)

commit eb9dc0cc2b90d53b87b52e13122f760d291d211e
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Jul 6 10:55:03 2009 +0100

    Rework creating a salut account so it doesn't need profiles

 src/empathy.c | 128
 ++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 85 insertions(+), 43 deletions(-)

commit da5b54cd7fb15a4388d494348b94f96787896155
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Jul 6 10:51:05 2009 +0100

    use newly deprecated API

 src/empathy-import-dialog.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 7445fd6d08294399972dd0c2c808d9aabfc11b20
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Jul 5 16:19:59 2009 +0100

    Add api to create accounts, by cm and proto name

 libempathy/empathy-account-manager.c | 42
 +++++++++++++++++++++++++++++++++++-
 libempathy/empathy-account-manager.h |  8 ++++++-
 tests/check-empathy-helpers.c	      |  3 ++-
 3 files changed, 50 insertions(+), 3 deletions(-)

commit 162dbd9125538c310cbc91cc4bf19458fb79c47f
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Sun Jul 5 17:54:21 2009 +0100

    Don't check for Adium themes if Webkit isn't available

    This was breaking compile with -Werror

 libempathy-gtk/empathy-theme-manager.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 2d517a8bf5f8048a83d753fb0977d4949cbdeb7a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Jul 5 13:08:11 2009 +0100

    Remove usage of McProfiles

 libempathy-gtk/empathy-account-widget.c | 140
 +++++++++++++++++---------------
 libempathy-gtk/empathy-theme-adium.c	 |   5 +-
 src/empathy-accounts-dialog.c		 |  95 +++++++++-------------
 src/empathy-new-chatroom-dialog.c	 |   5 +-
 4 files changed, 117 insertions(+), 128 deletions(-)

commit ddcb104dfa874375ea17cac4de2f273af7327fc4
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Jul 5 10:43:50 2009 +0100

    Get the icon name from the account object directly

 libempathy-gtk/empathy-account-chooser.c |  2 +-
 libempathy-gtk/empathy-log-window.c	  |  2 +-
 libempathy-gtk/empathy-ui-utils.c	  | 10 ----------
 libempathy-gtk/empathy-ui-utils.h	  |  1 -
 libempathy/empathy-account.c		  | 11 +++++++++++
 libempathy/empathy-account.h		  |  1 +
 src/empathy-accounts-dialog.c		  |  2 +-
 7 files changed, 15 insertions(+), 14 deletions(-)

commit 1732b56d4186e1e15275dadf6c8db0305398d36d
Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
Date:	Sun Jul 5 11:38:59 2009 +0200

    Updated Spanish translation

 po/es.po | 469
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 248 insertions(+), 221 deletions(-)

commit 6294f9870191ddc0f8a357907d17ac776ef511ca
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Jul 5 10:31:15 2009 +0100

    Add missing newline

 libempathy-gtk/empathy-ui-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit adef4b7fed1d3555723b7e223781f6caa1a8e015
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sun Jul 5 10:28:04 2009 +0100

    Add API to get the protocol and cm name from a account

 libempathy/empathy-account.c | 55
 ++++++++++++++++++++++++++++++++++++++------
 libempathy/empathy-account.h |  7 +++---
 2 files changed, 51 insertions(+), 11 deletions(-)

commit 79dfad0edbc4a1e32cff19d23b9a28bad68cfed7
Author: drtvasudevan <agnihot3@gmail.com>
Date:	Sat Jul 4 14:43:04 2009 +0530

    Updated Tamil translation

 po/ta.po | 517
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 265 insertions(+), 252 deletions(-)

commit 9bececb9ff8b4678c34238f520a982ed66eb9820
Author: drtvasudevan <agnihot3@gmail.com>
Date:	Fri Jul 3 22:09:25 2009 +0530

    Updated Tamil translation

 po/ta.po | 282
 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 168 insertions(+), 114 deletions(-)

commit baec7d9dc896aa9297c18310c27060f4125e812b
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Fri Jun 26 19:02:07 2009 -0400

    Sort themes by name

 src/empathy-preferences.c | 2 ++
 1 file changed, 2 insertions(+)

commit 9f148e53e8086daff05f7ce9801a405c61182864
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Mon Jun 29 20:07:33 2009 -0400

    List installed adium themes

 libempathy-gtk/empathy-theme-adium.c	|  22 ++++-
 libempathy-gtk/empathy-theme-manager.c |  61 ++++++++++++-
 libempathy-gtk/empathy-theme-manager.h |   1 +
 src/empathy-preferences.c		| 159
 ++++++++++++++-------------------
 src/empathy-preferences.ui		|  44 ---------
 5 files changed, 142 insertions(+), 145 deletions(-)

commit 9fe194288e580fcbd79fcae90050ccb8b6380a63
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Thu Jul 2 12:08:43 2009 -0400

    Added functions to determine if a contact has video capabilities
    Activating the "Video Call" button only if the remote contact support
    video.
    The call window's "Send Video" is only sensitive if the contact has
    video capabilities.

 libempathy-gtk/empathy-contact-menu.c |  4 ++--
 libempathy/empathy-contact.c	       | 24 ++++++++++++++++++++++++
 libempathy/empathy-contact.h	       |  2 ++
 src/empathy-call-window.c	       | 12 +++++++-----
 4 files changed, 35 insertions(+), 7 deletions(-)

commit 5dae9d1185b972651a7c7e8d4431f8dcdd2e0cd3
Merge: 5af5ded f923e5e
Author: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Date:	Thu Jul 2 11:15:13 2009 -0300

    Merge branch 'fix-585601'

commit 5af5dedd2bd5a57f700d3abf7a326d0462494caa
Merge: 0e9e212 fdbb5ae
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Jul 1 23:43:27 2009 +0100

    Merge branch 'part-reasons'

commit f923e5ed0d36621b580061dbaff834ec7e7ee0bc
Author: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Date:	Wed Jul 1 10:08:48 2009 -0300

    Fix Bug 585601: Adium theme is not reloaded on /clear or Ctrl+L or
    clear menu item

    The theme was deciding that new messages should be 'joined' to an
    already existing message bubble, because not enough time had passed,
    even after clearing the chat area. We now clear last_contact to make
    sure this never happens.

 libempathy-gtk/empathy-chat-text-view.c | 4 ++++
 libempathy-gtk/empathy-theme-adium.c	 | 7 +++++++
 2 files changed, 11 insertions(+)

commit 0e9e2124eee55872b7e6209cbcfd626c9e366e40
Author: Manoj Kumar Giri <mgiri@mgiri.csb>
Date:	Wed Jul 1 19:23:23 2009 +0530

    Added Oriya into the List

 po/LINGUAS | 1 +
 1 file changed, 1 insertion(+)

commit b6feb637d1dc4acaaab4dc946d1c787d96c97aab
Author: Manoj Kumar Giri <mgiri@mgiri.csb>
Date:	Wed Jul 1 19:23:00 2009 +0530

    Updated Oriya Translation

 po/or.po | 1970
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 1156 insertions(+), 814 deletions(-)

commit 488710d07959785515e2b44237c0c4fdb9a83424
Author: Manoj Kumar Giri <mgiri@mgiri.csb>
Date:	Wed Jul 1 19:19:30 2009 +0530

    Updated Oriya Translation

 po/or.po | 2148
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 2148 insertions(+)

commit ccdfb6e4e03b3e651c68f4ed3fff61cd9db6a753
Author: Abner Silva <abner.silva@collabora.co.uk>
Date:	Mon Jun 29 19:18:50 2009 -0300

    New chatrooms are no longer marked as favorite by default. Fixes
    bug #575667

 src/empathy-chat-window.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 8caba0f8e3f7d48881572d456ef4f92a4637c272
Author: Abner Silva <abner.silva@collabora.co.uk>
Date:	Mon Jun 29 13:49:52 2009 -0300

    Removing chatroom from the list before emmiting chatroom-removed
    signal.

 libempathy/empathy-chatroom-manager.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 0a41b6b31705626c71047261b91afdac711dead7
Merge: a980a2b 1a74f07
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 1 14:21:29 2009 +0100

    Merge branch 'empathy-account'

commit 1a74f07d19bdbdbf0aa62587343b64f636ec7b20
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 1 14:05:05 2009 +0100

    clarify when notify::connection is signalled

 libempathy/empathy-account.c | 1 +
 1 file changed, 1 insertion(+)

commit 2a56b58b44cb38e394c1e92a59ee65dbc9456f7d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 1 14:03:45 2009 +0100

    fix coding style

 libempathy/empathy-account-manager.c | 1 -
 1 file changed, 1 deletion(-)

commit d5a9f12cc68ec9e63a588e7aac7d49608d49ad19
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 1 14:03:35 2009 +0100

    Clarify that we own the keys/values in the accounts hash

 libempathy/empathy-account-manager.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 16da0cefe5da520704d9914b1bc824c7b5342071
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 1 14:01:20 2009 +0100

    explain the connect_time struct member

 libempathy/empathy-account.c | 1 +
 1 file changed, 1 insertion(+)

commit 6f38a06ea764fc3542be9470fb44406f4268e058
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed Jul 1 13:49:35 2009 +0100

    Fix coding style

 libempathy/empathy-account.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 7b8a38ef119b1bcbf0a82d3f99552fe4bb2c3b9c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Jun 26 14:59:09 2009 +0100

    Update the python bindings

 python/pyempathy/pyempathy.defs       | 137
 ++++++++++++++++++++++++----------
 python/pyempathygtk/pyempathygtk.defs | 101 ++++++++++---------------
 2 files changed, 137 insertions(+), 101 deletions(-)

commit d3693520f43afa28ac328843ea3d01c2b1dac427
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Jun 26 14:58:40 2009 +0100

    Port the tests to EmpathyAccount

 tests/check-empathy-chatroom-manager.c | 45
 ++++++++++++++++++++++------------
 tests/check-empathy-chatroom.c		|  2 +-
 tests/check-empathy-helpers.c		| 25 +++++++++++++------
 tests/check-empathy-helpers.h		|  6 ++---
 tests/check-helpers.h			|  1 -
 5 files changed, 51 insertions(+), 28 deletions(-)

commit f623e96f1e77b32d411150c4040055f11f17da2b
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Jun 26 14:58:02 2009 +0100

    Port megaphone to EmpathyAccount

 megaphone/src/megaphone-applet.c | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

commit dd54eb8205f1cd12267af127dab79297c0edc469
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Jun 26 14:49:13 2009 +0100

    Port the main of empathy to EmpathyAccount

 src/empathy-accounts-dialog.c	   | 125
 +++++++++++++++++++-------------------
 src/empathy-accounts-dialog.h	   |   4 +-
 src/empathy-chat-window.c	   |  26 ++++----
 src/empathy-chat-window.h	   |   4 +-
 src/empathy-chatrooms-window.c    |   4 +-
 src/empathy-event-manager.c	   |  11 +---
 src/empathy-import-dialog.c	   |  24 +++++---
 src/empathy-import-dialog.h	   |   1 +
 src/empathy-import-pidgin.c	   |   1 -
 src/empathy-main-window.c	   |  25 ++++----
 src/empathy-new-chatroom-dialog.c |  16 +++--
 src/empathy-status-icon.c	   |  16 +++--
 src/empathy.c			   |  22 ++++---
 13 files changed, 141 insertions(+), 138 deletions(-)

commit f3d6fcb79762ff484c8b7221cec1079b0dad7fb7
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Jun 26 14:43:26 2009 +0100

    Port libempathy-gtk to EmpathyAccount

 libempathy-gtk/empathy-account-chooser.c    | 71
 +++++++++++++--------------
 libempathy-gtk/empathy-account-chooser.h    | 10 ++--
 libempathy-gtk/empathy-account-widget-irc.c | 39 ++++++++-------
 libempathy-gtk/empathy-account-widget-irc.h |	4 +-
 libempathy-gtk/empathy-account-widget-sip.c |	9 ++--
 libempathy-gtk/empathy-account-widget-sip.h |	4 +-
 libempathy-gtk/empathy-account-widget.c     | 75
 ++++++++++++++---------------
 libempathy-gtk/empathy-account-widget.h     | 22 ++++-----
 libempathy-gtk/empathy-chat-text-view.c     |	2 +-
 libempathy-gtk/empathy-chat.c		     |	8 +--
 libempathy-gtk/empathy-chat.h		     |	2 +-
 libempathy-gtk/empathy-contact-dialogs.c    | 12 +----
 libempathy-gtk/empathy-contact-list-view.c  | 17 +++----
 libempathy-gtk/empathy-contact-widget.c     |	6 +--
 libempathy-gtk/empathy-irc-network-dialog.c |	2 +-
 libempathy-gtk/empathy-log-window.c	     | 45 ++++++++---------
 libempathy-gtk/empathy-log-window.h	     |	4 +-
 libempathy-gtk/empathy-new-message-dialog.c |	2 +-
 libempathy-gtk/empathy-theme-adium.c	     |	4 +-
 libempathy-gtk/empathy-ui-utils.c	     |	4 +-
 libempathy-gtk/empathy-ui-utils.h	     |	4 +-
 21 files changed, 164 insertions(+), 182 deletions(-)

commit 370bb92f2ce8ccd70bd694a6ab4ba78abeb448f9
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Jun 26 14:42:42 2009 +0100

    Port libempathy to EmpathyAccount

 libempathy/empathy-chatroom-manager.c	 | 18 ++++++++---------
 libempathy/empathy-chatroom-manager.h	 | 11 +++++------
 libempathy/empathy-chatroom.c		 | 20 ++++++++-----------
 libempathy/empathy-chatroom.h		 | 11 +++++------
 libempathy/empathy-contact.c		 | 13 ++++++-------
 libempathy/empathy-contact.h		 |  6 +++---
 libempathy/empathy-dispatch-operation.c |  4 +++-
 libempathy/empathy-dispatch-operation.h |  2 ++
 libempathy/empathy-log-manager.c	 | 15 +++++----------
 libempathy/empathy-log-manager.h	 | 12 ++++++------
 libempathy/empathy-log-store-empathy.c  | 34
 ++++++++++++++++++---------------
 libempathy/empathy-log-store.c		 | 12 ++++++------
 libempathy/empathy-log-store.h		 | 26 ++++++++++++-------------
 libempathy/empathy-utils.c		 | 15 +++------------
 libempathy/empathy-utils.h		 |  1 -
 15 files changed, 93 insertions(+), 107 deletions(-)

commit b2691907925acca067dcaa8492619581bcc83480
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Jun 26 14:41:37 2009 +0100

    Port EmpathyTpRoomlist to EmpathyAccount

 libempathy/empathy-tp-roomlist.c | 46
 ++++++++++++++--------------------------
 libempathy/empathy-tp-roomlist.h |  4 ++--
 2 files changed, 18 insertions(+), 32 deletions(-)

commit e0b356e25084d47d8953cc7c15fae4a97f62d047
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri Jun 26 14:17:55 2009 +0100

    Implement EmpathyAccount

    Refactor EmpathyAccountManager and introduce a seperate EmpathyAccount
    object, which wraps McAccount. When moving to MC5, EmpathyAccount
    will wrap the
    Telepathy.Account interface. Fixes #587508

 libempathy/Makefile.am		      |   3 +
 libempathy/empathy-account-manager.c | 579
 ++++++++++++++---------------------
 libempathy/empathy-account-manager.h |  19 +-
 libempathy/empathy-account-priv.h    |  44 +++
 libempathy/empathy-account.c	      | 572
 ++++++++++++++++++++++++++++++++++
 libempathy/empathy-account.h	      |  94 ++++++
 6 files changed, 956 insertions(+), 355 deletions(-)

commit a980a2b3eaa634981b0ebfe950f50b515e43cf4a
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Tue Jun 30 12:35:55 2009 -0400

    Improve geocoding debugging and add more fields

 libempathy/empathy-tp-contact-factory.c | 42
 ++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 8 deletions(-)

commit c157ac3a330abe4831c4c93e52126a054934b9f6
Author: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Date:	Mon Jun 29 17:25:56 2009 -0300

    Fix Bug 585882: Can't easily copy URL's when using Adium themes

    Track the last hovered link, and use it to copy/open addresses using
    the context menu.

 libempathy-gtk/empathy-theme-adium.c | 94
 ++++++++++++++++++++++++++++++++++--
 1 file changed, 90 insertions(+), 4 deletions(-)

commit 66b32d43ebeab870039ca729b24ae64fdeff5088
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jun 30 17:24:05 2009 +0100

    Fallback to OFFLINE when getting an unknown presence from MC

 libempathy/empathy-idle.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9c05486e1f1acf1c71ff0593e6c9d9060e32e152
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jun 30 17:23:31 2009 +0100

    Use NM by default

 libempathy/empathy-idle.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit d57d431db13fa5fdbddc51d71b9f82da00418522
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jun 30 17:21:18 2009 +0100

    Always react when disconnecting from the network

 libempathy/empathy-idle.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 941d757434d220fec709f30ac4847c7240b3d7d3
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Tue Jun 30 15:57:06 2009 +0100

    Optionally use libnm-glib for NetworkManager integration

    Previously Empathy use the NM D-Bus interface directly. Unfortunately
    the d-bus
    calls used were deprecated and somewhat buggy (if NM wasn't running
    on empathy
    startup, it would never detect network changes).

    Given that NetworkManager isn't a blessed gnome dependency the code
    has been
    made optional, but it's expected that every distribution will
    build with
    NetworkManager integration anyway.

    Based on a patch by Tambet Ingo <tambet@novell.com>. Fixes #587446

 configure.ac		   | 29 ++++++++++++++++-
 libempathy/Makefile.am    |  4 ++-
 libempathy/empathy-idle.c | 81
 ++++++++++++++++++++---------------------------
 3 files changed, 65 insertions(+), 49 deletions(-)

commit 6a1b1c8baf4c30fabd76395e6ff81fd3b7cd621d
Author: Abderaouf Bencherait <kenshin@collabora.co.uk>
Date:	Fri Jun 26 19:38:37 2009 -0400

    fixed libnotify crashing if icon doesn't exist

 src/empathy-chat-window.c | 8 ++++++--
 src/empathy-status-icon.c | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

commit bd2d05811e85a43bc960da36483c315f83e4ac31
Author: Žygimantas Beručka <zygis@gnome.org>
Date:	Mon Jun 29 20:11:41 2009 +0300

    Updated Lithuanian translation

 po/lt.po | 2361
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 1317 insertions(+), 1044 deletions(-)

commit 5e30d8dcf1b80b6281df6bd872bb4455f28c1b23
Merge: 8ffe9c1 240b54d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Jun 28 09:58:53 2009 +0200

    Merge commit 'elliot/bug-584703-c'

commit 8ffe9c1d74fa04ed7dfb898a8760469e8df16915
Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
Date:	Sat Jun 27 15:04:10 2009 +0200

    Updated Spanish translation

 po/es.po | 262
 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 139 insertions(+), 123 deletions(-)

commit 160408787937224c2f9b1ed7965c2ad92e3c3255
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jun 26 18:27:21 2009 +0200

    Ring on outgoing call.

 libempathy/empathy-call-handler.c |  3 +-
 src/empathy-call-window.c	   | 78
 +++++++++++++++++++++++++++------------
 2 files changed, 56 insertions(+), 25 deletions(-)

commit 6cd00184145a217f2a295f96a8c43d0f1fbe984d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jun 26 16:34:39 2009 +0200

    Add empathy_sound_* in doc.

 docs/libempathy-gtk/libempathy-gtk-docs.sgml | 1 +
 1 file changed, 1 insertion(+)

commit 147ab96a53207b846da9fb7126ebbefc84fe0b55
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jun 26 16:29:08 2009 +0200

    Include empathy-sound.h to make it build

 src/empathy-chat-window.c |  1 +
 src/empathy-main-window.c | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

commit bef0b0057e4a76924b64c2c3b1d5e2edc237fbe2
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jun 26 16:24:34 2009 +0200

    Port EmpathyEventManager to new empathy-sound API.

 src/empathy-event-manager.c | 97
 ++++++++-------------------------------------
 1 file changed, 16 insertions(+), 81 deletions(-)

commit 53050e14aadcd76d454a5236454e3d44f63f0ddd
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Fri Jun 26 14:05:43 2009 +0200

    Move sound related functions to its own module.

 libempathy-gtk/Makefile.am	   |   2 +
 libempathy-gtk/empathy-sound.c    | 385
 ++++++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-sound.h    |  56 ++++++
 libempathy-gtk/empathy-ui-utils.c | 139 +-------------
 libempathy-gtk/empathy-ui-utils.h |  26 ---
 po/POTFILES.in			   |   1 +
 6 files changed, 445 insertions(+), 164 deletions(-)

commit 240b54dbfe75e1d24a7619cf22e2ffd3acbb6427
Author: Elliot Fairweather <elliot.fairweather@collabora.co.uk>
Date:	Fri Jun 26 14:49:30 2009 +0100

    disconnect from invalidated signal before unreferencing connections

 libempathy/empathy-account-manager.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit ae811044a107035a82cbba64951661494dd33e3a
Author: Elliot Fairweather <elliot.fairweather@collabora.co.uk>
Date:	Fri Jun 26 14:45:22 2009 +0100

    disconnnect from invalidated signal before unreferencing connections

 libempathy/empathy-contact-manager.c | 44
 ++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 20 deletions(-)

commit 46e1b63ca2310b6a3465c271afecc01d2ee72343
Author: Matthias Clasen <mclasen@redhat.com>
Date:	Tue Jun 23 12:16:33 2009 +0200

    Don't hardcode size of the accounts dialog and use ellipsization
    (#520972)

 src/empathy-accounts-dialog.c	| 1 +
 src/empathy-accounts-dialog.ui | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

commit ba43aa5a434eab9e68a73af667b4c4441b50db61
Author: Giedrius Slavinskas <giedrius25@gmail.com>
Date:	Fri Jun 26 11:08:00 2009 +0200

    Use gnome-session instead of gnome-screensaver to know when session
    is idle

 libempathy/empathy-idle.c | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

commit 764e70b98c1b657e87b349c1f220903a78eb4065
Merge: 2f64117 65d0f64
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Thu Jun 25 14:06:26 2009 -0400

    Merge branch 'fix-prefs'

commit 65d0f6456b3a590e32853c400474561e89b19662
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Thu Jun 25 13:48:02 2009 -0400

    Rename label1 to remove dupped id

 src/empathy-preferences.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2f64117b60d24ba5ad3f4bb1c41d4ea3a91f15a6
Merge: aa9603b 807b622
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jun 25 18:52:48 2009 +0100

    Merge branch 'debugger'

commit aa9603b62dd1893eb3fdcd357397ba20c733da43
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 11:25:52 2009 +0100

    check-whitespace.sh: check trailing tabs

 tools/check-whitespace.sh | 6 ++++++
 1 file changed, 6 insertions(+)

commit 49e8e15aebd530dc21ad4c5a41679d2354355e40
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:45:29 2009 +0100

    empathy-theme-manager: remove trailing tabs

 libempathy-gtk/empathy-theme-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7ea5e46363457fe2a677e343ac0beed2c29d6de0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:45:21 2009 +0100

    empathy-theme-irc: remove trailing tabs

 libempathy-gtk/empathy-theme-irc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c7aeca1d4bbc7c9a2f767807d2752156eebb2215
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:45:14 2009 +0100

    empathy-theme-boxes: remove trailing tabs

 libempathy-gtk/empathy-theme-boxes.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 53c33c1edd59042c9fcf5f7f0e9ddfd489c1405a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:45:06 2009 +0100

    empathy-theme-adium: remove trailing tabs

 libempathy-gtk/empathy-theme-adium.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit 79f4cab781ecdae50934146f365de98421c21f1c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:44:59 2009 +0100

    empathy-spell: remove trailing tabs

 libempathy-gtk/empathy-spell.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit faca6e2fb73105a6408ea36d09d2cdcf883892ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:44:52 2009 +0100

    empathy-smiley-manager: remove trailing tabs

 libempathy-gtk/empathy-smiley-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 633f111cb0569220f096d9039b27afdec6df3675
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:44:43 2009 +0100

    empathy-new-message-dialog: remove trailing tabs

 libempathy-gtk/empathy-new-message-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c6f80bd5d78054651c9ed0daab213a64059f4e5f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:44:35 2009 +0100

    empathy-log-window: remove trailing tabs

 libempathy-gtk/empathy-log-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b08b12f0ec3803b355c2a1355ae92fdcb4833e7b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:44:28 2009 +0100

    empathy-contact-menu: remove trailing tabs

 libempathy-gtk/empathy-contact-menu.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 22cdc148e14071f820fe668f92a174aee7a67460
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:44:21 2009 +0100

    empathy-contact-list-view: remove trailing tabs

 libempathy-gtk/empathy-contact-list-view.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 3974ab0014f5146f162945eb9102051826bd109e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:44:09 2009 +0100

    empathy-contact-list-store: remove trailing tabs

 libempathy-gtk/empathy-contact-list-store.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit edaad58496e20b817036e167ce63239da272f5cf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:44:00 2009 +0100

    empathy-contact-dialogs: remove trailing tabs

 libempathy-gtk/empathy-contact-dialogs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2e8c433a836739bcaf62bd50cea4c3992534818e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:43:51 2009 +0100

    empathy-chat: remove trailing tabs

 libempathy-gtk/empathy-chat.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit d462954efb034d07c1c4a274c05d171cd476f276
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:53:52 2009 +0100

    empathy-chat-view: remove trailing tabs

 libempathy-gtk/empathy-chat-view.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

commit 0573829c980d06c47d2ceb88f890389d16b400a0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:43:31 2009 +0100

    empathy-chat-text-view: remove trailing tabs

 libempathy-gtk/empathy-chat-text-view.c | 282
 ++++++++++++++++----------------
 1 file changed, 141 insertions(+), 141 deletions(-)

commit 6d5a2f5a5e8259ba4febe144674a9e68076edb53
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:43:16 2009 +0100

    empathy-avatar-chooser: remove trailing tabs

 libempathy-gtk/empathy-avatar-chooser.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 68df3f2115dcae41400f5b13ec0b87ec4875a8a6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:43:09 2009 +0100

    empathy-account-widget: remove trailing tabs

 libempathy-gtk/empathy-account-widget.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 58781acde5a0e1ca4bc20fe1eb4884fa2c097b74
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:43:01 2009 +0100

    empathy-account-chooser: remove trailing tabs

 libempathy-gtk/empathy-account-chooser.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 66a3fe50151f3fb7498e38b8b3a4f54918244baf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:27:19 2009 +0100

    empathy-utils: remove trailing tabs

 libempathy/empathy-utils.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 3106afc8993db5df27ff41dd715469b66aaf4912
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:27:09 2009 +0100

    empathy-tp-contact-list: remove trailing tabs

 libempathy/empathy-tp-contact-list.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d03e9ce9b20c5b36a326741e3481d5fd73baf238
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:27:01 2009 +0100

    empathy-tp-chat: remove trailing tabs

 libempathy/empathy-tp-chat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 12a1643c10b0d9375ef41cb9493d08c46c5b96ef
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:26:49 2009 +0100

    empathy-time: remove trailing tabs

 libempathy/empathy-time.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0d8a535644f15f2fd7efc878910530f952927b57
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:26:41 2009 +0100

    empathy-idle: remove trailing tabs

 libempathy/empathy-idle.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a29b9902f1f006ba2a0ef83a605d08aceddccc90
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:26:35 2009 +0100

    empathy-contact-manager: remove trailing tabs

 libempathy/empathy-contact-manager.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit ec9c3c21d4fb4396de9d89486c7f5a7620920686
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:26:28 2009 +0100

    empathy-chatroom: remove trailing tabs

 libempathy/empathy-chatroom.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ceffec53f750fe1fe44efb98d7d36eb73fd88f9f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:24:00 2009 +0100

    empathy: remove trailing tabs

 src/empathy.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 81bb64536866022147663230e4d166769bd5e070
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:23:53 2009 +0100

    empathy-status-icon: remove trailing tabs

 src/empathy-status-icon.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ce18f35f5fac38d43115df41c357e3bafe35d361
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:23:45 2009 +0100

    empathy-sidebar: remove trailing tabs

 src/empathy-sidebar.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8816b1b8e8cdacd150aba479729d7884b4613cd2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:23:36 2009 +0100

    empathy-preferences: remove trailing tabs

 src/empathy-preferences.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit e25f7f1a2f082c0dc6294cbeb39ca71c86366f87
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:23:28 2009 +0100

    empathy-new-chatroom-dialog: remove trailing tabs

 src/empathy-new-chatroom-dialog.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 7aa191693d4636b12df13eb1e85366252010e801
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:23:20 2009 +0100

    empathy-chat-window: remove trailing tabs

 src/empathy-chat-window.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 2a99081f8dbccd419e171a26f452a1334fe535d4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 15:23:13 2009 +0100

    empathy-accounts-dialog: remove trailing tabs

 src/empathy-accounts-dialog.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 309a9214ca400ca0f3bfaacd47ed1e0cd7444220
Merge: a7dba74 c36efaa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 17:31:53 2009 +0100

    Merge branch 'check-style'

commit a7dba74096b4d64e24f3e89aff6616b1e872db34
Author: Laurent Bigonville <bigon@bigon.be>
Date:	Thu Jun 18 00:26:06 2009 +0200

    configure.ac: Cleanup PKG_CHECK_MODULES

 configure.ac | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit c36efaa152329d5a22e5925bb3fc7f342965228c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 16:07:33 2009 +0100

    add empathy-map-view files to empathy_handwritten_source so they
    are checked by the coding style script

 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 16b7d0adaecd0ff7f1d24741cd35246f80a72e42
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 24 16:07:52 2009 +0100

    empathy-map-view: fix coding style

 src/empathy-map-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5557dda4a2b596d32962f5e7bc5800967d410d60
Author: drtvasudevan <agnihot3@gmail.com>
Date:	Tue Jun 23 21:44:09 2009 +0530

    Updated Tamil translation

 po/ta.po | 827
 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 449 insertions(+), 378 deletions(-)

commit f18e71dedebf24c9cb721c1cf7ce5f7009324b3b
Author: Nicolò Chieffo <nicolo.chieffo@gmail.com>
Date:	Tue Jun 23 11:13:55 2009 -0400

    Fix Bug 586133: don't autoscroll on new messages

 libempathy-gtk/empathy-chat-text-view.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit 03fa531203802810a57bc723132368bf2761e19c
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Mon Jun 22 09:10:29 2009 -0400

    Fixed  Bug 586284 – Crasher: click on the microphone once
    disconnected

 src/empathy-call-window.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

commit cf5cd933ff677c2a36aba86cab7921339503362c
Author: Frédéric Péters <fpeters@0d.be>
Date:	Tue Jun 23 12:03:14 2009 +0200

    New labels for user signing in/out notification preferences.

 src/empathy-preferences.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit db7bc6a966cb9250fa8f5649975b68d3d6e60514
Author: Frédéric Péters <fpeters@0d.be>
Date:	Mon Jun 22 16:03:48 2009 +0200

    More human notification messages when users sign in/out.

 src/empathy-event-manager.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 057ee5554220ef573a577db545df40fcfaf587b3
Author: Frédéric Péters <fpeters@0d.be>
Date:	Mon Jun 22 16:02:11 2009 +0200

    Fixed coding style of presence notification.

 src/empathy-event-manager.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

commit e037c0c20d0f532314ce9cad99347418506dd6c2
Author: Frédéric Péters <fpeters@0d.be>
Date:	Tue Jun 16 09:49:20 2009 +0200

    Do not flash contact icon in the main window for notification
    only events

 src/empathy-main-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 14e24fa32cf6059e9a5cedadc86cef8dea7575fd
Author: Frédéric Péters <fpeters@0d.be>
Date:	Tue Jun 16 09:48:45 2009 +0200

    Do not blink status icon for notification only events

 src/empathy-status-icon.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 9b0797d859e999bf28145ed77aa13b3970b2a9a3
Author: Frédéric Péters <fpeters@0d.be>
Date:	Tue Jun 16 09:46:06 2009 +0200

    Support for notification-only events

    Add a "must_ack" attribute to events, set if there is no function
    associated to the event, and add a timeout on such events to have them
    removed automatically.

 src/empathy-event-manager.c | 13 +++++++++++++
 src/empathy-event-manager.h |	1 +
 2 files changed, 14 insertions(+)

commit a51deb704aa36bc8b6d02be102f90b666397ff16
Author: Frédéric Péters <fpeters@0d.be>
Date:	Mon Jun 15 16:53:48 2009 +0200

    Show a notification when a contact goes offline or online

 data/empathy.schemas.in       | 30 +++++++++++++++++++
 libempathy-gtk/empathy-conf.h |  2 ++
 src/empathy-event-manager.c   | 70
 +++++++++++++++++++++++++++++++++++++++++++
 src/empathy-preferences.c     | 16 ++++++++++
 src/empathy-preferences.ui    | 26 ++++++++++++++++
 5 files changed, 144 insertions(+)

commit d38da38d45d13ca4a85456609abacec17d01a6eb
Author: Nicolo Chieffo <84yelo3@gmail.com>
Date:	Tue Jun 23 11:19:48 2009 +0200

    Workaround for the "Contact list doesn't appear in windows list"
    bug (#572759)

 libempathy-gtk/empathy-ui-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7ead087382b7a403b2f0eca2f70389a758ff1a00
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Jun 22 22:47:10 2009 +0100

    Fix coding style and FSF address

 libempathy-gtk/empathy-plist.c | 12 ++++++------
 libempathy-gtk/empathy-plist.h |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

commit d296a5a92b346ae2237a71b60000f30dad3429b1
Author: Patryk Zawadzki <patrys@pld-linux.org>
Date:	Mon Jun 22 17:54:42 2009 +0200

    Add working GTK+ theme tracking

 libempathy-gtk/empathy-theme-manager.c | 34
 +++++-----------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

commit cde7b1953a9c430946af7152fb72bbaf3e1d4a95
Merge: 69989d7 ae4ef55
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 22 16:45:12 2009 +0200

    Merge branch 'status-icon-586645'

commit ae4ef5575fbf5fc20753bbcfb8d7e8b1feff858b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 22 16:37:23 2009 +0200

    Assume our presence is offline if MC reports it as UNSET (#586645)

 libempathy/empathy-idle.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 69989d77d169f08d9d5d702cd22f3cda4c2b2ce2
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Jun 22 16:06:29 2009 +0200

    Add helper API to read info.plist file of an adium theme. Will be
    useful for upcoming theme selector

 libempathy-gtk/empathy-theme-adium.c | 50
 +++++++++++++++++++++++++++---------
 libempathy-gtk/empathy-theme-adium.h |  4 +++
 2 files changed, 42 insertions(+), 12 deletions(-)

commit 4c782007bf100a3820dc265bca6fceda17991a77
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Jun 22 10:43:38 2009 +0200

    Move all data about an adium theme into EmpathyAdiumData struct and
    share it with all EmpathyThemeAdium instances.

 docs/libempathy-gtk/libempathy-gtk.types |   1 +
 libempathy-gtk/empathy-theme-adium.c	  | 492
 ++++++++++++++++++-------------
 libempathy-gtk/empathy-theme-adium.h	  |  14 +-
 libempathy-gtk/empathy-theme-manager.c   |  24 +-
 src/empathy-preferences.c		  |   2 +-
 5 files changed, 320 insertions(+), 213 deletions(-)

commit 0f915c44a5e5a2fd91c5b5b26f5a8e5a78ee7ed3
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Jun 22 15:24:03 2009 +0200

    Fix typos in plist parser

 libempathy-gtk/empathy-plist.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 24f46af7642e8e2d0b7fa737d0fbb64ff394b437
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Jun 21 11:28:29 2009 +0200

    Fix warning if theme don't have footer_html

 libempathy-gtk/empathy-theme-adium.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 4a119839567ba66889b222fac4b87627863a218a
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Jun 21 11:27:16 2009 +0200

    Use tp_g_value_slice_new and tp_asv API for plist parser.

 libempathy-gtk/empathy-plist.c       | 137
 +++++++++--------------------------
 libempathy-gtk/empathy-plist.h       |   3 +-
 libempathy-gtk/empathy-theme-adium.c |  25 +++----
 3 files changed, 47 insertions(+), 118 deletions(-)

commit 071f1844a8f47e4d67ad3c752441a3d71d9e18e2
Author: Patryk Zawadzki <patrys@pld-linux.org>
Date:	Sun Jun 21 01:46:36 2009 +0200

    Add a plist parser and set font family, size and default
    variant. Fixes bug #586387.

 libempathy-gtk/Makefile.am	      |   4 +
 libempathy-gtk/empathy-plist.c       | 404
 +++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-plist.h       |  35 +++
 libempathy-gtk/empathy-theme-adium.c |  37 +++-
 4 files changed, 478 insertions(+), 2 deletions(-)

commit 2031cecd62e0b846c84ab7b8126c4fb556f99bd6
Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
Date:	Sun Jun 21 12:05:40 2009 +0200

    Updated Spanish translation

 po/es.po | 568
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 317 insertions(+), 251 deletions(-)

commit 140a3e7349025b41e1a0e7f5bd20e85f41cea75e
Author: Patryk Zawadzki <patrys@pld-linux.org>
Date:	Fri Jun 19 16:23:57 2009 +0200

    Partial fix for bug #586379

    Added naive support for footer files in adium themes. No macros are
    actually parsed and replaces but these are mostly used in headers.

 libempathy-gtk/empathy-theme-adium.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

commit 3f1ee55e4b48f8e771abe18808502a2f62f17932
Author: Patryk Zawadzki <patrys@pld-linux.org>
Date:	Fri Jun 19 15:49:24 2009 +0200

    Stop status_html from leaking

 libempathy-gtk/empathy-theme-adium.c | 1 +
 1 file changed, 1 insertion(+)

commit 20be4973fcdaff3ee828483f2b03b67adec260a1
Author: Patryk Zawadzki <patrys@pld-linux.org>
Date:	Fri Jun 19 15:25:04 2009 +0200

    Fix bug #585475

    Implemented %service%, %shortTime%, %senderDisplayName%,
    %senderScreenName% and %messageClasses%

 libempathy-gtk/empathy-theme-adium.c | 44
 ++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

commit 4de45a243b718afa7bba29f5100c4e2df4b967f9
Author: Runa Bhattacharjee <runab@redhat.com>
Date:	Fri Jun 19 18:47:59 2009 +0530

    Merged translations for Bengali India

 po/bn_IN.po | 2419
 +++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 1683 insertions(+), 736 deletions(-)

commit 3eb439ded3d3bd5e644b82b9cec910e0ad5b23fc
Author: Patryk Zawadzki <patrys@pld-linux.org>
Date:	Fri Jun 19 13:50:11 2009 +0200

    Support fallback avatars provided by adium themes

 libempathy-gtk/empathy-theme-adium.c | 35
 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

commit 5f638d0e0cb77b0dbc59782eb8b80b1763a4c81b
Author: Patryk Zawadzki <patrys@pld-linux.org>
Date:	Fri Jun 19 11:49:32 2009 +0200

    Limit joining consecutive messages to 5 minutes

    Fixes bug #586352

 libempathy-gtk/empathy-theme-adium.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit fdbb5ae44e2b82a36f7103b63e5c8a2041faea6c
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Jun 18 21:29:31 2009 +0100

    Style: avoid marching off the right margin

 libempathy/empathy-tp-chat.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

commit a0813b0a5b90e959994f0f6f029af30364ddd258
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Jun 18 21:26:50 2009 +0100

    Style: use FIXME not TODO

 libempathy/empathy-tp-chat.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 367084af410d31a3fa8a9f040dd70ba5238816f4
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Jun 18 21:26:41 2009 +0100

    Coding style: one declaration per line.

 libempathy/empathy-tp-chat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit ecbd33430aa9005131327e413d3e6eb267c6721a
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Jun 18 21:26:04 2009 +0100

    Move string manipulation into build_part_message

    Xavier said he preferred this, and it's shorter, so...

 libempathy-gtk/empathy-chat.c | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

commit d8c0a34b31f6e8c0c0f09d8a529970b888cee17c
Author: drtvasudevan <agnihot3@gmail.com>
Date:	Fri Jun 19 05:44:59 2009 +0530

    Updated Tamil translation

 po/ta.po | 961
 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 615 insertions(+), 346 deletions(-)

commit 08f02f53a10fd653cac56e23817f3c40d636ca5e
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Jun 18 21:16:51 2009 +0100

    Reduce format string duplication for part notifications.

    Xavier suggested that just appending " (%s)" to the common prefix when
    there is a message is probably okay from a translation point of
    view, as
    long as there's a comment to translators.

 libempathy-gtk/empathy-chat.c | 83
 +++++++++++++++++--------------------------
 1 file changed, 33 insertions(+), 50 deletions(-)

commit bfd99fa8722a9e988df008558782dca6d6118034
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Wed Jun 17 23:40:43 2009 -0400

    Hide muc contacts list
    - Removed trailing spaces
    - Notify change to visibility
    - Added G_PARAM_STATIC_STRINGS to properties
    - Broke empathy_chat_set_show_contacts() in two, simplifying call

 data/empathy.schemas.in       | 10 +++----
 libempathy-gtk/empathy-chat.c | 65
 ++++++++++++++++++++++++++-----------------
 src/empathy-chat-window.c     |  4 +--
 src/empathy-preferences.c     |  2 +-
 4 files changed, 46 insertions(+), 35 deletions(-)

commit 422e90f113fb04e4d8b21f50fe8b1d314a3ef3ac
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Sun May 31 17:35:27 2009 -0400

    Applied Xavier's comments
    Added "show-contacts" property in empathy-chat with default value
    to preference.
    Setter function show/hide contact list.
    When Conv menu is opened in empathy-chat-window, update it with
    "show-contacts" value.
    Uses "remote-contact" instead of "empathy_chat_is_room" for that.
    Call setter function when Show Contacts menu is activated.

 libempathy-gtk/empathy-chat.c | 68
 +++++++++++++++++++++++--------------------
 libempathy-gtk/empathy-chat.h |  2 ++
 src/empathy-chat-window.c     | 50 +++++++++++++++----------------
 3 files changed, 61 insertions(+), 59 deletions(-)

commit ddb6c9033a1e1f028ab3df93d48462f33ea86a44
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Sat May 23 15:51:56 2009 -0400

    Add 'Show Contact List' in Conversation menu

 src/empathy-chat-window.c  | 39 +++++++++++++++++++++++++++++++++++++++
 src/empathy-chat-window.ui |  8 ++++++++
 2 files changed, 47 insertions(+)

commit bc076392a0980d6a3040e2be2f047fedfadcf591
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Sat May 23 15:46:17 2009 -0400

    Read config and show/hide contact list

 libempathy-gtk/empathy-chat.c | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

commit 2ffdfc58b3cbddbe6fe9899f02d0f6efb59da721
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Sat May 23 14:10:20 2009 -0400

    Added a preference in the conf and schema (show contact list in rooms)

 data/empathy.schemas.in       | 14 ++++++++++++++
 libempathy-gtk/empathy-conf.h |  1 +
 src/empathy-preferences.c     |  6 ++++++
 3 files changed, 21 insertions(+)

commit e33c10700fc2313a90c7171a3b794e33007c8591
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Sat May 23 13:51:50 2009 -0400

    Added general option Show contact list in rooms

 src/empathy-preferences.ui | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit 2b5677fb74447fc618346d883828eb389c31d037
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Sat May 23 13:48:39 2009 -0400

    removed extra spacing

 src/empathy-preferences.ui | 1 -
 1 file changed, 1 deletion(-)

commit 28acd3ce10a88f912f0d3f42d14c2e5a98d619bd
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Jun 18 11:04:54 2009 +0100

    Include actor in part message if possible

 libempathy-gtk/empathy-chat.c | 68
 ++++++++++++++++++++++++++++++-------------
 1 file changed, 47 insertions(+), 21 deletions(-)

commit cbfe2006c6b8e0fae731cd26c0284d7767fc4662
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Thu Jun 18 11:04:40 2009 +0100

    Include actor in members-changed if possible

 libempathy/empathy-tp-chat.c | 65
 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 51 insertions(+), 14 deletions(-)

commit 564562fd34a7a456e042041118ee326d3fae0069
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Jun 17 21:17:33 2009 +0100

    Extract part message building to a function

 libempathy-gtk/empathy-chat.c | 79
 ++++++++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 35 deletions(-)

commit 17fb8fcf2f5cb1b535815dcabdc790b04969e6d5
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Jun 17 21:10:08 2009 +0100

    Return early from chat_members_changed_cb

    This avoids the function marching to the right quite so much.

 libempathy-gtk/empathy-chat.c | 85
 ++++++++++++++++++++++---------------------
 1 file changed, 43 insertions(+), 42 deletions(-)

commit bc08d45ad3b44b7ba7b5b0044f538338d2a6553e
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Jun 17 20:41:31 2009 +0100

    Print part reasons to conversation window

 libempathy-gtk/empathy-chat.c | 40
 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

commit c007f0c68d7a40f658a238cc2316ccc545bef7c0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 15 18:13:33 2009 +0100

    status_presets_file_parse: discard invalid presence (#585031)

 libempathy/empathy-status-presets.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

commit afd2392c8e58e1f9b01eb7e983634ab288b62751
Author: Frédéric Péters <fpeters@0d.be>
Date:	Thu Jun 18 11:38:35 2009 +0200

    Use call-stop icon for Hang up toolbutton and menu item (GNOME
    bug 574771)

 src/empathy-call-window.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 0b6193d1e3f336b6d4dcd2b6ce9c90c5ce59edac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 18 09:38:28 2009 +0100

    add doc about empathy_status_presets_is_valid

 libempathy/empathy-status-presets.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit f3696aa8cb23fc853e298f9614768233f69f1298
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 17 18:39:13 2009 +0100

    Don't add invalid presence type as favorite (#585053)

 libempathy-gtk/empathy-presence-chooser.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 4ce928ce7b856c9fcbf61595fae83eed22b90b25
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 17 18:36:28 2009 +0100

    add empathy_status_presets_is_valid

 libempathy/empathy-status-presets.c | 20 ++++++++++++++++++++
 libempathy/empathy-status-presets.h |	1 +
 2 files changed, 21 insertions(+)

commit 16738495eb7c0d205ffb92bd2997a7ddf03e85a0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 15 17:47:20 2009 +0100

    empathy-presence-chooser: use tp_strdiff instead of strcmp

 libempathy-gtk/empathy-presence-chooser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 807b62250294666c0dccc27fbab03c1c782dd38b
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jun 18 00:57:44 2009 +0100

    Add empathy to debug dialog CM chooser.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

commit 6914121ce5169769207613166e14c077259c863b
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jun 18 00:54:55 2009 +0100

    Implement o.fd.Tp.Debug. (Fixes #580631)

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/Makefile.am        |   2 +
 libempathy/empathy-debug.c    |  74 ++++++++++--
 libempathy/empathy-debug.h    |   4 +
 libempathy/empathy-debugger.c | 270
 ++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-debugger.h |  88 ++++++++++++++
 src/empathy.c		       |  31 +++++
 6 files changed, 461 insertions(+), 8 deletions(-)

commit a7785586abe2bf770185fdf8be1855552c476600
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jun 18 00:26:20 2009 +0100

    Set G_LOG_DOMAIN in libempathy and empathy.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/Makefile.am | 1 +
 src/Makefile.am	| 1 +
 2 files changed, 2 insertions(+)

commit b30ac2b9664e4c0a31f15a8b59ee9f23c308d91f
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Jun 17 23:22:45 2009 +0100

    Use correct emacs modelines.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-debug.c | 2 +-
 libempathy/empathy-debug.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 21ed0c9812b89d41518397ff4ee08c3eeebe0712
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Jun 17 22:53:10 2009 +0100

    Take org.gnome.Empathy as a well-known name on startup. (Fixes
    #560159)

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

commit 8b126ca039f7d4a5a93e695682dc975d1254c49e
Author: Nicolò Chieffo <nicolo.chieffo@gmail.com>
Date:	Wed Jun 17 13:08:30 2009 -0400

    Fix wrapping in Preferences dialog

 src/empathy-preferences.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d0a3c7a9e5052a5487e74fe70e0d1f40c6f904a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 17 17:19:00 2009 +0100

    Remove 'new message from' from notification message (#586102). Based
    on a patch from Nicolo Chieffo

 src/empathy-chat-window.c   | 7 +++----
 src/empathy-event-manager.c | 6 ++----
 2 files changed, 5 insertions(+), 8 deletions(-)

commit 8f7597bb501d2e641b09f55769990df97576cd0f
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Mon Jun 15 16:30:35 2009 -0400

    Fix 585887: "Publish my location" causes a crash

    Adds more error handling on geoclue init and the geoclue_is_setup
    check
    was too late in update_resources

 libempathy-gtk/empathy-location-manager.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

commit 0f4c81cabf14b37cebef3f4c22f9bdc3ce5238b3
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Jun 17 09:57:02 2009 +0200

    Refuse sending empty or special files (directories, char/block
    devices, etc.)

    (GNOME bug 563678)

 libempathy/empathy-ft-handler.c | 19 ++++++++++++++++++-
 libempathy/empathy-tp-file.h	 |  4 +++-
 2 files changed, 21 insertions(+), 2 deletions(-)

commit e4aa4b036f8f7663b9a0b9362617bce544ac1a3e
Author: Frédéric Péters <fpeters@0d.be>
Date:	Wed Jun 17 10:06:11 2009 +0200

    [release script] also check for bug numbers with a variant form

 release.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 7e6f8f16531da4f40ba4f3158d31fce863942bda
Author: Claude Paroz <claude@2xlibre.net>
Date:	Tue Jun 16 23:30:15 2009 +0200

    Remove markup from GTKBuilder translatable strings

 libempathy-gtk/empathy-account-widget-aim.ui	    |  6 +-
 libempathy-gtk/empathy-account-widget-generic.ui   |  6 +-
 libempathy-gtk/empathy-account-widget-groupwise.ui |  6 +-
 libempathy-gtk/empathy-account-widget-icq.ui	    |  6 +-
 libempathy-gtk/empathy-account-widget-irc.ui	    | 12 ++--
 libempathy-gtk/empathy-account-widget-jabber.ui    | 12 ++--
 libempathy-gtk/empathy-account-widget-msn.ui	    |  6 +-
 libempathy-gtk/empathy-account-widget-salut.ui     |  6 +-
 libempathy-gtk/empathy-account-widget-sip.ui	    |  6 +-
 libempathy-gtk/empathy-account-widget-yahoo.ui     |  6 +-
 libempathy-gtk/empathy-chat.ui			    |  6 +-
 libempathy-gtk/empathy-contact-widget.ui	    | 24 +++++---
 src/empathy-accounts-dialog.ui			    | 25 +++++---
 src/empathy-preferences.ui			    | 66
 ++++++++++++++--------
 14 files changed, 129 insertions(+), 64 deletions(-)

commit 551fe27bfb5078ae95d2a4d418df7abe66db0a93
Merge: 40d3362 2360a56
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 16 15:26:09 2009 +0100

    Merge commit 'jtellier/video-call-stop-showing-last-frame'

commit 40d33622db46952e016cc8e540403cccb7ba6103
Author: Patryk Zawadzki <patrys@pld-linux.org>
Date:	Tue Jun 16 15:37:08 2009 +0200

    Introduce empathy_contact_equal, adapt themes

    Fixed adium and boxes theme engines to check if contacts refer to
    the same id instead of comparing pointers. This fixes bug #585885.

 libempathy-gtk/empathy-theme-adium.c |  4 ++--
 libempathy-gtk/empathy-theme-boxes.c |  2 +-
 libempathy/empathy-contact.c	      | 37
 ++++++++++++++++++++++++++++++++++++
 libempathy/empathy-contact.h	      |  4 +++-
 4 files changed, 43 insertions(+), 4 deletions(-)

commit 2360a56f96df9315b7cbcfc8bf3a3f8ddcb919cf
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Mon Jun 15 16:07:59 2009 -0400

    The EmpathyCallHandler correctly initializes it "initial_video"
    property
    when the remote contact initiates the call.
    empathy_tp_call_is_(sending/receiving)_video correctly returns a
    gboolean.
    The remote avatar is correctly shown when the remote site does
    not send
    video.
    When a call is disconnected, the video preview is hidden.

 libempathy/empathy-call-handler.c |  4 +++-
 libempathy/empathy-tp-call.c	   |  6 ++++--
 src/empathy-call-window.c	   | 31 ++++++++++++++++++++++++++++---
 3 files changed, 35 insertions(+), 6 deletions(-)

commit cea163a21118f4f06aa6c37fa4463f9666a63019
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Jun 15 18:44:34 2009 +0200

    Bump version to 2.27.4

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cb1d2d6748eb657c93f5a7873c88dbc7bda17660
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Jun 15 18:40:19 2009 +0200

    Fix build of libempathy-gtk doc. We have to init threads

 docs/libempathy-gtk/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit 3ea616f06694ef62a08cfc2bd95446a65827298b
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Jun 15 16:55:47 2009 +0200

    Bump ABI version

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d33b3a97ff1ebf21d76c760ed21c0a0197f1f644
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Jun 15 16:55:37 2009 +0200

    Update NEWS for 2.27.3

 NEWS | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

commit 67d9a3b82476dc2f74d5c87cf43de118c13579c5
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Jun 15 16:50:41 2009 +0200

    Reorder functions to not declare them on top

 src/empathy-map-view.c | 238
 +++++++++++++++++++++++--------------------------
 1 file changed, 113 insertions(+), 125 deletions(-)

commit d563a37f9f94ab5f8c77cbf644d8d2901ad74476
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Sun Jun 14 14:05:53 2009 -0400

    empathy_time_to_string_relative was missing weeks

    This resulted in "0 month ago" being returned.

 libempathy/empathy-time.c | 5 +++++
 1 file changed, 5 insertions(+)

commit ec4b41130b1b9704abf190a470d65a9e41846284
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Sun Jun 14 12:30:40 2009 -0400

    Add contextual popup menu in map view

 src/empathy-map-view.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

commit e37fbd376151222f336650f66476c3cdc0957451
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Sun Jun 14 12:20:28 2009 -0400

    Simplify map_view_marker_update_position

 src/empathy-map-view.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

commit 0b23d0983acb95ced196c766ee112143ec314c22
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Fri Jun 12 01:19:26 2009 -0400

    Use libchamplain 0.3.3 new Gtk embed API

 configure.ac				 |  4 ++--
 libempathy-gtk/empathy-contact-widget.c | 12 ++++++------
 src/empathy-map-view.c			 |  7 +++----
 3 files changed, 11 insertions(+), 12 deletions(-)

commit 909f3e3d892afc61e42143bf9182d6dec9f3ccb9
Merge: 3624ff9 e5989d0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 15 10:47:06 2009 +0100

    Merge commit 'jtellier/call-window-video-preview'

commit 3624ff9a9fc90161487431fd536cdc3fffb0bb57
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 15 10:17:06 2009 +0100

    empathy-ft-manager: tile should be 'File Transfers'. (#585788)

 src/empathy-ft-manager.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 79b35ff58934c0ed20c4092138973c88a827a16b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Sun Jun 14 17:36:37 2009 +0100

    empathy_idle_init: fallback to OFFLINE instead of UNSET if
    empathy_idle_get_actual_presence failed

    If MC is not running, mission_control_get_presence_actual will return
    OFFLINE and set an error. Empathy should do the same and use OFFLINE
    instead of UNSET to avoid to not display the status icon in such cases
    (there is no UNSET presence icon).

 libempathy/empathy-idle.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 3064b1394d1d98f10808b0cf25474c2541851dd4
Author: Luis Menina <liberforce@freeside.fr>
Date:	Sat Jun 13 22:37:40 2009 +0200

    [Goal] Clean up GLib and GTK+ includes in empathy (Fixes #585669)

    Allows to compile with G_DISABLE_SINGLE_INCLUDES,
    GDK_PIXBUF_DISABLE_SINGLE_INCLUDES and GTK_DISABLE_SINGLE_INCLUDES.
    This prepares for the GNOME 3.0 transition.

 libempathy-gtk/empathy-account-chooser.h	    | 2 +-
 libempathy-gtk/empathy-account-widget-irc.h	    | 2 +-
 libempathy-gtk/empathy-account-widget-sip.h	    | 2 +-
 libempathy-gtk/empathy-avatar-chooser.h	    | 2 +-
 libempathy-gtk/empathy-avatar-image.h		    | 2 +-
 libempathy-gtk/empathy-cell-renderer-activatable.c | 2 +-
 libempathy-gtk/empathy-cell-renderer-activatable.h | 2 +-
 libempathy-gtk/empathy-cell-renderer-expander.c    | 2 +-
 libempathy-gtk/empathy-cell-renderer-expander.h    | 2 +-
 libempathy-gtk/empathy-cell-renderer-text.h	    | 2 +-
 libempathy-gtk/empathy-chat-text-view.h	    | 2 +-
 libempathy-gtk/empathy-chat-view.h		    | 2 +-
 libempathy-gtk/empathy-chat.h			    | 2 +-
 libempathy-gtk/empathy-contact-list-store.h	    | 2 +-
 libempathy-gtk/empathy-contact-list-view.h	    | 2 +-
 libempathy-gtk/empathy-contact-menu.h		    | 2 +-
 libempathy-gtk/empathy-irc-network-dialog.h	    | 2 +-
 libempathy-gtk/empathy-new-message-dialog.h	    | 2 +-
 src/empathy-about-dialog.c			    | 3 +--
 src/empathy-about-dialog.h			    | 2 +-
 src/empathy-accounts-dialog.h			    | 2 +-
 src/empathy-chat-window.h			    | 2 +-
 src/empathy-main-window.h			    | 2 +-
 src/empathy-map-view.h				    | 2 +-
 src/empathy-preferences.h			    | 2 +-
 src/ephy-spinner.c				    | 4 +---
 src/ephy-spinner.h				    | 3 +--
 27 files changed, 27 insertions(+), 31 deletions(-)

commit 7e2814612216637ed537c879646bd0691f883455
Author: Frédéric Péters <fpeters@0d.be>
Date:	Sat Jun 13 17:56:19 2009 +0200

    Do not include default title property for Adium theme filepicker

    (GNOME bug 585640)

 src/empathy-preferences.ui | 1 -
 1 file changed, 1 deletion(-)

commit bb1946ec6cdb35346d6fa81dba1b6e168b10d5bf
Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
Date:	Sat Jun 13 13:18:47 2009 +0200

    Updated Spanish translation

 po/es.po | 258
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 142 insertions(+), 116 deletions(-)

commit e5989d0face9edde213e0530ba6c886d61a1276f
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Fri Jun 12 14:27:12 2009 -0400

    The video preview is no longer hidden when we get connected to a audio
    only call.

 src/empathy-call-window.c | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

commit 87d5ea81cc37d8a1a4eda76da7251551c8f7a979
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 12 16:28:01 2009 +0100

    empathy-location-manager: remove a trailing space

 libempathy-gtk/empathy-location-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f3e7e7d24461f07b2d4752c154d5c0a68dabf23e
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Fri Jun 12 11:20:04 2009 -0400

    Fixed code style

 libempathy-gtk/empathy-smiley-manager.c | 2 +-
 libempathy-gtk/empathy-theme-adium.c	 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 1a2da857a423d46a4496064078c92fd3214ebf3e
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Fri Jun 12 10:55:05 2009 -0400

    Corrected code style in empathy_call_window_setup_video_preview.
    The video preview is now shown no matter if we are sending video
    or not.

 src/empathy-call-window.c | 101
 +++++++++++++++++++++++++---------------------
 1 file changed, 56 insertions(+), 45 deletions(-)

commit 3719c62c3f34e11dbdcdff741eb2aadf69c9c202
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Thu Jun 11 10:12:26 2009 -0400

    Added an early return in empathy_call_window_setup_video_preview.
    Code style correction in
    empathy_call_window_setup_video_preview_visibility.
    Corrected a bug which prevented a user with no video input to redial
    video calls.
    The "Send video" option should be properly disabled when we can't send
    video.

 libempathy-gtk/empathy-video-widget.c |   3 +
 src/empathy-call-window.c	       | 183
 ++++++++++++++++++----------------
 2 files changed, 99 insertions(+), 87 deletions(-)

commit c65de38d223ada5dfcf2d74b25a6af520143f3c5
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Wed Jun 10 15:36:01 2009 -0400

    Better implemented empathy_tp_call_is_receiving_video and
    empathy_tp_call_is_sending_video.
    Removed the "video-stream-changed" from EmpathyCallHandler
    Corrected gtk-doc in EmpathyCallHandler.
    empathy_call_window_stup_video_preview now checks the status of the
    video_tee and the video_preview.
    empathy_call_window_sink_added_cb does not automatically starts the
    preview.

 libempathy/empathy-call-handler.c |  28 +--------
 libempathy/empathy-tp-call.c	   |   6 +-
 src/empathy-call-window.c	   | 125
 ++++++++++++++++++++++----------------
 3 files changed, 78 insertions(+), 81 deletions(-)

commit c5c09d7a6a0161b66f1747e3496cb1365f6f35bc
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Fri Jun 5 14:56:09 2009 -0400

    Not creating the video preview if we don't want to show it (in audio
    calls for instance).

 libempathy/empathy-call-handler.c |  17 +++++
 libempathy/empathy-call-handler.h |   2 +
 src/empathy-call-window.c	   | 153
 ++++++++++++++++++++++++--------------
 3 files changed, 116 insertions(+), 56 deletions(-)

commit d9a8b7a80525e4faa908c5eb0bf1f8fb89c49dfe
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Wed May 20 13:49:02 2009 -0400

    Implemented the call window's "View -> Video preview" option.

 src/empathy-call-window.c  | 36 +++++++++++++++++++++++++++++++++++-
 src/empathy-call-window.ui |  1 +
 2 files changed, 36 insertions(+), 1 deletion(-)

commit 62ed123c83ff2de84622abe1e2cb972a409c43ae
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Wed May 20 13:49:02 2009 -0400

    When no video is received or sent we show contacts' avatars instead
    of showing
    black widgets.

 libempathy/empathy-call-handler.c | 22 ++++++++++++++++++
 libempathy/empathy-tp-call.c	   | 37 +++++++++++++++++++++++++++++
 libempathy/empathy-tp-call.h	   |  2 ++
 src/empathy-call-window.c	   | 49
 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 110 insertions(+)

commit efd01a1ef0a6be5552cc370e0870c9106fdc2908
Merge: ba97570 40e0273
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Jun 12 12:04:42 2009 +0200

    Merge branch 'ft_ipv4'

commit 40e02734065878fcfbb0a316ca2217a5676862e8
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Fri Jun 12 11:55:52 2009 +0200

    Drop PORT access control support for now

 libempathy/empathy-tp-file.c | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

commit ba975704f0cfeae622fdd2967f36ebf2c39e29df
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Thu Jun 11 18:25:14 2009 -0400

    Add spinning throbber to EmpathyMapView

    OSM servers can be slow at times, the user
    can now know that data is loading

 src/empathy-map-view.c  | 27 +++++++++++++++++++++++++++
 src/empathy-map-view.ui | 27 +++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

commit 3974937e07af52950c8f8ae411069a04804f8ab3
Author: Mark Krapivner <mark125@gmail.com>
Date:	Thu Jun 11 23:09:47 2009 +0300

    Updated Hebrew translation

 po/he.po | 2469
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1337 insertions(+), 1132 deletions(-)

commit 647ef034c03b4669e9eb4e489443295ea6d107e1
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jun 11 20:21:30 2009 +0200

    Add doc for empathy_avatar_new()

 libempathy/empathy-contact.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit e1997f45a15c8a42e7304120034e0fcf86560bf5
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jun 11 20:03:15 2009 +0200

    Update copyright to 2008-2009

 libempathy-gtk/empathy-theme-adium.c | 2 +-
 libempathy-gtk/empathy-theme-adium.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 2440c52f3ac77481d530a8153f09376ca4f61e4f
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jun 11 20:02:48 2009 +0200

    Move g_object_unref to dispose instead of finalize

 libempathy-gtk/empathy-theme-adium.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

commit fd8a3a5ef0de9951d185d18200c322a4b1714288
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jun 11 19:58:00 2009 +0200

    Include empathy-theme-adium.c/h in tarballs even if webkit is not
    installed

 libempathy-gtk/Makefile.am | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

commit 924bb95909e995b8cc5c8686580467e69234217b
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jun 11 19:47:57 2009 +0200

    Correctly parse %time% if a format is provided

 libempathy-gtk/empathy-theme-adium.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 6cad3e6d0d4123a7eaf8fbb8dc6cf1976854aaa4
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jun 11 19:47:46 2009 +0200

    Remove trailing space

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b722fcccf60be70a068b83b9e7f49fcbc6fde4e4
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jun 11 17:44:56 2009 +0200

    New webkit needs an URI as basedir for
    webkit_web_view_load_html_string.

 configure.ac			      |  3 ++-
 libempathy-gtk/empathy-theme-adium.c | 10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

commit 823b8bf90abf4230a63bb00fef7e9ffd7cd11156
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jun 11 14:04:28 2009 +0200

    Do not use empathy_contact_equal(), we can now compare pointers
    directly.

 libempathy-gtk/empathy-theme-adium.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 5d83372d392c074b13fb82eb934d6f795edc0d09
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jun 11 14:04:02 2009 +0200

    Add Adium theme support in the configure summary

 configure.ac | 1 +
 1 file changed, 1 insertion(+)

commit 431ecd21a339ed8fe3cbc4e69937264f65a6ce2a
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Feb 20 19:29:52 2009 +0100

    Support /me command and fix crash if smiley are not enabled

 libempathy-gtk/empathy-theme-adium.c | 53
 +++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 19 deletions(-)

commit d3ab89520c02dd011822a42921c902edf7667275
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Feb 20 19:28:57 2009 +0100

    Fix build error due to wrong rebase

 libempathy-gtk/empathy-chat-text-view.c | 1 -
 1 file changed, 1 deletion(-)

commit 5600490e9edda705b4b58720433b476c0d744115
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Feb 20 18:14:24 2009 +0100

    Port to new API

 libempathy-gtk/empathy-theme-adium.c | 2 +-
 src/empathy-preferences.c	      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 8ab8a754b3c23bf8d8b2298fe20bc6a7ea7dac63
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Nov 30 00:44:14 2008 +0100

    Update pyhton bindings

 python/pyempathy/pyempathy.defs       |  1 +
 python/pyempathygtk/pyempathygtk.defs | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 11 deletions(-)

commit 6e2d0ab5c3cb496ad94c3e0a12cc9dbeedd8ce70
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Nov 30 00:24:41 2008 +0100

    Add EmpathyThemeAdium to the API doc.

 docs/libempathy-gtk/libempathy-gtk-docs.sgml | 1 +
 docs/libempathy-gtk/libempathy-gtk.types     | 1 +
 2 files changed, 2 insertions(+)

commit 2aeffc8776f7e19a44a619b3de26f748d0346b8d
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Nov 6 10:25:24 2008 +0100

    WebKit is expecting an absolute path to a file name as the last
    parameter of webkit_web_view_load_html_string.  But adding a extra /
    at the end of
    the path works also fine (patch to be attached).

 libempathy-gtk/empathy-theme-adium.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1ce531c29108e9bf0a90a4c013283b9115598bb9
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 4 00:21:52 2008 +0100

    Delete useless file

 libempathy-gtk/empathy-theme.c | 408
 -----------------------------------------
 1 file changed, 408 deletions(-)

commit 35879a4a3ab0ac586cb183beaaa44ec2e50788f9
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 4 00:21:13 2008 +0100

     - Implement remaining functions on EmpathyThemeAdium.
     - Fix refcounting of EmpathySmileyManager, avoid double free in
     its finalize.
     - Create our own context menu on EmpathyThemeAdium.

 libempathy-gtk/empathy-chat-text-view.c |  28 +--
 libempathy-gtk/empathy-smiley-manager.c |   1 -
 libempathy-gtk/empathy-theme-adium.c	 | 350
 ++++++++++++++++++++------------
 3 files changed, 233 insertions(+), 146 deletions(-)

commit 9526e4a4b28eab55a52d3fb9d1d3cfc9d990af24
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 4 00:20:39 2008 +0100

    Fix a warning when the ADIUM_PATH gconf key is unset.

 src/empathy-preferences.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit 0d73068c7f58185be37a2fe42fe006342e441dc1
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Nov 4 00:18:11 2008 +0100

    Add whitespace to respect coding style

 libempathy-gtk/empathy-theme-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 38c22ce23b3b600a249c2d6145e50430734d8787
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sun Jul 20 20:14:05 2008 +0200

    Don't escape message before detecting smileys otherwise some won't
    be detected.

 libempathy-gtk/empathy-theme-adium.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

commit 3e384cce2caa2729cc9a9409f115fcf117701384
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sat Jul 19 09:43:05 2008 +0200

    Cleanup little things

 libempathy-gtk/empathy-theme-adium.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

commit 1095ede4e263939f5dd8457c083d0457e1fb30c7
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Sat Jul 19 00:09:13 2008 +0200

    Use a default Template.html if not provided by the theme.

 data/Template.html		      | 159
 +++++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-theme-adium.c |  58 +++++++++----
 2 files changed, 202 insertions(+), 15 deletions(-)

commit 3f7f5c8eb5f93361e2d0723790f13f082263255a
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jul 18 21:52:25 2008 +0200

    Correctly escape message body so html tags are not interpreted
    by webkit.

 libempathy-gtk/empathy-theme-adium.c | 61
 +++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 29 deletions(-)

commit eb48fbaf322604ee57888165242acd97efd8decc
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jul 18 20:59:59 2008 +0200

    Add a path property on EmpathyThemeAdium and ge the adium-path gconf
    key in EmpathyThemeManager.

 libempathy-gtk/empathy-theme-adium.c	| 82
 +++++++++++++++++++++++++++++-----
 libempathy-gtk/empathy-theme-adium.h	|  2 +-
 libempathy-gtk/empathy-theme-manager.c | 49 ++++++++++++++++++--
 3 files changed, 117 insertions(+), 16 deletions(-)

commit 80f5d332a5a531f8d5b96d9ea50f2384bf515324
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jul 18 19:50:45 2008 +0200

    Add some #ifdef HAVE_WEBKIT

 src/empathy-preferences.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 9da5a48b5c7d8c47418b56776839ff7687ecd7f0
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Fri Jul 18 19:45:53 2008 +0200

    Quick check if the theme path is OK.

 data/Makefile.am		      |  8 ++++++--
 libempathy-gtk/empathy-theme-adium.c | 29 +++++++++++++++++++++++------
 2 files changed, 29 insertions(+), 8 deletions(-)

commit 294a19437a0ac22d5853dd1ec0934042fcd86360
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jul 17 22:19:43 2008 +0200

    Add UI in the preference dialog to select the path to adium theme

 data/empathy.schemas.in	      |  14 ++
 libempathy-gtk/empathy-conf.h	      |   1 +
 libempathy-gtk/empathy-theme-adium.c |   6 +
 libempathy-gtk/empathy-theme-adium.h |   1 +
 src/Makefile.am		      |   4 +-
 src/empathy-preferences.c	      | 328
 +++++++++++++++++++++--------------
 src/empathy-preferences.ui	      |  43 +++++
 7 files changed, 261 insertions(+), 136 deletions(-)

commit afbb47911c8b0e82bb05fdb826fc056d9da10555
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jul 17 15:24:44 2008 +0200

    Add a tooltip on smileys with the text it hides

 libempathy-gtk/empathy-theme-adium.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 7655246b73cf1eedb8ede01e8d0c156f197dcae7
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jul 17 15:10:28 2008 +0200

    Open URI when they are clicked in webkit

 libempathy-gtk/empathy-theme-adium.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

commit 2ff2dc404fe65778b6c7451aae580e455766de89
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jul 17 12:29:38 2008 +0200

    Reorganise a bit the body parsing and add support for URL

 libempathy-gtk/empathy-chat-text-view.c |   1 +
 libempathy-gtk/empathy-theme-adium.c	 | 134
 +++++++++++++++++++++-----------
 2 files changed, 90 insertions(+), 45 deletions(-)

commit 3f4ba63033de82d2bb1193f330177e428ea55126
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jul 17 11:18:37 2008 +0200

    Fix a typo in a comment

 libempathy-gtk/empathy-theme-adium.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6c25442a2d2d54b53fa034fa592351bef0b2965a
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jul 17 11:07:12 2008 +0200

    Add support for smileys with adium themes

 libempathy-gtk/empathy-theme-adium.c | 76
 ++++++++++++++++++++++++++++++------
 1 file changed, 63 insertions(+), 13 deletions(-)

commit 0e59e586c3806cc95c3e6cb20621333ca1a35386
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jul 17 10:32:34 2008 +0200

    rename ready to page_loaded, it explains better what it does.

 libempathy-gtk/empathy-theme-adium.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 9f7e19517623ea663dcd54b84b3839fbbf2c582c
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jul 17 10:28:50 2008 +0200

    Add path in EmpathySmiley

 libempathy-gtk/empathy-smiley-manager.c | 82
 ++++++++++++++++++---------------
 libempathy-gtk/empathy-smiley-manager.h |  9 ++--
 libempathy-gtk/empathy-theme-adium.c	 | 35 +++-----------
 libempathy-gtk/empathy-ui-utils.c	 | 23 +++++++++
 libempathy-gtk/empathy-ui-utils.h	 |  9 ++--
 5 files changed, 84 insertions(+), 74 deletions(-)

commit 41e4816144f6e9ace93b0497f35c6aee480fa1c5
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Jul 16 22:45:27 2008 +0200

    Update for more recent webkit

 configure.ac			      | 2 +-
 libempathy-gtk/empathy-theme-adium.c | 5 +----
 libempathy-gtk/empathy-theme-adium.h | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

commit c701544eca086e1d87f8f3539580a37c6fcd3931
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Jul 16 20:26:03 2008 +0200

    Fallback if ContentNext or Outgoing are missing.

 libempathy-gtk/empathy-theme-adium.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit 0dfbea70e24e4fecde1d347ae5bb1ac2c864e37e
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Jul 16 20:13:34 2008 +0200

    Oops, remove stupid debug g_print

 libempathy-gtk/empathy-theme-adium.c | 3 ---
 1 file changed, 3 deletions(-)

commit 3bd5bfb25895a95bb879bcdb27647533c5ae2ce8
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Jul 16 20:12:36 2008 +0200

    Don't load SVG icons because webkit can't load them

 libempathy-gtk/empathy-theme-adium.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit c9b74c0e4891a12133aab46312b6038c3a2d0047
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Jul 16 20:05:08 2008 +0200

    Add the filename in EmpathyAvatar and fallback to stock_person

 libempathy-gtk/empathy-avatar-chooser.c |  4 +-
 libempathy-gtk/empathy-theme-adium.c	 | 88
 ++++++++++++++++++++++++++-------
 libempathy/empathy-contact.c		 | 27 +++-------
 libempathy/empathy-contact.h		 |  5 +-
 4 files changed, 81 insertions(+), 43 deletions(-)

commit 250c6aaadcfd00470f670bc6bf4b1098c1640179
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Jul 16 18:32:47 2008 +0200

    Support for custom time format

 libempathy-gtk/empathy-theme-adium.c | 46
 +++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 11 deletions(-)

commit bd603ce6e5945ed1d06e550c928fc2ed21da3d88
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Jul 16 16:45:29 2008 +0200

    Add initial adium theme support: Load the template and append
    messages.

 libempathy-gtk/empathy-theme-adium.c | 288
 +++++++++++++++++++++++++++++++++--
 libempathy/empathy-contact.c	      |  12 ++
 libempathy/empathy-contact.h	      |   1 +
 3 files changed, 285 insertions(+), 16 deletions(-)

commit 8ae92f733e7177326ca24b80307b4c3ffcde94d5
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Jul 15 21:11:58 2008 +0200

    EmpathyThemeAdium inherit from WebkitWebView and not GtkTextView.

 libempathy-gtk/empathy-theme-adium.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 06563d5df6dfbb129f80d3088448abda0fb245b3
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Jul 15 20:56:45 2008 +0200

    Compile EmpathyThemeAdium only if webkit is installed

 configure.ac				| 4 ++++
 libempathy-gtk/Makefile.am		| 7 +++++--
 libempathy-gtk/empathy-theme-manager.c | 9 ++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

commit 4860e692b18ef271889633faa978d546221e8d7b
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Jul 15 18:56:34 2008 +0200

    Add skelet of Adium theme using webkit.

 configure.ac				|  23 +++++
 libempathy-gtk/Makefile.am		|   4 +
 libempathy-gtk/empathy-theme-adium.c	| 157
 +++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-theme-adium.h	|  55 ++++++++++++
 libempathy-gtk/empathy-theme-manager.c |   5 ++
 5 files changed, 244 insertions(+)

commit 2fbb4aa0b855d3bac977c25e32c599e59fde89ee
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Thu Jun 11 10:30:49 2009 -0400

    Fix compile warning

 src/empathy-map-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7b1d5580526f2f2644d5ff7202d0f8f6cd4f3284
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu Jun 11 15:23:56 2009 +0200

    Get author for bug fixes

 release.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

commit cf5caa2099aaad410f76ccb839ea20687ef92e27
Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
Date:	Thu Jun 11 14:31:38 2009 +0200

    Updated Spanish translation

 po/es.po | 45 ++++++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 19 deletions(-)

commit 48b18840940ff3b59647e8617f667b71246da022
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 11 13:14:46 2009 +0100

    src/Makefile.am: actually enable warning CFLAGS

 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c5de8301caac1e3a248a3f254fb38a1656e96959
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 11 13:22:34 2009 +0100

    empathy-call-window: remove unused variables

 src/empathy-call-window.c | 3 ---
 1 file changed, 3 deletions(-)

commit 291154c8a7af5a0686a36929a52337e65784e9b7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 10 12:54:34 2009 +0100

    import im-meanwhile from Pidgin

 data/icons/Makefile.am				   |   4 +
 data/icons/hicolor_apps_16x16_im-meanwhile.png    | Bin 0 -> 938 bytes
 data/icons/hicolor_apps_22x22_im-meanwhile.png    | Bin 0 -> 1538 bytes
 data/icons/hicolor_apps_48x48_im-meanwhile.png    | Bin 0 -> 3647 bytes
 data/icons/hicolor_apps_scalable_im-meanwhile.svg | 174
 ++++++++++++++++++++++
 5 files changed, 178 insertions(+)

commit 473a3821f0185b1af001bce45bef98d69a720cff
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 10 12:39:08 2009 +0100

    add sametime profile (#562981)

 data/Makefile.am      |  3 ++-
 data/sametime.profile | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

commit a26f30468a501a94410f6d771df57eae01eb253a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 11 11:21:02 2009 +0100

    empathy-accounts-dialog: move back the 'Create' button on the right

 src/empathy-accounts-dialog.ui | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

commit 58c031e979d623fdf447351713ffb0fafb801ce6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 10 16:03:29 2009 +0100

    empathy-accounts-dialog: Use radio buttons instead of a checkbox
    for the 'reuse existing account' UI

 src/empathy-accounts-dialog.c	| 20 ++++++++++++--------
 src/empathy-accounts-dialog.ui | 38
 +++++++++++++++++++++++++++++++-------
 2 files changed, 43 insertions(+), 15 deletions(-)

commit 50b28b2222b2b2d1f32ef7a9968e3441da13df7a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Jun 10 15:46:31 2009 +0100

    empathy-accounts-dialog: change title to 'Add Account' as we can
    reuse an existing one (#548707)

 src/empathy-accounts-dialog.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d03626604c00fba805b2ed8f79e09b0ebfac6dfd
Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
Date:	Thu Jun 11 09:32:43 2009 +0200

    Updated Spanish translation

 po/es.po | 79
 +++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 38 insertions(+), 41 deletions(-)

commit 05e87230cb3e1fa70dd31f34ecc7416de8f2fa89
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Wed Jun 10 10:13:07 2009 +0200

    Updated Norwegian bokmål translation.

 po/nb.po | 1706
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 1002 insertions(+), 704 deletions(-)

commit 39c0f4468521deaa00f4db3e891cd20992aa96c9
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Mon Jun 8 18:37:47 2009 -0400

    Geoclue doesn't like NONE as an accuracy level

    Possibly a bug in Geoclue, but passing COUNTRY instead of NONE as
    the minimum accuracy required gives better results (ie more providers
    are possible).

 libempathy-gtk/empathy-location-manager.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 62a2f58de7ff809169787fa6de369c15465c69fd
Merge: 83912b1 f31d0fb
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Jun 9 19:08:23 2009 +0100

    Merge branch 'ft-error-confusion'

commit f31d0fbeda0c03a619c2db2a84ef3181c579649b
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Jun 9 18:34:35 2009 +0100

    Correctly propagate Provide/Accept errors

    Previously, if myerr was set as well as error, myerr was cleared, but
    not set to a copy of error. So then the function continued as normal,
    and crashed.

    Also, having checked if myerr is set, we should probably log the
    message
    from that, rather than from the (possibly NULL) error. :)

 libempathy/empathy-tp-file.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 83912b157904043cbb3d972bd3eb5f8e75f1d1c2
Merge: 93e3219 9d2cfd5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 9 14:34:48 2009 +0100

    Merge commit 'jtellier/call-window-redial-button'

commit 9d2cfd58eccb1e5fa985b14b0b744c3766f7988d
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Thu May 7 15:13:04 2009 -0400

    Added a "Redial" button to the call window.

 libempathy/empathy-call-handler.c |  21 ++-
 libempathy/empathy-call-handler.h |   3 +-
 src/empathy-call-window.c	   | 342
 +++++++++++++++++++++++++++-----------
 src/empathy-call-window.ui	   |  21 +++
 4 files changed, 287 insertions(+), 100 deletions(-)

commit 93e3219c604cc97f1bdcd28e86ebaa0f511f4efb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 9 14:07:35 2009 +0100

    contact_get_avatar_filename: remove unused priv pointer

 libempathy/empathy-contact.c | 1 -
 1 file changed, 1 deletion(-)

commit 4047625966d7de345673f6e0603c7e45f2e7d747
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 9 13:56:10 2009 +0100

    contact_get_avatar_filename: use empathy_contact_get_id instead of
    priv->id directly

    priv->id is not supposed to be set for not log contacts so the avatar
    cache was broken for all TpContact.

 libempathy/empathy-contact.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 08fb04d03b17c44e401d89cfd0e957c41cdf3b56
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Jun 9 11:29:07 2009 +0100

    Remove outstanding operations before dispatching them

    Fixes #585231

 libempathy/empathy-dispatcher.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 01db736d42599437458371dbd2a66030647de7e2
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Jun 9 11:28:25 2009 +0100

    Document the purpose of outstanding_channels

 libempathy/empathy-dispatcher.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 279a93cbc25ade081510d94c20777e16527cf475
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Mon Jun 8 22:39:56 2009 +0100

    Break after deleting current item in chatroom list

    When I signed off, Empathy exploded. l was 0x33, which oddly
    enough was
    secretly not the address of a GList. :-) I think what happened is that
    empathy_chatroom_manager_remove() deleted the list node currently
    pointed to by l; then the loop advanced to l->next, which was now
    garbage.

    We don't need to keep iterating once we find the chatroom we were
    looking for, so break out of the loop.

 libempathy/empathy-chatroom-manager.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit f0ff888b79ce3c902f4f7211bbe1dadcba0c1799
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Jun 9 10:52:07 2009 +0100

    Extract removing chatroom links to a function

 libempathy/empathy-chatroom-manager.c | 31
 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

commit 3ace031c4d31c397d89ddb8ae37c8898d7bd5a37
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Jun 9 10:35:52 2009 +0100

    Consistently use this_chatroom when removing a room

 libempathy/empathy-chatroom-manager.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 32ac85819a5109d73f16c48bc6e110669dc07ebf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 5 16:04:20 2009 +0100

    libempathy.types: remove empathy_tp_tube_get_type

 docs/libempathy/libempathy.types | 1 -
 1 file changed, 1 deletion(-)

commit ab339a3d75a555e4437c99195037600d3154f5fa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 5 14:47:55 2009 +0100

    update Python bindings

 python/pyempathy/pyempathy.defs | 61
 -----------------------------------------
 1 file changed, 61 deletions(-)

commit 1c95d3d7c90e76bc908f643f3556e79c4c0667aa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 5 14:47:40 2009 +0100

    remove EmpathyTpTube from Python bindings

 python/pyempathy/pyempathy.override | 1 -
 python/update-binding.sh	     | 1 -
 2 files changed, 2 deletions(-)

commit 000d345c18bae7db791214b0216f71d630d66e12
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 5 14:46:32 2009 +0100

    tube-handler: use TpChannel directly instead of EmpathyTpTube

 libempathy/empathy-tube-handler.c | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

commit 927e7227b6cbb423b00962ff2b0bc9d3c737f7d1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 5 14:36:11 2009 +0100

    remove empathy-tp-tube from doc

 docs/libempathy/libempathy-docs.sgml | 1 -
 1 file changed, 1 deletion(-)

commit 7b773f345bcd34b32b46f8e0c471cbd7d19abf40
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 5 14:35:59 2009 +0100

    stop to build empathy-tp-tube

 libempathy/Makefile.am | 2 --
 1 file changed, 2 deletions(-)

commit b09a383920ecef2f5cc16a7c114bc5e6c0e63d25
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jun 5 14:35:47 2009 +0100

    remove empathy-tp-tube

 libempathy/empathy-tp-tube.c | 669
 -------------------------------------------
 libempathy/empathy-tp-tube.h | 103 -------
 2 files changed, 772 deletions(-)

commit 48767187edcf5e3e2cac0e08bacfcaa3c735ee49
Merge: b28c2c1 b6041ca
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jun 9 10:10:26 2009 +0100

    Merge commit 'gmillaires/fix-564259'

commit b6041ca821ce4b9c3c527caee9e30fef6d2a2870
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Mon Jun 8 22:52:55 2009 -0400

    Activated tooltips feature for MUC contact list

 libempathy-gtk/empathy-chat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b28c2c17566ac07565b98e6720c7a6a5ec927ad1
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Mon Jun 8 15:10:57 2009 -0400

    Distribute conditionally built files

 libempathy-gtk/Makefile.am | 20 ++++++++++++--------
 src/Makefile.am	    | 16 +++++++++++-----
 2 files changed, 23 insertions(+), 13 deletions(-)

commit cc548789733a60b077718c022b6b0e03fc793857
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Sun Jun 7 21:08:43 2009 +0100

    Don't repeat a tooltip format string

 src/empathy-chat-window.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

commit 32d9b5f6dced1d8a51daa5bdced9d2784c1f0698
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Sun Jun 7 20:58:13 2009 +0100

    Italicize status message in tooltip

 src/empathy-chat-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c6b5ba56f7156b911e2292b2b638ebd46577ae99
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Sun Jun 7 20:57:29 2009 +0100

    Don't include "Available"/"Away"... in tooltips

    I don't think including the default string for a status adds
    anything to
    the tooltips.

 src/empathy-chat-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 03f13ebc2457e06ea2c90153777c57a4921876a9
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Sun Jun 7 20:53:50 2009 +0100

    Extract markup_printf-append-free to a function

    The repeated g_markup_printf_escaped; g_string_append; g_free offended
    me. I think this makes the function easier to read.

 src/empathy-chat-window.c | 47
 +++++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 18 deletions(-)

commit fe0b029e662224a5218f09eeabb0a49739620740
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Sun Jun 7 20:19:01 2009 +0100

    Only show status in tooltip when it exists

    empathy_contact_get_status () can return NULL: perhaps the protocol
    doesn't support presence, or perhaps we're not subscribed to the
    contact's presence.

 src/empathy-chat-window.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

commit b82e930d045ce65fc9bfb6529898349144101be8
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Sat Jun 6 13:01:00 2009 +0100

    Don't double-unref superseded group TpChannels.

 libempathy/empathy-tp-contact-list.c | 44
 ++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 7 deletions(-)

commit d440d9ab734b45ffc651750a3d317e299c851821
Merge: 396aff9 138ec18
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Sun Jun 7 14:35:11 2009 +0100

    Merge branch 'profile-chooser'

commit f399b307ebc18c2382cb09ac24b41de2f5212bf7
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sun Jun 7 15:11:28 2009 +0200

    Fix make check

 libempathy/empathy-tp-file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d0c304bac08a910c048bee84338a97d55a5d0811
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sun Jun 7 15:10:23 2009 +0200

    Emit an error for socket types we don't handle

    Also, fix error handling when a socket fails on connect().

 libempathy/empathy-tp-file.c | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

commit f0d5544426b06662365a3b99e05eae23e76b6ee6
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Tue Jun 2 11:09:28 2009 +0200

    Use empathy_uint_compare

 libempathy/empathy-tp-file.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

commit 246c2f6468ab7dc1546b2793aed023035f5d88e8
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sun May 24 17:49:08 2009 +0200

    Build fix after rebase

 libempathy/empathy-tp-file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 87d8aa4edcb738d89e77a0d8286e47649fe164f6
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed May 20 12:15:08 2009 +0200

    Initialize the address and port values

    The address the CM returns if we're using IPV4 is of the type
    TP_STRUCT_TYPE_SOCKET_ADDRESS_IPV4; use those values to setup the IPV4
    socket.

 libempathy/empathy-tp-file.c | 46
 ++++++++++++++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 12 deletions(-)

commit 75fd5cc5365178dbaeb5d48cf5c426c46e46b867
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed May 20 02:12:30 2009 +0200

    Add support for IPV4 sockets

 libempathy/empathy-tp-file.c | 93
 ++++++++++++++++++++++++++++++++------------
 1 file changed, 68 insertions(+), 25 deletions(-)

commit 62197f1d3c75224c2138ebda5dbc420bc166e3a6
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue May 19 16:17:22 2009 +0200

    Look at the available socket type

    Look at the available socket types, and don't hardcode UNIX/LOCALHOST
    values.

 libempathy/empathy-tp-file.c | 72
 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

commit 138ec18cd4c9deafd20d4e0b08c4d3dab07f7c10
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Sun Jun 7 14:15:26 2009 +0100

    Add empathy_profile_chooser to libempathy-gtk type list.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 docs/libempathy-gtk/libempathy-gtk.types | 1 +
 1 file changed, 1 insertion(+)

commit cb475d95ee299924317b9e2aedfc1f93c5982b18
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Sun Jun 7 14:15:19 2009 +0100

    Fix small typo in docs.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy-gtk/empathy-profile-chooser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 951970b64634802ab084cdccccce5104142ee76f
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Sun Jun 7 14:02:30 2009 +0100

    Chain up to the constructed call of the parent class.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy-gtk/empathy-profile-chooser.c | 3 +++
 1 file changed, 3 insertions(+)

commit fbebfd376a9a571acdd12508031d2bb13a6ddfc3
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Sun Jun 7 13:48:40 2009 +0100

    Only include gtk/gtk.h and not gtkcombobox.h.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy-gtk/empathy-profile-chooser.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 71a29e5e3c19c219399c3354f53c932b5d02804e
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Sun Jun 7 13:45:58 2009 +0100

    Implement constructed instead of constructor.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy-gtk/empathy-profile-chooser.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

commit 4f7bc97c36095dad43bb183105d49c713cf74bfe
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Sun Jun 7 13:43:23 2009 +0100

    Small coding style change.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy-gtk/empathy-profile-chooser.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 396aff97047f039c5bca8f3a0da13b9b295e657b
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Sat Jun 6 22:30:38 2009 +0800

    Fix silly mistake where I passed the struct pointer and not the
    first member

 libempathy-gtk/empathy-presence-chooser.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c2392bfba90e89593ddd93c98055b9f477a054ee
Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
Date:	Sat Jun 6 12:47:26 2009 +0200

    Updated Spanish translation

 po/es.po | 183
 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 116 insertions(+), 67 deletions(-)

commit a55a2d6e7dfedc51154e3d73fab40707d87c579f
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Fri Jun 5 15:19:02 2009 +0100

    Use tp_asv_get_string instead of messing with GValues.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-import-pidgin.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

commit 78a59f67de194944fb5c988e100a42e56e9de890
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Fri Jun 5 15:10:07 2009 +0100

    Use "foo == NULL" instead of "!foo".

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-import-pidgin.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 48236b65f7ac33d05f0bc4a7a83ddec1e9ec59aa
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Fri Jun 5 15:04:40 2009 +0100

    Set an empty password for pidgin accounts that have no password set.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-import-pidgin.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 9c1dfe2afbeae0a3e598e5afe094f42b321e5257
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Fri Jun 5 14:59:15 2009 +0100

    Special-case XMPP with importing accounts from Pidgin. (Fixes bug
    #579992)

    It was decided that if pidgin has an account with no host set, then
    both the server and port should be ignored, as a special case in XMPP.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-import-pidgin.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

commit ca094304b0184f2c248ab29e95c14a8dad0acc4a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Fri Jun 5 13:59:18 2009 +0100

    Update python bindings.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 python/pyempathygtk/pyempathygtk.defs | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

commit 0f77bf449105bd33390e1ba88d51b2e8f2993770
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Fri Jun 5 13:58:40 2009 +0100

    Update the accounts dialog to the new profile chooser API.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-accounts-dialog.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 60fc555a09b01a7bb7b974c3d875eab0ba66f0d3
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Fri Jun 5 13:57:49 2009 +0100

    Make EmpathyProfileChooser a subclass of GtkComboBox.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy-gtk/empathy-profile-chooser.c | 226
 +++++++++++++++++++++----------
 libempathy-gtk/empathy-profile-chooser.h |  47 ++++++-
 2 files changed, 194 insertions(+), 79 deletions(-)

commit 326ec5c02e85f1a94580120f6ccd715245348209
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jun 4 23:04:46 2009 +0100

    Convert style to Telepathy coding style.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy-gtk/empathy-profile-chooser.c | 302
 ++++++++++++++++---------------
 libempathy-gtk/empathy-profile-chooser.h |   6 +-
 2 files changed, 155 insertions(+), 153 deletions(-)

commit d3dc61867d99d3f9fa50e204fba66943d955ecd1
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jun 4 23:03:01 2009 +0100

    Add test-empathy-profile-chooser.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 tests/.gitignore		      |  1 +
 tests/Makefile.am		      |  4 +++-
 tests/test-empathy-profile-chooser.c | 31 +++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

commit 3d1f8a776ca187ee211cdd2361b0aab79def6834
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jun 4 22:04:30 2009 +0100

    Add simple flymake support.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy-gtk/Makefile.am | 1 +
 libempathy/Makefile.am     | 1 +
 src/Makefile.am	    | 1 +
 tools/Makefile.am	    | 1 +
 tools/flymake.mk	    | 4 ++++
 5 files changed, 8 insertions(+)

commit 26ee37e8b33a4df369558a7ba150839455663680
Merge: 634b9e0 d25cf54
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Fri Jun 5 12:24:21 2009 +0100

    Merge branch 'debug-fixes'

commit 634b9e01dc43cdacef58b5baf213883ff88227ce
Author: A S Alam <aalam@users.sf.net>
Date:	Fri Jun 5 06:42:58 2009 +0530

    updating Translation for Gurmukhi

 po/pa.po | 966
 +++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 595 insertions(+), 371 deletions(-)

commit d25cf54e8cc0dd24731cc528881a8863b30321b8
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jun 4 22:46:22 2009 +0100

    Don't display an empty treeview if there are no connections on
    opening.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 2c8c5507c716c4a3ed236037697ef0fa11b99fa3
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jun 4 22:45:46 2009 +0100

    Don't unref widgets twice.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 6 ------
 1 file changed, 6 deletions(-)

commit e3c8aaf705a14f7db408781cf1332cd7d67e4da4
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jun 4 22:45:21 2009 +0100

    Free a GError after use.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 1 +
 1 file changed, 1 insertion(+)

commit b1d33938778faa1faa3687e87bb8646d6668992d
Merge: b788f7c c06f26d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jun 4 17:09:44 2009 +0100

    Merge branch 'debug'

    Conflicts:
	extensions/Makefile.am
	extensions/misc.xml
	po/POTFILES.in

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit b788f7ca76096138b65f4518fb4435608cd0f91f
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jun 4 16:42:07 2009 +0100

    Coding style fixes.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-contact.c	 | 2 +-
 libempathy/empathy-dispatcher.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit c06f26d8c999b47c22dcd78f07140d027e8882c7
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jun 4 16:36:54 2009 +0100

    Add empathy-debug-dialog to POTFILES.in.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit 7216c2ed732ae4fb661dfa749ac1a73939edc325
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jun 4 16:19:02 2009 +0100

    Display a label if the selected CM does not support Debug.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 62
 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 56 insertions(+), 6 deletions(-)

commit cb3f09f50537a6cac40a2e1a5d30e045ad426a20
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jun 4 16:18:26 2009 +0100

    Add level label to priv struct.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 899e4cd7f419588e11a5991e9bfb27f6da1b9135
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Thu Jun 4 10:50:47 2009 -0400

    Fix Bug 584830: Invalid read in new_connection_cb

    There is a manager and a location_manager pointer in that
    function. The
    wrong one was used in the cast.

 libempathy-gtk/empathy-location-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d2c0aaae088b846dfb54e39b389aaa4a71d4ddac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Jun 4 14:59:22 2009 +0100

    event_manager_approve_channel_cb: displayed ignored channel type

 src/empathy-event-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 018cfa176218b8f75b376ada4bf8c43012fb9627
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jun 4 14:33:41 2009 +0100

    Store toolbar items in priv struct.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 71
 +++++++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 33 deletions(-)

commit b1c7419f38db35c1793e1e080c612cfdb7d68b6b
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jun 4 14:26:53 2009 +0100

    Keep a ref to the TpDBusDaemon so the NameOwnerChanged cb gets called.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit ea5fbd90e9e36f1081cab4a0d2d92bc9eef25696
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Jun 4 14:19:51 2009 +0100

    Clean up EmpathyDebugDialogPriv.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

commit a3e1b4666571ae951683c782f89be26eae4fb97a
Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
Date:	Wed Jun 3 20:08:01 2009 +0200

    Updated Spanish translation

 po/es.po | 675
 ++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 405 insertions(+), 270 deletions(-)

commit 07027834acf0c40105693f079dea51687cd07141
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Jun 3 15:29:30 2009 +0100

    Use G_GSIZE_FORMAT instead of %u.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit de1ff4426cd4b50bbea43e882bddd894936b2313
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Wed Jun 3 13:10:05 2009 +0100

    Updated Debug spec.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 extensions/Debug.xml | 140
 +++++++++++++++++++++++++++++++++++----------------
 1 file changed, 97 insertions(+), 43 deletions(-)

commit d083a54cbe33ed66d621a4b5bd47f3ebd75346cd
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Jun 2 23:47:00 2009 +0100

    Add a right-click menu to conversation window tabs.

    It turns out that GtkNotebook supports right-click menus that list the
    tabs with minimal effort on our part. This makes it easier to
    deal with
    windows with more tabs than can fit in the space available.

    Signed-off-by: Will Thompson <will.thompson@collabora.co.uk>

 src/empathy-chat-window.c | 84
 +++++++++++++++++++++++++++++------------------
 1 file changed, 52 insertions(+), 32 deletions(-)

commit 6c869a62128a755dfd688c94f37546d8127aaa07
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Jun 2 19:05:51 2009 +0100

    Remove "View"/"Show" prefixes from View menu items

    Signed-off-by: Will Thompson <will.thompson@collabora.co.uk>

 src/empathy-main-window.ui | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 7b0009a165c60dc32b916de60d4ff641f6091665
Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
Date:	Tue Jun 2 20:18:10 2009 +0200

    Updated Spanish translation

 po/es.po | 334
 +++++++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 252 insertions(+), 82 deletions(-)

commit dd5468856810324668718259674b5e78c97b19e7
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Jun 2 19:32:10 2009 +0200

    Invert the presence order.

 libempathy-gtk/empathy-contact-list-store.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fce49b89f9e5e0f864b7f2d7fbda69397a575ed4
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Mon Jun 1 13:39:38 2009 -0400

    Fix Bug 584518: Critical error in publish_to_all_connections

    The account_manager was initialised after the callbacks were.

 libempathy-gtk/empathy-location-manager.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 76d2f71aecdc4abd5ca423626792c66dc4eeb2b0
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Mon Jun 1 12:10:29 2009 -0400

    Level is used before init

 libempathy-gtk/empathy-location-manager.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 3623b886388ccb1a581177c096a1668b26fdadd1
Merge: b06c101 17fec97
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Jun 1 18:07:13 2009 +0200

    Merge branch 'ft_rework'

commit 17fec9762e1680828a73efb59f7ed155219763ac
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Jun 1 18:02:03 2009 +0200

    Fix conflict after rebase

 src/empathy.c | 1 -
 1 file changed, 1 deletion(-)

commit b06c101e97689187240ea55fe1d3e399ed0960e0
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Mon Jun 1 12:06:50 2009 +0100

    Don't set NM presence state on connect when it was unset

    When the presence state that was saved upon disconnect was _UNSET
    don't try to
    set it when we reconnect.

 libempathy/empathy-idle.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit f0c1f00b3562294709827d1463b3d605e0f09f40
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Jun 1 17:32:57 2009 +0200

    Update python bindings

 python/pyempathy/pyempathy.defs | 43
 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 7 deletions(-)

commit b2a7b3d8d9f69f611d7c4ffc1df298bf33de03ff
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Jun 1 17:17:50 2009 +0200

    Format contact information when hashing

 src/empathy-ft-manager.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit e2fa5b38c29e8b2c1572ff477ef602b739791f57
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Jun 1 17:14:07 2009 +0200

    Free the cb_data after errors in construction

 libempathy/empathy-ft-handler.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

commit 5a321202dfaa506c8f6e75a9389d4cdb5b8f6619
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Jun 1 17:02:13 2009 +0200

    Add myself to the contributors

 CONTRIBUTORS		    | 1 +
 src/empathy-about-dialog.c | 1 +
 2 files changed, 2 insertions(+)

commit 71542b5863e39c0b7586cbd76e830b97bb8693d6
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Jun 1 17:00:34 2009 +0200

    Update copyright header

 libempathy/empathy-dispatcher.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 7d1926a446c9e7a0e4f149bdca318b876b4e3eb4
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Jun 1 16:59:33 2009 +0200

    Clarify the docs

    Clarify the use of find_requestable_channel_classes in the docs.

 libempathy/empathy-dispatcher.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit f1be1c621d9a331045d756366e59ec7b9a33eac3
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Jun 1 16:44:56 2009 +0200

    Use the new API.

 libempathy/empathy-ft-handler.c | 61
 +++++++++++++++--------------------------
 1 file changed, 22 insertions(+), 39 deletions(-)

commit 1224648072c5077d6846da367b89c5abf19e3e81
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Jun 1 16:44:26 2009 +0200

    Hopefully proper version of _find_requestable_channel_classes ()

 libempathy/empathy-dispatcher.c | 176
 +++++++++++++++++++++-------------------
 1 file changed, 92 insertions(+), 84 deletions(-)

commit 8465ea62a1813462ed4c6170ce74ba8407ef6455
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed May 27 17:42:42 2009 +0200

    Fix trailing whitespace

 libempathy/empathy-ft-handler.c | 2 +-
 libempathy/empathy-utils.c	 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 03dd02c5cf379dc85b0c1dd6e5bf002d9a363bb4
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed May 27 14:39:46 2009 +0200

    Adapt EmpathyCallHandler to the new API

 libempathy/empathy-call-handler.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 48345c658336e3731d7e35905df7dbec52491adf
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed May 27 14:39:06 2009 +0200

    Use the new API in the handler

 libempathy/empathy-ft-handler.c | 86
 +++++++++++++++++++++++++++++++----------
 1 file changed, 65 insertions(+), 21 deletions(-)

commit e59b7ab18c06c473e246a91e8337e629d716b82b
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed May 27 14:38:27 2009 +0200

    Free the list after calling the callback

 libempathy/empathy-dispatcher.c | 3 +++
 1 file changed, 3 insertions(+)

commit 4a3f9aa43df81215cbb0ad1ae1c00702798f44f9
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed May 27 14:36:31 2009 +0200

    Add a helper uint_compare function

 libempathy/empathy-utils.c | 7 +++++++
 libempathy/empathy-utils.h | 2 ++
 2 files changed, 9 insertions(+)

commit b430108ed73aad05a6cb6f94bdb7092abe4daebc
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed May 27 14:35:55 2009 +0200

    Update the requestable channel classes API

    Make it more complex, according to Sjoerd's comments.

 libempathy/empathy-dispatcher.c | 304
 ++++++++++++++++++++++++----------------
 libempathy/empathy-dispatcher.h |   6 +-
 2 files changed, 190 insertions(+), 120 deletions(-)

commit 12ad94e68d9ad3d4258ae8fa0755528a22871b4b
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon May 25 20:05:52 2009 +0200

    Fix trailing whitespaces

 libempathy/empathy-dispatcher.c | 4 ++--
 libempathy/empathy-ft-handler.c | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

commit e0144199db485b5e744c8cb9af6051f8645f40a0
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sun May 24 13:15:46 2009 +0200

    Remove GConf schema

 data/empathy.schemas.in | 15 ---------------
 1 file changed, 15 deletions(-)

commit aef402c6cd92c60b6ee6254f354363abb0ee3b2c
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sun May 24 13:12:54 2009 +0200

    Remove the preferences

 libempathy-gtk/empathy-conf.h |  1 -
 src/empathy-preferences.c     |  5 -----
 src/empathy-preferences.ui    | 36 ------------------------------------
 3 files changed, 42 deletions(-)

commit f14763ece20839cb52cea4c2119503221b380a3a
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sun May 24 13:12:35 2009 +0200

    Remove use_hash when using the file chooser

 libempathy-gtk/empathy-ui-utils.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

commit 69cf2699ca14176d12c980d8de401abf81c435c4
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sun May 24 13:04:33 2009 +0200

    Remove the use_hash arg and property

    Remove the use_hash construct arg and property from EmpathyFTHandler
    and
    make it clear in the docs how clients are supposed to know whether we
    are hashing or not.
    Also, port EmpathyFTFactory to the new API

 libempathy/empathy-ft-factory.c | 18 ++++--------
 libempathy/empathy-ft-factory.h |  6 ++--
 libempathy/empathy-ft-handler.c | 61
 ++++++++++++-----------------------------
 libempathy/empathy-ft-handler.h |  4 +--
 4 files changed, 25 insertions(+), 64 deletions(-)

commit ab0ce8a4bde442384f0e2ca6b0de973e75183607
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sun May 24 12:55:30 2009 +0200

    Actually check if FT+hash is supported

    Use the new API to find out if FT+hash is supported before setting the
    handler as ready. This gives the clients to use
    empathy_ft_handler_can_hash reliably before calling
    empahty_ft_handler_start_transfer to know to which signal they should
    connect.

 libempathy/empathy-ft-handler.c | 114
 ++++++++++++++++++++++++++--------------
 1 file changed, 74 insertions(+), 40 deletions(-)

commit 67d4fbf275c98ed8478818cd8ee8d6e5d6c83844
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sun May 24 12:55:08 2009 +0200

    Use the new API in the call handler

 libempathy/empathy-call-handler.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit ab09ea63588d1b00e3ec3474546f181e041af6e4
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sun May 24 12:54:30 2009 +0200

    Add find_requestable_channel_classes

    And remove find_channel_class API.

 libempathy/empathy-dispatcher.c | 149
 ++++++++++++++++++++++++++++++++++++++--
 libempathy/empathy-dispatcher.h |  16 +++--
 2 files changed, 152 insertions(+), 13 deletions(-)

commit 020e85a643577821fc679868d0495fdda958760c
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat May 23 16:39:18 2009 +0200

    Don't chain up to constructor

 libempathy/empathy-tp-file.c | 2 --
 1 file changed, 2 deletions(-)

commit da1129424fd0d5a2809e0a9f077100cbc10fb046
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat May 23 16:32:42 2009 +0200

    Add GObject propreties for EmpathyFTHandler

 libempathy/empathy-ft-handler.c | 110
 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 109 insertions(+), 1 deletion(-)

commit 55a8adfe1d7856c5736cefc860e050223795a48d
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat May 23 16:16:38 2009 +0200

    Use _constructed instead of _constructor

 libempathy/empathy-tp-file.c | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

commit 50e5710f5d7650ee5cd7c9ffc949457675e5a459
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat May 23 16:09:37 2009 +0200

    Remove useless member

 libempathy/empathy-ft-handler.c | 1 -
 1 file changed, 1 deletion(-)

commit 421b6efa8018de4973050e8f2799c81687395986
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat May 23 16:08:05 2009 +0200

    Remove the g_idle sources on destroy

    Remove the GSources added with g_idle_add when destroying the
    EmpathyDispatcher.

 libempathy/empathy-dispatcher.c | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

commit b9c4083bc1c4924171bc0095d1489f6354534960
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat May 23 15:42:02 2009 +0200

    Actually see if the connection is ready

    Before appending an outstanding request for channel classes, verify
    thigns aren't actually ready.

 libempathy/empathy-dispatcher.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

commit fec609875fd59ec0d50114e638620e3d372c511e
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat May 23 15:34:28 2009 +0200

    Style fixes for *_free() functions

 libempathy/empathy-dispatcher.c |  3 +--
 libempathy/empathy-ft-handler.c | 27 ++++++---------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

commit 3c0044036538d3a3e4faf600c097e57f551e2d4f
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat May 23 15:28:37 2009 +0200

    Don't use slices for 4096 chunks

 libempathy/empathy-ft-handler.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e442cf1c6b5f22ae3d3b8acb537ebe32d932b676
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed May 20 20:02:03 2009 +0200

    Properly free memory

 libempathy/empathy-ft-handler.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c23cff9fadeae104feff7c19764bafaff78cfbd6
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed May 20 12:34:23 2009 +0200

    Clarify a bit the docs about checksumming

 libempathy/empathy-ft-handler.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit f2020ab546f98b45080923b07129b2ab38d087bd
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue May 19 12:16:39 2009 +0200

    Clear the remaining time when transfer ends

    Also, use empathy_builder_unref_and_keep_widget() on the
    EmpathyFTManager toplevel.

 src/empathy-ft-manager.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

commit ee4dc84a5d3a25576e9960b52dc8fa0e1e6a4703
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon May 18 19:25:41 2009 +0200

    Add the received files to GtkRecentManager

 src/empathy-ft-manager.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 45e9d9d455df7732f19e5af8c54c066965238eaa
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon May 18 19:21:49 2009 +0200

    Report the right remaining time in the progress cb

 libempathy/empathy-ft-handler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ffe88b8bb214b0af5b92f600d9fa43bbd71d4761
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon May 18 18:35:30 2009 +0200

    Plug a leak

 src/empathy-ft-manager.c | 2 ++
 1 file changed, 2 insertions(+)

commit 404ce36f5d2a717998c1dd79ddb0acf11fe24f54
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon May 18 17:59:51 2009 +0200

    Add a comment to make the style checker happy

 libempathy/empathy-ft-handler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3b1865b52e8d45c1387176d5c08b8a3441d50a50
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon May 18 17:53:55 2009 +0200

    Fix coding style

 libempathy/empathy-dispatcher.c |  4 ++--
 libempathy/empathy-ft-factory.c |  4 ++--
 libempathy/empathy-ft-handler.c | 26 +++++++++++++-------------
 libempathy/empathy-tp-file.c	 | 10 +++++-----
 src/empathy-ft-manager.c	 |  4 ++--
 5 files changed, 24 insertions(+), 24 deletions(-)

commit 21d0796aaa90612dd499da0d74ac9200bd448393
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon May 18 17:44:21 2009 +0200

    Add some files to POTFILES.in

 po/POTFILES.in | 2 ++
 1 file changed, 2 insertions(+)

commit c145ff5f1d5edc658e666ba05bbb41854e577590
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon May 18 17:31:54 2009 +0200

    Emit the callback always in an idle

    Also, fix some leaks.

 libempathy/empathy-dispatcher.c | 61
 ++++++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 25 deletions(-)

commit 9e3494b16c494577ea54fb809f7dadba1ba482b4
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon May 18 16:59:19 2009 +0200

    Use the new function in EmpathyFTHandler

 libempathy/empathy-ft-handler.c | 71
 +++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

commit f131fb616483531a97334890c56376fc0e2f4cf2
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon May 18 16:59:00 2009 +0200

    Add empathy_dispatcher_find_channel_class_async()

 libempathy/empathy-dispatcher.c | 97
 +++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-dispatcher.h |  6 +++
 2 files changed, 103 insertions(+)

commit 24c1b03b78ee231e78a52ec79eb15e2f41e80338
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon May 18 14:55:01 2009 +0200

    Set use_hash according to what the CM returns

    Set use_hash according to what the CM returns and not what the user
    would like it to be, so that clients won't be confused about whether
    they should connect to "hashing-started" after "transfer-done".

 libempathy/empathy-ft-handler.c | 11 +++++++++++
 src/empathy-ft-manager.c	 | 10 +++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

commit 948f05b5e6b28afbfc0549efe6cc4fd55598738c
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon May 18 14:30:08 2009 +0200

    Use the right macros to pass a gboolean as user_data

    Use GPOINTER_TO_INT and GINT_TO_POINTER instead of passing the
    address,
    as that doesn't work.

 libempathy/empathy-ft-handler.c |  2 ++
 libempathy/empathy-tp-file.c	 | 23 ++++++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

commit 28ca5c25c82b7cb8898d2d967bee88b604c109d4
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon May 18 14:17:28 2009 +0200

    Set the completed message anyway

    Set the completed message anyway in the UI, as it's not guaranteed
    that
    the hashing will take place even if use_hash is TRUE

 src/empathy-ft-manager.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit b2106701b42a161c3aa954e29909e66e5b6fc898
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat May 16 17:08:21 2009 +0200

    Update doc templates

 docs/libempathy-gtk/libempathy-gtk-docs.sgml | 3 +++
 docs/libempathy-gtk/libempathy-gtk.types     | 1 +
 docs/libempathy/libempathy-docs.sgml	      | 5 +++++
 docs/libempathy/libempathy.types	      | 3 +++
 4 files changed, 12 insertions(+)

commit fed60ea90914c7b2a55699a41ba532b405a255a0
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat May 16 17:00:47 2009 +0200

    Document EmpathyFTHandler

 libempathy/empathy-ft-handler.c | 251
 ++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-ft-handler.h |   6 +
 2 files changed, 257 insertions(+)

commit b0fb21acabb015693954ba3d2a56ea2c097167a8
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat May 16 16:04:11 2009 +0200

    Document EmpathyTpFile

 libempathy/empathy-tp-file.c | 87
 +++++++++++++++++++++++++++++++++++---------
 libempathy/empathy-tp-file.h | 12 ++++++
 2 files changed, 82 insertions(+), 17 deletions(-)

commit ee333d5882eeae8069bda92903cdc0f004dc355c
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat May 16 15:44:12 2009 +0200

    Remove useless GET_PRIV

 libempathy/empathy-ft-factory.c | 2 --
 1 file changed, 2 deletions(-)

commit a1352e7be6a9ffcbd3e251e9d5f07b94d996c916
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat May 16 15:41:20 2009 +0200

    Remove useless define

 libempathy/empathy-tp-file.h | 2 --
 1 file changed, 2 deletions(-)

commit 285c936b62a38e455b36b904929cf8856da30f3d
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat May 16 15:38:45 2009 +0200

    Use NULL instead of FALSE

 libempathy/empathy-ft-factory.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1f8a5269ec715a1917274f36450082891bb36c43
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat May 16 15:38:26 2009 +0200

    Document EmpathyFTFactory

 libempathy/empathy-ft-factory.c | 83
 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)

commit a1a7696a9b0c783a10d5a06e32f7e987b9201905
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat May 16 13:17:16 2009 +0200

    Remove useless gtk-doc annotations

    gtk-doc annotations are useless for files outside of libempathy*

 src/empathy-ft-manager.c | 17 -----------------
 1 file changed, 17 deletions(-)

commit 5756b9d02b60f1421abbca71624fc82ef469227a
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri May 15 20:19:19 2009 +0200

    Don't claim outgoing channels

 src/empathy.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 6ff16c56bc78c3df27f0da315536c94ae1a2085c
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri May 15 18:43:15 2009 +0200

    Add a comment.

 libempathy-gtk/empathy-ui-utils.c | 3 +++
 1 file changed, 3 insertions(+)

commit 181c2a5ab6417c2e745e507d64b66f4c6ba261f6
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri May 15 18:39:38 2009 +0200

    Move the error declaration in empathy-tp-file.h

 libempathy/empathy-tp-file.h | 10 ++++++++++
 libempathy/empathy-utils.h   | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

commit 4f3b1c138451c622204bfbc77467ac4d247b035a
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri May 15 18:37:58 2009 +0200

    Unref the EmpathyTpContactFactory

 src/empathy-event-manager.c | 2 ++
 1 file changed, 2 insertions(+)

commit 78fac00f23704f8233c79c7b79ee0c7a8e133c2d
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri May 15 18:36:24 2009 +0200

    Use gchar* instead of char* for allocated retvals

 src/empathy-ft-manager.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit ff229c47dcee18e2723aae6f3b5cd513f79ae503
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri May 15 18:34:59 2009 +0200

    Use != NULL for pointer checks.

 libempathy/empathy-ft-factory.c |  2 +-
 libempathy/empathy-ft-handler.c | 14 +++++++-------
 libempathy/empathy-tp-file.c	 | 32 ++++++++++++++++----------------
 3 files changed, 24 insertions(+), 24 deletions(-)

commit 99e69fa352b25ae65d636a2ab464886d1b8f8af1
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri May 15 18:28:28 2009 +0200

    Use g_slice_* instead of g_malloc

 libempathy/empathy-ft-handler.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 4fcc11053a0a2eef7271431997eb5ff629199290
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri May 15 18:21:37 2009 +0200

    Use tp_g_value_slice_new_* where possible

 libempathy/empathy-ft-handler.c | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

commit 62f32581a28b6b9083efd4bd419cfb217770f19e
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri May 15 18:17:57 2009 +0200

    Unref the EmpathyTpContactFactory

 libempathy/empathy-ft-handler.c | 2 ++
 1 file changed, 2 insertions(+)

commit 69765b1425c0ab80df655df5a5e7a96b707beee6
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri May 15 18:15:36 2009 +0200

    Adapt the code to the tp style.

 libempathy/empathy-ft-factory.c |  30 +++++------
 libempathy/empathy-ft-factory.h |  23 ++++++---
 libempathy/empathy-ft-handler.c |  79 ++++++++++++++---------------
 libempathy/empathy-ft-handler.h |  23 ++++++---
 libempathy/empathy-tp-file.c	 | 108
 ++++++++++++++++++++--------------------
 libempathy/empathy-tp-file.h	 |  47 +++++++++--------
 6 files changed, 166 insertions(+), 144 deletions(-)

commit 0caac94000e5681e22e0938af94ed5ed4d3d206b
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri May 15 16:26:33 2009 +0200

    Plug a string leak

 src/empathy-ft-manager.c | 2 ++
 1 file changed, 2 insertions(+)

commit efc7ca8632a73dd30b0e3b36931e63c3922ae8ee
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri May 15 16:21:39 2009 +0200

    Don't destroy an hashtable owned by DBus

 libempathy/empathy-ft-handler.c | 2 --
 1 file changed, 2 deletions(-)

commit ea473bb361a461e30e45db76377592346af9b3cf
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri May 15 15:38:45 2009 +0200

    Update Python bindings

 python/pyempathy/pyempathy.defs	   | 267
 ++++++++++++++++++++++--------
 python/pyempathy/pyempathy.override	   |   2 +
 python/pyempathygtk/pyempathygtk.defs	   |   8 +
 python/pyempathygtk/pyempathygtk.override |   1 +
 python/update-binding.sh		   |   2 +
 5 files changed, 215 insertions(+), 65 deletions(-)

commit ca4022f7e479bf282db649c15860f41b1d281020
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri May 15 14:50:17 2009 +0200

    Wait for channel close before closing the socket

    So that we can better handle cancellations of the transfer.

 libempathy/empathy-tp-file.c | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

commit 3d5e817ba6f8094d40471fb5c41c4edf3c2e573b
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri May 15 11:21:23 2009 +0200

    Add schema for the new preference

 data/empathy.schemas.in | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

commit 83a1c8e38b10ca0a66adc4f19e78c69f3796c7e4
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri May 15 11:02:45 2009 +0200

    Don't leak GErrors.

 libempathy/empathy-ft-handler.c | 4 +++-
 libempathy/empathy-tp-file.c	 | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

commit 0a96c62150fe235167c291ead9a4f180fd80109e
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri May 15 00:46:26 2009 +0200

    Handle construction errors

    Handle errors that may arise when constructing the handler from the
    factory.

 libempathy/empathy-ft-factory.c | 25 ++++++-------------------
 libempathy/empathy-ft-handler.c |  9 +++++++++
 src/empathy.c			 | 14 ++++++++++++--
 3 files changed, 27 insertions(+), 21 deletions(-)

commit 997c9dabb5fd8ea6631a37a80576d312b0da56d5
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu May 14 19:57:25 2009 +0200

    Set the right initial value in the UI

    Set an initial value for the UI string in case we're not using hash.

 src/empathy-ft-manager.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 434bbd9419c2297bad034ea19adafdb1281bf18c
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu May 14 19:57:17 2009 +0200

    Add some debug messages

 libempathy/empathy-ft-handler.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 94e382478366624bb9c198e349fd1dd6c7b9cf6d
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu May 14 19:44:59 2009 +0200

    Properly handle checksumming in the receiver UI

 src/empathy-ft-manager.c | 53
 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 13 deletions(-)

commit 63369cbc268ec537649056a04ca334882543fff9
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu May 14 13:04:37 2009 +0200

    Remove the singleton logic from the manager

    Don't use a singleton logic for the FT Manager, but let the manager
    itself hold the references according to the state of the toplevel
    window.

 src/empathy-ft-manager.c  | 51
 ++++++++++++++++++++++-------------------------
 src/empathy-ft-manager.h  | 10 ++++------
 src/empathy-main-window.c |  7 +------
 src/empathy.c		   |  8 +-------
 4 files changed, 30 insertions(+), 46 deletions(-)

commit bea3e3b51d5bf55d07b719cd20d9014c158ea7f4
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed May 13 20:25:55 2009 +0200

    Adjust clear button sensitivity

    Set the clear button sensitivity according to the number of
    completed/cancelled handlers in the manager.

 src/empathy-ft-manager.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

commit 11bce5d5883782e2af15bd06a7a10b507b8bbef1
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed May 13 17:35:49 2009 +0200

    Adapt the manager code

    Adapt the manager code to react to the new possible hashing.

 src/empathy-ft-manager.c | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

commit cecbf767e3364d3342aef9b73206d4e29c692953
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed May 13 17:35:25 2009 +0200

    Add empathy_ft_handler_get_use_hash

    This is needed, as the GConf property might change during the
    transfer.

 libempathy/empathy-ft-handler.c | 20 +++++++++++++++++++-
 libempathy/empathy-ft-handler.h |  1 +
 2 files changed, 20 insertions(+), 1 deletion(-)

commit 1cde27a07305bc03e8f7d6d676a24e9ccda8e566
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed May 13 17:34:42 2009 +0200

    Fix a stupid mistake

 libempathy-gtk/empathy-ui-utils.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit 3575745b086596df988be4be7ee40aac06e52caa
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed May 13 16:31:43 2009 +0200

    W.I.P. for hash on receiver side.

 libempathy/empathy-ft-handler.c | 113
 ++++++++++++++++++++++++++++++++++++----
 libempathy/empathy-utils.h	 |   1 +
 2 files changed, 103 insertions(+), 11 deletions(-)

commit 872178334e6171c60b5bcf1cede7ae5a36645da1
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed May 13 15:02:16 2009 +0200

    Add use_hash params for incoming transfers

    Add use_hash params for incoming transfers to the FT Factory and
    Handler, so that we will use them to check hash for received files.

 libempathy-gtk/empathy-ui-utils.c |  8 +++++++-
 libempathy/empathy-ft-factory.c   |  5 +++--
 libempathy/empathy-ft-factory.h   |  2 +-
 libempathy/empathy-ft-handler.c   | 10 ++++++----
 libempathy/empathy-ft-handler.h   |  2 +-
 5 files changed, 18 insertions(+), 9 deletions(-)

commit 46881a51c2c317d482de1889ad29f3e58a0cfe10
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed May 13 14:46:43 2009 +0200

    Clarify UI string

    Checksum is not always possible.

 src/empathy-preferences.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d3fc1349507da7d0bb6538a8e66fa3116bb6eec9
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed May 6 15:04:12 2009 +0200

    Add a new preference in the UI

 libempathy-gtk/empathy-conf.h	   |  1 +
 libempathy-gtk/empathy-ui-utils.c |  9 ++++++++-
 src/empathy-preferences.c	   |  5 +++++
 src/empathy-preferences.ui	   | 36
 ++++++++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 1 deletion(-)

commit 6a0da1dbef905ec7bf93e6d1c0eca6c6b8dfdb4a
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed May 6 15:03:46 2009 +0200

    Add the USE_HASH property in class_init

 libempathy/empathy-ft-handler.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit c0a0111bcdb1d0f65e718883eeea4da868374e2e
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed May 6 14:59:17 2009 +0200

    Update the EmpathyFTFactory API

    Update the factory API to make hashing request optional.

 libempathy/empathy-ft-factory.c | 5 +++--
 libempathy/empathy-ft-factory.h | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

commit ea3f6d46cbcb8faa50b50c317cfde6952947f9be
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed May 6 14:51:13 2009 +0200

    Make checksum optional when sending

 libempathy/empathy-ft-handler.c | 24 +++++++++++++++++++-----
 libempathy/empathy-ft-handler.h |  2 +-
 2 files changed, 20 insertions(+), 6 deletions(-)

commit 9d33f23f7615d118c685c5e6352492a4ee7703f6
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue May 5 21:19:38 2009 +0200

    Cleanup after rebase v2

 libempathy/empathy-tp-file.c | 10 +++++++++
 src/empathy-event-manager.c  | 51
 +++++++++++++++++++++++++++++++-------------
 src/empathy-ft-manager.c     | 10 +++++++++
 src/empathy-ft-manager.h     |  1 +
 src/empathy-main-window.c    |  4 +---
 5 files changed, 58 insertions(+), 18 deletions(-)

commit 3d6b55954ec8fe6fd037f78f3114bdf6f6952e1a
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue May 5 20:10:23 2009 +0200

    First cleanup after rebase

 libempathy/empathy-dispatch-operation.c | 17 -------
 libempathy/empathy-dispatcher.c	 |  2 +-
 libempathy/empathy-ft-handler.c	 | 80
 ++++++++++++++++-----------------
 libempathy/empathy-tp-file.c		 | 18 --------
 4 files changed, 40 insertions(+), 77 deletions(-)

commit c7ea0ef05972116a5b29b50bad98f759cb641e4c
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Tue May 5 18:28:50 2009 +0200

    Simplify the hashing code

    Simplify the hashing code with the aid of GIOScheduler. This has the
    nice side effect that checksum updating is now done in the I/O thread.

 libempathy/empathy-ft-handler.c | 118
 ++++++++++++++++------------------------
 1 file changed, 48 insertions(+), 70 deletions(-)

commit 50577c500cd3a4ed96e024383c720264b130b416
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Tue May 5 17:42:23 2009 +0200

    Ensure the callbacks are only run once

    Also ensure that we get no progress callbacks after the transfer has
    been cancelled.

 libempathy/empathy-ft-handler.c |  3 +++
 libempathy/empathy-tp-file.c	 | 12 ++++++++++++
 2 files changed, 15 insertions(+)

commit 53073da65b919bd68a26e5e0e276ec5ba15f51ea
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Tue May 5 17:22:14 2009 +0200

    Add back speed and remaining time

 libempathy/empathy-ft-handler.c | 66
 ++++++++++++++++++++++++++++++-----------
 src/empathy-ft-manager.c	 | 49 +++++++++++++++++++++++++-----
 2 files changed, 91 insertions(+), 24 deletions(-)

commit 4c38107259d0fd13795adf2218f1fd6fadc0acef
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Tue May 5 15:56:38 2009 +0200

    Close the handler when rejecting a transfer

 libempathy-gtk/empathy-ui-utils.c | 2 ++
 1 file changed, 2 insertions(+)

commit 829c16e8589c94b0bdf719c40e6615d00403175f
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Tue May 5 15:56:08 2009 +0200

    React to Tp remote errors

    Push Tp state change errors to the handler/UI.

 libempathy/empathy-tp-file.c | 60
 +++++++++++++++++++++++++++++++++++++++++---
 libempathy/empathy-utils.h   |  7 +++---
 src/empathy-ft-manager.c     | 25 +-----------------
 3 files changed, 62 insertions(+), 30 deletions(-)

commit 4e83ee317253d1cd3821258a418cdd829ce01549
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Tue May 5 15:35:02 2009 +0200

    Remove hashing progress debug message

 src/empathy-ft-manager.c | 2 --
 1 file changed, 2 deletions(-)

commit 04cc954b2551b7c6c622a630bfc54d55edbe81ab
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Tue May 5 15:02:23 2009 +0200

    Properly ref/unref the request table

    Destroy the request table early, and keep a reference when passing
    it to
    the dispatcher.
    Also, don't cancel the nonexistant EmpathyTpFile when stopping
    hashing.

 libempathy/empathy-ft-handler.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

commit b026e9345b2249d2d5d1217ea79315ffa43151cc
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Tue May 5 15:01:34 2009 +0200

    Don't set the status to cancelled when closing

    If we are only closing a channel, don't set the EmpathyTpFile
    status to
    cancelled.

 libempathy/empathy-tp-file.c | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

commit 4d6781912473aa6b08f78e40857124e1182b4655
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon May 4 12:31:14 2009 +0200

    Handle errors coming from the EmpathyFTFactory

 libempathy/empathy-ft-factory.c |   2 +-
 src/empathy-ft-manager.c	 | 121
 +++++++++++++++++++++++++++++-----------
 src/empathy-ft-manager.h	 |   2 +
 3 files changed, 91 insertions(+), 34 deletions(-)

commit 93226e13ef87be16b42eb77a4b504ec657fd3e2c
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon May 4 12:30:56 2009 +0200

    Set the overwrite confermation when receiving

 libempathy-gtk/empathy-ui-utils.c | 3 +++
 1 file changed, 3 insertions(+)

commit d5f0907f1e62c22d225c9899c847b4ce5ad1e137
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon May 4 03:06:28 2009 +0200

    Unref the EmpathyFTHandlers

    Unref EmpathyFTHandler objects after adding them to the manager.

 src/empathy.c | 2 ++
 1 file changed, 2 insertions(+)

commit 34ca5111a0a540b4b756f02592686668e80e538d
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon May 4 03:05:24 2009 +0200

    Properly emit the TRANSFER_STARTED signal

    Emit the TRANSFER_STARTED signal when actually starting the transfer
    (after the DBus invocation callback).

 libempathy/empathy-ft-handler.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

commit 7cdb829025611c98473e11ea2512f5f8c0bf3c75
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon May 4 03:04:42 2009 +0200

    Don't notify progress for zero bytes

    Also, remove useless state property.

 libempathy/empathy-tp-file.c | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

commit a6b83fc7b0d3a0dbbd2d0266f6b2250221e803bb
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon May 4 02:14:43 2009 +0200

    First implementation of error handling

    Implement the callback in EmpathyFTManager.
    Erase a redundant is_cancelled property in EmpathyFTHandler and
    rely on
    the GCancellable, which is shared by EmpathyTpFile and
    EmpathyFTHandler.

 libempathy/empathy-ft-handler.c | 61
 +++++++++++++++++------------------------
 libempathy/empathy-ft-handler.h |  2 --
 libempathy/empathy-tp-file.c	 | 34 ++---------------------
 libempathy/empathy-tp-file.h	 |  2 --
 src/empathy-ft-manager.c	 | 48 ++++++++++++++++++++++----------
 5 files changed, 60 insertions(+), 87 deletions(-)

commit 1f239a9cb9595292b71fc0336e5d0055c5b81860
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon May 4 01:50:03 2009 +0200

    Total FileTransfer draft spec exorcism

 libempathy/empathy-ft-handler.c | 9 ++++-----
 libempathy/empathy-ft-handler.h | 2 +-
 libempathy/empathy-tp-file.c	 | 6 ++----
 libempathy/empathy-tp-file.h	 | 4 +---
 src/empathy-ft-manager.c	 | 1 -
 5 files changed, 8 insertions(+), 14 deletions(-)

commit 059082374fc8d1cda07486e5e3eb9546a1739811
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon May 4 01:44:24 2009 +0200

    Rework the logic of cancelling transfers

    Rework the logic of cancelling transfers so that the GCancellable
    object
    is not used from an UI frontend, as that would require to duplicate
    storage for each EmpathyFTHandler in the manager.

 libempathy/empathy-ft-handler.c | 19 ++++++++++++++++---
 libempathy/empathy-ft-handler.h |  4 ++--
 src/empathy-ft-manager.c	 | 27 +++------------------------
 3 files changed, 21 insertions(+), 29 deletions(-)

commit 74817d7509831f225de813fa82fa8d53c3a44f58
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon May 4 01:32:22 2009 +0200

    Use proper DEBUG() messages

 libempathy/empathy-ft-handler.c | 16 ++++++++--------
 libempathy/empathy-tp-file.c	 |  1 -
 2 files changed, 8 insertions(+), 9 deletions(-)

commit 26274be2897e98800e0b7baeda3319916205b56c
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon May 4 01:29:08 2009 +0200

    Use values from TpFileTransferState

    Use values from the TpFileTransferState and
    TpFileTransferStateChangeReason enums instead of the Empathy draft
    interfaces.

 libempathy/empathy-tp-file.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 7d5485549becfc095556d282f6622ce2b16caef0
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon May 4 01:26:15 2009 +0200

    Only close the FT operation after the state change

    Close the FT operation only after the "completed" state change
    has been
    emitted, so that we can guarantee there will be no other progress
    signals emitted after TRANSFER_DONE.
    Also, add some other debug calls.

 libempathy/empathy-ft-handler.c |  2 ++
 libempathy/empathy-tp-file.c	 | 13 +++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

commit 584de2350d0299bedcdb140cbb9adeb8a13ea42c
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sun May 3 19:21:15 2009 +0200

    Format messages for hashing

    Format messages when hashing.
    Also, add some debug spew to see when the callbacks are called.

 src/empathy-ft-manager.c | 60
 +++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 49 insertions(+), 11 deletions(-)

commit 74bea808243c98816732864de15a8dfd887d0f22
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sun May 3 19:19:54 2009 +0200

    Emit the TRANSFER_STARTED signal

    Emit the TRANSFER_STARTED signal also when offering.

 libempathy/empathy-ft-handler.c | 3 +++
 1 file changed, 3 insertions(+)

commit 92da9df161cf8e104e783a943d40d7a248a18259
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sun May 3 19:18:26 2009 +0200

    Set the "incoming" property at construct

    Set the "incoming" property of EmpathyTpFile when we construct it from
    EmpathyDispatchOperation.

 libempathy/empathy-dispatch-operation.c | 11 ++---------
 libempathy/empathy-tp-file.c		 | 25 +++++++++++++++++++++----
 libempathy/empathy-tp-file.h		 |  2 +-
 3 files changed, 24 insertions(+), 14 deletions(-)

commit 6ce42b069142048084697f8def936c5d7e376101
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat May 2 21:11:20 2009 +0200

    Sync with changes in master

    Sync with the changes in master and port to the stable TP FileTransfer
    spec.

 libempathy/empathy-tp-file.c | 47
 ++++++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 17 deletions(-)

commit a37cd739d75587cc5a38389586a6f8a5cdd6e083
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat May 2 21:10:38 2009 +0200

    Add is_completed and is_cancelled API

    Add some API to get the state of the handler.

 libempathy/empathy-ft-handler.c | 64
 +++++++++++++++++++++++++++++++++--------
 libempathy/empathy-ft-handler.h |  2 ++
 2 files changed, 54 insertions(+), 12 deletions(-)

commit 7d8254421a1b91516f35255c1a149c288fc92d22
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat May 2 21:09:43 2009 +0200

    Use the proper TP interface instead of emp_cli

    Update to use the stable TP interface for FT.

 src/empathy-ft-manager.c | 33 ++++++++++++++++++++++++---------
 src/empathy.c		  |  2 +-
 2 files changed, 25 insertions(+), 10 deletions(-)

commit acfdeef8ac4a6599ba3df55ab207088264ea3e8d
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Sat May 2 15:23:13 2009 +0200

    Make the whole thing compile

    The branch now compiles. Still have to debug and implement error
    handling.

 src/empathy-ft-manager.c | 440
 ++++++++++++++++++++++++-----------------------
 1 file changed, 229 insertions(+), 211 deletions(-)

commit a698a6f2f622061c7b23c589a0a9eb0b72573993
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Apr 30 19:50:06 2009 +0200

    Remove some of the EmpFileTransferState crack

    The basic idea is to completely hide the state in EmpathyFTHandler,
    and
    let the clients interact with the signal interface instead of
    switching
    cases for the state.

 libempathy/empathy-tp-file.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit a64bc30f336c9dc6fa8e22f33cae3a97d5819d7d
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Apr 30 19:49:47 2009 +0200

    Add empathy_ft_handler_get_total_bytes API

 libempathy/empathy-ft-handler.c | 20 ++++++++++++++++----
 libempathy/empathy-ft-handler.h |  9 +++------
 2 files changed, 19 insertions(+), 10 deletions(-)

commit cb541929d5079a6c817685776ee86b1b7c4664fc
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Apr 30 17:57:19 2009 +0200

    s/ft_manager/manager/ where appropriate

 src/empathy-ft-manager.c | 111
 +++++++++++++++++++++++------------------------
 1 file changed, 54 insertions(+), 57 deletions(-)

commit d9cc7cfc1e666dececb9fd1eac28281d6b0354a9
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Apr 30 17:38:27 2009 +0200

    W.I.P. code for EmpathyFTManager v2

    Use GET_PRIV everywhere
    Stubs of implementations of the transfer state machine

 src/empathy-ft-manager.c | 331
 +++++++++++++++++++++++++++--------------------
 1 file changed, 188 insertions(+), 143 deletions(-)

commit 7eb34d005b43f8e1a4c6120ad00ac5730bb5cfb2
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Apr 30 17:38:11 2009 +0200

    Add empathy_ft_handler_get_transferred_bytes API

 libempathy/empathy-ft-handler.c | 12 ++++++++++++
 libempathy/empathy-ft-handler.h |  1 +
 2 files changed, 13 insertions(+)

commit 113996fbc2c8afd4835a525b1f977e96c002ddf5
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed Apr 29 17:48:22 2009 +0200

    First batch of W.I.P. rework of EmpathyFTManager

 src/empathy-ft-manager.c | 538
 ++++++++++++++++-------------------------------
 src/empathy-ft-manager.h |  39 ++--
 2 files changed, 197 insertions(+), 380 deletions(-)

commit ab87573e65ed5f09573398e11fa286585fb13846
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed Apr 29 17:47:51 2009 +0200

    Add to the EmpathyFTManager the new handlers.

 src/empathy.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit a18e5fce7d4e98b0f5bbe3d2c5dc0eb9a8684dd2
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed Apr 29 17:46:31 2009 +0200

    Add some useful APIs to EmpathyFTHandler

    Add some APIs to EmpathyFTHandler useful to get transfer properties.
    Also, implement an error signal.

 libempathy/empathy-ft-handler.c | 79
 +++++++++++++++++++++++++++++++++++++++--
 libempathy/empathy-ft-handler.h | 11 ++++++
 2 files changed, 88 insertions(+), 2 deletions(-)

commit 3c048a484986d560d1a8468b4a238b7c7fc0f4f7
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed Apr 29 17:45:48 2009 +0200

    Fix indentation of function prototype

 libempathy/empathy-ft-factory.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 24b86703ef5fa0e181108af76bb8ba54efb7cccb
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed Apr 29 17:45:11 2009 +0200

    Remove useless include of empathy-tp-file.h

 libempathy/empathy-dispatcher.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 23b3f7b0609a948267a9b7855079e124e0a1ab7d
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed Feb 18 16:47:16 2009 +0100

    Remove dead code in EmpathyDispatcher

 libempathy/empathy-dispatcher.c | 131
 ----------------------------------------
 1 file changed, 131 deletions(-)

commit 58d08cef143811d990218551a922451609978610
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed Feb 18 16:41:12 2009 +0100

    Rethink a bit the logic for an incoming transfer.

    Now, a client should have to do the following, in order to receive
    a file transfer:
    - let the EmpathyFTFactory claim the EmpathyDispatchOperation
    - the factory will emit "new-incoming-transfer" when the handler is
    filled with
      the relevant properties
    - now you can choose a destination file, and then you should call
    _set_destination
      on EmpathyFTFactory passing the handler.
    - the factory will emit "new-ft-handler" as you're now ready to
    start the actual
      transfer.

 libempathy-gtk/empathy-ui-utils.c | 46
 ++++++++++++++++++++++++++++++++++++++-
 libempathy-gtk/empathy-ui-utils.h |  3 ++-
 libempathy/empathy-ft-factory.c   | 43
 +++++++++++++++++++++++++++---------
 libempathy/empathy-ft-factory.h   |  9 ++++++--
 libempathy/empathy-ft-handler.c   | 26 +++++++++++++++++++---
 libempathy/empathy-ft-handler.h   |  9 ++++++--
 src/empathy.c			   | 26 +++++++++++++++++++++-
 7 files changed, 142 insertions(+), 20 deletions(-)

commit 1e69ae50fa2a35ac4e54283d40e9d96777ff6e61
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed Feb 18 12:16:11 2009 +0100

    Use the new API to send a file with the file chooser.

 libempathy-gtk/empathy-ui-utils.c | 103
 ++++++--------------------------------
 1 file changed, 14 insertions(+), 89 deletions(-)

commit 0b8cc28c3452e43672905553aaf006c178587605
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed Feb 18 11:49:02 2009 +0100

    Emit the transfer_started signal as soon as we start an incoming
    transfer.

 libempathy/empathy-ft-handler.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 4c8eb38a82759926b11ce0454c33a127037d3ba7
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed Feb 18 11:45:38 2009 +0100

    Free memory in _finalize inside EmpathyFTHandler.

 libempathy/empathy-ft-handler.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit 94722faf307e2e0d4d1d9532893f0a2206ac4803
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed Feb 18 11:41:46 2009 +0100

    We don't need dispose, finalize and private fields in EmpathyFTFactory
    (yet?).

 libempathy/empathy-ft-factory.c | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

commit 04a90fadbd4dcd4fa2276a06f2cf4fdae411b729
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed Feb 18 11:39:49 2009 +0100

    Cleanup in EmpathyTpFile style.

 libempathy/empathy-tp-file.c | 379
 +++++++++++++++++++++----------------------
 libempathy/empathy-tp-file.h |   8 +-
 2 files changed, 187 insertions(+), 200 deletions(-)

commit e5ac1f797a0e2f24f9a2412abf833dcdddf6998d
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Feb 17 20:07:06 2009 +0100

    Make libempathy compile with the new changes.

 libempathy/empathy-ft-factory.c |  24 ++++--
 libempathy/empathy-ft-handler.c |   3 +-
 libempathy/empathy-tp-file.c	 | 169
 +++++++++++++++++++---------------------
 libempathy/empathy-tp-file.h	 |   3 +-
 4 files changed, 100 insertions(+), 99 deletions(-)

commit a5440333ee18a3174acc2437e2ba1e30365b1bca
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Feb 17 19:48:01 2009 +0100

    Modify EmpathyFTHandler to adapt to the changes in EmpathyTpFile API.

 libempathy/empathy-ft-handler.c | 47
 +++++++++++++++++++++++++++++++++++------
 libempathy/empathy-ft-handler.h |  5 +++--
 libempathy/empathy-tp-file.c	 |  6 ++----
 3 files changed, 45 insertions(+), 13 deletions(-)

commit 5f52c3e662e717f2246f505eb590c32caca0883d
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Feb 17 14:07:39 2009 +0100

    Remove the RequestData struct.

 libempathy/empathy-ft-handler.c | 267
 ++++++++++++++++++----------------------
 1 file changed, 120 insertions(+), 147 deletions(-)

commit 92778cc0fa77a252763dee87ed1f95f9c7e95cb1
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Tue Feb 17 12:03:58 2009 +0100

    W.I.P. for heavy lifting on EmpathyTpFile.

 libempathy-gtk/empathy-ui-utils.c |   24 +-
 libempathy/empathy-dispatcher.c   |   54 ++
 libempathy/empathy-ft-factory.c   |   24 +-
 libempathy/empathy-ft-factory.h   |	4 +-
 libempathy/empathy-ft-handler.c   |  194 ++++--
 libempathy/empathy-ft-handler.h   |	9 +-
 libempathy/empathy-tp-file.c	   | 1390
 +++++++++++--------------------------
 libempathy/empathy-tp-file.h	   |   66 +-
 libempathy/empathy-utils.h	   |	1 +
 src/empathy.c			   |   14 +-
 10 files changed, 711 insertions(+), 1069 deletions(-)

commit 98284c362f9bea1558a0b0c89f8f8d6a93c63074
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon Feb 9 18:04:50 2009 +0100

    Don't schedule the next read two times when we're finished reading
    the stream.

 libempathy/empathy-ft-handler.c | 1 -
 1 file changed, 1 deletion(-)

commit 2be3236febcc83ebe96ba29dca49f7c1abce6300
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon Feb 9 17:32:47 2009 +0100

    Add debug spew.

 libempathy/empathy-ft-handler.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

commit b16406a06699233fd68cc1cf3a3610eed4d63d6c
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon Feb 9 16:14:08 2009 +0100

    Add some error handling and keep on adding progress signals.

 libempathy/empathy-ft-handler.c | 75
 ++++++++++++++++++++++++++++++++++-------
 libempathy/empathy-utils.h	 |  7 ++++
 2 files changed, 69 insertions(+), 13 deletions(-)

commit 32ea1c4f65f1b38226c6a4216e9271dfbaa12879
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon Feb 9 15:22:08 2009 +0100

    Fix the build.

 libempathy/empathy-ft-handler.c | 8 ++++++--
 libempathy/empathy-ft-handler.h | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

commit ea8aee8ccab439709ef69899512635662b480f5c
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Mon Feb 9 10:20:25 2009 +0100

    Start implementing signals inside EmpathyFTHandler.

 libempathy/empathy-ft-handler.c | 80
 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 73 insertions(+), 7 deletions(-)

commit aab63c16b9ded12295e0fa354757c77b002a6fbd
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Feb 5 15:26:08 2009 +0100

    Implement empathy_ft_factory_claim_channel and make naming uniform.

 libempathy/empathy-ft-factory.c | 23 ++++++++++++++++++-----
 libempathy/empathy-ft-factory.h |  4 ++--
 2 files changed, 20 insertions(+), 7 deletions(-)

commit 0ff13177916385b78b069c851b1b9442c57dbbb2
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Feb 5 15:19:00 2009 +0100

    Fix the build.

 libempathy/empathy-ft-factory.c | 2 +-
 libempathy/empathy-ft-handler.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

commit 0390c52061551390ea77877700c18e7ae57afc08
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Feb 5 15:16:41 2009 +0100

    Set more meaningful names for EmpathyFTHandler public methods.

 libempathy/empathy-ft-handler.c | 15 +++++++++------
 libempathy/empathy-ft-handler.h |  7 ++++---
 2 files changed, 13 insertions(+), 9 deletions(-)

commit 606bffede10826c02b8e5f14d161701720e94e70
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Feb 5 15:00:16 2009 +0100

    Call the dispatcher to create the Channel after we have built the
    request.

 libempathy/empathy-ft-handler.c | 79
 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 73 insertions(+), 6 deletions(-)

commit b470c2894387a2156e4e576137611ba77d1fe5f5
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Feb 5 12:24:47 2009 +0100

    Implement hashing of the file. Make it compile.

 libempathy/Makefile.am		 |   4 +
 libempathy/empathy-ft-factory.c |  13 +-
 libempathy/empathy-ft-factory.h |   4 +
 libempathy/empathy-ft-handler.c | 377
 ++++++++++++++++++++++++++++++++++++++--
 4 files changed, 381 insertions(+), 17 deletions(-)

commit 8bea8f7c36646481454a3f5c0b5db6598ba006fd
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Feb 5 01:25:48 2009 +0100

    Little cleanup.

 libempathy/empathy-ft-handler.c | 6 +++---
 libempathy/empathy-ft-handler.h | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

commit 36e014c3d2ea4bd2c863182c817e146a5e069662
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Wed Feb 4 20:06:30 2009 +0100

    Initial commit for EmpathyFTFactory and EmpathyFTHandler.

 libempathy/empathy-ft-factory.c | 147 +++++++++++++++++++++++++++
 libempathy/empathy-ft-factory.h |  64 ++++++++++++
 libempathy/empathy-ft-handler.c | 216
 ++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-ft-handler.h |  62 ++++++++++++
 4 files changed, 489 insertions(+)

commit eb8b217e20baaa817371266abf43f32de24bd906
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Mon Jun 1 11:10:23 2009 -0400

    Only remove the address fields and position fields instead of all

 libempathy-gtk/empathy-location-manager.c | 32
 +++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

commit 1dec1e60d647ba5380824b6887341f07e0c0ae1b
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Mon Jun 1 10:43:08 2009 -0400

    Remove unused var

 libempathy-gtk/empathy-location-manager.c | 1 -
 1 file changed, 1 deletion(-)

commit 4ef4e182cbbc3396dad6cafb7aea2d5d8fc55694
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Mon Jun 1 10:39:26 2009 -0400

    Get rid of McAccount everywhere

    Shouldn't have to care about accounts, just connections.

 libempathy-gtk/empathy-location-manager.c | 49
 +++++++++++++++----------------
 1 file changed, 24 insertions(+), 25 deletions(-)

commit 09f40353148d467db0464dc512c642c12418ecaa
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Sun May 31 15:39:15 2009 -0400

    Get rid of Mission Control as EmpathyAccountManager does all that too

 libempathy-gtk/empathy-location-manager.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

commit 1e2fff115e8f2da4e42e780878f828ee174e3f4f
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Sun May 31 12:21:22 2009 -0400

    Fix inconsistency in preferences and code

 libempathy-gtk/empathy-location-manager.c | 2 --
 src/empathy-preferences.ui		   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

commit 9869f68136e335d7439d434aa93a9ca229125a45
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Sun May 31 12:12:34 2009 -0400

    Don't set priv on a separate line

 libempathy-gtk/empathy-location-manager.c | 37
 +++++++++----------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

commit 131728206cdc9005585ebe3cb6d0c4430a42de73
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Sun May 31 12:10:02 2009 -0400

    Use tp_g_value_slice_new_double

    tp_asv_* cannot be used as tp_asv does not copy the keys

 libempathy-gtk/empathy-location-manager.c | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

commit 861762f5dd3181f47b6dcb03d1c830100d26ad3d
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Sun May 31 12:03:36 2009 -0400

    Reorder functions to get rid of the function declarations

 libempathy-gtk/empathy-location-manager.c | 455
 ++++++++++++++----------------
 1 file changed, 214 insertions(+), 241 deletions(-)

commit f24134c23869a0a1749a7b8f8bc2347011050a4f
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Sun May 31 11:53:18 2009 -0400

    Reimplement the singleton in the constructor

 libempathy-gtk/empathy-location-manager.c | 37
 +++++++++++++++++++++++--------
 libempathy-gtk/empathy-location-manager.h |  2 +-
 src/empathy.c				   |  2 +-
 3 files changed, 30 insertions(+), 11 deletions(-)

commit 2b4b8cafc87d72a3f93ddab1a2058a64460e54c3
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Fri May 29 16:09:41 2009 -0400

    Fix errors found by make check

 libempathy-gtk/empathy-location-manager.c | 8 ++++----
 libempathy-gtk/empathy-location-manager.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

commit 992b424a41a2725eb96940cb3434ef0fd2a0e589
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Fri May 29 16:00:00 2009 -0400

    Use timeout instead of idle (and fix the fact that it wasn't actually
    working)

 libempathy-gtk/empathy-location-manager.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

commit 9713a23a9b42860aa76f02b82cbc7a761110c3aa
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Fri May 29 15:51:31 2009 -0400

    Use DEBUG instead of printerr

 libempathy-gtk/empathy-location-manager.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit b9f8f5f022fc95a59ae4a20f65b2272ecbdc84c1
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Fri May 29 15:44:39 2009 -0400

    Don't use foreach to iter over a HashTable

 libempathy-gtk/empathy-location-manager.c | 41
 +++++++++++++------------------
 1 file changed, 17 insertions(+), 24 deletions(-)

commit 07d6f0088b1428c6c64b4625c42f36e93cafa267
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Fri May 29 15:38:31 2009 -0400

    Fix bracket style

 libempathy-gtk/empathy-location-manager.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

commit a1d1a2307eb7168be75e46ee89dc016354a62f2c
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Fri May 29 15:35:14 2009 -0400

    Properly unref objects used by EmpathyLocationManager

 libempathy-gtk/empathy-location-manager.c | 38
 ++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 6 deletions(-)

commit 1de150bc48080744009389fb09eb45d4ff96abd2
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Fri May 29 15:27:23 2009 -0400

    Apply style fixes to EmpathyLocationManager

    • update the copyright
    • EmpathyLocationManagerPriv: document the hash table
    • is_setup seems a poor name. geoclue_is_setup?
    • remove PROP_0 we don't need/use it
    • Don't use C++ comments

 libempathy-gtk/empathy-location-manager.c | 35
 +++++++++++++++----------------
 libempathy-gtk/empathy-location-manager.h |  4 ++--
 2 files changed, 19 insertions(+), 20 deletions(-)

commit 7a1fd4ecfdb3af30a23b4cd028a5c7402f1f6a38
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Fri May 29 15:15:42 2009 -0400

    Don't build the file instead of #if the whole file

 libempathy-gtk/Makefile.am		   | 10 ++++++++--
 libempathy-gtk/empathy-location-manager.c |  3 ---
 2 files changed, 8 insertions(+), 5 deletions(-)

commit 6db41c2d2576e35bfe086a9a96e5014a7a8ff6db
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Fri May 29 11:59:31 2009 -0400

    Factory is sometimes ref leaked

 libempathy-gtk/empathy-location-manager.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 9330381ac6f8b78ba737a21e42f9b60c1bcee6dd
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Fri May 29 14:08:18 2009 -0400

    Queue location publish requests

    Using an idle callback makes it less probable that the location
    will be updated twice in a very short time.  This scenario
    is common is the address_cb and position_cb got a reply from
    geocluse almost at the sametime.

 libempathy-gtk/empathy-location-manager.c | 30
 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

commit 2556a450e8c1c1deb5330dacb00087e6c56d8f57
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Thu May 28 17:03:35 2009 -0400

    Rename empathy_location_manager_get_default to dup_default

    This is more consistent with the rest of Empathy.

 libempathy-gtk/empathy-location-manager.c | 10 +++++++---
 libempathy-gtk/empathy-location-manager.h |  2 +-
 src/empathy.c				   |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

commit 06785f7e2f1cb5634ca941d9933fd3877d63d214
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Thu May 28 14:23:05 2009 -0400

    More explicit debug message on what is published

 libempathy-gtk/empathy-location-manager.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit a674071a1deb51ab75cd6dc550b3db00763f3a5c
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Wed May 27 21:44:05 2009 -0400

    Any location accuracy will do

 libempathy-gtk/empathy-location-manager.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d64c42ef982318c23562986a4b82a0f4f77f7122
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Wed May 27 21:42:47 2009 -0400

    Don't use geoclue's timestamp

    It turns out that the timestamp are not reliable (they
    are often set to 0).

 libempathy-gtk/empathy-location-manager.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

commit f4029062299a0f1c5f68c213bf65569e35ff44a0
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Wed May 27 12:49:37 2009 -0400

    Don't call geoclue functions if the init failed

 libempathy-gtk/empathy-location-manager.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit 8a4e3bef97f66bc40f9c4fb24158f0bd0226ac55
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue Apr 7 17:44:18 2009 -0400

    Fix a warning if McAccount has no TpConnection

 libempathy-gtk/empathy-location-manager.c | 3 +++
 1 file changed, 3 insertions(+)

commit d03890164e921182268c5f34aeb44b93a51b35c6
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue Apr 7 14:38:04 2009 -0400

    Fix left over issues from rebasing

 libempathy-gtk/empathy-location-manager.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit 2d09cd3c1d45360a71930b2c3c971e50a5935b62
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Mon Jan 26 00:06:13 2009 +1100

    Don't show the location preferences if geoclue not available

 src/empathy-preferences.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 3d23b14af82c996165a8eec628d841f463302f7c
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Sun Jan 25 08:05:56 2009 -0500

    Fix compilation if geoclue is not enabled

 libempathy-gtk/empathy-location-manager.c | 8 ++------
 src/empathy.c				   | 8 +++++++-
 2 files changed, 9 insertions(+), 7 deletions(-)

commit cab630a8ac359a8f44fdd30a5c3c128ef5d0916a
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Thu Jan 22 16:03:54 2009 +1100

    Merge fixes due to API changes

 libempathy-gtk/empathy-location-manager.c | 36
 ++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 13 deletions(-)

commit 2bf4823a18e5e140d13cfc37fa767b9e05daac02
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Sat Jan 17 16:32:46 2009 +0200

    Various style fixes

 libempathy-gtk/empathy-location-manager.c | 31
 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

commit 30aa5cfac08630c0599088678a58f10389866221
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue Jan 13 01:02:03 2009 +0200

    Send a int64 timestamp to match the spec

 libempathy-gtk/empathy-location-manager.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

commit 0f9d947f490d741172aad78df2820c25b4e45a5c
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Thu Jan 1 23:34:23 2009 -0500

    Clear remote location upon disabling

 libempathy-gtk/empathy-location-manager.c | 48
 ++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 17 deletions(-)

commit c4a935701119a0a9f54a3b62ed42c867c4e1d489
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue Dec 30 13:24:06 2008 -0500

    Fix key freeing

 libempathy-gtk/empathy-location-manager.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 5faf7832ec78b463808f857a6ffdb8da958355ca
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue Dec 16 17:40:49 2008 -0500

    Implement reduced accuracy

 libempathy-gtk/empathy-location-manager.c | 50
 ++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

commit 82235fee6f56b8dc3c0d7c84e9349a06ceb616e9
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue Dec 16 15:18:51 2008 -0500

    Send timestamp

 libempathy-gtk/empathy-location-manager.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

commit 94d32934ce6f9f4f22b314d262b7b2e7f15fa400
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Mon Dec 15 16:17:45 2008 -0500

    When updating the resources, check for changed location

 libempathy-gtk/empathy-location-manager.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

commit d6625f09c88ea48121c815a4f8f46025c10090c5
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Fri Dec 12 18:14:03 2008 -0500

    More ressource fix

 libempathy-gtk/empathy-location-manager.c | 42
 ++++++++++++++++---------------
 1 file changed, 22 insertions(+), 20 deletions(-)

commit 42344f07956ad7d6eb2d327f87cdb63d08334487
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Fri Dec 12 17:40:22 2008 -0500

    Initial position/address and ressource fix

 libempathy-gtk/empathy-location-manager.c | 58
 +++++++++++++++++++++++++------
 1 file changed, 48 insertions(+), 10 deletions(-)

commit 07061229f3328c3fa5300217004e27f6a12304f8
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Fri Dec 12 13:56:46 2008 -0500

    Should not be elseif

 libempathy-gtk/empathy-location-manager.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 2f6fcddc5dbeba69b7c2cc01d311ad2057f24f19
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Thu Dec 11 16:31:52 2008 -0500

    Publish location when enabling it

 libempathy-gtk/empathy-location-manager.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 82e42143ae2ad688045554abaa686ed5a19f454d
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Thu Dec 11 16:07:55 2008 -0500

    Support all position fields

 libempathy-gtk/empathy-location-manager.c | 51
 +++++++++++++++++++++++++------
 libempathy/empathy-location.h		   |  1 +
 2 files changed, 43 insertions(+), 9 deletions(-)

commit b89200b47a145f288a35a81625a73bb76a054599
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Wed Dec 10 17:27:42 2008 -0500

    Support address fields

 libempathy-gtk/empathy-location-manager.c | 32
 +++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

commit 3db6c6d6152fbb5c3741e748ec0de66a40440784
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Wed Dec 10 12:04:30 2008 -0500

    Publish location after connection and when location changes

 libempathy-gtk/empathy-location-manager.c | 94
 +++++++++++++++++++++++++++----
 1 file changed, 82 insertions(+), 12 deletions(-)

commit 2c0aa5b450b8b3743c00e9bdcc34851358976e40
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Fri Nov 28 23:01:20 2008 -0500

    Add EmpathyLocationManager

 libempathy-gtk/Makefile.am		   |   2 +
 libempathy-gtk/empathy-location-manager.c | 339
 ++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-location-manager.h |  57 +++++
 src/empathy.c				   |   6 +
 4 files changed, 404 insertions(+)

commit c6d064ad5952f233d583ccd420c502b581d57a8c
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Fri May 29 13:53:38 2009 -0400

    Add a Location tab in preferences

 data/empathy.schemas.in       |  72 ++++++++++++++-
 libempathy-gtk/empathy-conf.h |   5 +
 src/empathy-preferences.c     |  52 +++++++++++
 src/empathy-preferences.ui    | 206
 +++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 329 insertions(+), 6 deletions(-)

commit c2c29925bcb51aa4b5bb5c6e07e52fa4c155ce95
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue Nov 25 17:11:29 2008 -0500

    Configure bits for geoclue

 configure.ac		    | 4 ++--
 libempathy-gtk/Makefile.am | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

commit 35a5ce7c4708114932b9e0274925f6a34efd2895
Merge: a585fb5 ce67f69
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jun 1 15:47:55 2009 +0100

    Merge commit 'ksz/can_stream_tube'

commit ce67f6901ba26b589345a8cdea110878bf6861c6
Author: Arnaud Maillet <arnaud.maillet@collabora.co.uk>
Date:	Fri May 29 15:18:52 2009 +0200

    Add the method empathy_contact_can_stream_tubes in the
    empathy-tp-contact-factory

 libempathy/empathy-contact.c		 | 12 ++++++
 libempathy/empathy-contact.h		 |  2 +
 libempathy/empathy-tp-contact-factory.c | 67
 ++++++++++++++++++++-------------
 3 files changed, 55 insertions(+), 26 deletions(-)

commit a585fb5dc244a0c63f54e0bedca3b8403ffc54a6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Sun May 31 12:38:06 2009 +0100

    add chat.freenode.net as default FreeNode server (#584061)

 libempathy/irc-networks.xml | 1 +
 1 file changed, 1 insertion(+)

commit 221b3c1a7620e02b02ac9b5dd1a04be05b81db31
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	Sun May 31 01:03:16 2009 +0200

    Small update

 po/hu.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit a38c0151eeb417d4d4068d018450757d34aa327f
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat May 30 22:48:46 2009 +0100

    Cope with status icon begin NULL

 src/empathy-status-icon.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 53013e8534c6e8340a7aefde55eb10164c8a3d61
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat May 30 22:48:26 2009 +0100

    Cope with status being NULL

 libempathy-gtk/empathy-presence-chooser.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 327b8e56ecbaca67d550802f2fac741a78d81eb8
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat May 30 20:15:31 2009 +0100

    Remove usage of McPresence as much as possible

 libempathy-gtk/empathy-contact-list-store.c   |  36 +------
 libempathy-gtk/empathy-presence-chooser.c     |  95 +++++++++---------
 libempathy-gtk/empathy-status-preset-dialog.c |  20 ++--
 libempathy-gtk/empathy-ui-utils.c	       |  23 ++---
 libempathy-gtk/empathy-ui-utils.h	       |   2 +-
 libempathy/empathy-account-manager.c	       |  29 +++++-
 libempathy/empathy-contact-monitor.c	       |  13 ++-
 libempathy/empathy-contact.c		       |  68 +++++--------
 libempathy/empathy-contact.h		       |   4 +-
 libempathy/empathy-idle.c		       | 134
 +++++++++++++++++++-------
 libempathy/empathy-idle.h		       |  10 +-
 libempathy/empathy-status-presets.c	       |  34 +++----
 libempathy/empathy-status-presets.h	       |  12 +--
 libempathy/empathy-utils.c		       |  99 +++++++++----------
 libempathy/empathy-utils.h		       |   6 +-
 python/pyempathy/pyempathy.defs	       |  38 +++++---
 python/pyempathygtk/pyempathygtk.defs	       |  12 ++-
 src/empathy-main-window.c		       |  35 ++++---
 src/empathy-status-icon.c		       |   2 +-
 src/empathy.c				       |   5 +-
 20 files changed, 370 insertions(+), 307 deletions(-)

commit f93b95e549591cc8302d894e44641f42751b7f67
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Sat May 30 17:00:12 2009 +0100

    Ensure a minimum size of tabs in the chat window

    When there are a lot of tabs in the chat window it's not useful to
    resize them
    such that only the ellipsis is actually visible. To prevent this
    make the
    notebook scrollable and ensure the tabs are width enough to contain
    approximately 12 characters.

 src/empathy-chat-window.c | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

commit dd61ed770308dce8fbf951e7a7b9a2c62b251f6a
Author: Dimitris Zenios <dimitris.zenios@gmail.com>
Date:	Fri May 29 19:09:48 2009 +0300

    fixed bug #548716

 libempathy-gtk/empathy-account-widget-irc.c |	2 ++
 libempathy-gtk/empathy-account-widget-sip.c |	2 ++
 libempathy-gtk/empathy-account-widget.c     | 31
 +++++++++++++++++++++++++++++
 libempathy-gtk/empathy-account-widget.h     |	2 ++
 4 files changed, 37 insertions(+)

commit cf54c58bf9331e0e22c6f6dc42b78ce2b1d29616
Author: Olivier Le Thanh Duong <olivier@lethanh.be>
Date:	Thu May 21 22:09:41 2009 +0200

    Fix the python example

 python/example.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit eae07d39d08ef7568acd9b594dfd0172b1f7613d
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Thu May 28 14:59:57 2009 -0400

    Fix ‘lat’, ‘lon’ may be used uninitialized in this function

 libempathy-gtk/empathy-contact-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d151261308da99f44410da4f07b78dd56c0cb5f8
Merge: 395a0ea 545342a
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Thu May 28 17:54:30 2009 +0800

    Merge commit 'origin/master'

commit 395a0eaf7520826c13d7f4b193aa0907b54cf46a
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Thu May 28 17:51:56 2009 +0800

    EmpathyStatusPresetDialog: fix status_preset_add_combo_reset()

 libempathy-gtk/empathy-status-preset-dialog.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit aed93e6bd2c1b26cf66aa1486bdf4b98ca1ef36c
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Thu May 28 17:47:09 2009 +0800

    Highlight the most recently added entry in the status presets dialog

 libempathy-gtk/empathy-status-preset-dialog.c | 36
 ++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

commit 545342a22a793a45b8f1150c57b8abaa42a5fa7d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 26 15:38:56 2009 +0100

    new tube API is now stable

 libempathy/empathy-tp-tube.c | 27 +++++++++++++--------------
 src/empathy-event-manager.c  |  4 ++--
 src/empathy-tube-dispatch.c  |  8 ++++----
 3 files changed, 19 insertions(+), 20 deletions(-)

commit 2a0e56361c6fc9c0e3869dc99375dd5a11f55fbe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 28 10:01:31 2009 +0100

    bump tp-glib dep to 0.7.31 as we need it for tube new API

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e4b631f58ae100e747f6bffc1494edcda4c2cc9b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue May 26 15:26:33 2009 +0100

    stop to generate tube new API extensions

 extensions/Channel_Interface_Tube.xml	 | 148 ------------------
 extensions/Channel_Type_DBus_Tube.xml	 | 163 --------------------
 extensions/Channel_Type_Stream_Tube.xml | 262
 --------------------------------
 extensions/Makefile.am			 |   5 +-
 extensions/misc.xml			 |   3 -
 5 files changed, 1 insertion(+), 580 deletions(-)

commit 23c7cd285186313c9f1b3b9b6e3c0eae35eff0d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 28 10:06:21 2009 +0100

    empathy-call-window: coding style fix

 src/empathy-call-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7af6acca0b4bc147d6655d27566f1b287d8fb4da
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 28 10:06:11 2009 +0100

    empathy-tp-contact-factory: coding style fixes

 libempathy/empathy-tp-contact-factory.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b9511df4f7cc20f68259086a2821409a96ce4b66
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 28 10:04:33 2009 +0100

    empathy-time.c now contains translatable strings

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit 164528b9334cb599fcd4bafdcf5157c0f0a1b0cd
Author: A S Alam <aalam@users.sf.net>
Date:	Thu May 28 09:11:36 2009 +0530

    updating Punjabi Translation

 po/pa.po | 1458
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 852 insertions(+), 606 deletions(-)

commit 05a941a4b071189b819faf9c5a8b54712b2d5467
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed May 27 23:56:37 2009 +0100

    Only do sounds/notifications for text messages when they involve
    the user

    When in a chatroom notifications and sounds should only happen when
    the users
    is part of the message (either someone is speaking to them or
    referring to
    them), otherwise the user will go crazy when in a lot of different muc
    channels. For a peer to peer text channel, all messages sent are
    targetted at
    the user so always do sounds/notifications in that case.

 src/empathy-chat-window.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

commit 6265c301144866873f49851d850ba66fcde3bd8c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed May 27 22:48:33 2009 +0100

    Correctly set the is_member flag when members are added

 libempathy/empathy-tp-chat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bef9e289a01555b4a557988eac0b52ce4d1b1b22
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Wed May 27 22:30:36 2009 +0100

    Treat TP_CONNECTION_PRESENCE_TYPE_UNSET as _AVAILABLE

    In case a CM doesn't have the presence interface a contacts presence
    will be
    reported as _UNSET. Treating this as _AVAILABLE causes these
    contacts to
    show up in the UI

 libempathy/empathy-contact.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f3f045256549a1e2fc6a0f214eb57bc7aecbf6b9
Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date:	Wed May 27 13:24:47 2009 -0400

    Add sections to the configure report

 configure.ac | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 73ead8b8337785093aeefab4c14a8c2dff9dc4f9
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Wed May 27 12:23:33 2009 -0400

    Should check for enable location and not map (bad copy/paste)

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d857e3d568b7ba4c1dd43e2f1f7c467190e0dce4
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Wed May 27 12:10:31 2009 -0400

    Improve code readability

    Rename userdata to contact,
    wrap at 80 chars

 libempathy/empathy-tp-contact-factory.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

commit b9bb0f42712f601c11fcd3d312910da0fd72b6ed
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Wed May 27 12:09:52 2009 -0400

    Don't need to check twice if location has latitude

    There is no need to check for lon as lat, lon as always set togeter
    (they
    are meaningless alone).

 libempathy/empathy-tp-contact-factory.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

commit 63980054c4e8ec5d63b9da9a0de1d13c45bfd1a2
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Wed May 27 12:04:03 2009 -0400

    Fix English label for Location's date

 libempathy-gtk/empathy-contact-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a6727eb14a19681c1839e9aacf9abcb139ceb268
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 26 20:44:25 2009 -0400

    Use the layer to list the markers

    There was no need to add an extra list as the layer already has
    a list of the markers.

 src/empathy-map-view.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

commit d13ba3658eded1649daff133cb04c76f6e3a906b
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Wed May 27 11:57:14 2009 -0400

    Move the geoclue geocoding in EmpathyTpContactFactory

    This code needs to be run when ever there is a new location available
    It makes more sens for it to be there. This makes the geolocation
    informtion
    ritcher as it can be displayed on a map.

 libempathy/Makefile.am			 |   4 +-
 libempathy/empathy-tp-contact-factory.c | 130
 ++++++++++++++++++++++++++++++++
 src/Makefile.am			 |   4 +-
 src/empathy-map-view.c			 | 115
 ----------------------------
 4 files changed, 134 insertions(+), 119 deletions(-)

commit 46663cfe8954970c167251c987f8b6998dcdf341
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 26 18:33:32 2009 -0400

    Fix memory leak

 src/empathy-map-view.c | 1 +
 1 file changed, 1 insertion(+)

commit 771929ecdfb4d97dccd67baa7dafe56aca8b06ed
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 26 18:26:38 2009 -0400

    Fix translation and value errors for relative time

 libempathy/empathy-time.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit d4d2036320d77e9f079b7dc13921e027c93a4e98
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 26 18:12:09 2009 -0400

    Disconnect from notify::location

    Since the list of EmpathyContact can change at anytime, it can't
    be iterated to disconnect the handlers.  Instead, a ref is
    added to the markers.

 src/empathy-map-view.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

commit cc7656ce36f0a531cc21585de63d1c2e493bc993
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 26 16:52:48 2009 -0400

    Move the geocoding to when the location is updated

    This way, when the location is updated, the lat,lon is fetched too
    (not only upon showing the map).

 src/empathy-map-view.c | 87
 +++++++++++++++++++++++++-------------------------
 1 file changed, 44 insertions(+), 43 deletions(-)

commit eb7d4bbe7b4dac195cf0cc26f7bfd50fb49dde69
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 26 16:17:17 2009 -0400

    Avatar was leaked

 src/empathy-map-view.c | 1 +
 1 file changed, 1 insertion(+)

commit 7965e120d0ba25581349ba990420d513bf8d5102
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 26 16:14:38 2009 -0400

    Don't need to keep the address around

    Since Geoclue is passing the address to dbus, we don't
    need to keep the address around as it'll be copied anyway.

 src/empathy-map-view.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit 5bdfd49c15348d8d9ae3ca7f24ab942e052e3a3f
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 26 16:09:37 2009 -0400

    Don't need to set back if it is the same hashtable

    This code was ugly, by removing the ref, unref and the set call,
    the code is much simpler.  The other objects will still be notified
    of the changes.

 src/empathy-map-view.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

commit c40737394bff5c27daea7e4ee08f240224475904
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 26 15:38:32 2009 -0400

    Display relative time to user

    The time of the geolocation update is displayed relatively to
    current time (1 min ago, 3 hours ago).

    The function just prints ("in the future") for debugging purpuses
    for time in the future.

 libempathy-gtk/empathy-contact-widget.c | 13 +++++++----
 libempathy/empathy-time.c		 | 41
 +++++++++++++++++++++++++++++++++
 libempathy/empathy-time.h		 |  1 +
 src/empathy-map-view.c			 | 19 ++++++++++++++-
 4 files changed, 69 insertions(+), 5 deletions(-)

commit c734c5e2451582a52596e44f96e617ee346b6598
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 26 12:45:19 2009 -0400

    Fix possible compilation error

 src/empathy-map-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3b1bbb17b9d082a2e19571e0328394c99c35bcf7
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 26 12:44:38 2009 -0400

    Simplify the #if by isolating the content

 src/empathy-main-window.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit 2d38908c639e7fbc6b90daf395919987e3d0c844
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 26 12:42:10 2009 -0400

    Simplifly the logic on when to display the location

    By verifying earlier on

 libempathy-gtk/empathy-contact-list-view.c |	3 +-
 libempathy-gtk/empathy-contact-widget.c    | 113
 +++++++++++++++--------------
 2 files changed, 60 insertions(+), 56 deletions(-)

commit 09998744f5092ee928a5a7b8cfd97e62d059acdc
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 26 12:28:04 2009 -0400

    Geoclue is not used in libempathy-gtk

 libempathy-gtk/Makefile.am | 2 --
 1 file changed, 2 deletions(-)

commit cf198ce9b0834e4d2cf156f201c3fb77d17a1ce5
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 26 12:27:25 2009 -0400

    Use empathy_time_to_string_local

 libempathy-gtk/empathy-contact-widget.c | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

commit 3b2d620a1fb5ce624fbf330a96d76a0d6b563aaf
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 26 12:05:11 2009 -0400

    Remove unneeded elses

    As the vars will already be to no.

 configure.ac | 4 ----
 1 file changed, 4 deletions(-)

commit e3bf42b161f516427c0b9a7aace65800c9d00170
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Mon May 25 14:55:25 2009 -0400

    Print library usage in new configure report

 configure.ac | 2 ++
 1 file changed, 2 insertions(+)

commit 42e12e5ad7fde4a1776b3910a3ffa1b1219e80b3
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Mon May 25 14:53:42 2009 -0400

    Don't create a marker if the user has no location

 src/empathy-map-view.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

commit 968b8e35a504d0fb617c7a022cd3dbb04560cc6e
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Fri May 22 18:51:57 2009 -0400

    Don't list timestamp in the location fields as it is already included
    in the header

 libempathy-gtk/empathy-contact-widget.c | 3 +++
 1 file changed, 3 insertions(+)

commit 7af9d6e26eb64e0da0bfad39320d41e9c8a66fcc
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Fri May 22 13:42:05 2009 -0400

    Use tp_strdiff instead of strcmp

 libempathy-gtk/empathy-contact-widget.c | 48
 ++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

commit b56b48b67fe63bb40871360116a80f1df17d3273
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Thu May 21 12:25:55 2009 -0400

    Have better user labels for location values

    And have them better placed (with labels on left not expand).

 libempathy-gtk/empathy-contact-widget.c | 69
 +++++++++++++++++++++++++++++++--
 1 file changed, 65 insertions(+), 4 deletions(-)

commit e9010cc1e7b3bdaa3366ea530d0d3780dbbfb0a4
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Wed May 20 16:33:07 2009 -0400

    Fix double border issue in the Map View

    By replace the scrolled view by a viewport, anyway, there can't
    be scrollbars with libchamplain

 src/empathy-map-view.c  |  2 +-
 src/empathy-map-view.ui | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

commit da79702908d9c4187469962e1027b11abc416b26
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Wed May 20 16:11:40 2009 -0400

    Move geocoding in a place where we can have better memory management

 src/empathy-map-view.c | 83
 ++++++++++++++++++++++++++++++++------------------
 1 file changed, 53 insertions(+), 30 deletions(-)

commit cccf17b4460cfdd084ea40ebff895abf101d4f49
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Wed May 20 14:17:35 2009 -0400

    Display user textual location even if it doesn't include a lat,lon

 libempathy-gtk/empathy-contact-widget.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

commit 1a8aefd70a364e8b3e7eac6eda4f93bb04022d1e
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Wed May 20 14:29:44 2009 -0400

    Simplify and clarify map_view_geocode_cb

 src/empathy-map-view.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

commit 9c540f20d87d06867eac63c8378fb83ee59b9329
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Wed May 20 13:48:34 2009 -0400

    Don't allow the user to display many map views

 src/empathy-map-view.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 3dc79d54d273bdf7064abca1f7cf2d1748941377
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Wed May 20 13:42:30 2009 -0400

    Fix coding styles and memory leaks found by Guillaume Desmottes

 src/empathy-map-view.c | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

commit 35674b38a744e4024911f9e38c231ea687fc16d3
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Wed May 20 13:21:56 2009 -0400

    Undo changes to EmpathyContactDialogs

 libempathy-gtk/empathy-contact-dialogs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d310cd8ea9d6cc233be3be9186a9f963748c77bb
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Wed May 20 13:21:43 2009 -0400

    Fix gtk warning at startup when not compiled with libchamplain

 src/empathy-main-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 98ac7b635ef523f2dd8f90b2d0df55114e2c4333
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Wed May 20 13:00:53 2009 -0400

    Fix coding style issues found by make check

 libempathy-gtk/empathy-contact-widget.c | 2 +-
 src/empathy.c				 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 602637b16aa840b26a82dbfab18de7fecc21a56d
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Wed May 20 12:58:14 2009 -0400

    Add the new UI to translation files

 po/POTFILES.in | 2 ++
 1 file changed, 2 insertions(+)

commit 571c208976b517afe0ad39063cde82fb45739590
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 12 11:39:20 2009 -0400

    Make map visible!

 libempathy-gtk/empathy-contact-widget.c | 1 +
 1 file changed, 1 insertion(+)

commit 7b90a1b6cc102b411d8f5ec0532060bd01ff14c3
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 12 11:15:11 2009 -0400

    Fix licensing: should have been LGPL 2.1+

 src/empathy-map-view.c | 19 +++++++++----------
 src/empathy-map-view.h | 19 +++++++++----------
 2 files changed, 18 insertions(+), 20 deletions(-)

commit 966169f0cf3e245c57c4c7461a2715d56e08fa1a
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 12 11:04:51 2009 -0400

    Make buildable and visible if libchamplain not available

 libempathy-gtk/empathy-contact-dialogs.c | 2 --
 libempathy-gtk/empathy-contact-widget.c  | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

commit b1c0e81a7c6e6ff591aa69c6211f676336c14e15
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 12 00:28:03 2009 -0400

    Apply new coding styles

 src/empathy-map-view.c | 93
 ++++++++++++++++++++++++++------------------------
 1 file changed, 49 insertions(+), 44 deletions(-)

commit 7b8f1908a67e9adc40674ee2c6b0fd00c658c606
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 12 00:19:05 2009 -0400

    Remove dead code and update function name

 src/empathy-map-view.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

commit 28107b1f3fc85df86d1325791804b27e9059d1d7
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 12 00:10:34 2009 -0400

    Update to use libchamplain 0.3's API

 configure.ac				 |  8 ++++----
 libempathy-gtk/empathy-contact-widget.c |  7 ++++---
 src/empathy-map-view.c			 | 19 ++++++++++++-------
 3 files changed, 20 insertions(+), 14 deletions(-)

commit 3967ad986cf0a678f5fa918e7e995267ed71fa07
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue May 12 00:10:13 2009 -0400

    Make buildable without Geoclue

 src/empathy-map-view.c | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

commit 29a6e9ff7d6b775be67d81c5ce8a5631164a51e3
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Mon May 11 01:00:34 2009 -0400

    Fix contacts not showing on the map

 src/empathy-map-view.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit c387d97d12f788291974da01c315fa87eb5f8b51
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Mon May 11 00:56:21 2009 -0400

    Get rid of disconnect which is undeeded

 src/empathy-map-view.c | 32 ++++----------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

commit f09cfa0a6a26e8badaf86353b955fee593786e42
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Sun May 10 23:39:41 2009 -0400

    List geolocation information in Tooltip

 libempathy-gtk/empathy-contact-widget.c  | 87
 ++++++++++++++++++++++++++++----
 libempathy-gtk/empathy-contact-widget.ui | 18 +++++--
 2 files changed, 91 insertions(+), 14 deletions(-)

commit 530daa415e81ca3eadfbcc726486e3fdf80f6c1f
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue Apr 7 17:51:23 2009 -0400

    Fix a warning if the handle doesn't exist

 src/empathy-map-view.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 4152e6dc08ea55434558e4b0105ec1df3628c4f8
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue Apr 7 17:41:23 2009 -0400

    Use its own ListStore of contacts instead of borrowing the Contact
    List's

 src/empathy-main-window.c | 2 +-
 src/empathy-map-view.c    | 8 +++++++-
 src/empathy-map-view.h    | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

commit 43680e9c8613024a9d92c03b2e937d8bcbc8e22b
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Thu Jan 22 16:04:10 2009 +1100

    Build fix

 configure.ac	 | 2 ++
 src/Makefile.am | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

commit 3f1b321290d57754584f5d547f801c9cc6f04c75
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Sun Jan 25 23:07:04 2009 +1100

    Expect the timestamp to be a int64

 libempathy-gtk/empathy-contact-widget.c | 35
 +++++++++++++++++----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

commit f84dfa1e04ea5283d09ca03dd9416a93f005b5fb
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Wed Dec 31 16:17:49 2008 -0500

    Show contacts without an avatar

 src/empathy-map-view.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

commit afebe6eb1adc4dac3ac1f0b4610096fbceb627b4
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue Dec 30 21:26:30 2008 -0500

    Remove signal handler when closing the window

 src/empathy-map-view.c | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

commit ed29d815833d874a16e6d0c5e08dcb9506333d76
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue Dec 30 14:22:33 2008 -0500

    Don't init vars with a function

 libempathy-gtk/empathy-contact-widget.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 1ad83ec843cb36808310afb5fe9e5ea296d3f0fb
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue Dec 16 17:41:40 2008 -0500

    Add marker on map

 libempathy-gtk/empathy-contact-widget.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 62993977a9409a995e2dfdbadbb90a759e032489
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue Dec 16 15:19:15 2008 -0500

    Display timestamp and location

 libempathy-gtk/empathy-contact-widget.c | 105
 +++++++++++++++++++++++---------
 1 file changed, 76 insertions(+), 29 deletions(-)

commit 0c673a2c9255fd5eb430f21f0c973101c775d3a1
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Sun May 10 20:23:16 2009 -0400

    Use EmpathyContact's location

 src/empathy-map-view.c | 152
 +++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 140 insertions(+), 12 deletions(-)

commit b12b63f0c0a992d3caf8c0ada68e502bd8d3a506
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue Apr 7 16:04:31 2009 -0400

    Add a map in the Contact Information dialog
    For now, the map in the tool tip is disabled as Clutter-gtk
    does like at all this type of window/initialisation

 libempathy-gtk/Makefile.am		  |  4 +++
 libempathy-gtk/empathy-contact-dialogs.c |  5 +++-
 libempathy-gtk/empathy-contact-widget.c  | 48
 ++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-contact-widget.h  |  1 +
 libempathy-gtk/empathy-contact-widget.ui | 50
 ++++++++++++++++++++++++++++++--
 5 files changed, 104 insertions(+), 4 deletions(-)

commit 30165e135359e217e7a9581277f8bf9b7b5c7459
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Sun May 10 21:09:40 2009 -0400

    Add a Contact Map window

 src/Makefile.am	    |	8 ++
 src/empathy-main-window.c  |  19 ++++
 src/empathy-main-window.ui |	7 ++
 src/empathy-map-view.c     | 217
 +++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-map-view.h     |  33 +++++++
 src/empathy-map-view.ui    |  59 ++++++++++++
 src/empathy.c		    |	8 ++
 7 files changed, 351 insertions(+)

commit c43cfe015de9771fb20c718039f5ea09e56ae1c7
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Tue Nov 25 17:11:29 2008 -0500

    Configure bits for libchamplain

 configure.ac	 | 64
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/Makefile.am |  4 +++-
 2 files changed, 67 insertions(+), 1 deletion(-)

commit 1d8091578b25a85b3d1d6d4c651a0c8e73c3fe2d
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Wed May 27 11:45:32 2009 -0400

    Copy GHashTable received from Dbus and refactor

    This makes the GHashTable's structure explicit and less error prone
    when inserting later on.

    Move the copied code over to a new function.

 libempathy/empathy-tp-contact-factory.c | 37
 +++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 13 deletions(-)

commit 0df4d81f42b3657cd466df44ccffb78045e5d8c9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 25 13:40:15 2009 +0100

    empathy-tp-chat: fix leak in dispose

 libempathy/empathy-tp-chat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 24c980457d575a2574a59d534dc442cf4193b24a
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Tue May 26 10:49:11 2009 -0400

    When initializing users' avatar, the pixbuf representing it is now
    initialized to NULL.

 src/empathy-call-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 72720c392da5917088cc95a5fc5dd4e7ce56a4d1
Author: Jonathan Tellier <jonathan.tellier@gmail.com>
Date:	Wed May 20 13:49:02 2009 -0400

    When no video is received or sent we show contacts' avatars instead
    of showing
    black widgets.

 libempathy-gtk/empathy-video-widget.c |   4 +-
 libempathy-gtk/empathy-video-widget.h |   3 +
 src/empathy-call-window.c	       | 146
 ++++++++++++++++++++++++++++++++--
 3 files changed, 143 insertions(+), 10 deletions(-)

commit fdd5d6bcf95255cad8f4573d262abe1532a0f912
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue May 26 09:21:23 2009 +0200

    Bump version to 2.27.3

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0c20c80c2d4b28fea49dabc34ed5a95b9103a0ad
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon May 25 22:13:38 2009 +0200

    Write NEWS entry

 NEWS | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit 6a8497e9bacf9a1fcdbbe51f61b32e6187c52724
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon May 25 22:11:45 2009 +0200

    Bump ABI version

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit cc8699c9b6b469f63c754632485242d37b4ff3e0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 25 11:46:51 2009 +0100

    Display a report at the end of configure

 configure.ac | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit b529fc63cf131709a5cd6132a72f9f2f605efad8
Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
Date:	Sat May 23 20:18:40 2009 +0200

    Updated Spanish translation

 po/es.po | 74
 +++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 41 insertions(+), 33 deletions(-)

commit 866aa89a1f3fac72f8ef48f076dccf7b0e4c59d0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 22 17:07:55 2009 +0100

    move 'View Previous Conversations' menu entry to View

 src/empathy-main-window.c  | 10 +++++-----
 src/empathy-main-window.ui |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

commit 02ce3c9a8c3baff0c53a548cde8b959e6ec5c9b8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 22 17:05:09 2009 +0100

    move 'show offline contacts' menu entry to View

 src/empathy-main-window.c  | 6 +++---
 src/empathy-main-window.ui | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

commit 92633f9ea0e68abe84d0f8a77ddc5b9691a8a8d1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 22 17:01:18 2009 +0100

    move 'show file transfers' menu entry to View

 src/empathy-main-window.c  | 4 ++--
 src/empathy-main-window.ui | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

commit 4467e8c05dc70e4325cf4adceca6e78cd1ff64ca
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 22 16:56:03 2009 +0100

    empathy-main-window: add View top menu

 src/empathy-main-window.ui | 8 ++++++++
 1 file changed, 8 insertions(+)

commit d6328ff8dc911f787ace5c6fff922c628944a6b3
Merge: 26699d3 401b81d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 22 16:47:31 2009 +0100

    Merge commit 'ksz/fix-bug-583558'

commit 26699d3c9580c2aeb41f1bcb9fc3cb2ca512fae9
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Fri May 22 11:20:11 2009 -0400

    Error label now translatable

 src/empathy-new-chatroom-dialog.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b63427129077ecb85adcc54085b9b7162a0667bb
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Sat May 16 16:56:20 2009 -0400

    Set treeview insensitive and hide error message

 src/empathy-new-chatroom-dialog.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 96d040d7ce116f22e27cbf8acbdf10a7d3277df6
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Sat May 16 16:43:13 2009 -0400

    Display error message in UI

 src/empathy-new-chatroom-dialog.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

commit 6405eb55ea31ac039c39a780fbeb6848d05934bf
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Sat May 16 16:42:37 2009 -0400

    Fixed call with list

 libempathy/empathy-tp-roomlist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 043a161ccdfe386057b51da8c87142ec6e1d131b
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Sat May 16 16:12:05 2009 -0400

    Added border, resized error icons, fixed item names and made error
    message invisible by default

 src/empathy-new-chatroom-dialog.ui | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit b00d0ffd273edd3ac9248307dcb0f3ff36781b7f
Author: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date:	Fri May 8 11:31:10 2009 -0400

    Error bar UI proto

 src/empathy-new-chatroom-dialog.ui | 132
 +++++++++++++++++++++++++++++--------
 1 file changed, 106 insertions(+), 26 deletions(-)

commit b3a804afbff0bda318d31dea243ffef18491c2d8
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Sat May 16 15:57:22 2009 -0400

    Connect to error signals

 src/empathy-new-chatroom-dialog.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

commit 39af082298a0bbd0e91e23e31e1e32fc71f8f4bf
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Sat May 16 15:56:21 2009 -0400

    Signal "error" is detailed

 libempathy/empathy-tp-roomlist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 740f230888350114708d51067e624b31880cfdb2
Author: Gabriel Millaire <millaire.gabriel@gmail.com>
Date:	Mon May 11 22:15:14 2009 -0400

    Implement error signal

 libempathy/empathy-tp-roomlist.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

commit 401b81d9cf9667283cabea8d1d9b5926d9d77a9c
Author: Arnaud Maillet <arnaud.maillet@collabora.co.uk>
Date:	Fri May 22 16:02:00 2009 +0200

    Rename OfferStreamTube and AcceptStreamTube to Offer and Accept

 extensions/Channel_Type_Stream_Tube.xml | 92
 ++++++++++++++++++++++++++-------
 libempathy/empathy-tp-tube.c		 |  6 +--
 2 files changed, 77 insertions(+), 21 deletions(-)

commit 7b1c449738cd5800d54335eb5512a3b8231b1e12
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri May 22 10:42:17 2009 +0100

    empathy-chat-window: add Contact menu as top-level (bgo #580922)

 src/empathy-chat-window.c  | 9 +++++++++
 src/empathy-chat-window.ui | 7 +++++++
 2 files changed, 16 insertions(+)

commit efb2bc19461c213a1bd6917d5b7f25943f436c6d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu May 21 20:07:12 2009 +0100

    remove Conversation->Contact menu entry

 src/empathy-chat-window.c  | 14 --------------
 src/empathy-chat-window.ui |  7 -------
 2 files changed, 21 deletions(-)

commit 47a2e02ba9ecb28fe12697d69b9f387783072775
Author: Davyd Madeley <davyd@madeley.id.au>
Date:	Fri May 22 13:40:43 2009 +0800

    Force update of GtkEntry primary icon for ENTRY_TYPE_BUILTIN

    Fixes 583430

 libempathy-gtk/empathy-presence-chooser.c | 3 +++
 1 file changed, 3 insertions(+)

commit ac9ae5ea673292782adb694be19a6a6b0d1eefc5
Merge: b08244a 353f7a0
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Thu May 21 12:08:44 2009 +0200

    Merge commit 'istaz/python-empathy-fix'

commit b08244af933d4ce6a4d8e622c587ea7361999ec0
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed May 20 18:45:20 2009 +0100

    Remove hard-coded strings from (un)subscriptions

 libempathy-gtk/empathy-contact-dialogs.c   | 3 +--
 libempathy-gtk/empathy-contact-list-view.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

commit ee50898acb55b8c0b481ff38f7dea1e7c0ddc6da
Author: drtvasudevan <agnihot3@gmail.com>
Date:	Wed May 20 22:07:54 2009 +0530

    Added ta translation

 po/LINGUAS | 1 +
 1 file changed, 1 insertion(+)

commit c7d169c22da82393bd7449ec7793b25b17b585e0
Author: drtvasudevan <agnihot3@gmail.com>
Date:	Wed May 20 14:02:50 2009 +0530

    Updated Tamil translation

 po/ta.po | 87
 ++++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 49 insertions(+), 38 deletions(-)

commit 7b1191951232a978f41667d39fa4de4b41b7dfe4
Author: drtvasudevan <agnihot3@gmail.com>
Date:	Wed May 20 13:52:48 2009 +0530

    Updated Tamil translation

 po/ta.po | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

commit aaeef098dd53381f2ea9c037ce946c64a2e20de3
Author: drtvasudevan <agnihot3@gmail.com>
Date:	Wed May 20 13:48:51 2009 +0530

    Updated Tamil translation

 po/ta.po | 116
 +++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 79 insertions(+), 37 deletions(-)

commit 876c18b60deb4a4211937acb74bbdf4c21f4b680
Author: drtvasudevan <agnihot3@gmail.com>
Date:	Thu May 7 22:24:13 2009 +0530

    added Tamil translation

 po/ta.po | 2069
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 2069 insertions(+)

commit ac29c5993863e0c773230fa8df2e33b235a89bbb
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue May 19 11:45:55 2009 +0200

    Bump version to 2.27.2

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 415c903efae7ae87e99b6406015b1385be7a578b
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue May 19 11:43:25 2009 +0200

    Fix NEWS

 NEWS | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 076b15c256da1ff6b5489bf40a4f506a7b70c874
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue May 19 11:41:38 2009 +0200

    Improve a bit the release notes

 release.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit b46d5f9bc5bb86aaf59a22d574d8caf393901954
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue May 19 11:34:45 2009 +0200

    Update NEWS for 2.27.1.1 release

 NEWS | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit 91d9bbea39b77cc578537adb8423fbcc2ef20b11
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue May 19 11:34:31 2009 +0200

    Add documentation translation to NEWS

 release.py | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

commit 007f92ecb7a09ffc21bd0bfd6764c0f60ba18ddd
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue May 19 11:02:46 2009 +0200

    Bump ABI to not conflict with abi in 2.26 branch

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 521cbd489cb62732d00f0edd050754121e7ba82b
Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
Date:	Mon May 18 20:21:47 2009 +0200

    Updated Spanish translation

 po/es.po | 99
 +++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 54 insertions(+), 45 deletions(-)

commit e40e258ab2f65fad9838fe37a7c0d38ec8f8b20e
Author: Γιάννης Κατσαμπίρης <juankatsampirhs@gmail.com>
Date:	Mon May 18 16:48:49 2009 +0100

    updated Greek documentation translation

 help/el/el.po | 924
 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 730 insertions(+), 194 deletions(-)

commit 21d4e24e8d0624f5f6ec5be6acd45c6c02d30e44
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:19:17 2009 +0100

    upgrade Python bindings

 python/pyempathy/pyempathy.defs       | 23 +++++++++++++++++++++++
 python/pyempathygtk/pyempathygtk.defs | 13 ++++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)

commit 6cbe46ff82e331bd8d7101980908928611b73b8f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 15:06:23 2009 +0100

    document empathy_call_factory_new_call and
    empathy_call_factory_new_call_with_streams

 libempathy/empathy-call-factory.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit 4bd37c3ad42d29cd7545e8ddd0f94594daff52a8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 15:02:59 2009 +0100

    document empathy_call_handler_new_for_contact_with_streams and
    empathy_call_handler_new_for_contact

 libempathy/empathy-call-handler.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit 84e2c127de4b21c0bbd53fa46ab00bf7d497969b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 14:53:01 2009 +0100

    add 'Video Call' entry to the Contact menu

 libempathy-gtk/empathy-contact-menu.c | 40
 +++++++++++++++++++++++++++++++++--
 libempathy-gtk/empathy-contact-menu.h |  1 +
 2 files changed, 39 insertions(+), 2 deletions(-)

commit 74d04392b3aadeee49fc7012d2647f631ed69ac6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 14:37:09 2009 +0100

    empathy_contact_audio_call_menu_item_activated: use
    empathy_call_factory_new_call_with_streams

 libempathy-gtk/empathy-contact-menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2887c266c85b651784f68b3d3fd5515cda759d88
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 14:27:19 2009 +0100

    empathy_contact_audio_call_menu_item_new: change label to 'Audio Call'

 libempathy-gtk/empathy-contact-menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d68a09b816e8b2c60a9d333a3a6cb9b86f20de89
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 14:27:06 2009 +0100

    rename empathy_contact_call_menu_item_new to
    empathy_contact_audio_call_menu_item_new

 libempathy-gtk/empathy-contact-menu.c | 10 +++++-----
 libempathy-gtk/empathy-contact-menu.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

commit 8966178abf5d90f7a3260688f5c490c8ed80b56c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Fri May 8 12:00:52 2009 +0100

    Show an audio and a video call button

 libempathy-gtk/empathy-contact-list-store.c | 24 +++++++--
 libempathy-gtk/empathy-contact-list-store.h |	3 +-
 libempathy-gtk/empathy-contact-list-view.c  | 84
 +++++++++++++++++++++++++----
 libempathy-gtk/empathy-images.h	     |	1 +
 4 files changed, 96 insertions(+), 16 deletions(-)

commit 567c6f977d72adfc6f2a4d07311d1403bbb51d0c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu May 7 15:20:47 2009 +0100

    Allow the call factory to create calls with specific types of media

 libempathy/empathy-call-factory.c | 17 ++++++++++++++---
 libempathy/empathy-call-factory.h |  3 +++
 2 files changed, 17 insertions(+), 3 deletions(-)

commit fdb4f5cd91ab28a2216d14388e707ba61efab353
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu May 7 15:19:20 2009 +0100

    Change empathy_tp_call_to to indicate with what media streams we
    want to start

 libempathy/empathy-tp-call.c | 14 ++++++++++++--
 libempathy/empathy-tp-call.h |  3 ++-
 2 files changed, 14 insertions(+), 3 deletions(-)

commit d16f5ff7b8ab7b3325401e13987cebeba87044d8
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu May 7 15:18:32 2009 +0100

    Allow handlers to be created for streams with initial audio and video

 libempathy/empathy-call-handler.c | 46
 +++++++++++++++++++++++++++++++++++++--
 libempathy/empathy-call-handler.h |  3 +++
 2 files changed, 47 insertions(+), 2 deletions(-)

commit a3e15eb1121dc577551934374fc5274aa49da607
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu May 7 15:17:50 2009 +0100

    Tweak the properties of various elements for a better voip experience

 libempathy/empathy-call-handler.c | 48
 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

commit 047b8d63d8617109df8c9ba19e0f4373c535e5b8
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:	Thu May 7 15:15:36 2009 +0100

    Let configure also check for farsight2

 configure.ac | 1 +
 1 file changed, 1 insertion(+)

commit 5b343bef5aabeedfc6c5fac73eb56519f93ba74f
Author: Guillaume Desmottes <gdesmott@gnome.org>
Date:	Tue Apr 14 11:12:40 2009 +0100

    enable coding style checks in libempathy-gtk

 libempathy-gtk/Makefile.am | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

commit a0096d54af2c7b9a33610ac479de36683827780d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:06:14 2009 +0100

    empathy-account-chooser: fix coding style and update FSF address

 libempathy-gtk/empathy-account-chooser.c | 20 ++++++++++----------
 libempathy-gtk/empathy-account-chooser.h |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

commit 4d537af22726496380a36be7ddf073e098abdfeb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:05:58 2009 +0100

    empathy-account-widget-irc: fix coding style

 libempathy-gtk/empathy-account-widget-irc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cff74c58c9e327a3a8f509b75f9179c628a68905
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:05:49 2009 +0100

    empathy-account-widget-sip: fix coding style

 libempathy-gtk/empathy-account-widget-sip.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 7fd94f82a3cb476021e3b374897a71d7eaf803fa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:05:38 2009 +0100

    empathy-account-widget: fix coding style and update FSF address

 libempathy-gtk/empathy-account-widget.c | 18 +++++++++---------
 libempathy-gtk/empathy-account-widget.h |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

commit 815d9d1804e1d1e18314528c48ad5dd4c6976c93
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:05:17 2009 +0100

    empathy-audio-sink: fix coding style

 libempathy-gtk/empathy-audio-sink.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c3e65c91c4123bbc3093e42b5603f466349839c9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:05:09 2009 +0100

    empathy-audio-src: fix coding style

 libempathy-gtk/empathy-audio-src.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e3b7b7c34488b649f7fe10728b939baca76e0fd8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:04:55 2009 +0100

    empathy-avatar-chooser: fix coding style and update FSF address

 libempathy-gtk/empathy-avatar-chooser.c | 8 ++++----
 libempathy-gtk/empathy-avatar-chooser.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

commit 1180e9384fa41a825c814cb8b408539739b381eb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:04:40 2009 +0100

    empathy-avatar-image: update FSF address

 libempathy-gtk/empathy-avatar-image.c | 4 ++--
 libempathy-gtk/empathy-avatar-image.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 78a4786dbb746266272d1205ceaef733948aa30c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:04:20 2009 +0100

    empathy-cell-renderer-activatable: fix coding style

 libempathy-gtk/empathy-cell-renderer-activatable.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f34b13e2f95b88aad6c3c21003fd9c98e191bda8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:04:00 2009 +0100

    empathy-cell-renderer-expander: fix coding style and update FSF
    address

 libempathy-gtk/empathy-cell-renderer-expander.c | 10 +++++-----
 libempathy-gtk/empathy-cell-renderer-expander.h |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

commit 1230f8b408a8752aba579db475379b6bce9e683f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:03:43 2009 +0100

    empathy-cell-renderer-text: update FSF address

 libempathy-gtk/empathy-cell-renderer-text.c | 6 +++---
 libempathy-gtk/empathy-cell-renderer-text.h | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

commit bd8565a59fefc0c2819c9a1b5c8d7a1dee1f15ad
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:03:27 2009 +0100

    empathy-chat-text-view: fix coding style and update FSF address

 libempathy-gtk/empathy-chat-text-view.c | 18 +++++++++---------
 libempathy-gtk/empathy-chat-text-view.h |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

commit 65fb5fdace542411a014e1e0e66620e29445f5d6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:03:14 2009 +0100

    empathy-chat-view: fix coding style and update FSF address

 libempathy-gtk/empathy-chat-view.c | 24 ++++++++++++------------
 libempathy-gtk/empathy-chat-view.h |  6 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)

commit 27720000b8749b952c90710ddc725acb9e86fe60
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:02:56 2009 +0100

    empathy-chat: fix coding style and update FSF address

 libempathy-gtk/empathy-chat.c | 26 +++++++++++++-------------
 libempathy-gtk/empathy-chat.h |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

commit 0a1923ccc82889a3cd26082df0e19f6d7c14f5dc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:02:37 2009 +0100

    empathy-conf: fix coding style and update FSF address

 libempathy-gtk/empathy-conf.c | 4 ++--
 libempathy-gtk/empathy-conf.h | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

commit eb3f722a06ae8a9278b845ae72a99acb83a3ca1a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:02:22 2009 +0100

    empathy-contact-list-store: fix coding style and update FSF address

 libempathy-gtk/empathy-contact-list-store.c | 12 ++++++------
 libempathy-gtk/empathy-contact-list-store.h |	4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

commit a54165a8bf8af0f5b507f0c670c2c4d1b4428d46
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:02:04 2009 +0100

    empathy-contact-list-view: fix coding style and update FSF address

 libempathy-gtk/empathy-contact-list-view.c | 20 ++++++++++----------
 libempathy-gtk/empathy-contact-list-view.h |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

commit 914b9e47e2f96865e7dcfce92f3237a3ff8086fc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:01:42 2009 +0100

    empathy-contact-menu: fix coding style

 libempathy-gtk/empathy-contact-menu.c | 4 ++--
 libempathy-gtk/empathy-contact-menu.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit ee9e40df7290b056332d890ce19d22dbe24c16d6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:01:30 2009 +0100

    empathy-contact-selector: fix coding style

 libempathy-gtk/empathy-contact-selector.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c6651fdfbaf19fd20da3f9be13691f142aef8786
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:01:16 2009 +0100

    empathy-contact-widget: fix coding style

 libempathy-gtk/empathy-contact-widget.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 56bfafeea5e41e5c6e943fe41eb348f10d174062
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:01:01 2009 +0100

    empathy-geometry: update FSF address

 libempathy-gtk/empathy-geometry.c | 4 ++--
 libempathy-gtk/empathy-geometry.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit aace12d9d1ea713dfcf13acd89f28f481b654ecd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:00:37 2009 +0100

    empathy-images: fix coding style

 libempathy-gtk/empathy-images.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 691ea26a17b34085ace287f4fb7e0b7e79a09b26
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:00:24 2009 +0100

    empathy-irc-network-dialog: fix coding style

 libempathy-gtk/empathy-irc-network-dialog.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 057ed59e0086cb0a6576dc1ff9121687d5382ae2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 16:00:10 2009 +0100

    empathy-log-window: fix coding style and update FSF address

 libempathy-gtk/empathy-log-window.c | 10 +++++-----
 libempathy-gtk/empathy-log-window.h |	6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

commit dbf752ab75427642eae6afe4343a21e8b03e6e90
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 15:59:54 2009 +0100

    empathy-new-message-dialog: fix coding style

 libempathy-gtk/empathy-new-message-dialog.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 402929e44e5e28d568d6895b37c50e0f974f1e59
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 15:59:43 2009 +0100

    empathy-presence-chooser: fix coding style and update FSF address

 libempathy-gtk/empathy-presence-chooser.c | 8 ++++----
 libempathy-gtk/empathy-presence-chooser.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

commit c0dc199af77dc7a5197f99bbfd5b353741273be9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 15:59:26 2009 +0100

    empathy-profile-chooser: fix coding style

 libempathy-gtk/empathy-profile-chooser.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 01e22174eb8ca95d992b1128bb0329df1d46805c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 15:59:13 2009 +0100

    empathy-smiley-manager: fix coding style

 libempathy-gtk/empathy-smiley-manager.c | 10 +++++-----
 libempathy-gtk/empathy-smiley-manager.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

commit 5cd377055ba315c442e9f0aed943be3eaa45ea8b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 15:58:58 2009 +0100

    empathy-spell: update FSF address

 libempathy-gtk/empathy-spell.c | 4 ++--
 libempathy-gtk/empathy-spell.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 28e7a06124667aec8439ca9e9e3eadb877e80a8e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 15:58:40 2009 +0100

    empathy-status-preset-dialog: fix coding style and update FSF address

 libempathy-gtk/empathy-status-preset-dialog.c | 8 ++++----
 libempathy-gtk/empathy-status-preset-dialog.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

commit 16deaa5025e7527c1fc1a36fb8fd8afb900ff75c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 15:58:24 2009 +0100

    empathy-theme-boxes: fix coding style and update FSF address

 libempathy-gtk/empathy-theme-boxes.c | 8 ++++----
 libempathy-gtk/empathy-theme-boxes.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

commit 52e500f44d9bd572e1a224d3d16fe188312a0b8f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 15:58:09 2009 +0100

    empathy-theme-irc: fix coding style and update FSF address

 libempathy-gtk/empathy-theme-irc.c | 6 +++---
 libempathy-gtk/empathy-theme-irc.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

commit 80efc3dda3de137bc6d8e9cf339ded9f25d40234
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 15:57:55 2009 +0100

    empathy-theme-manager: fix coding style and update FSF address

 libempathy-gtk/empathy-theme-manager.c | 8 ++++----
 libempathy-gtk/empathy-theme-manager.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

commit f3cf1014c526d70e50b3900929f9a056c724d109
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 15:57:43 2009 +0100

    empathy-ui-utils: fix coding style and update FSF address

 libempathy-gtk/empathy-ui-utils.c | 28 ++++++++++++++--------------
 libempathy-gtk/empathy-ui-utils.h |  8 ++++----
 2 files changed, 18 insertions(+), 18 deletions(-)

commit 4ca94531a85b8f648f5be5f9951b1e8c56e4e8a7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 15:57:24 2009 +0100

    empathy-video-src: fix coding style

 libempathy-gtk/empathy-video-src.c | 6 +++---
 libempathy-gtk/empathy-video-src.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 30848986f6483ac8c43c0ed4d84a479a2f480783
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 15:57:13 2009 +0100

    empathy-video-widget: fix coding style

 libempathy-gtk/empathy-video-widget.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 326c3a23e79880381917fad9d30de2a4df1c78a8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 14:06:22 2009 +0100

    enable coding style checks by default

 configure.ac | 9 +++++++++
 1 file changed, 9 insertions(+)

commit 70e90db86acce48b34391a5115df23042bd780b6
Author: Guillaume Desmottes <gdesmott@gnome.org>
Date:	Tue Apr 14 11:12:34 2009 +0100

    enable coding style checks in libempathy

 libempathy/Makefile.am | 6 ++++++
 1 file changed, 6 insertions(+)

commit dc82422e7c4e508924ccdced859d6f7b089dcf46
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:56:16 2009 +0100

    empathy-tube-handler: fix coding style

 libempathy/empathy-tube-handler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f450bb6318ba7ead7bc8014a5325cf03bb19e61a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:56:00 2009 +0100

    empathy-tp-tube: fix coding style

 libempathy/empathy-tp-tube.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 79a634bec5750340ba11a888e4694683938221d0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:55:49 2009 +0100

    empathy-tp-roomlist: fix coding style

 libempathy/empathy-tp-roomlist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7be06cbed86cd7382854832f58089d6fa269d3b2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:55:37 2009 +0100

    empathy-tp-contact-factory: fix coding style

 libempathy/empathy-tp-contact-factory.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit a4003a623b98bb2d868bc3d10da305f2b5fba435
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:55:23 2009 +0100

    empathy-tp-chat: fix coding style

 libempathy/empathy-tp-chat.c | 12 ++++++------
 libempathy/empathy-tp-chat.h |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

commit 311da6b7a292e02cb14540fe90cbf28b3650067d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:55:10 2009 +0100

    empathy-tp-call: fix coding style

 libempathy/empathy-tp-call.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 15ec4617ba99fa803befc897c665ea9690657692
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:54:49 2009 +0100

    empathy-time: update FSF address

 libempathy/empathy-time.c | 4 ++--
 libempathy/empathy-time.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 8adecae5dd907387d030531356149b369f51af60
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:54:35 2009 +0100

    empathy-status-presets: fix coding style and update FSF address

 libempathy/empathy-status-presets.c | 10 +++++-----
 libempathy/empathy-status-presets.h |	4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

commit 1d0751634dbf9586c2ec40c4cb003399b05bcf35
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:54:13 2009 +0100

    empathy-message: update FSF address

 libempathy/empathy-message.c | 4 ++--
 libempathy/empathy-message.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit e737bea41bcdbe607f022b6cd9921ed576715b24
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:54:00 2009 +0100

    empathy-log-store: update FSF address

 libempathy/empathy-log-store.c | 4 ++--
 libempathy/empathy-log-store.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 7efd911c6a57f65d7c65ea8be41344d2c222cdcf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:53:42 2009 +0100

    empathy-log-store-empathy: update FSF address

 libempathy/empathy-log-store-empathy.c | 4 ++--
 libempathy/empathy-log-store-empathy.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit c770d6729456361c0220dc7e05dddc6763bcb71c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:53:30 2009 +0100

    empathy-log-manager: update FSF address

 libempathy/empathy-log-manager.c | 4 ++--
 libempathy/empathy-log-manager.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 80cefbfa1bcb09a467f13ebd1df254769b2cd76c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:53:13 2009 +0100

    empathy-irc-network: update FSF address

 libempathy/empathy-irc-network.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9239cf14f80b43a82b1b3dd3c467d670ef2de9c5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:52:48 2009 +0100

    empathy-irc-network-manager: fix coding style

 libempathy/empathy-irc-network-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3c472b22ebcf51c6f6f49ed868cd2df08988a965
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:52:35 2009 +0100

    empathy-types: fix coding style

 libempathy/empathy-types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7d0392564e2a5a6508470b2cfa94f39ec26e64ff
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:52:23 2009 +0100

    empathy-tp-contact-list: fix coding style

 libempathy/empathy-tp-contact-list.c | 14 +++++++-------
 libempathy/empathy-tp-contact-list.h |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

commit ec20fb7ff4bee998e5ea0ceb6b6670858d21fb1d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:52:09 2009 +0100

    empathy-utils: fix coding style and update FSF address

 libempathy/empathy-utils.c | 12 ++++++------
 libempathy/empathy-utils.h |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

commit c0dcaede2b8a47ae0da897cc18f2899d6a649433
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:51:48 2009 +0100

    empathy-idle: fix coding style

 libempathy/empathy-idle.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 49b39abeec278ac6e78f6c87ac63d8fbb86b1b12
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:51:36 2009 +0100

    empathy-dispatcher: fix coding style

 libempathy/empathy-dispatcher.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit f50bb220dd13097081b8e45422681507999e9a07
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:51:23 2009 +0100

    empathy-dispatch-operation: fix coding style

 libempathy/empathy-dispatch-operation.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ccc136843beb485cb7ac8aa3646cfee1a7d24c82
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:51:11 2009 +0100

    empathy-contact: fix coding style

 libempathy/empathy-contact.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0f95e1b5f33fbf3cfe9099106b123b722ed566ce
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:50:59 2009 +0100

    empathy-contact-manager: fix coding style

 libempathy/empathy-contact-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c9a4f5b5c0be0ff0c94bba545b91a4f93f509616
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:50:39 2009 +0100

    empathy-contact-monitor: fix coding style

 libempathy/empathy-contact-monitor.c | 2 +-
 libempathy/empathy-contact-monitor.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

commit a66b3c81dc6b8d1dfba8329cf9aacf217c80010c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:50:14 2009 +0100

    empathy-contact-groups: fix coding style and update FSF address

 libempathy/empathy-contact-groups.c | 8 ++++----
 libempathy/empathy-contact-groups.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

commit a7f1705e7202ccc9a6174fe3a315840977a62f6f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:49:58 2009 +0100

    empathy-chatroom-manager: fix coding style and update FSF address

 libempathy/empathy-chatroom-manager.c | 8 ++++----
 libempathy/empathy-chatroom-manager.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

commit 5cc5d7bc3a74eff93e45ccc2b0d0b11bd4260772
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:49:39 2009 +0100

    empathy-call-handler: fix coding style

 libempathy/empathy-call-handler.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9c4658aacb727463c8cec239f82763802b89ab4d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:49:23 2009 +0100

    empathy-call-factory: fix coding style

 libempathy/empathy-call-factory.c | 2 +-
 libempathy/empathy-call-factory.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit a0605bdf7f09a224a81d24909702c347319ae728
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon May 18 13:46:39 2009 +0100

    empathy-account-manager: fix coding style

 libempathy/empathy-account-manager.c | 10 +++++-----
 libempathy/empathy-account-manager.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

commit 518a613ee08adde8b1e9516d9e82e6baa72ec882
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon May 18 13:15:38 2009 +0200

    Extract date of last tag instead of hardcoding it.

 release.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit ae394e19d0b012e849dfd913e683f73ef54b8e57
Author: Frédéric Péters <fpeters@0d.be>
Date:	Mon May 18 12:35:33 2009 +0200

    [help] remove invalid <year> element under <publisher>

 help/C/empathy.xml | 5 -----
 1 file changed, 5 deletions(-)

commit cce131dc448057cff3b1dcfae234c976a657a3b0
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon May 18 12:15:34 2009 +0200

    Bump version to future 2.27 releases

 Makefile.am  | 2 +-
 configure.ac | 2 +-
 release.py   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 353f7a0db7f46d41d07c9a290102f39ef5e3730b
Author: Olivier Le Thanh Duong <olivier@lethanh.be>
Date:	Thu May 7 19:56:24 2009 +0200

    Fix GstBin import problem in the python binding

 python/pyempathygtk/pyempathygtk.override | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 93d1b6ead8b6bb92c5e6251f75dd7109b51036f5
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Fri Apr 24 13:46:51 2009 +0100

    Add a "Copy" toolbar item to copy text to clipboard.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 73
 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

commit 7f6ef434116202d103024c41cf280c2d15b81862
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Fri Apr 24 12:47:14 2009 +0100

    Create a straight TpProxy instead of a TpConnection.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

commit 5aff2cd01627715693f777dd69400665cf79dc7a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Fri Apr 24 01:41:52 2009 +0100

    Connect to NameOwnerChanged so the CM chooser can be updated when
    new CMs join and old ones die.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 93
 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)

commit cd7da38d3d22a5a7588346f2cb097e9152dcd120
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Apr 23 18:45:43 2009 +0100

    Store unique names in CM model.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 139
 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 112 insertions(+), 27 deletions(-)

commit 3d5c631f39123c026ddd67f30c98400fb5d60c31
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Apr 23 12:46:59 2009 +0100

    Use GtkWindow's "transient-for" property instead of holding a ref
    to the parent window.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

commit a6cdf0ea3b5c585a7fbbe692be2fee322801d716
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Apr 23 12:43:14 2009 +0100

    Don't show the same CM more than once in the CM chooser if there
    are more than one connections to it.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit 6cc716c326a27cc4db993a3384ec73bd9bb0aa3d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Apr 23 12:20:47 2009 +0100

    Use GFile and GFileOutputStream instead of fopen and fprintf.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 48
 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 35 insertions(+), 13 deletions(-)

commit 74f912543dcd2d78aee3e6ab15bf60a29e08074a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Apr 23 11:52:16 2009 +0100

    Use "foo != NULL" instead of "foo".

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit b096d874c2ffc78d38849cc5a8d98bcdf98cc2ec
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Apr 23 11:55:44 2009 +0100

    Add more comments to debug_dialog_press_event_cb.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 3 +++
 1 file changed, 3 insertions(+)

commit ece1e3733ab9e68a2f630801cba420521217eebb
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Apr 23 11:53:46 2009 +0100

    Use guint instead of int for for loop counter.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4c964ad03a5821ab8b6b8a239445ef49e05d0e86
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Apr 23 11:53:08 2009 +0100

    Split some long lines into two.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

commit ce3757027a8d85b27b8e06dce1faf62ed50159f0
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Apr 23 11:47:09 2009 +0100

    Changed Help menu item to simply "Debug.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-main-window.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 865ef86c6649c3aa29f95e674d4b322f650282a9
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Thu Apr 23 11:46:20 2009 +0100

    Updated coding style.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 88
 +++++++++++++++++++++++-----------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

commit a54629f7d8f1ea443546c69fa42d7b43de345a91
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Apr 21 19:50:02 2009 +0100

    Remove tabs, sigh.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit a3c76f11316e9db645767ea79ae12302db6c4274
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Apr 21 17:51:35 2009 +0100

    Implement save button.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 96
 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)

commit 9114490a86ba3fc5003158d8c32d4d4a7358583b
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Apr 21 16:52:32 2009 +0100

    Clear the store when changing CM.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 2 ++
 1 file changed, 2 insertions(+)

commit 07c9be03b2c31136548d1a90ffbe1a243f2dbe07
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Apr 21 16:42:52 2009 +0100

    Implemented a menu when selecting a row to copy message to clipboard.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 95
 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)

commit dced9a5c90939b1be6a893bd8135bfdd5ae3b557
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Apr 21 04:07:48 2009 +0100

    Display debug message as monospace.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 3 +++
 1 file changed, 3 insertions(+)

commit 588532480256c991bf976dba129b9ec2eedb89ec
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Apr 21 03:43:30 2009 +0100

    Implement clear button.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit d8de0a0b75eb671ad69f6212bbfbf4aa4aa2f397
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Tue Apr 21 03:37:27 2009 +0100

    Implement level combo box.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 145
 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 117 insertions(+), 28 deletions(-)

commit 7e473c19291d827cfa85ec7d09d5a602bbc34aaf
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Apr 20 23:28:59 2009 +0100

    Align text at the top of the row.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 1 +
 1 file changed, 1 insertion(+)

commit 0dce56f5fccdb09c42a66823986f5b13ba2e4704
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Apr 20 22:24:40 2009 +0100

    Remove trailing whitespace from the debug message.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

commit 37b7480c83cae6bc8bb818c1a0d6ba77ead968eb
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Apr 20 22:15:36 2009 +0100

    Store the bus name of CMs in an the combo box's tree model instead
    of two different lists.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

commit 989e03b5f67ce060f5f96a5bc8c1d6b176e5bc4b
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Apr 20 21:54:05 2009 +0100

    Make the tree view have alternating row colours.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 1 +
 1 file changed, 1 insertion(+)

commit 5bb2c60a3746e458aa82312f036655457459d2f0
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Apr 20 20:20:54 2009 +0100

    Correct indentation and tab problems.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 72
 +++++++++++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

commit 67fc33120047dc2e0eea93fb255ee21674d5d8c5
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Apr 20 20:13:30 2009 +0100

    Define the debug object path in the header and keep CM bus names
    from tp_list_connection_names around.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 30 +++++++++++++++---------------
 src/empathy-debug-dialog.h |  2 ++
 2 files changed, 17 insertions(+), 15 deletions(-)

commit 94214398a27d10a9bc55716856ae2303e9d6f6d6
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Apr 20 16:38:00 2009 +0100

    Create a new string for category as it's g_free'd.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6d3c3d4d23c2baca8dbab76edf349691f74b1276
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Apr 20 16:37:35 2009 +0100

    Add Debug interface to TpProxy's known interfaces.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 3 +++
 1 file changed, 3 insertions(+)

commit 563cdd3b2e98eaf6225727f3320eb81826eaa41d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Apr 20 15:46:16 2009 +0100

    Return NULL if _new is not given a GtkWindow.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 2 ++
 1 file changed, 2 insertions(+)

commit f408815ea2363da687f13bc93d3149ae982169c3
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Apr 20 15:44:31 2009 +0100

    Only set Enabled=false in dispose if there we have a proxy.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 4db501d37a674c4ec696a6d0fbe30272f0e5acd6
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Apr 20 15:44:02 2009 +0100

    Changed account chooser to CM chooser.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 115
 ++++++++++++++++++++++++++++++---------------
 1 file changed, 78 insertions(+), 37 deletions(-)

commit 9de1a3a667851d39f82a5b2aa21af6620750a10d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Apr 20 14:40:24 2009 +0100

    Get the CM bus name from the TpProxy instead of hard-coding, and
    fix some ref problems.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

commit 810744148160705f76412551b28daadaf7d29da8
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Apr 20 02:15:47 2009 +0100

    Make sure the toolbar labels are shown.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit 828b3394316f42a6a451db1b541299cae516bcd9
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Apr 20 02:12:06 2009 +0100

    Only set Enabled when we already have a proxy.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit a1a6d017403f00f39d34611d0890edb8cebf9389
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Apr 20 02:02:57 2009 +0100

    Set Enabled dbus property to the correct value depending on whether
    the signal is connected and whether the pause button is pressed.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

commit 431c9bd2c21cf9d47996f1d9e68519acbbc70652
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Apr 20 01:46:50 2009 +0100

    Implement pause button and handle connections to signal when changing
    account.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 52
 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 44 insertions(+), 8 deletions(-)

commit 53ac3ca75ee31a2d62d0d0bb96f8344764949a36
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Apr 20 01:29:14 2009 +0100

    Only connect to NewDebugMessage if the paused button is not pressed.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit 181bac302b8b30c2ba9f409e051087f8e154fb2c
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Apr 20 01:26:03 2009 +0100

    Connect to NewDebugMessage and append it to the treeview.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 108
 ++++++++++++++++++++++++++++-----------------
 1 file changed, 67 insertions(+), 41 deletions(-)

commit 56cc5ad7593c863bff6c04c792c222228d2b78ce
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Mon Apr 20 01:07:17 2009 +0100

    Call GetMessages when the debug dialog opens.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 182
 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 171 insertions(+), 11 deletions(-)

commit db4456ba5fabfef982a13359df599f7040aa5275
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Sun Apr 19 20:21:01 2009 +0100

    Add GtkTreeView to debug dialog.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 67
 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 61 insertions(+), 6 deletions(-)

commit 0cbb9fe558f4652c5a0f70a2864a061665ba605e
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Sun Apr 19 19:38:42 2009 +0100

    Add Debug interface.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 extensions/Debug.xml	| 112
 +++++++++++++++++++++++++++++++++++++++++++++++++
 extensions/Makefile.am |   3 +-
 extensions/misc.xml	|   1 +
 3 files changed, 115 insertions(+), 1 deletion(-)

commit 7e1d202225b540ed028343a5f882a2bb9c02f121
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Sun Apr 19 19:29:41 2009 +0100

    Added Debug Window menu item.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-main-window.c  | 9 +++++++++
 src/empathy-main-window.ui | 7 +++++++
 2 files changed, 16 insertions(+)

commit 56daa742534c8bac393b21ae204927d144307074
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Sun Apr 19 19:22:52 2009 +0100

    Added a basic UI to debug dialog.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-debug-dialog.c | 119
 ++++++++++++++++++++++++++++++++++++++++++---
 src/empathy-debug-dialog.h |	2 +-
 2 files changed, 112 insertions(+), 9 deletions(-)

commit b95432a011a198175e42ad191fc4892d0abf153f
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:	Sun Apr 19 16:19:08 2009 +0100

    Added initial empty EmpathyDebugDialog.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/Makefile.am	    |	1 +
 src/empathy-debug-dialog.c | 130
 +++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-debug-dialog.h |  61 +++++++++++++++++++++
 3 files changed, 192 insertions(+)
