[Tkabber-dev] r1731 - in trunk/tkabber: . plugins/roster

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sat Mar 14 19:55:42 MSK 2009


Author: sergei
Date: 2009-03-14 19:55:42 +0300 (Sat, 14 Mar 2009)
New Revision: 1731

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/muc.tcl
   trunk/tkabber/plugins/roster/conferences.tcl
Log:
	* muc.tcl: Treat conference room as MUC-compatible if its server is.

	* plugins/roster/conferences.tcl: Fixed adding MUC commands to a
	  bookmark roster item.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2009-03-14 15:59:30 UTC (rev 1730)
+++ trunk/tkabber/ChangeLog	2009-03-14 16:55:42 UTC (rev 1731)
@@ -12,6 +12,11 @@
 	* plugins/general/xcommands.tcl: Added ad-hoc commands submenu to all
 	  popup menus.
 
+	* muc.tcl: Treat conference room as MUC-compatible if its server is.
+
+	* plugins/roster/conferences.tcl: Fixed adding MUC commands to a
+	  bookmark roster item.
+
 2009-03-13  Sergei Golovan  <sgolovan at nes.ru>
 
 	* plugins/general/captcha.tcl: Renamed from challenge.tcl and added

Modified: trunk/tkabber/muc.tcl
===================================================================
--- trunk/tkabber/muc.tcl	2009-03-14 15:59:30 UTC (rev 1730)
+++ trunk/tkabber/muc.tcl	2009-03-14 16:55:42 UTC (rev 1731)
@@ -1404,6 +1404,7 @@
 
     if {[string equal $res ok] && [lsearch -exact $features $::NS(muc)] >= 0} {
 	set muc_compatible($group) 1
+	set muc_compatible([::xmpp::jid::server $group]) 1
 	return
     }
 
@@ -1428,6 +1429,8 @@
 
     if {[info exists muc_compatible($group)]} {
 	return $muc_compatible($group)
+    } elseif {[info exists muc_compatible([::xmpp::jid::server $group])]} {
+	return $muc_compatible([::xmpp::jid::server $group])
     } else {
 	return 0
     }

Modified: trunk/tkabber/plugins/roster/conferences.tcl
===================================================================
--- trunk/tkabber/plugins/roster/conferences.tcl	2009-03-14 15:59:30 UTC (rev 1730)
+++ trunk/tkabber/plugins/roster/conferences.tcl	2009-03-14 16:55:42 UTC (rev 1731)
@@ -787,7 +787,7 @@
 				  $args]
 
     # TODO: Check for real MUC? Move to muc.tcl?
-    muc::add_muc_menu_items $m [chat::chatid $xlib $jid] end
+    muc::add_muc_menu_items $m $xlib $jid
 }   
 
 hook::add roster_conference_popup_menu_hook \



More information about the Tkabber-dev mailing list