[Tkabber-dev] r1203 - in trunk/tkabber: . doc ifacetk plugins/general plugins/iq plugins/unix plugins/windows

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Thu Aug 30 20:56:17 MSD 2007


Author: sergei
Date: 2007-08-30 20:56:14 +0400 (Thu, 30 Aug 2007)
New Revision: 1203

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/README
   trunk/tkabber/datagathering.tcl
   trunk/tkabber/disco.tcl
   trunk/tkabber/doc/tkabber.html
   trunk/tkabber/doc/tkabber.xml
   trunk/tkabber/ifacetk/default.xrdb
   trunk/tkabber/ifacetk/iface.tcl
   trunk/tkabber/ifacetk/unix.xrdb
   trunk/tkabber/muc.tcl
   trunk/tkabber/plugins/general/headlines.tcl
   trunk/tkabber/plugins/general/offline.tcl
   trunk/tkabber/plugins/general/subscribe_gateway.tcl
   trunk/tkabber/plugins/general/xcommands.tcl
   trunk/tkabber/plugins/iq/browse.tcl
   trunk/tkabber/plugins/unix/icon.tcl
   trunk/tkabber/plugins/windows/taskbar.tcl
   trunk/tkabber/register.tcl
   trunk/tkabber/search.tcl
   trunk/tkabber/tkabber.tcl
   trunk/tkabber/userinfo.tcl
Log:
	* README, datagathering.tcl, disco.tcl, doc/tkabber.html,
	  doc/tkabber.xml, ifacetk/default.xrdb, ifacetk/iface.tcl,
	  ifacetk/unix.xrdb, muc.tcl, plugins/general/headlines.tcl,
	  plugins/general/offline.tcl, plugins/general/subscribe_gateway.tcl,
	  plugins/general/xcommands.tcl, plugins/iq/browse.tcl,
	  plugins/unix/icon.tcl, plugins/windows/taskbar.tcl, register.tcl,
	  search.tcl, tkabber.tcl, userinfo.tcl: Moved Jabber Browser (XEP-0011)
	  support to an external plugin since it is deprecated for a long time.
	  Moved registering Disco features (and Browser namespaces) to a new
	  hook. Replaced JBrowser window class by JDisco.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/ChangeLog	2007-08-30 16:56:14 UTC (rev 1203)
@@ -1,3 +1,16 @@
+2007-08-30  Sergei Golovan  <sgolovan at nes.ru>
+
+	* README, datagathering.tcl, disco.tcl, doc/tkabber.html,
+	  doc/tkabber.xml, ifacetk/default.xrdb, ifacetk/iface.tcl,
+	  ifacetk/unix.xrdb, muc.tcl, plugins/general/headlines.tcl,
+	  plugins/general/offline.tcl, plugins/general/subscribe_gateway.tcl,
+	  plugins/general/xcommands.tcl, plugins/iq/browse.tcl,
+	  plugins/unix/icon.tcl, plugins/windows/taskbar.tcl, register.tcl,
+	  search.tcl, tkabber.tcl, userinfo.tcl: Moved Jabber Browser (XEP-0011)
+	  support to an external plugin since it is deprecated for a long time.
+	  Moved registering Disco features (and Browser namespaces) to a new
+	  hook. Replaced JBrowser window class by JDisco.
+
 2007-08-18  Sergei Golovan  <sgolovan at nes.ru>
 
 	* plugins/general/xcommands.tcl: Fixed x:data cleanup on completing or

Modified: trunk/tkabber/README
===================================================================
--- trunk/tkabber/README	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/README	2007-08-30 16:56:14 UTC (rev 1203)
@@ -127,10 +127,10 @@
      A.5.  Main changes in 0.9.6beta  . . . . . . . . . . . . . . . . 46
      A.6.  Main changes in 0.9.5beta  . . . . . . . . . . . . . . . . 46
    Appendix B.  Tk option database resources  . . . . . . . . . . . . 47
-   Appendix C.  Documentation TODO  . . . . . . . . . . . . . . . . . 50
-   Appendix D.  Acknowledgements  . . . . . . . . . . . . . . . . . . 51
-   Appendix E.  Copyrights  . . . . . . . . . . . . . . . . . . . . . 52
-   Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . . 53
+   Appendix C.  Documentation TODO  . . . . . . . . . . . . . . . . . 51
+   Appendix D.  Acknowledgements  . . . . . . . . . . . . . . . . . . 52
+   Appendix E.  Copyrights  . . . . . . . . . . . . . . . . . . . . . 53
+   Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . . 54
 
 
 
