Bug #300688 --> get rid f bandRealShortName. Now that the seamonkey rebranding effort has landed, Thunderbird can get rid of

the brandRealShortName work around we had been using.

sr=bienvenu
a=asa

mail/base/content/phishingDetector.js

@@ -212,7 +212,7 @@ function isIPv4HostName(aHostName)
 // returns true if the user confirms the URL is a scam
 function confirmSuspiciousURL(aPhishingType, aSuspiciousHostName)
 {
-  var brandShortName = gBrandBundle.getString("brandRealShortName");
+  var brandShortName = gBrandBundle.getString("brandShortName");
   var titleMsg = gMessengerBundle.getString("confirmPhishingTitle");
   var dialogMsg;
 

mail/components/preferences/general.js

@@ -124,7 +124,7 @@ var gGeneralPane = {
     var mapiReg = Components.classes["@mozilla.org/mapiregistry;1"]
                    .getService(Components.interfaces.nsIMapiRegistry);
 
-    var brandShortName = this.mBrandBundle.getString("brandRealShortName");
+    var brandShortName = this.mBrandBundle.getString("brandShortName");
     var promptTitle = this.mMapiBundle.getFormattedString("dialogTitle",
                                                     [brandShortName]);
     var promptMessage;

mail/locales/en-US/chrome/branding/brand.properties

@@ -1,10 +1,4 @@
-brandShortName=Mail/News Client
-
-#We don't have a real property for the REAL short name (Thunderbird), uses thisone temporarily
-#We can't change brandShortName because that's used by non forked thunderbird/seamonkey code
-#where it really needs to be the full name for thunderbird
-brandRealShortName=Mail/News
-
+brandShortName=Mail/News
 brandFullName=Mail/News Client
 vendorShortName=Mail/News Client
 sidebarName=Sidebar

mailnews/mapi/mapihook/src/msgMapiHook.cpp

@@ -209,7 +209,7 @@ PRBool nsMapiHook::DisplayLoginDialog(PRBool aLogin, PRUnichar **aUsername,
 
         nsXPIDLString brandName;
         rv = brandBundle->GetStringFromName(
-                           NS_LITERAL_STRING("brandShortName").get(),
+                           NS_LITERAL_STRING("brandFullName").get(),
                            getter_Copies(brandName));
         if (NS_FAILED(rv)) return PR_FALSE;
         

mailnews/mapi/mapihook/src/nsMapiRegistryUtils.cpp

@@ -108,7 +108,7 @@ void nsMapiRegistryUtils::getVarValue(const PRUnichar * varName, nsAutoString &
 const PRUnichar * nsMapiRegistryUtils::brandName() 
 {
     if (m_brand.IsEmpty())
-        getVarValue(NS_LITERAL_STRING("brandShortName").get(), m_brand);
+        getVarValue(NS_LITERAL_STRING("brandFullName").get(), m_brand);
     return m_brand.get();
 }
 
@@ -789,7 +789,7 @@ nsresult nsMapiRegistryUtils::registerMailApp(PRBool aForceRegistration)
           appKeyName.AppendLiteral("\\shell\\properties");
 
           nsAutoString brandShortName;
-          getVarValue(NS_LITERAL_STRING("brandRealShortName").get(), brandShortName);
+          getVarValue(NS_LITERAL_STRING("brandShortName").get(), brandShortName);
 
           const PRUnichar* brandNameStrings[] = { brandShortName.get() };
 

other-licenses/branding/thunderbird/locales/en-US/brand.properties

@@ -1,10 +1,4 @@
-brandShortName=Mozilla Thunderbird
-
-#We don't have a real property for the REAL short name (Thunderbird), uses this one temporarily
-#We can't change brandShortName because that's used by non forked thunderbird/seamonkey code
-#where it really needs to be the full name for thunderbird
-brandRealShortName=Thunderbird
-
-brandFullName=Mozilla Thunderbird Alpha 2
+brandShortName=Thunderbird
+brandFullName=Mozilla Thunderbird
 vendorShortName=Mozilla Thunderbird
 sidebarName=Sidebar