[Tkabber-dev] r1533 - in trunk/tkabber: . doc

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Fri Oct 17 23:17:24 MSD 2008


Author: sergei
Date: 2008-10-17 23:17:23 +0400 (Fri, 17 Oct 2008)
New Revision: 1533

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/README
   trunk/tkabber/doc/tkabber.html
   trunk/tkabber/doc/tkabber.xml
   trunk/tkabber/pubsub.tcl
Log:
	* pubsub.tcl: Fixed typo.

	* doc/tkabber.html, doc/tkabber.xml, README: Changed connection ID to
	  connection token.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2008-10-17 19:09:59 UTC (rev 1532)
+++ trunk/tkabber/ChangeLog	2008-10-17 19:17:23 UTC (rev 1533)
@@ -43,6 +43,11 @@
 
 	* plugins/pep/user_location.tcl: Fixed typo.
 
+	* pubsub.tcl: Fixed typo.
+
+	* doc/tkabber.html, doc/tkabber.xml, README: Changed connection ID to
+	  connection token.
+
 2008-10-11  Sergei Golovan  <sgolovan at nes.ru>
 
 	* AUTHORS: Fixed authors list.

Modified: trunk/tkabber/README
===================================================================
--- trunk/tkabber/README	2008-10-17 19:09:59 UTC (rev 1532)
+++ trunk/tkabber/README	2008-10-17 19:17:23 UTC (rev 1533)
@@ -1041,7 +1041,7 @@
 
    # debugging output
 
-   set debug_lvls {jlib warning}
+   set debug_lvls {xmpp warning}
 
 
    # splash window
@@ -2297,8 +2297,9 @@
                              Tkabber 0.11.1                    June 2008
 
 
-   "chat::get_jid" and connection ID using "chat::get_connid" routines);
-   and, and the type of chat (either ""chat"" or ""groupchat"").
+   "chat::get_jid" and connection token using "chat::get_xlib"
+   routines); and, and the type of chat (either ""chat"" or
+   ""groupchat"").
 
    Similarly, when _Tkabber_ encounters activity on a tabbed window, a
    hook is run:
@@ -2327,12 +2328,12 @@
    Chat windows have menubuttons, and two hooks are used to add items in
    menu:
 
-   chat_create_user_menu_hook $path $connid $jid
-   chat_create_conference_menu_hook $path $connid $jid
+   chat_create_user_menu_hook $path $xlib $jid
+   chat_create_conference_menu_hook $path $xlib $jid
 
    The first is used in user chat windows, and second in groupchat ones.
    Hooks are given three parameters: the path of the _Tk_ menu widget;
-   connection ID; and, the JID of user or conference.
+   connection token; and, the JID of user or conference.
 
    In groupchat windows it is possible to complete participants' nicks
    or commands by pressing TAB key.  List of completions is generated by
@@ -2347,7 +2348,6 @@
 
 
 
-
 Shchepin, et al.                                               [Page 42]
 
                              Tkabber 0.11.1                    June 2008
@@ -2366,12 +2366,12 @@
    Two hooks are invoked whenever a session is connected or
    disconnected:
 
-   connected_hook $connid
+   connected_hook $xlib
 
-   disconnected_hook $connid
+   disconnected_hook $xlib
 
-   Both hooks are given one parameter: connection ID (_Tkabber_ allows
-   several connections at once).
+   Both hooks are given one parameter: connection token (_Tkabber_
+   allows several connections at once).
 
 7.3.  Presence Hooks
 
@@ -2411,9 +2411,9 @@
 
    And for all received presence packets, a hook is run:
 
-   client_presence_hook $connid $from $type $x $args
+   client_presence_hook $xlib $from $type $x $args
 
