aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla/mozilla-embed-persist.cpp
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2003-11-22 19:32:34 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2003-11-22 19:32:34 +0800
commita0e702ef16f5e52c9c366713934c07aa3dc2ce7a (patch)
treee9f71380e21af46897b068308cb1983d942f920e /embed/mozilla/mozilla-embed-persist.cpp
parentd961598c3761da5a673acef2d2f7abd33586f1c1 (diff)
downloadgsoc2013-epiphany-a0e702ef16f5e52c9c366713934c07aa3dc2ce7a.tar
gsoc2013-epiphany-a0e702ef16f5e52c9c366713934c07aa3dc2ce7a.tar.gz
gsoc2013-epiphany-a0e702ef16f5e52c9c366713934c07aa3dc2ce7a.tar.bz2
gsoc2013-epiphany-a0e702ef16f5e52c9c366713934c07aa3dc2ce7a.tar.lz
gsoc2013-epiphany-a0e702ef16f5e52c9c366713934c07aa3dc2ce7a.tar.xz
gsoc2013-epiphany-a0e702ef16f5e52c9c366713934c07aa3dc2ce7a.tar.zst
gsoc2013-epiphany-a0e702ef16f5e52c9c366713934c07aa3dc2ce7a.zip
Add a factory to create embed objects and use it. Deal with dependency of
2003-11-22 Marco Pesenti Gritti <marco@gnome.org> * doc/reference/Makefile.am: * embed/Makefile.am: * embed/ephy-embed-persist.c: (ephy_embed_persist_save): * embed/ephy-embed-persist.h: * embed/ephy-embed-popup-control.c: (save_url), (embed_popup_set_image_as_background_cmd): * embed/ephy-embed-shell.c: (ephy_embed_shell_get_embed_single): * embed/ephy-embed.c: * embed/ephy-embed.h: * embed/ephy-favicon-cache.c: (ephy_favicon_cache_download): * embed/mozilla/mozilla-embed-persist.cpp: * embed/mozilla/mozilla-embed-single.cpp: * embed/mozilla/mozilla-embed-single.h: * embed/mozilla/mozilla-embed.cpp: * src/Makefile.am: * src/ephy-nautilus-view.c: (ephy_nautilus_view_instance_init): * src/ephy-tab.c: (ephy_tab_init): * src/popup-commands.c: (save_property_url), (popup_cmd_set_image_as_background): * src/window-commands.c: (window_cmd_file_save_as), (save_temp_source): Add a factory to create embed objects and use it. Deal with dependency of mozilla-embed and mozilla-embed-persist on mozilla-embed-single internally.
Diffstat (limited to 'embed/mozilla/mozilla-embed-persist.cpp')
-rw-r--r--embed/mozilla/mozilla-embed-persist.cpp14
1 files changed, 13 insertions, 1 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;