[Tkabber-dev] r1561 - in trunk/tkabber-plugins: . tclchat

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sun Oct 19 11:55:31 MSD 2008


Author: sergei
Date: 2008-10-19 11:55:31 +0400 (Sun, 19 Oct 2008)
New Revision: 1561

Modified:
   trunk/tkabber-plugins/ChangeLog
   trunk/tkabber-plugins/tclchat/tclchat_messages.tcl
Log:
	* tclchat/tclchat_messages.tcl: Adapted client callback invocations to
	  the changed syntax.


Modified: trunk/tkabber-plugins/ChangeLog
===================================================================
--- trunk/tkabber-plugins/ChangeLog	2008-10-19 06:23:58 UTC (rev 1560)
+++ trunk/tkabber-plugins/ChangeLog	2008-10-19 07:55:31 UTC (rev 1561)
@@ -10,6 +10,9 @@
 	  ::xmpp::jid::resource, ::xmpp::jid::stripResource,
 	  ::xmpp::jid::normalize).
 
+	* tclchat/tclchat_messages.tcl: Adapted client callback invocations to
+	  the changed syntax.
+
 2008-10-18  Sergei Golovan <sgolovan at nes.ru>
 
 	* georoster/georoster.tcl: Fixed balloon text setting.

Modified: trunk/tkabber-plugins/tclchat/tclchat_messages.tcl
===================================================================
--- trunk/tkabber-plugins/tclchat/tclchat_messages.tcl	2008-10-19 06:23:58 UTC (rev 1560)
+++ trunk/tkabber-plugins/tclchat/tclchat_messages.tcl	2008-10-19 07:55:31 UTC (rev 1561)
@@ -118,10 +118,10 @@
 		[cequal $::muc::users(role,$xlib,$nickid) ""]} {
 	    client:presence $xlib $nickid available [list $px]
 	} else {
-	    client:message $xlib $group "" groupchat 0 "" \
-			   [::msgcat::mc "%s has joined IRC channel,\
-					  but he/she is already in Jabber room" \
-					 $nick] [list "" ""] "" "" {}
+	    client:message $xlib $group groupchat {} \
+			   -body [::msgcat::mc "%s has joined IRC channel,\
+						but he/she is already in\
+						Jabber room" $nick]
 	}
     }
 }
@@ -173,11 +173,11 @@
 		if {![jid_in_chat $chatid $nickid]} {
 		    client:presence $xlib $nickid available [list $px]
 		} else {
-		    client:message $xlib $group $id $type 0 "" \
-				   [::msgcat::mc "%s has joined IRC channel,\
-						  but %s is already in Jabber room" \
-						 $nick $nick] \
-				   $err $thread $priority $x
+		    client:message $xlib $group $type {} \
+				   -body [::msgcat::mc "%s has joined IRC\
+							channel, but %s is\
+							already in Jabber room" \
+						       $nick $nick]
 		}
 	    }
 	    leaves {
@@ -186,11 +186,11 @@
 		if {![jid_in_chat $chatid $nickid]} {
 		    client:presence $xlib $nickid unavailable {}
 		} else {
-		    client:message $xlib $group $id $type 0 "" \
-				   [::msgcat::mc "%s has left IRC channel,\
-						  but %s is still in Jabber room" \
-						 $nick $nick] \
-				   $err $thread $priority $x
+		    client:message $xlib $group $type {} \
+				   -body [::msgcat::mc "%s has left IRC\
+							channel, but %s is\
+							still in Jabber room" \
+						       $nick $nick]
 		}
 	    }
 	    default {
@@ -230,27 +230,30 @@
 		    client:presence $xlib $to_nickid available [list $px]
 		} else {
 		    client:presence $xlib $from_nickid unavailable {}
-		    client:message $xlib $group $id $type 0 "" \
-				   [::msgcat::mc "%s has changed nick to %s in the IRC channel,\
-						  but %s is already in Jabber room" \
-						 $from_nick $to_nick $to_nick] \
-				   $err $thread $priority $x
+		    client:message $xlib $group $type {} \
+				   -body [::msgcat::mc "%s has changed nick\
+							to %s in the IRC channel,\
+							but %s is already in\
+							Jabber room" \
+						 $from_nick $to_nick $to_nick]
 		}
 	    } else {
 		if {![jid_in_chat $chatid $to_nickid]} {
-		    client:message $xlib $group $id $type 0 "" \
-				   [::msgcat::mc "%s has changed nick to %s in the IRC channel,\
-						  but %s is still in Jabber room" \
-						 $from_nick $to_nick $from_nick] \
-				   $err $thread $priority $x
+		    client:message $xlib $group $type {} \
+				   -body [::msgcat::mc "%s has changed nick to\
+							%s in the IRC channel,\
+							but %s is still in Jabber\
+							room" \
+						 $from_nick $to_nick $from_nick]
 		    client:presence $xlib $to_nickid available [list $px]
 		} else {
-		    client:message $xlib $group $id $type 0 "" \
-				   [::msgcat::mc "%s has changed nick to %s in the IRC channel,\
-						  but %s is still in Jabber room and\
-						  %s is already in Jabber room" \
-						 $from_nick $to_nick $from_nick $to_nick] \
-				   $err $thread $priority $x
+		    client:message $xlib $group $type {} \
+				   -body [::msgcat::mc "%s has changed nick to %s\
+							in the IRC channel,\
+							but %s is still in Jabber\
+							room and %s is already in\
+							Jabber room" \
+						 $from_nick $to_nick $from_nick $to_nick]
 		}
 	    }
 	    return stop
@@ -262,13 +265,11 @@
     # Filter out nicks
     if {[regexp {^<(\S+)>\s+(.*)} $body -> nick body]} {
 	set nickid $group/$nick
-	client:message $xlib $nickid $id $type $is_subject $subject $body \
-		       $err $thread $priority $x
+	client:message $xlib $nickid $type {} -body $body
 	return stop
     } elseif {[regexp {^\*\s+(\S+)\s+(.*)} $body -> nick body]} {
 	set nickid $group/$nick
-	client:message $xlib $nickid $id $type $is_subject $subject "/me $body" \
-		       $err $thread $priority $x
+	client:message $xlib $nickid $type {} -body "/me $body"
 	return stop
     }
 



More information about the Tkabber-dev mailing list