[Tkabber-dev] r1729 - in trunk/tkabber: . doc examples/configs

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sat Mar 14 18:30:03 MSK 2009


Author: sergei
Date: 2009-03-14 18:30:03 +0300 (Sat, 14 Mar 2009)
New Revision: 1729

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/README
   trunk/tkabber/chats.tcl
   trunk/tkabber/doc/tkabber.html
   trunk/tkabber/doc/tkabber.xml
   trunk/tkabber/examples/configs/badlop-config.tcl
Log:
	* README, chats.tcl, doc/tkabber.html, doc/tkabber.xml,
	  examples/configs/badlop-config.tcl: Removed
	  chat::options(default_message_type) option because messages with no
	  type attribute must be treated as normal.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2009-03-14 13:40:15 UTC (rev 1728)
+++ trunk/tkabber/ChangeLog	2009-03-14 15:30:03 UTC (rev 1729)
@@ -4,6 +4,11 @@
 	  ones (created just before posting) to make it easier to
 	  enabling/disabling and adding/deleting items.
 
+	* README, chats.tcl, doc/tkabber.html, doc/tkabber.xml,
+	  examples/configs/badlop-config.tcl: Removed
+	  chat::options(default_message_type) option because messages with no
+	  type attribute must be treated as normal.
+
 2009-03-13  Sergei Golovan  <sgolovan at nes.ru>
 
 	* plugins/general/captcha.tcl: Renamed from challenge.tcl and added

Modified: trunk/tkabber/README
===================================================================
--- trunk/tkabber/README	2009-03-14 13:40:15 UTC (rev 1728)
+++ trunk/tkabber/README	2009-03-14 15:30:03 UTC (rev 1729)
@@ -115,7 +115,7 @@
 
        6.2.15. The Message Module . . . . . . . . . . . . . . . . . . 33
        6.2.16. The Raw XML Input Module . . . . . . . . . . . . . . . 33
-       6.2.17. The Roster Module  . . . . . . . . . . . . . . . . . . 34
+       6.2.17. The Roster Module  . . . . . . . . . . . . . . . . . . 33
        6.2.18. The Sound Module . . . . . . . . . . . . . . . . . . . 34
      6.3.  Menu-load  . . . . . . . . . . . . . . . . . . . . . . . . 36
        6.3.1.  The Avatar Module  . . . . . . . . . . . . . . . . . . 36
@@ -1303,7 +1303,6 @@
 
 # the chat module
 
-    set chat::options(default_message_type) chat
     set chat::options(stop_scroll)          0
     set plugins::options(timestamp_format)  {[%R]}
 
@@ -1340,6 +1339,7 @@
 
 
 
+
 Shchepin, et al.                                               [Page 24]
 
                              Tkabber 0.11.1                    June 2008
@@ -1550,31 +1550,25 @@
 
 6.2.4.  The Chat Module
 
-   Most instant messaging users prefer to see all the back-and-forth
-   communication in a single window.  If you prefer to see each line
-   sent back-and-forth in a separate window, here's what to put in your
-   "postload":
-
-   set chat::options(default_message_type) normal
-
    The variable named "chat::options(stop_scroll)" determines whether a
    chat window should automatically scroll down to the bottom whenever
    something new comes in.
 
+   You can also set format of time stamp that displayed in beginning of
+   each chat message.  Refer to _Tcl_ documentation for description of
+   format.  E.g., to display it in ""dd:mm:ss"" format, add this line:
 
+   set plugins::options(timestamp_format) {[%T]}
 
 
+
+
+
 Shchepin, et al.                                               [Page 28]
 
                              Tkabber 0.11.1                    June 2008
 
 
-   You can also set format of time stamp that displayed in beginning of
-   each chat message.  Refer to _Tcl_ documentation for description of
-   format.  E.g., to display it in ""dd:mm:ss"" format, add this line:
-
-   set plugins::options(timestamp_format) {[%T]}
-
 6.2.5.  The Clientinfo Module
 
    This module shows in popup balloons information of used by this user
@@ -1617,18 +1611,20 @@
    The procedure called _plugins::emoticons::load_dir_ is used to load
    emoticon definitions from a directory.  The directory contains a file
    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 [24].)
 
 
 
+
+
+
 Shchepin, et al.                                               [Page 29]
 
                              Tkabber 0.11.1                    June 2008
 
 
