Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug fix for 52648 -- remaining stash of progids which I missed on

Browse Source 
the mega-change yesterday.  This will fix a few more issues.

r=warren
This commit is contained in:
rayw%netscape.com 2000-09-14 23:20:49 +00:00
parent 8ca9d0bdbe
commit 3cd14f5878
45 changed files with 188 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/html/document/src/nsHTMLDocument.cpp
View File

@ -2853,7 +2853,7 @@ nsHTMLDocument::GetSelection(nsAWritableString& aReturn)
nsCOMPtr<nsISelectionPrivate> privSel(do_QueryInterface(domSelection));
nsCOMPtr<nsIConsoleService> consoleService
(do_GetService("mozilla.consoleservice.1"));
(do_GetService("@mozilla.org/consoleservice;1"));
if (consoleService) {
consoleService->LogStringMessage(NS_LITERAL_STRING("Deprecated method document.getSelection() called. Please use window.getSelection() instead.").get());

4
content/html/style/src/nsCSSScanner.cpp
View File

@ -223,9 +223,9 @@ void nsCSSScanner::ReportError(const nsAReadableString& aError)
// Log it to the JavaScript console
nsCOMPtr<nsIConsoleService> consoleService
(do_GetService("mozilla.consoleservice.1"));
(do_GetService("@mozilla.org/consoleservice;1"));
nsCOMPtr<nsIScriptError> errorObject
(do_CreateInstance("mozilla.scripterror.1"));
(do_CreateInstance("@mozilla.org/scripterror;1"));
if (consoleService && errorObject) {
nsresult rv;

2
content/xul/document/src/nsXULPrototypeDocument.cpp
View File

@ -383,7 +383,7 @@ nsXULPrototypeDocument::ReportScriptError(nsIScriptError *errorObject)
// Get the console service, where we're going to register the error.
nsCOMPtr<nsIConsoleService> consoleService
(do_GetService("mozilla.consoleservice.1"));
(do_GetService("@mozilla.org/consoleservice;1"));
if (consoleService != nsnull) {
rv = consoleService->LogMessage(errorObject);

2
docshell/base/nsDocShell.cpp
View File

@ -2245,7 +2245,7 @@ NS_IMETHODIMP nsDocShell::ReportScriptError(nsIScriptError *errorObject)
// Get the console service, where we're going to register the error.
nsCOMPtr<nsIConsoleService> consoleService
(do_GetService("mozilla.consoleservice.1"));
(do_GetService("@mozilla.org/consoleservice;1"));
if (consoleService != nsnull)
{

4
extensions/cookie/nsCookieHTTPNotify.cpp
View File

@ -63,7 +63,7 @@ NS_METHOD nsCookieHTTPNotify::RegisterProc(nsIComponentManager *aCompMgr,
{
// Register ourselves into the NS_CATEGORY_HTTP_STARTUP
nsresult rv;
nsCOMPtr<nsICategoryManager> catman = do_GetService("mozilla.categorymanager.1", &rv);
nsCOMPtr<nsICategoryManager> catman = do_GetService("@mozilla.org/categorymanager;1", &rv);
if (NS_FAILED(rv)) return rv;
nsXPIDLCString prevEntry;
@ -79,7 +79,7 @@ NS_METHOD nsCookieHTTPNotify::UnregisterProc(nsIComponentManager *aCompMgr,
const char *registryLocation)
{
nsresult rv;
nsCOMPtr<nsICategoryManager> catman = do_GetService("mozilla.categorymanager.1", &rv);
nsCOMPtr<nsICategoryManager> catman = do_GetService("@mozilla.org/categorymanager;1", &rv);
if (NS_FAILED(rv)) return rv;
nsXPIDLCString prevEntry;

4
extensions/irc/js/lib/chatzilla-service.js
View File

@ -277,7 +277,7 @@ function (compMgr, fileSpec, location, type)
CLINE_SERVICE_CONTRACTID, fileSpec,
location, true, true, type);
catman = Components.classes["mozilla.categorymanager.1"]
catman = Components.classes["@mozilla.org/categorymanager;1"]
.getService(nsICategoryManager);
catman.addCategoryEntry("command-line-argument-handlers",
"chatzilla command line handler",
@ -301,7 +301,7 @@ ChatzillaModule.unregisterSelf =
function(compMgr, fileSpec, location)
{
compMgr.unregisterComponentSpec(CLINE_SERVICE_CID, fileSpec);
catman = Components.classes["mozilla.categorymanager.1"]
catman = Components.classes["@mozilla.org/categorymanager;1"]
.getService(nsICategoryManager);
catman.deleteCategoryEntry("command-line-argument-handlers",
CLINE_SERVICE_CONTRACTID, true);

2
extensions/xml-rpc/test/xml-rpc.xul
View File

@ -8,7 +8,7 @@
<script language="javascript"><![CDATA[
function getClient() {
return Components.classes['mozilla.xml-rpc.client.1']
return Components.classes['@mozilla.org/xml-rpc/client;1']
.createInstance(Components.interfaces.nsIXmlRpcClient);
}

4
extensions/xmlterm/ui/xmlterm-service.js
View File

@ -281,7 +281,7 @@ function (compMgr, fileSpec, location, type)
CLINE_SERVICE_CONTRACTID, fileSpec,
location, true, true, type);
catman = Components.classes["mozilla.categorymanager.1"]
catman = Components.classes["@mozilla.org/categorymanager;1"]
.getService(nsICategoryManager);
catman.addCategoryEntry("command-line-argument-handlers",
"xmlterm command line handler",
@ -305,7 +305,7 @@ XMLtermModule.unregisterSelf =
function(compMgr, fileSpec, location)
{
compMgr.unregisterComponentSpec(CLINE_SERVICE_CID, fileSpec);
catman = Components.classes["mozilla.categorymanager.1"]
catman = Components.classes["@mozilla.org/categorymanager;1"]
.getService(nsICategoryManager);
catman.deleteCategoryEntry("command-line-argument-handlers",
CLINE_SERVICE_CONTRACTID, true);

24
gfx/src/gtk/nsGfxFactoryGTK.cpp
View File

@ -114,61 +114,61 @@ static nsModuleComponentInfo components[] =
{
{ "Gtk Font Metrics",
NS_FONT_METRICS_CID,
// "mozilla.gfx.font_metrics.gtk.1",
// "@mozilla.org/gfx/font_metrics/gtk;1",
"@mozilla.org/gfx/fontmetrics;1",
nsFontMetricsGTKConstructor },
{ "Gtk Device Context",
NS_DEVICE_CONTEXT_CID,
// "mozilla.gfx.device_context.gtk.1",
// "@mozilla.org/gfx/device_context/gtk;1",
"@mozilla.org/gfx/devicecontext;1",
nsDeviceContextGTKConstructor },
{ "Gtk Rendering Context",
NS_RENDERING_CONTEXT_CID,
// "mozilla.gfx.rendering_context.gtk.1",
// "@mozilla.org/gfx/rendering_context/gtk;1",
"@mozilla.org/gfx/renderingcontext;1",
nsRenderingContextGTKConstructor },
{ "Gtk Image",
NS_IMAGE_CID,
// "mozilla.gfx.image.gtk.1",
// "@mozilla.org/gfx/image/gtk;1",
"@mozilla.org/gfx/image;1",
nsImageGTKConstructor },
{ "Gtk Region",
NS_REGION_CID,
"mozilla.gfx.region.gtk.1",
"@mozilla.org/gfx/region/gtk;1",
nsRegionGTKConstructor },
{ "Scriptable Region",
NS_SCRIPTABLE_REGION_CID,
// "mozilla.gfx.scriptable_region.1",
// "@mozilla.org/gfx/scriptable_region;1",
"@mozilla.org/gfx/region;1",
nsScriptableRegionConstructor },
{ "Blender",
NS_BLENDER_CID,
// "mozilla.gfx.blender.1",
// "@mozilla.org/gfx/blender;1",
"@mozilla.org/gfx/blender;1",
nsBlenderConstructor },
{ "Gtk Device Context Spec",
NS_DEVICE_CONTEXT_SPEC_CID,
// "mozilla.gfx.device_context_spec.gtk.1",
// "@mozilla.org/gfx/device_context_spec/gtk;1",
"@mozilla.org/gfx/devicecontextspec;1",
nsDeviceContextSpecGTKConstructor },
{ "Gtk Device Context Spec Factory",
NS_DEVICE_CONTEXT_SPEC_FACTORY_CID,
// "mozilla.gfx.device_context_spec_factory.gtk.1",
// "@mozilla.org/gfx/device_context_spec_factory/gtk;1",
"@mozilla.org/gfx/devicecontextspecfactory;1",
nsDeviceContextSpecFactoryGTKConstructor },
{ "Image Manager",
NS_IMAGEMANAGER_CID,
// "mozilla.gfx.image_manager.1",
// "@mozilla.org/gfx/image_manager;1",
"@mozilla.org/gfx/imagemanager;1",
nsImageManagerConstructor },
{ "GTK Font Enumerator",
NS_FONT_ENUMERATOR_CID,
// "mozilla.gfx.font_enumerator.gtk.1",
// "@mozilla.org/gfx/font_enumerator/gtk;1",
"@mozilla.org/gfx/fontenumerator;1",
nsFontEnumeratorGTKConstructor },
{ "Gtk Screen Manager",
NS_SCREENMANAGER_CID,
// "mozilla.gfx.screenmanager.gtk.1",
// "@mozilla.org/gfx/screenmanager/gtk;1",
"@mozilla.org/gfx/screenmanager;1",
nsScreenManagerGtkConstructor }
};

24
gfx/src/photon/nsGfxFactoryPh.cpp
View File

@ -113,51 +113,51 @@ static nsModuleComponentInfo components[] =
{
{ "Ph Font Metrics",
NS_FONT_METRICS_CID,
"mozilla.gfx.font_metrics.Ph.1",
"@mozilla.org/gfx/font_metrics/Ph;1",
nsFontMetricsPhConstructor },
{ "Ph Device Context",
NS_DEVICE_CONTEXT_CID,
"mozilla.gfx.device_context.Ph.1",
"@mozilla.org/gfx/device_context/Ph;1",
nsDeviceContextPhConstructor },
{ "Ph Rendering Context",
NS_RENDERING_CONTEXT_CID,
"mozilla.gfx.rendering_context.Ph.1",
"@mozilla.org/gfx/rendering_context/Ph;1",
nsRenderingContextPhConstructor },
{ "Ph Image",
NS_IMAGE_CID,
"mozilla.gfx.image.Ph.1",
"@mozilla.org/gfx/image/Ph;1",
nsImagePhConstructor },
{ "Ph Region",
NS_REGION_CID,
"mozilla.gfx.region.Ph.1",
"@mozilla.org/gfx/region/Ph;1",
nsRegionPhConstructor },
{ "Scriptable Region",
NS_SCRIPTABLE_REGION_CID,
"mozilla.gfx.scriptable_region.1",
"@mozilla.org/gfx/scriptable_region;1",
nsScriptableRegionConstructor },
{ "Blender",
NS_BLENDER_CID,
"mozilla.gfx.blender.1",
"@mozilla.org/gfx/blender;1",
nsBlenderConstructor },
{ "Ph Device Context Spec",
NS_DEVICE_CONTEXT_SPEC_CID,
"mozilla.gfx.device_context_spec.Ph.1",
"@mozilla.org/gfx/device_context_spec/Ph;1",
nsDeviceContextSpecPhConstructor },
{ "Ph Device Context Spec Factory",
NS_DEVICE_CONTEXT_SPEC_FACTORY_CID,
"mozilla.gfx.device_context_spec_factory.Ph.1",
"@mozilla.org/gfx/device_context_spec_factory/Ph;1",
nsDeviceContextSpecFactoryPhConstructor },
{ "Image Manager",
NS_IMAGEMANAGER_CID,
"mozilla.gfx.image_manager.1",
"@mozilla.org/gfx/image_manager;1",
nsImageManagerConstructor },
{ "Ph Font Enumerator",
NS_FONT_ENUMERATOR_CID,
"mozilla.gfx.font_enumerator.Ph.1",
"@mozilla.org/gfx/font_enumerator/Ph;1",
nsFontEnumeratorPhConstructor },
{ "Ph Screen Manager",
NS_SCREENMANAGER_CID,
"mozilla.gfx.screenmanager.Ph.1",
"@mozilla.org/gfx/screenmanager/Ph;1",
nsScreenManagerPhConstructor }
};

24
gfx/src/xlib/nsGfxFactoryXlib.cpp
View File

@ -115,61 +115,61 @@ static nsModuleComponentInfo components[] =
{
{ "Xlib Font Metrics",
NS_FONT_METRICS_CID,
// "mozilla.gfx.font_metrics.xlib.1",
// "@mozilla.org/gfx/font_metrics/xlib;1",
"@mozilla.org/gfx/fontmetrics;1",
nsFontMetricsXlibConstructor },
{ "Xlib Device Context",
NS_DEVICE_CONTEXT_CID,
// "mozilla.gfx.device_context.xlib.1",
// "@mozilla.org/gfx/device_context/xlib;1",
"@mozilla.org/gfx/devicecontext;1",
nsDeviceContextXlibConstructor },
{ "Xlib Rendering Context",
NS_RENDERING_CONTEXT_CID,
// "mozilla.gfx.rendering_context.xlib.1",
// "@mozilla.org/gfx/rendering_context/xlib;1",
"@mozilla.org/gfx/renderingcontext;1",
nsRenderingContextXlibConstructor },
{ "Xlib Image",
NS_IMAGE_CID,
// "mozilla.gfx.image.xlib.1",
// "@mozilla.org/gfx/image/xlib;1",
"@mozilla.org/gfx/image;1",
nsImageXlibConstructor },
{ "Xlib Region",
NS_REGION_CID,
"mozilla.gfx.region.xlib.1",
"@mozilla.org/gfx/region/xlib;1",
nsRegionXlibConstructor },
{ "Scriptable Region",
NS_SCRIPTABLE_REGION_CID,
// "mozilla.gfx.scriptable_region.1",
// "@mozilla.org/gfx/scriptable_region;1",
"@mozilla.org/gfx/region;1",
nsScriptableRegionConstructor },
{ "Blender",
NS_BLENDER_CID,
// "mozilla.gfx.blender.1",
// "@mozilla.org/gfx/blender;1",
"@mozilla.org/gfx/blender;1",
nsBlenderConstructor },
{ "Xlib Device Context Spec",
NS_DEVICE_CONTEXT_SPEC_CID,
// "mozilla.gfx.device_context_spec.xlib.1",
// "@mozilla.org/gfx/device_context_spec/xlib;1",
"@mozilla.org/gfx/devicecontextspec;1",
nsDeviceContextSpecXlibConstructor },
{ "Xlib Device Context Spec Factory",
NS_DEVICE_CONTEXT_SPEC_FACTORY_CID,
// "mozilla.gfx.device_context_spec_factory.xlib.1",
// "@mozilla.org/gfx/device_context_spec_factory/xlib;1",
"@mozilla.org/gfx/devicecontextspecfactory;1",
nsDeviceContextSpecFactoryXlibConstructor },
{ "Image Manager",
NS_IMAGEMANAGER_CID,
// "mozilla.gfx.image_manager.1",
// "@mozilla.org/gfx/image_manager;1",
"@mozilla.org/gfx/imagemanager;1",
nsImageManagerConstructor },
//{ "Xlib Font Enumerator",
//NS_FONT_ENUMERATOR_CID,
// "mozilla.gfx.font_enumerator.xlib.1",
// "@mozilla.org/gfx/font_enumerator/xlib;1",
//"@mozilla.org/gfx/fontenumerator;1",
//nsFontEnumeratorXlibConstructor },
{ "Xlib Screen Manager",
NS_SCREENMANAGER_CID,
// "mozilla.gfx.screenmanager.xlib.1",
// "@mozilla.org/gfx/screenmanager/xlib;1",
"@mozilla.org/gfx/screenmanager;1",
nsScreenManagerXlibConstructor }
};

2
js/src/xpconnect/loader/mozJSComponentLoader.cpp
View File

@ -280,7 +280,7 @@ Reporter(JSContext *cx, const char *message, JSErrorReport *rep)
/* Use the console service to register the error. */
nsCOMPtr<nsIConsoleService> consoleService
(do_GetService("mozilla.consoleservice.1"));
(do_GetService("@mozilla.org/consoleservice;1"));
/*
* Make an nsIScriptError, populate it with information from this

2
js/src/xpconnect/src/xpc.msg
View File

@ -60,7 +60,7 @@ XPC_MSG_DEF(NS_ERROR_XPC_CANT_CALL_WO_SCRIPTABLE , "Can not use wrapper a
XPC_MSG_DEF(NS_ERROR_XPC_CANT_CTOR_WO_SCRIPTABLE , "Can not use wrapper as constuctor unless it implements nsIXPCScriptable")
XPC_MSG_DEF(NS_ERROR_XPC_CI_RETURNED_FAILURE , "ComponentManager::CreateInstance returned failure code:")
XPC_MSG_DEF(NS_ERROR_XPC_GS_RETURNED_FAILURE , "ServiceManager::GetService returned failure code:")
XPC_MSG_DEF(NS_ERROR_XPC_BAD_CID , "Invalid ClassID or ProgID")
XPC_MSG_DEF(NS_ERROR_XPC_BAD_CID , "Invalid ClassID or ContractID")
XPC_MSG_DEF(NS_ERROR_XPC_BAD_IID , "Invalid InterfaceID")
XPC_MSG_DEF(NS_ERROR_XPC_CANT_CREATE_WN , "Can not create wrapper around native interface")
XPC_MSG_DEF(NS_ERROR_XPC_JS_THREW_EXCEPTION , "JavaScript component threw exception")

2
js/src/xpconnect/src/xpcwrappedjsclass.cpp
View File

@ -830,7 +830,7 @@ pre_call_clean_up:
// Log the exception to the JS Console, so that users can do
// something with it.
nsCOMPtr<nsIConsoleService> consoleService
(do_GetService("mozilla.consoleservice.1"));
(do_GetService("@mozilla.org/consoleservice;1"));
if(nsnull != consoleService)
{
nsresult rv;

2
js/src/xpconnect/tests/TestXPC.cpp
View File

@ -659,7 +659,7 @@ static void TestCategoryManmager()
printf("\n");
nsresult rv;
NS_WITH_SERVICE(nsICategoryManager, catman, "mozilla.categorymanager.1", &rv);
NS_WITH_SERVICE(nsICategoryManager, catman, "@mozilla.org/categorymanager;1", &rv);
if(NS_SUCCEEDED(rv) && catman)
{
printf("got category manager\n");

2
layout/html/document/src/nsHTMLDocument.cpp
View File

@ -2853,7 +2853,7 @@ nsHTMLDocument::GetSelection(nsAWritableString& aReturn)
nsCOMPtr<nsISelectionPrivate> privSel(do_QueryInterface(domSelection));
nsCOMPtr<nsIConsoleService> consoleService
(do_GetService("mozilla.consoleservice.1"));
(do_GetService("@mozilla.org/consoleservice;1"));
if (consoleService) {
consoleService->LogStringMessage(NS_LITERAL_STRING("Deprecated method document.getSelection() called. Please use window.getSelection() instead.").get());

4
layout/html/style/src/nsCSSScanner.cpp
View File

@ -223,9 +223,9 @@ void nsCSSScanner::ReportError(const nsAReadableString& aError)
// Log it to the JavaScript console
nsCOMPtr<nsIConsoleService> consoleService
(do_GetService("mozilla.consoleservice.1"));
(do_GetService("@mozilla.org/consoleservice;1"));
nsCOMPtr<nsIScriptError> errorObject
(do_CreateInstance("mozilla.scripterror.1"));
(do_CreateInstance("@mozilla.org/scripterror;1"));
if (consoleService && errorObject) {
nsresult rv;

4
layout/style/nsCSSScanner.cpp
View File

@ -223,9 +223,9 @@ void nsCSSScanner::ReportError(const nsAReadableString& aError)
// Log it to the JavaScript console
nsCOMPtr<nsIConsoleService> consoleService
(do_GetService("mozilla.consoleservice.1"));
(do_GetService("@mozilla.org/consoleservice;1"));
nsCOMPtr<nsIScriptError> errorObject
(do_CreateInstance("mozilla.scripterror.1"));
(do_CreateInstance("@mozilla.org/scripterror;1"));
if (consoleService && errorObject) {
nsresult rv;

2
mailnews/base/prefs/resources/content/AccountWizard.js
View File

@ -729,7 +729,7 @@ function getInterfaceForType(type) {
// flush the XUL cache - just for debugging purposes - not called
function onFlush() {
var prefs = Components.classes["component://netscape/preferences"].getService(Components.interfaces.nsIPref);
var prefs = Components.classes["@mozilla.org/preferences;1"].getService(Components.interfaces.nsIPref);
prefs.SetBoolPref("nglayout.debug.disable_xul_cache", true);
prefs.SetBoolPref("nglayout.debug.disable_xul_cache", false);

2
mailnews/base/resources/content/mailWidgets.xml
View File

@ -60,7 +60,7 @@
<implementation>
<property readonly="true" name="validityManager">
<![CDATA[
Components.classes['mozilla.mail.search.validityManager.1'].getService(Components.interfaces.nsIMsgSearchValidityManager);
Components.classes['@mozilla.org/mail/search/validityManager;1'].getService(Components.interfaces.nsIMsgSearchValidityManager);
]]>
</property>
<property name="searchScope" onget="return this.internalScope;">

2
mailnews/compose/resources/content/askSendFormat.js
View File

@ -25,7 +25,7 @@ var defaultAction = msgCompSendFormat.PlainText;
var recommended_as_default = true;
var display_recommendation = true;
var prefs = Components.classes["component://netscape/preferences"].getService();
var prefs = Components.classes["@mozilla.org/preferences;1"].getService();
if (prefs) {
prefs = prefs.QueryInterface(Components.interfaces.nsIPref);
if (prefs) {

2
modules/libjar/nsJAR.cpp
View File

@ -789,7 +789,7 @@ void nsJAR::ReportError(const char* aFilename, PRInt16 errorCode)
}
// Report error in JS console
nsCOMPtr<nsIConsoleService> console(do_GetService("mozilla.consoleservice.1"));
nsCOMPtr<nsIConsoleService> console(do_GetService("@mozilla.org/consoleservice;1"));
if (console)
{
PRUnichar* messageUni = message.ToNewUnicode();

2
netwerk/base/public/nsIPasswordManagerUtils.h
View File

@ -25,6 +25,6 @@
#include "nsIPasswordManager.h"
/* XXX love me, rayw, love me true */
#define PASSWORDMANAGER_CONTRACTID "mozilla.network.password-manager.1"
#define PASSWORDMANAGER_CONTRACTID "@mozilla.org/network/password-manager;1"
#endif /* NSIPASSWORDMANAGERUTILS_H__ */

2
netwerk/protocol/http/src/nsHTTPHandler.cpp
View File

@ -125,7 +125,7 @@ CategoryCreateService( const char *category )
int nFailed = 0;
nsCOMPtr<nsICategoryManager> categoryManager =
do_GetService("mozilla.categorymanager.1", &rv);
do_GetService("@mozilla.org/categorymanager;1", &rv);
if (!categoryManager) return rv;
nsCOMPtr<nsISimpleEnumerator> enumerator;

2
netwerk/streamconv/src/nsStreamConverterService.cpp
View File

@ -101,7 +101,7 @@ nsStreamConverterService::Init() {
// An edge in this case is comprised of a FROM and TO MIME type combination.
//
// CONTRACTID format:
// component://netscape/strmconv?from=text/html&to=text/plain
// @mozilla.org/streamconv;1?from=text/html&to=text/plain
// XXX curently we only handle a single from and to combo, we should repeat the
// XXX registration process for any series of from-to combos.
// XXX can use nsTokenizer for this.

2
rdf/content/src/nsXULPrototypeDocument.cpp
View File

@ -383,7 +383,7 @@ nsXULPrototypeDocument::ReportScriptError(nsIScriptError *errorObject)
// Get the console service, where we're going to register the error.
nsCOMPtr<nsIConsoleService> consoleService
(do_GetService("mozilla.consoleservice.1"));
(do_GetService("@mozilla.org/consoleservice;1"));
if (consoleService != nsnull) {
rv = consoleService->LogMessage(errorObject);

38
widget/src/gtk/nsWidgetFactory.cpp
View File

@ -124,83 +124,83 @@ static nsModuleComponentInfo components[] =
{
{ "Gtk nsWindow",
NS_WINDOW_CID,
"mozilla.widgets.window.gtk.1",
"@mozilla.org/widgets/window/gtk;1",
nsWindowConstructor },
{ "Gtk Child nsWindow",
NS_CHILD_CID,
"mozilla.widgets.child_window.gtk.1",
"@mozilla.org/widgets/child_window/gtk;1",
ChildWindowConstructor },
{ "Gtk Button",
NS_BUTTON_CID,
"mozilla.widgets.button.gtk.1",
"@mozilla.org/widgets/button/gtk;1",
nsButtonConstructor },
{ "Gtk Check Button",
NS_CHECKBUTTON_CID,
"mozilla.widgets.checkbutton.gtk.1",
"@mozilla.org/widgets/checkbutton/gtk;1",
nsCheckButtonConstructor },
{ "Gtk File Widget",
NS_FILEWIDGET_CID,
"mozilla.widgets.filewidget.gtk.1",
"@mozilla.org/widgets/filewidget/gtk;1",
nsFileWidgetConstructor },
{ "Gtk Horiz Scrollbar",
NS_HORZSCROLLBAR_CID,
"mozilla.widgets.horizscroll.gtk.1",
"@mozilla.org/widgets/horizscroll/gtk;1",
nsHorizScrollbarConstructor },
{ "Gtk Vert Scrollbar",
NS_VERTSCROLLBAR_CID,
"mozilla.widgets.vertscroll.gtk.1",
"@mozilla.org/widgets/vertscroll/gtk;1",
nsVertScrollbarConstructor },
{ "Gtk Text Widget",
NS_TEXTFIELD_CID,
"mozilla.widgets.textwidget.gtk.1",
"@mozilla.org/widgets/textwidget/gtk;1",
nsTextWidgetConstructor },
{ "Gtk AppShell",
NS_APPSHELL_CID,
"mozilla.widget.appshell.gtk.1",
"@mozilla.org/widget/appshell/gtk;1",
nsAppShellConstructor },
{ "Gtk Toolkit",
NS_TOOLKIT_CID,
"mozilla.widget.toolkit.gtk.1",
"@mozilla.org/widget/toolkit/gtk;1",
nsToolkitConstructor },
{ "Gtk Look And Feel",
NS_LOOKANDFEEL_CID,
"mozilla.widget.lookandfeel.gtk.1",
"@mozilla.org/widget/lookandfeel/gtk;1",
nsLookAndFeelConstructor },
{ "Gtk Label",
NS_LABEL_CID,
"mozilla.widget.label.gtk.1",
"@mozilla.org/widget/label/gtk;1",
nsLabelConstructor },
{ "Gtk Sound",
NS_SOUND_CID,
// "mozilla.widget.sound.gtk.1"
// "@mozilla.org/widget/sound/gtk;1"
"@mozilla.org/sound;1",
nsSoundConstructor },
{ "Transferrable",
NS_TRANSFERABLE_CID,
// "mozilla.widget.transferrable.gtk.1",
// "@mozilla.org/widget/transferrable/gtk;1",
"@mozilla.org/widget/transferable;1",
nsTransferableConstructor },
{ "Gtk Clipboard",
NS_CLIPBOARD_CID,
// "mozilla.widget.clipboard.gtk.1",
// "@mozilla.org/widget/clipboard/gtk;1",
"@mozilla.org/widget/clipboard;1",
nsClipboardConstructor },
{ "XIF Format Converter",
NS_XIFFORMATCONVERTER_CID,
"mozilla.widget.xifformatconverter.gtk.1",
"@mozilla.org/widget/xifformatconverter/gtk;1",
nsXIFFormatConverterConstructor },
{ "Gtk Font Retriever Service",
NS_FONTRETRIEVERSERVICE_CID,
"mozilla.widget.fontretrieverservice.gtk.1",
"@mozilla.org/widget/fontretrieverservice/gtk;1",
nsFontRetrieverServiceConstructor },
{ "Gtk Drag Service",
NS_DRAGSERVICE_CID,
// "mozilla.widget.dragservice.gtk.1",
// "@mozilla.org/widget/dragservice/gtk;1",
"@mozilla.org/widget/dragservice;1",
nsDragServiceConstructor },
{ "File Spec with UI",
NS_FILESPECWITHUI_CID,
// "mozilla.widget.filespecwithui.gtk.1",
// "@mozilla.org/widget/filespecwithui/gtk;1",
"@mozilla.org/filespecwithui;1",
nsFileSpecWithUIImplConstructor }
};

38
widget/src/photon/nsWidgetFactory.cpp
View File

@ -131,87 +131,87 @@ static nsModuleComponentInfo components[] =
{
{ "Ph nsWindow",
NS_WINDOW_CID,
"mozilla.widgets.window.ph.1",
"@mozilla.org/widgets/window/ph;1",
nsWindowConstructor },
{ "Ph Child nsWindow",
NS_CHILD_CID,
"mozilla.widgets.child_window.ph.1",
"@mozilla.org/widgets/child_window/ph;1",
ChildWindowConstructor },
{ "Ph Button",
NS_BUTTON_CID,
"mozilla.widgets.button.ph.1",
"@mozilla.org/widgets/button/ph;1",
nsButtonConstructor },
/*
{ "Ph Check Button",
NS_CHECKBUTTON_CID,
"mozilla.widgets.checkbutton.ph.1",
"@mozilla.org/widgets/checkbutton/ph;1",
nsCheckButtonConstructor },
*/
{ "Ph File Widget",
NS_FILEWIDGET_CID,
"mozilla.widgets.filewidget.ph.1",
"@mozilla.org/widgets/filewidget/ph;1",
nsFileWidgetConstructor },
{ "Ph Horiz Scrollbar",
NS_HORZSCROLLBAR_CID,
"mozilla.widgets.horizscroll.ph.1",
"@mozilla.org/widgets/horizscroll/ph;1",
nsHorizScrollbarConstructor },
{ "Ph Vert Scrollbar",
NS_VERTSCROLLBAR_CID,
"mozilla.widgets.vertscroll.ph.1",
"@mozilla.org/widgets/vertscroll/ph;1",
nsVertScrollbarConstructor },
{ "Ph Text Widget",
NS_TEXTFIELD_CID,
"mozilla.widgets.textwidget.ph.1",
"@mozilla.org/widgets/textwidget/ph;1",
nsTextWidgetConstructor },
{ "Ph AppShell",
NS_APPSHELL_CID,
"mozilla.widget.appshell.ph.1",
"@mozilla.org/widget/appshell/ph;1",
nsAppShellConstructor },
{ "Ph Toolkit",
NS_TOOLKIT_CID,
"mozilla.widget.toolkit.ph.1",
"@mozilla.org/widget/toolkit/ph;1",
nsToolkitConstructor },
{ "Ph Look And Feel",
NS_LOOKANDFEEL_CID,
"mozilla.widget.lookandfeel.ph.1",
"@mozilla.org/widget/lookandfeel/ph;1",
nsLookAndFeelConstructor },
/*
{ "Ph Label",
NS_LABEL_CID,
"mozilla.widget.label.ph.1",
"@mozilla.org/widget/label/ph;1",
nsLabelConstructor },
*/
{ "Ph Sound",
NS_SOUND_CID,
// "mozilla.widget.sound.ph.1"
// "@mozilla.org/widget/sound/ph;1"
"@mozilla.org/sound;1",
nsSoundConstructor },
{ "Transferrable",
NS_TRANSFERABLE_CID,
// "mozilla.widget.transferrable.ph.1",
// "@mozilla.org/widget/transferrable/ph;1",
"@mozilla.org/widget/transferable;1",
nsTransferableConstructor },
{ "Ph Clipboard",
NS_CLIPBOARD_CID,
// "mozilla.widget.clipboard.ph.1",
// "@mozilla.org/widget/clipboard/ph;1",
"@mozilla.org/widget/clipboard;1",
nsClipboardConstructor },
{ "XIF Format Converter",
NS_XIFFORMATCONVERTER_CID,
"mozilla.widget.xifformatconverter.ph.1",
"@mozilla.org/widget/xifformatconverter/ph;1",
nsXIFFormatConverterConstructor },
{ "Ph Font Retriever Service",
NS_FONTRETRIEVERSERVICE_CID,
"mozilla.widget.fontretrieverservice.ph.1",
"@mozilla.org/widget/fontretrieverservice/ph;1",
nsFontRetrieverServiceConstructor },
{ "Ph Drag Service",
NS_DRAGSERVICE_CID,
// "mozilla.widget.dragservice.ph.1",
// "@mozilla.org/widget/dragservice/ph;1",
"@mozilla.org/widget/dragservice;1",
nsDragServiceConstructor },
{ "File Spec with UI",
NS_FILESPECWITHUI_CID,
// "mozilla.widget.filespecwithui.ph.1",
// "@mozilla.org/widget/filespecwithui/ph;1",
"@mozilla.org/filespecwithui;1",
nsFileSpecWithUIImplConstructor }
};

38
widget/src/xlib/nsWidgetFactory.cpp
View File

@ -125,83 +125,83 @@ static nsModuleComponentInfo components[] =
{
{ "Xlib nsWindow",
NS_WINDOW_CID,
"mozilla.widgets.window.xlib.1",
"@mozilla.org/widgets/window/xlib;1",
nsWindowConstructor },
{ "Xlib Child nsWindow",
NS_CHILD_CID,
"mozilla.widgets.child_window.xlib.1",
"@mozilla.org/widgets/child_window/xlib;1",
ChildWindowConstructor },
{ "Xlib Button",
NS_BUTTON_CID,
"mozilla.widgets.button.xlib.1",
"@mozilla.org/widgets/button/xlib;1",
nsButtonConstructor },
{ "Xlib Check Button",
NS_CHECKBUTTON_CID,
"mozilla.widgets.checkbutton.xlib.1",
"@mozilla.org/widgets/checkbutton/xlib;1",
nsCheckButtonConstructor },
{ "Xlib File Widget",
NS_FILEWIDGET_CID,
"mozilla.widgets.filewidget.xlib.1",
"@mozilla.org/widgets/filewidget/xlib;1",
nsFileWidgetConstructor },
{ "Xlib Horiz Scrollbar",
NS_HORZSCROLLBAR_CID,
"mozilla.widgets.horizscroll.xlib.1",
"@mozilla.org/widgets/horizscroll/xlib;1",
nsHorizScrollbarConstructor },
{ "Xlib Vert Scrollbar",
NS_VERTSCROLLBAR_CID,
"mozilla.widgets.vertscroll.xlib.1",
"@mozilla.org/widgets/vertscroll/xlib;1",
nsVertScrollbarConstructor },
{ "Xlib Text Widget",
NS_TEXTFIELD_CID,
"mozilla.widgets.textwidget.xlib.1",
"@mozilla.org/widgets/textwidget/xlib;1",
nsTextWidgetConstructor },
{ "Xlib AppShell",
NS_APPSHELL_CID,
"mozilla.widget.appshell.xlib.1",
"@mozilla.org/widget/appshell/xlib;1",
nsAppShellConstructor },
{ "Xlib Toolkit",
NS_TOOLKIT_CID,
"mozilla.widget.toolkit.xlib.1",
"@mozilla.org/widget/toolkit/xlib;1",
nsToolkitConstructor },
{ "Xlib Look And Feel",
NS_LOOKANDFEEL_CID,
"mozilla.widget.lookandfeel.xlib.1",
"@mozilla.org/widget/lookandfeel/xlib;1",
nsLookAndFeelConstructor },
{ "Xlib Label",
NS_LABEL_CID,
"mozilla.widget.label.xlib.1",
"@mozilla.org/widget/label/xlib;1",
nsLabelConstructor },
{ "Xlib Sound",
NS_SOUND_CID,
"mozilla.widget.sound.xlib.1",
"@mozilla.org/widget/sound/xlib;1",
//"@mozilla.org/sound;1",
nsSoundConstructor },
{ "Transferrable",
NS_TRANSFERABLE_CID,
// "mozilla.widget.transferrable.xlib.1",
// "@mozilla.org/widget/transferrable/xlib;1",
"@mozilla.org/widget/transferable;1",
nsTransferableConstructor },
{ "Xlib Clipboard",
NS_CLIPBOARD_CID,
// "mozilla.widget.clipboard.xlib.1",
// "@mozilla.org/widget/clipboard/xlib;1",
"@mozilla.org/widget/clipboard;1",
nsClipboardConstructor },
{ "XIF Format Converter",
NS_XIFFORMATCONVERTER_CID,
"mozilla.widget.xifformatconverter.xlib.1",
"@mozilla.org/widget/xifformatconverter/xlib;1",
nsXIFFormatConverterConstructor },
//{ "Xlib Font Retriever Service",
//NS_FONTRETRIEVERSERVICE_CID,
//"mozilla.widget.fontretrieverservice.xlib.1",
//"@mozilla.org/widget/fontretrieverservice/xlib;1",
//nsFontRetrieverServiceConstructor },
{ "Xlib Drag Service",
NS_DRAGSERVICE_CID,
// "mozilla.widget.dragservice.xlib.1",
// "@mozilla.org/widget/dragservice/xlib;1",
"@mozilla.org/widget/dragservice;1",
nsDragServiceConstructor },
{ "File Spec with UI",
NS_FILESPECWITHUI_CID,
// "mozilla.widget.filespecwithui.xlib.1",
// "@mozilla.org/widget/filespecwithui/xlib;1",
"@mozilla.org/filespecwithui;1",
nsFileSpecWithUIImplConstructor }
};

2
xpcom/base/nsIConsoleMessage.idl
View File

@ -37,5 +37,5 @@ interface nsIConsoleMessage : nsISupports
#define NS_CONSOLEMESSAGE_CID \
{ 0x56c9d666, 0x1dd2, 0x11b2, { 0xb4, 0x3c, 0xa8, 0x4b, 0xf3, 0xb3, 0xec, 0xbb }}
#define NS_CONSOLEMESSAGE_CONTRACTID "mozilla.consolemessage.1"
#define NS_CONSOLEMESSAGE_CONTRACTID "@mozilla.org/consolemessage;1"
%}

2
xpcom/base/nsIConsoleService.idl
View File

@ -65,6 +65,6 @@ interface nsIConsoleService : nsISupports
#define NS_CONSOLESERVICE_CID \
{ 0x7e3ff85c, 0x1dd2, 0x11b2, { 0x8d, 0x4b, 0xeb, 0x45, 0x2c, 0xb0, 0xff, 0x40 }}
#define NS_CONSOLESERVICE_CONTRACTID "mozilla.consoleservice.1"
#define NS_CONSOLESERVICE_CONTRACTID "@mozilla.org/consoleservice;1"
%}

2
xpcom/base/nsSystemInfo.h
View File

@ -30,7 +30,7 @@
{ 0xbf, 0xa1, 0x83, 0x12, 0x5c, 0x3f, 0x38, 0x87 }}
#define NS_SYSTEMINFO_CLASSNAME "System Info Service"
#define NS_SYSTEMINFO_CONTRACTID "mozilla.sysinfo.1"
#define NS_SYSTEMINFO_CONTRACTID "@mozilla.org/sysinfo;1"
class nsSystemInfo : public nsISystemInfo
{

2
xpcom/components/nsICategoryManager.idl
View File

@ -111,7 +111,7 @@ interface nsICategoryManager : nsISupports
};
%{C++
#define NS_CATEGORYMANAGER_CONTRACTID "mozilla.categorymanager.1"
#define NS_CATEGORYMANAGER_CONTRACTID "@mozilla.org/categorymanager;1"
#define NS_CATEGORYMANAGER_CLASSNAME "Category Manager"
/* 16d222a6-1dd2-11b2-b693-f38b02c021b2 */
#define NS_CATEGORYMANAGER_CID \

72
xpcom/doc/xpcom-log-analyze.pl
View File

@ -9,7 +9,7 @@
# ./mozilla
# <quit>
#
# To get registry (used to figure out progid mappings)
# To get registry (used to figure out contractid mappings)
# ./regExport component.reg > registry.txt
# Usage:
@ -17,7 +17,7 @@
# a) To get simple output
# cat xpcom.log | perl xpcom-log-analyze.pl > xpcom-log.html
#
# b) To get all possible cid->progid mappings filled in
# b) To get all possible cid->contractid mappings filled in
# cat xpcom.log registry.txt | perl xpcom-log-analyze.pl > xpcom-log.html
#
#
@ -27,23 +27,23 @@
while (<>)
{
chomp;
if ( /ProgIDToClassID.*\}/ )
if ( /ContractIDToClassID.*\}/ )
{
# Passed progid to cid mapping. Add progid to cid mapping
# Passed contractid to cid mapping. Add contractid to cid mapping
$cid = GetCID();
$progid = GetProgID();
$progid_map{$cid} = $progid;
$progid_passed{$progid}++;
$nprogid_passed++;
$contractid = GetContractID();
$contractid_map{$cid} = $contractid;
$contractid_passed{$contractid}++;
$ncontractid_passed++;
next;
}
if ( /ProgIDToClassID.*FAILED/ )
if ( /ContractIDToClassID.*FAILED/ )
{
# Failed progid. Collect it.
$progid = GetProgID();
$progid_failed{$progid}++;
$nprogid_failed++;
# Failed contractid. Collect it.
$contractid = GetContractID();
$contractid_failed{$contractid}++;
$ncontractid_failed++;
next;
}
@ -74,26 +74,26 @@ while (<>)
if ( / classID - \{/ )
{
# this is from the output of registry. Try to update progid_map
# this is from the output of registry. Try to update contractid_map
$cid = GetCID();
# Get the next progid or classname line until a empty new line
$_ = <STDIN> until (/ProgID|ClassName/ || length == 1);
# Get the next contractid or classname line until a empty new line
$_ = <STDIN> until (/ContractID|ClassName/ || length == 1);
chomp;
$progid = $_;
$progid =~ s/^.*= //;
$progid_map{$cid} = $progid;
$contractid = $_;
$contractid =~ s/^.*= //;
$contractid_map{$cid} = $contractid;
}
}
PrintHTMLResults();
sub GetProgID() {
sub GetContractID() {
# Get a proid from a line
my($progid) = $_;
$progid =~ s/^.*\((.*)\).*$/$1/;
# print "Got Progid: $progid\n";
return $progid;
my($contractid) = $_;
$contractid =~ s/^.*\((.*)\).*$/$1/;
# print "Got Progid: $contractid\n";
return $contractid;
}
sub GetCID() {
@ -142,17 +142,17 @@ sub PrintHTMLResults()
@sorted_key = SortKeyByValue(%objects);
foreach $cid (@sorted_key)
{
printf("%5d %s [%s]\n", $objects{$cid}, $cid, $progid_map{$cid});
printf("%5d %s [%s]\n", $objects{$cid}, $cid, $contractid_map{$cid});
}
print "</blockquote></pre>\n";
# Passed progid calls
print "<H3>Succeeded ProgIDToClassID() : $nprogid_passed</H3>\n";
# Passed contractid calls
print "<H3>Succeeded ContractIDToClassID() : $ncontractid_passed</H3>\n";
print "<blockquote><pre>\n";
@sorted_key = SortKeyByValue(%progid_passed);
foreach $progid (@sorted_key)
@sorted_key = SortKeyByValue(%contractid_passed);
foreach $contractid (@sorted_key)
{
printf("%5d %s\n", $progid_passed{$progid}, $progid);
printf("%5d %s\n", $contractid_passed{$contractid}, $contractid);
}
print "</blockquote></pre>\n";
@ -168,17 +168,17 @@ sub PrintHTMLResults()
@sorted_key = SortKeyByValue(%objects_failed);
foreach $cid (@sorted_key)
{
printf("%5d %s [%s]\n", $objects_failed{$cid}, $cid, $progid_map{$cid});
printf("%5d %s [%s]\n", $objects_failed{$cid}, $cid, $contractid_map{$cid});
}
print "</blockquote></pre>\n";
# ProgIDToClassID() FAILED with a histogram
print "<H3>Failed ProgIDToClassID() : $nprogid_failed</H3>\n";
# ContractIDToClassID() FAILED with a histogram
print "<H3>Failed ContractIDToClassID() : $ncontractid_failed</H3>\n";
print "<blockquote><pre>\n";
@sorted_key = SortKeyByValue(%progid_failed);
foreach $progid (@sorted_key)
@sorted_key = SortKeyByValue(%contractid_failed);
foreach $contractid (@sorted_key)
{
printf("%5d %s\n", $progid_failed{$progid}, $progid);
printf("%5d %s\n", $contractid_failed{$contractid}, $contractid);
}
print "</blockquote></pre>\n";

18
xpcom/doc/xpcom-log-analyze.sh
View File

@ -73,11 +73,11 @@ echo "<blockquote><pre>"
grep 'RegisterComponentCommon({' $logfile
echo "</pre></blockquote>"
# Number of succeeded calls to ProgIDToClassID() with histogram
n=`grep -i 'progidtoclassid.*}' $logfile | wc -l`
echo "<H3>Count of succeeded ProgIDToClassID() : $n</H3>"
# Number of succeeded calls to ContractIDToClassID() with histogram
n=`grep -i 'contractidtoclassid.*}' $logfile | wc -l`
echo "<H3>Count of succeeded ContractIDToClassID() : $n</H3>"
echo "<blockquote><pre>"
grep -i 'progidtoclassid.*}' $logfile | sort | uniq -c | sort -nr
grep -i 'contractidtoclassid.*}' $logfile | sort | uniq -c | sort -nr
echo "</pre></blockquote>"
@ -93,13 +93,13 @@ echo "<blockquote><pre>"
grep 'CreateInstance.*FAILED' $logfile
echo "</pre></blockquote>"
# ProgIDToClassID() FAILED with a histogram
n=`grep 'ProgIDToClassID.*FAILED' $logfile | wc -l`
echo "<H3>Failed ProgIDToClassID() : $n</H3>"
# ContractIDToClassID() FAILED with a histogram
n=`grep 'ContractIDToClassID.*FAILED' $logfile | wc -l`
echo "<H3>Failed ContractIDToClassID() : $n</H3>"
echo "<blockquote><pre>"
grep 'ProgIDToClassID.*FAILED' $logfile | sort | uniq -c | sort -nr
grep 'ContractIDToClassID.*FAILED' $logfile | sort | uniq -c | sort -nr
echo "</pre></blockquote>"
#
# Cleanup
echo "</HTML>"
echo "</HTML>"

4
xpcom/sample/xpconnect-sample.html
View File

@ -117,7 +117,7 @@ printed is calculated in C++ code defined in <a href="http://lxr.mozilla.org/sea
<!-- XXX keep in sync with stuff in pre tag below -->
<script>
/* to use nsSample.js version, use "mozilla.jssample.1" */
/* to use nsSample.js version, use "@mozilla.org/jssample;1" */
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var sample = Components.classes["@mozilla.org/sample;1"].createInstance();
sample = sample.QueryInterface(Components.interfaces.nsISample);
@ -168,7 +168,7 @@ JavaScript and form source:
<!-- XXX keep in sync with actual script -->
<pre>
&lt;script&gt;
/* to use nsSample.js version, use "mozilla.jssample.1" */
/* to use nsSample.js version, use "@mozilla.org/jssample;1" */
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var sample = Components.classes["@mozilla.org/sample;1"].createInstance();
sample = sample.QueryInterface(Components.interfaces.nsISample);

4
xpfe/appshell/public/nsICmdLineHandler.idl
View File

@ -90,7 +90,7 @@ NS_IMETHODIMP macro_class::GetOpenWindowWithArgs(PRBool *aOpenWindowWithArgs) \
NS_METHOD macro_class::RegisterProc(nsIComponentManager *aCompMgr, nsIFile *aPath, const char *registryLocation, const char *componentType) \
{ \
nsresult rv; \
nsCOMPtr<nsICategoryManager> catman = do_GetService("mozilla.categorymanager.1", &rv); \
nsCOMPtr<nsICategoryManager> catman = do_GetService("@mozilla.org/categorymanager;1", &rv); \
if (NS_FAILED(rv)) return rv; \
nsXPIDLCString prevEntry; \
rv = catman->AddCategoryEntry(COMMAND_LINE_ARGUMENT_HANDLERS, macro_pretty_name, macro_contractid, PR_TRUE, PR_TRUE, getter_Copies(prevEntry)); \
@ -99,7 +99,7 @@ NS_METHOD macro_class::RegisterProc(nsIComponentManager *aCompMgr, nsIFile *aPat
NS_METHOD macro_class::UnregisterProc(nsIComponentManager *aCompMgr, nsIFile *aPath, const char *registryLocation) \
{ \
nsresult rv; \
nsCOMPtr<nsICategoryManager> catman = do_GetService("mozilla.categorymanager.1", &rv); \
nsCOMPtr<nsICategoryManager> catman = do_GetService("@mozilla.org/categorymanager;1", &rv); \
if (NS_FAILED(rv)) return rv; \
nsXPIDLCString prevEntry; \
rv = catman->DeleteCategoryEntry(COMMAND_LINE_ARGUMENT_HANDLERS, macro_contractid, PR_TRUE, getter_Copies(prevEntry)); \

2
xpfe/bootstrap/nsAppRunner.cpp
View File

@ -276,7 +276,7 @@ static nsresult OpenChromeURL( const char * urlstr, PRInt32 height = NS_SIZETOCO
static void DumpArbitraryHelp()
{
nsresult rv;
NS_WITH_SERVICE(nsICategoryManager, catman, "mozilla.categorymanager.1", &rv);
NS_WITH_SERVICE(nsICategoryManager, catman, "@mozilla.org/categorymanager;1", &rv);
if(NS_SUCCEEDED(rv) && catman) {
nsCOMPtr<nsISimpleEnumerator> e;
rv = catman->EnumerateCategory(COMMAND_LINE_ARGUMENT_HANDLERS, getter_AddRefs(e));

2
xpfe/browser/resources/content/navigator.js
View File

@ -1599,7 +1599,7 @@ var consoleListener = {
function initConsoleListener()
{
var consoleService = nsJSComponentManager.getService("mozilla.consoleservice.1", "nsIConsoleService");
var consoleService = nsJSComponentManager.getService("@mozilla.org/consoleservice;1", "nsIConsoleService");
/**
* XXX - console launch hookup requires some work that I'm not sure how to

2
xpfe/components/bookmarks/resources/bm-find.js
View File

@ -421,7 +421,7 @@ function SetSortColumn(column_name)
function sort_column(column, direction)
{
var isupports_uri = "component://netscape/rdf/xul-sort-service";
var isupports_uri = "@mozilla.org/rdf/xul-sort-service;1";
var isupports = Components.classes[isupports_uri].getService();
if (!isupports) return false;
var xulSortService = isupports.QueryInterface(Components.interfaces.nsIXULSortService);

4
xpfe/components/console/jsconsole-clhandler.js
View File

@ -62,7 +62,7 @@ var jsConsoleHandlerModule = {
'JS Console Commandline Handler component',
JSCONSOLEHANDLER_CONTRACTID, fileSpec,
location, true, true, type);
var catman = Components.classes["mozilla.categorymanager.1"]
var catman = Components.classes["@mozilla.org/categorymanager;1"]
.getService(Components.interfaces.nsICategoryManager);
catman.addCategoryEntry("command-line-argument-handlers", "jsconsole command line handler",
JSCONSOLEHANDLER_CONTRACTID,
@ -71,7 +71,7 @@ var jsConsoleHandlerModule = {
unregisterSelf: function(compMgr, fileSpec, location) {
compMgr.unregisterComponentSpec(JSCONSOLEHANDLER_CID, fileSpec);
var catman = Components.classes["mozilla.categorymanager.1"]
var catman = Components.classes["@mozilla.org/categorymanager;1"]
.getService(Components.interfaces.nsICategoryManager);
catman.deleteCategoryEntry("command-line-argument-handlers",
JSCONSOLEHANDLER_CONTRACTID, true);

8
xpfe/components/console/resources/content/console.js
View File

@ -47,7 +47,7 @@ var num_errors=0;
function onLoadJSConsole()
{
try {
var cs_class = Components.classes['mozilla.consoleservice.1'];
var cs_class = Components.classes['@mozilla.org/consoleservice;1'];
var cs_iface = Components.interfaces.nsIConsoleService;
var cs_isupports = cs_class.getService();
var cs = cs_isupports.QueryInterface(cs_iface);
@ -58,7 +58,7 @@ function onLoadJSConsole()
appendMessage({ message:
"Unable to display errors - " +
"couldn't get Console Service component. " +
"(Missing mozilla.consoleservice.1)" });
"(Missing @mozilla.org/consoleservice;1)" });
return;
}
@ -101,7 +101,7 @@ function onUnloadJSConsole()
// keep a global ref. to it instead???
try {
var cs_class = Components.classes['mozilla.consoleservice.1'];
var cs_class = Components.classes['@mozilla.org/consoleservice;1'];
var cs_iface = Components.interfaces.nsIConsoleService;
var cs_isupports = cs_class.getService();
var cs = cs_isupports.QueryInterface(cs_iface);
@ -244,7 +244,7 @@ function clear ()
{
try {
var cs_class = Components.classes['mozilla.consoleservice.1'];
var cs_class = Components.classes['@mozilla.org/consoleservice;1'];
var cs_iface = Components.interfaces.nsIConsoleService;
var cs_isupports = cs_class.getService();
var cs = cs_isupports.QueryInterface(cs_iface);

2
xpfe/components/public/nsIAppShellComponent.idl
View File

@ -54,7 +54,7 @@ class nsICmdLineService;
| adds functions specific to that component. |
| 3. Register (using the Mozilla XPCOM component registration facilities) |
| using a ContractID of the form: |
| component://netscape/appshell/component/foo |
| @mozilla.org/appshell/component/foo;1 |
| where "foo" is a component-specific identifier (which should match the |
| component-specific interface name). |
| |

4
xpfe/components/startup/public/nsICmdLineHandler.idl
View File

@ -90,7 +90,7 @@ NS_IMETHODIMP macro_class::GetOpenWindowWithArgs(PRBool *aOpenWindowWithArgs) \
NS_METHOD macro_class::RegisterProc(nsIComponentManager *aCompMgr, nsIFile *aPath, const char *registryLocation, const char *componentType) \
{ \
nsresult rv; \
nsCOMPtr<nsICategoryManager> catman = do_GetService("mozilla.categorymanager.1", &rv); \
nsCOMPtr<nsICategoryManager> catman = do_GetService("@mozilla.org/categorymanager;1", &rv); \
if (NS_FAILED(rv)) return rv; \
nsXPIDLCString prevEntry; \
rv = catman->AddCategoryEntry(COMMAND_LINE_ARGUMENT_HANDLERS, macro_pretty_name, macro_contractid, PR_TRUE, PR_TRUE, getter_Copies(prevEntry)); \
@ -99,7 +99,7 @@ NS_METHOD macro_class::RegisterProc(nsIComponentManager *aCompMgr, nsIFile *aPat
NS_METHOD macro_class::UnregisterProc(nsIComponentManager *aCompMgr, nsIFile *aPath, const char *registryLocation) \
{ \
nsresult rv; \
nsCOMPtr<nsICategoryManager> catman = do_GetService("mozilla.categorymanager.1", &rv); \
nsCOMPtr<nsICategoryManager> catman = do_GetService("@mozilla.org/categorymanager;1", &rv); \
if (NS_FAILED(rv)) return rv; \
nsXPIDLCString prevEntry; \
rv = catman->DeleteCategoryEntry(COMMAND_LINE_ARGUMENT_HANDLERS, macro_contractid, PR_TRUE, getter_Copies(prevEntry)); \

2
xpinstall/src/nsSoftwareUpdateRun.cpp
View File

@ -83,7 +83,7 @@ XPInstallErrorReporter(JSContext *cx, const char *message, JSErrorReport *report
/* Use the console service to register the error. */
nsCOMPtr<nsIConsoleService> consoleService
(do_GetService("mozilla.consoleservice.1"));
(do_GetService("@mozilla.org/consoleservice;1"));
/*
* Make an nsIScriptError, populate it with information from this