[Tkabber-dev] r1529 - in trunk/tkabber: . ifacetk plugins/chat plugins/pep

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Fri Oct 17 22:52:11 MSD 2008


Author: sergei
Date: 2008-10-17 22:52:11 +0400 (Fri, 17 Oct 2008)
New Revision: 1529

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/disco.tcl
   trunk/tkabber/ifacetk/iface.tcl
   trunk/tkabber/joingrdialog.tcl
   trunk/tkabber/muc.tcl
   trunk/tkabber/plugins/chat/disco.tcl
   trunk/tkabber/plugins/pep/user_location.tcl
   trunk/tkabber/plugins/pep/user_mood.tcl
   trunk/tkabber/plugins/pep/user_tune.tcl
   trunk/tkabber/xmppmime.tcl
Log:
	* disco.tcl, ifacetk/iface.tcl, joingrdialog.tcl, muc.tcl,
	  plugins/chat/disco.tcl, plugins/pep/user_location.tcl,
	  plugins/pep/user_mood.tcl, plugins/pep/user_tune.tcl, xmppmime.tcl:
	  Fixed connection options.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2008-10-17 18:38:30 UTC (rev 1528)
+++ trunk/tkabber/ChangeLog	2008-10-17 18:52:11 UTC (rev 1529)
@@ -36,6 +36,11 @@
 
 	* ifacetk/iface.tcl: Fixed privacy menu items.
 
+	* disco.tcl, ifacetk/iface.tcl, joingrdialog.tcl, muc.tcl,
+	  plugins/chat/disco.tcl, plugins/pep/user_location.tcl,
+	  plugins/pep/user_mood.tcl, plugins/pep/user_tune.tcl, xmppmime.tcl:
+	  Fixed connection options.
+
 2008-10-11  Sergei Golovan  <sgolovan at nes.ru>
 
 	* AUTHORS: Fixed authors list.

Modified: trunk/tkabber/disco.tcl
===================================================================
--- trunk/tkabber/disco.tcl	2008-10-17 18:38:30 UTC (rev 1528)
+++ trunk/tkabber/disco.tcl	2008-10-17 18:52:11 UTC (rev 1529)
@@ -496,7 +496,7 @@
 
 ###############################################################################
 
