[Tkabber-dev] r1555 - trunk/tkabber

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sat Oct 18 22:47:30 MSD 2008


Author: sergei
Date: 2008-10-18 22:47:30 +0400 (Sat, 18 Oct 2008)
New Revision: 1555

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/presence.tcl
Log:
	* presence.tcl: Show error messages in contact status, as it was
	  before switching to a new library.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2008-10-18 14:13:37 UTC (rev 1554)
+++ trunk/tkabber/ChangeLog	2008-10-18 18:47:30 UTC (rev 1555)
@@ -46,6 +46,9 @@
 
 	* plugins/roster/backup.tcl: Fixed roster backup.
 
+	* presence.tcl: Show error messages in contact status, as it was
+	  before switching to a new library.
+
 2008-10-17  Sergei Golovan  <sgolovan at nes.ru>
 
 	* plugins/general/sound.tcl: Cleared sound external program option

Modified: trunk/tkabber/presence.tcl
===================================================================
--- trunk/tkabber/presence.tcl	2008-10-18 14:13:37 UTC (rev 1554)
+++ trunk/tkabber/presence.tcl	2008-10-18 18:47:30 UTC (rev 1555)
@@ -227,7 +227,9 @@
     global presence
 
     set jid [get_jid_of_user $xlib $user]
-    if {[info exists presence(status,$xlib,$jid)]} {
+    if {[info exists presence(error,$xlib,$jid)]} {
+	return [::xmpp::stanzaerror::message $presence(error,$xlib,$jid)]
+    } elseif {[info exists presence(status,$xlib,$jid)]} {
 	return $presence(status,$xlib,$jid)
     } else {
 	return ""



More information about the Tkabber-dev mailing list