[Tkabber-dev] r1373 - in trunk/tkabber: . doc ifaceck jabberlib plugins/chat plugins/general plugins/roster

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Tue Feb 5 22:19:07 MSK 2008


Author: sergei
Date: 2008-02-05 22:19:06 +0300 (Tue, 05 Feb 2008)
New Revision: 1373

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/README
   trunk/tkabber/chats.tcl
   trunk/tkabber/custom.tcl
   trunk/tkabber/datagathering.tcl
   trunk/tkabber/disco.tcl
   trunk/tkabber/doc/tkabber.html
   trunk/tkabber/doc/tkabber.xml
   trunk/tkabber/ifaceck/iroster.tcl
   trunk/tkabber/jabberlib/jabberlib.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/histool.tcl
   trunk/tkabber/plugins/chat/logger.tcl
   trunk/tkabber/plugins/chat/nick_colors.tcl
   trunk/tkabber/plugins/general/headlines.tcl
   trunk/tkabber/plugins/general/message_archive.tcl
   trunk/tkabber/plugins/general/offline.tcl
   trunk/tkabber/plugins/general/rawxml.tcl
   trunk/tkabber/plugins/general/xcommands.tcl
   trunk/tkabber/plugins/roster/annotations.tcl
   trunk/tkabber/pubsub.tcl
   trunk/tkabber/register.tcl
   trunk/tkabber/search.tcl
   trunk/tkabber/userinfo.tcl
Log:
	* doc/tkabber.html, doc/tkabber.xml, README: Fixed notice about
	  external XML parser (replaced TclXML which diesnt' work by tDOM
	  which works).

	* jabberlib/jabberlib.tcl: Eliminate use_external_tclxml variable.
	  Now, to use tDOM a user should 'require' it in a config file.

	* chats.tcl, custom.tcl, datagathering.tcl, disco.tcl,
	  ifaceck/iroster.tcl, messages.tcl, muc.tcl,
	  plugins/chat/chatstate.tcl, plugins/chat/events.tcl,
	  plugins/chat/histool.tcl, plugins/chat/logger.tcl,
	  plugins/chat/nick_colors.tcl, plugins/general/headlines.tcl,
	  plugins/general/message_archive.tcl, plugins/general/offline.tcl,
	  plugins/general/rawxml.tcl, plugins/general/xcommands.tcl,
	  plugins/roster/annotations.tcl, pubsub.tcl, register.tcl,
	  search.tcl, userinfo.tcl: Removed usage of global variable font.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/ChangeLog	2008-02-05 19:19:06 UTC (rev 1373)
@@ -1,3 +1,22 @@
+2008-02-05  Sergei Golovan  <sgolovan at nes.ru>
+
+	* doc/tkabber.html, doc/tkabber.xml, README: Fixed notice about
+	  external XML parser (replaced TclXML which diesnt' work by tDOM
+	  which works).
+
+	* jabberlib/jabberlib.tcl: Eliminate use_external_tclxml variable.
+	  Now, to use tDOM a user should 'require' it in a config file.
+
+	* chats.tcl, custom.tcl, datagathering.tcl, disco.tcl,
+	  ifaceck/iroster.tcl, messages.tcl, muc.tcl,
+	  plugins/chat/chatstate.tcl, plugins/chat/events.tcl,
+	  plugins/chat/histool.tcl, plugins/chat/logger.tcl,
+	  plugins/chat/nick_colors.tcl, plugins/general/headlines.tcl,
+	  plugins/general/message_archive.tcl, plugins/general/offline.tcl,
+	  plugins/general/rawxml.tcl, plugins/general/xcommands.tcl,
+	  plugins/roster/annotations.tcl, pubsub.tcl, register.tcl,
+	  search.tcl, userinfo.tcl: Removed usage of global variable font.
+
 2008-01-27  Sergei Golovan  <sgolovan at nes.ru>
 
 	* plugins/filetransfer/si.tcl: Registered filetransfer feature to

Modified: trunk/tkabber/README
===================================================================
--- trunk/tkabber/README	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/README	2008-02-05 19:19:06 UTC (rev 1373)
@@ -68,7 +68,7 @@
        5.1.1.  Tabbed Interface . . . . . . . . . . . . . . . . . . . 16
        5.1.2.  Fonts and colors . . . . . . . . . . . . . . . . . . . 16
        5.1.3.  Cryptography by default  . . . . . . . . . . . . . . . 18
-       5.1.4.  Using of external TclXML library . . . . . . . . . . . 18
+       5.1.4.  Using of external XML parser from tDOM . . . . . . . . 18
        5.1.5.  Debugging Output . . . . . . . . . . . . . . . . . . . 18
        5.1.6.  Splash window  . . . . . . . . . . . . . . . . . . . . 19
        5.1.7.  I18n/L10n  . . . . . . . . . . . . . . . . . . . . . . 19
@@ -374,17 +374,17 @@
       later).  This package works on both Unix and Windows.
 
 
+   o  By default, Tkabber uses pure-Tcl XML parser.  If its performance
+      is insufficient, you may want to install tDOM version 0.8.0 [7]
+      (or later) and use expat based XML parser.
+
    o  By default, communications between the server and client take
       place over a plaintext connection.  While this may not be a
       problem in some local, wired environments, if your server is
       distant or your client is wireless, then you may want to encrypt
       all the client/server traffic.
-      Accordingly, you may to install tls version 1.4.1 [7] (or later).
+      Accordingly, you may to install tls version 1.4.1 [8] (or later).
       This package works on both Unix and Windows.  Note that if you're
-      using Unix, then you'll also need to have _OpenSSL_ installed.
-      Fortunately, this comes preinstalled on many Unix systems.  If
-      it's not on your system, check here [8].  (The Windows
-      distribution of _tls_ comes with all the necessary DLLs.)
 
 
 
@@ -393,10 +393,16 @@
                              Tkabber v0.10.1                January 2007
 
 
+      using Unix, then you'll also need to have _OpenSSL_ installed.
+      Fortunately, this comes preinstalled on many Unix systems.  If
+      it's not on your system, check here [9].  (The Windows
+      distribution of _tls_ comes with all the necessary DLLs.)
+
+
    o  Another option in Unix is to compress connection between client
       and server (it currently disables encryption).
       If you want to compress traffic you should install ZTcl version
-      1.0b4 [9] (or later) and Tclmore version 0.7b1 [9] (or later).
+      1.0b4 [10] (or later) and Tclmore version 0.7b1 [10] (or later).
 
 
    o  By default, end-to-end communications between two or more Jabber
@@ -409,46 +415,45 @@
       installed on your system, you may have to download upto three
       files:
 