-   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 [24].)
-
    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
    "plugins::emoticons::add", e.g.,
@@ -1669,26 +1665,22 @@
 
        set defaultnick(adhoc at conference.example.com) publius
 
+   Another possibility is to put pattern in parentheses.  The following
+   example shows how to specify default nickname for all conferences at
+   _conference.example.com_:
 
+       set defaultnick(*@conference.example.com) ciceroni
 
+   Exact JID's take the higher precedence than patterns.
 
 
 
 
-
 Shchepin, et al.                                               [Page 30]
 
                              Tkabber 0.11.1                    June 2008
 
 
-   Another possibility is to put pattern in parentheses.  The following
-   example shows how to specify default nickname for all conferences at
-   _conference.example.com_:
-
-       set defaultnick(*@conference.example.com) ciceroni
-
-   Exact JID's take the higher precedence than patterns.
-
 6.2.11.  The Ispell Module
 
    On Unix, _Tkabber_ can check spelling of what you entered by calling
@@ -1728,20 +1720,23 @@
    ibb:  that uses your "Jabber" connection to transmit the data (which
       may slowdown other traffic to you).
 
+   If your machine is behind a NAT, then you can't use the "bytestreams"
+   transport, so you should disable it:
 
+       set si::transport(allowed,http://jabber.org/protocol/bytestreams) 0
 
 
 
+
+
+
+
+
 Shchepin, et al.                                               [Page 31]
 
                              Tkabber 0.11.1                    June 2008
 
 
-   If your machine is behind a NAT, then you can't use the "bytestreams"
-   transport, so you should disable it:
-
-       set si::transport(allowed,http://jabber.org/protocol/bytestreams) 0
-
 6.2.13.  The Logger Module
 
    You can set directory to store logs:
@@ -1785,19 +1780,19 @@
    you are in LAN environment without _DNS_) you can force _Tkabber_ to
    connect to the server using "loginconf(altserver)" and
    "loginconf(altport)" options (do not forget to set
+   "loginconf(usealtserver)" to "1").
 
+   Another option is to use _HTTP_-polling connect method (if your
+   server supports it) and tunnel _XMPP_ traffic through _HTTP_.  To
+   enable _HTTP_-polling set "loginconf(usehttppoll)" to "1". _Tkabber_
 
 
+
 Shchepin, et al.                                               [Page 32]
 
                              Tkabber 0.11.1                    June 2008
 
 
-   "loginconf(usealtserver)" to "1").
-
-   Another option is to use _HTTP_-polling connect method (if your
-   server supports it) and tunnel _XMPP_ traffic through _HTTP_.  To
-   enable _HTTP_-polling set "loginconf(usehttppoll)" to "1". _Tkabber_
    then tries to find connect _URL_ using _TXT_ record in _DNS_ (see
    XEP-0156).  You can specify _URL_ manually by setting
    "loginconf(pollurl)".
@@ -1842,17 +1837,18 @@
    drawed incorrectly, e.g. for XHTML tags.  Also you can set
    indentation level via "indent" option.
 
+6.2.17.  The Roster Module
 
+   By default, your entire roster is shown, even those items that aren't
+   online.  The variable called "roster::show_only_online" controls
 
+
+
 Shchepin, et al.                                               [Page 33]
 
                              Tkabber 0.11.1                    June 2008
 
 
-6.2.17.  The Roster Module
-
-   By default, your entire roster is shown, even those items that aren't
-   online.  The variable called "roster::show_only_online" controls
    this.
 
    Similarly by default, each item in every category is shown in the
@@ -1900,6 +1896,10 @@
 
 
 
+
+
+
+
 Shchepin, et al.                                               [Page 34]
 
                              Tkabber 0.11.1                    June 2008

Modified: trunk/tkabber/chats.tcl
===================================================================
--- trunk/tkabber/chats.tcl	2009-03-14 13:40:15 UTC (rev 1728)
+++ trunk/tkabber/chats.tcl	2009-03-14 15:30:03 UTC (rev 1729)
@@ -24,11 +24,6 @@
     custom::defvar options(display_status_description) 1 \
 	[::msgcat::mc "Display description of user status in chat windows."] \
 	-type boolean -group Chat
