[Tkabber-dev] r1763 - in trunk/tkabber: . plugins/chat plugins/filetransfer

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Mon Mar 30 00:05:22 MSD 2009


Author: sergei
Date: 2009-03-30 00:05:22 +0400 (Mon, 30 Mar 2009)
New Revision: 1763

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/plugins/chat/popupmenu.tcl
   trunk/tkabber/plugins/filetransfer/http.tcl
   trunk/tkabber/proxy.tcl
Log:
	* proxy.tcl, plugins/chat/popupmenu.tcl, plugins/filetransfer/http.tcl:
	  Added version to http package requirement to prevent version 1.0
	  loading.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2009-03-29 11:14:31 UTC (rev 1762)
+++ trunk/tkabber/ChangeLog	2009-03-29 20:05:22 UTC (rev 1763)
@@ -14,6 +14,10 @@
 	* proxy.tcl: Changed proxy type for HTTPS traffic from HTTP to
 	  tunnelling, which is more appropriate.
 
+	* proxy.tcl, plugins/chat/popupmenu.tcl, plugins/filetransfer/http.tcl:
+	  Added version to http package requirement to prevent version 1.0
+	  loading.
+
 2009-03-28  Sergei Golovan  <sgolovan at nes.ru>
 
 	* si.tcl, plugins/si/ibb.tcl, plugins/si/iqibb.tcl,

Modified: trunk/tkabber/plugins/chat/popupmenu.tcl
===================================================================
--- trunk/tkabber/plugins/chat/popupmenu.tcl	2009-03-29 11:14:31 UTC (rev 1762)
+++ trunk/tkabber/plugins/chat/popupmenu.tcl	2009-03-29 20:05:22 UTC (rev 1763)
@@ -1,6 +1,6 @@
 # $Id$
 
-package require http
+package require http 2
 
 namespace eval popupmenu {
     hook::add postload_hook [namespace current]::init

Modified: trunk/tkabber/plugins/filetransfer/http.tcl
===================================================================
--- trunk/tkabber/plugins/filetransfer/http.tcl	2009-03-29 11:14:31 UTC (rev 1762)
+++ trunk/tkabber/plugins/filetransfer/http.tcl	2009-03-29 20:05:22 UTC (rev 1763)
@@ -240,7 +240,7 @@
     }
 }
 
-package require http
+package require http 2
 
 proc http::recv_file_start {winid from lang url} {
     variable saveas$winid
@@ -263,7 +263,7 @@
 	      -progress [list [namespace current]::recv_file_progress $f.pb] \
 	      -command [list [namespace current]::recv_file_finish $winid $lang]]
 
-    if {[package vcompare 2.3.3 [package require http]] <= 0} {
+    if {[package vcompare 2.3.3 [package present http]] <= 0} {
 	lappend geturl -binary 1
     }
 

Modified: trunk/tkabber/proxy.tcl
===================================================================
--- trunk/tkabber/proxy.tcl	2009-03-29 11:14:31 UTC (rev 1762)
+++ trunk/tkabber/proxy.tcl	2009-03-29 20:05:22 UTC (rev 1763)
@@ -3,7 +3,7 @@
 package require pconnect::socks4
 package require pconnect::socks5
 package require pconnect::https
-package require http
+package require http 2
 
 namespace eval proxy {
     set tproxies {}



More information about the Tkabber-dev mailing list