[Tkabber-dev] r1780 - trunk/tkabber

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Wed Apr 8 23:35:10 MSD 2009


Author: sergei
Date: 2009-04-08 23:35:10 +0400 (Wed, 08 Apr 2009)
New Revision: 1780

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/presence.tcl
   trunk/tkabber/roster.tcl
Log:
	* presence.tcl, roster.tcl: Changed the order in which Tkabber asks for
	  roster and sends initial presence to register roater XMLNS first and
	  create the correct caps hash.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2009-04-08 18:33:43 UTC (rev 1779)
+++ trunk/tkabber/ChangeLog	2009-04-08 19:35:10 UTC (rev 1780)
@@ -2,6 +2,10 @@
 
 	* msgs/de.msg: Updated German translation (thanks to Roger Sondermann).
 
+	* presence.tcl, roster.tcl: Changed the order in which Tkabber asks for
+	  roster and sends initial presence to register roater XMLNS first and
+	  create the correct caps hash.
+
 2009-04-05  Sergei Golovan  <sgolovan at nes.ru>
 
 	* ifacetk/iroster.tcl: Removed unused curuser variable.

Modified: trunk/tkabber/presence.tcl
===================================================================
--- trunk/tkabber/presence.tcl	2009-04-08 18:33:43 UTC (rev 1779)
+++ trunk/tkabber/presence.tcl	2009-04-08 19:35:10 UTC (rev 1780)
@@ -445,7 +445,7 @@
     hook::run change_our_presence_post_hook $userstatus
 }
 
-hook::add connected_hook [namespace current]::send_first_presence 10
+hook::add connected_hook [namespace current]::send_first_presence 15
 
 ###############################################################################
 
@@ -584,10 +584,9 @@
 proc custom_presence_menu {m xlib jid} {
     set chatid [chat::chatid $xlib [::xmpp::jid::stripResource $jid]]
     set chatid1 [chat::chatid $xlib $jid]
+
     if {[chat::is_groupchat $chatid] && ![chat::is_groupchat $chatid1]} {
-	set state disabled
-    } else {
-	set state normal
+	return
     }
 
     set mm [menu $m.custom_presence -tearoff 0]
@@ -606,7 +605,6 @@
 		    -command [list send_custom_presence $xlib $jid unavailable]
 
     $m add cascade -label [::msgcat::mc "Send custom presence"] \
-		   -state $state \
 		   -menu $mm
 }
 

Modified: trunk/tkabber/roster.tcl
===================================================================
--- trunk/tkabber/roster.tcl	2009-04-08 18:33:43 UTC (rev 1779)
+++ trunk/tkabber/roster.tcl	2009-04-08 19:35:10 UTC (rev 1780)
@@ -87,7 +87,7 @@
     ::xmpp::roster::get $roster(token,$xlib) -command [list client:roster_cmd $xlib]
 }
 
-hook::add connected_hook [namespace current]::roster::request_roster 15
+hook::add connected_hook [namespace current]::roster::request_roster 10
 
 proc roster::clean {xlib} {
     variable roster



More information about the Tkabber-dev mailing list