@@ -2596,8 +2596,6 @@
 
    *Messages.geometry
 
-   *JBrowser.geometry
-
    *JDisco.geometry Geometry of various windows (when not using tabs).
 
    *mainRosterWidth The width of the main roster window.
@@ -2616,11 +2614,13 @@
       appeared after some time) and "follow" (balloon appeared
       immediately and follows mouse).
 
-   *JBrowser.fill Color of browser item name.
+   *JDisco.fill Color of service discovery browser item name.
 
-   *JBrowser.nscolor Color of NS browser item.
+   *JDisco.identitycolor Color of service discovery browser item
+      identity.
 
-   *JBrowser*Tree*background Background of browser.
+   *JDisco.featurecolor Color of service discovery browser entity
+      feature.
 
 
 
@@ -2633,6 +2633,8 @@
                              Tkabber v0.10.0                January 2007
 
 
+   *JDisco*Tree*background Background of service discovery browser.
+
    *Chat.meforeground Color of user's messages in chat windows.
 
    *Chat.theyforeground Color of other peoples messages in chat windows.
@@ -2676,19 +2678,19 @@
 
    *Roster.groupiconindent Indentation for group icon.
 
-   *Roster.jidindent Indentation for item name.
 
 
 
 
 
 
-
 Shchepin, et al.                                               [Page 48]
 
                              Tkabber v0.10.0                January 2007
 
 
+   *Roster.jidindent Indentation for item name.
+
    *Roster.jidmultindent Indentation for item with multiple resources.
 
    *Roster.subjidindent Indentation for item resource.
@@ -2733,6 +2735,16 @@
 
    *Roster.availableforeground
 
+
+
+
+
+
+Shchepin, et al.                                               [Page 49]
+
+                             Tkabber v0.10.0                January 2007
+
+
    *Roster.chatforeground Colors of item name for different presences.
 
 
@@ -2740,7 +2752,51 @@
 
 
 
-Shchepin, et al.                                               [Page 49]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Shchepin, et al.                                               [Page 50]
 
                              Tkabber v0.10.0                January 2007
 
@@ -2796,7 +2852,7 @@
 
 
 
-Shchepin, et al.                                               [Page 50]
+Shchepin, et al.                                               [Page 51]
 
                              Tkabber v0.10.0                January 2007
 
@@ -2852,7 +2908,7 @@
 
 
 
-Shchepin, et al.                                               [Page 51]
+Shchepin, et al.                                               [Page 52]
 
                              Tkabber v0.10.0                January 2007
 
@@ -2908,7 +2964,7 @@
 
 
 
-Shchepin, et al.                                               [Page 52]
+Shchepin, et al.                                               [Page 53]
 
                              Tkabber v0.10.0                January 2007
 
@@ -2964,5 +3020,5 @@
 
 
 
-Shchepin, et al.                                               [Page 53]
+Shchepin, et al.                                               [Page 54]
 

Modified: trunk/tkabber/datagathering.tcl
===================================================================
--- trunk/tkabber/datagathering.tcl	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/datagathering.tcl	2007-08-30 16:56:14 UTC (rev 1203)
@@ -741,13 +741,8 @@
 disco::browser::register_feature_handler jabber:iq:data \
     [list [namespace current]::data::request_data jabber:iq:data] -node 1 \
     -desc [list * [::msgcat::mc "Data form"]]
-browser::register_ns_handler jabber:iq:data \
-    [list [namespace current]::data::request_data jabber:iq:data] -node 1 \
-    -desc [list * [::msgcat::mc "Data form"]]
 
 disco::browser::register_feature_handler ejabberd:config \
     [list [namespace current]::data::request_data ejabberd:config] -node 1 \
     -desc [list * [::msgcat::mc "Configure service"]]
-browser::register_ns_handler ejabberd:config \
-    [list [namespace current]::data::request_data ejabberd:config] -node 1 \
-    -desc [list * [::msgcat::mc "Configure service"]]
+

Modified: trunk/tkabber/disco.tcl
===================================================================
--- trunk/tkabber/disco.tcl	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/disco.tcl	2007-08-30 16:56:14 UTC (rev 1203)
@@ -1145,7 +1145,7 @@
             reorder_node $tw $tnode $neworder
 
             foreach child [$tw nodes $tnode] {
-                browser::browser_action $action $bw $child
+                browser_action $action $bw $child
             }
 	}
 
