Bug 306324 - Fix some Javascript imports in msgMail3PaneWindow.js and mailMigrator.js. r=mconley.
authorJan Horak <jhorak@redhat.com>
Thu, 03 Nov 2011 09:32:35 -0400
changeset 8761 54ce07c8295ec64db8cb36309d0787281fc46686
parent 8760 2a8720e7927077285d0eca1b11a3c023925830ab
child 8762 3f817c4323c98d9139fd4650de43fd017c2ba4b4
push id6734
push usermconley@mozilla.com
push dateThu, 03 Nov 2011 13:33:06 +0000
treeherdercomm-central@54ce07c8295e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley
bugs306324
Bug 306324 - Fix some Javascript imports in msgMail3PaneWindow.js and mailMigrator.js. r=mconley.
mail/base/content/msgMail3PaneWindow.js
mail/base/modules/mailMigrator.js
--- a/mail/base/content/msgMail3PaneWindow.js
+++ b/mail/base/content/msgMail3PaneWindow.js
@@ -38,17 +38,17 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-Components.utils.import("resource://gre/modules/folderUtils.jsm");
+Components.utils.import("resource:///modules/folderUtils.jsm");
 Components.utils.import("resource:///modules/activity/activityModules.js");
 Components.utils.import("resource:///modules/jsTreeSelection.js");
 Components.utils.import("resource:///modules/MailConsts.js");
 Components.utils.import("resource:///modules/errUtils.js");
 Components.utils.import("resource:///modules/IOUtils.js");
 Components.utils.import("resource:///modules/mailnewsMigrator.js");
 Components.utils.import("resource:///modules/sessionStoreManager.js");
 Components.utils.import("resource:///modules/mailInstrumentation.js");
--- a/mail/base/modules/mailMigrator.js
+++ b/mail/base/modules/mailMigrator.js
@@ -43,17 +43,17 @@
  */
 
 var EXPORTED_SYMBOLS = ["MailMigrator"];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
-Cu.import("resource:///modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 var MailMigrator = {
   /**
    * Switch the given fonts to the given encodings, but only if the current fonts
    * are defaults.
    */
   _switchDefaultFonts: function MailMigrator__switchDefaultFonts(aFonts,
                                                                  aEncodings) {