[Tkabber-dev] r1538 - trunk/tkabber

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Fri Oct 17 23:29:47 MSD 2008


Author: sergei
Date: 2008-10-17 23:29:46 +0400 (Fri, 17 Oct 2008)
New Revision: 1538

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/messages.tcl
   trunk/tkabber/muc.tcl
   trunk/tkabber/userinfo.tcl
Log:
	* muc.tcl, userinfo.tcl, messages.tcl: Fixed cdata notation.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2008-10-17 19:28:53 UTC (rev 1537)
+++ trunk/tkabber/ChangeLog	2008-10-17 19:29:46 UTC (rev 1538)
@@ -52,6 +52,8 @@
 
 	* plugins/roster/conferenceinfo.tcl: Fixed main menu item command.
 
+	* muc.tcl, userinfo.tcl, messages.tcl: Fixed cdata notation.
+
 2008-10-11  Sergei Golovan  <sgolovan at nes.ru>
 
 	* AUTHORS: Fixed authors list.

Modified: trunk/tkabber/messages.tcl
===================================================================
--- trunk/tkabber/messages.tcl	2008-10-17 19:28:53 UTC (rev 1537)
+++ trunk/tkabber/messages.tcl	2008-10-17 19:29:46 UTC (rev 1538)
@@ -508,14 +508,14 @@
                 continue
             }
 
-            if {[catch { ssj::${tag}:output $xlib $params(-body) $to } chdata]} {
-                debugmsg message "ssj::${tag}:output: $chdata"
+            if {[catch { ssj::${tag}:output $xlib $params(-body) $to } cdata]} {
+                debugmsg message "ssj::${tag}:output: $cdata"
                 return [list error ssj]
             }
             
-            if {![cequal $chdata ""]} {
+            if {![cequal $cdata ""]} {
                 lappend xs [::xmpp::xml::create x \
-                                -xmlns jabber:x:$tag -cdata $chdata]
+                                -xmlns jabber:x:$tag -cdata $cdata]
                 if {[cequal $tag encrypted]} {
                     set params(-body) [::msgcat::mc "This message is encrypted."]
                 }

Modified: trunk/tkabber/muc.tcl
===================================================================
--- trunk/tkabber/muc.tcl	2008-10-17 19:28:53 UTC (rev 1537)
+++ trunk/tkabber/muc.tcl	2008-10-17 19:29:46 UTC (rev 1538)
@@ -1626,7 +1626,7 @@
 			    # TODO decline
 			}
 			password {
-			    set password $schdata
+			    set password $scdata
 			}
 		    }
 		}

Modified: trunk/tkabber/userinfo.tcl
===================================================================
--- trunk/tkabber/userinfo.tcl	2008-10-17 19:28:53 UTC (rev 1537)
+++ trunk/tkabber/userinfo.tcl	2008-10-17 19:29:46 UTC (rev 1538)
@@ -893,12 +893,12 @@
     }
 }
 
-proc userinfo::append_tag {varname tag chdata {subtags {}}} {
+proc userinfo::append_tag {varname tag cdata {subtags {}}} {
     upvar $varname tags
 
-    if {$chdata != "" || $subtags != {}} {
+    if {$cdata != "" || $subtags != {}} {
 	lappend tags [::xmpp::xml::create $tag \
-				-cdata $chdata \
+				-cdata $cdata \
 				-subelements $subtags]
     }
 }



More information about the Tkabber-dev mailing list