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.

1 files changed, 1 insertions, 6 deletions

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;
 	}
 }