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

[Alberto Mardegan]

Remove unused webkit options file for Google

Remove unused webkit options file for Google

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