Merge lp:~mardy/account-plugins/lp1432613-utopic into lp:account-plugins/14.10

[Alberto Mardegan]

Backport two bugfixes

* Add required ResponseType parameter to Facebook plugin, move to v2.0 API.
  (LP: #1430694)
* Remove non working IM services (LP: #1432613)

Backport two bugfixes

* Add required ResponseType parameter to Facebook plugin, move to v2.0 API.
  (LP: #1430694)
* Remove non working IM services (LP: #1432613)

[Iain Lane (laney)]

OK thanks, optionally consider updating the descriptions to mention the lack of IM support

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2014-09-10 07:47:30 +0000
+++ Makefile.am	2015-04-28 15:40:20 +0000
@@ -80,7 +80,6 @@
 	$(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@
 
 services_in_files = \
-	data/services/facebook-im.service.in \
 	data/services/facebook-microblog.service.in \
 	data/services/facebook-sharing.service.in \
 	data/services/flickr-microblog.service.in \
@@ -94,8 +93,7 @@
 	data/services/picasa.service.in \
 	data/services/sina-microblog.service.in \
 	data/services/sohu-microblog.service.in \
-	data/services/twitter-microblog.service.in \
-	data/services/wlm.service.in
+	data/services/twitter-microblog.service.in
 
 services_DATA = \
 	$(services_in_files:.service.in=.service)

=== modified file 'data/providers/facebook.provider.in.in'
--- data/providers/facebook.provider.in.in	2014-09-24 08:27:39 +0000
+++ data/providers/facebook.provider.in.in	2015-04-28 15:40:20 +0000
@@ -16,8 +16,9 @@
           <setting name="Host">www.facebook.com</setting>
           <setting name="AuthPath">/dialog/oauth</setting>
           <setting name="RedirectUri">https://www.facebook.com/connect/login_success.html</setting>
+          <setting name="ResponseType">token</setting>
           <setting name="Display">popup</setting>
-          <setting name="Scope" type="as">['publish_stream','read_stream','status_update','user_photos','friends_photos','xmpp_login']</setting>
+          <setting name="Scope" type="as">['publish_actions','read_stream','user_photos']</setting>
           <setting name="ClientId">@FACEBOOK_CLIENT_ID@</setting>
           <setting name="AllowedSchemes" type="as">['https','http']</setting>
         </group>

=== removed file 'data/services/facebook-im.service.in'
--- data/services/facebook-im.service.in	2012-10-04 14:18:34 +0000
+++ data/services/facebook-im.service.in	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<service id="facebook-im">
-  <type>IM</type>
-  <name>Facebook</name>
-  <icon>facebook</icon>
-  <provider>facebook</provider>
-  <translations>account-plugins</translations>
-
-  <!-- default settings (account settings have precedence over these) -->
-  <template>
-    <group name="telepathy">
-      <setting name="mc-readonly-params" type="b">true</setting>
-      <setting name="manager">gabble</setting>
-      <setting name="protocol">jabber</setting>
-
-      <setting name="param-account">chat.facebook.com</setting>
-      <setting name="param-server">chat.facebook.com</setting>
-      <setting name="param-fallback-servers">chat.facebook.com:443</setting>
-    </group>
-  </template>
-
-</service>

=== removed file 'data/services/wlm.service.in'
--- data/services/wlm.service.in	2012-10-04 14:18:34 +0000
+++ data/services/wlm.service.in	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<service id="wlm">
-  <type>IM</type>
-  <name>Windows Live Messenger</name>
-  <icon>msn</icon>
-  <provider>windows-live</provider>
-  <translations>account-plugins</translations>
-
-  <!-- default settings (account settings have precedence over these) -->
-  <template>
-    <group name="telepathy">
-      <setting name="mc-readonly-params" type="b">true</setting>
-      <setting name="manager">gabble</setting>
-      <setting name="protocol">jabber</setting>
-
-      <setting name="param-account">messenger.live.com</setting>
-      <setting name="param-fallback-servers">xmpp.messenger.live.com</setting>
-      <setting name="param-extra-certificate-identities">*.gateway.messenger.live.com</setting>
-    </group>
-  </template>
-
-</service>

=== modified file 'debian/account-plugin-facebook.install'
--- debian/account-plugin-facebook.install	2014-09-10 07:47:30 +0000
+++ debian/account-plugin-facebook.install	2015-04-28 15:40:20 +0000
@@ -1,6 +1,5 @@
 etc/signon-ui/webkit-options.d/www.facebook.com.conf
 usr/share/accounts/services/facebook-sharing.service
 usr/share/accounts/services/facebook-microblog.service
-usr/share/accounts/services/facebook-im.service
 usr/share/accounts/providers/facebook.provider
 usr/share/accounts/qml-plugins/facebook/Main.qml

=== modified file 'debian/account-plugin-windows-live.install'
--- debian/account-plugin-windows-live.install	2013-03-19 14:47:46 +0000
+++ debian/account-plugin-windows-live.install	2015-04-28 15:40:20 +0000
@@ -1,3 +1,2 @@
 etc/signon-ui/webkit-options.d/login.live.com.conf
-usr/share/accounts/services/wlm.service
 usr/share/accounts/providers/windows-live.provider

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-24 23:36:09 +0000
+++ debian/changelog	2015-04-28 15:40:20 +0000
@@ -1,3 +1,11 @@
+account-plugins (0.12+14.10.20140924-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Add required ResponseType parameter to Facebook plugin, move to 2.0 API.
+   (LP: #1430694)
+  * Remove non working IM services (LP: #1432613)
+
+ -- Alberto Mardegan <[e-mail]>  Tue, 28 Apr 2015 10:35:28 -0500
+
 account-plugins (0.12+14.10.20140924-0ubuntu1) utopic; urgency=low
 
   [ Alberto Mardegan ]