Refactor initialization some more.

5 files changed, 43 insertions, 19 deletions

diff --git a/python/hulahop.defs b/python/hulahop.defs
index cad4a28..d07bf16 100644
--- a/python/hulahop.defs
+++ b/python/hulahop.defs
@@ -5,6 +5,12 @@
   (gtype-id "HULAHOP_TYPE_WEB_VIEW")
 )
 
+(define-virtual setup
+  (of-object "HulahopWebView")
+  (c-name "hulahop_web_view_setup")
+  (return-type "none")
+)
+
 (define-method grab_focus
   (of-object "HulahopWebView")
   (c-name "hulahop_web_view_grab_focus")
diff --git a/python/webview.py b/python/webview.py
index c257f9c..3cccde6 100644
--- a/python/webview.py
+++ b/python/webview.py
@@ -227,6 +227,13 @@ class WebView(_hulahop.WebView):
                                            interfaces.nsIWebProgressListener)
 
         self._status = ''
+        self._first_uri = None
+
+    def do_setup(self):
+        _hulahop.WebView.do_setup(self)
+
+        if self._first_uri:
+            self.load_uri(self._first_uri)
 
     def _notify_title_changed(self):
         self.notify('title')
@@ -261,9 +268,12 @@ class WebView(_hulahop.WebView):
         return self.browser.contentDOMWindow
 
     def load_uri(self, uri):
-        self.web_navigation.loadURI(
-                    uri, interfaces.nsIWebNavigation.LOAD_FLAGS_NONE,
-                    None, None, None)
+        try:
+            self.web_navigation.loadURI(
+                        uri, interfaces.nsIWebNavigation.LOAD_FLAGS_NONE,
+                        None, None, None)
+        except xpcom.Exception:
+            self._first_uri = uri
 
     dom_window = property(get_dom_window)
     browser = property(get_browser)
diff --git a/src/hulahop-web-view.cpp b/src/hulahop-web-view.cpp
index 2317823..9104b20 100644
--- a/src/hulahop-web-view.cpp
+++ b/src/hulahop-web-view.cpp
@@ -49,10 +49,6 @@ struct _HulahopWebView {
     GtkWidget *mozilla_widget;
 };
 
-struct _HulahopWebViewClass {
-	GtkBinClass base_class;
-};
-
 G_DEFINE_TYPE(HulahopWebView, hulahop_web_view, GTK_TYPE_BIN)
 
 static GObjectClass *parent_class = NULL;
@@ -95,6 +91,13 @@ hulahop_web_view_unrealize(GtkWidget *widget)
     GTK_WIDGET_CLASS(parent_class)->unrealize(widget);
 }
 
+void
+hulahop_web_view_setup(HulahopWebView *web_view)
+{
+    web_view->base_window->Create();
+    web_view->mozilla_widget = GTK_BIN(web_view)->child;
+}
+
 static void
 hulahop_web_view_realize(GtkWidget *widget)
 {
@@ -126,10 +129,11 @@ hulahop_web_view_realize(GtkWidget *widget)
     if (web_view->mozilla_widget) {
         gtk_widget_reparent(web_view->mozilla_widget, widget);
     } else {
-        web_view->base_window->Create();
-        web_view->mozilla_widget = GTK_BIN(web_view)->child;
+        HULAHOP_WEB_VIEW_GET_CLASS(web_view)->setup(web_view);
     }
 
+    g_assert(web_view->mozilla_widget);
+
     g_signal_connect_object(web_view->mozilla_widget,
                             "focus-in-event",
                             G_CALLBACK(child_focus_in_cb),
@@ -231,7 +235,9 @@ hulahop_web_view_class_init(HulahopWebViewClass *web_view_class)
     widget_class->unmap = hulahop_web_view_unmap;
     widget_class->size_allocate = hulahop_web_view_size_allocate;
 
-    gobject_class->dispose = hulahop_web_view_dispose;    
+    gobject_class->dispose = hulahop_web_view_dispose;
+
+    web_view_class->setup = hulahop_web_view_setup;
 }
 
 static void
@@ -239,8 +245,6 @@ hulahop_web_view_init(HulahopWebView *web_view)
 {
     web_view->offscreen_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     gtk_widget_realize(web_view->offscreen_window);
-
-    nsresult rv;
     
     web_view->browser = do_CreateInstance
             ("@mozilla.org/embedding/browser/nsWebBrowser;1");
@@ -250,8 +254,11 @@ hulahop_web_view_init(HulahopWebView *web_view)
     item->SetItemType(nsIDocShellTreeItem::typeContentWrapper);
 
     web_view->base_window = do_QueryInterface(web_view->browser);
+    g_assert(web_view->base_window);
 
+    nsresult rv;
     rv = web_view->base_window->InitWindow(web_view, nsnull, 0, 0, 100, 100);
+    g_assert(NS_SUCCEEDED(rv));
 
     GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(web_view), GTK_NO_WINDOW);
 }
diff --git a/src/hulahop-web-view.h b/src/hulahop-web-view.h
index f54fecf..cd3b710 100644
--- a/src/hulahop-web-view.h
+++ b/src/hulahop-web-view.h
@@ -35,6 +35,12 @@ typedef struct _HulahopWebViewClass       HulahopWebViewClass;
 #define HULAHOP_IS_WEB_VIEW_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE((klass), HULAHOP_TYPE_WEB_VIEW))
 #define HULAHOP_WEB_VIEW_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), HULAHOP_TYPE_WEB_VIEW, HulahopWebViewClass))
 
+struct _HulahopWebViewClass {
+    GtkBinClass base_class;
+
+    void (* setup) (HulahopWebView *web_view);
+};
+
 GType     hulahop_web_view_get_type        (void);
 void      hulahop_web_view_grab_focus      (HulahopWebView *web_view);
 
diff --git a/tests/test-web-view.py b/tests/test-web-view.py
index 0d3574f..86038e3 100644
--- a/tests/test-web-view.py
+++ b/tests/test-web-view.py
@@ -11,12 +11,7 @@ def quit(window):
     gtk.main_quit()
 
 def entry_activate_cb(entry):
-    from xpcom import components
-    from xpcom.components import interfaces
-
-    cls = components.classes['@sugarlabs.org/add-cert-exception;1']
-    cert_exception = cls.createInstance(interfaces.hulahopAddCertException)
-    cert_exception.showDialog(web_view.dom_window)
+    web_view.load_uri(entry.get_text())
 
 window = gtk.Window()
 window.set_default_size(600, 400)
@@ -30,7 +25,7 @@ vbox.pack_start(entry, False)
 entry.show()
 
 web_view = WebView()
-web_view.load_uri('https://mozilla.org')
+web_view.load_uri('http://www.gnome.org')
 vbox.pack_start(web_view)
 web_view.show()