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

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sat Nov 15 11:32:41 MSK 2008


Author: sergei
Date: 2008-11-15 11:32:40 +0300 (Sat, 15 Nov 2008)
New Revision: 1614

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/ifacetk/systray.tcl
   trunk/tkabber/register.tcl
Log:
	* register.tcl: Fixed keyboard bindings in register window (thanks to
	  Konstantin Khomoutov).

	* ifacetk/systray.tcl: Fixed invocation of location callback.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2008-11-14 21:07:35 UTC (rev 1613)
+++ trunk/tkabber/ChangeLog	2008-11-15 08:32:40 UTC (rev 1614)
@@ -1,3 +1,10 @@
+2008-11-15  Sergei Golovan  <sgolovan at nes.ru>
+
+	* register.tcl: Fixed keyboard bindings in register window (thanks to
+	  Konstantin Khomoutov).
+
+	* ifacetk/systray.tcl: Fixed invocation of location callback.
+
 2008-11-11  Sergei Golovan  <sgolovan at nes.ru>
 
 	* plugins/chat/draw_xhtml_message.tcl: Fixed another typo.

Modified: trunk/tkabber/ifacetk/systray.tcl
===================================================================
--- trunk/tkabber/ifacetk/systray.tcl	2008-11-14 21:07:35 UTC (rev 1613)
+++ trunk/tkabber/ifacetk/systray.tcl	2008-11-15 08:32:40 UTC (rev 1614)
@@ -327,7 +327,7 @@
 	    }
 	    balloon::set_text $text
 	    if {[info exists state(location)]} {
-		lassign [$state(location) $icon] x y
+		lassign [uplevel #0 $state(location) [list $icon]] x y
 	    } else {
 		set x [winfo rootx $icon]
 		set y [winfo rooty $icon]

Modified: trunk/tkabber/register.tcl
===================================================================
--- trunk/tkabber/register.tcl	2008-11-14 21:07:35 UTC (rev 1613)
+++ trunk/tkabber/register.tcl	2008-11-15 08:32:40 UTC (rev 1614)
@@ -240,8 +240,8 @@
 	    destroy $w.bbox
 	    set bbox [ButtonBox $w.bbox -spacing 0 -padx 10 -default 0]
 	    $bbox add -text [::msgcat::mc "Close"] -command [list destroy $w]
-	    bind $w <Return> "ButtonBox::invoke $w.bbox1 default"
-	    bind $w <Escape> "ButtonBox::invoke $w.bbox1 0"
+	    bind $w <Return> "ButtonBox::invoke $bbox default"
+	    bind $w <Escape> "ButtonBox::invoke $bbox 0"
 	    pack $bbox -padx 2m -pady 2m -anchor e -side bottom -before $w.sep
 	}
 	continue {



More information about the Tkabber-dev mailing list