-   The hook is given four parameters: connection ID, who send this
+   The hook is given four parameters: connection token, who send this
    presence, type of presence (e.g., "error", "unavailable"), list of
    extended subtags and parameters of this presence (e.g., "-show xa
    -status online").
@@ -2423,34 +2423,34 @@
    When an item is added to the roster window, one of the four hooks is
    run to add stuff to the menu associated with that item:
 
-   roster_conference_popup_menu_hook $path $connid $jid
+   roster_conference_popup_menu_hook $path $xlib $jid
 
-   roster_service_popup_menu_hook $path $connid $jid
+   roster_service_popup_menu_hook $path $xlib $jid
 
-   roster_jid_popup_menu_hook $path $connid $jid
+   roster_jid_popup_menu_hook $path $xlib $jid
 
-   roster_group_popup_menu_hook $path $connid $name
+   roster_group_popup_menu_hook $path $xlib $name
 
    When run, each hook is given three parameters: the path of the _Tk_
-   menu widget; the connection ID; and, a JID of the roster item (or the
-   name of the roster group for the last one).
+   menu widget; the connection token; and, a JID of the roster item (or
+   the name of the roster group for the last one).
 
    Also the following hook is run to add stuff to the menu in
    groupchats:
 
-   roster_create_groupchat_user_menu_hook $path $connid $jid
+   roster_create_groupchat_user_menu_hook $path $xlib $jid
 
    The hook is given three parameters: the path of the _Tk_ menu widget;
-   the connection ID; and, a JID of user.
+   the connection token; and, a JID of user.
 
    The following hook is run to add stuff to the popup balloon for each
    roster item:
 
-   roster_user_popup_info_hook $varname $connid $jid
+   roster_user_popup_info_hook $varname $xlib $jid
 
    The hook is given three parameters: the variable name in which
-   current popup text is stored, the connection ID, and the JID of the
-   roster item.
+   current popup text is stored, the connection token, and the JID of
+   the roster item.
 
 
 
@@ -2483,7 +2483,7 @@
 
    You can add custom pages to userinfo window using
 
-   userinfo_hook $path $connid $jid $editable
+   userinfo_hook $path $xlib $jid $editable
 
 
 

Modified: trunk/tkabber/doc/tkabber.html
===================================================================
--- trunk/tkabber/doc/tkabber.html	2008-10-17 19:09:59 UTC (rev 1532)
+++ trunk/tkabber/doc/tkabber.html	2008-10-17 19:17:23 UTC (rev 1533)
@@ -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 0.11.1</title>
-<meta http-equiv="Expires" content="Fri, 17 Oct 2008 08:23:30 +0000">
+<meta http-equiv="Expires" content="Fri, 17 Oct 2008 19:14:53 +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.30 (http://xml.resource.org/)">
@@ -1086,7 +1086,7 @@
 
 # debugging output
 
-set debug_lvls {jlib warning}
+set debug_lvls {xmpp warning}
 
 
 # splash window
@@ -2398,8 +2398,8 @@
 </pre>
 <p>Both hooks are given two parameters:
 the chatid (ID of the chat or conference room window, you always can obtain JID using
-<span class="verb">chat::get_jid</span> and connection ID using
-<span class="verb">chat::get_connid</span> routines);
+<span class="verb">chat::get_jid</span> and connection token using
+<span class="verb">chat::get_xlib</span> routines);
 and,
 and the type of chat
 (either <span class="verb">"chat"</span> or <span class="verb">"groupchat"</span>).
@@ -2443,13 +2443,13 @@
             in menu:
           
 </p><pre>
-chat_create_user_menu_hook $path $connid $jid
-chat_create_conference_menu_hook $path $connid $jid
+chat_create_user_menu_hook $path $xlib $jid
+chat_create_conference_menu_hook $path $xlib $jid
 </pre>
 <p>
             The first is used in user chat windows, and second in groupchat
             ones.  Hooks are given three parameters: the path of the <span class="emph">Tk</span> menu
-            widget; connection ID; and, the JID of user or conference.
+            widget; connection token; and, the JID of user or conference.
           
 </p>
 <p>
@@ -2486,11 +2486,11 @@
 <p>Two hooks are invoked whenever a session is connected or
 disconnected:
 </p><pre>
-connected_hook $connid
+connected_hook $xlib
 
-disconnected_hook $connid
+disconnected_hook $xlib
 </pre>
