Gitweb links:

...log 
http://git.netsurf-browser.org/netsurf.git/shortlog/e5928ebd5f842dc5ae66543f628af0cede4397bd
...commit 
http://git.netsurf-browser.org/netsurf.git/commit/e5928ebd5f842dc5ae66543f628af0cede4397bd
...tree 
http://git.netsurf-browser.org/netsurf.git/tree/e5928ebd5f842dc5ae66543f628af0cede4397bd

The branch, master has been updated
       via  e5928ebd5f842dc5ae66543f628af0cede4397bd (commit)
       via  e5374cc042645cc03bccb37fea0730d88a5ae879 (commit)
       via  5fb51a0fb76707e1b5dac4bbe04613d0396d7bc0 (commit)
       via  fcb7143ecb0c1acedfb30d34931896dbefc660b1 (commit)
      from  a3ef5c2c3c448f6ded44b4135a1a745721653230 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commitdiff 
http://git.netsurf-browser.org/netsurf.git/commitdiff/e5928ebd5f842dc5ae66543f628af0cede4397bd
commit e5928ebd5f842dc5ae66543f628af0cede4397bd
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>

    Broadcast explict status messages for mouse hovers via content msg system, 
rather than using the browser window.

diff --git a/render/html_interaction.c b/render/html_interaction.c
index 190952c..6b5cef2 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -197,6 +197,7 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
        int scroll_mouse_x = 0, scroll_mouse_y = 0;
        int padding_left, padding_right, padding_top, padding_bottom;
        browser_drag_type drag_type = browser_window_get_drag_type(bw);
