adium 3333:e8433cf44951: Remove "developmentRegion = English;" f...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/e8433cf44951
revision:	3333:e8433cf44951
author:		Robert Vehse
date:		Fri Sep 24 11:15:11 2010 +0200

Remove "developmentRegion = English;" from Project file.
Subject: adium 3334:fc32ad2f6ffc: Merge. :/

details:	http://hg.adium.im/adium/rev/fc32ad2f6ffc
revision:	3334:fc32ad2f6ffc
author:		Robert Vehse
date:		Fri Sep 24 22:56:47 2010 +0200

Merge. :/

diffs (44 lines):

diff -r f8753a112961 -r fc32ad2f6ffc Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Mon Sep 20 14:21:14 2010 -0400
+++ b/Adium.xcodeproj/project.pbxproj	Fri Sep 24 22:56:47 2010 +0200
@@ -9681,7 +9681,6 @@
 			};
 			buildConfigurationList = DADE8E3A085507450062B664 /* Build configuration list for PBXProject "Adium" */;
 			compatibilityVersion = "Xcode 3.1";
-			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				en,
diff -r f8753a112961 -r fc32ad2f6ffc Frameworks/Adium Framework/Source/ESDebugAILog.m
--- a/Frameworks/Adium Framework/Source/ESDebugAILog.m	Mon Sep 20 14:21:14 2010 -0400
+++ b/Frameworks/Adium Framework/Source/ESDebugAILog.m	Fri Sep 24 22:56:47 2010 +0200
@@ -58,8 +58,6 @@
 }
 
 void AILog_impl (NSString *format, ...) {
-	if (!AIDebugLoggingEnabled) return;
-
 	va_list		ap; /* Points to each unamed argument in turn */
 	NSString	*debugMessage;
 	
@@ -74,8 +72,6 @@
 }
 
 void AILogWithPrefix_impl (const char *prefix, NSString *format, ...) {
-	if (!AIDebugLoggingEnabled) return;
-
 	va_list		ap; /* Points to each unamed argument in turn */
 	NSString	*debugMessage, *actualMessage;
 	
diff -r f8753a112961 -r fc32ad2f6ffc Plugins/Purple Service/CBPurpleAccount.m
--- a/Plugins/Purple Service/CBPurpleAccount.m	Mon Sep 20 14:21:14 2010 -0400
+++ b/Plugins/Purple Service/CBPurpleAccount.m	Fri Sep 24 22:56:47 2010 +0200
@@ -823,6 +823,8 @@
 	for (NSDictionary *user in users) {
 		AIListContact *contact = [self contactWithUID:[user objectForKey:@"UID"]];
 		
+		AILogWithSignature(@"%@ join %@", chat, contact);
+		
 		[contact setOnline:YES notify:NotifyNever silently:YES];
 		
 		[newListObjects addObject:contact];