[Tkabber-dev] r1187 - trunk/tkabber

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Thu Aug 16 02:42:46 MSD 2007


Author: sergei
Date: 2007-08-16 02:42:46 +0400 (Thu, 16 Aug 2007)
New Revision: 1187

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/datagathering.tcl
   trunk/tkabber/disco.tcl
   trunk/tkabber/messages.tcl
   trunk/tkabber/tkabber.tcl
Log:
	* datagathering.tcl: Register jabber:x:data to show in disco#info
	  responses (closes:
	  http://www.jabber.ru/bugzilla/show_bug.cgi?id=365).

	* messages.tcl: Register jabber:x:oob to show in disco#info
	  responses (closes:
	  http://www.jabber.ru/bugzilla/show_bug.cgi?id=366).

	* disco.tcl: Sort features list on sending disco#info response.

	* tkabber.tcl: Reordered files sourcesd at Tkabber start to allow
	  registering jabber:x:oob as a disco feature in messages.tcl.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2007-08-15 15:51:11 UTC (rev 1186)
+++ trunk/tkabber/ChangeLog	2007-08-15 22:42:46 UTC (rev 1187)
@@ -1,3 +1,18 @@
+2007-08-16  Sergei Golovan  <sgolovan at nes.ru>
+
+	* datagathering.tcl: Register jabber:x:data to show in disco#info
+	  responses (closes:
+	  http://www.jabber.ru/bugzilla/show_bug.cgi?id=365).
+
+	* messages.tcl: Register jabber:x:oob to show in disco#info
+	  responses (closes:
+	  http://www.jabber.ru/bugzilla/show_bug.cgi?id=366).
+
+	* disco.tcl: Sort features list on sending disco#info response.
+
+	* tkabber.tcl: Reordered files sourcesd at Tkabber start to allow
+	  registering jabber:x:oob as a disco feature in messages.tcl.
+
 2007-08-15  Sergei Golovan  <sgolovan at nes.ru>
 
 	* examples/tools/jsend.tcl, examples/tools/rssbot.tcl: Fixed sending

Modified: trunk/tkabber/datagathering.tcl
===================================================================
--- trunk/tkabber/datagathering.tcl	2007-08-15 15:51:11 UTC (rev 1186)
+++ trunk/tkabber/datagathering.tcl	2007-08-15 22:42:46 UTC (rev 1187)
@@ -26,6 +26,8 @@
 	misc         [::msgcat::mc "Misc:"] \
 	text         [::msgcat::mc "Text:"] \
 	key          [::msgcat::mc "Key:"]]
+
+    disco::register_feature jabber:x:data
 }
 
 proc data::fill_fields {g items} {

Modified: trunk/tkabber/disco.tcl
===================================================================
--- trunk/tkabber/disco.tcl	2007-08-15 15:51:11 UTC (rev 1186)
+++ trunk/tkabber/disco.tcl	2007-08-15 22:42:46 UTC (rev 1187)
@@ -304,14 +304,10 @@
 					 type pc \
 					 name Tkabber]]
 
-	foreach ns $::iq::supported_ns {
+	foreach ns [lsort [concat $::iq::supported_ns $supported_features]] {
 	    lappend restags [jlib::wrapper:createtag feature \
 				 -vars [list var $ns]]
 	}
-	foreach ns $supported_features {
-	    lappend restags [jlib::wrapper:createtag feature \
-				 -vars [list var $ns]]
-	}
     
 	set res [jlib::wrapper:createtag query \
 		     -vars [list xmlns $::NS(disco_info)] \

Modified: trunk/tkabber/messages.tcl
===================================================================
--- trunk/tkabber/messages.tcl	2007-08-15 15:51:11 UTC (rev 1186)
+++ trunk/tkabber/messages.tcl	2007-08-15 22:42:46 UTC (rev 1187)
@@ -12,6 +12,8 @@
 
     custom::defgroup Messages [::msgcat::mc "Message and Headline options."] \
 	-group Tkabber
+
+    disco::register_feature jabber:x:oob
 }
 
 proc message::process_message {connid from id type is_subject subject body err thread priority x} {

Modified: trunk/tkabber/tkabber.tcl
===================================================================
--- trunk/tkabber/tkabber.tcl	2007-08-15 15:51:11 UTC (rev 1186)
+++ trunk/tkabber/tkabber.tcl	2007-08-15 22:42:46 UTC (rev 1187)
@@ -229,6 +229,8 @@
 load_source balloon.tcl
 load_source presence.tcl
 load_source iq.tcl
+load_source browser.tcl
+load_source disco.tcl
 load_source roster.tcl
 load_source itemedit.tcl
 load_source messages.tcl
@@ -236,8 +238,6 @@
 load_source joingrdialog.tcl
 load_source muc.tcl
 load_source login.tcl
-load_source browser.tcl
-load_source disco.tcl
 load_source userinfo.tcl
 load_source datagathering.tcl
 load_source negotiate.tcl



More information about the Tkabber-dev mailing list