From e5374cc042645cc03bccb37fea0730d88a5ae879 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Wed, 15 Aug 2012 19:00:50 +0100 Subject: Let contents broadcast explicit status messages as well as announce that their internal status has been updated. --- desktop/browser.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'desktop') 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: -- cgit v1.2.3