-proc disco::browser::open_win {jid args} {
+proc disco::browser::open_win {xlib jid args} {
     variable winid
     variable disco
     variable config
@@ -507,12 +507,7 @@
 
     if {[llength [connections]] == 0} return
 
-    foreach {opt val} $args {
-	switch -- $opt {
-	    -connection { set xlib $val }
-	}
-    }
-    if {![info exists xlib]} {
+    if {$xlib == ""} {
 	set xlib [lindex [connections] 0]
     }
 

Modified: trunk/tkabber/ifacetk/iface.tcl
===================================================================
--- trunk/tkabber/ifacetk/iface.tcl	2008-10-17 18:38:30 UTC (rev 1528)
+++ trunk/tkabber/ifacetk/iface.tcl	2008-10-17 18:52:11 UTC (rev 1529)
@@ -419,7 +419,7 @@
 		       -command {userinfo::show_info_dialog}] \
 		  {separator} \
 		  [list command [::msgcat::mc "Service Discovery"] {} {} {} \
-		       -command {disco::browser::open_win ""}] \
+		       -command {disco::browser::open_win "" ""}] \
 		  {separator} \
 		  [list command [::msgcat::mc "Message archive"] {} {} {} \
 		       -command {message_archive::show_archive}] \
@@ -795,7 +795,7 @@
 
     add_toolbar_button toolbar/add-user {message::send_subscribe_dialog ""} \
 	[::msgcat::mc "Add new user..."]
-    add_toolbar_button toolbar/disco {disco::browser::open_win ""} \
+    add_toolbar_button toolbar/disco {disco::browser::open_win "" ""} \
 	[::msgcat::mc "Service Discovery"]
     add_toolbar_button toolbar/join-conference {join_group_dialog ""} \
 	[::msgcat::mc "Join group..."]

Modified: trunk/tkabber/joingrdialog.tcl
===================================================================
--- trunk/tkabber/joingrdialog.tcl	2008-10-17 18:38:30 UTC (rev 1528)
+++ trunk/tkabber/joingrdialog.tcl	2008-10-17 18:52:11 UTC (rev 1529)
@@ -138,8 +138,7 @@
 
     join_group $xlib [::xmpp::jid::jid $gr_group $gr_server ""] \
 	       -nick $gr_nick \
-	       -password $gr_passwd \
-	       -connection $xlib
+	       -password $gr_passwd
 }
 
 proc join_group {xlib jid args} {

Modified: trunk/tkabber/muc.tcl
===================================================================
--- trunk/tkabber/muc.tcl	2008-10-17 18:38:30 UTC (rev 1528)
+++ trunk/tkabber/muc.tcl	2008-10-17 18:52:11 UTC (rev 1529)
@@ -1660,10 +1660,9 @@
 
     label $f.lgroup$row -text [::msgcat::mc "Invited to:"]
     button $f.group$row -text $group \
-	-command [list ::join_group $group \
+	-command [list ::join_group $xlib $group \
 		       -nick [get_group_nick $group $gr_nick] \
-		       -password $password \
-		       -connection $xlib]
+		       -password $password]
     
     grid $f.lgroup$row -row $row -column 0 -sticky e
     grid $f.group$row  -row $row -column 1 -sticky ew

Modified: trunk/tkabber/plugins/chat/disco.tcl
===================================================================
--- trunk/tkabber/plugins/chat/disco.tcl	2008-10-17 18:38:30 UTC (rev 1528)
+++ trunk/tkabber/plugins/chat/disco.tcl	2008-10-17 18:52:11 UTC (rev 1529)
@@ -19,7 +19,7 @@
 	return
     }
 
-    disco::browser::open_win $jid -connection $xlib
+    disco::browser::open_win $xlib $jid
     return stop
 }
 

Modified: trunk/tkabber/plugins/pep/user_location.tcl
===================================================================
--- trunk/tkabber/plugins/pep/user_location.tcl	2008-10-17 18:38:30 UTC (rev 1528)
+++ trunk/tkabber/plugins/pep/user_location.tcl	2008-10-17 18:52:11 UTC (rev 1529)
@@ -98,8 +98,7 @@
 
     set to [node_and_server_from_jid $jid]
     set cmd [linsert $args 0 [namespace current]::subscribe_result $xlib $to]
-    pep::subscribe $to $node \
-	    -connection $xlib \
+    pep::subscribe $xlib $to $node \
 	    -command $cmd
     set substatus($xlib,$to) sent-subscribe
 }
@@ -110,8 +109,7 @@
 
     set to [node_and_server_from_jid $jid]
     set cmd [linsert $args 0 [namespace current]::unsubscribe_result $xlib $to]
-    pep::unsubscribe $to $node \
-	    -connection $xlib \
+    pep::unsubscribe $xlib $to $node \
 	    -command $cmd
     set substatus($xlib,$to) sent-unsubscribe
 }
@@ -296,8 +294,7 @@
 	}
     }
 
-    set cmd [list pep::publish_item $node geoloc \
-		  -connection $xlib \
+    set cmd [list pep::publish_item $xlib $node geoloc \
 		  -payload [list [::xmpp::xml::create geoloc \
 					    -xmlns $node] \
 					    -subelements $content]]]
@@ -319,9 +316,8 @@
 	}
     }
 
