Merge lp:~pete-woods/account-plugins/google-youtube into lp:account-plugins

Proposed by Pete Woods on 2014-07-01
Status: Rejected
Rejected by: Alberto Mardegan on 2014-07-01
Proposed branch: lp:~pete-woods/account-plugins/google-youtube
Merge into: lp:account-plugins
Diff against target: 50 lines (+12/-1)
4 files modified
Makefile.am (+1/-0)
data/providers/google.provider.in.in (+1/-1)
data/services/google-youtube.service.in (+9/-0)
debian/account-plugin-google.install (+1/-0)
To merge this branch: bzr merge lp:~pete-woods/account-plugins/google-youtube
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) 2014-07-01 Disapprove on 2014-07-01
PS Jenkins bot (community) continuous-integration Approve on 2014-07-01
Review via email: mp+225131@code.launchpad.net

Commit message

Google: Add Youtube service

Description of the change

Add the Youtube service to enable the newly written Youtube scope to access Youtube accounts.

To post a comment you must log in.
Alberto Mardegan (mardy) wrote :

As discussed in IRC, the service file will be shipped by the youtube scope.

review: Disapprove

Unmerged revisions

139. By Pete Woods on 2014-07-01

Google: Add Youtube service

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 2014-07-01 10:39:24 +0000
@@ -89,6 +89,7 @@
89 data/services/foursquare-microblog.service.in \89 data/services/foursquare-microblog.service.in \
90 data/services/google-drive.service.in \90 data/services/google-drive.service.in \
91 data/services/google-im.service.in \91 data/services/google-im.service.in \
92 data/services/google-youtube.service.in \
92 data/services/identica-microblog.service.in \93 data/services/identica-microblog.service.in \
93 data/services/linkedin-microblog.service.in \94 data/services/linkedin-microblog.service.in \
94 data/services/instagram-microblog.service.in \95 data/services/instagram-microblog.service.in \
9596
=== modified file 'data/providers/google.provider.in.in'
--- data/providers/google.provider.in.in 2014-03-07 15:03:19 +0000
+++ data/providers/google.provider.in.in 2014-07-01 10:39:24 +0000
@@ -19,7 +19,7 @@
19 <setting name="TokenPath">o/oauth2/token</setting>19 <setting name="TokenPath">o/oauth2/token</setting>
20 <setting name="RedirectUri">https://wiki.ubuntu.com/</setting>20 <setting name="RedirectUri">https://wiki.ubuntu.com/</setting>
21 <setting name="ResponseType">code</setting>21 <setting name="ResponseType">code</setting>
22 <setting name="Scope" type="as">['https://docs.google.com/feeds/','https://www.googleapis.com/auth/googletalk','https://www.googleapis.com/auth/userinfo.email','https://www.googleapis.com/auth/userinfo.profile','https://picasaweb.google.com/data/','https://mail.google.com/','https://www.google.com/m8/feeds/','https://www.googleapis.com/auth/calendar','https://www.googleapis.com/auth/carddav']</setting>22 <setting name="Scope" type="as">['https://docs.google.com/feeds/','https://www.googleapis.com/auth/googletalk','https://www.googleapis.com/auth/userinfo.email','https://www.googleapis.com/auth/userinfo.profile','https://picasaweb.google.com/data/','https://mail.google.com/','https://www.google.com/m8/feeds/','https://www.googleapis.com/auth/calendar','https://www.googleapis.com/auth/carddav','https://www.googleapis.com/auth/youtube']</setting>
23 <setting name="ClientId">@GOOGLE_CLIENT_ID@</setting>23 <setting name="ClientId">@GOOGLE_CLIENT_ID@</setting>
24 <setting name="ClientSecret">@GOOGLE_CLIENT_SECRET@</setting>24 <setting name="ClientSecret">@GOOGLE_CLIENT_SECRET@</setting>
25 <setting name="AllowedSchemes" type="as">['https','http']</setting>25 <setting name="AllowedSchemes" type="as">['https','http']</setting>
2626
=== added file 'data/services/google-youtube.service.in'
--- data/services/google-youtube.service.in 1970-01-01 00:00:00 +0000
+++ data/services/google-youtube.service.in 2014-07-01 10:39:24 +0000
@@ -0,0 +1,9 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<service id="google-youtube">
3 <type>sharing</type>
4 <name>Youtube</name>
5 <icon>youtube</icon>
6 <provider>google</provider>
7 <translations>account-plugins</translations>
8</service>
9
010
=== modified file 'debian/account-plugin-google.install'
--- debian/account-plugin-google.install 2013-08-01 14:34:21 +0000
+++ debian/account-plugin-google.install 2014-07-01 10:39:24 +0000
@@ -1,6 +1,7 @@
1etc/signon-ui/webkit-options.d/accounts.google.com.conf1etc/signon-ui/webkit-options.d/accounts.google.com.conf
2usr/share/accounts/services/google-drive.service2usr/share/accounts/services/google-drive.service
3usr/share/accounts/services/google-im.service3usr/share/accounts/services/google-im.service
4usr/share/accounts/services/google-youtube.service
4usr/share/accounts/services/picasa.service5usr/share/accounts/services/picasa.service
5usr/share/accounts/providers/google.provider6usr/share/accounts/providers/google.provider
6usr/share/accounts/qml-plugins/google/Main.qml7usr/share/accounts/qml-plugins/google/Main.qml

Subscribers

People subscribed via source and target branches