diff options
| author | Xan Lopez <xan@gnome.org> | 2009-06-02 23:56:28 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@gnome.org> | 2009-06-03 00:08:50 +0800 |
| commit | a62be2bb0ad051a60b99b02e39c58f96dd5b3b9e (patch) | |
| tree | c551691573045b474c0cb894cc98ba4dbd5fc6bb /src | |
| parent | 9f4b66ef75418ea4f51179432f4d5aeca4e586ed (diff) | |
| download | gsoc2013-epiphany-a62be2bb0ad051a60b99b02e39c58f96dd5b3b9e.tar.gz gsoc2013-epiphany-a62be2bb0ad051a60b99b02e39c58f96dd5b3b9e.tar.zst gsoc2013-epiphany-a62be2bb0ad051a60b99b02e39c58f96dd5b3b9e.zip | |
Move load_url method to EphyWebView.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ephy-shell.c | 3 | ||||
| -rw-r--r-- | src/ephy-window.c | 4 | ||||
| -rw-r--r-- | src/epiphany.defs | 9 | ||||
| -rw-r--r-- | src/popup-commands.c | 8 |
4 files changed, 7 insertions, 17 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c index f9f11387e..0c013b804 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -396,8 +396,7 @@ load_homepage (EphyEmbed *embed) } is_empty = url_is_empty (home); - - ephy_embed_load_url (embed, home); + ephy_web_view_load_url (EPHY_WEB_VIEW (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed)), home); g_free (home); diff --git a/src/ephy-window.c b/src/ephy-window.c index 3f0c4f497..2df66b244 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -3598,7 +3598,7 @@ ephy_window_open_link (EphyLink *link, } else { - ephy_embed_load_url (embed, address); + ephy_web_view_load_url (EPHY_WEB_VIEW (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed)), address); if (address == NULL || address[0] == '\0' || strcmp (address, "about:blank") == 0) { @@ -3990,7 +3990,7 @@ real_get_active_tab (EphyWindow *window, int page_num) * @url: the url to load * * Loads a new url in the active tab of @window. - * Unlike ephy_embed_load_url(), this function activates + * Unlike ephy_web_view_load_url(), this function activates * the embed. * **/ diff --git a/src/epiphany.defs b/src/epiphany.defs index b0c439fe5..8465d3a28 100644 --- a/src/epiphany.defs +++ b/src/epiphany.defs @@ -951,15 +951,6 @@ (return-type "GType") ) -(define-method load_url - (of-object "EphyEmbed") - (c-name "ephy_embed_load_url") - (return-type "none") - (parameters - '("const-char*" "url") - ) -) - (define-method get_title (of-object "EphyEmbed") (c-name "ephy_embed_get_title") diff --git a/src/popup-commands.c b/src/popup-commands.c index 503e6cc4f..31203237e 100644 --- a/src/popup-commands.c +++ b/src/popup-commands.c @@ -25,10 +25,12 @@ #include "ephy-embed-container.h" #include "ephy-embed-factory.h" #include "ephy-embed-persist.h" +#include "ephy-embed-utils.h" #include "ephy-prefs.h" #include "eel-gconf-extensions.h" #include "ephy-file-helpers.h" #include "ephy-bookmarks-ui.h" +#include "ephy-web-view.h" #include <string.h> #include <glib/gi18n.h> @@ -248,8 +250,7 @@ popup_cmd_open_link (GtkAction *action, event = ephy_window_get_context_event (window); value = ephy_embed_event_get_property (event, "link"); location = g_value_get_string (value); - - ephy_embed_load_url (embed, location); + ephy_web_view_load_url (EPHY_WEB_VIEW (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed)), location); } void @@ -373,8 +374,7 @@ popup_cmd_open_frame (GtkAction *action, g_return_if_fail (embed != NULL); location = ephy_embed_get_location (embed, FALSE); - - ephy_embed_load_url (embed, location); + ephy_web_view_load_url (EPHY_WEB_VIEW (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed)), location); g_free (location); } |