[Tkabber-dev] r1479 - trunk/tkabber

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Wed Jul 30 20:14:23 MSD 2008


Author: sergei
Date: 2008-07-30 20:13:55 +0400 (Wed, 30 Jul 2008)
New Revision: 1479

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/login.tcl
Log:
	* login.tcl: Added -proxy option to jlib::connect call even if no
	  proxy is used. This fixes bug when it's impossible to disable once
	  used proxy.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2008-07-28 17:51:38 UTC (rev 1478)
+++ trunk/tkabber/ChangeLog	2008-07-30 16:13:55 UTC (rev 1479)
@@ -1,3 +1,9 @@
+2008-07-30  Sergei Golovan  <sgolovan at nes.ru>
+
+	* login.tcl: Added -proxy option to jlib::connect call even if no
+	  proxy is used. This fixes bug when it's impossible to disable once
+	  used proxy.
+
 2008-07-28  Sergei Golovan  <sgolovan at nes.ru>
 
 	* jabberlib/https.tcl: Fixed typo in basic authentication (thanks to

Modified: trunk/tkabber/login.tcl
===================================================================
--- trunk/tkabber/login.tcl	2008-07-28 17:51:38 UTC (rev 1478)
+++ trunk/tkabber/login.tcl	2008-07-30 16:13:55 UTC (rev 1479)
@@ -362,13 +362,17 @@
 	lappend args -usesasl $lc(usesasl)
     }
 
-    if {$have_proxy && ($lc(proxy) != "none")} {
-	lappend args -proxy $lc(proxy)
-	lappend args -proxyhost $lc(proxyhost)
-	lappend args -proxyport $lc(proxyport)
-	lappend args -proxyusername $lc(proxyusername)
-	lappend args -proxypassword $lc(proxypassword)
-	lappend args -proxyuseragent $lc(proxyuseragent)
+    if {$have_proxy} {
+	if {($lc(proxy) != "none")} {
+	    lappend args -proxy $lc(proxy)
+	    lappend args -proxyhost $lc(proxyhost)
+	    lappend args -proxyport $lc(proxyport)
+	    lappend args -proxyusername $lc(proxyusername)
+	    lappend args -proxypassword $lc(proxypassword)
+	    lappend args -proxyuseragent $lc(proxyuseragent)
+	} else {
+	    lappend args -proxy ""
+	}
     }
 
     set ascii_server [idna::domain_toascii $lc(server)]



More information about the Tkabber-dev mailing list