diff options
author | Jean-François Rameau <jframeau@cvs.gnome.org> | 2006-10-23 01:08:06 +0800 |
---|---|---|
committer | Jean-François Rameau <jframeau@src.gnome.org> | 2006-10-23 01:08:06 +0800 |
commit | f2d423a34e23b3d785fab96c9c14925bdbe16591 (patch) | |
tree | 9bea04c2dc966a64887bd56796bc08c6051038f1 /src/ephy-window.c | |
parent | 461daa07586775c39d72c22287e0ab1fd1f9cf34 (diff) | |
download | gsoc2013-epiphany-f2d423a34e23b3d785fab96c9c14925bdbe16591.tar gsoc2013-epiphany-f2d423a34e23b3d785fab96c9c14925bdbe16591.tar.gz gsoc2013-epiphany-f2d423a34e23b3d785fab96c9c14925bdbe16591.tar.bz2 gsoc2013-epiphany-f2d423a34e23b3d785fab96c9c14925bdbe16591.tar.lz gsoc2013-epiphany-f2d423a34e23b3d785fab96c9c14925bdbe16591.tar.xz gsoc2013-epiphany-f2d423a34e23b3d785fab96c9c14925bdbe16591.tar.zst gsoc2013-epiphany-f2d423a34e23b3d785fab96c9c14925bdbe16591.zip |
Get keyword search back by passing ALLOW_THIRD_PARTY_FIXUP flag to gecko.
2006-10-22 Jean-François Rameau <jframeau@cvs.gnome.org>
* embed/ephy-embed.h:
* embed/ephy-embed.c:
* embed/mozilla/EphyBrowser.cpp:
* embed/mozilla/EphyBrowser.h:
* embed/mozilla/mozilla-embed.cpp:
* src/ephy-link.h:
* src/ephy-location-action.c: (action_activated_cb):
* src/ephy-shell.c: (ephy_shell_new_tab_full):
* src/ephy-shell.h:
* src/ephy-window.c: (ephy_window_open_link):
Get keyword search back by passing ALLOW_THIRD_PARTY_FIXUP flag to gecko.
Add a new load method to EphyEmbed to custom load behaviour and pass (optional) referrer.
Fix bug #350053.
Diffstat (limited to 'src/ephy-window.c')
-rw-r--r-- | src/ephy-window.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c index 04539f2b9..000c0fbab 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -2970,7 +2970,9 @@ ephy_window_open_link (EphyLink *link, tab = ephy_window_get_active_tab (window); } - if (flags != 0) + if (flags & (EPHY_LINK_JUMP_TO | + EPHY_LINK_NEW_TAB | + EPHY_LINK_NEW_WINDOW)) { EphyNewTabFlags ntflags = EPHY_NEW_TAB_OPEN_PAGE; @@ -2987,6 +2989,10 @@ ephy_window_open_link (EphyLink *link, { ntflags |= EPHY_NEW_TAB_IN_EXISTING_WINDOW; } + if (flags & EPHY_LINK_ALLOW_FIXUP) + { + ntflags |= EPHY_NEW_TAB_ALLOW_FIXUP; + } new_tab = ephy_shell_new_tab (ephy_shell, @@ -2999,7 +3005,17 @@ ephy_window_open_link (EphyLink *link, embed = ephy_tab_get_embed (tab); - ephy_embed_load_url (embed, address); + if (flags & EPHY_LINK_ALLOW_FIXUP) + { + ephy_embed_load (embed, + address, + EPHY_EMBED_LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP, + NULL); + } + else + { + ephy_embed_load_url (embed, address); + } if (address == NULL || address[0] == '\0' || strcmp (address, "about:blank") == 0) { |