[Tkabber-dev] r1892 - trunk/tkabber

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sun Jan 24 17:18:15 MSK 2010


Author: sergei
Date: 2010-01-24 17:18:15 +0300 (Sun, 24 Jan 2010)
New Revision: 1892

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/joingrdialog.tcl
Log:
	* joingrdialog.tcl: Fixed calls to JID normalization where chatid was
	  passed to xmpp::jid::normalize instead of JID itself.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2010-01-24 08:45:56 UTC (rev 1891)
+++ trunk/tkabber/ChangeLog	2010-01-24 14:18:15 UTC (rev 1892)
@@ -5,6 +5,9 @@
 
 	* msgs/de.msg: Updated German translation (thanks to Roger Sondermann).
 
+	* joingrdialog.tcl: Fixed calls to JID normalization where chatid was
+	  passed to xmpp::jid::normalize instead of JID itself.
+
 2010-01-23  Sergei Golovan  <sgolovan at nes.ru>
 
 	* login.tcl, roster.tcl: Use xmpp::register package from TclXMPP.

Modified: trunk/tkabber/joingrdialog.tcl
===================================================================
--- trunk/tkabber/joingrdialog.tcl	2010-01-24 08:45:56 UTC (rev 1891)
+++ trunk/tkabber/joingrdialog.tcl	2010-01-24 14:18:15 UTC (rev 1892)
@@ -164,22 +164,24 @@
     chat::activate [chat::chatid $xlib $group]
 }
 
-proc set_our_groupchat_nick {group nick} {
+proc set_our_groupchat_nick {chatid nick} {
     global groupchats
 
-    debugmsg conference "SET NICK: $group '$nick'"
+    debugmsg conference "SET NICK: $chatid '$nick'"
 
-    set group [::xmpp::jid::normalize $group]
-    set groupchats(nick,$group) $nick
+    set xlib [chat::get_xlib $chatid]
+    set group [::xmpp::jid::normalize [chat::get_jid $chatid]]
+    set groupchats(nick,$xlib,$group) $nick
 }
 
-proc get_our_groupchat_nick {group} {
+proc get_our_groupchat_nick {chatid} {
     global groupchats
     
-    debugmsg conference "GET NICK: $group"
+    debugmsg conference "GET NICK: $chatid"
 
-    set group [::xmpp::jid::normalize $group]
-    return $groupchats(nick,$group)
+    set xlib [chat::get_xlib $chatid]
+    set group [::xmpp::jid::normalize [chat::get_jid $chatid]]
+    return $groupchats(nick,$xlib,$group)
 }
 
 ###############################################################################



More information about the Tkabber-dev mailing list