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