summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorJames Bursa <james@netsurf-browser.org>2004-07-27 15:49:28 +0000
committerJames Bursa <james@netsurf-browser.org>2004-07-27 15:49:28 +0000
commit534b464becb6c429b5976695bfe142690f45b779 (patch)
tree00f97e2b09aa68ab1653566678fc6f64b86e463b /desktop
parentd378575d4c484d4e9fe8dba56c93323053de668a (diff)
downloadnetsurf-534b464becb6c429b5976695bfe142690f45b779.tar.gz
netsurf-534b464becb6c429b5976695bfe142690f45b779.tar.bz2
[project @ 2004-07-27 15:49:28 by bursa]
Implement proxy authentication. Bring templates in line with style guide (icon sizes and fill display fields), and remove dead icons. Clean up choices dialog code. Fix persistent dialog code. Make browser choices the default pane. svn path=/import/netsurf/; revision=1153
Diffstat (limited to 'desktop')
-rw-r--r--desktop/options.c9
-rw-r--r--desktop/options.h6
2 files changed, 15 insertions, 0 deletions
diff --git a/desktop/options.c b/desktop/options.c
index 92a3659e9..c999e0ea6 100644
--- a/desktop/options.c
+++ b/desktop/options.c
@@ -35,6 +35,12 @@ bool option_http_proxy = false;
char *option_http_proxy_host = 0;
/** Proxy port. */
int option_http_proxy_port = 8080;
+/** Proxy authentication method. */
+int option_http_proxy_auth = OPTION_HTTP_PROXY_AUTH_NONE;
+/** Proxy authentication user name */
+char *option_http_proxy_auth_user = 0;
+/** Proxy authentication password */
+char *option_http_proxy_auth_pass = 0;
/** Default font size / 0.1pt. */
int option_font_size = 100;
/** Minimum font size. */
@@ -57,6 +63,9 @@ struct {
{ "http_proxy", OPTION_BOOL, &option_http_proxy },
{ "http_proxy_host", OPTION_STRING, &option_http_proxy_host },
{ "http_proxy_port", OPTION_INTEGER, &option_http_proxy_port },
+ { "http_proxy_auth", OPTION_BOOL, &option_http_proxy_auth },
+ { "http_proxy_auth_user", OPTION_STRING, &option_http_proxy_auth_user },
+ { "http_proxy_auth_pass", OPTION_STRING, &option_http_proxy_auth_pass },
{ "font_size", OPTION_INTEGER, &option_font_size },
{ "font_min_size", OPTION_INTEGER, &option_font_min_size },
{ "accept_language", OPTION_STRING, &option_accept_language },
diff --git a/desktop/options.h b/desktop/options.h
index a4f0de038..65fa59fc2 100644
--- a/desktop/options.h
+++ b/desktop/options.h
@@ -24,9 +24,15 @@
#ifndef _NETSURF_DESKTOP_OPTIONS_H_
#define _NETSURF_DESKTOP_OPTIONS_H_
+enum { OPTION_HTTP_PROXY_AUTH_NONE = 0, OPTION_HTTP_PROXY_AUTH_BASIC = 1,
+ OPTION_HTTP_PROXY_AUTH_NTLM = 2 };
+
extern bool option_http_proxy;
extern char *option_http_proxy_host;
extern int option_http_proxy_port;
+extern int option_http_proxy_auth;
+extern char *option_http_proxy_auth_user;
+extern char *option_http_proxy_auth_pass;
extern int option_font_size;
extern int option_font_min_size;
extern char *option_accept_language;