[Tkabber-dev] r1542 - in trunk/tkabber: . plugins/chat plugins/roster

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sat Oct 18 10:08:30 MSD 2008


Author: sergei
Date: 2008-10-18 10:08:30 +0400 (Sat, 18 Oct 2008)
New Revision: 1542

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/joingrdialog.tcl
   trunk/tkabber/plugins/chat/irc_commands.tcl
   trunk/tkabber/plugins/roster/conferences.tcl
   trunk/tkabber/presence.tcl
Log:
	* presence.tcl: Fixed sending directed presence.

	* plugins/chat/irc_commands.tcl: Use JID creation command instead of
	  joining JID parts manually.

	* joingrdialog.tcl, plugins/roster/conferences.tcl: Use JID command
	  with optional resource.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2008-10-18 05:28:54 UTC (rev 1541)
+++ trunk/tkabber/ChangeLog	2008-10-18 06:08:30 UTC (rev 1542)
@@ -1,3 +1,13 @@
+2008-10-18  Sergei Golovan  <sgolovan at nes.ru>
+
+	* presence.tcl: Fixed sending directed presence.
+
+	* plugins/chat/irc_commands.tcl: Use JID creation command instead of
+	  joining JID parts manually.
+
+	* joingrdialog.tcl, plugins/roster/conferences.tcl: Use JID command
+	  with optional resource.
+
 2008-10-17  Sergei Golovan  <sgolovan at nes.ru>
 
 	* plugins/general/sound.tcl: Cleared sound external program option

Modified: trunk/tkabber/joingrdialog.tcl
===================================================================
--- trunk/tkabber/joingrdialog.tcl	2008-10-18 05:28:54 UTC (rev 1541)
+++ trunk/tkabber/joingrdialog.tcl	2008-10-18 06:08:30 UTC (rev 1542)
@@ -90,7 +90,7 @@
 	set gr_nick $nick
 #	set gr_nick_list [update_combo_list $gr_nick_list $gr_nick 10]
     } else {
-	set gr_nick [get_group_nick [::xmpp::jid::jid $gr_group $gr_server ""] $gr_nick]
+	set gr_nick [get_group_nick [::xmpp::jid::jid $gr_group $gr_server] $gr_nick]
     }
     if {$xlib == ""} {
 	set xlib [lindex [connections] 0]
@@ -136,7 +136,7 @@
 	set xlib [lindex [connections] 0]
     }
 
-    join_group $xlib [::xmpp::jid::jid $gr_group $gr_server ""] \
+    join_group $xlib [::xmpp::jid::jid $gr_group $gr_server] \
 	       -nick $gr_nick \
 	       -password $gr_passwd
 }

Modified: trunk/tkabber/plugins/chat/irc_commands.tcl
===================================================================
--- trunk/tkabber/plugins/chat/irc_commands.tcl	2008-10-18 05:28:54 UTC (rev 1541)
+++ trunk/tkabber/plugins/chat/irc_commands.tcl	2008-10-18 06:08:30 UTC (rev 1542)
@@ -91,8 +91,8 @@
 	    if {[cequal $type groupchat]} {
 		if {[cequal $room ""]} {
 		    set room $jid
-		} elseif {[string first @ $room] < 0} {
-		    set room $room@[server_from_jid $jid]
+		} elseif {[::xmpp::jid::node $room] != ""} {
+		    set room [::xmpp::jid::jid $room [server_from_jid $jid]]
 		}
 	    }
 	    if {[catch {

Modified: trunk/tkabber/plugins/roster/conferences.tcl
===================================================================
--- trunk/tkabber/plugins/roster/conferences.tcl	2008-10-18 05:28:54 UTC (rev 1541)
+++ trunk/tkabber/plugins/roster/conferences.tcl	2008-10-18 06:08:30 UTC (rev 1542)
@@ -349,7 +349,7 @@
     }
 
     if {![info exists gra_nick]} {
-	set gra_nick [get_group_nick [::xmpp::jid::jid $gra_group $gra_server ""] ""]
+	set gra_nick [get_group_nick [::xmpp::jid::jid $gra_group $gra_server] ""]
     }
     set gra_xlib [connection_jid $xlib]
 

Modified: trunk/tkabber/presence.tcl
===================================================================
--- trunk/tkabber/presence.tcl	2008-10-18 05:28:54 UTC (rev 1541)
+++ trunk/tkabber/presence.tcl	2008-10-18 06:08:30 UTC (rev 1542)
@@ -472,7 +472,7 @@
 	}
     }
 
-    eval {send_presence $status} $args \
+    eval {send_presence $xlib $status} $args \
 	 {-to $to -status $stat -priority $userpriority}
 }
 



More information about the Tkabber-dev mailing list