[Tkabber-dev] r1784 - trunk/tkabber

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Tue Apr 21 20:42:46 MSD 2009


Author: sergei
Date: 2009-04-21 20:42:45 +0400 (Tue, 21 Apr 2009)
New Revision: 1784

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/pubsub.tcl
Log:
	* pubsub.tcl: Fixed requesting pubsub subscriptions.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2009-04-21 12:12:48 UTC (rev 1783)
+++ trunk/tkabber/ChangeLog	2009-04-21 16:42:45 UTC (rev 1784)
@@ -1,6 +1,6 @@
 2009-04-21  Sergei Golovan  <sgolovan at nes.ru>
 
-	* pubsub.tcl: Fixed typo.
+	* pubsub.tcl: Fixed typo. Also, fixed requesting pubsub subscriptions.
 
 2009-04-10  Sergei Golovan  <sgolovan at nes.ru>
 

Modified: trunk/tkabber/pubsub.tcl
===================================================================
--- trunk/tkabber/pubsub.tcl	2009-04-21 12:12:48 UTC (rev 1783)
+++ trunk/tkabber/pubsub.tcl	2009-04-21 16:42:45 UTC (rev 1784)
@@ -91,7 +91,7 @@
 	    -command [list data::test_error_res $w]
 }
 
-proc pubsub::retrieveSubscriptions {xlib service node} {
+proc pubsub::requestSubscriptions {xlib service node} {
     debugmsg pubsub [info level 0]
 
     if {$node == ""} {
@@ -101,10 +101,10 @@
     }
 
     eval {::xmpp::pubsub::requestSubscriptions $xlib $service} $args \
-	 {-command [namespace code [list RetrieveSubscriptionsResult $xlib $service]]}
+	 {-command [namespace code [list RequestSubscriptionsResult $xlib $service]]}
 }
 
-proc pubsub::RetrieveSubscriptionsResult {xlib service status items} {
+proc pubsub::RequestSubscriptionsResult {xlib service status items} {
     debugmsg pubsub [info level 0]
 
     if {![string equal $status ok]} {
@@ -642,6 +642,10 @@
 
 proc pubsub::disco_node_menu_setup {m bw tnode data parentdata} {
     lassign $data type xlib jid node
+    lassign $parentdata ptype pxlib pjid pnode
+
+    if {$pjid != $jid} return
+
     switch -- $type {
 	item -
 	item2 {



More information about the Tkabber-dev mailing list