Merge lp:~mardy/account-plugins/lp1432613-trusty into lp:account-plugins/14.04

Proposed by Alberto Mardegan on 2015-04-28
Status: Merged
Merged at revision: 139
Proposed branch: lp:~mardy/account-plugins/lp1432613-trusty
Merge into: lp:account-plugins/14.04
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-trusty
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+257652@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
=== modified file 'Makefile.am'
--- Makefile.am 2014-03-31 08:21:46 +0000
+++ Makefile.am 2015-04-28 15:32:46 +0000
@@ -81,7 +81,6 @@
8181
82services_in_files = \82services_in_files = \
83 data/services/facebook-contacts.service.in \83 data/services/facebook-contacts.service.in \
84 data/services/facebook-im.service.in \
85 data/services/facebook-microblog.service.in \84 data/services/facebook-microblog.service.in \
86 data/services/facebook-sharing.service.in \85 data/services/facebook-sharing.service.in \
87 data/services/flickr-microblog.service.in \86 data/services/flickr-microblog.service.in \
@@ -95,8 +94,7 @@
95 data/services/picasa.service.in \94 data/services/picasa.service.in \
96 data/services/sina-microblog.service.in \95 data/services/sina-microblog.service.in \
97 data/services/sohu-microblog.service.in \96 data/services/sohu-microblog.service.in \
98 data/services/twitter-microblog.service.in \97 data/services/twitter-microblog.service.in
99 data/services/wlm.service.in
10098
101services_DATA = \99services_DATA = \
102 $(services_in_files:.service.in=.service)100 $(services_in_files:.service.in=.service)
103101
=== modified file 'data/providers/facebook.provider.in.in'
--- data/providers/facebook.provider.in.in 2013-05-27 06:09:20 +0000
+++ data/providers/facebook.provider.in.in 2015-04-28 15:32:46 +0000
@@ -15,8 +15,9 @@
15 <setting name="Host">www.facebook.com</setting>15 <setting name="Host">www.facebook.com</setting>
16 <setting name="AuthPath">/dialog/oauth</setting>16 <setting name="AuthPath">/dialog/oauth</setting>
17 <setting name="RedirectUri">https://www.facebook.com/connect/login_success.html</setting>17 <setting name="RedirectUri">https://www.facebook.com/connect/login_success.html</setting>
18 <setting name="ResponseType">token</setting>
18 <setting name="Display">popup</setting>19 <setting name="Display">popup</setting>
19 <setting name="Scope" type="as">['publish_stream','read_stream','status_update','user_photos','friends_photos','xmpp_login']</setting>20 <setting name="Scope" type="as">['publish_actions','read_stream','user_photos']</setting>
20 <setting name="ClientId">@FACEBOOK_CLIENT_ID@</setting>21 <setting name="ClientId">@FACEBOOK_CLIENT_ID@</setting>
21 <setting name="AllowedSchemes" type="as">['https','http']</setting>22 <setting name="AllowedSchemes" type="as">['https','http']</setting>
22 </group>23 </group>
2324
=== 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 @@
1<?xml version="1.0" encoding="UTF-8" ?>
2<service id="facebook-im">
3 <type>IM</type>
4 <name>Facebook</name>
5 <icon>facebook</icon>
6 <provider>facebook</provider>
7 <translations>account-plugins</translations>
8
9 <!-- default settings (account settings have precedence over these) -->
10 <template>
11 <group name="telepathy">
12 <setting name="mc-readonly-params" type="b">true</setting>
13 <setting name="manager">gabble</setting>
14 <setting name="protocol">jabber</setting>
15
16 <setting name="param-account">chat.facebook.com</setting>
17 <setting name="param-server">chat.facebook.com</setting>
18 <setting name="param-fallback-servers">chat.facebook.com:443</setting>
19 </group>
20 </template>
21
22</service>
230
=== 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 @@
1<?xml version="1.0" encoding="UTF-8" ?>
2<service id="wlm">
3 <type>IM</type>
4 <name>Windows Live Messenger</name>
5 <icon>msn</icon>
6 <provider>windows-live</provider>
7 <translations>account-plugins</translations>
8
9 <!-- default settings (account settings have precedence over these) -->
10 <template>
11 <group name="telepathy">
12 <setting name="mc-readonly-params" type="b">true</setting>
13 <setting name="manager">gabble</setting>
14 <setting name="protocol">jabber</setting>
15
16 <setting name="param-account">messenger.live.com</setting>
17 <setting name="param-fallback-servers">xmpp.messenger.live.com</setting>
18 <setting name="param-extra-certificate-identities">*.gateway.messenger.live.com</setting>
19 </group>
20 </template>
21
22</service>
230
=== modified file 'debian/account-plugin-facebook.install'
--- debian/account-plugin-facebook.install 2013-06-27 14:17:22 +0000
+++ debian/account-plugin-facebook.install 2015-04-28 15:32:46 +0000
@@ -2,6 +2,5 @@
2usr/share/accounts/services/facebook-sharing.service2usr/share/accounts/services/facebook-sharing.service
3usr/share/accounts/services/facebook-contacts.service3usr/share/accounts/services/facebook-contacts.service
4usr/share/accounts/services/facebook-microblog.service4usr/share/accounts/services/facebook-microblog.service
5usr/share/accounts/services/facebook-im.service
6usr/share/accounts/providers/facebook.provider5usr/share/accounts/providers/facebook.provider
7usr/share/accounts/qml-plugins/facebook/Main.qml6usr/share/accounts/qml-plugins/facebook/Main.qml
87
=== 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:32:46 +0000
@@ -1,3 +1,2 @@
1etc/signon-ui/webkit-options.d/login.live.com.conf1etc/signon-ui/webkit-options.d/login.live.com.conf
2usr/share/accounts/services/wlm.service
3usr/share/accounts/providers/windows-live.provider2usr/share/accounts/providers/windows-live.provider
43
=== modified file 'debian/changelog'
--- debian/changelog 2014-04-09 17:58:26 +0000
+++ debian/changelog 2015-04-28 15:32:46 +0000
@@ -1,3 +1,11 @@
1account-plugins (0.11+14.04.20140409.1-0ubuntu2) UNRELEASED; urgency=medium
2
3 * Add required ResponseType parameter to Facebook plugin, move to v2.0 API.
4 (LP: #1430694)
5 * Remove non working IM services (LP: #1432613)
6
7 -- Alberto Mardegan <alberto.mardegan@canonical.com> Tue, 28 Apr 2015 10:21:22 -0500
8
1account-plugins (0.11+14.04.20140409.1-0ubuntu1) trusty; urgency=low9account-plugins (0.11+14.04.20140409.1-0ubuntu1) trusty; urgency=low
210
3 [ Ubuntu daily release ]11 [ Ubuntu daily release ]

Subscribers

People subscribed via source and target branches