[Tkabber-dev] r1740 - trunk/tkabber

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Fri Mar 20 17:42:32 MSK 2009


Author: sergei
Date: 2009-03-20 17:42:32 +0300 (Fri, 20 Mar 2009)
New Revision: 1740

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/muc.tcl
Log:
	* muc.tcl: Fixed MUC item in disco popup menu.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2009-03-20 09:23:11 UTC (rev 1739)
+++ trunk/tkabber/ChangeLog	2009-03-20 14:42:32 UTC (rev 1740)
@@ -3,6 +3,8 @@
 	* messages.tcl: Put messages in the message archive only if they have
 	  non-empty body.
 
+	* muc.tcl: Fixed MUC item in disco popup menu.
+
 2009-03-17  Sergei Golovan  <sgolovan at nes.ru>
 
 	* messages.tcl: Don't create subject menu on every incoming message.

Modified: trunk/tkabber/muc.tcl
===================================================================
--- trunk/tkabber/muc.tcl	2009-03-20 09:23:11 UTC (rev 1739)
+++ trunk/tkabber/muc.tcl	2009-03-20 14:42:32 UTC (rev 1740)
@@ -118,10 +118,8 @@
 
 ###############################################################################
 
-proc muc::add_muc_menu_items {m xlib group} {
-    if {![is_compatible $group]} {
-	set state disabled
-    } else {
+proc muc::add_muc_menu_items {m xlib group {state disabled}} {
+    if {[is_compatible $group]} {
 	set state normal
     }
 
@@ -179,7 +177,7 @@
 		if {[::xmpp::xml::getAttr $id category] == "conference"} {
 		    foreach f $features {
 			if {$f == $::NS(muc)} {
-			    add_muc_menu_items $m [chat::chatid $xlib $jid] end
+			    add_muc_menu_items $m $xlib $jid normal
 			    return
 			}
 		    }



More information about the Tkabber-dev mailing list