adium-1.4 3289:08041129f388: Fix typos in comments.

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/08041129f388
revision:	3289:08041129f388
author:		Robert Vehse
date:		Sat Nov 27 15:09:14 2010 +0100

Fix typos in comments.
Subject: adium-1.4 3290:3122b7149fcd: Merge

details:	http://hg.adium.im/adium-1.4/rev/3122b7149fcd
revision:	3290:3122b7149fcd
author:		Robert Vehse
date:		Sat Nov 27 15:09:37 2010 +0100

Merge

diffs (63 lines):

diff -r 22fb5f71ee72 -r 3122b7149fcd Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Sun Nov 21 21:00:40 2010 -0600
+++ b/Adium.xcodeproj/project.pbxproj	Sat Nov 27 15:09:37 2010 +0100
@@ -9543,7 +9543,6 @@
 			};
 			buildConfigurationList = DADE8E3A085507450062B664 /* Build configuration list for PBXProject "Adium" */;
 			compatibilityVersion = "Xcode 3.1";
-			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				en,
diff -r 22fb5f71ee72 -r 3122b7149fcd Frameworks/Adium Framework/Source/AIXMLElement.m
--- a/Frameworks/Adium Framework/Source/AIXMLElement.m	Sun Nov 21 21:00:40 2010 -0600
+++ b/Frameworks/Adium Framework/Source/AIXMLElement.m	Sat Nov 27 15:09:37 2010 +0100
@@ -217,7 +217,11 @@
 - (void)addObject:(id)obj
 {
 	//Warn but don't assert if null is added.  Adding nothing is a no-op, but we may want to investigate where this is happening further.
-	if (!obj) NSLog(@"Warning: Attempted to add (null) to %@", obj);
+	if (!obj) {
+		AILog(@"Attempted to add null to AIXMLElement %@, backtrace available in debug mode", obj);
+		AILogBacktrace();
+		return;
+	}
 
 	BOOL isString = [obj isKindOfClass:[NSString class]];
 	NSAssert2((isString || [obj isKindOfClass:[AIXMLElement class]]), @"%@: addObject: %@ is of incorrect class",self,obj);
diff -r 22fb5f71ee72 -r 3122b7149fcd Plugins/Purple Service/CBPurpleOscarAccount.m
--- a/Plugins/Purple Service/CBPurpleOscarAccount.m	Sun Nov 21 21:00:40 2010 -0600
+++ b/Plugins/Purple Service/CBPurpleOscarAccount.m	Sat Nov 27 15:09:37 2010 +0100
@@ -750,7 +750,7 @@
 	 * Libpurple, as of 2.0.0 but not before so far as we've seen, sometimes feeds us truncated AIM away messages.
 	 * The full message will then follow... followed by the truncated one... and so on. This makes the message
 	 * change in the buddy list and in the message window repeatedly.
-	 * I'm not sure how long the truncted versions are - I've seen 40 to 70 characters.  We'll therefore ignore
+	 * I'm not sure how long the truncated versions are - I've seen 40 to 70 characters.  We'll therefore ignore
 	 * an incoming message which is the same as the first 40 characters of the existing one.  I wonder how long
 	 * before someone will notice this "odd" behavior and file a bug report... -evands
 	 */
diff -r 22fb5f71ee72 -r 3122b7149fcd Plugins/Purple Service/DCPurpleOscarJoinChatViewController.m
--- a/Plugins/Purple Service/DCPurpleOscarJoinChatViewController.m	Sun Nov 21 21:00:40 2010 -0600
+++ b/Plugins/Purple Service/DCPurpleOscarJoinChatViewController.m	Sat Nov 27 15:09:37 2010 +0100
@@ -81,7 +81,7 @@
 	room = [textField_roomName stringValue];
 
 	if (room && [room length]) {
-		//XXX we should probaly let the user pick the exchange
+		//XXX we should probably let the user pick the exchange
 		exchange = 4;
 				
 		//The chatCreationInfo has keys corresponding to the GHashTable keys and values to match them.
diff -r 22fb5f71ee72 -r 3122b7149fcd Source/AIInfoInspectorPane.m
--- a/Source/AIInfoInspectorPane.m	Sun Nov 21 21:00:40 2010 -0600
+++ b/Source/AIInfoInspectorPane.m	Sat Nov 27 15:09:37 2010 +0100
@@ -58,7 +58,7 @@
 		[userIcon setMaxSize:NSMakeSize(256,256)];
 		[userIcon setDelegate:self];
 		
-		[aliasLabel setLocalizedString:AILocalizedString(@"Alias:","Label beside the field for a contact's alias in the settings tab of the Get Infow indow")];
+		[aliasLabel setLocalizedString:AILocalizedString(@"Alias:","Label beside the field for a contact's alias in the settings tab of the Get Info window")];
 	}
 	return self;
 }