summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Tytgat <joty@netsurf-browser.org>2004-06-20 19:49:40 +0000
committerJohn Tytgat <joty@netsurf-browser.org>2004-06-20 19:49:40 +0000
commitb08c7135fe65d383ec96c679ce2a7aedda6a6d1c (patch)
tree72ec0cd86bb88fe61265b8ed7d88fb2be728f7aa
parent6ce6e99659ea6142bb923a4e62dfb8a269b7d4b6 (diff)
downloadnetsurf-b08c7135fe65d383ec96c679ce2a7aedda6a6d1c.tar.gz
netsurf-b08c7135fe65d383ec96c679ce2a7aedda6a6d1c.tar.bz2
[project @ 2004-06-20 19:49:40 by joty]
Src cleanup. svn path=/import/netsurf/; revision=981
-rw-r--r--riscos/401login.c93
1 files changed, 46 insertions, 47 deletions
diff --git a/riscos/401login.c b/riscos/401login.c
index c6927355e..a88e891ef 100644
--- a/riscos/401login.c
+++ b/riscos/401login.c
@@ -27,10 +27,8 @@ static void get_unamepwd(void);
static wimp_window *dialog_401_template;
extern wimp_w dialog_401li;
-struct login LOGIN;
-
static char *uname;
-static char* url;
+static char *url;
static char *pwd;
static struct browser_window *bwin;
@@ -45,18 +43,18 @@ void ro_gui_401login_init(void)
}
-void gui_401login_open(struct browser_window *bw, struct content *c, char *realm) {
-
- char *murl, *host;
+void gui_401login_open(struct browser_window *bw, struct content *c, char *realm)
+{
+ char *murl, *host;
- murl = c->url;
- host = url_host(murl);
- assert(host);
- bwin = bw;
+ murl = c->url;
+ host = url_host(murl);
+ assert(host);
+ bwin = bw;
- ro_gui_401login_open(host, realm, murl);
+ ro_gui_401login_open(host, realm, murl);
- xfree(host);
+ xfree(host);
}
@@ -96,50 +94,51 @@ void ro_gui_401login_open(char *host, char* realm, char *fetchurl)
-1, -1, -1, 0);
}
-bool ro_gui_401login_keypress(wimp_key *key) {
-
- switch (key->c) {
- case wimp_KEY_RETURN:
- get_unamepwd();
- ro_gui_dialog_close(dialog_401li);
- browser_window_go(bwin, url);
- return true;
- case wimp_KEY_ESCAPE:
- ro_gui_dialog_close(dialog_401li);
- return true;
- default: break;
- }
-
- return false;
+bool ro_gui_401login_keypress(wimp_key *key)
+{
+ switch (key->c) {
+ case wimp_KEY_RETURN:
+ get_unamepwd();
+ ro_gui_dialog_close(dialog_401li);
+ browser_window_go(bwin, url);
+ return true;
+ case wimp_KEY_ESCAPE:
+ ro_gui_dialog_close(dialog_401li);
+ return true;
+ }
+
+ return false;
}
/* Login Clicked -> create a new fetch request, specifying uname & pwd
* CURLOPT_USERPWD takes a string "username:password"
*/
-void ro_gui_401login_click(wimp_pointer *pointer) {
-
- if (pointer->buttons == wimp_CLICK_MENU) return;
-
- switch (pointer->i) {
- case ICON_401LOGIN_LOGIN:
- get_unamepwd();
- ro_gui_dialog_close(dialog_401li);
- browser_window_go(bwin, url);
- break;
- case ICON_401LOGIN_CANCEL:
- ro_gui_dialog_close(dialog_401li);
- break;
- default: break;
- }
+void ro_gui_401login_click(wimp_pointer *pointer)
+{
+ if (pointer->buttons == wimp_CLICK_MENU)
+ return;
+
+ switch (pointer->i) {
+ case ICON_401LOGIN_LOGIN:
+ get_unamepwd();
+ ro_gui_dialog_close(dialog_401li);
+ browser_window_go(bwin, url);
+ break;
+ case ICON_401LOGIN_CANCEL:
+ ro_gui_dialog_close(dialog_401li);
+ break;
+ }
}
-void get_unamepwd() {
-
- char *lidets = xcalloc(strlen(uname)+strlen(pwd)+2, sizeof(char));
+void get_unamepwd(void)
+{
+ char *lidets = xcalloc(strlen(uname)+strlen(pwd)+2, sizeof(char));
+ if (lidets == NULL)
+ return;
- sprintf(lidets, "%s:%s", uname, pwd);
+ sprintf(lidets, "%s:%s", uname, pwd);
- login_list_add(url, lidets);
+ login_list_add(url, lidets);
}
#endif