[Tkabber-dev] r320 - trunk/plugins/bldjid

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Fri Mar 19 18:16:53 MSK 2010


Author: bigote
Date: 2010-03-19 18:16:53 +0300 (Fri, 19 Mar 2010)
New Revision: 320

Modified:
   trunk/plugins/bldjid/ChangeLog
   trunk/plugins/bldjid/bldjid.tcl
Log:
Fixed appearance of print-out lines if log_role_aff and log_ver_os options are disabled (removed unnecessary separators).
Fixed typo in smart_enter_exit_message procedure.


Modified: trunk/plugins/bldjid/ChangeLog
===================================================================
--- trunk/plugins/bldjid/ChangeLog	2010-03-18 23:09:59 UTC (rev 319)
+++ trunk/plugins/bldjid/ChangeLog	2010-03-19 15:16:53 UTC (rev 320)
@@ -1,3 +1,15 @@
+2010-03-19  Serge Yudin  <xmpp:bigote at jabber.ru> <mailto:bigote at gmail.com>
+
+--- Version 0.9.7.1 of the plugin.
+
+--- Files modified:
+    bldjid.tcl, ChangeLog.
+
+--- Changes:
+	Fixed appearance of print-out lines if log_role_aff and log_ver_os
+	options are disabled (removed unnecessary separators).
+	Fixed typo in smart_enter_exit_message procedure.
+
 2010-03-18  Serge Yudin  <xmpp:bigote at jabber.ru> <mailto:bigote at gmail.com>
 
 --- Version 0.9.7 of the plugin.

Modified: trunk/plugins/bldjid/bldjid.tcl
===================================================================
--- trunk/plugins/bldjid/bldjid.tcl	2010-03-18 23:09:59 UTC (rev 319)
+++ trunk/plugins/bldjid/bldjid.tcl	2010-03-19 15:16:53 UTC (rev 320)
@@ -1,4 +1,4 @@
-# "Bldjid" plugin for Tkabber. 2010-03-18 v. 0.9.7
+# "Bldjid" plugin for Tkabber. 2010-03-19 v. 0.9.7.1
 # Written by Serge Yudin xmpp:bigote at jabber.ru
 # See README or README.ru file for usage.
 
@@ -220,7 +220,7 @@
 				lappend jids_by_chats($group) \
 				[list $ts $nick $real_jid $role_aff $ver_os]
 				if {$options(log_file) != ""} {
-					set msg4log "$ent_cntr\t$ts\t$group\t$nick\t$rjid\t$role_aff\t$ver_os"
+					set msg4log "$ent_cntr\t$ts\t$group\t$nick\t$real_jid\t$role_aff\t$ver_os"
 					[namespace current]::log_msg $msg4log
 					incr ent_cntr
 				}
@@ -237,7 +237,6 @@
 				[namespace current]::process_ver [list $nick $ts $group $real_jid $role_aff]]
 				[namespace current]::request_iq \
 				$xlib $chatid $group $nick $ts $real_jid $role_aff $pid
-# You can increase this timeout if you have bad connection.
 			}
 		}
 	}
@@ -966,7 +965,17 @@
 	} else {
 		set myroom " $s [lindex $msg 5]"
 	}
-		return "\n$n:\t$timestamp $s $nick $s $jid $s $r_aff $s $v_os$myroom"
+	if {$options(log_role_aff)} {
+		set myroleaff " $s $r_aff"
+	} else {
+		set myroleaff ""
+	}
+	if {$options(log_ver_os)} {
+		set myvos " $s $v_os"
+	} else {
+		set myvos ""
+	}
+		return "\n$n:\t$timestamp $s $nick $s $jid$myroleaff$myvos$myroom"
 }
 
 proc bldjid::prepare_user_list {grpjds par} {



More information about the Tkabber-dev mailing list