[Tkabber-dev] r1087 - in trunk/tkabber: . plugins/search

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sun Apr 8 21:27:05 MSD 2007


Author: sergei
Date: 2007-04-08 21:27:04 +0400 (Sun, 08 Apr 2007)
New Revision: 1087

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/plugins/search/search.tcl
   trunk/tkabber/roster.tcl
Log:
	* plugins/search/search.tcl, roster.tcl: Fixed regexp statements
	  (added missing --).


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2007-04-08 16:00:42 UTC (rev 1086)
+++ trunk/tkabber/ChangeLog	2007-04-08 17:27:04 UTC (rev 1087)
@@ -23,6 +23,9 @@
 	* datagathering.tcl, plugins/chat/logger.tcl: Fixed switch statements
 	  (added missing --).
 
+	* plugins/search/search.tcl, roster.tcl: Fixed regexp statements
+	  (added missing --).
+
 2007-04-02  Sergei Golovan  <sgolovan at nes.ru>
 
 	* msgs/de.msg: Updated German translation (thanks to Roger

Modified: trunk/tkabber/plugins/search/search.tcl
===================================================================
--- trunk/tkabber/plugins/search/search.tcl	2007-04-08 16:00:42 UTC (rev 1086)
+++ trunk/tkabber/plugins/search/search.tcl	2007-04-08 17:27:04 UTC (rev 1087)
@@ -35,7 +35,7 @@
 proc search::validate_entry {w val} {
     variable options
 
-    if {$options(mode) == "regexp" && [catch { regexp $val {} }]} {
+    if {$options(mode) == "regexp" && [catch { regexp -- $val {} }]} {
 	$w configure -fg [option get $w errorForeground Entry]
 
     } else {
@@ -152,9 +152,9 @@
     }
 
     if {$options(case)} {
-	set args [list $what $where]
+	set args [list -- $what $where]
     } else {
-	set args [list -nocase $what $where]
+	set args [list -nocase -- $what $where]
     }
 
     switch -- $options(mode) {

Modified: trunk/tkabber/roster.tcl
===================================================================
--- trunk/tkabber/roster.tcl	2007-04-08 16:00:42 UTC (rev 1086)
+++ trunk/tkabber/roster.tcl	2007-04-08 17:27:04 UTC (rev 1087)
@@ -635,7 +635,7 @@
 	set items {}
 
 	foreach jid $roster(jids,$connid) {
-	    if {[regexp $regexp $jid]} {
+	    if {[regexp -- $regexp $jid]} {
 		set idx [lsearch -exact $roster(group,$connid,$jid) $name]
 		lappend roster(group,$connid,$jid) $name
 		set roster(group,$connid,$jid) \



More information about the Tkabber-dev mailing list