[Tkabber-dev] r1778 - trunk/tkabber

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sun Apr 5 23:19:58 MSD 2009


Author: sergei
Date: 2009-04-05 23:19:58 +0400 (Sun, 05 Apr 2009)
New Revision: 1778

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/pubsub.tcl
Log:
	* pubsub.tcl: Fixed referring to pubsub namespaces.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2009-04-05 18:20:40 UTC (rev 1777)
+++ trunk/tkabber/ChangeLog	2009-04-05 19:19:58 UTC (rev 1778)
@@ -15,6 +15,8 @@
 	* pubsub.tcl: Added simple user interface for subscription,
 	  unsubscription and configuring subscription.
 
+	* pubsub.tcl: Fixed referring to pubsub namespaces.
+
 2009-04-02  Sergei Golovan  <sgolovan at nes.ru>
 
 	* plugins/general/comm.tcl, tkabber-remote.tcl: Made errors from a

Modified: trunk/tkabber/pubsub.tcl
===================================================================
--- trunk/tkabber/pubsub.tcl	2009-04-05 18:20:40 UTC (rev 1777)
+++ trunk/tkabber/pubsub.tcl	2009-04-05 19:19:58 UTC (rev 1778)
@@ -272,12 +272,10 @@
 #
 
 proc pubsub::request_pending_subscription {xlib service} {
-    variable ns
-
     debugmsg pubsub [info level 0]
 
     # Let xcommands.tcl do the job
-    xcommands::execute $xlib $service $ns(get-pending)
+    xcommands::execute $xlib $service $::xmpp::pubsub::ns(get-pending)
 }
 
 ##########################################################################
@@ -612,7 +610,6 @@
 proc pubsub::process_event_notification {xlib from mid type is_subject subject body \
     err thread priority x} {
 
-    variable ns
     variable handler
 
     set res ""
@@ -621,7 +618,7 @@
 	::xmpp::xml::split $event tag xmlns attrs cdata subels
 
 	if {![string equal $tag event]} continue
-	if {![string equal $xmlns $ns(event)]} continue
+	if {![string equal $xmlns $::xmpp::pubsub::ns(event)]} continue
 
 	foreach item $subels {
 	    ::xmpp::xml::split $item stag sxmlns sattrs scdata ssubels



More information about the Tkabber-dev mailing list