-<p>Both hooks are given one parameter: connection ID (<span class="emph">Tkabber</span>
+<p>Both hooks are given one parameter: connection token (<span class="emph">Tkabber</span>
 allows several connections at once).
 </p>
 <a name="anchor3"></a><br /><hr />
@@ -2538,10 +2538,10 @@
             And for all received presence packets, a hook is run:
           
 </p><pre>
-client_presence_hook $connid $from $type $x $args
+client_presence_hook $xlib $from $type $x $args
 </pre>
 <p>
-            The hook is given four parameters: connection ID, who send this presence, type of
+            The hook is given four parameters: connection token, who send this presence, type of
             presence (e.g., "error", "unavailable"), list of extended subtags
             and parameters of this presence (e.g., "-show xa -status online").
           
@@ -2555,17 +2555,17 @@
             stuff to the menu associated with that item:
           
 </p><pre>
-roster_conference_popup_menu_hook $path $connid $jid
+roster_conference_popup_menu_hook $path $xlib $jid
 
-roster_service_popup_menu_hook $path $connid $jid
+roster_service_popup_menu_hook $path $xlib $jid
 
-roster_jid_popup_menu_hook $path $connid $jid
+roster_jid_popup_menu_hook $path $xlib $jid
 
-roster_group_popup_menu_hook $path $connid $name
+roster_group_popup_menu_hook $path $xlib $name
 </pre>
 <p>
             When run, each hook is given three parameters: the path of the <span class="emph">Tk</span> menu
-            widget; the connection ID; and, a JID of the roster item (or the name
+            widget; the connection token; and, a JID of the roster item (or the name
                 of the roster group for the last one).
           
 </p>
@@ -2573,11 +2573,11 @@
             Also the following hook is run to add stuff to the menu in groupchats:
           
 </p><pre>
-roster_create_groupchat_user_menu_hook $path $connid $jid
+roster_create_groupchat_user_menu_hook $path $xlib $jid
 </pre>
 <p>
             The hook is given three parameters: the path of the <span class="emph">Tk</span> menu
-            widget; the connection ID; and, a JID of user.
+            widget; the connection token; and, a JID of user.
           
 </p>
 <p>
@@ -2585,11 +2585,11 @@
             item:
           
 </p><pre>
-roster_user_popup_info_hook $varname $connid $jid
+roster_user_popup_info_hook $varname $xlib $jid
 </pre>
 <p>
             The hook is given three parameters: the variable name in which
-            current popup text is stored, the connection ID, and the JID of the roster item.
+            current popup text is stored, the connection token, and the JID of the roster item.
           
 </p>
 <a name="anchor5"></a><br /><hr />
@@ -2614,7 +2614,7 @@
 </p>
 <p>You can add custom pages to userinfo window using
 </p><pre>
-userinfo_hook $path $connid $jid $editable
+userinfo_hook $path $xlib $jid $editable
 </pre>
 <a name="s.user-interface"></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>

Modified: trunk/tkabber/doc/tkabber.xml
===================================================================
--- trunk/tkabber/doc/tkabber.xml	2008-10-17 19:09:59 UTC (rev 1532)
+++ trunk/tkabber/doc/tkabber.xml	2008-10-17 19:17:23 UTC (rev 1533)
@@ -2025,8 +2025,8 @@
 ]]></artwork>
 <postamble>Both hooks are given two parameters:
 the chatid (ID of the chat or conference room window, you always can obtain JID using
-<spanx style='verb'>chat::get_jid</spanx> and connection ID using
-<spanx style='verb'>chat::get_connid</spanx> routines);
+<spanx style='verb'>chat::get_jid</spanx> and connection token using
+<spanx style='verb'>chat::get_xlib</spanx> routines);
 and,
 and the type of chat
 (either <spanx style='verb'>"chat"</spanx> or <spanx style='verb'>"groupchat"</spanx>).</postamble>
@@ -2079,13 +2079,13 @@
             in menu:
           </preamble>
 <artwork><![CDATA[
-chat_create_user_menu_hook $path $connid $jid
-chat_create_conference_menu_hook $path $connid $jid
+chat_create_user_menu_hook $path $xlib $jid
+chat_create_conference_menu_hook $path $xlib $jid
 ]]></artwork>
           <postamble>
             The first is used in user chat windows, and second in groupchat
             ones.  Hooks are given three parameters: the path of the <spanx>Tk</spanx> menu
-            widget; connection ID; and, the JID of user or conference.
+            widget; connection token; and, the JID of user or conference.
           </postamble>
         </figure>
 
