aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2004-07-21 06:28:55 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-07-21 06:28:55 +0800
commit750efa7d51d97859f37e9e59065ba176d7520cce (patch)
treeef473016ddcad25326d02e14a88bab3b93a29958
parent0e8132c237b8da5837ea2f8889507d91b0ead33c (diff)
downloadgsoc2013-epiphany-750efa7d51d97859f37e9e59065ba176d7520cce.tar
gsoc2013-epiphany-750efa7d51d97859f37e9e59065ba176d7520cce.tar.gz
gsoc2013-epiphany-750efa7d51d97859f37e9e59065ba176d7520cce.tar.bz2
gsoc2013-epiphany-750efa7d51d97859f37e9e59065ba176d7520cce.tar.lz
gsoc2013-epiphany-750efa7d51d97859f37e9e59065ba176d7520cce.tar.xz
gsoc2013-epiphany-750efa7d51d97859f37e9e59065ba176d7520cce.tar.zst
gsoc2013-epiphany-750efa7d51d97859f37e9e59065ba176d7520cce.zip
No need to use a weak ref for the observer, makes the single code easier.
2004-07-21 Marco Pesenti Gritti <marco@gnome.org> * embed/mozilla/EphySingle.cpp: * embed/mozilla/EphySingle.h: * embed/mozilla/mozilla-embed-single.cpp: No need to use a weak ref for the observer, makes the single code easier.
-rw-r--r--ChangeLog9
-rw-r--r--embed/mozilla/EphySingle.cpp10
-rw-r--r--embed/mozilla/EphySingle.h3
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp7
4 files changed, 16 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index b28ca8336..ff6fa70b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-07-21 Marco Pesenti Gritti <marco@gnome.org>
+
+ * embed/mozilla/EphySingle.cpp:
+ * embed/mozilla/EphySingle.h:
+ * embed/mozilla/mozilla-embed-single.cpp:
+
+ No need to use a weak ref for the observer,
+ makes the single code easier.
+
2004-07-20 Marco Pesenti Gritti <marco@gnome.org>
* embed/mozilla/EphyHeaderSniffer.cpp:
diff --git a/embed/mozilla/EphySingle.cpp b/embed/mozilla/EphySingle.cpp
index 3c8fb67b6..065b886cf 100644
--- a/embed/mozilla/EphySingle.cpp
+++ b/embed/mozilla/EphySingle.cpp
@@ -39,7 +39,7 @@
#include <nsIIDNService.h>
#endif
-NS_IMPL_ISUPPORTS2(EphySingle, nsIObserver, nsISupportsWeakReference)
+NS_IMPL_ISUPPORTS1(EphySingle, nsIObserver)
EphySingle::EphySingle()
: mOwner(nsnull)
@@ -54,10 +54,10 @@ EphySingle::Init (EphyEmbedSingle *aOwner)
NS_ENSURE_TRUE (mObserverService, NS_ERROR_FAILURE);
nsresult rv;
- rv = mObserverService->AddObserver (this, "cookie-changed", PR_TRUE);
- rv |= mObserverService->AddObserver (this, "cookie-rejected", PR_TRUE);
- rv |= mObserverService->AddObserver (this, "perm-changed", PR_TRUE);
- rv |= mObserverService->AddObserver (this, "network:offline-status-changed", PR_TRUE);
+ rv = mObserverService->AddObserver (this, "cookie-changed", PR_FALSE);
+ rv |= mObserverService->AddObserver (this, "cookie-rejected", PR_FALSE);
+ rv |= mObserverService->AddObserver (this, "perm-changed", PR_FALSE);
+ rv |= mObserverService->AddObserver (this, "network:offline-status-changed", PR_FALSE);
NS_ENSURE_SUCCESS (rv, NS_ERROR_FAILURE);
mOwner = aOwner;
diff --git a/embed/mozilla/EphySingle.h b/embed/mozilla/EphySingle.h
index 5c47a5002..aff9de9a6 100644
--- a/embed/mozilla/EphySingle.h
+++ b/embed/mozilla/EphySingle.h
@@ -33,8 +33,7 @@
#include <nsICookie.h>
#include <nsIPermission.h>
-class EphySingle : public nsIObserver,
- public nsSupportsWeakReference
+class EphySingle : public nsIObserver
{
public:
NS_DECL_ISUPPORTS
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 0ee08f9d4..fb6f644e3 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -419,8 +419,7 @@ mozilla_init_observer (MozillaEmbedSingle *single)
EphySingle *es;
es = new EphySingle ();
- nsCOMPtr<nsIObserver> guard = NS_STATIC_CAST (nsIObserver *, es);
- if (!guard) return;
+ NS_ADDREF (single->priv->mSingleObserver = es);
nsresult rv;
rv = es->Init (EPHY_EMBED_SINGLE (single));
@@ -429,8 +428,6 @@ mozilla_init_observer (MozillaEmbedSingle *single)
g_warning ("Failed to initialise EphySingle!\n");
return;
}
-
- NS_ADDREF (single->priv->mSingleObserver = es);
}
static gboolean
@@ -511,8 +508,6 @@ mozilla_embed_single_dispose (GObject *object)
{
single->priv->mSingleObserver->Detach ();
NS_RELEASE (single->priv->mSingleObserver);
- delete single->priv->mSingleObserver;
- single->priv->mSingleObserver = nsnull;
}
}