[Tkabber-dev] r2106 - in trunk/tkabber-plugins: . latex otr

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Mon Jan 27 10:23:02 MSK 2014


Author: sergei
Date: 2014-01-27 10:23:02 +0400 (Mon, 27 Jan 2014)
New Revision: 2106

Modified:
   trunk/tkabber-plugins/ChangeLog
   trunk/tkabber-plugins/latex/latex.tcl
   trunk/tkabber-plugins/otr/key.tcl
Log:
	* otr/key.tcl: Fixed collecting jids from current connections to show
	  in key management dialog.


Modified: trunk/tkabber-plugins/ChangeLog
===================================================================
--- trunk/tkabber-plugins/ChangeLog	2014-01-27 05:15:50 UTC (rev 2105)
+++ trunk/tkabber-plugins/ChangeLog	2014-01-27 06:23:02 UTC (rev 2106)
@@ -5,6 +5,9 @@
 
 	* otr/otr.tcl: Added heartbeat-interval option.
 
+	* otr/key.tcl: Fixed collecting jids from current connections to show
+	  in key management dialog.
+
 2014-01-26  Sergei Golovan <sgolovan at nes.ru>
 
 	* otr/tclotr/otr.tcl: Fixed refreshing private connection if the

Modified: trunk/tkabber-plugins/latex/latex.tcl
===================================================================
--- trunk/tkabber-plugins/latex/latex.tcl	2014-01-27 05:15:50 UTC (rev 2105)
+++ trunk/tkabber-plugins/latex/latex.tcl	2014-01-27 06:23:02 UTC (rev 2106)
@@ -141,22 +141,22 @@
 
     if {[catch {
 	    exec latex -output-directory $dirname \
-		       -interaction=batchmode out.tex $null
+		       -interaction=batchmode out.tex 2>@1
 	    if {[catch {
 		exec dvigif -o [file join $dirname out.gif] \
 			    -D $res \
 			    -T tight \
-			    [file join $dirname out.dvi] $null
+			    [file join $dirname out.dvi] 2>@1
 		} msg1]} {
 		debugmsg plugins "dvigif error: $msg1, trying dvips&convert"
 		exec dvips -o [file join $dirname out.eps] \
 			   -E \
-			   [file join $dirname out.dvi] $null
+			   [file join $dirname out.dvi] 2>@1
 		exec convert +adjoin \
 			     -antialias \
 			     -density ${res}x${res} \
 			     [file join $dirname out.eps] \
-			     [file join $dirname out.gif] $null
+			     [file join $dirname out.gif] 2>@1
 	    }
 	} msg]} {
 	file delete -force $dirname

Modified: trunk/tkabber-plugins/otr/key.tcl
===================================================================
--- trunk/tkabber-plugins/otr/key.tcl	2014-01-27 05:15:50 UTC (rev 2105)
+++ trunk/tkabber-plugins/otr/key.tcl	2014-01-27 06:23:02 UTC (rev 2106)
@@ -152,7 +152,7 @@
     # Next, the existing connections
     foreach xlib [connections] {
 	lappend jids \
-	       [::xmpp::jid::normalize [::xmpp::jid::removeResource $xlib]]
+	       [::xmpp::jid::normalize [::xmpp::jid::removeResource [connection_jid $xlib]]]
     }
     # Next the existing profiles
     for {set i 1} {[info exists ::loginconf$i]} {incr i} {



More information about the Tkabber-dev mailing list