[Tkabber-dev] r1215 - trunk/tkabber

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sun Sep 2 02:37:53 MSD 2007


Author: sergei
Date: 2007-09-02 02:37:53 +0400 (Sun, 02 Sep 2007)
New Revision: 1215

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/login.tcl
Log:
	* login.tcl: Added $connid suffix to authentication error dialog path
	  to avoid conflict if several connections are used simultaneously.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2007-09-01 08:58:02 UTC (rev 1214)
+++ trunk/tkabber/ChangeLog	2007-09-01 22:37:53 UTC (rev 1215)
@@ -1,4 +1,10 @@
+2007-09-02  Sergei Golovan  <sgolovan at nes.ru>
+
+	* login.tcl: Added $connid suffix to authentication error dialog path
+	  to avoid conflict if several connections are used simultaneously.
+
 2007-08-31  Sergei Golovan  <sgolovan at nes.ru>
+
 	* README, doc/tkabber.html, doc/tkabber.xml, jidlink.tcl,
 	  plugins/filetransfer/jidlink.tcl, plugins/jidlink/dtcp.tcl,
 	  plugins/jidlink/ibb.tcl, tkabber.tcl: Moved Jidlink (obsolete

Modified: trunk/tkabber/login.tcl
===================================================================
--- trunk/tkabber/login.tcl	2007-09-01 08:58:02 UTC (rev 1214)
+++ trunk/tkabber/login.tcl	2007-09-01 22:37:53 UTC (rev 1215)
@@ -515,12 +515,12 @@
     if {$res == "OK"} {
 	connected $connid $logindata
     } else {
-	if {[winfo exists .auth_err]} {
-	    destroy .auth_err
+	if {[winfo exists .auth_err$connid]} {
+	    destroy .auth_err$connid
 	}
 	lassign [error_type_condition [lindex $args 0]] type cond
 	if {($type == "sasl") || ($type == "auth" && $cond == "not-authorized")} {
-	    set res [MessageDlg .auth_err -aspect 50000 -icon error \
+	    set res [MessageDlg .auth_err$connid -aspect 50000 -icon error \
 			 -message [format \
 			     [::msgcat::mc "Authentication failed: %s\nCreate new account?"] \
 			     [error_to_string [lindex $args 0]]] \
@@ -538,7 +538,7 @@
 		return
 	    }
 	} else {
-	    MessageDlg .auth_err -aspect 50000 -icon error \
+	    MessageDlg .auth_err$connid -aspect 50000 -icon error \
 		-message [format \
 			     [::msgcat::mc "Authentication failed: %s"] \
 			     [error_to_string [lindex $args 0]]] \
@@ -553,10 +553,10 @@
 	jlib::disconnect
 	login $logindata
     } else {
-	if {[winfo exists .auth_err]} {
-	    destroy .auth_err
+	if {[winfo exists .auth_err$connid]} {
+	    destroy .auth_err$connid
 	}
-	MessageDlg .auth_err -aspect 50000 -icon error \
+	MessageDlg .auth_err$connid -aspect 50000 -icon error \
 	    -message [format [::msgcat::mc "Registration failed: %s"] \
 			  [error_to_string [lindex $args 0]]] \
 	    -type user -buttons ok -default 0 -cancel 0



More information about the Tkabber-dev mailing list