Handle choice of whether to show status for loading content or request content.

This commit is contained in:
Michael Drake 2012-08-19 11:33:37 +01:00
parent c4b284e43c
commit 65e825c0c5

View File

@ -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,