From: Mike Hommey <mh@glandium.org>
Date: Sun, 11 May 2014 06:08:37 +0000 (+0900)
Subject: Use "firefox" instead of MOZ_APP_NAME for profile reset
X-Git-Tag: archive/raspbian/60.4.0esr-1+rpi1~1^2^2~19
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0bb5b7b79e204bd7550843ef5847552ec3509b15;p=firefox-esr.git

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 52c35c79474..af2c0cf25d3 100644
--- 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 df82a0e6a85..b2120d4e528 100644
--- 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);
       }