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

 .../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

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