Merge lp:~mardy/account-plugins/webkit-files-1565772 into lp:account-plugins

Proposed by Alberto Mardegan on 2016-12-06
Status: Merged
Approved by: David Barth on 2016-12-07
Approved revision: 182
Merged at revision: 182
Proposed branch: lp:~mardy/account-plugins/webkit-files-1565772
Merge into: lp:account-plugins
Diff against target: 34 lines (+0/-11)
3 files modified
Makefile.am (+0/-1)
data/webkit-options/accounts.google.com.conf (+0/-9)
debian/account-plugin-google.install (+0/-1)
To merge this branch: bzr merge lp:~mardy/account-plugins/webkit-files-1565772
Reviewer Review Type Date Requested Status
Online Accounts 2016-12-06 Pending
Review via email: mp+312572@code.launchpad.net

Commit message

Remove unused webkit options file for Google

Description of the change

Remove unused webkit options file for Google

To post a comment you must log in.

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 2016-11-10 08:50:04 +0000
3+++ Makefile.am 2016-12-06 14:06:04 +0000
4@@ -127,7 +127,6 @@
5
6 webkitoptionsdir = $(sysconfdir)/signon-ui/webkit-options.d
7 dist_webkitoptions_DATA = \
8- data/webkit-options/accounts.google.com.conf \
9 data/webkit-options/api.instagram.com.conf \
10 data/webkit-options/api.weibo.com.conf \
11 data/webkit-options/api.t.sohu.com.conf \
12
13=== removed file 'data/webkit-options/accounts.google.com.conf'
14--- data/webkit-options/accounts.google.com.conf 2012-11-09 11:11:43 +0000
15+++ data/webkit-options/accounts.google.com.conf 1970-01-01 00:00:00 +0000
16@@ -1,9 +0,0 @@
17-ViewportWidth = 480
18-ViewportHeight = 420
19-UsernameField = input[name="Email"]
20-PasswordField = input[name="Passwd"]
21-# Accept all https URLs, and add as exceptions those http only
22-# URLs which are used in some countries.
23-# See https://bugs.launchpad.net/bugs/1074733
24-AllowedUrls = (https://.*|http://[^/]*google\\.[^.]+/accounts/.*)
25-
26
27=== modified file 'debian/account-plugin-google.install'
28--- debian/account-plugin-google.install 2013-08-01 14:34:21 +0000
29+++ debian/account-plugin-google.install 2016-12-06 14:06:04 +0000
30@@ -1,4 +1,3 @@
31-etc/signon-ui/webkit-options.d/accounts.google.com.conf
32 usr/share/accounts/services/google-drive.service
33 usr/share/accounts/services/google-im.service
34 usr/share/accounts/services/picasa.service

Subscribers

People subscribed via source and target branches

to all changes: