Make sure event listener is ever attached. Never allow to override

2003-01-06  Marco Pesenti Gritti  <marco@it.gnome.org>

	* TODO:
	* embed/mozilla/EphyWrapper.cpp:
	* embed/mozilla/EphyWrapper.h:
	* embed/mozilla/mozilla-embed.cpp:
	* src/ephy-tab.c: (ephy_tab_init), (ephy_tab_link_message_cb),
	(ephy_tab_get_status_message):

	Make sure event listener is ever attached.
	Never allow to override statusbar messages.

3 files changed, 29 insertions, 34 deletions

diff --git a/embed/mozilla/EphyWrapper.cpp b/embed/mozilla/EphyWrapper.cpp
index 716b5e75c..8473d1a6f 100644
--- a/embed/mozilla/EphyWrapper.cpp
+++ b/embed/mozilla/EphyWrapper.cpp
@@ -27,7 +27,6 @@
 #include <unistd.h>
 
 #include "nsIContentViewer.h"
-#include "nsIPermissionManager.h"
 #include "nsIGlobalHistory.h"
 #include "nsIDocShellHistory.h"
 #include "nsIWebBrowserFind.h"
@@ -41,14 +40,10 @@
 #include "nsIPresShell.h"
 #include "nsIMarkupDocumentViewer.h"
 #include "nsIComponentManager.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMNodeList.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIScriptContext.h"
 
 #include "nsIDOMWindowInternal.h"
-#include "nsICharsetConverterManager.h"
-#include "nsICharsetConverterManager2.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIFocusController.h"
 #include "nsIWebBrowserPersist.h"
@@ -73,9 +68,6 @@
 #include "nsIDOMHTMLDocument.h"
 #include "nsIDOMHTMLCollection.h"
 #include "nsIDOMHTMLElement.h"
-#include "nsIDOMHTMLImageElement.h"
-#include "nsIDOMHTMLFormElement.h"
-#include "nsIDOMHTMLAnchorElement.h"
 #include "caps/nsIPrincipal.h"
 #include "nsIDeviceContext.h"
 #include "nsIPresContext.h"
@@ -86,6 +78,8 @@
 
 EphyWrapper::EphyWrapper ()
 {
+	mEventListener = nsnull;
+	mEventReceiver = nsnull;	
 }
 
 EphyWrapper::~EphyWrapper ()
@@ -130,10 +124,10 @@ nsresult EphyWrapper::Init (GtkMozEmbed *mozembed)
 	return dsHistory->SetGlobalHistory(inst);
 }
 
-void
+nsresult
 EphyWrapper::GetListener (void)
 {
-  	if (mEventReceiver) return;
+  	if (mEventReceiver) return NS_ERROR_FAILURE;
 
   	nsCOMPtr<nsIDOMWindow> domWindowExternal;
   	mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindowExternal));
@@ -142,38 +136,39 @@ EphyWrapper::GetListener (void)
         domWindow = do_QueryInterface(domWindowExternal);
 	
 	nsCOMPtr<nsPIDOMWindow> piWin(do_QueryInterface(domWindow));
-  	if (!piWin) return;
+  	if (!piWin) return NS_ERROR_FAILURE;
 
   	nsCOMPtr<nsIChromeEventHandler> chromeHandler;
   	piWin->GetChromeEventHandler(getter_AddRefs(chromeHandler));
 
   	mEventReceiver = do_QueryInterface(chromeHandler);
+	if (!mEventReceiver) return NS_ERROR_FAILURE;
+
+	return NS_OK;
 }
 
-void
+nsresult
 EphyWrapper::AttachListeners(void)
 {
-  	if (!mEventReceiver || mListenersAttached)
-    		return;
+  	if (!mEventReceiver) return NS_ERROR_FAILURE;
 
 	nsCOMPtr<nsIDOMEventTarget> target;
 	target = do_QueryInterface (mEventReceiver);
 
-	target->AddEventListener(NS_LITERAL_STRING("DOMLinkAdded"), mEventListener, PR_FALSE);
-
-  	mListenersAttached = PR_TRUE;
+	return target->AddEventListener(NS_LITERAL_STRING("DOMLinkAdded"),
+			                mEventListener, PR_FALSE);
 }
 
-void
+nsresult
 EphyWrapper::DetachListeners(void)
 {
-  	if (!mListenersAttached || !mEventReceiver)
-    		return;
-
+	if (!mEventReceiver) return NS_ERROR_FAILURE;
+	
 	nsCOMPtr<nsIDOMEventTarget> target;
 	target = do_QueryInterface (mEventReceiver);
 
-	target->RemoveEventListener(NS_LITERAL_STRING("DOMLinkAdded"), mEventListener, PR_FALSE);
+	return target->RemoveEventListener(NS_LITERAL_STRING("DOMLinkAdded"),
+					   mEventListener, PR_FALSE);
 }
 
 nsresult EphyWrapper::GetDocShell (nsIDocShell **aDocShell)
diff --git a/embed/mozilla/EphyWrapper.h b/embed/mozilla/EphyWrapper.h
index 0345ede30..8f6a3672a 100644
--- a/embed/mozilla/EphyWrapper.h
+++ b/embed/mozilla/EphyWrapper.h
@@ -112,11 +112,10 @@ private:
 	nsCOMPtr<nsIWebProgressListener> mProgress;
 	nsCOMPtr<nsIDOMEventReceiver> mEventReceiver;
 	EphyEventListener *mEventListener;
-	PRBool mListenersAttached;
 
-	void GetListener (void);
-	void AttachListeners (void);
-	void DetachListeners (void);
+	nsresult GetListener (void);
+	nsresult AttachListeners (void);
+	nsresult DetachListeners (void);
 	nsresult SetZoomOnDocshell (float aZoom, nsIDocShell *DocShell);
 	nsresult GetDocShell (nsIDocShell **aDocShell);
 	nsresult GetCSSBackground (nsIDOMNode *node, nsAutoString& url);
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 8c39dd460..05408973f 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -382,6 +382,7 @@ static void
 mozilla_embed_destroy (GtkObject *object)
 {
 	int i;
+	MozillaEmbed *embed = MOZILLA_EMBED (object);
 	
 	for (i = 0; signal_connections[i].event != NULL; i++)
         {
@@ -390,6 +391,13 @@ mozilla_embed_destroy (GtkObject *object)
                          (gpointer)signal_connections[i].func, 
                          (void *)object);
         }
+
+	if (embed->priv->wrapper)
+	{
+		embed->priv->wrapper->Destroy();
+        	delete embed->priv->wrapper;
+        	embed->priv->wrapper = NULL;
+	}
 	
 	GTK_OBJECT_CLASS (parent_class)->destroy (object);
 }
@@ -406,14 +414,7 @@ mozilla_embed_finalize (GObject *object)
 	
 	g_return_if_fail (embed->priv != NULL);
 	
-	if (embed->priv->wrapper)
-	{
-		embed->priv->wrapper->Destroy();
-        	delete embed->priv->wrapper;
-        	embed->priv->wrapper = NULL;
-	}
-
-	delete embed->priv;
+	g_free (embed->priv);
 	
         G_OBJECT_CLASS (parent_class)->finalize (object);