[Tkabber-dev] r1549 - in trunk/tkabber: . ifacetk plugins/chat plugins/filetransfer plugins/general plugins/roster plugins/unix

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sat Oct 18 14:13:07 MSD 2008


Author: sergei
Date: 2008-10-18 14:13:07 +0400 (Sat, 18 Oct 2008)
New Revision: 1549

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/chats.tcl
   trunk/tkabber/configdir.tcl
   trunk/tkabber/disco.tcl
   trunk/tkabber/filetransfer.tcl
   trunk/tkabber/filters.tcl
   trunk/tkabber/ifacetk/iface.tcl
   trunk/tkabber/ifacetk/iroster.tcl
   trunk/tkabber/itemedit.tcl
   trunk/tkabber/login.tcl
   trunk/tkabber/messages.tcl
   trunk/tkabber/muc.tcl
   trunk/tkabber/plugins/chat/chatstate.tcl
   trunk/tkabber/plugins/chat/events.tcl
   trunk/tkabber/plugins/chat/logger.tcl
   trunk/tkabber/plugins/chat/nick_colors.tcl
   trunk/tkabber/plugins/filetransfer/http.tcl
   trunk/tkabber/plugins/filetransfer/si.tcl
   trunk/tkabber/plugins/general/autoaway.tcl
   trunk/tkabber/plugins/general/clientinfo.tcl
   trunk/tkabber/plugins/general/headlines.tcl
   trunk/tkabber/plugins/general/subscribe_gateway.tcl
   trunk/tkabber/plugins/roster/annotations.tcl
   trunk/tkabber/plugins/roster/backup.tcl
   trunk/tkabber/plugins/roster/conferenceinfo.tcl
   trunk/tkabber/plugins/roster/conferences.tcl
   trunk/tkabber/plugins/roster/rosterx.tcl
   trunk/tkabber/plugins/unix/wmdock.tcl
   trunk/tkabber/register.tcl
   trunk/tkabber/search.tcl
   trunk/tkabber/si.tcl
   trunk/tkabber/userinfo.tcl
Log:
	* login.tcl: Change status message while waiting for the next
	  reconnection.

	* chats.tcl, configdir.tcl, disco.tcl, filetransfer.tcl, filters.tcl,
	  ifacetk/iface.tcl, ifacetk/iroster.tcl, itemedit.tcl, messages.tcl,
	  muc.tcl, plugins/chat/chatstate.tcl, plugins/chat/events.tcl,
	  plugins/chat/logger.tcl, plugins/chat/nick_colors.tcl,
	  plugins/filetransfer/http.tcl, plugins/filetransfer/si.tcl,
	  plugins/general/autoaway.tcl, plugins/general/clientinfo.tcl,
	  plugins/general/headlines.tcl,
	  plugins/general/subscribe_gateway.tcl,
	  plugins/roster/annotations.tcl, plugins/roster/backup.tcl,
	  plugins/roster/conferenceinfo.tcl, plugins/roster/conferences.tcl,
	  plugins/roster/rosterx.tcl, plugins/unix/wmdock.tcl, register.tcl,
	  search.tcl, si.tcl, userinfo.tcl: Removed unnecessary call to format
	  command.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/ChangeLog	2008-10-18 10:13:07 UTC (rev 1549)
@@ -23,6 +23,23 @@
 	* gpgme.tcl, privacy.tcl: Fixed widget paths with connection token in
 	  their names.
 
+	* login.tcl: Change status message while waiting for the next
+	  reconnection.
+
+	* chats.tcl, configdir.tcl, disco.tcl, filetransfer.tcl, filters.tcl,
+	  ifacetk/iface.tcl, ifacetk/iroster.tcl, itemedit.tcl, messages.tcl,
+	  muc.tcl, plugins/chat/chatstate.tcl, plugins/chat/events.tcl,
+	  plugins/chat/logger.tcl, plugins/chat/nick_colors.tcl,
+	  plugins/filetransfer/http.tcl, plugins/filetransfer/si.tcl,
+	  plugins/general/autoaway.tcl, plugins/general/clientinfo.tcl,
+	  plugins/general/headlines.tcl,
+	  plugins/general/subscribe_gateway.tcl,
+	  plugins/roster/annotations.tcl, plugins/roster/backup.tcl,
+	  plugins/roster/conferenceinfo.tcl, plugins/roster/conferences.tcl,
+	  plugins/roster/rosterx.tcl, plugins/unix/wmdock.tcl, register.tcl,
+	  search.tcl, si.tcl, userinfo.tcl: Removed unnecessary call to format
+	  command.
+
 2008-10-17  Sergei Golovan  <sgolovan at nes.ru>
 
 	* plugins/general/sound.tcl: Cleared sound external program option

