diff options
| author | Marco Pesenti Gritti <marco@gnome.org> | 2003-11-22 19:32:34 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2003-11-22 19:32:34 +0800 |
| commit | a0e702ef16f5e52c9c366713934c07aa3dc2ce7a (patch) | |
| tree | e9f71380e21af46897b068308cb1983d942f920e /src/ephy-tab.c | |
| parent | d961598c3761da5a673acef2d2f7abd33586f1c1 (diff) | |
| download | gsoc2013-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 'src/ephy-tab.c')
| -rw-r--r-- | src/ephy-tab.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/ephy-tab.c b/src/ephy-tab.c index ac8859f69..def1e741b 100644 --- a/src/ephy-tab.c +++ b/src/ephy-tab.c @@ -26,6 +26,7 @@ #include "ephy-shell.h" #include "eel-gconf-extensions.h" #include "ephy-prefs.h" +#include "ephy-embed-factory.h" #include "ephy-embed-prefs.h" #include "ephy-debug.h" #include "ephy-string.h" @@ -1035,15 +1036,11 @@ static void ephy_tab_init (EphyTab *tab) { GObject *embed, *embed_widget; - EphyEmbedSingle *single; EphyFaviconCache *cache; char *id; LOG ("EphyTab initialising %p", tab) - single = ephy_embed_shell_get_embed_single - (EPHY_EMBED_SHELL (ephy_shell)); - tab->priv = EPHY_TAB_GET_PRIVATE (tab); tab->priv->window = NULL; @@ -1065,7 +1062,8 @@ ephy_tab_init (EphyTab *tab) tab->priv->setting_zoom = FALSE; tab->priv->address_expire = TAB_ADDRESS_EXPIRE_NOW; - tab->priv->embed = ephy_embed_new (G_OBJECT(single)); + tab->priv->embed = EPHY_EMBED + (ephy_embed_factory_new_object ("EphyEmbed")); g_assert (tab->priv->embed != NULL); embed = G_OBJECT (tab->priv->embed); |