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/popup-commands.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/popup-commands.c')
-rw-r--r-- | src/popup-commands.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/popup-commands.c b/src/popup-commands.c index 6d8a1c4a7..ac5e5ee43 100644 --- a/src/popup-commands.c +++ b/src/popup-commands.c @@ -25,6 +25,7 @@ #include "popup-commands.h" #include "ephy-shell.h" #include "ephy-new-bookmark.h" +#include "ephy-embed-factory.h" #include "ephy-embed-persist.h" #include "ephy-prefs.h" #include "eel-gconf-extensions.h" @@ -282,8 +283,10 @@ save_property_url (GtkAction *action, ephy_embed_event_get_property (info, property, &value); location = g_value_get_string (value); - persist = ephy_embed_persist_new (embed); + persist = EPHY_EMBED_PERSIST + (ephy_embed_factory_new_object ("EphyEmbedPersist")); + ephy_embed_persist_set_embed (persist, embed); ephy_embed_persist_set_fc_title (persist, title); ephy_embed_persist_set_fc_parent (persist,GTK_WINDOW (window)); ephy_embed_persist_set_flags @@ -373,11 +376,13 @@ popup_cmd_set_image_as_background (GtkAction *action, ephy_embed_event_get_property (info, "image", &value); location = g_value_get_string (value); - persist = ephy_embed_persist_new (embed); + persist = EPHY_EMBED_PERSIST + (ephy_embed_factory_new_object ("EphyEmbedPersist")); base = g_path_get_basename (location); dest = g_build_filename (ephy_dot_dir (), base, NULL); + ephy_embed_persist_set_embed (persist, embed); ephy_embed_persist_set_dest (persist, dest); ephy_embed_persist_set_flags (persist, EMBED_PERSIST_NO_VIEW); ephy_embed_persist_set_source (persist, location); |