From 38c896d1a9b3cd1be071c8cd83bb5f295c9917cf Mon Sep 17 00:00:00 2001
From: "darin%meer.net" <darin%meer.net>
Date: Tue, 31 Jan 2006 15:02:26 +0000
Subject: [PATCH] fixes uninstaller regression for deerpark trunk builds,
 b=320504, r=bsmedberg

---
 browser/Makefile.in                             |  4 ++++
 browser/locales/en-US/installer/uninstaller.inc | 17 +++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/browser/Makefile.in b/browser/Makefile.in
index 4777e1a2fc73..3290d2594bbe 100644
--- a/browser/Makefile.in
+++ b/browser/Makefile.in
@@ -50,6 +50,10 @@ ifeq ($(OS_ARCH),WINNT)
 ifdef MOZ_INSTALLER
 DIRS += installer/windows
 
+ifdef MOZ_BRANDING_DIRECTORY
+DEFINES += -DOFFICIAL_BRANDING=1
+endif
+
 # Generate uninstall.ini (en-US only for now)
 UNINSTALLER_INC = $(topsrcdir)/browser/locales/en-US/installer/uninstaller.inc
 $(FINAL_TARGET)/uninstall/uninstall.ini: $(topsrcdir)/browser/installer/windows/uninstall.it $(UNINSTALLER_INC)
diff --git a/browser/locales/en-US/installer/uninstaller.inc b/browser/locales/en-US/installer/uninstaller.inc
index da1062e986ba..563d9342cee7 100644
--- a/browser/locales/en-US/installer/uninstaller.inc
+++ b/browser/locales/en-US/installer/uninstaller.inc
@@ -3,10 +3,19 @@
 # This file is in the UTF-8 encoding
 
 #define BRAND_COMPANY_NAME Mozilla
+#ifdef OFFICIAL_BRANDING
 #define BRAND_PRODUCT_NAME Mozilla Firefox
+#else
+#define BRAND_PRODUCT_NAME Deer Park Alpha 2
+#endif
 
+#ifdef OFFICIAL_BRANDING
 #define UNINST_RUNNING Mozilla Firefox is detected to be currently running.  Please quit Mozilla Firefox before continuing.  Click OK to exit Mozilla Firefox automatically and proceed with uninstallation.
 #define UNINST_SHUTDOWN Shutting down Mozilla Firefox.  Please wait...
+#else
+#define UNINST_RUNNING Deer Park Alpha 2 is detected to be currently running.  Please quit Deer Park Alpha 2 before continuing.  Click OK to exit Deer Park Alpha 2 automatically and proceed with uninstallation.
+#define UNINST_SHUTDOWN Shutting down Deer Park Alpha 2.  Please wait...
+#endif
 #define UNINST_FONT MS Sans Serif
 #define UNINST_FONTSIZE 8
 #define UNINST_CHARSET 0
@@ -20,7 +29,11 @@
 #  CHINESEBIG5_CHARSET = 136
 #  OEM_CHARSET 255
 
+#ifdef OFFICIAL_BRANDING
 #define UNINST_TITLE Mozilla Firefox Uninstaller
+#else
+#define UNINST_TITLE Deer Park Alpha 2 Uninstaller
+#endif
 #define UNINST_MESSAGE0 Are you sure you want to completely remove %s and all of its components?
 #define BTN_UNINST &Uninstall
 #define BTN_CANCEL &Cancel
@@ -54,6 +67,10 @@
 #define MSG_FORCE_QUIT_PROCESS Uninstall has detected that %s (%s) is still running.  Click OK to quit %s and proceed with uninstallation. Alternatively, use the Windows Task Manager to quit %s, and then click OK to continue with uninstallation.
 #define MSG_FORCE_QUIT_PROCESS_FAILED Uninstall will now exit.  Uninstall could not continue because %s (%s) is still running. Try manually quitting %s using Windows Task Manager, and then run Uninstall again.
 #define MSG_DELETE_INSTALLATION_PATH Not all files were uninstalled from the installation directory:\n\n  %s\n\nDo you want to completely delete this directory?
+#ifdef OFFICIAL_BRANDING
 #define MSG_INSTALLATION_PATH_WITHIN_WINDIR Uninstall has detected that the installation path of Mozilla Firefox is installed to a folder within your Windows folder.  Uninstall will not attempt to delete this installation due to the potential removal of critical system files.
+#else
+#define MSG_INSTALLATION_PATH_WITHIN_WINDIR Uninstall has detected that the installation path of Deer Park Alpha 2 is installed to a folder within your Windows folder.  Uninstall will not attempt to delete this installation due to the potential removal of critical system files.
+#endif
 
 #unfilter emptyLines