[Tkabber-dev] r955 - in trunk/tkabber: . plugins/unix

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Wed Feb 21 00:19:17 MSK 2007


Author: sergei
Date: 2007-02-21 00:19:14 +0300 (Wed, 21 Feb 2007)
New Revision: 955

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/plugins/unix/icon.tcl
Log:
	* plugins/unix/icon.tcl: Removed version check, since colored icons
	  are supported not only in Tcl/Tk 8.5.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2007-02-20 18:35:54 UTC (rev 954)
+++ trunk/tkabber/ChangeLog	2007-02-20 21:19:14 UTC (rev 955)
@@ -8,6 +8,9 @@
 	  msgs/ru.msg, msgs/uk.msg, search.tcl: Fixed typos in translatable
 	  messages.
 
+	* plugins/unix/icon.tcl: Removed version check, since colored icons
+	  are supported not only in Tcl/Tk 8.5.
+
 2007-02-18  Sergei Golovan  <sgolovan at nes.ru>
 
 	* plugins/chat/postpone.tcl: Added new plugin, which allows to

Modified: trunk/tkabber/plugins/unix/icon.tcl
===================================================================
--- trunk/tkabber/plugins/unix/icon.tcl	2007-02-20 18:35:54 UTC (rev 954)
+++ trunk/tkabber/plugins/unix/icon.tcl	2007-02-20 21:19:14 UTC (rev 955)
@@ -1,8 +1,6 @@
 # $Id$
 # Titlebar icons support. Works with Tk 8.5 or newer.
 
-if {[info tclversion] < 8.5} return
-
 ##########################################################################
 
 namespace eval icon {
@@ -12,7 +10,7 @@
 ##########################################################################
 
 proc icon::win_icons {} {
-    wm iconphoto . roster/user/unavailable
+    if {[catch {wm iconphoto . roster/user/unavailable}]} return
 
     trace variable ::curuserstatus w [namespace code update_icon]
 
@@ -54,10 +52,12 @@
 ##########################################################################
 
 proc icon::update_all_icons {} {
-    foreach w [concat . [winfo children .]] {
-	win_icon_setup $w
+    catch {
+	foreach w [concat . [winfo children .]] {
+	    win_icon_setup $w
+	}
+	update_icon curuserstatus
     }
-    update_icon curuserstatus
 }
 
 hook::add set_theme_hook [namespace current]::icon::update_all_icons



More information about the Tkabber-dev mailing list