@@ -1175,7 +1175,7 @@
             reorder_node $tw $tnode $neworder
 
             foreach child [$tw nodes $tnode] {
-                browser::browser_action $action $bw $child
+                browser_action $action $bw $child
             }
 	}
 
@@ -1301,6 +1301,11 @@
 #}
 
 proc disco::browser::register_feature_handler {feature handler args} {
+    eval [list hook::run browser_register_feature_handler_hook \
+	       $feature $handler] $args
+}
+
+proc disco::browser::register_feature_handler1 {feature handler args} {
     variable browser
 
     set node 0
@@ -1320,6 +1325,9 @@
     }
 }
 
+hook::add browser_register_feature_handler_hook \
+	  disco::browser::register_feature_handler1
+
 # Destroy all (global) state assotiated with the given browser window.
 # Intended to be bound to a <Destroy> event handler for browser windows.
 proc disco::browser::destroy_state {bw} {
@@ -1334,9 +1342,3 @@
     }
 }
 
-hook::add postload_hook \
-    [list browser::register_ns_handler $::NS(disco_info) disco::browser::open_win \
-	 -desc [list * [::msgcat::mc "Discover service"]]]
-hook::add postload_hook \
-    [list browser::register_ns_handler $::NS(disco_items) disco::browser::open_win \
-	 -desc [list * [::msgcat::mc "Discover service"]]]

Modified: trunk/tkabber/doc/tkabber.html
===================================================================
--- trunk/tkabber/doc/tkabber.html	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/doc/tkabber.html	2007-08-30 16:56:14 UTC (rev 1203)
@@ -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.0</title>
-<meta http-equiv="Expires" content="Sun, 15 Jul 2007 13:07:28 +0000">
+<meta http-equiv="Expires" content="Thu, 30 Aug 2007 16:42:22 +0000">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="description" content="Tkabber v0.10.0">
 <meta name="generator" content="xml2rfc v1.30 (http://xml.resource.org/)">
@@ -2684,9 +2684,6 @@
 <dt>*Messages.geometry</dt>
 <dd>
 </dd>
-<dt>*JBrowser.geometry</dt>
-<dd>
-</dd>
 <dt>*JDisco.geometry</dt>
 <dd>
 	    Geometry of various windows (when not using tabs).
@@ -2720,21 +2717,26 @@
 	    follows mouse).
 	  
 </dd>
-<dt>*JBrowser.fill</dt>
+<dt>*JDisco.fill</dt>
 <dd>
-	    Color of browser item name.
+	    Color of service discovery browser item name.
 	  
 </dd>
-<dt>*JBrowser.nscolor</dt>
+<dt>*JDisco.identitycolor</dt>
 <dd>
-	    Color of NS browser item.
+	    Color of service discovery browser item identity.
 	  
 </dd>
-<dt>*JBrowser*Tree*background</dt>
+<dt>*JDisco.featurecolor</dt>
 <dd>
-	    Background of browser.
+	    Color of service discovery browser entity feature.
 	  
 </dd>
+<dt>*JDisco*Tree*background</dt>
+<dd>
+	    Background of service discovery browser.
+	  
+</dd>
 <dt>*Chat.meforeground</dt>
 <dd>
 	    Color of user's messages in chat windows.

Modified: trunk/tkabber/doc/tkabber.xml
===================================================================
--- trunk/tkabber/doc/tkabber.xml	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/doc/tkabber.xml	2007-08-30 16:56:14 UTC (rev 1203)
@@ -2283,7 +2283,6 @@
 	  <t hangText="*RawXML.geometry"/>
 	  <t hangText="*Stats.geometry"/>
 	  <t hangText="*Messages.geometry"/>
-	  <t hangText="*JBrowser.geometry"/>
 	  <t hangText="*JDisco.geometry">
 	    Geometry of various windows (when not using tabs).
 	  </t>
@@ -2303,15 +2302,18 @@
 	    after some time) and <spanx style='verb'>follow</spanx> (balloon appeared immediately and
 	    follows mouse).
 	  </t>
-	  <t hangText="*JBrowser.fill">
-	    Color of browser item name.
+	  <t hangText="*JDisco.fill">
+	    Color of service discovery browser item name.
 	  </t>
-	  <t hangText="*JBrowser.nscolor">
-	    Color of NS browser item.
+	  <t hangText="*JDisco.identitycolor">
+	    Color of service discovery browser item identity.
 	  </t>
