diff options
| author | Xan Lopez <xan@gnome.org> | 2009-09-07 20:28:28 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@gnome.org> | 2009-09-07 20:31:04 +0800 |
| commit | 7d58850eb100ff84bb2fe3f48658e01f64bb088c (patch) | |
| tree | ff3e0aa65c9225039d3a2c9799fd41d575d25db3 /src | |
| parent | 108eade49982245d1ffcf30159707554cdb63d69 (diff) | |
| download | gsoc2013-epiphany-7d58850eb100ff84bb2fe3f48658e01f64bb088c.tar.gz gsoc2013-epiphany-7d58850eb100ff84bb2fe3f48658e01f64bb088c.tar.zst gsoc2013-epiphany-7d58850eb100ff84bb2fe3f48658e01f64bb088c.zip | |
Simplify EXPIRE logic in ephy_web_view_set_typed_address
The whole thing just had one functionality at this point as far as I
can see: prevent the typed address from being wiped out when a page
is loading. Simplify the code to do just that.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ephy-lockdown.c | 3 | ||||
| -rw-r--r-- | src/ephy-shell.c | 3 | ||||
| -rw-r--r-- | src/ephy-toolbar.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/ephy-lockdown.c b/src/ephy-lockdown.c index 98627e722..f11d7b086 100644 --- a/src/ephy-lockdown.c +++ b/src/ephy-lockdown.c @@ -106,8 +106,7 @@ update_location_editable (EphyWindow *window, { address = ephy_web_view_get_location (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed), TRUE); ephy_toolbar_set_location (EPHY_TOOLBAR (toolbar), address, NULL); - ephy_web_view_set_typed_address (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed), NULL, - EPHY_WEB_VIEW_ADDRESS_EXPIRE_CURRENT); + ephy_web_view_set_typed_address (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed), NULL); g_free (address); } } diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 0d37e609f..38c0c1a69 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -515,8 +515,7 @@ ephy_shell_new_tab_full (EphyShell *shell, if (flags & EPHY_NEW_TAB_HOME_PAGE || flags & EPHY_NEW_TAB_NEW_PAGE) { - ephy_web_view_set_typed_address (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed), "", - EPHY_WEB_VIEW_ADDRESS_EXPIRE_NEXT); + ephy_web_view_set_typed_address (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed), ""); ephy_toolbar_activate_location (toolbar); is_empty = load_homepage (embed); } diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c index e91b8ed62..61a34fccc 100644 --- a/src/ephy-toolbar.c +++ b/src/ephy-toolbar.c @@ -183,8 +183,7 @@ sync_user_input_cb (EphyLocationAction *action, address = ephy_location_action_get_address (action); priv->updating_address = TRUE; - ephy_web_view_set_typed_address (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed), address, - EPHY_WEB_VIEW_ADDRESS_EXPIRE_CURRENT); + ephy_web_view_set_typed_address (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed), address); priv->updating_address = FALSE; } |