[Tkabber-dev] r708 - in trunk/tkabber: . ifacetk

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sat Sep 9 16:05:10 MSD 2006


Author: sergei
Date: 2006-09-09 16:05:04 +0400 (Sat, 09 Sep 2006)
New Revision: 708

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/gpgme.tcl
   trunk/tkabber/ifacetk/iroster.tcl
   trunk/tkabber/roster.tcl
Log:
	* gpgme.tcl, ifacetk/iroster.tcl, roster.tcl: Added checks for
	  a few extra service categories.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2006-09-09 10:24:10 UTC (rev 707)
+++ trunk/tkabber/ChangeLog	2006-09-09 12:05:04 UTC (rev 708)
@@ -43,6 +43,9 @@
 	  types, caches them locally and makes roster using the cached
 	  information for displaying JIDs icons, menus etc.
 
+	* gpgme.tcl, ifacetk/iroster.tcl, roster.tcl: Added checks for
+	  a few extra service categories.
+
 2006-09-05  Sergei Golovan  <sgolovan at nes.ru>
 
 	* ifacetk/iface.tcl: Added conventional quit on closing

Modified: trunk/tkabber/gpgme.tcl
===================================================================
--- trunk/tkabber/gpgme.tcl	2006-09-09 10:24:10 UTC (rev 707)
+++ trunk/tkabber/gpgme.tcl	2006-09-09 12:05:04 UTC (rev 708)
@@ -790,8 +790,9 @@
     lassign [roster::get_category_and_subtype $connid $jid] \
             category subtype
     switch -- $category {
-	conference
-	    -
+	conference -
+	server     -
+	gateway    -
 	service {
 	    set resP 0
 	}

Modified: trunk/tkabber/ifacetk/iroster.tcl
===================================================================
--- trunk/tkabber/ifacetk/iroster.tcl	2006-09-09 10:24:10 UTC (rev 707)
+++ trunk/tkabber/ifacetk/iroster.tcl	2006-09-09 12:05:04 UTC (rev 708)
@@ -613,6 +613,8 @@
 		return unavailable
 	    }
 	}
+	server  -
+	gateway -
 	service {
 	    return [get_service_foreground $connid $jid $type]
 	}
@@ -638,6 +640,8 @@
 	    }
 	    return roster/conference/unavailable
 	}
+	server  -
+	gateway -
 	service {
 		return [get_service_icon $connid $jid $type]
 	}
@@ -718,9 +722,14 @@
 	if {$show_transport_user_icons} {
 	    set service [server_from_jid $user]
 	    lassign [::roster::get_category_and_subtype $connid $service] category type
-	    switch -- $type {
-		jud {return services/jud}
-		sms {return services/sms}
+	    switch -glob -- $category/$type {
+		directory/* -
+		*/jud {
+		    return services/jud
+		}
+		*/sms {
+		    return services/sms
+		}
 	    }
 	    if {![catch { image type services/$type/$status }]} {
 		return services/$type/$status
@@ -1388,6 +1397,8 @@
     switch -- $category {
 	user       {set menu [create_user_menu $connid $jid]}
 	conference {set menu [conference_popup_menu $connid $jid]}
+	server  -
+	gateway -
 	service    {set menu [service_popup_menu $connid $jid]}
 	default    {set menu [jid_popup_menu $connid $jid]}
     }

Modified: trunk/tkabber/roster.tcl
===================================================================
--- trunk/tkabber/roster.tcl	2006-09-09 10:24:10 UTC (rev 707)
+++ trunk/tkabber/roster.tcl	2006-09-09 12:05:04 UTC (rev 708)
@@ -475,7 +475,8 @@
 
     lassign [get_category_and_subtype $connid $jid] category subtype
 
-    if {($category == "service") && ($jid != [jlib::connection_server $connid])} {
+    if {(($category == "service") || ($category == "server") || ($category == "gateway")) && \
+	    ($jid != [jlib::connection_server $connid])} {
 	jlib::send_iq set \
 	    [jlib::wrapper:createtag query \
 		-vars {xmlns jabber:iq:register} \



More information about the Tkabber-dev mailing list