-      *  Tcl GPGME version 1.0 [10] (or later);
+      *  Tcl GPGME version 1.0 [11] (or later);
 
-      *  GPGME version 0.3.11 [11] (or later but only 0.3.x); and,
+      *  GPGME version 0.3.11 [12] (or later but only 0.3.x); and,
 
-      *  GPG version 1.0.7 [12] (or later).
+      *  GPG version 1.0.7 [13] (or later).
 
 
    o  If you're running Unix or Windows, then you may want _Tkabber_ to
       automatically mark you as away after a priod of inactivity.
       Accordingly, on Unix, you may want to install Tk Xwin version
-      1.0 [13] (or later), whilst on WIndows, you may want to install
-      Tcl Winidle version 0.1 [14] (or later).
+      1.0 [14] (or later), whilst on WIndows, you may want to install
+      Tcl Winidle version 0.1 [15] (or later).
 
 
    o  If you're running Unix, then you may want _Tkabber_ to use the
       docking tray.
-      Accordingly, you may want to install Tk Theme version 1.20 [15]
-      (or later) for _KDE_ icon, or tktray version 1.1 [16] (or later)
+      Accordingly, you may want to install Tk Theme version 1.20 [16]
+      (or later) for _KDE_ icon, or tktray version 1.1 [17] (or later)
       for freedesktop icon (supported by modern _KDE_ and _GNOME_).
 
 
    o  If you're running Windows, then you may want _Tkabber_ to use the
       system tray.
-      Accordingly, you may want to install Winico version 0.6 [17] (or
+      Accordingly, you may want to install Winico version 0.6 [18] (or
       later).
 
 
-   o  If you're a Tcl/Tk guru, then you may want to access the Tk
-      console to debug things.
-      Accordingly, you may want to install tkcon version 2.3 [18] (or
-      later).
 
 
-
-
 Shchepin, et al.                                                [Page 8]
 
                              Tkabber v0.10.1                January 2007
 
 
+   o  If you're a Tcl/Tk guru, then you may want to access the Tk
+      console to debug things.
+      Accordingly, you may want to install tkcon version 2.3 [19] (or
+      later).
+
    Please keep in mind that these are all "optional extras" -- if
    they're not right for you or your environment, don't bother with
    them!
@@ -495,11 +500,6 @@
 
 
 
-
-
-
-
-
 Shchepin, et al.                                                [Page 9]
 
                              Tkabber v0.10.1                January 2007
@@ -571,7 +571,7 @@
    menu to find the checkbutton to show the console.
 
    Also you can setup _Tkabber_ as handler for XMPP/Jabber MIME
-   Type [19].  For this you need to set hanler for
+   Type [20].  For this you need to set hanler for
    "application/xmpp+xml" MIME type in your browser to something like
    this:
 
@@ -811,9 +811,9 @@
    set ssj::options(encrypt-traffic) 0
 
 
-   # using of external tclxml library
+   # using of external XML parser
 
-   set use_external_tclxml 0
+   package require tdom 0.8
 
 
    # debugging output
@@ -860,9 +860,9 @@
 
    Many aspects of the _Tkabber_'s visual appearance such as fonts,
    colors and geometry of windows can be configured using the Tk option
-   database. [20]
+   database. [21]
 
-   The corresponding _Tk_'s option [21] command can be used in the
+   The corresponding _Tk_'s option [22] command can be used in the
    _Tkabber_'s configuration file in any acceptable way: from small
    tweaks to reading files containing elaborate sets of configuration
    commands; ready-to-use examples of such files are included in the
@@ -973,14 +973,14 @@
    otherwise, the default behavior is to proceed without any
    cryptographic buttons, menus, and so on.)
 
-5.1.4.  Using of external TclXML library
+5.1.4.  Using of external XML parser from tDOM
 
-   By default _Tkabber_ use version of _TclXML_ library that come with
-   it distribution.  This version is pure-Tcl, and it performance can be
-   not suitable.  Then you can install _TclXML_ with built-in _expat_
-   support and set variable "use_external_tclxml":
+   By default for parsing XML _Tkabber_ uses (modified) _TclXML_ library
+   that comes with it distribution.  This parser is pure-Tcl, and it
+   performance can be not suitable.  Then you can install _tDOM_ with
+   built-in _expat_ support and require it in the config file:
 
-   set use_external_tclxml 0
+   package require tdom 0.8
 
 5.1.5.  Debugging Output
 
@@ -1075,7 +1075,7 @@
        set alert_lvls(mesg_to_user) 3
        set alert_colors             {Black DarkBlue Blue Red}
 
-       set raise_new_tab            1
+       set ifacetk::options(raise_new_tab) 1
 
 
    # the autoaway module
@@ -1304,9 +1304,9 @@
    o  a chat message addressed directly to you will cause the tab to go
       red.
 
-   By default, whenever a tab has new activity, it is automatically
+   By default, whenever a new tab is created, it is automatically
    raised.  If you don't like this behavior, add this line:
-   set raise_new_tab 0
+   set ifacetk::options(raise_new_tab) 0
 
 5.2.2.  The Autoaway Module
 
@@ -1418,7 +1418,7 @@
    called ""icondef.xml"", which defines the mapping between each image
    and its textual emoticon (To find out what this file looks like, go
    to where you installed _Tkabber_ and take a look at the file called
-   ""emoticons/default/icondef.xml"" or read XEP-0038 [22].)
+   ""emoticons/default/icondef.xml"" or read XEP-0038 [23].)
 
    If you have just a few icons, and you don't want to create a
    directory and a textual mapping, you can use the procedure called
@@ -2358,7 +2358,7 @@
          concept found in Unix shells.
 
       *  _regexp_ -- provides for searching using full-blown regular
-         expressions engine.  The full syntax is described here [23].
+         expressions engine.  The full syntax is described here [24].
 
 
 