-	  <t hangText="*JBrowser*Tree*background">
-	    Background of browser.
+	  <t hangText="*JDisco.featurecolor">
+	    Color of service discovery browser entity feature.
 	  </t>
+	  <t hangText="*JDisco*Tree*background">
+	    Background of service discovery browser.
+	  </t>
 	  <t hangText="*Chat.meforeground">
 	    Color of user's messages in chat windows.
 	  </t>

Modified: trunk/tkabber/ifacetk/default.xrdb
===================================================================
--- trunk/tkabber/ifacetk/default.xrdb	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/ifacetk/default.xrdb	2007-08-30 16:56:14 UTC (rev 1203)
@@ -4,7 +4,6 @@
 *RawXML.geometry:		500x500
 *Stats.geometry:		500x500
 *Messages.geometry:		600x500
-*JBrowser.geometry:		500x500
 *JDisco.geometry:		500x500
 *Chat.inputheight:		3
 *RawXML.inputheight:		4

Modified: trunk/tkabber/ifacetk/iface.tcl
===================================================================
--- trunk/tkabber/ifacetk/iface.tcl	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/ifacetk/iface.tcl	2007-08-30 16:56:14 UTC (rev 1203)
@@ -392,8 +392,6 @@
 		  [list command [::msgcat::mc "Show user or service info..."] {} {} {} \
 		       -command {userinfo::show_info_dialog}] \
 		  {separator} \
-		  [list command [::msgcat::mc "Jabber Browser"] {} {} {} \
-		       -command {browser::open}] \
 		  [list command [::msgcat::mc "Service Discovery"] {} {} {} \
 		       -command {disco::browser::open_win ""}] \
 		  {separator} \

Modified: trunk/tkabber/ifacetk/unix.xrdb
===================================================================
--- trunk/tkabber/ifacetk/unix.xrdb	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/ifacetk/unix.xrdb	2007-08-30 16:56:14 UTC (rev 1203)
@@ -39,7 +39,6 @@
 *Tree*background:		#eeeeee
 *Tree*borderWidth:		1
 
-*JBrowser.fill:			#000000
 *JDisco.fill:			#000000
 
 *Balloon.background:		#ffeeaa

Modified: trunk/tkabber/muc.tcl
===================================================================
--- trunk/tkabber/muc.tcl	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/muc.tcl	2007-08-30 16:56:14 UTC (rev 1203)
@@ -1630,21 +1630,12 @@
 }
 
 hook::add postload_hook \
-    [list browser::register_ns_handler jabber:iq:conference muc::join \
-	 -desc [list conference [::msgcat::mc "Join conference"]]]
-hook::add postload_hook \
     [list disco::browser::register_feature_handler jabber:iq:conference \
 	 muc::join -desc [list conference [::msgcat::mc "Join conference"]]]
 hook::add postload_hook \
-    [list browser::register_ns_handler $::NS(muc) muc::join \
-	 -desc [list conference [::msgcat::mc "Join conference"]]]
-hook::add postload_hook \
     [list disco::browser::register_feature_handler $::NS(muc) muc::join \
 	 -desc [list conference [::msgcat::mc "Join conference"]]]
 hook::add postload_hook \
-    [list browser::register_ns_handler "gc-1.0" muc::join \
-	 -desc [list conference [::msgcat::mc "Join groupchat"]]]
-hook::add postload_hook \
     [list disco::browser::register_feature_handler "gc-1.0" muc::join \
 	 -desc [list conference [::msgcat::mc "Join groupchat"]]]
 

Modified: trunk/tkabber/plugins/general/headlines.tcl
===================================================================
--- trunk/tkabber/plugins/general/headlines.tcl	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/plugins/general/headlines.tcl	2007-08-30 16:56:14 UTC (rev 1203)
@@ -114,7 +114,7 @@
 
     add_win $hw -title $title -tabtitle $tabtitle \
 		-raisecmd [list focus $tw] \
-		-class JBrowser
+		-class JDisco
 
     PanedWin $hw.pw -side right -pad 0 -width 8
     pack $hw.pw -fill both -expand yes
