From 9ee8b01bebeeabe34a74f646980d021ea30eee8e Mon Sep 17 00:00:00 2001
From: "bugzilla%standard8.plus.com"
 <bugzilla%standard8.plus.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 17 Jul 2008 07:44:09 +0000
Subject: [PATCH] Bug 443398 reland the remaining official branding text
 changes from bug 397621 that were backed out due to tinderbox problems that
 are now fixed. tinder-config.pl was r=reed over irc,mail/ changes were
 r=davida,bienvenu

git-svn-id: svn://10.0.0.236/trunk@253071 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mail/app/Makefile.in                                  | 3 +--
 mozilla/mail/branding/nightly/configure.sh                    | 2 +-
 .../tinderbox-configs/thunderbird/macosx/tinder-config.pl     | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/mozilla/mail/app/Makefile.in b/mozilla/mail/app/Makefile.in
index 2feac263dd1..472b283a6e0 100644
--- a/mozilla/mail/app/Makefile.in
+++ b/mozilla/mail/app/Makefile.in
@@ -346,8 +346,7 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 
 AB := $(firstword $(subst -, ,$(AB_CD)))
 
-#APP_NAME = $(MOZ_APP_DISPLAYNAME)
-APP_NAME = Thunderbird
+APP_NAME = $(MOZ_APP_DISPLAYNAME)
 
 ifdef MOZ_DEBUG
 APP_NAME := $(APP_NAME)Debug
diff --git a/mozilla/mail/branding/nightly/configure.sh b/mozilla/mail/branding/nightly/configure.sh
index f0718c97baa..59c18123ed3 100644
--- a/mozilla/mail/branding/nightly/configure.sh
+++ b/mozilla/mail/branding/nightly/configure.sh
@@ -1 +1 @@
-MOZ_APP_DISPLAYNAME=Thunderbird
+MOZ_APP_DISPLAYNAME=Shredder
diff --git a/mozilla/tools/tinderbox-configs/thunderbird/macosx/tinder-config.pl b/mozilla/tools/tinderbox-configs/thunderbird/macosx/tinder-config.pl
index 7850db56694..1ffd5eac607 100644
--- a/mozilla/tools/tinderbox-configs/thunderbird/macosx/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/thunderbird/macosx/tinder-config.pl
@@ -55,8 +55,8 @@ $BuildAdministrator = 'build@mozilla.org';
 # Tests
 $CleanProfile             = 1;
 #$ResetHomeDirForTests     = 1;
-$ProductName              = "Thunderbird";
-$VendorName               = 'Mozilla';
+$ProductName              = "Shredder";
+#$VendorName               = 'Mozilla';
 
 $RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
 $RegxpcomTest             = 1;