Use "firefox" instead of MOZ_APP_NAME for profile reset

Gbp-Pq: Topic iceweasel-branding
Gbp-Pq: Name Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch

diff --git a/toolkit/modules/ResetProfile.jsm b/toolkit/modules/ResetProfile.jsm
index 52c35c794740684a4e24388c1303a35b95d67228..af2c0cf25d31c377e73647da33eecf38fd172d47 100644 (file)
--- a/toolkit/modules/ResetProfile.jsm
+++ b/toolkit/modules/ResetProfile.jsm
@@ -11,7 +11,7 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/AppConstants.jsm");
 
-const MOZ_APP_NAME = AppConstants.MOZ_APP_NAME;
+const MOZ_APP_NAME = "firefox";
 const MOZ_BUILD_APP = AppConstants.MOZ_BUILD_APP;
 
 this.ResetProfile = {

diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index df82a0e6a85560c6f7a8175b57d3569a59f4c2e6..b2120d4e528d4f852f697e14014ac012b43dec1f 100644 (file)
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4145,7 +4145,7 @@ XREMain::XRE_mainRun()
         if (gDoProfileReset) {
           // Automatically migrate from the current application if we just
           // reset the profile.
-          aKey = MOZ_APP_NAME;
+          aKey = "firefox";
         }
         pm->Migrate(&mDirProvider, aKey);
       }