Modified: trunk/tkabber/chats.tcl
===================================================================
--- trunk/tkabber/chats.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/chats.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -204,7 +204,6 @@
 
 proc chat::process_message_fallback \
      {connid from id type is_subject subject body err thread priority x} {
-    global font
     variable chats
 
     set chatid [chatid $connid $from]

Modified: trunk/tkabber/custom.tcl
===================================================================
--- trunk/tkabber/custom.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/custom.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -163,8 +163,6 @@
 ###############################################################################
 
 proc custom::open_window {gid} {
-    global font
-
     set w .customize
     if {[winfo exists $w]} {
 	raise_win $w

Modified: trunk/tkabber/datagathering.tcl
===================================================================
--- trunk/tkabber/datagathering.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/datagathering.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -33,7 +33,6 @@
 proc data::fill_fields {g items} {
     variable data
     variable field_labels
-    global font
 
     set row 0
     set data(varlist,$g) {}
@@ -79,20 +78,19 @@
 	    key {
 		entry $g.$row \
 		    -textvariable [namespace current]::data(var,$tag,$g) \
-		    -state disabled -font $font
+		    -state disabled
 	    }
 	    password {
 		entry $g.$row \
 		    -textvariable [namespace current]::data(var,$tag,$g) \
-		    -show * -font $font
+		    -show *
 		if {$focus == ""} {
 		    set focus $g.$row
 		}
 	    }
 	    default {
 		entry $g.$row \
-		    -textvariable [namespace current]::data(var,$tag,$g) \
-		    -font $font
+		    -textvariable [namespace current]::data(var,$tag,$g)
 		if {$focus == ""} {
 		    set focus $g.$row
 		}
@@ -288,7 +286,6 @@
 
 proc data::fill_fields_x {g items} {
     variable data
-    global font
 
     set data(x,$g) 1
     set row 0
@@ -335,7 +332,6 @@
 
 proc data::fill_field_x {g row tag vars chdata childrens} {
     variable data
-    global font
 
     set required 0
     set desc {}
@@ -376,8 +372,7 @@
 	text-private {
 	    add_label $g $row $label $required
 	    entry $g.entry$row \
-		-textvariable [namespace current]::data(var,$var,$g) \
-		-font $font
+		-textvariable [namespace current]::data(var,$var,$g)
 	    if {$type == "text-private"} {
 		$g.entry$row configure -show *
 	    }
@@ -391,7 +386,7 @@
 	text-multi {
 	    add_label $g $row $label $required
 	    set sw [ScrolledWindow $g.textsw$row -scrollbar vertical]
-	    textUndoable $g.text$row -font $font -height 6 -width 50
+	    textUndoable $g.text$row -height 6 -width 50
 	    $sw setwidget $g.text$row
 	    bind $g.text$row <Control-Key-Return> { }
 	    bind $g.text$row <Return> "[bind Text <Return>]\nbreak"
@@ -455,7 +450,6 @@
 		set height 10
 	    }
 	    set cb [ComboBox $g.combo$row \
-			-font $font \
 			-height $height \
 			-editable no \
 			-values $data(combol$row,$var,$g) \
@@ -473,7 +467,7 @@
 	list-multi {
 	    add_label $g $row $label $required
 	    set sw [ScrolledWindow $g.sw$row]
-	    set l [listbox $g.lb$row -font $font -height 6 \
+	    set l [listbox $g.lb$row -height 6 \
 		       -selectmode multiple -exportselection no]
 	    $sw setwidget $l
 	    foreach {lab val} $options {
@@ -732,7 +726,6 @@
     set m [message $w.error.msg \
 		   -aspect 50000 \
 		   -text [error_to_string $child] \
-		   -font $font \
 		   -pady 2m]
     $m configure -foreground [option get $m errorForeground Message]
     pack $m

Modified: trunk/tkabber/disco.tcl
===================================================================
--- trunk/tkabber/disco.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/disco.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -617,7 +617,6 @@
      {w connid jid node res identities features extras featured_nodes} {
     variable browser
     variable config
-    global font
 
     set tw $browser(tree,$w)
 
@@ -633,7 +632,7 @@
     set desc [item_desc $jid $node $name $nitems]
     set icon ""
 
-    add_line $tw $parent_tag $tnode $icon $desc $data -font $font \
+    add_line $tw $parent_tag $tnode $icon $desc $data \
 	-fill $config(fill)
 
     if {$res != "OK"} {
@@ -644,7 +643,7 @@
 		      [error_to_string $identities]]
 	set icon ""
 	
-	add_line $tw $parent_tag $tnode $icon $desc $data -font $font \
+	add_line $tw $parent_tag $tnode $icon $desc $data \
 	    -fill $config(identitycolor)
 
 	remove_old $tw $parent_tag identity [list $tnode]
@@ -667,7 +666,7 @@
 	set desc "$name ($category/$type)"
 	set icon [item_icon $category $type]
 	
-	add_line $tw $parent_tag $tnode $icon $desc $data -font $font \
+	add_line $tw $parent_tag $tnode $icon $desc $data \
 	    -fill $config(identitycolor)
     }
 
@@ -682,7 +681,7 @@
 	set desc "$label ($var): $value"
 	set icon ""
 	
-	add_line $tw $parent_tag $tnode $icon $desc $data -font $font \
+	add_line $tw $parent_tag $tnode $icon $desc $data \
 	    -fill $config(identitycolor)
     }
 
@@ -727,7 +726,7 @@
 	set icon ""
 
 	if {![$tw exists $tnode]} {
-	    add_line $tw $parent_tag $tnode $icon $desc $data -font $font \
+	    add_line $tw $parent_tag $tnode $icon $desc $data \
 		     -fill $config(fill)
 	}
     }
@@ -757,7 +756,6 @@
 proc disco::browser::draw_items {w connid jid node res items} {
     variable browser
     variable config
-    global font
 
     set tw $browser(tree,$w)
 
@@ -774,7 +772,7 @@
     set desc [item_desc $jid $node $name $nitems]
     set icon ""
 
-    add_line $tw $parent_tag $tnode $icon $desc $data -font $font \
+    add_line $tw $parent_tag $tnode $icon $desc $data \
 	-fill $config(fill)
 
     if {$res != "OK"} {
@@ -790,7 +788,7 @@
 				   [error_to_string $items]]
 	    set icon ""
 	
-	    add_line $tw $parent_tag $tnode $icon $desc $data -font $font \
+	    add_line $tw $parent_tag $tnode $icon $desc $data \
 		     -fill $config(fill)
 
 	    remove_old $tw $parent_tag item [list $tnode]
@@ -829,7 +827,7 @@
 
 	lappend itemnodes $tnode
 
-	add_line $tw $parent_tag $tnode $icon $desc $data -font $font \
+	add_line $tw $parent_tag $tnode $icon $desc $data \
 	    -fill $config(fill)
     }
     remove_old $tw $parent_tag item $itemnodes
@@ -843,7 +841,6 @@
 
 proc disco::browser::negotiate_feature {tw connid jid parent type} {
     variable config
-    global font
 
     lassign [negotiate::send_request $connid $jid $type] res opts
 
@@ -857,7 +854,7 @@
 		      [error_to_string $opts]]
 	set icon ""
 	
-	add_line $tw $parent $node $icon $desc $data -font $font \
+	add_line $tw $parent $node $icon $desc $data \
 	    -fill $config(optioncolor)
 
 	remove_old $tw $parent option [list $node]
@@ -873,7 +870,7 @@
 	set desc $opt
 	set icon ""
 	
-	add_line $tw $parent $node $icon $desc $data -font $font \
+	add_line $tw $parent $node $icon $desc $data \
 	    -fill $config(optioncolor)
     }
     remove_old $tw $parent option $optnodes

Modified: trunk/tkabber/doc/tkabber.html
===================================================================
--- trunk/tkabber/doc/tkabber.html	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/doc/tkabber.html	2008-02-05 19:19:06 UTC (rev 1373)
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en"><head><title>Tkabber v0.10.1</title>
-<meta http-equiv="Expires" content="Thu, 29 Nov 2007 16:19:58 +0000">
+<meta http-equiv="Expires" content="Thu, 31 Jan 2008 19:42:15 +0000">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="description" content="Tkabber v0.10.1">
 <meta name="generator" content="xml2rfc v1.30 (http://xml.resource.org/)">
@@ -163,8 +163,8 @@
 Fonts and colors<br />
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="#s.preload-crypto">5.1.3.</a>&nbsp;
 Cryptography by default<br />
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="#s.preload-tclxml">5.1.4.</a>&nbsp;
-Using of external TclXML library<br />
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="#s.preload-tdom">5.1.4.</a>&nbsp;
+Using of external XML parser from tDOM<br />
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="#s.preload-debugoutput">5.1.5.</a>&nbsp;
 Debugging Output<br />
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="#s.preload-splashwindow">5.1.6.</a>&nbsp;
@@ -479,6 +479,12 @@
 </li><br />
 <br />
 
+<li>By default, Tkabber uses pure-Tcl XML parser. If its performance is
+insufficient, you may want to install
+<a href="http://www.tdom.org/">tDOM version 0.8.0</a> (or later)
+and use expat based XML parser.
+
+</li>
 <li>By default,
 communications between the server and client take place over a
 plaintext connection.
@@ -806,9 +812,9 @@
 set ssj::options(encrypt-traffic) 0
 
 
-# using of external tclxml library
+# using of external XML parser
 
-set use_external_tclxml 0
+package require tdom 0.8
 
 
 # debugging output
@@ -980,19 +986,18 @@
 the default behavior is to proceed without any cryptographic buttons,
 menus, and so on.)
 </p>
-<a name="s.preload-tclxml"></a><br /><hr />
+<a name="s.preload-tdom"></a><br /><hr />
 <table summary="layout" cellpadding="0" cellspacing="2" class="bug" align="right"><tr><td class="bug"><a href="#toc" class="link2">&nbsp;TOC&nbsp;</a></td></tr></table>
-<a name="rfc.section.5.1.4"></a><h3>5.1.4.&nbsp;Using of external TclXML library</h3>
+<a name="rfc.section.5.1.4"></a><h3>5.1.4.&nbsp;Using of external XML parser from tDOM</h3>
 
 <p>
-	      By default <span class="emph">Tkabber</span> use version of <span class="emph">TclXML</span> library that come
-	      with it distribution.  This version is pure-Tcl, and it
-	      performance can be not suitable.  Then you can install <span class="emph">TclXML</span>
-	      with built-in <span class="emph">expat</span> support and set variable
-	      <span class="verb">use_external_tclxml</span>:
+	      By default for parsing XML <span class="emph">Tkabber</span> uses (modified) <span class="emph">TclXML</span>
+	      library that comes with it distribution. This parser is pure-Tcl, and it
+	      performance can be not suitable.  Then you can install <span class="emph">tDOM</span>
+	      with built-in <span class="emph">expat</span> support and require it in the config file:
 	    
 </p><pre>
-set use_external_tclxml 0
+package require tdom 0.8
 </pre>
 <a name="s.preload-debugoutput"></a><br /><hr />
 <table summary="layout" cellpadding="0" cellspacing="2" class="bug" align="right"><tr><td class="bug"><a href="#toc" class="link2">&nbsp;TOC&nbsp;</a></td></tr></table>
@@ -1096,7 +1101,7 @@
     set alert_lvls(mesg_to_user) 3
     set alert_colors             {Black DarkBlue Blue Red}
 
-    set raise_new_tab            1
+    set ifacetk::options(raise_new_tab) 1
 
 
 # the autoaway module
@@ -1318,12 +1323,12 @@
 </ul><p>
 	  
 </p>
-<p>By default, whenever a tab has new activity,
+<p>By default, whenever a new tab is created,
 it is automatically raised.
 If you don't like this behavior,
 add this line:
 	    
-</p><pre>set raise_new_tab 0</pre>
+</p><pre>set ifacetk::options(raise_new_tab) 0</pre>
 <a name="s.postload-autoaway"></a><br /><hr />
 <table summary="layout" cellpadding="0" cellspacing="2" class="bug" align="right"><tr><td class="bug"><a href="#toc" class="link2">&nbsp;TOC&nbsp;</a></td></tr></table>
 <a name="rfc.section.5.2.2"></a><h3>5.2.2.&nbsp;The Autoaway Module</h3>

Modified: trunk/tkabber/doc/tkabber.xml
===================================================================
--- trunk/tkabber/doc/tkabber.xml	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/doc/tkabber.xml	2008-02-05 19:19:06 UTC (rev 1373)
@@ -209,6 +209,12 @@
 <!-- http://www.xs4all.nl/~nijtmans/img.html -->
 <vspace blankLines='1' />
 
+<t>By default, Tkabber uses pure-Tcl XML parser. If its performance is
+insufficient, you may want to install
+<eref target="http://www.tdom.org/">tDOM version 0.8.0</eref> (or later)
+and use expat based XML parser.
+</t>
+
 <t>By default,
 communications between the server and client take place over a
 plaintext connection.
@@ -515,9 +521,9 @@
 set ssj::options(encrypt-traffic) 0
 
 
-# using of external tclxml library
+# using of external XML parser
 
-set use_external_tclxml 0
+package require tdom 0.8
 
 
 # debugging output
@@ -684,17 +690,16 @@
 menus, and so on.)</t>
 </section>
 
-	<section anchor='s.preload-tclxml' title="Using of external TclXML library">
+	<section anchor='s.preload-tdom' title="Using of external XML parser from tDOM">
 	  <figure>
 	    <preamble>
-	      By default <spanx>Tkabber</spanx> use version of <spanx>TclXML</spanx> library that come
-	      with it distribution.  This version is pure-Tcl, and it
-	      performance can be not suitable.  Then you can install <spanx>TclXML</spanx>
-	      with built-in <spanx>expat</spanx> support and set variable
-	      <spanx style='verb'>use_external_tclxml</spanx>:
+	      By default for parsing XML <spanx>Tkabber</spanx> uses (modified) <spanx>TclXML</spanx>
+	      library that comes with it distribution. This parser is pure-Tcl, and it
+	      performance can be not suitable.  Then you can install <spanx>tDOM</spanx>
+	      with built-in <spanx>expat</spanx> support and require it in the config file:
 	    </preamble>
 <artwork>
-set use_external_tclxml 0
+package require tdom 0.8
 </artwork>
 	  </figure>
 	</section>

Modified: trunk/tkabber/ifaceck/iroster.tcl
===================================================================
--- trunk/tkabber/ifaceck/iroster.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/ifaceck/iroster.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -578,7 +578,6 @@
 }
 
 proc roster::addline {w type text jid {jids {}} {foreground ""}} {
-    global font
     variable roster
     variable config
     variable aliases

Modified: trunk/tkabber/jabberlib/jabberlib.tcl
===================================================================
--- trunk/tkabber/jabberlib/jabberlib.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/jabberlib/jabberlib.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -65,9 +65,7 @@
 proc jlib::noop args
 }
 
-if {[info exists use_external_tclxml] && $use_external_tclxml} {
-    package require tdom 0.8
-} else {
+if {[catch {package present tdom}]} {
     package require -exact xml 2.0
 }
 

Modified: trunk/tkabber/messages.tcl
===================================================================
--- trunk/tkabber/messages.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/messages.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -30,7 +30,6 @@
     [namespace current]::message::process_message
 
 proc message::show_dialog {connid from type subject body thread priority x {replyP 1}} {
-    global font
     variable msgid
 
     if {$type == "normal"} {
@@ -95,14 +94,13 @@
 
     if {[llength [jlib::connections]] > 1} {
 	label $mw.title.lconnection -text [::msgcat::mc "Received by:"]
-	label $mw.title.connection -text " [jlib::connection_jid $connid]" \
-	    -font $font
+	label $mw.title.connection -text " [jlib::connection_jid $connid]"
 	grid $mw.title.lconnection -row 0 -column 0 -sticky e
 	grid $mw.title.connection  -row 0 -column 1 -sticky w
     }
 
     label $mw.title.lab -text $title
-    menubutton $mw.title.mb -text $from -font $font -menu $mw.title.mb.menu
+    menubutton $mw.title.mb -text $from -menu $mw.title.mb.menu
     subject_menu $mw.title.mb.menu $connid $from message
     grid $mw.title.lab -row 1 -column 0 -sticky e
     grid $mw.title.mb  -row 1 -column 1 -sticky w
@@ -196,7 +194,7 @@
         ScrolledWindow $mw.sw
         pack $mw.sw -in $mw.frame -side top -fill both -expand yes
 
-        textUndoable $mw.body -width 60 -height 8 -wrap word -font $font
+        textUndoable $mw.body -width 60 -height 8 -wrap word
         pack $mw.body -side top -fill both -expand yes -in $mw.sw
         bind $mw.body <Control-Return> "ButtonBox::invoke $bbox 0
                 break"
@@ -303,7 +301,6 @@
 }
 
 proc message::send_dialog {args} {
-    global font
     variable msgid
     variable message_dest_list
     variable send_dialog_connid
@@ -401,7 +398,6 @@
 	ComboBox $mw.f.connection \
 	    -textvariable [namespace current]::send_dialog_connid($mw) \
 	    -values $connections \
-	    -font $font \
 	    -state $cstate
 
 	grid $mw.f.lconnection -row 0 -column 0 -sticky e
@@ -441,7 +437,7 @@
     ScrolledWindow $mw.sw
     pack $mw.sw -in $mw.frame -side top -fill both -expand yes
 
-    textUndoable $mw.body -width 60 -height 8 -wrap word -font $font
+    textUndoable $mw.body -width 60 -height 8 -wrap word
     pack $mw.body -side top -fill both -expand yes -in $mw.sw
     bind $mw.body <Control-Return> "ButtonBox::invoke $bbox 0
             break"
@@ -585,7 +581,6 @@
 
 proc message::show_subscribe_dialog {connid from type x args} {
     variable msgid
-    global font
 
     if {$type != "subscribe"} return
 
@@ -631,15 +626,14 @@
 
     if {[llength [jlib::connections]] > 1} {
 	label $mw.subj.lconnection -text [::msgcat::mc "Received by:"]
-	label $mw.subj.connection -text " [jlib::connection_jid $connid]" \
-	    -font $font
+	label $mw.subj.connection -text " [jlib::connection_jid $connid]"
 	grid $mw.subj.lconnection -row 0 -column 0 -sticky e
 	grid $mw.subj.connection  -row 0 -column 1 -sticky w
     }
 
 
     label $mw.subj.lab -text [::msgcat::mc "Subscription request from:"]
-    menubutton $mw.subj.mb -text $from -font $font -menu $mw.subj.mb.menu
+    menubutton $mw.subj.mb -text $from -menu $mw.subj.mb.menu
     subject_menu $mw.subj.mb.menu $connid $from subscribe
     grid $mw.subj.lab -row 1 -column 0 -sticky e
     grid $mw.subj.mb  -row 1 -column 1 -sticky w
@@ -809,7 +803,6 @@
 ###############################################################################
 
 proc message::send_subscribe_dialog {to args} {
-    global font
     variable msgid
     variable send_subscribe_connid
 
@@ -870,7 +863,6 @@
 	ComboBox $mw.subj.connection \
 	    -textvariable [namespace current]::send_subscribe_connid \
 	    -values $connections \
-	    -font $font \
 	    -state $cstate
 
 	grid $mw.subj.lconnection -row 0 -column 0 -sticky e
@@ -878,7 +870,7 @@
     }
 
     label $mw.subj.lab -text [::msgcat::mc "Send request to: "]
-    entry $mw.subj.entry -font $font
+    entry $mw.subj.entry
     $mw.subj.entry insert 0 $to
     grid $mw.subj.lab   -row 1 -column 0 -sticky e
     grid $mw.subj.entry -row 1 -column 1 -sticky ew

Modified: trunk/tkabber/muc.tcl
===================================================================
--- trunk/tkabber/muc.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/muc.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -593,7 +593,6 @@
 ###############################################################################
 
 proc muc::fill_list {sf f items attr val} {
-    global font
     variable listdata
     variable origlistdata
 
@@ -651,7 +650,7 @@
 	lassign $item listdata($f,nick,$row) listdata($f,jid,$row) \
 		      role affiliation listdata($f,reason,$row)
 
-	entry $f.nick$row -font $font \
+	entry $f.nick$row \
 	    -textvariable muc::listdata($f,nick,$row) \
 	    -takefocus 0 \
 	    -highlightthickness 0 \
@@ -662,7 +661,7 @@
 	grid $f.nick$row -row $row -column 0 -sticky we -padx 1m
 	bindscroll $f.nick$row $sf
 
-	entry $f.jid$row -font $font \
+	entry $f.jid$row \
 	    -textvariable muc::listdata($f,jid,$row) \
 	    -takefocus 0 \
 	    -highlightthickness 0 \
@@ -694,7 +693,7 @@
 	    }
 	}
 
-	entry $f.reason$row -font $font \
+	entry $f.reason$row \
 	    -textvariable muc::listdata($f,reason,$row) \
 	    -width 40
 	grid $f.reason$row -row $row -column 3 -sticky we -padx 1m
@@ -710,20 +709,17 @@
 ###############################################################################
 
 proc muc::list_add_item {sf f attr val} {
-    global font
     variable listdata
 
     set row [incr listdata($f,rows)]
 
     entry $f.nick$row \
-	-font $font \
 	-textvariable muc::listdata($f,nick,$row) \
 	-width 20
     grid $f.nick$row -row $row -column 0 -sticky we -padx 1m
     bindscroll $f.nick$row $sf
     
     entry $f.jid$row \
-	-font $font \
 	-textvariable muc::listdata($f,jid,$row) \
 	-width 30
     grid $f.jid$row -row $row -column 1 -sticky we -padx 1m
@@ -751,7 +747,6 @@
     }
 
     entry $f.reason$row \
-	-font $font \
 	-textvariable muc::listdata($f,reason,$row) \
 	-width 40
     grid $f.reason$row -row $row -column 3 -sticky we -padx 1m

Modified: trunk/tkabber/plugins/chat/chatstate.tcl
===================================================================
--- trunk/tkabber/plugins/chat/chatstate.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/plugins/chat/chatstate.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -157,7 +157,6 @@
 
 proc chatstate::setup_ui {chatid type} {
     variable chatstate
-    global font
 
     if {![chat::is_chat $chatid]} return
 
@@ -165,7 +164,7 @@
 
     set l $cw.status.event
     if {![winfo exists $l]} {
-	label $l -font $font
+	label $l
 	pack $l -side left
     }
 

Modified: trunk/tkabber/plugins/chat/events.tcl
===================================================================
--- trunk/tkabber/plugins/chat/events.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/plugins/chat/events.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -215,7 +215,6 @@
 
 proc events::setup_ui {chatid type} {
     variable events
-    global font
 
     if {![chat::is_chat $chatid]} return
 
@@ -223,7 +222,7 @@
 
     set l $cw.status.event
     if {![winfo exists $l]} {
-	label $l -font $font
+	label $l
 	pack $l -side left
     }
 

Modified: trunk/tkabber/plugins/chat/histool.tcl
===================================================================
--- trunk/tkabber/plugins/chat/histool.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/plugins/chat/histool.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -40,8 +40,6 @@
 }
 
 proc histool::browser_create {w} {
-    global font tk_relief tk_borderwidth
-
     variable loghier [get_log_hier]
 
     add_win $w \

Modified: trunk/tkabber/plugins/chat/logger.tcl
===================================================================
--- trunk/tkabber/plugins/chat/logger.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/plugins/chat/logger.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -248,7 +248,6 @@
 #############################################################################
 
 proc ::logger::create_log_viewer {lw jid args} {
-    global font
     global tcl_platform
     global defaultnick
 
@@ -274,7 +273,7 @@
     wm iconname $lw $title
 
     set lf [ScrolledWindow $lw.sw]
-    set l [text $lw.log -font $font -wrap word -takefocus 0]
+    set l [text $lw.log -wrap word -takefocus 0]
 
     set mf [frame $lw.mf]
     pack $mf -side top -fill x -expand no -padx 1m -pady 1m

Modified: trunk/tkabber/plugins/chat/nick_colors.tcl
===================================================================
--- trunk/tkabber/plugins/chat/nick_colors.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/plugins/chat/nick_colors.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -165,7 +165,6 @@
 }
 
 proc nickcolors::edit_nick_colors {} {
-    global font
     variable NickColors
     variable NickColorEdits
 
@@ -197,7 +196,7 @@
 
     foreach nick [lsort -dictionary [array names NickColors]] {
 	set clr $NickColors($nick)
-        $lf tag configure NICK-$nick -font $font -foreground $clr
+        $lf tag configure NICK-$nick -foreground $clr
         $lf tag bind NICK-$nick <Enter> \
             [list [namespace current]::on_nick_hover $lf $nick Enter]
         $lf tag bind NICK-$nick <Leave> \

Modified: trunk/tkabber/plugins/general/headlines.tcl
===================================================================
--- trunk/tkabber/plugins/general/headlines.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/plugins/general/headlines.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -82,7 +82,6 @@
 
 proc headlines::open_window {connid from} {
     global tcl_platform
-    global font
     variable options
     variable trees
 
@@ -124,7 +123,7 @@
 
     frame $dw.date
     label $dw.date.label -anchor w -text [::msgcat::mc "Date:"]
-    entry $dw.date.ts -font $font \
+    entry $dw.date.ts \
 		      -takefocus 0 \
 		      -highlightthickness 0 \
 		      -relief flat
@@ -134,7 +133,7 @@
 
     frame $dw.from
     label $dw.from.label -anchor w -text [::msgcat::mc "From:"]
-    entry $dw.from.jid -font $font \
+    entry $dw.from.jid \
 		       -takefocus 0 \
 		       -highlightthickness 0 \
 		       -relief flat
@@ -144,7 +143,7 @@
 
     frame $dw.subject
     label $dw.subject.lsubj -anchor w -text [::msgcat::mc "Subject:"]
-    text $dw.subject.subj -font $font \
+    text $dw.subject.subj \
 			  -height 1 \
 			  -takefocus 0 \
 			  -highlightthickness 0 \
@@ -194,7 +193,7 @@
     bindscroll $tw.c
 
     set dsw [ScrolledWindow $dw.sw]
-    text $hw.body -font $font -height 12 -state disabled \
+    text $hw.body -height 12 -state disabled \
 		  -wrap word -takefocus 1
     ::richtext::config $hw.body -using url
     $dsw setwidget $hw.body
@@ -219,7 +218,6 @@
     variable headlines
     variable trees
     variable options
-    global font
 
     set subject [string trim $subject]
     set body [string trim $body]
@@ -287,7 +285,7 @@
     set fnode [str2node $text]
     if {![$tw exists $fnode]} {
         $tw insert end root $fnode -text [string map [list "\n" " "] $text] -open 1 \
-            -image browser/headline -font $font \
+            -image browser/headline \
             -fill $options(seencolor) \
             -data [list type from text $text unseen 0]
     }
@@ -299,7 +297,7 @@
 
         if {![$tw exists $snode]} {
             $tw insert end $fnode $snode -text [string map [list "\n" " "] $dsubject] -open 1 \
-                -image browser/headline -font $font \
+                -image browser/headline \
                 -fill $options(seencolor) \
                 -data [list type subject text $subject unseen 0]
         }
@@ -318,7 +316,7 @@
     append nodetext [string map [list "\n" " "] $ddesc]
 
     $tw insert end $snode $anode -text $nodetext -open 1 \
-        -fill $options(seencolor) -font $font \
+        -fill $options(seencolor) \
         -data [array get props]
     if {$props(unseen)} {
         $tw itemconfigure $anode -fill $options(unseencolor)

Modified: trunk/tkabber/plugins/general/message_archive.tcl
===================================================================
--- trunk/tkabber/plugins/general/message_archive.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/plugins/general/message_archive.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -43,7 +43,6 @@
 }
 
 proc ::message_archive::show_archive {} {
-    global font
     variable lastsort
     variable label
     variable messages
@@ -65,15 +64,15 @@
     set dw [PanedWinAdd $w.pw -weight 1 -minsize 100]
 
     frame $dw.title
-    label $dw.title.label -font $font -text $label(from)
-    label $dw.title.jid -font $font
+    label $dw.title.label -text $label(from)
+    label $dw.title.jid
     pack $dw.title -fill x
     pack $dw.title.label -side left
     pack $dw.title.jid -side left
 
     frame $dw.subject
-    label $dw.subject.lsubj -font $font -text [::msgcat::mc "Subject:"]
-    label $dw.subject.subj -font $font
+    label $dw.subject.lsubj -text [::msgcat::mc "Subject:"]
+    label $dw.subject.subj
     pack $dw.subject -fill x
     pack $dw.subject.lsubj -side left
     pack $dw.subject.subj -side left
@@ -89,8 +88,6 @@
     set height [option get $w listheight Messages]
     ::mclistbox::mclistbox $sww.listbox \
 	    -resizeonecolumn 1 \
-	    -font $font \
-	    -labelfont $font \
 	    -labelanchor w \
 	    -width 90 \
 	    -height $height
@@ -99,7 +96,8 @@
     pack $sww -expand yes -fill both -anchor nw -in $uw
     $sww setwidget $l
 
-    [winfo parent $uw] configure -height [expr {int( 1.2*($height+1)*[font metrics $font -linespace] )}]
+    [winfo parent $uw] configure \
+	-height [expr {int( 1.2*($height+1)*[font metrics [$l cget -font] -linespace] )}]
 
 
     set lastsort($l) ""

Modified: trunk/tkabber/plugins/general/offline.tcl
===================================================================
--- trunk/tkabber/plugins/general/offline.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/plugins/general/offline.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -109,7 +109,6 @@
 package require md5
 
 proc offline::add_message {tw connid node from category type} {
-    global font
     variable options
 
     set jid [jlib::connection_jid $connid]
@@ -117,7 +116,7 @@
     set fnode [str2node $jid]
     if {![$tw exists $fnode]} {
 	$tw insert end root $fnode -text $jid -open 1 \
-	    -fill $options(unseencolor) -image browser/user -font $font \
+	    -fill $options(unseencolor) -image browser/user \
 	    -data [list type jid connid $connid jid $jid unseen 1]
     }
 
@@ -129,7 +128,7 @@
 	    set t " ($type)"
 	}
 	$tw insert end $fnode $snode -text "$category$t from $from \[$node\]" -open 1 \
-	    -fill $options(unseencolor) -font $font \
+	    -fill $options(unseencolor) \
 	    -data [list type node connid $connid jid $jid node $node \
 			from $from category $category type $type unseen 1]
 	message_update $tw $snode

Modified: trunk/tkabber/plugins/general/rawxml.tcl
===================================================================
--- trunk/tkabber/plugins/general/rawxml.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/plugins/general/rawxml.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -102,7 +102,6 @@
 }
 
 proc rawxml::pretty_print {t xmldata prefix tag {xmlns jabber:client}} {
-    global font
     variable options
     variable tabs
 
@@ -126,7 +125,7 @@
 	#			     [expr {[clength $tagname] + 2}]]
 	set arr_index "$prefix<$tagname "
 	if {![info exists tabs($arr_index)]} {
-	    set tabs($arr_index) [font measure $font $arr_index]
+	    set tabs($arr_index) [font measure [$t cget -font] $arr_index]
 	}
 	$t tag configure $arr_index -tabs [list $tabs($arr_index)]
 
@@ -173,8 +172,6 @@
     "[namespace current]::rawxml::handle_inout_x \$connid \$x OUT out"
 
 proc rawxml::open_window {} {
-    global font
-
     set w .rawxml
     if {[winfo exists $w]} {
 	return
@@ -217,14 +214,14 @@
 
     set isw [ScrolledWindow $w.isw -scrollbar vertical]
     pack $isw -side bottom -fill both -expand yes -in $dw
-    set input [textUndoable $w.input -font $font \
+    set input [textUndoable $w.input \
 		   -height [option get $w inputheight RawXML]]
     $isw setwidget $input
     [winfo parent $dw] configure -height [winfo reqheight $input]
 
     set sw [ScrolledWindow $w.sw -scrollbar vertical]
     pack $sw -side top -fill both -expand yes -in $uw
-    set dump [text $w.dump -font $font]
+    set dump [text $w.dump]
     $sw setwidget $dump
 
     $dump configure -state disabled

Modified: trunk/tkabber/plugins/general/xcommands.tcl
===================================================================
--- trunk/tkabber/plugins/general/xcommands.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/plugins/general/xcommands.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -201,8 +201,6 @@
 ##########################################################################
 
 proc xcommands::pack_note {fr type note} {
-    global font
-
     set mf $fr.msg
     if {[winfo exists $mf]} {
 	destroy $mf
@@ -221,7 +219,7 @@
 	    set msg [::msgcat::mc "Info:"]
 	}
     }
-    message $mf -font $font -text "$msg $note" -aspect 50000 -width 0
+    message $mf -text "$msg $note" -aspect 50000 -width 0
     pack $mf
 }
 

Modified: trunk/tkabber/plugins/roster/annotations.tcl
===================================================================
--- trunk/tkabber/plugins/roster/annotations.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/plugins/roster/annotations.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -170,7 +170,6 @@
 
 proc annotations::show_dialog {connid jid} {
     variable notes
-    global font
 
     set jid [node_and_server_from_jid $jid]
 
@@ -207,7 +206,7 @@
 
     ScrolledWindow $f.sw
     pack $f.sw -side top -expand yes -fill both
-    textUndoable $f.note -width 50 -height 5 -wrap word -font $font
+    textUndoable $f.note -width 50 -height 5 -wrap word
     if {[info exists notes($connid,note,$jid)]} {
 	$f.note insert 0.0 $notes($connid,note,$jid)
     }
@@ -264,7 +263,6 @@
 
 proc annotations::note_page {tab connid jid editable} {
     variable notes
-    global font
 
     if {$editable} return
 
@@ -293,7 +291,7 @@
     }
 
     set sw [ScrolledWindow $n.sw -scrollbar vertical]
-    text $n.text -font $font -height 12 -wrap word
+    text $n.text -height 12 -wrap word
     $sw setwidget $n.text
     $n.text insert 0.0 $notes($connid,note,$jid)
     $n.text configure -state disabled

Modified: trunk/tkabber/pubsub.tcl
===================================================================
--- trunk/tkabber/pubsub.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/pubsub.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -1590,7 +1590,6 @@
 }
 
 proc pubsub::fill_list {sf f entities} {
-    global font
     variable a2m
     variable s2m
     variable listdata
@@ -1638,12 +1637,12 @@
     foreach entity [lsort -dictionary -index 0 $entities2] {
 	lassign $item jid subid affiliation subscription
 
-	label $f.jid$row -text $jid -font $font \
+	label $f.jid$row -text $jid \
 	    -textvariable [namespace current]::listdata($f,jid,$row)
 	grid $f.jid$row -row $row -column 0 -sticky w -padx 1m
 	bindscroll $f.jid$row $sf
 
-	label $f.subid$row -text $subid -font $font \
+	label $f.subid$row -text $subid \
 	    -textvariable [namespace current]::listdata($f,subid,$row)
 	grid $f.subid$row -row $row -column 1 -sticky w -padx 1m
 	bindscroll $f.subid$row $sf
@@ -1678,7 +1677,6 @@
 }
 
 proc pubsub::list_add_item {sf f} {
-    global font
     variable a2m
     variable s2m
     variable listdata
@@ -1687,12 +1685,12 @@
 
     set row $listdata($f,rows)
 
-    entry $f.jid$row -font $font \
+    entry $f.jid$row \
 	-textvariable [namespace current]::listdata($f,jid,$row)
     grid $f.jid$row -row $row -column 0 -sticky we -padx 1m
     bindscroll $f.jid$row $sf
 
-    entry $f.subid$row -font $font \
+    entry $f.subid$row \
 	-textvariable [namespace current]::listdata($f,subid,$row)
     grid $f.subid$row -row $row -column 1 -sticky we -padx 1m
     bindscroll $f.subid$row $sf

Modified: trunk/tkabber/register.tcl
===================================================================
--- trunk/tkabber/register.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/register.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -154,7 +154,6 @@
 
 
 proc register::recv_result {w connid jid res child} {
-    global font
     variable data
 
     debugmsg register "$res $child"
@@ -168,7 +167,6 @@
 	set m [message $w.error.msg \
 		       -aspect 50000 \
 		       -text [error_to_string $child] \
-		       -font $font \
 		       -pady 2m]
 	$m configure -foreground [option get $m errorForeground Message]
 	pack $m

Modified: trunk/tkabber/search.tcl
===================================================================
--- trunk/tkabber/search.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/search.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -105,7 +105,6 @@
 }
 
 proc search::recv_items {sw jid connid res child} {
-    global font
     variable lastsort
 
     debugmsg search "$res $child"
@@ -125,7 +124,7 @@
 	    destroy $sw.errormsg
 	}
 
-	message $sw.errormsg -aspect 50000 -font $font \
+	message $sw.errormsg -aspect 50000 \
 	    -text [format [::msgcat::mc "An error occurred when searching in %s\n\n%s"] \
 		       $jid [error_to_string $child]]
 
@@ -162,8 +161,6 @@
 
     ::mclistbox::mclistbox $sww.listbox \
 	-resizeonecolumn 1 \
-	-font $font \
-	-labelfont $font \
 	-labelanchor w \
 	-width 90 \
 	-height 16
@@ -191,7 +188,7 @@
 
     if {$rows <= 0} {
 	pack forget $sww
-	message $rw.errormsg -aspect 50000 -font $font \
+	message $rw.errormsg -aspect 50000 \
 	    -text [format [::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} {

Modified: trunk/tkabber/userinfo.tcl
===================================================================
--- trunk/tkabber/userinfo.tcl	2008-02-04 00:38:06 UTC (rev 1372)
+++ trunk/tkabber/userinfo.tcl	2008-02-05 19:19:06 UTC (rev 1373)
@@ -84,14 +84,12 @@
 }
 
 proc userinfo::pack_entry {jid g row name text} {
-    global font
-
     set w [w_from_jid $jid]
 
     label $g.l$name -text $text
     upvar editable editable
 
-    entry $g.$name -textvariable userinfo::userinfo($name,$jid) -font $font
+    entry $g.$name -textvariable userinfo::userinfo($name,$jid)
     if {$editable} {
 	ecursor_entry $g.$name
     } else {
@@ -113,7 +111,6 @@
 }
 
 proc userinfo::pack_text_entry {jid g row name text} {
-    global font
     variable userinfo
 
     set w [w_from_jid $jid]
@@ -136,18 +133,16 @@
 }
 
 proc userinfo::pack_spinbox {jid g row col name low high text} {
-    global font
-
     label $g.l$name -text $text
 
     set width [expr {[string length $high] + 1}]
     if {[info tclversion] >= 8.4} {
 	spinbox $g.$name -from $low -to $high -increment 1 \
 		-buttoncursor left_ptr -width $width \
-		-textvariable userinfo::userinfo($name,$jid) -font $font
+		-textvariable userinfo::userinfo($name,$jid)
     } else {
 	SpinBox $g.$name -range [list $low $high 1] -width $width \
-		-textvariable userinfo::userinfo($name,$jid) -font $font
+		-textvariable userinfo::userinfo($name,$jid)
     }
     
     grid $g.l$name -row $row -column $col -sticky e
@@ -170,7 +165,6 @@
 }
 
 proc userinfo::open {jid args} {
-    global font
     global tcl_platform
     variable userinfo
 
@@ -317,10 +311,10 @@
     set a [pack_frame $about.about [string trim [::msgcat::mc "About "]]]
     set sw [ScrolledWindow $a.sw -scrollbar vertical]
     if {!$editable} {
-	text $a.text -font $font -height 12 -wrap word
+	text $a.text -height 12 -wrap word
 	::richtext::config $a.text -using {url emoticon}
     } else {
-	textUndoable $a.text -font $font -height 12 -wrap word
+	textUndoable $a.text -height 12 -wrap word
     }
     $sw setwidget $a.text
     bind $a.text <Key-Return> [bind Text <Key-Return>]



More information about the Tkabber-dev mailing list