[Tkabber-dev] r1815 - in trunk/tkabber: . plugins/general

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sat Jul 25 23:38:32 MSD 2009


Author: sergei
Date: 2009-07-25 23:38:32 +0400 (Sat, 25 Jul 2009)
New Revision: 1815

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/plugins/general/xcommands.tcl
Log:
	* plugins/general/xcommands.tcl:
	  Fixed Escape key binding for ad-hoc command windows. Added id to
	  cancel requests.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2009-07-25 10:52:17 UTC (rev 1814)
+++ trunk/tkabber/ChangeLog	2009-07-25 19:38:32 UTC (rev 1815)
@@ -2,6 +2,8 @@
 
 	* plugins/general/xcommands.tcl: Made ad-hoc command window
 	  non-transitive which is more suitable for long-lived dialogs.
+	  Fixed Escape key binding for ad-hoc command windows. Added id to
+	  cancel requests.
 
 2009-07-17  Sergei Golovan  <sgolovan at nes.ru>
 

Modified: trunk/tkabber/plugins/general/xcommands.tcl
===================================================================
--- trunk/tkabber/plugins/general/xcommands.tcl	2009-07-25 10:52:17 UTC (rev 1814)
+++ trunk/tkabber/plugins/general/xcommands.tcl	2009-07-25 19:38:32 UTC (rev 1815)
@@ -157,7 +157,7 @@
     }
     # Can't configure -cancel option because of bug in BWidget
     # $w configure -cancel $cancel
-    bind $w <Escape> [list %W invoke $cancel]
+    bind $w <Escape> [list $w.bbox invoke $cancel]
     bind $f <Destroy> [list data::cleanup %W]
 
     bindscroll $f $sf
@@ -384,14 +384,14 @@
 	-query [::xmpp::xml::create command \
 			-xmlns $::NS(commands) \
 			-attrs $vars] \
+	-command [namespace code cancel_result] \
 	-to $jid
 
-    set f [$w.fields getframe]
-    data::cleanup $f
-
-    destroy $w
+    close_window $w
 }
 
+proc xcommands::cancel_result {args} {}
+
 ##########################################################################
 
 proc xcommands::close_window {w} {



More information about the Tkabber-dev mailing list