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 files changed, 0 insertions(+), 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 files 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 files changed, 1 insertions(+), 1 deletions(-)

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 files 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 files changed, 4 insertions(+), 0 deletions(-)

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 files 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 files 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 files changed, 1 insertions(+), 0 deletions(-)

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 files 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

 .../empathy-irc-network-chooser-dialog.c           |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

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 files changed, 35 insertions(+), 0 deletions(-)

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(+), 0 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 files 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 files changed, 26 insertions(+), 26 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 files 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 files changed, 8 insertions(+), 0 deletions(-)

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 files 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 files 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 files changed, 6 insertions(+), 0 deletions(-)

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 files 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 files 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 files 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 files 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 files 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 files 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 files 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 files 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(+), 0 deletions(-)

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 files changed, 1 insertions(+), 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 files changed, 2 insertions(+), 1 deletions(-)

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 files changed, 11 insertions(+), 0 deletions(-)

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 files changed, 1 insertions(+), 0 deletions(-)

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 files changed, 0 insertions(+), 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 files 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(+), 0 deletions(-)

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 files changed, 0 insertions(+), 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 files 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 files 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 files 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 files 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 files changed, 1 insertions(+), 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 files changed, 0 insertions(+), 1 deletions(-)

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 files changed, 0 insertions(+), 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 files 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 files changed, 1 insertions(+), 1 deletions(-)

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 files changed, 1 insertions(+), 1 deletions(-)

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 deletions(-)

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 files 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 files 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 files 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 files 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 files 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 files changed, 1 insertions(+), 1 deletions(-)