Bug 1388060 - Bug 1384218 follow-up: fix import URI for OAuth2.jsm and OAuth2Providers.jsm. r=aceman a=jorgk
authorJorg K <jorgk@jorgk.com>
Wed, 09 Aug 2017 11:18:56 +0200
changeset 28556 cb20f12bad7e5c259d2c1b33e706ffcc0417f719
parent 28555 73e76a656af51902fa784307ecd085a770057a3a
child 28557 1c8042a818622f827b2da724a1531b515c92c461
child 28558 f27b2bac33747bcd441d24f6567220b553a2afe1
push id1993
push usermozilla@jorgk.com
push dateWed, 09 Aug 2017 22:13:49 +0000
treeherdercomm-beta@cb20f12bad7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaceman, jorgk
bugs1388060, 1384218
Bug 1388060 - Bug 1384218 follow-up: fix import URI for OAuth2.jsm and OAuth2Providers.jsm. r=aceman a=jorgk
mail/components/accountcreation/content/emailWizard.js
mail/components/accountcreation/content/verifyConfig.js
mailnews/base/src/msgOAuth2Module.js
--- a/mail/components/accountcreation/content/emailWizard.js
+++ b/mail/components/accountcreation/content/emailWizard.js
@@ -1,17 +1,17 @@
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Components.utils.import("resource:///modules/mailServices.js");
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource:///modules/hostnameUtils.jsm");
-Components.utils.import("resource://gre/modules/OAuth2Providers.jsm");
+Components.utils.import("resource:///modules/OAuth2Providers.jsm");
 
 /**
  * This is the dialog opened by menu File | New account | Mail... .
  *
  * It gets the user's realname, email address and password,
  * and tries to automatically configure the account from that,
  * using various mechanisms. If all fails, the user can enter/edit
  * the config, then we create the account.
--- a/mail/components/accountcreation/content/verifyConfig.js
+++ b/mail/components/accountcreation/content/verifyConfig.js
@@ -25,17 +25,17 @@
  * @param errorCallback function(ex)
  *   Called when we could guess not the config, either
  *   because we have not found anything or
  *   because there was an error (e.g. no network connection).
  *   The ex.message will contain a user-presentable message.
  */
 
 Components.utils.import("resource:///modules/mailServices.js");
-Components.utils.import("resource://gre/modules/OAuth2Providers.jsm");
+Components.utils.import("resource:///modules/OAuth2Providers.jsm");
 
 if (typeof gEmailWizardLogger == "undefined") {
   Cu.import("resource:///modules/gloda/log4moz.js");
   var gEmailWizardLogger = Log4Moz.getConfiguredLogger("mail.wizard");
 }
 
 function verifyConfig(config, alter, msgWindow, successCallback, errorCallback)
 {
--- a/mailnews/base/src/msgOAuth2Module.js
+++ b/mailnews/base/src/msgOAuth2Module.js
@@ -3,18 +3,18 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cr = Components.results;
 
-Components.utils.import("resource://gre/modules/OAuth2.jsm");
-Components.utils.import("resource://gre/modules/OAuth2Providers.jsm");
+Components.utils.import("resource:///modules/OAuth2.jsm");
+Components.utils.import("resource:///modules/OAuth2Providers.jsm");
 Components.utils.import("resource://gre/modules/Preferences.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 function OAuth2Module() {
   this._refreshToken = '';
 }
 OAuth2Module.prototype = {