4 files changed, 27 insertions, 12 deletions
diff --git a/embed/mozilla/mozilla-embed-persist.cpp b/embed/mozilla/mozilla-embed-persist.cpp
index 166942139..2818bb3b4 100644
--- a/embed/mozilla/mozilla-embed-persist.cpp
+++ b/embed/mozilla/mozilla-embed-persist.cpp
@@ -24,6 +24,7 @@
 
 #include "mozilla-embed-persist.h"
 #include "mozilla-embed.h"
+#include "ephy-embed-shell.h"
 #include "EphyBrowser.h"
 #include "EphyHeaderSniffer.h"
 #include "MozDownload.h"
@@ -85,7 +86,6 @@ static void
 mozilla_embed_persist_init (MozillaEmbedPersist *persist)
 {
         persist->priv = MOZILLA_EMBED_PERSIST_GET_PRIVATE (persist);
-
       	persist->priv->mPersist = do_CreateInstance (NS_WEBBROWSERPERSIST_CONTRACTID);
 }
 
@@ -264,6 +264,17 @@ impl_save (EphyEmbedPersist *persist)
 	return TRUE;
 }
 
+static GObject *
+mozilla_embed_persist_constructor (GType type, guint n_construct_properties,
+			           GObjectConstructParam *construct_params)
+{
+	/* we depend on single because of mozilla initialization */
+	ephy_embed_shell_get_embed_single (embed_shell);
+
+	return parent_class->constructor (type, n_construct_properties,
+					  construct_params);
+}
+
 static void
 mozilla_embed_persist_class_init (MozillaEmbedPersistClass *klass)
 {
@@ -273,6 +284,7 @@ mozilla_embed_persist_class_init (MozillaEmbedPersistClass *klass)
         parent_class = (GObjectClass *) g_type_class_peek_parent (klass);
 	
         object_class->finalize = mozilla_embed_persist_finalize;
+	object_class->constructor = mozilla_embed_persist_constructor;
 
 	persist_class->save = impl_save;
 	persist_class->cancel = impl_cancel;
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index a3a88c465..3df1860ad 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -173,12 +173,6 @@ mozilla_embed_single_get_type (void)
         return type;
 }
 
-EphyEmbedSingle *
-mozilla_embed_single_new (void)
-{
-	return EPHY_EMBED_SINGLE (g_object_new (MOZILLA_TYPE_EMBED_SINGLE, NULL));
-}
-
 static gboolean
 mozilla_set_default_prefs (MozillaEmbedSingle *mes)
 {
diff --git a/embed/mozilla/mozilla-embed-single.h b/embed/mozilla/mozilla-embed-single.h
index 08732a837..3e47febeb 100644
--- a/embed/mozilla/mozilla-embed-single.h
+++ b/embed/mozilla/mozilla-embed-single.h
@@ -54,8 +54,6 @@ struct MozillaEmbedSingleClass
 
 GType             mozilla_embed_single_get_type	     (void);
 
-EphyEmbedSingle  *mozilla_embed_single_new	     (void);
-
 G_END_DECLS
 
 #endif
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 497bc3753..1ebec735a 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -19,10 +19,9 @@
  */
 
 #include "mozilla-embed.h"
-
+#include "ephy-embed-shell.h"
 #include "ephy-command-manager.h"
 #include "ephy-string.h"
-#include "ephy-embed.h"
 #include "ephy-debug.h"
 
 #include "MozillaPrivate.h"
@@ -247,6 +246,17 @@ mozilla_embed_realize (GtkWidget *widget)
 	}
 }
 
+static GObject *
+mozilla_embed_constructor (GType type, guint n_construct_properties,
+			   GObjectConstructParam *construct_params)
+{
+	/* we depend on single because of mozilla initialization */
+	ephy_embed_shell_get_embed_single (embed_shell);
+
+	return parent_class->constructor (type, n_construct_properties,
+					  construct_params);
+}
+
 static void
 mozilla_embed_class_init (MozillaEmbedClass *klass)
 {
@@ -256,6 +266,8 @@ mozilla_embed_class_init (MozillaEmbedClass *klass)
 
 	parent_class = (GObjectClass *) g_type_class_peek_parent (klass);
 
+	object_class->constructor = mozilla_embed_constructor;
+
 	gtk_object_class->destroy = mozilla_embed_destroy;
 
 	widget_class->realize = mozilla_embed_realize;
@@ -267,7 +279,6 @@ static void
 mozilla_embed_init (MozillaEmbed *embed)
 {
         embed->priv = MOZILLA_EMBED_GET_PRIVATE (embed);
-
 	embed->priv->browser = new EphyBrowser ();
 	embed->priv->security_state = -1;