From 26992da121864d2338b30f72c3c2cc3a73cf8fea Mon Sep 17 00:00:00 2001
From: "av%netscape.com" <av%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 30 Apr 2002 05:08:44 +0000
Subject: [PATCH] Fixing 106411 -- 'Starting plugin...' message is stuck in the
 status bar, r=serge, sr=beard

git-svn-id: svn://10.0.0.236/trunk@120287 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../plugin/base/src/nsPluginHostImpl.cpp      | 48 +------------------
 .../plugin/base/src/nsPluginHostImpl.h        |  4 --
 2 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index 951800f8b0b..195de6372ff 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -194,7 +194,8 @@
 // 0.02 added caching of CanUnload to fix bug 105935
 // 0.03 changed name, description and mime desc from string to bytes, bug 108246
 // 0.04 added new mime entry point on Mac, bug 113464
-static const char *kPluginInfoVersion = "0.04";
+// 0.05 added new entry point check for the default plugin, bug 132430
+static const char *kPluginInfoVersion = "0.05";
 ////////////////////////////////////////////////////////////////////////
 // CID's && IID's
 static NS_DEFINE_IID(kIPluginInstanceIID, NS_IPLUGININSTANCE_IID);
@@ -3879,7 +3880,6 @@ NS_IMETHODIMP nsPluginHostImpl::SetUpPluginInstance(const char *aMimeType,
           }
         }
 #endif
-        this->PostStartupMessageForType(aMimeType, aOwner);
         result = plugin->CreateInstance(NULL, kIPluginInstanceIID, (void **)&instance);
 
 #ifdef XP_WIN
@@ -4389,50 +4389,6 @@ nsPluginHostImpl::FindPluginEnabledForType(const char* aMimeType,
   return NS_ERROR_FAILURE;
 }
 
-nsresult
-nsPluginHostImpl::PostStartupMessageForType(const char* aMimeType, 
-                                            nsIPluginInstanceOwner* aOwner)
-{
-  nsresult rv;
-  NS_ASSERTION(aOwner && aMimeType, 
-               "PostStartupMessageForType: invalid arguments");
-
-  PRUnichar *messageUni = nsnull;
-  nsAutoString msg;
-  nsCOMPtr<nsIStringBundle> regionalBundle;
-  nsCOMPtr<nsIStringBundleService> strings(do_GetService(kStringBundleServiceCID,
-                                                         &rv));
-  if (!strings) {
-    return rv;
-  }
-  rv = strings->CreateBundle(PLUGIN_REGIONAL_URL, 
-                             getter_AddRefs(regionalBundle));
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-  rv = regionalBundle->GetStringFromName(NS_LITERAL_STRING("pluginStartupMessage").get(), 
-                                         &messageUni);
-  if (NS_FAILED(rv)){
-    return rv;
-  }
-  msg = messageUni;
-  nsMemory::Free((void *)messageUni);
-
-  msg.Append(PRUnichar(' '));
-  msg.AppendWithConversion(aMimeType, PL_strlen(aMimeType));
-#ifdef PLUGIN_LOGGING
-  PR_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_ALWAYS,
-        ("nsPluginHostImpl::PostStartupMessageForType(aMimeType=%s)\n", 
-         aMimeType));
-
-  PR_LogFlush();
-#endif
-
-  rv = aOwner->ShowStatus(msg.get());
-  
-  return rv;
-}
-
 ////////////////////////////////////////////////////////////////////////
 NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugin** aPlugin)
 {
diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.h b/mozilla/modules/plugin/base/src/nsPluginHostImpl.h
index 89b9edfef58..b64fc2bc793 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.h
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.h
@@ -402,10 +402,6 @@ private:
   nsresult
   FindPluginEnabledForType(const char* aMimeType, nsPluginTag* &aPlugin);
 
-  nsresult
-  PostStartupMessageForType(const char* aMimeType, 
-                            nsIPluginInstanceOwner* aOwner);
-
   nsresult
   FindStoppedPluginForURL(nsIURI* aURL, nsIPluginInstanceOwner *aOwner);