[Mldonkey-commits] mldonkey distrib/ChangeLog src/gtk2/gui/guiHtml...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/08/16 19:19:24

Modified files:
        distrib        : ChangeLog 
        src/gtk2/gui   : guiHtml.ml guiOptions.ml 

Log message:
        patch #7267

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1462&r2=1.1463
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiHtml.ml?cvsroot=mldonkey&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiOptions.ml?cvsroot=mldonkey&r1=1.7&r2=1.8

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1462
retrieving revision 1.1463
diff -u -b -r1.1462 -r1.1463
--- distrib/ChangeLog   16 Aug 2010 19:17:21 -0000      1.1462
+++ distrib/ChangeLog   16 Aug 2010 19:19:23 -0000      1.1463
@@ -15,6 +15,7 @@
 =========
 
 2010/08/16
+7267: Fix compilation error in GTK2 GUI
 7282: Fix configure warning
 -------------------------------------------------------------------------------
 2010/08/15: version 3.0.4 = tag release-3-0-4

Index: src/gtk2/gui/guiHtml.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiHtml.ml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/gtk2/gui/guiHtml.ml     19 May 2006 23:43:54 -0000      1.8
+++ src/gtk2/gui/guiHtml.ml     16 Aug 2010 19:19:24 -0000      1.9
@@ -50,9 +50,13 @@
 
 let make_request url =
   let module H = Http_client in
+  let auth = match !!O.gtk_connection_http_proxy_login with
+  | "" -> None
+  | _ -> Some (!!O.gtk_connection_http_proxy_login, 
!!O.gtk_connection_http_proxy_password)
+  in
   let proxy =
     if !!O.gtk_connection_http_use_proxy
-      then Some (!!O.gtk_connection_http_proxy_server, 
!!O.gtk_connection_http_proxy_port)
+      then Some (!!O.gtk_connection_http_proxy_server, 
!!O.gtk_connection_http_proxy_port, auth)
       else None
   in
   let r = {

Index: src/gtk2/gui/guiOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiOptions.ml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/gtk2/gui/guiOptions.ml  1 Jul 2007 13:00:11 -0000       1.7
+++ src/gtk2/gui/guiOptions.ml  16 Aug 2010 19:19:24 -0000      1.8
@@ -166,6 +166,16 @@
     "Direct TCP connections to HTTP proxy (the proxy should support CONNECT)"
     bool_option false
 
+let gtk_connection_http_proxy_login = define_option current_section
+    ["gtk_connection_http_proxy_login"]
+    "HTTP proxy login (leave empty if proxy doesn't require authentication)"
+    string_option ""
+
+let gtk_connection_http_proxy_password = define_option current_section
+    ["gtk_connection_http_proxy_password"]
+    "HTTP proxy password"
+    string_option ""
+
 (* {Client} *)
 
 let gtk_client_login = define_option current_section