[Tkabber-dev] r1540 - in trunk/tkabber: . plugins/general

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sat Oct 18 01:14:33 MSD 2008


Author: sergei
Date: 2008-10-18 01:14:33 +0400 (Sat, 18 Oct 2008)
New Revision: 1540

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/plugins/general/rawxml.tcl
Log:
	* plugins/general/rawxml.tcl: Fixed window coloring.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2008-10-17 19:55:02 UTC (rev 1539)
+++ trunk/tkabber/ChangeLog	2008-10-17 21:14:33 UTC (rev 1540)
@@ -57,6 +57,8 @@
 	* login.tcl: Added server JID as to address when registering new
 	  username.
 
+	* plugins/general/rawxml.tcl: Fixed window coloring.
+
 2008-10-11  Sergei Golovan  <sgolovan at nes.ru>
 
 	* AUTHORS: Fixed authors list.

Modified: trunk/tkabber/plugins/general/rawxml.tcl
===================================================================
--- trunk/tkabber/plugins/general/rawxml.tcl	2008-10-17 19:55:02 UTC (rev 1539)
+++ trunk/tkabber/plugins/general/rawxml.tcl	2008-10-17 21:14:33 UTC (rev 1540)
@@ -105,16 +105,16 @@
     variable options
     variable tabs
 
-    ::xmpp::xml::split $xmldata tag xmlns attrs cdata subels
+    ::xmpp::xml::split $xmldata stag xmlns attrs cdata subels
 
     set attrs1 $attrs
-    if {$pxmlns != $xmlns} {
+    if {$pxmlns != $xmlns && $xmlns != ""} {
 	lappend attrs1 xmlns $xmlns
     }
 
-    $t insert end "$prefix<" {} $tag ${tag}tag
+    $t insert end "$prefix<" {} $stag ${tag}tag
     if {[llength $attrs1] != 0} {
-	set arr_index "$prefix<$tag "
+	set arr_index "$prefix<$stag "
 	if {![info exists tabs($arr_index)]} {
 	    set tabs($arr_index) [font measure [$t cget -font] $arr_index]
 	}
@@ -141,7 +141,7 @@
 
     if {[llength $subels] == 0} {
 	$t insert end [::xmpp::xml::Escape $cdata] ${tag}cdata
-	$t insert end "</" {} $tag ${tag}tag ">\n"
+	$t insert end "</" {} $stag ${tag}tag ">\n"
     } else {
 	$t insert end "\n"
         foreach subdata $subels {
@@ -149,7 +149,7 @@
 		$prefix[string repeat " " $options(indent)] $tag \
 		$xmlns
 	}
-	$t insert end "$prefix</" {} $tag ${tag}tag ">\n"
+	$t insert end "$prefix</" {} $stag ${tag}tag ">\n"
     }
 }
 



More information about the Tkabber-dev mailing list