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