-    custom::defvar options(default_message_type) chat \
-	[::msgcat::mc "Default message type (if not specified explicitly)."] \
-	-type radio -group Chat \
-	-values [list normal [::msgcat::mc "Normal"] \
-		      chat [string trim [::msgcat::mc "Chat "]]]
     custom::defvar options(gen_status_change_msgs) 0 \
 	[::msgcat::mc "Generate chat messages when chat peer\
 	    changes his/her status and/or status message"] \
@@ -225,7 +220,8 @@
     variable options
 
     if {$type == ""} {
-	set type $options(default_message_type)
+	# If message lacks type set it to 'normal' as required by RFC
+	set type normal
     }
 
     set from [::xmpp::jid::normalize $from]

Modified: trunk/tkabber/doc/tkabber.html
===================================================================
--- trunk/tkabber/doc/tkabber.html	2009-03-14 13:40:15 UTC (rev 1728)
+++ trunk/tkabber/doc/tkabber.html	2009-03-14 15:30:03 UTC (rev 1729)
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en"><head><title>Tkabber 0.11.1</title>
-<meta http-equiv="Expires" content="Sat, 01 Nov 2008 08:21:08 +0000">
+<meta http-equiv="Expires" content="Sat, 14 Mar 2009 15:26:52 +0000">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="description" content="Tkabber 0.11.1">
-<meta name="generator" content="xml2rfc v1.32 (http://xml.resource.org/)">
+<meta name="generator" content="xml2rfc v1.33 (http://xml.resource.org/)">
 <style type='text/css'><!--
         body {
                 font-family: verdana, charcoal, helvetica, arial, sans-serif;
@@ -1416,7 +1416,6 @@
 
 # the chat module
 
-    set chat::options(default_message_type) chat
     set chat::options(stop_scroll)          0
     set plugins::options(timestamp_format)  {[%R]}
 
@@ -1674,14 +1673,6 @@
 <a name="rfc.section.6.2.4"></a><h3>6.2.4.&nbsp;
 The Chat Module</h3>
 
-<p>Most instant messaging users prefer to see all the back-and-forth
-communication in a single window.
-If you prefer to see each line sent back-and-forth in a separate
-window,
-here's what to put in your <tt>postload</tt>:
-</p><div style='display: table; width: 0; margin-left: 3em; margin-right: auto'><pre>
-set chat::options(default_message_type) normal
-</pre></div>
 <p>The variable named <tt>chat::options(stop_scroll)</tt> determines whether
 a chat window should automatically scroll down to the bottom whenever
 something new comes in.

Modified: trunk/tkabber/doc/tkabber.xml
===================================================================
--- trunk/tkabber/doc/tkabber.xml	2009-03-14 13:40:15 UTC (rev 1728)
+++ trunk/tkabber/doc/tkabber.xml	2009-03-14 15:30:03 UTC (rev 1729)
@@ -1016,7 +1016,6 @@
 
 # the chat module
 
-    set chat::options(default_message_type) chat
     set chat::options(stop_scroll)          0
     set plugins::options(timestamp_format)  {[%R]}
 
@@ -1256,17 +1255,6 @@
 </section>
 
 <section anchor='s.postload-chat' title='The Chat Module'>
-<figure>
-<preamble>Most instant messaging users prefer to see all the back-and-forth
-communication in a single window.
-If you prefer to see each line sent back-and-forth in a separate
-window,
-here's what to put in your <spanx style='verb'>postload</spanx>:</preamble>
-<artwork><![CDATA[
-set chat::options(default_message_type) normal
-]]></artwork>
-</figure>
-
 <t>The variable named <spanx style='verb'>chat::options(stop_scroll)</spanx> determines whether
 a chat window should automatically scroll down to the bottom whenever
 something new comes in.</t>

Modified: trunk/tkabber/examples/configs/badlop-config.tcl
===================================================================
--- trunk/tkabber/examples/configs/badlop-config.tcl	2009-03-14 13:40:15 UTC (rev 1728)
+++ trunk/tkabber/examples/configs/badlop-config.tcl	2009-03-14 15:30:03 UTC (rev 1729)
@@ -155,7 +155,6 @@
 
 # 2.2.4 The Chat Module (chat, normal)
 
-#    set chat::options(default_message_type)		chat
 #    set chat::options(stop_scroll)				0
 #    set chat::options(smart_scroll)				1
 #	set chat::options(display_status_description) 1



More information about the Tkabber-dev mailing list