@@ -163,14 +163,14 @@
 
     if {![info exists options(seencolor)]} {
 	if {[string equal $tcl_platform(platform) unix] && \
-		![string equal [option get $hw disabledForeground JBrowser] ""]} {
-	    set options(seencolor) [option get $hw disabledForeground JBrowser]
+		![string equal [option get $hw disabledForeground JDisco] ""]} {
+	    set options(seencolor) [option get $hw disabledForeground JDisco]
 	} else {
-	    set options(seencolor) [option get $hw nscolor JBrowser]
+	    set options(seencolor) [option get $hw featurecolor JDisco]
 	}
     }
     if {![info exists options(unseencolor)]} {
-	set options(unseencolor) [option get $hw fill JBrowser]
+	set options(unseencolor) [option get $hw fill JDisco]
     }
 
     set sw [ScrolledWindow $uw.sw]

Modified: trunk/tkabber/plugins/general/offline.tcl
===================================================================
--- trunk/tkabber/plugins/general/offline.tcl	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/plugins/general/offline.tcl	2007-08-30 16:56:14 UTC (rev 1203)
@@ -44,17 +44,18 @@
     add_win $w -title [::msgcat::mc "Offline Messages"] \
 	-tabtitle [::msgcat::mc "Offline Messages"] \
 	-raisecmd [list focus $w.tree] \
-	-class JBrowser
+	-class JDisco
 
     if {![info exists options(seencolor)]} {
-	if {[cequal $tcl_platform(platform) unix]} {
-	    set options(seencolor) [option get $w disabledForeground JBrowser]
+	if {[cequal $tcl_platform(platform) unix] && \
+		![string equal [option get $w disabledForeground JDisco] ""]} {
+	    set options(seencolor) [option get $w disabledForeground JDisco]
 	} else {
-	    set options(seencolor) [option get $w nscolor JBrowser]
+	    set options(seencolor) [option get $w featurecolor JDisco]
 	}
     }
     if {![info exists options(unseencolor)]} {
-	set options(unseencolor) [option get $w fill JBrowser]
+	set options(unseencolor) [option get $w fill JDisco]
     }
 
     set sw [ScrolledWindow $w.sw]

Modified: trunk/tkabber/plugins/general/subscribe_gateway.tcl
===================================================================
--- trunk/tkabber/plugins/general/subscribe_gateway.tcl	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/plugins/general/subscribe_gateway.tcl	2007-08-30 16:56:14 UTC (rev 1203)
@@ -291,10 +291,7 @@
 }
 
 hook::add postload_hook \
-    [list browser::register_ns_handler jabber:iq:gateway \
-	  [namespace current]::gateway::convert_jid \
-	  -desc [list * [::msgcat::mc "Convert screenname"]]]
-hook::add postload_hook \
     [list disco::browser::register_feature_handler jabber:iq:gateway \
 	  [namespace current]::gateway::convert_jid \
 	  -desc [list * [::msgcat::mc "Convert screenname"]]]
+

