diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2012-08-19 11:34:46 +0100 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2012-08-19 11:34:46 +0100 |
| commit | d878ea4fb91143941ed84a9d300e4bb34731e41f (patch) | |
| tree | 2b7c15934d1bcdcefd6d0f70bab6ad3db44517a2 | |
| parent | 65e825c0c5d10820e66a7907ceb64afaae1e533d (diff) | |
| download | netsurf-d878ea4fb91143941ed84a9d300e4bb34731e41f.tar.gz netsurf-d878ea4fb91143941ed84a9d300e4bb34731e41f.tar.bz2 | |
Don't pass internal content status text as an explicit message.
| -rw-r--r-- | render/html_interaction.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/render/html_interaction.c b/render/html_interaction.c index b6f2dc615..f38361161 100644 --- a/render/html_interaction.c +++ b/render/html_interaction.c @@ -584,8 +584,7 @@ void html_mouse_action(struct content *c, struct browser_window *bw, DRAGGING_SELECTION, NULL); status = messages_get("Selecting"); - } else - status = content_get_status_message(h); + } } else if (mouse & BROWSER_MOUSE_PRESS_1) selection_clear(&html->sel, true); @@ -663,7 +662,6 @@ void html_mouse_action(struct content *c, struct browser_window *bw, } /* \todo should have a drag-saving object msg */ - status = content_get_status_message(h); } else if (iframe) { int pos_x, pos_y; @@ -756,10 +754,9 @@ void html_mouse_action(struct content *c, struct browser_window *bw, browser_window_set_drag_type(bw, DRAGGING_SELECTION, NULL); - status = - messages_get("Selecting"); - } else - status = content_get_status_message(h); + status = messages_get( + "Selecting"); + } done = true; } @@ -771,11 +768,6 @@ void html_mouse_action(struct content *c, struct browser_window *bw, if (!done) { if (title) status = title; - else if (bw->loading_content) - status = content_get_status_message( - bw->loading_content); - else - status = content_get_status_message(h); if (mouse & BROWSER_MOUSE_DRAG_1) { if (mouse & BROWSER_MOUSE_MOD_2) { @@ -824,12 +816,10 @@ void html_mouse_action(struct content *c, struct browser_window *bw, } } - if (status != NULL) { + if (!iframe) { msg_data.explicit_status_text = status; content_broadcast(c, CONTENT_MSG_STATUS, msg_data); - } - if (!iframe) { msg_data.pointer = pointer; content_broadcast(c, CONTENT_MSG_POINTER, msg_data); } |