Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/10033267a2a0a457f58faf76c3d1a7b813132eb0
...commit
http://git.netsurf-browser.org/netsurf.git/commit/10033267a2a0a457f58faf76c3d1a7b813132eb0
...tree
http://git.netsurf-browser.org/netsurf.git/tree/10033267a2a0a457f58faf76c3d1a7b813132eb0
The branch, master has been updated
via 10033267a2a0a457f58faf76c3d1a7b813132eb0 (commit)
via 423b04d4069c013733aa99f06bf9a5beefd552fd (commit)
via cd0309fa836c3d7846f6f009ba50b66b78c47ffa (commit)
from cf17ecbbc7281729b1780ef7e1d65f9a75138cc0 (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/commit/?id=10033267a2a0a457f58faf76c3d1a7b813132eb0
commit 10033267a2a0a457f58faf76c3d1a7b813132eb0
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
RISC OS: Propagate 401 login setup error back to core.
diff --git a/frontends/riscos/401login.c b/frontends/riscos/401login.c
index 882fefe..4fb4a35 100644
--- a/frontends/riscos/401login.c
+++ b/frontends/riscos/401login.c
@@ -41,7 +41,7 @@
static void ro_gui_401login_close(wimp_w w);
static bool ro_gui_401login_apply(wimp_w w);
-static void ro_gui_401login_open(nsurl *url, lwc_string *host,
+static nserror ro_gui_401login_open(nsurl *url, lwc_string *host,
const char *realm,
const char *username, const char *password,
nserror (*cb)(const char *username,
@@ -84,14 +84,15 @@ nserror gui_401login_open(nsurl *url, const char *realm,
void *pw),
void *cbpw)
{
+ nserror err;
lwc_string *host = nsurl_get_component(url, NSURL_HOST);
assert(host != NULL);
- ro_gui_401login_open(url, host, realm, username, password, cb, cbpw);
-
+ err = ro_gui_401login_open(url, host, realm, username, password,
+ cb, cbpw);
lwc_string_unref(host);
- return NSERROR_OK;
+ return err;
}
@@ -99,7 +100,7 @@ nserror gui_401login_open(nsurl *url, const char *realm,
* Open a 401 login window.
*/
-void ro_gui_401login_open(nsurl *url, lwc_string *host, const char *realm,
+nserror ro_gui_401login_open(nsurl *url, lwc_string *host, const char *realm,
const char *username, const char *password,
nserror (*cb)(const char *username,
const char *password,
@@ -117,7 +118,7 @@ void ro_gui_401login_open(nsurl *url, lwc_string *host,
const char *realm,
session = calloc(1, sizeof(struct session_401));
if (!session) {
ro_warn_user("NoMemory", 0);
- return;
+ return NSERROR_NOMEM;
}
if (realm == NULL)
@@ -142,7 +143,7 @@ void ro_gui_401login_open(nsurl *url, lwc_string *host,
const char *realm,
lwc_string_unref(session->host);
free(session);
ro_warn_user("NoMemory", 0);
- return;
+ return NSERROR_NOMEM;
}
/* fill in download window icons */
@@ -177,6 +178,8 @@ void ro_gui_401login_open(nsurl *url, lwc_string *host,
const char *realm,
ro_gui_wimp_event_set_user_data(w, session);
ro_gui_dialog_open_persistent(NULL, w, false);
+
+ return NSERROR_OK;
}
/**
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=423b04d4069c013733aa99f06bf9a5beefd552fd
commit 423b04d4069c013733aa99f06bf9a5beefd552fd
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Atari: gui_401login_open returns nserror now.
diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c
index 498cf5a..374220b 100644
--- a/frontends/atari/gui.c
+++ b/frontends/atari/gui.c
@@ -766,7 +766,7 @@ static void gui_set_clipboard(const char *buffer, size_t
length,
}
}
-static void gui_401login_open(nsurl *url, const char *realm,
+static nserror gui_401login_open(nsurl *url, const char *realm,
const char *username, const char *password,
nserror (*cb)(const char *username,
const char *password,
@@ -791,6 +791,8 @@ static void gui_401login_open(nsurl *url, const char *realm,
if (p_out != NULL) {
free(p_out);
}
+
+ return NSERROR_OK;
}
static nserror
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=cd0309fa836c3d7846f6f009ba50b66b78c47ffa
commit cd0309fa836c3d7846f6f009ba50b66b78c47ffa
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
RISC OS: gui_401login_open returns nserror now.
diff --git a/frontends/riscos/401login.c b/frontends/riscos/401login.c
index f14cdbb..882fefe 100644
--- a/frontends/riscos/401login.c
+++ b/frontends/riscos/401login.c
@@ -77,7 +77,7 @@ void ro_gui_401login_init(void)
/**
* Open the login dialog
*/
-void gui_401login_open(nsurl *url, const char *realm,
+nserror gui_401login_open(nsurl *url, const char *realm,
const char *username, const char *password,
nserror (*cb)(const char *username,
const char *password,
@@ -90,6 +90,8 @@ void gui_401login_open(nsurl *url, const char *realm,
ro_gui_401login_open(url, host, realm, username, password, cb, cbpw);
lwc_string_unref(host);
+
+ return NSERROR_OK;
}
diff --git a/frontends/riscos/gui.h b/frontends/riscos/gui.h
index 5026629..65c85f9 100644
--- a/frontends/riscos/gui.h
+++ b/frontends/riscos/gui.h
@@ -136,7 +136,7 @@ extern struct gui_download_table *riscos_download_table;
/* in 401login.c */
void ro_gui_401login_init(void);
-void gui_401login_open(struct nsurl *url, const char *realm,
+nserror gui_401login_open(struct nsurl *url, const char *realm,
const char *username, const char *password,
nserror (*cb)(const char *username,
const char *password,
-----------------------------------------------------------------------
Summary of changes:
frontends/atari/gui.c | 4 +++-
frontends/riscos/401login.c | 19 ++++++++++++-------
frontends/riscos/gui.h | 2 +-
3 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c
index 498cf5a..374220b 100644
--- a/frontends/atari/gui.c
+++ b/frontends/atari/gui.c
@@ -766,7 +766,7 @@ static void gui_set_clipboard(const char *buffer, size_t
length,
}
}
-static void gui_401login_open(nsurl *url, const char *realm,
+static nserror gui_401login_open(nsurl *url, const char *realm,
const char *username, const char *password,
nserror (*cb)(const char *username,
const char *password,
@@ -791,6 +791,8 @@ static void gui_401login_open(nsurl *url, const char *realm,
if (p_out != NULL) {
free(p_out);
}
+
+ return NSERROR_OK;
}
static nserror
diff --git a/frontends/riscos/401login.c b/frontends/riscos/401login.c
index f14cdbb..4fb4a35 100644
--- a/frontends/riscos/401login.c
+++ b/frontends/riscos/401login.c
@@ -41,7 +41,7 @@
static void ro_gui_401login_close(wimp_w w);
static bool ro_gui_401login_apply(wimp_w w);
-static void ro_gui_401login_open(nsurl *url, lwc_string *host,
+static nserror ro_gui_401login_open(nsurl *url, lwc_string *host,
const char *realm,
const char *username, const char *password,
nserror (*cb)(const char *username,
@@ -77,19 +77,22 @@ void ro_gui_401login_init(void)
/**
* Open the login dialog
*/
-void gui_401login_open(nsurl *url, const char *realm,
+nserror gui_401login_open(nsurl *url, const char *realm,
const char *username, const char *password,
nserror (*cb)(const char *username,
const char *password,
void *pw),
void *cbpw)
{
+ nserror err;
lwc_string *host = nsurl_get_component(url, NSURL_HOST);
assert(host != NULL);
- ro_gui_401login_open(url, host, realm, username, password, cb, cbpw);
-
+ err = ro_gui_401login_open(url, host, realm, username, password,
+ cb, cbpw);
lwc_string_unref(host);
+
+ return err;
}
@@ -97,7 +100,7 @@ void gui_401login_open(nsurl *url, const char *realm,
* Open a 401 login window.
*/
-void ro_gui_401login_open(nsurl *url, lwc_string *host, const char *realm,
+nserror ro_gui_401login_open(nsurl *url, lwc_string *host, const char *realm,
const char *username, const char *password,
nserror (*cb)(const char *username,
const char *password,
@@ -115,7 +118,7 @@ void ro_gui_401login_open(nsurl *url, lwc_string *host,
const char *realm,
session = calloc(1, sizeof(struct session_401));
if (!session) {
ro_warn_user("NoMemory", 0);
- return;
+ return NSERROR_NOMEM;
}
if (realm == NULL)
@@ -140,7 +143,7 @@ void ro_gui_401login_open(nsurl *url, lwc_string *host,
const char *realm,
lwc_string_unref(session->host);
free(session);
ro_warn_user("NoMemory", 0);
- return;
+ return NSERROR_NOMEM;
}
/* fill in download window icons */
@@ -175,6 +178,8 @@ void ro_gui_401login_open(nsurl *url, lwc_string *host,
const char *realm,
ro_gui_wimp_event_set_user_data(w, session);
ro_gui_dialog_open_persistent(NULL, w, false);
+
+ return NSERROR_OK;
}
/**
diff --git a/frontends/riscos/gui.h b/frontends/riscos/gui.h
index 5026629..65c85f9 100644
--- a/frontends/riscos/gui.h
+++ b/frontends/riscos/gui.h
@@ -136,7 +136,7 @@ extern struct gui_download_table *riscos_download_table;
/* in 401login.c */
void ro_gui_401login_init(void);
-void gui_401login_open(struct nsurl *url, const char *realm,
+nserror gui_401login_open(struct nsurl *url, const char *realm,
const char *username, const char *password,
nserror (*cb)(const char *username,
const char *password,
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
