[Amsn-commits] SF.net SVN: amsn: [8137] trunk/amsn

[<bl...@us...>]

Revision: 8137
          http://svn.sourceforge.net/amsn/?rev=8137&view=rev
Author:   bluetit
Date:     2007-02-28 14:00:45 -0800 (Wed, 28 Feb 2007)

Log Message:
-----------
fixed bug where old login window pops up when you do remember me on new
login

Modified Paths:
--------------
    trunk/amsn/config.tcl
    trunk/amsn/login_screen.tcl
    trunk/amsn/protocol.tcl

Modified: trunk/amsn/config.tcl
===================================================================
--- trunk/amsn/config.tcl	2007-02-28 21:52:43 UTC (rev 8136)
+++ trunk/amsn/config.tcl	2007-02-28 22:00:45 UTC (rev 8137)
@@ -1120,12 +1120,12 @@
 				set loginmode 0
 				# Going back to default profile
 				set loginmode 0
-				RefreshLogin .login.main 1
+				#RefreshLogin .login.main 1
 			} elseif { $idx > [LoginList size 0] } {
 				msg_box [trans allprofilesinuse]
 				# Going back to default profile
 				set loginmode 0
-				RefreshLogin .login.main 1
+				#RefreshLogin .login.main 1
 			}
 		# Else we are already in a profile, select that profile in combobox
 		} else {
@@ -1229,7 +1229,7 @@
 	# Redraw combobox with new profile
 	if { [winfo exists .login] } {
 		set loginmode 1
-		RefreshLogin .login.main 1
+		#RefreshLogin .login.main 1
 		.login.main.box list delete 0 end
 		set idx 0
 		set tmp_list ""

Modified: trunk/amsn/login_screen.tcl
===================================================================
--- trunk/amsn/login_screen.tcl	2007-02-28 21:52:43 UTC (rev 8136)
+++ trunk/amsn/login_screen.tcl	2007-02-28 22:00:45 UTC (rev 8137)
@@ -279,7 +279,7 @@
 		# Don't let us check numbers, it'll try and load that number profile (e.g. 0 would load the first profile, 1 the second etc)
 		if { [string is integer $username] } { set username "" }
 		after cancel $after_id(checkuser)
-		set after_id(checkuser) [after 100 "$self CheckUsername $username"]
+		set after_id(checkuser) [after 100 [list $self CheckUsername "$username"]]
 	}
 
 	method CheckUsername { {username ""} } {
@@ -376,7 +376,7 @@
 
 		# If remember me checkbutton is selected and a profile doesn't already exists for this user, create a profile for them.
 		if { $remember_me && ![LoginList exists 0 $user] } {
-			CreateProfile $user
+			#CreateProfile $user
 		}
 
 		# Login with them
@@ -388,12 +388,15 @@
 
 		# Set username and password key and global respectively
 		set password $pass
-		if { !$remember_me } {
+		if { !$remember_me || ![LoginList exists $user] } {
 			::config::setKey login [string tolower $user]
 		}
 
 		# Connect
-		::MSN::connect $password
+		set connect [::MSN::connect $password]
+		if { !$connect || $connect == -1 } {
+			return
+		}
 
 		# TEMPORARY CODE TO SWITCH BACK TO WIDGET WITH LOGIN PROGRESS IN
 		pack forget $self

Modified: trunk/amsn/protocol.tcl
===================================================================
--- trunk/amsn/protocol.tcl	2007-02-28 21:52:43 UTC (rev 8136)
+++ trunk/amsn/protocol.tcl	2007-02-28 22:00:45 UTC (rev 8137)
@@ -5951,7 +5951,7 @@
 #TODO: ::abook system
 proc cmsn_ns_connect { username {password ""} {nosignin ""} } {
 	if { ($username == "") || ($password == "")} {
-		cmsn_draw_login
+		#cmsn_draw_login
 		return -1
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.