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

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Fri Feb 9 15:40:19 MSK 2007


Author: sergei
Date: 2007-02-09 15:40:16 +0300 (Fri, 09 Feb 2007)
New Revision: 910

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/pixmaps.tcl
   trunk/tkabber/plugins/unix/icon.tcl
Log:
	* Removed just added hook (it duplicates existing hook).


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2007-02-09 12:28:49 UTC (rev 909)
+++ trunk/tkabber/ChangeLog	2007-02-09 12:40:16 UTC (rev 910)
@@ -4,8 +4,7 @@
 	  do not start file transfer.
 
 	* pixmaps.tcl: Made possible to add pixmap directories during
-	  startup. Added hook pixmaps_theme_changed, which is run after the
-	  pixmaps theme was changed.
+	  startup.
 	
 	* plugins/unix/icon.tcl: Fixed window icons changes when pixmaps theme
 	  is changed.

Modified: trunk/tkabber/pixmaps.tcl
===================================================================
--- trunk/tkabber/pixmaps.tcl	2007-02-09 12:28:49 UTC (rev 909)
+++ trunk/tkabber/pixmaps.tcl	2007-02-09 12:40:16 UTC (rev 910)
@@ -43,7 +43,9 @@
 proc pixmaps::load_stored_theme {args} {
     variable options
 
-    load_theme $options(pixmaps_theme)
+    if {[catch {load_theme $options(pixmaps_theme)}]} {
+	set options(pixmaps_theme) Default
+    }
 
     hook::run set_theme_hook
 }
@@ -109,8 +111,6 @@
 
     load_dir $themes(Default)
     load_dir $themes($theme)
-
-    hook::run pixmaps_theme_changed $theme
 }
 
 ###############################################################################

Modified: trunk/tkabber/plugins/unix/icon.tcl
===================================================================
--- trunk/tkabber/plugins/unix/icon.tcl	2007-02-09 12:28:49 UTC (rev 909)
+++ trunk/tkabber/plugins/unix/icon.tcl	2007-02-09 12:40:16 UTC (rev 910)
@@ -53,14 +53,14 @@
 
 ##########################################################################
 
-proc icon::update_all_icons {args} {
+proc icon::update_all_icons {} {
     foreach w [concat . [winfo children .]] {
 	win_icon_setup $w
     }
     update_icon curuserstatus
 }
 
-hook::add pixmaps_theme_changed [namespace current]::icon::update_all_icons
+hook::add set_theme_hook [namespace current]::icon::update_all_icons
 
 ##########################################################################
 



More information about the Tkabber-dev mailing list