summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2012-08-15 19:00:50 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2012-08-15 19:00:50 +0100
commite5374cc042645cc03bccb37fea0730d88a5ae879 (patch)
treee8ce7553d44292bb54f21ab5c637e5ab621cc9f5 /desktop
parent5fb51a0fb76707e1b5dac4bbe04613d0396d7bc0 (diff)
downloadnetsurf-e5374cc042645cc03bccb37fea0730d88a5ae879.tar.gz
netsurf-e5374cc042645cc03bccb37fea0730d88a5ae879.tar.bz2
Let contents broadcast explicit status messages as well as announce that their internal status has been updated.
Diffstat (limited to 'desktop')
-rw-r--r--desktop/browser.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/desktop/browser.c b/desktop/browser.c
index 73fcc0490..b7869859f 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -1323,7 +1323,15 @@ nserror browser_window_callback(hlcache_handle *c,
break;
case CONTENT_MSG_STATUS:
- browser_window_set_status(bw, content_get_status_message(c));
+ if (event->data.explicit_status_text == NULL) {
+ /* Object content's status text updated */
+ browser_window_set_status(bw,
+ content_get_status_message(c));
+ } else {
+ /* Object content wants to set explicit message */
+ browser_window_set_status(bw,
+ event->data.explicit_status_text);
+ }
break;
case CONTENT_MSG_REFORMAT: