[Tkabber-dev] r816 - in trunk/tkabber: . ifacetk plugins/general plugins/richtext plugins/roster

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sat Dec 2 15:31:25 MSK 2006


Author: sergei
Date: 2006-12-02 15:31:15 +0300 (Sat, 02 Dec 2006)
New Revision: 816

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/browser.tcl
   trunk/tkabber/chats.tcl
   trunk/tkabber/disco.tcl
   trunk/tkabber/ifacetk/iface.tcl
   trunk/tkabber/ifacetk/iroster.tcl
   trunk/tkabber/joingrdialog.tcl
   trunk/tkabber/login.tcl
   trunk/tkabber/messages.tcl
   trunk/tkabber/plugins/general/headlines.tcl
   trunk/tkabber/plugins/richtext/highlight.tcl
   trunk/tkabber/plugins/roster/cache_categories.tcl
   trunk/tkabber/presence.tcl
   trunk/tkabber/userinfo.tcl
Log:
	* plugins/richtext/highlight.tcl: Enable highlighting by default.

	* browser.tcl, chats.tcl, disco.tcl, ifacetk/iface.tcl,
	  ifacetk/iroster.tcl, joingrdialog.tcl, login.tcl, messages.tcl,
	  plugins/general/headlines.tcl, plugins/roster/cache_categories.tcl,
	  presence.tcl, userinfo.tcl: Removed explicit storing of customized
	  variables because they are stored automatically.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2006-11-29 17:36:59 UTC (rev 815)
+++ trunk/tkabber/ChangeLog	2006-12-02 12:31:15 UTC (rev 816)
@@ -1,3 +1,13 @@
+2006-12-02  Sergei Golovan  <sgolovan at nes.ru>
+
+	* plugins/richtext/highlight.tcl: Enable highlighting by default.
+
+	* browser.tcl, chats.tcl, disco.tcl, ifacetk/iface.tcl,
+	  ifacetk/iroster.tcl, joingrdialog.tcl, login.tcl, messages.tcl,
+	  plugins/general/headlines.tcl, plugins/roster/cache_categories.tcl,
+	  presence.tcl, userinfo.tcl: Removed explicit storing of customized
+	  variables because they are stored automatically.
+
 2006-11-29  Sergei Golovan  <sgolovan at nes.ru>
 
 	* plugins/richtext/highlight.tcl: Fixed initializing plugin state.

Modified: trunk/tkabber/browser.tcl
===================================================================
--- trunk/tkabber/browser.tcl	2006-11-29 17:36:59 UTC (rev 815)
+++ trunk/tkabber/browser.tcl	2006-12-02 12:31:15 UTC (rev 816)
@@ -115,8 +115,6 @@
 
 	set browse_list [update_combo_list $browse_list $jid 20]
 	$bw.navigate.entry configure -values $browse_list
-	set custom::saved([namespace current]::browse_list) $browse_list
-	custom::store
 
 	jlib::send_iq get \
 	    [jlib::wrapper:createtag query \

Modified: trunk/tkabber/chats.tcl
===================================================================
--- trunk/tkabber/chats.tcl	2006-11-29 17:36:59 UTC (rev 815)
+++ trunk/tkabber/chats.tcl	2006-12-02 12:31:15 UTC (rev 816)
@@ -105,8 +105,6 @@
     }
 
     set open_chat_list [update_combo_list $open_chat_list $open_chat_jid 20]
-    set custom::saved([namespace current]::open_chat_list) $open_chat_list
-    custom::store
     open_to_user $connid $open_chat_jid
 }
 

Modified: trunk/tkabber/disco.tcl
===================================================================
--- trunk/tkabber/disco.tcl	2006-11-29 17:36:59 UTC (rev 815)
+++ trunk/tkabber/disco.tcl	2006-12-02 12:31:15 UTC (rev 816)
@@ -582,8 +582,6 @@
         set node_list [update_combo_list $node_list $node 20]
 	$bw.navigate.entry configure -values $disco_list
 	$bw.navigate.node configure -values $node_list
-	custom::store_vars [namespace current]::disco_list \
-			   [namespace current]::node_list
 
 	lappend browser(required,$bw) $jid
 	set browser(required,$bw) [lrmdups $browser(required,$bw)]

Modified: trunk/tkabber/ifacetk/iface.tcl
===================================================================
--- trunk/tkabber/ifacetk/iface.tcl	2006-11-29 17:36:59 UTC (rev 815)
+++ trunk/tkabber/ifacetk/iface.tcl	2006-12-02 12:31:15 UTC (rev 816)
@@ -109,8 +109,6 @@
     set state [wm state .]
     if {$state != $mainwindowstate} {
 	set mainwindowstate $state
-	set custom::saved([namespace current]::mainwindowstate) $mainwindowstate
-	custom::store
     }
 }
 

Modified: trunk/tkabber/ifacetk/iroster.tcl
===================================================================
--- trunk/tkabber/ifacetk/iroster.tcl	2006-11-29 17:36:59 UTC (rev 815)
+++ trunk/tkabber/ifacetk/iroster.tcl	2006-12-02 12:31:15 UTC (rev 816)
@@ -138,6 +138,9 @@
     variable undef_group_name
     variable chats_group_name
 
+    set _collapsed_group_list $collapsed_group_list
+    set _show_offline_group_list $show_offline_group_list
+
     if {$connid == {}} {
 	set connidlist [jlib::connections]
     } else {
@@ -182,23 +185,23 @@
 	    }
 	}
 	if {![lempty $tmpc]} {
-	    while {[set idx [lsearch -exact $collapsed_group_list $bare_jid]] >= 0} {
-		set collapsed_group_list \
-		    [lreplace $collapsed_group_list $idx [expr {$idx + 1}]]
+	    while {[set idx [lsearch -exact $_collapsed_group_list $bare_jid]] >= 0} {
+		set _collapsed_group_list \
+		    [lreplace $_collapsed_group_list $idx [expr {$idx + 1}]]
 	    }
-	    lappend collapsed_group_list $bare_jid $tmpc
+	    lappend _collapsed_group_list $bare_jid $tmpc
 	}
 	if {![lempty $tmps]} {
-	    while {[set idx [lsearch -exact $show_offline_group_list $bare_jid]] >= 0} {
-		set show_offline_group_list \
-		    [lreplace $show_offline_group_list $idx [expr {$idx + 1}]]
+	    while {[set idx [lsearch -exact $_show_offline_group_list $bare_jid]] >= 0} {
+		set _show_offline_group_list \
+		    [lreplace $_show_offline_group_list $idx [expr {$idx + 1}]]
 	    }
-	    lappend show_offline_group_list $bare_jid $tmps
+	    lappend _show_offline_group_list $bare_jid $tmps
 	}
-	set custom::saved([namespace current]::collapsed_group_list) $collapsed_group_list
-	set custom::saved([namespace current]::show_offline_group_list) $show_offline_group_list
-	custom::store
     }
+
+    set collapsed_group_list $_collapsed_group_list
+    set show_offline_group_list $_show_offline_group_list
 }
 
 hook::add predisconnected_hook [namespace current]::roster::set_group_lists

Modified: trunk/tkabber/joingrdialog.tcl
===================================================================
--- trunk/tkabber/joingrdialog.tcl	2006-11-29 17:36:59 UTC (rev 815)
+++ trunk/tkabber/joingrdialog.tcl	2006-12-02 12:31:15 UTC (rev 816)
@@ -127,10 +127,6 @@
     set gr_nick_list [update_combo_list $gr_nick_list $gr_nick 10]
     set gr_group_list [update_combo_list $gr_group_list $gr_group 20]
     set gr_server_list [update_combo_list $gr_server_list $gr_server 10]
-    set custom::saved(::::gr_nick_list) $gr_nick_list
-    set custom::saved(::::gr_group_list) $gr_group_list
-    set custom::saved(::::gr_server_list) $gr_server_list
-    custom::store
 
     foreach c [jlib::connections] {
 	if {[jlib::connection_jid $c] == $gr_connid} {

Modified: trunk/tkabber/login.tcl
===================================================================
--- trunk/tkabber/login.tcl	2006-11-29 17:36:59 UTC (rev 815)
+++ trunk/tkabber/login.tcl	2006-12-02 12:31:15 UTC (rev 816)
@@ -664,8 +664,6 @@
     global logoutuserstatus logouttextstatus logoutpriority reason reasonlist
 
     set reasonlist [update_combo_list $reasonlist $reason 10]
-    set custom::saved(::::reasonlist) $reasonlist
-    custom::store
 
     set lw .logout
     $lw withdraw

Modified: trunk/tkabber/messages.tcl
===================================================================
--- trunk/tkabber/messages.tcl	2006-11-29 17:36:59 UTC (rev 815)
+++ trunk/tkabber/messages.tcl	2006-12-02 12:31:15 UTC (rev 816)
@@ -491,9 +491,6 @@
 		      -delimiter $::ifacetk::roster::options(nested_delimiter)]
     } else {
 	set message_dest_list [update_combo_list $message_dest_list $jid 20]
-	set custom::saved([namespace current]::message_dest_list) \
-	    $message_dest_list
-	custom::store
 	set jids [list $jid]
 	if {![info exists connid]} {
 	    set connid [jlib::route $jid]

Modified: trunk/tkabber/plugins/general/headlines.tcl
===================================================================
--- trunk/tkabber/plugins/general/headlines.tcl	2006-11-29 17:36:59 UTC (rev 815)
+++ trunk/tkabber/plugins/general/headlines.tcl	2006-12-02 12:31:15 UTC (rev 816)
@@ -700,8 +700,6 @@
 					      -chdata $props(text)]]]]
     set len [llength $send_jids]
     set send_jids [update_combo_list $send_jids $to 5]
-    set custom::saved([namespace current]::send_jids) $send_jids
-    custom::store
     update_menu $menu $len
 }
 
@@ -714,6 +712,7 @@
     }
 
     set len [llength $send_jids]
+    set _send_jids $send_jids
     foreach choice [array names forward_hl] {
 	if {$forward_hl($choice)} {
 	    lassign $choice connid to
@@ -727,11 +726,10 @@
 						 [jlib::wrapper:createtag desc \
 						      -chdata $props(text)]]]] \
 		-connection $connid
-	    set send_jids [update_combo_list $send_jids $to 5]
+	    set _send_jids [update_combo_list $_send_jids $to 10]
 	}
     }
-    set custom::saved([namespace current]::send_jids) $send_jids
-    custom::store
+    set send_jids $_send_jids
     update_menu $menu $len
 }
 

Modified: trunk/tkabber/plugins/richtext/highlight.tcl
===================================================================
--- trunk/tkabber/plugins/richtext/highlight.tcl	2006-11-29 17:36:59 UTC (rev 815)
+++ trunk/tkabber/plugins/richtext/highlight.tcl	2006-12-02 12:31:15 UTC (rev 816)
@@ -6,7 +6,7 @@
 	-group Chat \
 	-group {Rich Text}
 
-    custom::defvar options(enable_highlighting) 0 \
+    custom::defvar options(enable_highlighting) 1 \
 	[::msgcat::mc "Enable highlighting plugin."] \
 	-type boolean -group Highlight \
 	-command [namespace current]::on_state_changed

Modified: trunk/tkabber/plugins/roster/cache_categories.tcl
===================================================================
--- trunk/tkabber/plugins/roster/cache_categories.tcl	2006-11-29 17:36:59 UTC (rev 815)
+++ trunk/tkabber/plugins/roster/cache_categories.tcl	2006-12-02 12:31:15 UTC (rev 816)
@@ -85,7 +85,6 @@
 		lappend category_and_subtype_list \
 			$server [list $category $type]
 
-		custom::store_vars [namespace current]::category_and_subtype_list
 		::redraw_roster
 		break
 	    }

Modified: trunk/tkabber/presence.tcl
===================================================================
--- trunk/tkabber/presence.tcl	2006-11-29 17:36:59 UTC (rev 815)
+++ trunk/tkabber/presence.tcl	2006-12-02 12:31:15 UTC (rev 816)
@@ -278,17 +278,6 @@
 custom::defvar textstatus "" [::msgcat::mc "Stored user text status."] \
     -type string -group Hidden
 
-proc save_user_status {} {
-    global userpriority userstatus textstatus
-
-    set custom::saved(::::userpriority) $userpriority
-    set custom::saved(::::userstatus) $userstatus
-    set custom::saved(::::textstatus) $textstatus
-    custom::store
-}
-
-hook::add quit_hook save_user_status
-
 set userstatusdesc [::msgcat::mc "Not logged in"]
 
 set statusdesc(available)   [::msgcat::mc "Available"]

Modified: trunk/tkabber/userinfo.tcl
===================================================================
--- trunk/tkabber/userinfo.tcl	2006-11-29 17:36:59 UTC (rev 815)
+++ trunk/tkabber/userinfo.tcl	2006-12-02 12:31:15 UTC (rev 816)
@@ -70,8 +70,6 @@
     }
 
     set show_info_list [update_combo_list $show_info_list $show_info_jid 10]
-    set custom::saved([namespace current]::show_info_list) $show_info_list
-    custom::store
     userinfo::open $show_info_jid -connection $connid
 }
 



More information about the Tkabber-dev mailing list