[Tkabber-dev] r1927 - in trunk/tkabber: . ifacetk

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Tue Feb 23 12:35:52 MSK 2010


Author: sergei
Date: 2010-02-23 12:35:52 +0300 (Tue, 23 Feb 2010)
New Revision: 1927

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/ifacetk/roster.tcl
Log:
	* ifacetk/roster.tcl: Fixed commands in popup submenus if they contain
	  the menu path itself.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2010-02-22 09:51:52 UTC (rev 1926)
+++ trunk/tkabber/ChangeLog	2010-02-23 09:35:52 UTC (rev 1927)
@@ -1,3 +1,8 @@
+2010-02-23  Sergei Golovan  <sgolovan at nes.ru>
+
+	* ifacetk/roster.tcl: Fixed commands in popup submenus if they contain
+	  the menu path itself.
+
 2010-02-22  Sergei Golovan  <sgolovan at nes.ru>
 
 	* plugins/roster/bkup_conferences.tcl: Fixed storing roster conference

Modified: trunk/tkabber/ifacetk/roster.tcl
===================================================================
--- trunk/tkabber/ifacetk/roster.tcl	2010-02-22 09:51:52 UTC (rev 1926)
+++ trunk/tkabber/ifacetk/roster.tcl	2010-02-23 09:35:52 UTC (rev 1927)
@@ -1858,7 +1858,10 @@
 	if {![catch {$m1 index $label} idx] && $idx != "none"} {
 	    set command {}
 	    foreach opt $args {
-		lappend command [$m1 entrycget $idx $opt]
+		# In some commands menu path is used, which is destroyed after
+		# the submenus are created
+		lappend command [string map [list $m1 $m] \
+					    [$m1 entrycget $idx $opt]]
 	    }
 	    lappend command_list0 [list $label $command]
 	    lappend command_list1 [list $jid $command]



More information about the Tkabber-dev mailing list