[Tkabber-dev] r705 - in trunk/tkabber: . jabberlib-tclxml

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sun Sep 3 23:44:27 MSD 2006


Author: sergei
Date: 2006-09-03 23:44:18 +0400 (Sun, 03 Sep 2006)
New Revision: 705

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/jabberlib-tclxml/jabberlib.tcl
Log:
	* jabberlib-tclxml/jabberlib.tcl: Fixed processing presence of
	  type "error"


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2006-08-18 12:33:40 UTC (rev 704)
+++ trunk/tkabber/ChangeLog	2006-09-03 19:44:18 UTC (rev 705)
@@ -1,3 +1,18 @@
+2006-09-03  Serhei Golovan  <sgolovan at nes.ru>
+
+	* jabberlib-tclxml/jabberlib.tcl: Fixed processing presence of
+	  type "error"
+
+2006-08-18  Sergei Golovan  <sgolovan at nes.ru>
+
+	* pixmaps/*/*.gif: svn:mime-type property is set to
+	  application/octet-stream to avoid corruption when downloading
+	  on nonunix systems
+	  (Closes: http://www.jabber.ru/bugzilla/show_bug.cgi?id=256)
+
+	* plugins/general/rawxml.tcl, plugins/search/rawxml.tcl:
+	  Search in Raw XML window is added
+
 2006-08-17  Sergei Golovan  <sgolovan at nes.ru>
 
 	* plugins/search/chat.tcl, plugins/search/logger.tcl,

Modified: trunk/tkabber/jabberlib-tclxml/jabberlib.tcl
===================================================================
--- trunk/tkabber/jabberlib-tclxml/jabberlib.tcl	2006-08-18 12:33:40 UTC (rev 704)
+++ trunk/tkabber/jabberlib-tclxml/jabberlib.tcl	2006-09-03 19:44:18 UTC (rev 705)
@@ -1048,7 +1048,11 @@
 		wrapper:splitxml $child ctag cvars cisempty cchdata cchildren
 
 		switch -- $ctag {
-		    status   {lappend param -status   $cchdata}
+		    status   {
+			if {$type != "error"} {
+			    lappend param -status $cchdata
+			}
+		    }
 		    priority {lappend param -priority $cchdata}
 		    meta     {lappend param -meta     $cchdata}
 		    icon     {lappend param -icon     $cchdata}
@@ -1056,15 +1060,17 @@
 		    loc      {lappend param -loc      $cchdata}
 		    x        {lappend x $child}
 		    error {
-			set errcode [wrapper:getattr $cvars code]
-			set errtype [wrapper:getattr $cvars type]
-			if {$errtype == ""} {
-			    set err [list $errcode $cchdata]
-			} else {
-			    set err [list $errtype $child]
+			if {$type == "error"} {
+			    set errcode [wrapper:getattr $cvars code]
+			    set errtype [wrapper:getattr $cvars type]
+			    if {$errtype == ""} {
+				set err [list $errcode $cchdata]
+			    } else {
+				set err [list $errtype $child]
+			    }
+			    lappend param -status [lindex [stanzaerror::error_to_list $err] 2]
+			    lappend param -error [lrange [stanzaerror::error_to_list $err] 0 1]
 			}
-			lappend param -status [lindex [stanzaerror::error_to_list $err] 2]
-			lappend param -error [lrange [stanzaerror::error_to_list $err] 0 1]
 		    }
 		}
 	    }



More information about the Tkabber-dev mailing list