diff options
| author | Xan Lopez <xan@gnome.org> | 2009-05-31 00:21:03 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@gnome.org> | 2009-05-31 00:21:03 +0800 |
| commit | 3191345e4aafa9ae92c676468e588b6d1df2862c (patch) | |
| tree | f2cd7b8ab212fca19fa745966156ce58c1d31384 /src | |
| parent | d94e4eca61821f956c67e6a519c36be083dd794d (diff) | |
| download | gsoc2013-epiphany-3191345e4aafa9ae92c676468e588b6d1df2862c.tar gsoc2013-epiphany-3191345e4aafa9ae92c676468e588b6d1df2862c.tar.gz gsoc2013-epiphany-3191345e4aafa9ae92c676468e588b6d1df2862c.tar.bz2 gsoc2013-epiphany-3191345e4aafa9ae92c676468e588b6d1df2862c.tar.lz gsoc2013-epiphany-3191345e4aafa9ae92c676468e588b6d1df2862c.tar.xz gsoc2013-epiphany-3191345e4aafa9ae92c676468e588b6d1df2862c.tar.zst gsoc2013-epiphany-3191345e4aafa9ae92c676468e588b6d1df2862c.zip | |
Move method to copy history between embeds/views to EphyWebView from EphyEmbed.
Just part of the gradual progress to get rid of the Embed interface.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ephy-shell.c | 8 | ||||
| -rw-r--r-- | src/ephy-window.c | 9 | ||||
| -rw-r--r-- | src/epiphany.defs | 12 |
3 files changed, 7 insertions, 22 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 1052b59d3..f957f3c47 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -56,6 +56,7 @@ #include "ephy-gui.h" #include "ephy-stock-icons.h" #include "ephy-embed-factory.h" +#include "ephy-web-view.h" #ifdef ENABLE_NETWORK_MANAGER #include "ephy-net-monitor.h" @@ -491,11 +492,8 @@ ephy_shell_new_tab_full (EphyShell *shell, if (previous_embed != NULL) { - ephy_embed_shistory_copy (previous_embed, - embed, - TRUE, /* back history */ - TRUE, /* forward history */ - FALSE); /* current index */ + ephy_web_view_copy_back_history (EPHY_WEB_VIEW (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (previous_embed)), + EPHY_WEB_VIEW (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed))); } ephy_gui_window_update_user_time (GTK_WIDGET (window), user_time); diff --git a/src/ephy-window.c b/src/ephy-window.c index 68b0573ba..3f0c4f497 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -57,6 +57,7 @@ #include "ephy-embed-persist.h" #include "ephy-embed-factory.h" #include "ephy-location-entry.h" +#include "ephy-web-view.h" #include <string.h> #include <glib/gi18n.h> @@ -2264,11 +2265,9 @@ open_link_in_new (EphyWindow *window, if (dest) { - ephy_embed_shistory_copy (embed, - dest, - TRUE, /* back history */ - FALSE, /* forward history */ - FALSE); /* current index */ + ephy_web_view_copy_back_history (EPHY_WEB_VIEW (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed)), + EPHY_WEB_VIEW (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (dest))); + return TRUE; } diff --git a/src/epiphany.defs b/src/epiphany.defs index ca5785480..b0c439fe5 100644 --- a/src/epiphany.defs +++ b/src/epiphany.defs @@ -1081,18 +1081,6 @@ (return-type "none") ) -(define-method shistory_copy - (of-object "EphyEmbed") - (c-name "ephy_embed_shistory_copy") - (return-type "none") - (parameters - '("EphyEmbed*" "dest") - '("gboolean" "copy_back") - '("gboolean" "copy_forward") - '("gboolean" "copy_current") - ) -) - (define-method show_page_certificate (of-object "EphyEmbed") (c-name "ephy_embed_show_page_certificate") |