diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2003-10-26 12:41:51 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2003-10-26 12:41:51 +0000 |
| commit | 6d036cb630c1acdaaa889a578faa54f80879b612 (patch) | |
| tree | 1ccdbfb706660503744dfb2af0dbc3b7c71a93fa | |
| parent | 350cfd3570764c144331d1b9e51163b9e7ae4c4e (diff) | |
| download | netsurf-6d036cb630c1acdaaa889a578faa54f80879b612.tar.gz netsurf-6d036cb630c1acdaaa889a578faa54f80879b612.tar.bz2 | |
[project @ 2003-10-26 12:41:51 by jmb]
Make fetch abort finish when auth is required.
Lose the right click performs the opposite action stuff in the login
dialog.
svn path=/import/netsurf/; revision=391
| -rw-r--r-- | desktop/browser.c | 5 | ||||
| -rw-r--r-- | riscos/401login.c | 18 |
2 files changed, 9 insertions, 14 deletions
diff --git a/desktop/browser.c b/desktop/browser.c index 8e311eee8..048eb4d66 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -397,6 +397,11 @@ void browser_window_callback(content_msg msg, struct content *c, case CONTENT_MSG_AUTH: gui_401login_open(bw, c, error); + if (c == bw->loading_content) + bw->loading_content = 0; + else if (c == bw->current_content) + bw->current_content = 0; + browser_window_stop_throbber(bw); break; default: diff --git a/riscos/401login.c b/riscos/401login.c index ae922dfce..4e428ab3c 100644 --- a/riscos/401login.c +++ b/riscos/401login.c @@ -112,22 +112,12 @@ void ro_gui_401login_click(wimp_pointer *pointer) { switch (pointer->i) { case ICON_401LOGIN_LOGIN: - if (pointer->buttons == wimp_CLICK_SELECT) { - get_unamepwd(); - ro_gui_dialog_close(dialog_401li); - browser_window_open_location(bwin, url); - } - else - ro_gui_dialog_close(dialog_401li); + get_unamepwd(); + ro_gui_dialog_close(dialog_401li); + browser_window_open_location(bwin, url); break; case ICON_401LOGIN_CANCEL: - if (pointer->buttons == wimp_CLICK_SELECT) - ro_gui_dialog_close(dialog_401li); - else { - get_unamepwd(); - ro_gui_dialog_close(dialog_401li); - browser_window_open_location(bwin, url); - } + ro_gui_dialog_close(dialog_401li); break; default: break; } |