+       union content_msg_data msg_data;
 
        if (drag_type != DRAGGING_NONE && !mouse &&
                        html->visible_select_menu != NULL) {
@@ -214,9 +215,10 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
                                box->padding[BOTTOM] + box->padding[TOP];
                status = form_select_mouse_action(html->visible_select_menu,
                                mouse, x - box_x, y - box_y);
-               if (status != NULL)
-                       browser_window_set_status(bw, status);
-               else {
+               if (status != NULL) {
+                       msg_data.explicit_status_text = status;
+                       content_broadcast(c, CONTENT_MSG_STATUS, msg_data);
+               } else {
                        int width, height;
                        form_select_get_dimensions(html->visible_select_menu,
                                        &width, &height);
@@ -252,8 +254,9 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
                        status = scrollbar_mouse_action(html->scrollbar, mouse, 
                                        scroll_mouse_x, scroll_mouse_y);
                }
-               
-               browser_window_set_status(bw, status);
+
+               msg_data.explicit_status_text = status;
+               content_broadcast(c, CONTENT_MSG_STATUS, msg_data);
                return;
        }
 
@@ -685,8 +688,10 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
        if (action == ACTION_SUBMIT || action == ACTION_GO)
                bw->last_action = wallclock();
 
-       if (status != NULL)
-               browser_window_set_status(bw, status);
+       if (status != NULL) {
+               msg_data.explicit_status_text = status;
+               content_broadcast(c, CONTENT_MSG_STATUS, msg_data);
+       }
 
        if (!iframe)
                browser_window_set_pointer(bw, pointer);


commitdiff 
http://git.netsurf-browser.org/netsurf.git/commitdiff/e5374cc042645cc03bccb37fea0730d88a5ae879
commit e5374cc042645cc03bccb37fea0730d88a5ae879
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>

    Let contents broadcast explicit status messages as well as announce that 
their internal status has been updated.

diff --git a/content/content.c b/content/content.c
index 8b089cd..758a615 100644
--- a/content/content.c
+++ b/content/content.c
@@ -169,6 +169,7 @@ nserror content_llcache_callback(llcache_handle *llcache,
                (void) llcache_handle_get_source_data(llcache, &source_size);
 
                content_set_status(c, messages_get("Processing"));
+               msg_data.explicit_status_text = NULL;
                content_broadcast(c, CONTENT_MSG_STATUS, msg_data);
 
                content_convert(c);
@@ -182,6 +183,7 @@ nserror content_llcache_callback(llcache_handle *llcache,
                break;
        case LLCACHE_EVENT_PROGRESS:
                content_set_status(c, event->data.msg);
+               msg_data.explicit_status_text = NULL;
                content_broadcast(c, CONTENT_MSG_STATUS, msg_data);
                break;
        }
diff --git a/content/content.h b/content/content.h
index ab569dd..f1ff2a2 100644
--- a/content/content.h
+++ b/content/content.h
@@ -107,9 +107,13 @@ union content_msg_data {
                int object_width, object_height;
        } redraw;
        /** CONTENT_MSG_REFRESH - Minimum delay  */
-       int delay;      
+       int delay;
        /** CONTENT_MSG_REFORMAT - Reformat should not cause a redraw */
        bool background;
+       /** CONTENT_MSG_STATUS - Status message update.  If NULL, the content's
+        * internal status text has been updated, and listener should use
+        * content_get_status_message() */
+       const char *explicit_status_text;
        /** CONTENT_MSG_DOWNLOAD - Low-level cache handle */
        struct llcache_handle *download;
        /** CONTENT_MSG_RFC5988_LINK - rfc5988 link data   */
diff --git a/desktop/browser.c b/desktop/browser.c
index 73fcc04..b786985 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:
diff --git a/render/html.c b/render/html.c
index fc2f2b8..7f3c761 100644
--- a/render/html.c
+++ b/render/html.c
@@ -240,6 +240,7 @@ void html_finish_conversion(html_content *c)
        /* convert xml tree to box tree */
        LOG(("XML to box (%p)", c));
        content_set_status(&c->base, messages_get("Processing"));
+       msg_data.explicit_status_text = NULL;
        content_broadcast(&c->base, CONTENT_MSG_STATUS, msg_data);
 
        exc = dom_document_get_document_element(c->document, (void *) &html);
@@ -1168,14 +1169,18 @@ html_object_callback(hlcache_handle *object,
                LOG(("%d fetches active", c->base.active));
 
                content_add_error(&c->base, "?", 0);
-               html_set_status(c, event->data.error);
-               content_broadcast(&c->base, CONTENT_MSG_STATUS, event->data);
                html_object_failed(box, c, o->background);
                break;
 
        case CONTENT_MSG_STATUS:
-               html_set_status(c, content_get_status_message(object));
-               /* content_broadcast(&c->base, CONTENT_MSG_STATUS, 0); */
+               if (event->data.explicit_status_text == NULL) {
+                       /* Object content's status text updated */
+                       html_set_status(c, content_get_status_message(object));
+               } else {
+                       /* Object content wants to set explicit message */
+                       content_broadcast(&c->base, CONTENT_MSG_STATUS,
+                                       event->data);
+               }
                break;
 
        case CONTENT_MSG_REFORMAT:
@@ -1406,9 +1411,17 @@ html_convert_css_callback(hlcache_handle *css,
                break;
 
        case CONTENT_MSG_STATUS:
-               html_set_status(parent, content_get_status_message(css));
-               content_broadcast(&parent->base, CONTENT_MSG_STATUS,
-                               event->data);
+               if (event->data.explicit_status_text == NULL) {
+                       /* Object content's status text updated */
+                       html_set_status(parent,
+                                       content_get_status_message(css));
+                       content_broadcast(&parent->base, CONTENT_MSG_STATUS,
+                                       event->data);
+               } else {
+                       /* Object content wants to set explicit message */
+                       content_broadcast(&parent->base, CONTENT_MSG_STATUS,
+                                       event->data);
+               }
                break;
 
        default:
diff --git a/render/html_script.c b/render/html_script.c
index 44b661d..446868b 100644
--- a/render/html_script.c
+++ b/render/html_script.c
@@ -188,9 +188,6 @@ convert_script_async_cb(hlcache_handle *script,
                break;
 
        case CONTENT_MSG_STATUS:
-               html_set_status(parent, content_get_status_message(script));
-               content_broadcast(&parent->base, CONTENT_MSG_STATUS,
-                               event->data);
                break;
 
        default:
@@ -248,9 +245,6 @@ convert_script_defer_cb(hlcache_handle *script,
                break;
 
        case CONTENT_MSG_STATUS:
-               html_set_status(parent, content_get_status_message(script));
-               content_broadcast(&parent->base, CONTENT_MSG_STATUS,
-                               event->data);
                break;
 
        default:
@@ -345,9 +339,6 @@ convert_script_sync_cb(hlcache_handle *script,
                break;
 
        case CONTENT_MSG_STATUS:
-               html_set_status(parent, content_get_status_message(script));
-               content_broadcast(&parent->base, CONTENT_MSG_STATUS,
-                               event->data);
                break;
 
        default:


commitdiff 
http://git.netsurf-browser.org/netsurf.git/commitdiff/5fb51a0fb76707e1b5dac4bbe04613d0396d7bc0
commit 5fb51a0fb76707e1b5dac4bbe04613d0396d7bc0
Merge: fcb7143 a3ef5c2
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>

    Merge branch 'master' of git://git.netsurf-browser.org/netsurf



commitdiff 
http://git.netsurf-browser.org/netsurf.git/commitdiff/fcb7143ecb0c1acedfb30d34931896dbefc660b1
commit fcb7143ecb0c1acedfb30d34931896dbefc660b1
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>

    Simplify content status text setting.

diff --git a/content/content.c b/content/content.c
index b80626c..8b089cd 100644
--- a/content/content.c
+++ b/content/content.c
@@ -59,7 +59,6 @@ const char * const content_status_name[] = {
 static nserror content_llcache_callback(llcache_handle *llcache,
                const llcache_event *event, void *pw);
 static void content_convert(struct content *c);
-static void content_update_status(struct content *c);
 
 
 /**
@@ -169,7 +168,7 @@ nserror content_llcache_callback(llcache_handle *llcache,
 
                (void) llcache_handle_get_source_data(llcache, &source_size);
 
-               content_set_status(c, messages_get("Processing"), source_size);
+               content_set_status(c, messages_get("Processing"));
                content_broadcast(c, CONTENT_MSG_STATUS, msg_data);
 
                content_convert(c);
@@ -182,7 +181,7 @@ nserror content_llcache_callback(llcache_handle *llcache,
                content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
                break;
        case LLCACHE_EVENT_PROGRESS:
-               content_set_status(c, "%s", event->data.msg);
+               content_set_status(c, event->data.msg);
                content_broadcast(c, CONTENT_MSG_STATUS, msg_data);
                break;
        }
@@ -207,31 +206,7 @@ bool content_can_reformat(hlcache_handle *h)
 }
 
 
-/**
- * Updates content with new status.
- *
- * The textual status contained in the content is updated with given string.
- *
- * \param status_message new textual status
- */
-
-void content_set_status(struct content *c, const char *status_message, ...)
-{
-       va_list ap;
-       int len;
-
-       va_start(ap, status_message);
-       if ((len = vsnprintf(c->sub_status, sizeof (c->sub_status),
-                       status_message, ap)) < 0 ||
-                       (int)sizeof (c->sub_status) <= len)
-               c->sub_status[sizeof (c->sub_status) - 1] = '\0';
-       va_end(ap);
-
-       content_update_status(c);
-}
-
-
-void content_update_status(struct content *c)
+static void content_update_status(struct content *c)
 {
        if (c->status == CONTENT_STATUS_LOADING ||
                        c->status == CONTENT_STATUS_READY) {
@@ -245,8 +220,28 @@ void content_update_status(struct content *c)
                                "%s (%.1fs)", messages_get("Done"),
                                (float) time / 100);
        }
+}
+
+
+/**
+ * Updates content with new status.
+ *
+ * The textual status contained in the content is updated with given string.
+ *
+ * \param status_message  new textual status
+ */
+
+void content_set_status(struct content *c, const char *status_message)
+{
+       size_t len = strlen(status_message);
 
-       /* LOG(("%s", c->status_message)); */
+       if (len >= sizeof(c->sub_status)) {
+               len = sizeof(c->sub_status) - 1;
+       }
+       memcpy(c->sub_status, status_message, len);
+       c->sub_status[len] = '\0';
+
+       content_update_status(c);
 }
 
 
diff --git a/content/content_protected.h b/content/content_protected.h
index ad0b0af..e375734 100644
--- a/content/content_protected.h
+++ b/content/content_protected.h
@@ -160,7 +160,7 @@ void content_set_ready(struct content *c);
 void content_set_done(struct content *c);
 void content_set_error(struct content *c);
 
-void content_set_status(struct content *c, const char *status_message, ...);
+void content_set_status(struct content *c, const char *status_message);
 void content_broadcast(struct content *c, content_msg msg,
                union content_msg_data data);
 void content_add_error(struct content *c, const char *token,
diff --git a/render/html.c b/render/html.c
index 0099296..fc2f2b8 100644
--- a/render/html.c
+++ b/render/html.c
@@ -32,7 +32,6 @@
 #include "content/content_protected.h"
 #include "content/fetch.h"
 #include "content/hlcache.h"
-#include "desktop/browser.h"
 #include "desktop/options.h"
 #include "desktop/selection.h"
 #include "desktop/scrollbar.h"
@@ -2510,7 +2509,7 @@ static nserror html_clone(const struct content *old, 
struct content **newc)
 
 void html_set_status(html_content *c, const char *extra)
 {
-       content_set_status(&c->base, "%s", extra);
+       content_set_status(&c->base, extra);
 }
 
 


-----------------------------------------------------------------------

Summary of changes:
 content/content.c           |   55 ++++++++++++++++++++----------------------
 content/content.h           |    6 ++++-
 content/content_protected.h |    2 +-
 desktop/browser.c           |   10 +++++++-
 render/html.c               |   30 ++++++++++++++++-------
 render/html_interaction.c   |   19 +++++++++-----
 render/html_script.c        |    9 -------
 7 files changed, 74 insertions(+), 57 deletions(-)

diff --git a/content/content.c b/content/content.c
index b80626c..758a615 100644
--- a/content/content.c
+++ b/content/content.c
@@ -59,7 +59,6 @@ const char * const content_status_name[] = {
 static nserror content_llcache_callback(llcache_handle *llcache,
                const llcache_event *event, void *pw);
 static void content_convert(struct content *c);
-static void content_update_status(struct content *c);
 
 
 /**
@@ -169,7 +168,8 @@ nserror content_llcache_callback(llcache_handle *llcache,
 
                (void) llcache_handle_get_source_data(llcache, &source_size);
 
-               content_set_status(c, messages_get("Processing"), source_size);
+               content_set_status(c, messages_get("Processing"));
+               msg_data.explicit_status_text = NULL;
                content_broadcast(c, CONTENT_MSG_STATUS, msg_data);
 
                content_convert(c);
@@ -182,7 +182,8 @@ nserror content_llcache_callback(llcache_handle *llcache,
                content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
                break;
        case LLCACHE_EVENT_PROGRESS:
-               content_set_status(c, "%s", event->data.msg);
+               content_set_status(c, event->data.msg);
+               msg_data.explicit_status_text = NULL;
                content_broadcast(c, CONTENT_MSG_STATUS, msg_data);
                break;
        }
@@ -207,31 +208,7 @@ bool content_can_reformat(hlcache_handle *h)
 }
 
 
-/**
- * Updates content with new status.
- *
- * The textual status contained in the content is updated with given string.
- *
- * \param status_message new textual status
- */
-
-void content_set_status(struct content *c, const char *status_message, ...)
-{
-       va_list ap;
-       int len;
-
-       va_start(ap, status_message);
-       if ((len = vsnprintf(c->sub_status, sizeof (c->sub_status),
-                       status_message, ap)) < 0 ||
-                       (int)sizeof (c->sub_status) <= len)
-               c->sub_status[sizeof (c->sub_status) - 1] = '\0';
-       va_end(ap);
-
-       content_update_status(c);
-}
-
-
-void content_update_status(struct content *c)
+static void content_update_status(struct content *c)
 {
        if (c->status == CONTENT_STATUS_LOADING ||
                        c->status == CONTENT_STATUS_READY) {
@@ -245,8 +222,28 @@ void content_update_status(struct content *c)
                                "%s (%.1fs)", messages_get("Done"),
                                (float) time / 100);
        }
+}
+
+
+/**
+ * Updates content with new status.
+ *
+ * The textual status contained in the content is updated with given string.
+ *
+ * \param status_message  new textual status
+ */
+
+void content_set_status(struct content *c, const char *status_message)
+{
+       size_t len = strlen(status_message);
 
-       /* LOG(("%s", c->status_message)); */
+       if (len >= sizeof(c->sub_status)) {
+               len = sizeof(c->sub_status) - 1;
+       }
+       memcpy(c->sub_status, status_message, len);
+       c->sub_status[len] = '\0';
+
+       content_update_status(c);
 }
 
 
diff --git a/content/content.h b/content/content.h
index ab569dd..f1ff2a2 100644
--- a/content/content.h
+++ b/content/content.h
@@ -107,9 +107,13 @@ union content_msg_data {
                int object_width, object_height;
        } redraw;
        /** CONTENT_MSG_REFRESH - Minimum delay  */
-       int delay;      
+       int delay;
        /** CONTENT_MSG_REFORMAT - Reformat should not cause a redraw */
        bool background;
+       /** CONTENT_MSG_STATUS - Status message update.  If NULL, the content's
+        * internal status text has been updated, and listener should use
+        * content_get_status_message() */
+       const char *explicit_status_text;
        /** CONTENT_MSG_DOWNLOAD - Low-level cache handle */
        struct llcache_handle *download;
        /** CONTENT_MSG_RFC5988_LINK - rfc5988 link data   */
diff --git a/content/content_protected.h b/content/content_protected.h
index ad0b0af..e375734 100644
--- a/content/content_protected.h
+++ b/content/content_protected.h
@@ -160,7 +160,7 @@ void content_set_ready(struct content *c);
 void content_set_done(struct content *c);
 void content_set_error(struct content *c);
 
-void content_set_status(struct content *c, const char *status_message, ...);
+void content_set_status(struct content *c, const char *status_message);
 void content_broadcast(struct content *c, content_msg msg,
                union content_msg_data data);
 void content_add_error(struct content *c, const char *token,
diff --git a/desktop/browser.c b/desktop/browser.c
index 73fcc04..b786985 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:
diff --git a/render/html.c b/render/html.c
index 0099296..7f3c761 100644
--- a/render/html.c
+++ b/render/html.c
@@ -32,7 +32,6 @@
 #include "content/content_protected.h"
 #include "content/fetch.h"
 #include "content/hlcache.h"
-#include "desktop/browser.h"
 #include "desktop/options.h"
 #include "desktop/selection.h"
 #include "desktop/scrollbar.h"
@@ -241,6 +240,7 @@ void html_finish_conversion(html_content *c)
        /* convert xml tree to box tree */
        LOG(("XML to box (%p)", c));
        content_set_status(&c->base, messages_get("Processing"));
+       msg_data.explicit_status_text = NULL;
        content_broadcast(&c->base, CONTENT_MSG_STATUS, msg_data);
 
        exc = dom_document_get_document_element(c->document, (void *) &html);
@@ -1169,14 +1169,18 @@ html_object_callback(hlcache_handle *object,
                LOG(("%d fetches active", c->base.active));
 
                content_add_error(&c->base, "?", 0);
-               html_set_status(c, event->data.error);
-               content_broadcast(&c->base, CONTENT_MSG_STATUS, event->data);
                html_object_failed(box, c, o->background);
                break;
 
        case CONTENT_MSG_STATUS:
-               html_set_status(c, content_get_status_message(object));
-               /* content_broadcast(&c->base, CONTENT_MSG_STATUS, 0); */
+               if (event->data.explicit_status_text == NULL) {
+                       /* Object content's status text updated */
+                       html_set_status(c, content_get_status_message(object));
+               } else {
+                       /* Object content wants to set explicit message */
+                       content_broadcast(&c->base, CONTENT_MSG_STATUS,
+                                       event->data);
+               }
                break;
 
        case CONTENT_MSG_REFORMAT:
@@ -1407,9 +1411,17 @@ html_convert_css_callback(hlcache_handle *css,
                break;
 
        case CONTENT_MSG_STATUS:
-               html_set_status(parent, content_get_status_message(css));
-               content_broadcast(&parent->base, CONTENT_MSG_STATUS,
-                               event->data);
+               if (event->data.explicit_status_text == NULL) {
+                       /* Object content's status text updated */
+                       html_set_status(parent,
+                                       content_get_status_message(css));
+                       content_broadcast(&parent->base, CONTENT_MSG_STATUS,
+                                       event->data);
+               } else {
+                       /* Object content wants to set explicit message */
+                       content_broadcast(&parent->base, CONTENT_MSG_STATUS,
+                                       event->data);
+               }
                break;
 
        default:
@@ -2510,7 +2522,7 @@ static nserror html_clone(const struct content *old, 
struct content **newc)
 
 void html_set_status(html_content *c, const char *extra)
 {
-       content_set_status(&c->base, "%s", extra);
+       content_set_status(&c->base, extra);
 }
 
 
diff --git a/render/html_interaction.c b/render/html_interaction.c
index 190952c..6b5cef2 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -197,6 +197,7 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
        int scroll_mouse_x = 0, scroll_mouse_y = 0;
        int padding_left, padding_right, padding_top, padding_bottom;
        browser_drag_type drag_type = browser_window_get_drag_type(bw);
+       union content_msg_data msg_data;
 
        if (drag_type != DRAGGING_NONE && !mouse &&
                        html->visible_select_menu != NULL) {
@@ -214,9 +215,10 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
                                box->padding[BOTTOM] + box->padding[TOP];
                status = form_select_mouse_action(html->visible_select_menu,
                                mouse, x - box_x, y - box_y);
-               if (status != NULL)
-                       browser_window_set_status(bw, status);
-               else {
+               if (status != NULL) {
+                       msg_data.explicit_status_text = status;
+                       content_broadcast(c, CONTENT_MSG_STATUS, msg_data);
+               } else {
                        int width, height;
                        form_select_get_dimensions(html->visible_select_menu,
                                        &width, &height);
@@ -252,8 +254,9 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
                        status = scrollbar_mouse_action(html->scrollbar, mouse, 
                                        scroll_mouse_x, scroll_mouse_y);
                }
-               
-               browser_window_set_status(bw, status);
+
+               msg_data.explicit_status_text = status;
+               content_broadcast(c, CONTENT_MSG_STATUS, msg_data);
                return;
        }
 
@@ -685,8 +688,10 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
        if (action == ACTION_SUBMIT || action == ACTION_GO)
                bw->last_action = wallclock();
 
-       if (status != NULL)
-               browser_window_set_status(bw, status);
+       if (status != NULL) {
+               msg_data.explicit_status_text = status;
+               content_broadcast(c, CONTENT_MSG_STATUS, msg_data);
+       }
 
        if (!iframe)
                browser_window_set_pointer(bw, pointer);
diff --git a/render/html_script.c b/render/html_script.c
index 44b661d..446868b 100644
--- a/render/html_script.c
+++ b/render/html_script.c
@@ -188,9 +188,6 @@ convert_script_async_cb(hlcache_handle *script,
                break;
 
        case CONTENT_MSG_STATUS:
-               html_set_status(parent, content_get_status_message(script));
-               content_broadcast(&parent->base, CONTENT_MSG_STATUS,
-                               event->data);
                break;
 
        default:
@@ -248,9 +245,6 @@ convert_script_defer_cb(hlcache_handle *script,
                break;
 
        case CONTENT_MSG_STATUS:
-               html_set_status(parent, content_get_status_message(script));
-               content_broadcast(&parent->base, CONTENT_MSG_STATUS,
-                               event->data);
                break;
 
        default:
@@ -345,9 +339,6 @@ convert_script_sync_cb(hlcache_handle *script,
                break;
 
        case CONTENT_MSG_STATUS:
-               html_set_status(parent, content_get_status_message(script));
-               content_broadcast(&parent->base, CONTENT_MSG_STATUS,
-                               event->data);
                break;
 
        default:


-- 
NetSurf Browser

_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org

Reply via email to