diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | embed/mozilla/EphyProtocolHandler.cpp | 7 |
2 files changed, 8 insertions, 5 deletions
@@ -1,6 +1,12 @@ 2005-07-10 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/EphyProtocolHandler.cpp: + + Use contract IDs. + +2005-07-10 Christian Persch <chpe@cvs.gnome.org> + + * embed/mozilla/EphyProtocolHandler.cpp: Add context to two strings. diff --git a/embed/mozilla/EphyProtocolHandler.cpp b/embed/mozilla/EphyProtocolHandler.cpp index b327d5480..c91b6f4db 100644 --- a/embed/mozilla/EphyProtocolHandler.cpp +++ b/embed/mozilla/EphyProtocolHandler.cpp @@ -49,9 +49,6 @@ #include <string.h> -static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); -static NS_DEFINE_CID(kInputStreamChannelCID, NS_INPUTSTREAMCHANNEL_CID); - EphyProtocolHandler::EphyProtocolHandler() { LOG ("EphyProtocolHandler ctor [%p]\n", this); @@ -100,7 +97,7 @@ EphyProtocolHandler::NewURI(const nsACString &aSpec, nsIURI **_retval) { nsresult rv; - nsCOMPtr<nsIURI> uri (do_CreateInstance(kSimpleURICID, &rv)); + nsCOMPtr<nsIURI> uri (do_CreateInstance("@mozilla.org/network/simple-uri;1", &rv)); NS_ENSURE_SUCCESS (rv, rv); rv = uri->SetSpec (aSpec); @@ -548,7 +545,7 @@ EphyProtocolHandler::CreateErrorPage(nsIURI *aErrorURI, rv = storageStream->NewInputStream(0, getter_AddRefs (inputStream)); NS_ENSURE_SUCCESS (rv, rv); - nsCOMPtr<nsIInputStreamChannel> channel (do_CreateInstance (kInputStreamChannelCID, &rv)); + nsCOMPtr<nsIInputStreamChannel> channel (do_CreateInstance ("@mozilla.org/network/input-stream-channel;1", &rv)); NS_ENSURE_SUCCESS (rv, rv); rv |= channel->SetURI (aErrorURI); |