aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-07-11 02:28:19 +0800
committerChristian Persch <chpe@src.gnome.org>2005-07-11 02:28:19 +0800
commit49d5bba44cc0e59ed15cb04299fd36c701d58e59 (patch)
treee24052a12c13ada6171a21600812cdf22f8c0b26
parent75ecb3bdd186210a6064b46d3889b5719d786afb (diff)
downloadgsoc2013-epiphany-49d5bba44cc0e59ed15cb04299fd36c701d58e59.tar
gsoc2013-epiphany-49d5bba44cc0e59ed15cb04299fd36c701d58e59.tar.gz
gsoc2013-epiphany-49d5bba44cc0e59ed15cb04299fd36c701d58e59.tar.bz2
gsoc2013-epiphany-49d5bba44cc0e59ed15cb04299fd36c701d58e59.tar.lz
gsoc2013-epiphany-49d5bba44cc0e59ed15cb04299fd36c701d58e59.tar.xz
gsoc2013-epiphany-49d5bba44cc0e59ed15cb04299fd36c701d58e59.tar.zst
gsoc2013-epiphany-49d5bba44cc0e59ed15cb04299fd36c701d58e59.zip
Use contract IDs.
2005-07-10 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/EphyProtocolHandler.cpp: Use contract IDs.
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/EphyProtocolHandler.cpp7
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index aad157df3..ca6684564 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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);