[evolution-data-server/gnome-3-8] Bug 701797 - UOA: Remove ResponseType and AuthPath from service files

[Matthew Barnes <mbarnes src gnome org>]

commit 855d886056b79fcae18f89ad82804bf7fcddb859
Author: Ken VanDine <ken vandine canonical com>
Date:   Sat Jun 8 10:37:28 2013 -0400

    Bug 701797 - UOA: Remove ResponseType and AuthPath from service files
    
    Remove ResponseType and AuthPath from the Google Contacts / GMail
    service files, as it should be handled by the provider and it breaks
    OAuth2 authentication with the latest changes to QUrl.
    
    (cherry picked from commit 2d71746ceba0f7bd1d087b08ed4cc9bd9353e11a)

 .../google-contacts.service.in.in                  |    4 ----
 .../google-gmail.service.in.in                     |    4 ----
 2 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/modules/ubuntu-online-accounts/google-contacts.service.in.in 
b/modules/ubuntu-online-accounts/google-contacts.service.in.in
index cf9b729..8a77bd7 100644
--- a/modules/ubuntu-online-accounts/google-contacts.service.in.in
+++ b/modules/ubuntu-online-accounts/google-contacts.service.in.in
@@ -13,14 +13,10 @@
       <group name="oauth2">
         <group name="web_server">
           <setting name="Host">accounts.google.com</setting>
-          <setting name="AuthPath">o/oauth2/auth</setting>
           <setting name="TokenPath">o/oauth2/token</setting>
           <setting name="RedirectUri">https://live.gnome.org/Evolution</setting>
           <setting name="ClientId">796629365126.apps.googleusercontent.com</setting>
           <setting name="ClientSecret">3NbR94RM-DTnA81BWjiJe4TP</setting>
-          <!-- HACK: access_type is non standard, but Google requires it in
-               order to return a refresh token -->
-          <setting name="ResponseType">code&amp;access_type=offline</setting>
           <setting type="as" 
name="Scope">['https://www.googleapis.com/auth/userinfo.email','https://mail.google.com/','https://www.google.com/m8/feeds/','https://www.googleapis.com/auth/calendar']</setting>
         </group>
       </group>
diff --git a/modules/ubuntu-online-accounts/google-gmail.service.in.in 
b/modules/ubuntu-online-accounts/google-gmail.service.in.in
index 0e315ae..443d63f 100644
--- a/modules/ubuntu-online-accounts/google-gmail.service.in.in
+++ b/modules/ubuntu-online-accounts/google-gmail.service.in.in
@@ -13,14 +13,10 @@
       <group name="oauth2">
         <group name="web_server">
           <setting name="Host">accounts.google.com</setting>
-          <setting name="AuthPath">o/oauth2/auth</setting>
           <setting name="TokenPath">o/oauth2/token</setting>
           <setting name="RedirectUri">https://live.gnome.org/Evolution</setting>
           <setting name="ClientId">796629365126.apps.googleusercontent.com</setting>
           <setting name="ClientSecret">3NbR94RM-DTnA81BWjiJe4TP</setting>
-          <!-- HACK: access_type is non standard, but Google requires it in
-               order to return a refresh token -->
-          <setting name="ResponseType">code&amp;access_type=offline</setting>
           <setting type="as" 
name="Scope">['https://www.googleapis.com/auth/userinfo.email','https://mail.google.com/','https://www.google.com/m8/feeds/','https://www.googleapis.com/auth/calendar']</setting>
         </group>
       </group>