From 187ba83ad90cc71975bf8a7ef8f3c3f67afd037e Mon Sep 17 00:00:00 2001 From: "dbradley%netscape.com" Date: Tue, 20 May 2003 14:19:05 +0000 Subject: [PATCH] bug 205538 - Use hyphens instead of underscores in caps prefs for CID's. r=adamlock, sr=alecf, a=asa --- caps/src/nsScriptSecurityManager.cpp | 1 - embedding/browser/activex/src/plugin/activex.js | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/caps/src/nsScriptSecurityManager.cpp b/caps/src/nsScriptSecurityManager.cpp index a7e1560610b..3974f7906d9 100644 --- a/caps/src/nsScriptSecurityManager.cpp +++ b/caps/src/nsScriptSecurityManager.cpp @@ -2421,7 +2421,6 @@ nsScriptSecurityManager::CheckComponentPermissions(JSContext *cx, cidTemp.Adopt(aCID.ToString()); nsCAutoString cid(NS_LITERAL_CSTRING("CID") + Substring(cidTemp, 1, cidTemp.Length() - 2)); - cid.ReplaceChar('-','_'); ToUpperCase(cid); #ifdef DEBUG_mstoltz diff --git a/embedding/browser/activex/src/plugin/activex.js b/embedding/browser/activex/src/plugin/activex.js index 63bdcdccfb8..68df829d6f5 100644 --- a/embedding/browser/activex/src/plugin/activex.js +++ b/embedding/browser/activex/src/plugin/activex.js @@ -100,15 +100,15 @@ pref("security.classID.allowByDefault", true); // This is achieved by writing a policy rule, specifiying the classid of the // control and giving the control "AllAccess" or "NoAccess". // -// CIDaaaaaaaa_bbbb_cccc_dddd_eeeeeeeeeeee +// CIDaaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee // // You could explicitly ban a control (using the appropriate classid) like this // -// pref("capability.policy.default.ClassID.CID039ef260_2a0d_11d5_90a7_0010a4e73d9a", "NoAccess"); +// pref("capability.policy.default.ClassID.CID039ef260-2a0d-11d5-90a7-0010a4e73d9a", "NoAccess"); // // If you want to explicity enable a control then do this: // -// pref("capability.policy.default.ClassID.CID039ef260_2a0d_11d5_90a7_0010a4e73d9a", "AllAccess"); +// pref("capability.policy.default.ClassID.CID039ef260-2a0d-11d5-90a7-0010a4e73d9a", "AllAccess"); // // If you want to explicitly ban or allow a control for one or more sites then // you can create a policy for those sites. This example creates a domain @@ -117,7 +117,7 @@ pref("security.classID.allowByDefault", true); // // user_pref("capability.policy.policynames", "trustable"); // user_pref("capability.policy.trustable.sites", "http://www.site1.net http://www.site2.net"); -// user_pref("capability.policy.trustable.ClassID.CID039ef260_2a0d_11d5_90a7_0010a4e73d9a", "AllAccess"); +// user_pref("capability.policy.trustable.ClassID.CID039ef260-2a0d-11d5-90a7-0010a4e73d9a", "AllAccess"); //