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

Proposed by Alberto Mardegan on 2015-04-28
Status: Merged
Merged at revision: 144
Proposed branch: lp:~mardy/account-plugins/lp1432613-utopic
Merge into: lp:account-plugins/14.10
Diff against target: 125 lines (+11/-50)
7 files modified
Makefile.am (+1/-3)
data/providers/facebook.provider.in.in (+2/-1)
data/services/facebook-im.service.in (+0/-22)
data/services/wlm.service.in (+0/-22)
debian/account-plugin-facebook.install (+0/-1)
debian/account-plugin-windows-live.install (+0/-1)
debian/changelog (+8/-0)
To merge this branch: bzr merge lp:~mardy/account-plugins/lp1432613-utopic
Reviewer Review Type Date Requested Status
Iain Lane (community) 2015-04-28 Approve on 2015-04-28
Online Accounts 2015-04-28 Pending
Review via email: mp+257656@code.launchpad.net

Commit message

Backport two bugfixes

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

Description of the change

Backport two bugfixes

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

To post a comment you must log in.
Iain Lane (laney) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2014-09-10 07:47:30 +0000
3+++ Makefile.am 2015-04-28 15:40:20 +0000
4@@ -80,7 +80,6 @@
5 $(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@
6
7 services_in_files = \
8- data/services/facebook-im.service.in \
9 data/services/facebook-microblog.service.in \
10 data/services/facebook-sharing.service.in \
11 data/services/flickr-microblog.service.in \
12@@ -94,8 +93,7 @@
13 data/services/picasa.service.in \
14 data/services/sina-microblog.service.in \
15 data/services/sohu-microblog.service.in \
16- data/services/twitter-microblog.service.in \
17- data/services/wlm.service.in
18+ data/services/twitter-microblog.service.in
19
20 services_DATA = \
21 $(services_in_files:.service.in=.service)
22
23=== modified file 'data/providers/facebook.provider.in.in'
24--- data/providers/facebook.provider.in.in 2014-09-24 08:27:39 +0000
25+++ data/providers/facebook.provider.in.in 2015-04-28 15:40:20 +0000
26@@ -16,8 +16,9 @@
27 <setting name="Host">www.facebook.com</setting>
28 <setting name="AuthPath">/dialog/oauth</setting>
29 <setting name="RedirectUri">https://www.facebook.com/connect/login_success.html</setting>
30+ <setting name="ResponseType">token</setting>
31 <setting name="Display">popup</setting>
32- <setting name="Scope" type="as">['publish_stream','read_stream','status_update','user_photos','friends_photos','xmpp_login']</setting>
33+ <setting name="Scope" type="as">['publish_actions','read_stream','user_photos']</setting>
34 <setting name="ClientId">@FACEBOOK_CLIENT_ID@</setting>
35 <setting name="AllowedSchemes" type="as">['https','http']</setting>
36 </group>
37
38=== removed file 'data/services/facebook-im.service.in'
39--- data/services/facebook-im.service.in 2012-10-04 14:18:34 +0000
40+++ data/services/facebook-im.service.in 1970-01-01 00:00:00 +0000
41@@ -1,22 +0,0 @@
42-<?xml version="1.0" encoding="UTF-8" ?>
43-<service id="facebook-im">
44- <type>IM</type>
45- <name>Facebook</name>
46- <icon>facebook</icon>
47- <provider>facebook</provider>
48- <translations>account-plugins</translations>
49-
50- <!-- default settings (account settings have precedence over these) -->
51- <template>
52- <group name="telepathy">
53- <setting name="mc-readonly-params" type="b">true</setting>
54- <setting name="manager">gabble</setting>
55- <setting name="protocol">jabber</setting>
56-
57- <setting name="param-account">chat.facebook.com</setting>
58- <setting name="param-server">chat.facebook.com</setting>
59- <setting name="param-fallback-servers">chat.facebook.com:443</setting>
60- </group>
61- </template>
62-
63-</service>
64
65=== removed file 'data/services/wlm.service.in'
66--- data/services/wlm.service.in 2012-10-04 14:18:34 +0000
67+++ data/services/wlm.service.in 1970-01-01 00:00:00 +0000
68@@ -1,22 +0,0 @@
69-<?xml version="1.0" encoding="UTF-8" ?>
70-<service id="wlm">
71- <type>IM</type>
72- <name>Windows Live Messenger</name>
73- <icon>msn</icon>
74- <provider>windows-live</provider>
75- <translations>account-plugins</translations>
76-
77- <!-- default settings (account settings have precedence over these) -->
78- <template>
79- <group name="telepathy">
80- <setting name="mc-readonly-params" type="b">true</setting>
81- <setting name="manager">gabble</setting>
82- <setting name="protocol">jabber</setting>
83-
84- <setting name="param-account">messenger.live.com</setting>
85- <setting name="param-fallback-servers">xmpp.messenger.live.com</setting>
86- <setting name="param-extra-certificate-identities">*.gateway.messenger.live.com</setting>
87- </group>
88- </template>
89-
90-</service>
91
92=== modified file 'debian/account-plugin-facebook.install'
93--- debian/account-plugin-facebook.install 2014-09-10 07:47:30 +0000
94+++ debian/account-plugin-facebook.install 2015-04-28 15:40:20 +0000
95@@ -1,6 +1,5 @@
96 etc/signon-ui/webkit-options.d/www.facebook.com.conf
97 usr/share/accounts/services/facebook-sharing.service
98 usr/share/accounts/services/facebook-microblog.service
99-usr/share/accounts/services/facebook-im.service
100 usr/share/accounts/providers/facebook.provider
101 usr/share/accounts/qml-plugins/facebook/Main.qml
102
103=== modified file 'debian/account-plugin-windows-live.install'
104--- debian/account-plugin-windows-live.install 2013-03-19 14:47:46 +0000
105+++ debian/account-plugin-windows-live.install 2015-04-28 15:40:20 +0000
106@@ -1,3 +1,2 @@
107 etc/signon-ui/webkit-options.d/login.live.com.conf
108-usr/share/accounts/services/wlm.service
109 usr/share/accounts/providers/windows-live.provider
110
111=== modified file 'debian/changelog'
112--- debian/changelog 2014-09-24 23:36:09 +0000
113+++ debian/changelog 2015-04-28 15:40:20 +0000
114@@ -1,3 +1,11 @@
115+account-plugins (0.12+14.10.20140924-0ubuntu2) UNRELEASED; urgency=medium
116+
117+ * Add required ResponseType parameter to Facebook plugin, move to 2.0 API.
118+ (LP: #1430694)
119+ * Remove non working IM services (LP: #1432613)
120+
121+ -- Alberto Mardegan <alberto.mardegan@canonical.com> Tue, 28 Apr 2015 10:35:28 -0500
122+
123 account-plugins (0.12+14.10.20140924-0ubuntu1) utopic; urgency=low
124
125 [ Alberto Mardegan ]

Subscribers

People subscribed via source and target branches