Modified: trunk/tkabber/plugins/general/xcommands.tcl
===================================================================
--- trunk/tkabber/plugins/general/xcommands.tcl	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/plugins/general/xcommands.tcl	2007-08-30 16:56:14 UTC (rev 1203)
@@ -462,9 +462,6 @@
 ##########################################################################
 
 proc xcommands::register_namespace {} {
-    browser::register_ns_handler $::NS(commands) \
-	[namespace current]::execute -node 1 \
-	-desc [list automation [::msgcat::mc "Execute command"]]
     disco::browser::register_feature_handler $::NS(commands) \
 	[namespace current]::execute -node 1 \
 	-desc [list automation [::msgcat::mc "Execute command"]]

Modified: trunk/tkabber/plugins/iq/browse.tcl
===================================================================
--- trunk/tkabber/plugins/iq/browse.tcl	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/plugins/iq/browse.tcl	2007-08-30 16:56:14 UTC (rev 1203)
@@ -1,17 +1,8 @@
 # $Id$
 
-proc iq_browse {connid from lang child} {
-    browser::parse_items $from $child
-
-    return {}
-}
-
-iq::register_handler set {} jabber:iq:browse \
-    [namespace current]::iq_browse
-
 proc iq_browse_reply {connid from lang child} {
     set restags {}
-    foreach ns $::iq::supported_ns {
+    foreach ns [lsort $::iq::supported_ns] {
 	lappend restags [jlib::wrapper:createtag ns \
 			     -chdata $ns]
     }

Modified: trunk/tkabber/plugins/unix/icon.tcl
===================================================================
--- trunk/tkabber/plugins/unix/icon.tcl	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/plugins/unix/icon.tcl	2007-08-30 16:56:14 UTC (rev 1203)
@@ -19,7 +19,7 @@
 
     trace variable ::curuserstatus w [namespace code update_icon]
 
-    foreach tag [list Toplevel Chat JBrowser JDisco] {
+    foreach tag [list Toplevel Chat JDisco] {
 	bind $tag <Map> \
 	     [list [namespace code win_icon_setup] %W]
     }
@@ -36,7 +36,6 @@
 	Chat {
 	    wm iconphoto $w roster/conference/available
 	}
-	JBrowser -
 	JDisco {
 	    wm iconphoto $w roster/user/available
 	}

Modified: trunk/tkabber/plugins/windows/taskbar.tcl
===================================================================
--- trunk/tkabber/plugins/windows/taskbar.tcl	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/plugins/windows/taskbar.tcl	2007-08-30 16:56:14 UTC (rev 1203)
@@ -139,7 +139,7 @@
 
     trace variable ::curuserstatus w [namespace code update]
 
-    foreach tag [list Toplevel Chat JBrowser JDisco] {
+    foreach tag [list Toplevel Chat JDisco] {
 	bind $tag <Map> \
 	     [list [namespace code win_icon_setup] %W $tag]
     }
@@ -161,7 +161,6 @@
 	    winico setwindow $w $icon small $s2p(group)
 	    winico setwindow $w $icon big $s2p(group32)
 	}
-	JBrowser -
 	JDisco {
 	    winico setwindow $w $icon small $s2p(browser)
 	    winico setwindow $w $icon big $s2p(browser32)

Modified: trunk/tkabber/register.tcl
===================================================================
--- trunk/tkabber/register.tcl	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/register.tcl	2007-08-30 16:56:14 UTC (rev 1203)
@@ -192,8 +192,6 @@
 
 
 hook::add postload_hook \
-    [list browser::register_ns_handler $::NS(register) register::open \
-    -desc [list * [::msgcat::mc "Register"]]]
-hook::add postload_hook \
     [list disco::browser::register_feature_handler $::NS(register) register::open \
     -desc [list * [::msgcat::mc "Register"]]]
+

Modified: trunk/tkabber/search.tcl
===================================================================
--- trunk/tkabber/search.tcl	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/search.tcl	2007-08-30 16:56:14 UTC (rev 1203)
@@ -443,10 +443,6 @@
     [namespace current]::search::add_separator 50
 
 hook::add postload_hook \
-    [list browser::register_ns_handler jabber:iq:search \
-	[namespace current]::search::open \
-	-desc [list * [::msgcat::mc "Search"]]]
-hook::add postload_hook \
     [list disco::browser::register_feature_handler jabber:iq:search \
 	[namespace current]::search::open \
 	-desc [list * [::msgcat::mc "Search"]]]

Modified: trunk/tkabber/tkabber.tcl
===================================================================
--- trunk/tkabber/tkabber.tcl	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/tkabber.tcl	2007-08-30 16:56:14 UTC (rev 1203)
@@ -229,7 +229,6 @@
 load_source balloon.tcl
 load_source presence.tcl
 load_source iq.tcl
-load_source browser.tcl
 load_source disco.tcl
 load_source roster.tcl
 load_source itemedit.tcl

Modified: trunk/tkabber/userinfo.tcl
===================================================================
--- trunk/tkabber/userinfo.tcl	2007-08-18 17:27:13 UTC (rev 1202)
+++ trunk/tkabber/userinfo.tcl	2007-08-30 16:56:14 UTC (rev 1203)
@@ -1068,18 +1068,6 @@
     
 
 hook::add postload_hook \
-    [list browser::register_ns_handler vcard-temp userinfo::open \
-	 -desc [list user [::msgcat::mc "User info"] * [::msgcat::mc "Service info"]]]
-hook::add postload_hook \
-    [list browser::register_ns_handler jabber:iq:last userinfo::open_client \
-	 -desc [list user [::msgcat::mc "Last activity"] * [::msgcat::mc "Uptime"]]]
-hook::add postload_hook \
-    [list browser::register_ns_handler jabber:iq:time userinfo::open_client \
-	 -desc [list * [::msgcat::mc "Time"]]]
-hook::add postload_hook \
-    [list browser::register_ns_handler jabber:iq:version userinfo::open_client \
-	 -desc [list * [::msgcat::mc "Version"]]]
-hook::add postload_hook \
     [list disco::browser::register_feature_handler vcard-temp userinfo::open \
 	 -desc [list user [::msgcat::mc "User info"] \
 	 client [::msgcat::mc "User info"] \



More information about the Tkabber-dev mailing list