From 987c59cabaa28f8d90563282e17f3f4169185d11 Mon Sep 17 00:00:00 2001 From: "scc%mozilla.org" Date: Mon, 4 Sep 2000 00:50:50 +0000 Subject: [PATCH] we think the fix is in to support the original form, so back to the original form we go git-svn-id: svn://10.0.0.236/trunk@78092 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp | 6 +----- mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index a3244af364f..d4eddc2e0ba 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -2951,11 +2951,7 @@ LoadXPCOMPlugin(nsIComponentManager* aComponentManager, // To figure out the filename of the plugin, we'll need to get the // plugin's CID, and then navigate through the XPCOM registry to // pull out the DLL name to which the CID is registered. - nsAutoString path; - path.AppendWithConversion("software/mozilla/XPCOM/classID/"); - path.AppendWithConversion(aCID); - // this contortion to append is a hack until I can figure out why the right |operator+| is not found - // and/or why it doesn't know what a |nsPromiseConcatenation| is ... on some platforms + nsAutoString path(NS_LITERAL_STRING("software/mozilla/XPCOM/classID/") + NS_ConvertUCS2toASCII(aCID)); nsRegistryKey cidKey; rv = aRegistry->GetKey(nsIRegistry::Common, path.GetUnicode(), &cidKey); diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp index a3244af364f..d4eddc2e0ba 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp @@ -2951,11 +2951,7 @@ LoadXPCOMPlugin(nsIComponentManager* aComponentManager, // To figure out the filename of the plugin, we'll need to get the // plugin's CID, and then navigate through the XPCOM registry to // pull out the DLL name to which the CID is registered. - nsAutoString path; - path.AppendWithConversion("software/mozilla/XPCOM/classID/"); - path.AppendWithConversion(aCID); - // this contortion to append is a hack until I can figure out why the right |operator+| is not found - // and/or why it doesn't know what a |nsPromiseConcatenation| is ... on some platforms + nsAutoString path(NS_LITERAL_STRING("software/mozilla/XPCOM/classID/") + NS_ConvertUCS2toASCII(aCID)); nsRegistryKey cidKey; rv = aRegistry->GetKey(nsIRegistry::Common, path.GetUnicode(), &cidKey);