summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2012-08-19 11:33:37 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2012-08-19 11:33:37 +0100
commit65e825c0c5d10820e66a7907ceb64afaae1e533d (patch)
tree2e19dcf2dac8dd02a34a2d66ab683a78191a58d4 /desktop
parentc4b284e43c1aad1d825152de89ab2894df1fac3f (diff)
downloadnetsurf-65e825c0c5d10820e66a7907ceb64afaae1e533d.tar.gz
netsurf-65e825c0c5d10820e66a7907ceb64afaae1e533d.tar.bz2
Handle choice of whether to show status for loading content or request content.
Diffstat (limited to 'desktop')
-rw-r--r--desktop/browser.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/desktop/browser.c b/desktop/browser.c
index 64b35bb67..e7d39fd8b 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -1328,8 +1328,17 @@ nserror browser_window_callback(hlcache_handle *c,
case CONTENT_MSG_STATUS:
if (event->data.explicit_status_text == NULL) {
/* Object content's status text updated */
- browser_window_set_status(bw,
- content_get_status_message(c));
+ const char *status = NULL;
+ if (bw->loading_content != NULL)
+ /* Give preference to any loading content */
+ status = content_get_status_message(
+ bw->loading_content);
+
+ if (status == NULL)
+ status = content_get_status_message(c);
+
+ if (status != NULL)
+ browser_window_set_status(bw, status);
} else {
/* Object content wants to set explicit message */
browser_window_set_status(bw,