-    set cmd [list pep::delete_item $node geoloc \
-		  -notify true \
-		  -connection $xlib]
+    set cmd [list pep::delete_item $xlib $node geoloc \
+		  -notify true]
 
     if {$callback != ""} {
 	lappend cmd -command $callback

Modified: trunk/tkabber/plugins/pep/user_mood.tcl
===================================================================
--- trunk/tkabber/plugins/pep/user_mood.tcl	2008-10-17 18:38:30 UTC (rev 1528)
+++ trunk/tkabber/plugins/pep/user_mood.tcl	2008-10-17 18:52:11 UTC (rev 1529)
@@ -146,8 +146,7 @@
 
     set to [node_and_server_from_jid $jid]
     set cmd [linsert $args 0 [namespace current]::subscribe_result $xlib $to]
-    pep::subscribe $to $node \
-	    -connection $xlib \
+    pep::subscribe $xlib $to $node \
 	    -command $cmd
     set substatus($xlib,$to) sent-subscribe
 }
@@ -158,8 +157,7 @@
 
     set to [node_and_server_from_jid $jid]
     set cmd [linsert $args 0 [namespace current]::unsubscribe_result $xlib $to]
-    pep::unsubscribe $to $node \
-	    -connection $xlib \
+    pep::unsubscribe $xlib $to $node \
 	    -command $cmd
     set substatus($xlib,$to) sent-unsubscribe
 }
@@ -354,8 +352,7 @@
 	lappend content [::xmpp::xml::create text -cdata $text]
     }
 
-    set cmd [list pep::publish_item $node mood \
-		  -connection $xlib \
+    set cmd [list pep::publish_item $xlib $node mood \
 		  -payload [list [::xmpp::xml::create mood \
 					    -xmlns $node \
 					    -subelements $content]]]
@@ -377,9 +374,8 @@
 	}
     }
 
-    set cmd [list pep::delete_item $node mood \
-		  -notify true \
-		  -connection $xlib]
+    set cmd [list pep::delete_item $xlib $node mood \
+		  -notify true]
 
     if {$callback != ""} {
 	lappend cmd -command $callback

Modified: trunk/tkabber/plugins/pep/user_tune.tcl
===================================================================
--- trunk/tkabber/plugins/pep/user_tune.tcl	2008-10-17 18:38:30 UTC (rev 1528)
+++ trunk/tkabber/plugins/pep/user_tune.tcl	2008-10-17 18:52:11 UTC (rev 1529)
@@ -94,8 +94,7 @@
 
     set to [node_and_server_from_jid $jid]
     set cmd [linsert $args 0 [namespace current]::subscribe_result $xlib $to]
-    pep::subscribe $to $node \
-	    -connection $xlib \
+    pep::subscribe $xlib $to $node \
 	    -command $cmd
     set substatus($xlib,$to) sent-subscribe
 }
@@ -106,8 +105,7 @@
 
     set to [node_and_server_from_jid $jid]
     set cmd [linsert $args 0 [namespace current]::unsubscribe_result $xlib $to]
-    pep::unsubscribe $to $node \
-	    -connection $xlib \
+    pep::unsubscribe $xlib $to $node \
 	    -command $cmd
     set substatus($xlib,$to) sent-unsubscribe
 }
@@ -333,8 +331,7 @@
 	}
     }
 
-    set cmd [list pep::publish_item $node tune \
-		  -connection $xlib \
+    set cmd [list pep::publish_item $xlib $node tune \
 		  -payload [list [::xmpp::xml::create tune \
 					    -xmlns $node \
 					    -subelements $content]]]
@@ -356,9 +353,8 @@
 	}
     }
 
-    set cmd [list pep::delete_item $node tune \
-		  -notify true \
-		  -connection $xlib]
+    set cmd [list pep::delete_item $xlib $node tune \
+		  -notify true]
 
     if {$callback != ""} {
 	lappend cmd -command $callback

Modified: trunk/tkabber/xmppmime.tcl
===================================================================
--- trunk/tkabber/xmppmime.tcl	2008-10-17 18:38:30 UTC (rev 1528)
+++ trunk/tkabber/xmppmime.tcl	2008-10-17 18:52:11 UTC (rev 1529)
@@ -137,7 +137,7 @@
 
 	disco {
 	    if {$connected} {
-		disco::browser::open_win $jid
+		disco::browser::open_win $xlib $jid
 	    } else {
 		lappend queue $event
 	    }



More information about the Tkabber-dev mailing list