@@ -2125,11 +2125,11 @@
 <preamble>Two hooks are invoked whenever a session is connected or
 disconnected:</preamble>
 <artwork><![CDATA[
-connected_hook $connid
+connected_hook $xlib
 
-disconnected_hook $connid
+disconnected_hook $xlib
 ]]></artwork>
-<postamble>Both hooks are given one parameter: connection ID (<spanx>Tkabber</spanx>
+<postamble>Both hooks are given one parameter: connection token (<spanx>Tkabber</spanx>
 allows several connections at once).</postamble>
 </figure>
 </section>
@@ -2175,10 +2175,10 @@
             And for all received presence packets, a hook is run:
           </preamble>
 <artwork><![CDATA[
-client_presence_hook $connid $from $type $x $args
+client_presence_hook $xlib $from $type $x $args
 ]]></artwork>
           <postamble>
-            The hook is given four parameters: connection ID, who send this presence, type of
+            The hook is given four parameters: connection token, who send this presence, type of
             presence (e.g., "error", "unavailable"), list of extended subtags
             and parameters of this presence (e.g., "-show xa -status online").
           </postamble>
@@ -2192,17 +2192,17 @@
             stuff to the menu associated with that item:
           </preamble>
 <artwork><![CDATA[
-roster_conference_popup_menu_hook $path $connid $jid
+roster_conference_popup_menu_hook $path $xlib $jid
 
-roster_service_popup_menu_hook $path $connid $jid
+roster_service_popup_menu_hook $path $xlib $jid
 
-roster_jid_popup_menu_hook $path $connid $jid
+roster_jid_popup_menu_hook $path $xlib $jid
 
-roster_group_popup_menu_hook $path $connid $name
+roster_group_popup_menu_hook $path $xlib $name
 ]]></artwork>
           <postamble>
             When run, each hook is given three parameters: the path of the <spanx>Tk</spanx> menu
-            widget; the connection ID; and, a JID of the roster item (or the name
+            widget; the connection token; and, a JID of the roster item (or the name
                 of the roster group for the last one).
           </postamble>
         </figure>
@@ -2211,11 +2211,11 @@
             Also the following hook is run to add stuff to the menu in groupchats:
           </preamble>
 <artwork><![CDATA[
-roster_create_groupchat_user_menu_hook $path $connid $jid
+roster_create_groupchat_user_menu_hook $path $xlib $jid
 ]]></artwork>
           <postamble>
             The hook is given three parameters: the path of the <spanx>Tk</spanx> menu
-            widget; the connection ID; and, a JID of user.
+            widget; the connection token; and, a JID of user.
           </postamble>
         </figure>
         <figure>
@@ -2224,11 +2224,11 @@
             item:
           </preamble>
 <artwork><![CDATA[
-roster_user_popup_info_hook $varname $connid $jid
+roster_user_popup_info_hook $varname $xlib $jid
 ]]></artwork>
           <postamble>
             The hook is given three parameters: the variable name in which
-            current popup text is stored, the connection ID, and the JID of the roster item.
+            current popup text is stored, the connection token, and the JID of the roster item.
           </postamble>
         </figure>
       </section>
@@ -2255,9 +2255,9 @@
 <figure>
 <preamble>You can add custom pages to userinfo window using</preamble>
 <artwork><![CDATA[
-userinfo_hook $path $connid $jid $editable
+userinfo_hook $path $xlib $jid $editable
 ]]></artwork>
-It is run with four arguments: the userinfo notebook widget name; the connection ID;
+It is run with four arguments: the userinfo notebook widget name; the connection token;
 the JID of the user; and a boolean
 parameter which indicates whether the form is editable.
 </figure>

Modified: trunk/tkabber/pubsub.tcl
===================================================================
--- trunk/tkabber/pubsub.tcl	2008-10-17 19:09:59 UTC (rev 1532)
+++ trunk/tkabber/pubsub.tcl	2008-10-17 19:17:23 UTC (rev 1533)
@@ -247,7 +247,7 @@
 # -subscription_depth
 #
 
-proc pubsub::subscribe {$xlib service node args} {
+proc pubsub::subscribe {xlib service node args} {
     variable ns
 
     debugmsg pubsub [info level 0]



More information about the Tkabber-dev mailing list