Modified: trunk/tkabber/chats.tcl
===================================================================
--- trunk/tkabber/chats.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/chats.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -258,9 +258,9 @@
 		if {[cequal $body ""]} {
 		    set nick [resource_from_jid $from]
 		    if {[cequal $nick ""]} {
-			set body [format [::msgcat::mc "Subject is set to: %s"] $subject]
+			set body [::msgcat::mc "Subject is set to: %s" $subject]
 		    } else {
-			set body [format [::msgcat::mc "/me has set the subject to: %s"] $subject]
+			set body [::msgcat::mc "/me has set the subject to: %s" $subject]
 		    }
 		}
 	    }
@@ -318,7 +318,7 @@
 	    set tabtitlename $titlename
 	}
     }
-    return [list $tabtitlename [format [::msgcat::mc "Chat with %s"] $titlename]]
+    return [list $tabtitlename [::msgcat::mc "Chat with %s" $titlename]]
 }
 
 proc chat::reconnect_groupchats {xlib} {
@@ -688,9 +688,7 @@
     set ix [lsearch -exact [::chat::opened] $chatid]
     if {$ix < 0} return
 
-    set msg [format [::msgcat::mc \
-	"%s has changed nick to %s."] \
-	$nick $new_nick]
+    set msg [::msgcat::mc "%s has changed nick to %s." $nick $new_nick]
     ::chat::add_message $chatid "" chat $msg {}
 
     set cw [chat_win $chatid]
@@ -1334,14 +1332,14 @@
     if {[llength $titles] == 0} {
         MessageDlg ${gw}_err -aspect 50000 -icon info \
 	    -message \
-		[format [::msgcat::mc "No conferences for %s in progress..."] \
+		[::msgcat::mc "No conferences for %s in progress..." \
 		    [connection_jid $xlib]] \
 	    -type user \
 	    -buttons ok -default 0 -cancel 0
         return
     }
 
-    CbDialog $gw [format [::msgcat::mc "Invite %s to conferences"] $nick] \
+    CbDialog $gw [::msgcat::mc "Invite %s to conferences" $nick] \
 	[list [::msgcat::mc "Invite"] "chat::invitation [list $jid] 0 $ignore_muc
 				       destroy $gw" \
 	      [::msgcat::mc "Cancel"] "destroy $gw"] \
@@ -1368,14 +1366,14 @@
     if {[llength $choices] == 0} {
         MessageDlg ${gw}_err -aspect 50000 -icon info \
 	    -message \
-		[format [::msgcat::mc "No users in %s roster..."] \
+		[::msgcat::mc "No users in %s roster..." \
 		     [connection_jid $xlib]] \
 	    -type user \
 	    -buttons ok -default 0 -cancel 0
 	return
     }
 
-    CbDialog $gw [format [::msgcat::mc "Invite users to %s"] $title] \
+    CbDialog $gw [::msgcat::mc "Invite users to %s" $title] \
 	[list [::msgcat::mc "Invite"] "chat::invitation [list $jid] 1 $ignore_muc
 				       destroy $gw" \
 	      [::msgcat::mc "Cancel"] "destroy $gw"] \

Modified: trunk/tkabber/configdir.tcl
===================================================================
--- trunk/tkabber/configdir.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/configdir.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -44,9 +44,9 @@
     if {$failed} {
 	tk_messageBox -icon error \
 	    -title [::msgcat::mc "Attention"] \
-	    -message [format [::msgcat::mc "Tkabber configuration directory\
+	    -message [::msgcat::mc "Tkabber configuration directory\
 		transfer failed with:\n%s\n\
-		Tkabber will use the old directory:\n%s"] $err $from]
+		Tkabber will use the old directory:\n%s" $err $from]
     } else {
 	set to [file nativename $to]
 	tk_messageBox \

Modified: trunk/tkabber/disco.tcl
===================================================================
--- trunk/tkabber/disco.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/disco.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -663,7 +663,7 @@
     if {$res != "ok"} {
 	set tnode [jid_to_tag "error info $jid $node"]
 	set data [list error_info $xlib $jid]
-	set desc [format [::msgcat::mc "Error getting info: %s"] \
+	set desc [::msgcat::mc "Error getting info: %s" \
 		      [error_to_string $identities]]
 	set icon ""
 	
@@ -879,7 +879,7 @@
     if {$res != "ok"} {
 	set node [jid_to_tag "error negotiate $parent"]
 	set data [list error_negotiate $parent $xlib $jid]
-	set desc [format [::msgcat::mc "Error negotiate: %s"] \
+	set desc [::msgcat::mc "Error negotiate: %s" \
 		      [error_to_string $opts]]
 	set icon ""
 	
@@ -1334,7 +1334,7 @@
 
 #proc disco::browser::item_balloon_text {jid category type name version} {
 #    variable disco
-#    set text [format [::msgcat::mc "%s: %s/%s, Description: %s, Version: %s\nNumber of children: %s"] \
+#    set text [::msgcat::mc "%s: %s/%s, Description: %s, Version: %s\nNumber of children: %s" \
 #	    $jid $category $type $name $version $disco(nchilds,$jid)]
 #    return $text
 #}

Modified: trunk/tkabber/filetransfer.tcl
===================================================================
--- trunk/tkabber/filetransfer.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/filetransfer.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -154,7 +154,7 @@
     set state(jid) $jid
     set state(xlib) $xlib
 
-    Dialog $w -title [format [::msgcat::mc "Send file to %s"] $jid] \
+    Dialog $w -title [::msgcat::mc "Send file to %s" $jid] \
 	      -separator 1 -anchor e -modal none \
 	      -default 0 -cancel 1
 

Modified: trunk/tkabber/filters.tcl
===================================================================
--- trunk/tkabber/filters.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/filters.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -113,7 +113,7 @@
 
     if {![string equal $res ok]} {
 	MessageDlg .filters_err -aspect 50000 -icon error \
-	    -message [format [::msgcat::mc "Requesting filter rules: %s"] \
+	    -message [::msgcat::mc "Requesting filter rules: %s" \
 			  [error_to_string $child]] \
 	    -type user -buttons ok -default 0 -cancel 0
 	return

Modified: trunk/tkabber/ifacetk/iface.tcl
===================================================================
--- trunk/tkabber/ifacetk/iface.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/ifacetk/iface.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -667,7 +667,7 @@
     if {[llength $msg_list] == 2} {
 	lassign $msg_list server msg
 	set page [frame $fr.page]
-	set title [format [::msgcat::mc "%s SSL Certificate Info"] $server]
+	set title [::msgcat::mc "%s SSL Certificate Info" $server]
 	grid [label $page.title -text $title] -row 0 -column 0 -sticky ew
 	grid [message $page.info -aspect 50000 -text $msg] \
 	    -row 1 -column 0 -sticky ew
@@ -679,7 +679,7 @@
 	set i 0
 	foreach {server msg} $msg_list {
 	    set page [$nb insert end page$i -text $server]
-	    set title [format [::msgcat::mc "%s SSL Certificate Info"] $server]
+	    set title [::msgcat::mc "%s SSL Certificate Info" $server]
 	    grid [label $page.title -text $title] -row 0 -column 0 -sticky ew
 	    grid [message $page.info -aspect 50000 -text $msg] \
 		-row 1 -column 0 -sticky ew

Modified: trunk/tkabber/ifacetk/iroster.tcl
===================================================================
--- trunk/tkabber/ifacetk/iroster.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/ifacetk/iroster.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -1334,7 +1334,7 @@
 proc roster::remove_item_dialog {xlib jid} {
     set res [MessageDlg .remove_item -aspect 50000 -icon question -type user \
 	-buttons {yes no} -default 0 -cancel 1 \
-	-message [format [::msgcat::mc "Are you sure to remove %s from roster?"] $jid]]
+	-message [::msgcat::mc "Are you sure to remove %s from roster?" $jid]]
     if {$res == 0} {
 	::roster::remove_item $xlib $jid
     }
@@ -1808,8 +1808,8 @@
 proc roster::remove_group_dialog {xlib name} {
     set res [MessageDlg .remove_item -aspect 50000 -icon question -type user \
 		 -buttons {yes no} -default 0 -cancel 1 \
-		 -message [format [::msgcat::mc "Are you sure to remove group '%s' from roster?\
-\n(Users which are in this group only, will be in undefined group.)"] $name]]
+		 -message [::msgcat::mc "Are you sure to remove group '%s' from roster?\
+\n(Users which are in this group only, will be in undefined group.)" $name]]
 
     if {$res == 0} {
 	roster::send_rename_group $xlib $name ""
@@ -1819,8 +1819,8 @@
 proc roster::remove_users_group_dialog {xlib name} {
     set res [MessageDlg .remove_item -aspect 50000 -icon question -type user \
 		 -buttons {yes no} -default 0 -cancel 1 \
-		 -message [format [::msgcat::mc "Are you sure to remove all users in group '%s' from roster?\
-\n(Users which are in another groups too, will not be removed from the roster.)"] $name]]
+		 -message [::msgcat::mc "Are you sure to remove all users in group '%s' from roster?\
+\n(Users which are in another groups too, will not be removed from the roster.)" $name]]
 
     if {$res == 0} {
 	roster::send_remove_users_group $xlib $name

Modified: trunk/tkabber/itemedit.tcl
===================================================================
--- trunk/tkabber/itemedit.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/itemedit.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -10,7 +10,7 @@
 	destroy $w
     }
 
-    Dialog $w -title [format [::msgcat::mc "Edit properties for %s"] $jid] \
+    Dialog $w -title [::msgcat::mc "Edit properties for %s" $jid] \
 	-separator 1 -anchor e \
 	-default 0 -cancel 1
 
@@ -18,7 +18,7 @@
 
     hook::run roster_itemedit_setup_hook $f $xlib $jid
 
-    set g [[TitleFrame $f.gr -text [format [::msgcat::mc "Edit groups for %s"] $jid]] getframe]
+    set g [[TitleFrame $f.gr -text [::msgcat::mc "Edit groups for %s" $jid]] getframe]
     pack $f.gr -side top -expand yes -fill both
 
 
@@ -84,7 +84,7 @@
 proc itemedit::edit_item_setup_fallback {f xlib jid} {
     variable gra_name
 
-    set tf [TitleFrame $f.name -text [format [::msgcat::mc "Edit nickname for %s"] $jid]]
+    set tf [TitleFrame $f.name -text [::msgcat::mc "Edit nickname for %s" $jid]]
     set slaves [pack slaves $f]
     if {$slaves == ""} {
 	pack $tf -side top -expand yes -fill both

Modified: trunk/tkabber/login.tcl
===================================================================
--- trunk/tkabber/login.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/login.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -315,6 +315,7 @@
     debugmsg login "Starting login"
     if {[catch {login_connect $logindata} xlib] > 0} {
 	# Nasty thing has happened.
+	# $xlib contains error message here.
 	debugmsg login "Failed to connect: $xlib"
 	if {$lc(connect_forever)} {
 	    login_retry $logindata
@@ -349,10 +350,10 @@
     global login_after_time
     global login_after_id
 
-    if {![info exists login_after_time]} {set login_after_time 15000}
+    if {![info exists login_after_time]} {set login_after_time 7500}
     if {$login_after_time < 1800000} {
 	# 1800000 == 30 * 60 * 1000 == 30min
-	# the sequence goes: 30s, 1min, 2min, 4min, 8min, 16min, 32min, 32min...
+	# the sequence goes: 15s, 30s, 1min, 2min, 4min, 8min, 16min, 32min, 32min...
 	set login_after_time [expr {$login_after_time * 2}]
     }
     array set lc $logindata
@@ -364,9 +365,22 @@
     if {[info exists login_after_id($jid)]} {
 	after cancel $login_after_id($jid)
     }
-    set login_after_id($jid) [after $login_after_time [list login $logindata]]
+    login_retry1 $login_after_time $jid $logindata
 }
 
+proc login_retry1 {interval jid logindata} {
+    global login_after_id
+
+    if {$interval <= 0} {
+	login $logindata
+    } else {
+	incr interval -1000
+	set login_after_id($jid) [after 1000 [list login_retry1 $interval $jid $logindata]]
+	set_status [::msgcat::mc "Login retry for %s in %s" $jid \
+				 [format_time [expr {$interval/1000}]]]
+    }
+}
+
 proc client:tls_callback {xlib args} {
     global tls_result tls_warnings
     global ssl_certificate_fields

Modified: trunk/tkabber/messages.tcl
===================================================================
--- trunk/tkabber/messages.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/messages.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -43,9 +43,9 @@
     wm group $mw .
 
     if {$replyP} {
-        set title [format [::msgcat::mc "Message from %s"] $from]
+        set title [::msgcat::mc "Message from %s" $from]
     } else {
-        set title [format [::msgcat::mc "Extras from %s"] $from]
+        set title [::msgcat::mc "Extras from %s" $from]
     }
     wm title $mw $title
     wm iconname $mw $title
@@ -334,13 +334,13 @@
 
     if {$group} {
 	if {$to != ""} {
-	    set title [format [::msgcat::mc "Send message to group %s"] $to]
+	    set title [::msgcat::mc "Send message to group %s" $to]
 	} else {
 	    set title [::msgcat::mc "Send message to group"]
 	}
     } else {
 	if {$to != ""} {
-	    set title [format [::msgcat::mc "Send message to %s"] $to]
+	    set title [::msgcat::mc "Send message to %s" $to]
 	} else {
 	    set title [::msgcat::mc "Send message"]
 	}
@@ -578,7 +578,7 @@
     wm group $mw .
     wm withdraw $mw
 
-    set title [format [::msgcat::mc "Subscription request from %s"] $from]
+    set title [::msgcat::mc "Subscription request from %s" $from]
     wm title $mw $title
     wm iconname $mw $title
 
@@ -808,7 +808,7 @@
     if {[cequal $to ""]} {
         set title [::msgcat::mc "Send subscription request"]
     } else {
-        set title [format [::msgcat::mc "Send subscription request to %s"] $to]
+        set title [::msgcat::mc "Send subscription request to %s" $to]
     }
     wm title $mw $title
     wm iconname $mw $title

Modified: trunk/tkabber/muc.tcl
===================================================================
--- trunk/tkabber/muc.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/muc.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -1244,7 +1244,7 @@
 	} else {
 	    set occupant $nick
 	}
-	set msg [format [::msgcat::mc "%s has entered"] $occupant]
+	set msg [::msgcat::mc "%s has entered" $occupant]
 	if {$options(gen_muc_position_change_msgs)} {
 	    append msg " " [::msgcat::mc "as %s/%s" \
 		[::msgcat::mc $users(affiliation,$xlib,$jid)] \

Modified: trunk/tkabber/plugins/chat/chatstate.tcl
===================================================================
--- trunk/tkabber/plugins/chat/chatstate.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/plugins/chat/chatstate.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -98,23 +98,23 @@
     switch -- $status {
 	active {
 	    set text [::msgcat::mc "Chat window is active"]
-	    set stext [format [::msgcat::mc "%s has activated chat window"] $jid]
+	    set stext [::msgcat::mc "%s has activated chat window" $jid]
 	}
 	composing {
 	    set text [::msgcat::mc "Composing a reply"]
-	    set stext [format [::msgcat::mc "%s is composing a reply"] $jid]
+	    set stext [::msgcat::mc "%s is composing a reply" $jid]
 	}
 	paused {
 	    set text [::msgcat::mc "Paused a reply"]
-	    set stext [format [::msgcat::mc "%s is paused a reply"] $jid]
+	    set stext [::msgcat::mc "%s is paused a reply" $jid]
 	}
 	inactive {
 	    set text [::msgcat::mc "Chat window is inactive"]
-	    set stext [format [::msgcat::mc "%s has inactivated chat window"] $jid]
+	    set stext [::msgcat::mc "%s has inactivated chat window" $jid]
 	}
 	gone {
 	    set text [::msgcat::mc "Chat window is gone"]
-	    set stext [format [::msgcat::mc "%s has gone chat window"] $jid]
+	    set stext [::msgcat::mc "%s has gone chat window" $jid]
 	}
     }
 

Modified: trunk/tkabber/plugins/chat/events.tcl
===================================================================
--- trunk/tkabber/plugins/chat/events.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/plugins/chat/events.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -127,20 +127,20 @@
     switch -- $status {
 	offline   {
 	    set text [::msgcat::mc "Message stored on the server"]
-	    set stext [format [::msgcat::mc "Message stored on %s's server"] \
+	    set stext [::msgcat::mc "Message stored on %s's server" \
 			   $jid]
 	}
 	delivered {
 	    set text [::msgcat::mc "Message delivered"]
-	    set stext [format [::msgcat::mc "Message delivered to %s"] $jid]
+	    set stext [::msgcat::mc "Message delivered to %s" $jid]
 	}
 	displayed {
 	    set text [::msgcat::mc "Message displayed"]
-	    set stext [format [::msgcat::mc "Message displayed to %s"] $jid]
+	    set stext [::msgcat::mc "Message displayed to %s" $jid]
 	}
 	composing {
 	    set text [::msgcat::mc "Composing a reply"]
-	    set stext [format [::msgcat::mc "%s is composing a reply"] $jid]
+	    set stext [::msgcat::mc "%s is composing a reply" $jid]
 	}
     }
 

Modified: trunk/tkabber/plugins/chat/logger.tcl
===================================================================
--- trunk/tkabber/plugins/chat/logger.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/plugins/chat/logger.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -267,7 +267,7 @@
     toplevel $lw -relief $::tk_relief -borderwidth $::tk_borderwidth -class Chat
     wm group $lw .
     wm withdraw $lw
-    set title [format [::msgcat::mc "History for %s"] $jid]
+    set title [::msgcat::mc "History for %s" $jid]
     wm title $lw $title
     wm iconname $lw $title
 

Modified: trunk/tkabber/plugins/chat/nick_colors.tcl
===================================================================
--- trunk/tkabber/plugins/chat/nick_colors.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/plugins/chat/nick_colors.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -246,7 +246,7 @@
         set clr black
     }
     set new [tk_chooseColor -initialcolor $clr -parent $w \
-		 -title [format [::msgcat::mc "Edit %s color"] $nick]]
+		 -title [::msgcat::mc "Edit %s color" $nick]]
     if {$new != ""} {
 	$w tag configure NICK-$nick -foreground $new
 	set NickColorEdits($nick) $new
@@ -317,7 +317,7 @@
     variable NickColors
 
     set new [tk_chooseColor -initialcolor [get_color $nick] -parent $chatwin \
-		 -title [format [::msgcat::mc "Edit %s color"] $nick]]
+		 -title [::msgcat::mc "Edit %s color" $nick]]
     if {$new == ""} return
 
     if {$new != [get_color $nick]} {

Modified: trunk/tkabber/plugins/filetransfer/http.tcl
===================================================================
--- trunk/tkabber/plugins/filetransfer/http.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/plugins/filetransfer/http.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -178,7 +178,7 @@
 
     set url [lindex $urls 0]
 
-    Dialog $w -title [format [::msgcat::mc "Receive file from %s"] $from] \
+    Dialog $w -title [::msgcat::mc "Receive file from %s" $from] \
 	-separator 1 -anchor e \
 	-modal none -default 0 -cancel 1
 

Modified: trunk/tkabber/plugins/filetransfer/si.tcl
===================================================================
--- trunk/tkabber/plugins/filetransfer/si.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/plugins/filetransfer/si.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -115,7 +115,7 @@
     set state(lang) $lang
     set state(id) $id
 
-    Dialog $w -title [format [::msgcat::mc "Receive file from %s"] $from] \
+    Dialog $w -title [::msgcat::mc "Receive file from %s" $from] \
 	-separator 1 -anchor e \
 	-modal none -default 0 -cancel 1
 

Modified: trunk/tkabber/plugins/general/autoaway.tcl
===================================================================
--- trunk/tkabber/plugins/general/autoaway.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/plugins/general/autoaway.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -181,7 +181,7 @@
     }
 
     if {![cequal $savestatus ""]} {
-        set_status [format [::msgcat::mc "Idle for %s"] [format_time [expr {$idletime/1000}]]]
+        set_status [::msgcat::mc "Idle for %s" [format_time [expr {$idletime/1000}]]]
     }
 }
 

Modified: trunk/tkabber/plugins/general/clientinfo.tcl
===================================================================
--- trunk/tkabber/plugins/general/clientinfo.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/plugins/general/clientinfo.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -11,11 +11,11 @@
 
     if {[info exists ::userinfo::userinfo(fn,$jid)] && \
 	    $::userinfo::userinfo(fn,$jid) != ""} {
-	append info [format [::msgcat::mc "\n\tName: %s"] \
+	append info [::msgcat::mc "\n\tName: %s" \
 			 $::userinfo::userinfo(fn,$jid)]
     } elseif {[info exists ::userinfo::userinfo(name,$jid)] && \
 		  $::userinfo::userinfo(name,$jid) != ""} {
-	append info [format [::msgcat::mc "\n\tName: %s"] \
+	append info [::msgcat::mc "\n\tName: %s" \
 			 $::userinfo::userinfo(name,$jid)]
 	
 	if {[info exists ::userinfo::userinfo(family,$jid)] && \
@@ -26,7 +26,7 @@
 
     if {[info exists ::userinfo::userinfo(clientname,$jid)] && \
 	    $::userinfo::userinfo(clientname,$jid) != ""} {
-	append info [format [::msgcat::mc "\n\tClient: %s"] \
+	append info [::msgcat::mc "\n\tClient: %s" \
 			 $::userinfo::userinfo(clientname,$jid)]
 	if {[info exists ::userinfo::userinfo(clientversion,$jid)]} {
 	    append info " $::userinfo::userinfo(clientversion,$jid)"
@@ -34,7 +34,7 @@
     }
     if {[info exists ::userinfo::userinfo(os,$jid)] && \
 	    $::userinfo::userinfo(os,$jid) != ""} {
-	append info [format [::msgcat::mc "\n\tOS: %s"] \
+	append info [::msgcat::mc "\n\tOS: %s" \
 			 $::userinfo::userinfo(os,$jid)]
     }
 }

Modified: trunk/tkabber/plugins/general/headlines.tcl
===================================================================
--- trunk/tkabber/plugins/general/headlines.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/plugins/general/headlines.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -96,11 +96,11 @@
         }
         1 {
             set user [node_and_server_from_jid $from]
-            set title [format [::msgcat::mc "%s Headlines"] $user]
+            set title [::msgcat::mc "%s Headlines" $user]
             set tabtitle [node_from_jid $from]
         }
         default {
-            set title [format [::msgcat::mc "%s Headlines"] $from]
+            set title [::msgcat::mc "%s Headlines" $from]
             set tabtitle [node_from_jid $from]/[resource_from_jid $from]
         }
     }
@@ -407,7 +407,7 @@
     }
     foreach jid $send_jids {
 	$menu insert $ind command \
-	    -label [format [::msgcat::mc "Forward to %s"] $jid] \
+	    -label [::msgcat::mc "Forward to %s" $jid] \
 	    -command "[namespace current]::forward3 [list $menu] [list $jid] \
 			  \$[namespace current]::headwindow \$[namespace current]::headnode"
 	incr ind

Modified: trunk/tkabber/plugins/general/subscribe_gateway.tcl
===================================================================
--- trunk/tkabber/plugins/general/subscribe_gateway.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/plugins/general/subscribe_gateway.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -20,7 +20,7 @@
     toplevel $mw
     wm group $mw .
 
-    set title [format [::msgcat::mc "Send subscription at %s"] $service]
+    set title [::msgcat::mc "Send subscription at %s" $service]
     
     wm title $mw $title
     wm iconname $mw $title
@@ -223,7 +223,7 @@
 
     if {$res != "ok"} {
 	NonmodalMessageDlg $w -aspect 50000 -icon error \
-	    -message [format [::msgcat::mc "Error while converting screenname: %s."] \
+	    -message [::msgcat::mc "Error while converting screenname: %s." \
 			  [error_to_string $child]]
     } else {
 	set jid ""
@@ -242,7 +242,7 @@
 	
 	NonmodalMessageDlg $w -aspect 50000 \
 	    -title [::msgcat::mc "Screenname conversion"] \
-	    -message [format [::msgcat::mc "Screenname: %s\n\nConverted JID: %s"] \
+	    -message [::msgcat::mc "Screenname: %s\n\nConverted JID: %s" \
 			  $screenname $jid]
     }
 }

Modified: trunk/tkabber/plugins/roster/annotations.tcl
===================================================================
--- trunk/tkabber/plugins/roster/annotations.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/plugins/roster/annotations.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -186,7 +186,7 @@
 	destroy .store_notes_error
     }
     MessageDlg .store_notes_error -aspect 50000 -icon error \
-	-message [format [::msgcat::mc "Storing roster notes failed: %s"] \
+	-message [::msgcat::mc "Storing roster notes failed: %s" \
 			 [error_to_string $child]] \
 	-type user -buttons ok -default 0 -cancel 0
 }
@@ -232,7 +232,7 @@
 	destroy $w
     }
 
-    Dialog $w -title [format [::msgcat::mc "Edit roster notes for %s"] $jid] \
+    Dialog $w -title [::msgcat::mc "Edit roster notes for %s" $jid] \
 	-modal none -separator 1 -anchor e \
 	-default 0 -cancel 1
 
@@ -243,14 +243,14 @@
     set f [$w getframe]
 
     if {[info exists notes($xlib,cdate,$jid)]} {
-	label $f.cdate -text [format [::msgcat::mc "Created: %s"] \
+	label $f.cdate -text [::msgcat::mc "Created: %s" \
 				     [clock format $notes($xlib,cdate,$jid) \
 					    -format "%Y-%m-%d %T" -gmt false]]
 	pack $f.cdate -side top -anchor w
     }
 
     if {[info exists notes($xlib,mdate,$jid)]} {
-	label $f.mdate -text [format [::msgcat::mc "Modified: %s"] \
+	label $f.mdate -text [::msgcat::mc "Modified: %s" \
 				     [clock format $notes($xlib,mdate,$jid) \
 					    -format "%Y-%m-%d %T" -gmt false]]
 	pack $f.mdate -side top -anchor w
@@ -329,14 +329,14 @@
     set n [userinfo::pack_frame $notestab.notes [::msgcat::mc "Roster Notes"]]
 
     if {[info exists notes($xlib,cdate,$jid)]} {
-	label $n.cdate -text [format [::msgcat::mc "Created: %s"] \
+	label $n.cdate -text [::msgcat::mc "Created: %s" \
 				     [clock format $notes($xlib,cdate,$jid) \
 					    -format "%Y-%m-%d %T" -gmt false]]
 	pack $n.cdate -side top -anchor w
     }
 
     if {[info exists notes($xlib,mdate,$jid)]} {
-	label $n.mdate -text [format [::msgcat::mc "Modified: %s"] \
+	label $n.mdate -text [::msgcat::mc "Modified: %s" \
 				     [clock format $notes($xlib,mdate,$jid) \
 					    -format "%Y-%m-%d %T" -gmt false]]
 	pack $n.mdate -side top -anchor w

Modified: trunk/tkabber/plugins/roster/backup.tcl
===================================================================
--- trunk/tkabber/plugins/roster/backup.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/plugins/roster/backup.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -49,7 +49,7 @@
 
     foreach c [connections] {
 	set jid [connection_jid $c]
-	set label [format [::msgcat::mc "Roster of %s"] $jid]
+	set label [::msgcat::mc "Roster of %s" $jid]
 	set ecommand [list [namespace current]::export_to_file $c]
 	set icommand [list [namespace current]::import_from_file $c]
 	$emenu add command -label $label -command $ecommand

Modified: trunk/tkabber/plugins/roster/conferenceinfo.tcl
===================================================================
--- trunk/tkabber/plugins/roster/conferenceinfo.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/plugins/roster/conferenceinfo.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -39,7 +39,7 @@
 	} else {
 	    set errstr $data(error_disco,$jid)
 	}
-	append info [format [::msgcat::mc "\n\tCan't browse: %s"] $errstr]
+	append info [::msgcat::mc "\n\tCan't browse: %s" $errstr]
     } else {
 	if {$data(error_browse,$jid) == ""} {
 	    set mech browse
@@ -48,14 +48,14 @@
 	}
 	if {$data(users_$mech,$jid) != {}} {
 	    append info \
-		[format [::msgcat::mc "\nRoom participants at %s:"] \
+		[::msgcat::mc "\nRoom participants at %s:" \
 		     [clock format $data(time_$mech,$jid) -format %R]]
 	    foreach name $data(users_$mech,$jid) {
 		append info "\n\t$name"
 	    }
 	} else {
 	    append info \
-		[format [::msgcat::mc "\nRoom is empty at %s"] \
+		[::msgcat::mc "\nRoom is empty at %s" \
 		     [clock format $data(time_$mech,$jid) -format %R]]
 	}
     }

Modified: trunk/tkabber/plugins/roster/conferences.tcl
===================================================================
--- trunk/tkabber/plugins/roster/conferences.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/plugins/roster/conferences.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -280,7 +280,7 @@
     }
 
     MessageDlg .store_bookmarks_error -aspect 50000 -icon error \
-	-message [format [::msgcat::mc "Storing conferences failed: %s"] \
+	-message [::msgcat::mc "Storing conferences failed: %s" \
 			 [error_to_string $child]] \
 	-type user -buttons ok -default 0 -cancel 0
 }

Modified: trunk/tkabber/plugins/roster/rosterx.tcl
===================================================================
--- trunk/tkabber/plugins/roster/rosterx.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/plugins/roster/rosterx.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -143,7 +143,7 @@
         return
     }
 
-    CbDialog $gw [format [::msgcat::mc "Send contacts to %s"] $nick] \
+    CbDialog $gw [::msgcat::mc "Send contacts to %s" $nick] \
 	[list [::msgcat::mc "Send"] \
 	      [list [namespace current]::send_users $gw $xlib $jid] \
 	      [::msgcat::mc "Cancel"] \

Modified: trunk/tkabber/plugins/unix/wmdock.tcl
===================================================================
--- trunk/tkabber/plugins/unix/wmdock.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/plugins/unix/wmdock.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -62,11 +62,11 @@
     }
     
     #	set balloon_msg [concat "Message from" [roster::get_label $from] ]
-    set balloon_msg [format [::msgcat::mc "Message from %s"] $from]
+    set balloon_msg [::msgcat::mc "Message from %s" $from]
     
     after cancel $msg_afterid
     .icon.c itemconfigure icon -image docking/message
-    .icon.c itemconfigure text -text [format [::msgcat::mc "%s msgs"] $msgs]
+    .icon.c itemconfigure text -text [::msgcat::mc "%s msgs" $msgs]
     
     set msg_afterid [after 5000 ::wmdock::clear_msg_status]
 }
@@ -81,7 +81,7 @@
 	set msgs [expr $msgs - $msgsc($chatid)]
 	unset msgsc($chatid)
     }
-    .icon.c itemconfigure text -text [format [::msgcat::mc "%s msgs"] $msgs]
+    .icon.c itemconfigure text -text [::msgcat::mc "%s msgs" $msgs]
 }
 
 proc ::wmdock::presence_recv {who status} {
@@ -91,7 +91,7 @@
 
     if {![winfo exists .icon]} return
 
-    set balloon_msg [format [::msgcat::mc "%s is %s"] $who $status]
+    set balloon_msg [::msgcat::mc "%s is %s" $who $status]
     
     after cancel $msg_afterid
     .icon.c itemconfigure icon -image browser/user

Modified: trunk/tkabber/register.tcl
===================================================================
--- trunk/tkabber/register.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/register.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -10,7 +10,7 @@
     set w .register$winid
     toplevel $w
     wm group $w .
-    set title [format [::msgcat::mc "Register in %s"] $jid]
+    set title [::msgcat::mc "Register in %s" $jid]
     wm title $w $title
     wm iconname $w $title
     wm transient $w .

Modified: trunk/tkabber/search.tcl
===================================================================
--- trunk/tkabber/search.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/search.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -12,7 +12,7 @@
 
     toplevel $sw -cursor watch
     wm group $sw .
-    set title [format [::msgcat::mc "Search in %s"] $jid]
+    set title [::msgcat::mc "Search in %s" $jid]
     wm title $sw $title
     wm iconname $sw $title
     wm transient $sw .
@@ -128,7 +128,7 @@
 
     set rw [toplevel ${sw}results]
     wm group $rw .
-    set title [format [::msgcat::mc "Search in %s"] $jid]
+    set title [::msgcat::mc "Search in %s" $jid]
     wm title $rw $title
     wm iconname $rw $title
     wm withdraw $rw
@@ -179,7 +179,7 @@
     if {$rows <= 0} {
 	pack forget $sww
 	message $rw.errormsg -aspect 50000 \
-	    -text [format [::msgcat::mc "Search in %s: No matching items found"] $jid]
+	    -text [::msgcat::mc "Search in %s: No matching items found" $jid]
 	pack $rw.errormsg -expand yes -fill both -anchor nw -padx 1c -pady 1c
     } elseif {$rows <= 12} {
 	$sww.listbox configure -height [expr {$rows - ($rows % 4) + 4}]

Modified: trunk/tkabber/si.tcl
===================================================================
--- trunk/tkabber/si.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/si.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -423,7 +423,7 @@
 	lassign $t name prio
 
 	custom::defvar transport(allowed,$name) 1 \
-	[format [::msgcat::mc "Enable SI transport %s."] $name] \
+	[::msgcat::mc "Enable SI transport %s." $name] \
 	-type boolean -group {Stream Initiation}
     }
 }

Modified: trunk/tkabber/userinfo.tcl
===================================================================
--- trunk/tkabber/userinfo.tcl	2008-10-18 09:21:39 UTC (rev 1548)
+++ trunk/tkabber/userinfo.tcl	2008-10-18 10:13:07 UTC (rev 1549)
@@ -195,7 +195,7 @@
     toplevel $w -relief $::tk_relief -borderwidth $::tk_borderwidth
     wm group $w .
     wm withdraw $w
-    set title [format [::msgcat::mc "%s info"] $jid]
+    set title [::msgcat::mc "%s info" $jid]
     wm title $w $title
     wm iconname $w $title
 
@@ -532,7 +532,7 @@
 		destroy .load_photo_error
 	    }
 	    NonmodalMessageDlg .load_photo_error -aspect 50000 -icon error \
-	        -message [format [::msgcat::mc "Loading photo failed: %s."] \
+	        -message [::msgcat::mc "Loading photo failed: %s." \
 			         $res]
 	} else {
 	    set f [::open $filename]



More information about the Tkabber-dev mailing list