diff options
| author | Carlos Garcia Campos <cgarcia@igalia.com> | 2012-05-06 22:47:19 +0800 |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@gnome.org> | 2012-06-21 19:54:16 +0800 |
| commit | 97c91b2fc2059b1e358bb19896203afaa44bfd33 (patch) | |
| tree | 6aa01250a99fa884d177ce3202d8ff41e8e96d74 /src/ephy-shell.c | |
| parent | a8767266443074689200fff9ca43531d88d65aed (diff) | |
| download | gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.tar gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.tar.gz gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.tar.bz2 gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.tar.lz gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.tar.xz gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.tar.zst gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.zip | |
Initial WebKit2 port
It builds and basic functionality works.
Diffstat (limited to 'src/ephy-shell.c')
| -rw-r--r-- | src/ephy-shell.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 8e5b98c12..07a646eb3 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -669,7 +669,11 @@ EphyEmbed * ephy_shell_new_tab_full (EphyShell *shell, EphyWindow *parent_window, EphyEmbed *previous_embed, +#ifdef HAVE_WEBKIT2 + WebKitURIRequest *request, +#else WebKitNetworkRequest *request, +#endif EphyNewTabFlags flags, EphyWebViewChrome chrome, gboolean is_popup, @@ -761,7 +765,11 @@ ephy_shell_new_tab_full (EphyShell *shell, ephy_web_view_load_request (ephy_embed_get_web_view (embed), request); +#ifdef HAVE_WEBKIT2 + is_empty = ephy_embed_utils_url_is_empty (webkit_uri_request_get_uri (request)); +#else is_empty = ephy_embed_utils_url_is_empty (webkit_network_request_get_uri (request)); +#endif } /* Make sure the initial focus is somewhere sensible and not, for @@ -804,7 +812,11 @@ ephy_shell_new_tab (EphyShell *shell, EphyNewTabFlags flags) { EphyEmbed *embed; +#ifdef HAVE_WEBKIT2 + WebKitURIRequest *request = url ? webkit_uri_request_new (url) : NULL; +#else WebKitNetworkRequest *request = url ? webkit_network_request_new (url) : NULL; +#endif embed = ephy_shell_new_tab_full (shell, parent_window, previous_embed, request, flags, |