Appendix E. Copyrights

Tkabber is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.

Tkabber is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.

-Copyright © 2002-2015 Alexey Shchepin +Copyright © 2002-2018 Alexey Shchepin Tkabber is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru tkabber-1.1.2+20160818/ifacetk/iface.tcl tkabber-1.1.2+20191012/ifacetk/iface.tcl --- tkabber-1.1.2+20160818/ifacetk/iface.tcl 2016-08-18 12:35:53.000000000 +0000 +++ tkabber-1.1.2+20191012/ifacetk/iface.tcl 2018-04-13 18:41:48.000000000 +0000 @@ -526,7 +526,7 @@ set m [Message $frame.msg -text " Tkabber $tkabber_version ($toolkit_version) -Copyright \u00a9 2002-2015 [::msgcat::mc {Alexey Shchepin}] +Copyright \u00a9 2002-2018 [::msgcat::mc {Alexey Shchepin}] \n[::msgcat::mc Authors:] [::msgcat::mc {Alexey Shchepin}] [::msgcat::mc {Marshall T. Rose}] @@ -1171,6 +1171,8 @@ variable number_msg variable personal_msg + set xlib [chat::get_xlib $chatid] + if {![catch {::plugins::mucignore::is_ignored $xlib $from $type} ignore] && $ignore != ""} { return @@ -1195,7 +1197,7 @@ } elseif {$type == "groupchat"} { set jid [chat::get_jid $chatid] set myjid [chat::our_jid $chatid] - set mynick [chat::get_nick [chat::get_xlib $chatid] $myjid $type] + set mynick [chat::get_nick $xlib $myjid $type] if {![string equal $jid $from] && ![string equal $myjid $from]} { incr number_msg($chatid) } diff -Nru tkabber-1.1.2+20160818/README tkabber-1.1.2+20191012/README --- tkabber-1.1.2+20160818/README 2016-08-18 12:35:53.000000000 +0000 +++ tkabber-1.1.2+20191012/README 2018-04-13 18:41:48.000000000 +0000 @@ -3270,7 +3270,7 @@ Appendix E. Copyrights - Copyright (C) 2002-2015 Alexey Shchepin + Copyright (C) 2002-2018 Alexey Shchepin _Tkabber_ is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru tkabber-1.1.2+20160818/splash.tcl tkabber-1.1.2+20191012/splash.tcl --- tkabber-1.1.2+20160818/splash.tcl 2016-08-18 12:35:53.000000000 +0000 +++ tkabber-1.1.2+20191012/splash.tcl 2018-04-13 18:41:48.000000000 +0000 @@ -124,7 +124,7 @@ -text \ "Tkabber $tkabber_version ($toolkit_version) -Copyright \u00a9 2002-2015 [::msgcat::mc {Alexey Shchepin}] +Copyright \u00a9 2002-2018 [::msgcat::mc {Alexey Shchepin}] [::msgcat::mc Authors:] [::msgcat::mc {Alexey Shchepin}] diff -Nru tkabber-1.1.2+20160818/tclxmpp/ChangeLog tkabber-1.1.2+20191012/tclxmpp/ChangeLog --- tkabber-1.1.2+20160818/tclxmpp/ChangeLog 2016-01-11 15:18:43.000000000 +0000 +++ tkabber-1.1.2+20191012/tclxmpp/ChangeLog 2019-10-11 04:59:05.000000000 +0000 @@ -1,3 +1,7 @@ +2019-10-11 Sergei Golovan + + * examples/jsend.tcl: Add -xml option to send a prepared XML stanza. + 2016-01-11 Sergei Golovan * xmpp/xml.tcl: Replace a bunch of control characters by spaces when diff -Nru tkabber-1.1.2+20160818/tclxmpp/examples/jsend.tcl tkabber-1.1.2+20191012/tclxmpp/examples/jsend.tcl --- tkabber-1.1.2+20160818/tclxmpp/examples/jsend.tcl 2016-01-11 15:18:43.000000000 +0000 +++ tkabber-1.1.2+20191012/tclxmpp/examples/jsend.tcl 2019-10-11 04:59:05.000000000 +0000 @@ -54,6 +54,7 @@ -type chat \ -subject "" \ -body "" \ + -xml "" \ -xhtml "" \ -date "" \ -description "" \ @@ -112,8 +113,10 @@ set resource "jsend" } - if {[string equal $options(-body) ""] && $stayP < 2} { - set options(-body) [read -nonewline stdin] + if {[string equal $options(-xml) ""]} { + if {[string equal $options(-body) ""] && $stayP < 2} { + set options(-body) [read -nonewline stdin] + } } set options(-xlist) {} @@ -244,22 +247,27 @@ return 1 } - foreach to $options(-to) { - switch -- [eval [list ::xmpp::sendMessage $xlib $to] $params] { - -1 - - -2 { - if {$stayP} { - set cmd [list ::LOG] - } else { - set cmd [list error] + if {![string equal $options(-xml) ""]} { + ::xmpp::outText $xlib $options(-xml) + } else { + foreach to $options(-to) { + switch -- [eval [list ::xmpp::sendMessage $xlib $to] $params] { + -1 - + -2 { + if {$stayP} { + set cmd [list ::LOG] + } else { + set cmd [list error] + } + eval $cmd [list "error writing to socket, continuing..."] + return 0 } - eval $cmd [list "error writing to socket, continuing..."] - return 0 - } - default {} + default {} + } } } + if {!$stayP} { set jsend::stayP 0 ::xmpp::disconnect $xlib -wait 1 @@ -524,6 +532,7 @@ -subject string -body string -xhtml string + -xml string -description string -url string -bosh string (BOSH URL)