summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2014-02-08 12:07:13 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2014-02-08 12:07:13 +0000
commitcf84e557fa22ed22671e7d3dc5af8792d115a551 (patch)
tree35e36ae418cd0d7dc1d0f9164b4bc8bb6c1bf560 /gtk
parent41d7084356e0dd1616d771b260ef8c88319cc7f2 (diff)
downloadnetsurf-cf84e557fa22ed22671e7d3dc5af8792d115a551.tar.gz
netsurf-cf84e557fa22ed22671e7d3dc5af8792d115a551.tar.bz2
Simplify browser_window_refresh_url_bar.
Reduces front end need to access bw internals.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/scaffolding.c6
-rw-r--r--gtk/toolbar.c9
2 files changed, 2 insertions, 13 deletions
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index 91cbe1d06..5c649fc56 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -303,11 +303,7 @@ static void nsgtk_window_update_back_forward(struct gtk_scaffolding *g)
nsgtk_scaffolding_set_sensitivity(g);
/* update the url bar, particularly necessary when tabbing */
- if (bw->current_content != NULL &&
- hlcache_handle_get_url(bw->current_content) != NULL)
- browser_window_refresh_url_bar(bw,
- hlcache_handle_get_url(bw->current_content),
- bw->frag_id);
+ browser_window_refresh_url_bar(bw);
/* update the local history window, as well as queuing a redraw
* for it.
diff --git a/gtk/toolbar.c b/gtk/toolbar.c
index 8cff4ed18..936c8c5b2 100644
--- a/gtk/toolbar.c
+++ b/gtk/toolbar.c
@@ -429,14 +429,7 @@ void nsgtk_toolbar_close(nsgtk_scaffolding *g)
current_content) != NULL))
browser_window_refresh_url_bar(
nsgtk_get_browser_window(
- nsgtk_scaffolding_top_level(list)),
- hlcache_handle_get_url(
- nsgtk_get_browser_window(
- nsgtk_scaffolding_top_level(list))->
- current_content),
- nsgtk_get_browser_window(
- nsgtk_scaffolding_top_level(list))->
- frag_id);
+ nsgtk_scaffolding_top_level(list)));
if (list != g)
gtk_widget_set_sensitive(GTK_WIDGET(