aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDiego Escalante Urrelo <diegoe@src.gnome.org>2007-10-07 22:19:01 +0800
committerDiego Escalante Urrelo <diegoe@src.gnome.org>2007-10-07 22:19:01 +0800
commitf9fc60cc505114328f9fbf5b4dd480f4087ff51c (patch)
treec70bcf4a35deddc23a6f1729298ecf7235bb1be2 /src
parentcd1e5423e98b5a79204e7bce140f18167e73bb36 (diff)
downloadgsoc2013-epiphany-f9fc60cc505114328f9fbf5b4dd480f4087ff51c.tar
gsoc2013-epiphany-f9fc60cc505114328f9fbf5b4dd480f4087ff51c.tar.gz
gsoc2013-epiphany-f9fc60cc505114328f9fbf5b4dd480f4087ff51c.tar.bz2
gsoc2013-epiphany-f9fc60cc505114328f9fbf5b4dd480f4087ff51c.tar.lz
gsoc2013-epiphany-f9fc60cc505114328f9fbf5b4dd480f4087ff51c.tar.xz
gsoc2013-epiphany-f9fc60cc505114328f9fbf5b4dd480f4087ff51c.tar.zst
gsoc2013-epiphany-f9fc60cc505114328f9fbf5b4dd480f4087ff51c.zip
Makes the Go button behaviour consistent with the "Enter" behaviour. Both
* window-commands.c: Makes the Go button behaviour consistent with the "Enter" behaviour. Both actions search for keywords or load the url. Fixes #484178. svn path=/trunk/; revision=7521
Diffstat (limited to 'src')
-rw-r--r--src/window-commands.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/window-commands.c b/src/window-commands.c
index f72b10143..b4a801e2b 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -946,9 +946,17 @@ window_cmd_load_location (GtkAction *action,
if (location)
{
- ephy_link_open (EPHY_LINK (window), location,
+ EphyBookmarks *bookmarks;
+ char *address;
+
+ bookmarks = ephy_shell_get_bookmarks (ephy_shell_get_default ());
+
+ address = ephy_bookmarks_resolve_address (bookmarks, location, NULL);
+ g_return_if_fail (address != NULL);
+
+ ephy_link_open (EPHY_LINK (window), address,
ephy_window_get_active_tab (window),
- ephy_link_flags_from_current_event ());
+ ephy_link_flags_from_current_event () | EPHY_LINK_ALLOW_FIXUP);
}
}