adium-1.4 2970:fbb20179fa22: Strip whitespace from connect serve...

commits at adium.im commits at adium.im
Tue May 18 04:24:58 UTC 2010


details:	http://hg.adium.im/adium-1.4/rev/fbb20179fa22
revision:	2970:fbb20179fa22
author:		Evan Schoenberg
date:		Mon May 17 23:00:45 2010 -0500

Strip whitespace from connect servers. Patch from '''txp200''' to fix #13777.
(transplanted from e527fdf8026b05911e90a63003891221a1408934)

diffs (24 lines):

diff -r afa1254e9af4 -r fbb20179fa22 Copyright.txt
--- a/Copyright.txt	Mon May 17 22:54:53 2010 -0500
+++ b/Copyright.txt	Mon May 17 23:00:45 2010 -0500
@@ -57,6 +57,7 @@
 Yan Morissette
 Luca Motta
 Jeffrey Melloy
+Terence Muller
 David Munch
 Roeland Nas
 Laura Natcher
diff -r afa1254e9af4 -r fbb20179fa22 Frameworks/Adium Framework/Source/AIAccountViewController.m
--- a/Frameworks/Adium Framework/Source/AIAccountViewController.m	Mon May 17 22:54:53 2010 -0500
+++ b/Frameworks/Adium Framework/Source/AIAccountViewController.m	Mon May 17 23:00:45 2010 -0500
@@ -271,6 +271,9 @@
 
 	//Connect Host - save first in case the account uses the server name for password storage.
 	NSString *connectHost = [textField_connectHost stringValue];
+	//Remove trailing whitespace from the host string.  This causes connection to fail for IRC.
+	connectHost = [connectHost stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+	
 	[account setPreference:((connectHost && [connectHost length]) ? connectHost : nil)
 					forKey:KEY_CONNECT_HOST
 					 group:GROUP_ACCOUNT_STATUS];	




More information about the commits mailing list