- Enabled proxy_user in preferences.

8 files changed, 34 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 6b0737a6..9f72ad53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,7 +57,7 @@ dillo-fltk2
    Patches: Jorge Arellano Cid
 +- Connected signals to <li> elements (fixes links within lists).
  - Enabled text, background-color, panel_size, geometry, fullscreen,
-   start_page, geometry offset and limit_text_width in preferences.
+   start_page, geometry offset, proxy_user and limit_text_width in preferences.
  - Enabled clicking over image links.
  - Improved notification upon leaving links.
  - Implemented image-link URL showing in status bar.
diff --git a/src/IO/Url.h b/src/IO/Url.h
index 6d1995d0..698bc6ad 100644
--- a/src/IO/Url.h
+++ b/src/IO/Url.h
@@ -15,7 +15,7 @@ extern "C" {
 extern void a_Http_freeall(void);
 int a_Http_init(void);
 int a_Http_proxy_auth(void);
-void a_Http_set_proxy_passwd(char *str);
+void a_Http_set_proxy_passwd(const char *str);
 Dstr *a_Http_make_query_str(const DilloUrl *url, bool_t use_proxy);
 
 void a_Http_ccc (int Op, int Branch, int Dir, ChainLink *Info,
diff --git a/src/IO/http.c b/src/IO/http.c
index a907c8cf..ec87a7a4 100644
--- a/src/IO/http.c
+++ b/src/IO/http.c
@@ -106,7 +106,7 @@ int a_Http_proxy_auth(void)
 /*
  * Activate entered proxy password for HTTP.
  */
-void a_Http_set_proxy_passwd(char *str)
+void a_Http_set_proxy_passwd(const char *str)
 {
    char *http_proxyauth = dStrconcat(prefs.http_proxyuser, ":", str, NULL);
    HTTP_Proxy_Auth_base64 = a_Misc_encode_base64(http_proxyauth);
diff --git a/src/dialog.cc b/src/dialog.cc
index 1934e9a1..83b32d8f 100644
--- a/src/dialog.cc
+++ b/src/dialog.cc
@@ -65,6 +65,14 @@ const char *a_Dialog_input(const char *msg)
 }
 
 /*
+ * Dialog for password
+ */
+const char *a_Dialog_passwd(const char *msg)
+{
+   return password("%s", "", msg);
+}
+
+/*
  * Show the save file dialog.
  *
  * Return: pointer to chosen filename, or NULL on Cancel.
diff --git a/src/dialog.hh b/src/dialog.hh
index 5a30d0a8..8e1d4e60 100644
--- a/src/dialog.hh
+++ b/src/dialog.hh
@@ -12,6 +12,7 @@ int a_Dialog_choice5(const char *QuestionTxt,
                      const char *alt1, const char *alt2, const char *alt3,
                      const char *alt4, const char *alt5);
 const char *a_Dialog_input(const char *msg);
+const char *a_Dialog_passwd(const char *msg);
 const char *a_Dialog_save_file(const char *msg,
                                const char *pattern, const char *fname);
 const char *a_Dialog_select_file(const char *msg,
diff --git a/src/dillo.cc b/src/dillo.cc
index b71af0b4..3b384cfe 100644
--- a/src/dillo.cc
+++ b/src/dillo.cc
@@ -104,6 +104,15 @@ int main(int argc, char **argv)
    // Create a new UI/bw pair
    BrowserWindow *bw = a_UIcmd_browser_window_new(0, 0, NULL);
 
+   if (prefs.http_proxyuser && !a_Http_proxy_auth()) {
+      const char *passwd = a_UIcmd_get_passwd(prefs.http_proxyuser);
+      if (passwd) {
+         a_Http_set_proxy_passwd(passwd);
+      } else {
+         MSG_WARN("Not using proxy authentication.\n");
+      }
+   }
+
    if (argc == 2) {
       DilloUrl *url = Dillo_make_start_url(argv[1]);
       a_UIcmd_open_urlstr(bw, URL_STR(url));
diff --git a/src/uicmd.cc b/src/uicmd.cc
index 74f23404..84054b05 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -402,6 +402,18 @@ void a_UIcmd_search_dialog(void *vbw)
 }
 
 /*
+ * Get password for user
+ */
+const char *a_UIcmd_get_passwd(const char *user)
+{
+   const char *passwd;
+   char *prompt = dStrconcat("Password for user \"", user, "\"", NULL);
+   passwd = a_Dialog_passwd(prompt);
+   dFree(prompt);
+   return passwd;
+}
+
+/*
  * Save link URL
  */
 void a_UIcmd_save_link(BrowserWindow *bw, const DilloUrl *url)
diff --git a/src/uicmd.hh b/src/uicmd.hh
index ab2acaf1..91c14390 100644
--- a/src/uicmd.hh
+++ b/src/uicmd.hh
@@ -24,6 +24,7 @@ void a_UIcmd_save_link(BrowserWindow *bw, const DilloUrl *url);
 void a_UIcmd_open_file(void *vbw);
 const char *a_UIcmd_select_file();
 void a_UIcmd_search_dialog(void *vbw);
+const char *a_UIcmd_get_passwd(const char *user);
 void a_UIcmd_book(void *vbw);
 void a_UIcmd_add_bookmark(BrowserWindow *bw, const DilloUrl *url);
 void a_UIcmd_fullscreen_toggle(BrowserWindow *bw);