Solving the wrapper mess Episode 3. Rename to EphyBrowser and add sanity

2003-10-27  Marco Pesenti Gritti  <marco@gnome.org>

        * embed/mozilla/EphyBrowser.cpp:
        * embed/mozilla/EphyBrowser.h:
        * embed/mozilla/EphyWrapper.cpp:
        * embed/mozilla/EphyWrapper.h:
        * embed/mozilla/EventContext.cpp:
        * embed/mozilla/EventContext.h:
        * embed/mozilla/Makefile.am:
        * embed/mozilla/mozilla-embed-persist.cpp:
        * embed/mozilla/mozilla-embed.cpp:
        * embed/mozilla/mozilla-embed.h:

        Solving the wrapper mess Episode 3.
        Rename to EphyBrowser and add sanity checks.
        GtkMozEmbed initialize the browser on realize, that
        means until that we shouldnt use most of the EphyBrowser
        methods. I'm quite sure there are not such cases in
        current implementation, otherwise we would have had
        problems also before. Though better avoid problems
        in the future.

1 files changed, 3 insertions, 3 deletions

diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp
index 061448aa8..1ef9de9eb 100644
--- a/embed/mozilla/EventContext.cpp
+++ b/embed/mozilla/EventContext.cpp
@@ -56,9 +56,9 @@ EventContext::~EventContext ()
 {
 }
 
-nsresult EventContext::Init (EphyWrapper *wrapper)
+nsresult EventContext::Init (EphyBrowser *browser)
 {
-	mWrapper = wrapper;
+	mBrowser = browser;
 	mDOMDocument = nsnull;
 
 	return NS_OK;
@@ -771,7 +771,7 @@ nsresult EventContext::IsPageFramed (nsIDOMNode *node, PRBool *Framed)
 	nsresult result;
 	
 	nsCOMPtr<nsIDOMDocument> mainDocument;
-	result = mWrapper->GetDocument (getter_AddRefs(mainDocument));
+	result = mBrowser->GetDocument (getter_AddRefs(mainDocument));
 	if (NS_FAILED(result) || !mainDocument) return NS_ERROR_FAILURE;
 	
 	nsCOMPtr<nsIDOMDocument> nodeDocument;