[Tkabber-dev] r1668 - in trunk/tkabber-plugins: . georoster

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Tue Feb 17 09:32:30 MSK 2009


Author: sergei
Date: 2009-02-17 09:32:29 +0300 (Tue, 17 Feb 2009)
New Revision: 1668

Modified:
   trunk/tkabber-plugins/ChangeLog
   trunk/tkabber-plugins/georoster/georoster.tcl
Log:
	* georoster/georoster.tcl: Fixed retrieving stored georoster data.


Modified: trunk/tkabber-plugins/ChangeLog
===================================================================
--- trunk/tkabber-plugins/ChangeLog	2009-02-17 06:03:26 UTC (rev 1667)
+++ trunk/tkabber-plugins/ChangeLog	2009-02-17 06:32:29 UTC (rev 1668)
@@ -2,6 +2,8 @@
 
 	* georoster/georoster.tcl: Fixed typo.
 
+	* georoster/georoster.tcl: Fixed retrieving stored georoster data.
+
 2009-02-16  Sergei Golovan <sgolovan at nes.ru>
 
 	* georoster/georoster.tcl: Deleted references to roster aliases as

Modified: trunk/tkabber-plugins/georoster/georoster.tcl
===================================================================
--- trunk/tkabber-plugins/georoster/georoster.tcl	2009-02-17 06:03:26 UTC (rev 1667)
+++ trunk/tkabber-plugins/georoster/georoster.tcl	2009-02-17 06:32:29 UTC (rev 1668)
@@ -845,7 +845,7 @@
 
 ###############################################################################
 
-proc georoster::recv {xlib status xml} {
+proc georoster::recv {xlib status xmllist} {
     variable georoster
 
     if {$status != "ok"} {
@@ -854,22 +854,20 @@
 
     set georoster(jids,$xlib) {}
 
-    ::xmpp::xml::split $xml tag xmlns attrs cdata subels
+    foreach element $xmllist {
+	::xmpp::xml::split $element tag xmlns attrs cdata subels
 
-    foreach subel $subels {
-	::xmpp::xml::split $subel stag sxmlns sattrs scdata ssubels
-
-	foreach item $ssubels {
-	    ::xmpp::xml::split $item sstag ssxmlns sattrs sscdata sssubels
+	foreach item $subels {
+	    ::xmpp::xml::split $item stag sxmlns sattrs scdata ssubels
 	    set jid [::xmpp::xml::getAttr $sattrs jid]
 	    if {$jid != ""} {
 		lappend georoster(jids,$xlib) $jid
-		set georoster(lo,$xlib,$jid) [::xmpp::xml::getAttr $ssattrs lo]
-		set georoster(la,$xlib,$jid) [::xmpp::xml::getAttr $ssattrs la]
+		set georoster(lo,$xlib,$jid) [::xmpp::xml::getAttr $sattrs lo]
+		set georoster(la,$xlib,$jid) [::xmpp::xml::getAttr $sattrs la]
 	    }
 	}
     }
-    #after idle [list [namespace current]::redraw .georoster.c]
+    after idle [list [namespace current]::redraw .georoster.c]
 }
 
 ###############################################################################



More information about the Tkabber-dev mailing list