[Tkabber-dev] r2166 - trunk/tkabber

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Tue Dec 9 14:53:17 MSK 2014


Author: sergei
Date: 2014-12-09 14:53:17 +0300 (Tue, 09 Dec 2014)
New Revision: 2166

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/gpgme.tcl
Log:
	* gpgme.tcl: Fixed bug when unencrypted message is sent despite of
	  canceling in in the message dialog. The bug was introduced when
	  GPG support was rewritten as a plugin to be compatible with OTR.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2014-12-05 10:36:35 UTC (rev 2165)
+++ trunk/tkabber/ChangeLog	2014-12-09 11:53:17 UTC (rev 2166)
@@ -1,3 +1,9 @@
+2014-12-09  Sergei Golovan  <sgolovan at nes.ru>
+
+	* gpgme.tcl: Fixed bug when unencrypted message is sent despite of
+	  canceling in in the message dialog. The bug was introduced when
+	  GPG support was rewritten as a plugin to be compatible with OTR.
+
 2014-12-05  Sergei Golovan  <sgolovan at nes.ru>
 
 	* register.tcl: Fixed processing the result of password change form

Modified: trunk/tkabber/gpgme.tcl
===================================================================
--- trunk/tkabber/gpgme.tcl	2014-12-05 10:36:35 UTC (rev 2165)
+++ trunk/tkabber/gpgme.tcl	2014-12-09 11:53:17 UTC (rev 2166)
@@ -1289,6 +1289,10 @@
     foreach tag [list signed encrypted] {
         if {[catch { ssj::${tag}:output $xlib $body $to } cdata]} {
             debugmsg message "ssj::${tag}:output: $cdata"
+
+	    # Disable sending the message
+	    hook::unset_flag rewrite_outgoing_message_hook send
+
             return
         }
 



More information about the Tkabber-dev mailing list