adium-1.4 3060:ea0a1fa14eca: Remove "developmentRegion = English...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/ea0a1fa14eca
revision:	3060:ea0a1fa14eca
author:		Robert Vehse
date:		Fri Sep 24 11:16:50 2010 +0200

Remove "developmentRegion = English;", changelog #11122.
Subject: adium-1.4 3061:0822ac0f4c25: Merge. :/

details:	http://hg.adium.im/adium-1.4/rev/0822ac0f4c25
revision:	3061:0822ac0f4c25
author:		Robert Vehse
date:		Fri Sep 24 22:55:16 2010 +0200

Merge. :/

diffs (58 lines):

diff -r dc0331cdb426 -r 0822ac0f4c25 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Mon Sep 20 07:23:34 2010 -0400
+++ b/Adium.xcodeproj/project.pbxproj	Fri Sep 24 22:55:16 2010 +0200
@@ -9514,7 +9514,6 @@
 			};
 			buildConfigurationList = DADE8E3A085507450062B664 /* Build configuration list for PBXProject "Adium" */;
 			compatibilityVersion = "Xcode 3.1";
-			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				en,
diff -r dc0331cdb426 -r 0822ac0f4c25 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt	Mon Sep 20 07:23:34 2010 -0400
+++ b/ChangeLogs/Changes.txt	Fri Sep 24 22:55:16 2010 +0200
@@ -70,7 +70,7 @@
   * Added account-specific menu items (such as "Initiate Multi-User Chat" or "Initiate Direct IM") to the main menu's Contact menu.
   * Corrected a bug where a combined contact would be "always visible" and toggling the preference would not unset it.
   * Reduced complexity when determining what account is preferred for messaging a given contact. (#10547)
-  * The tune tooltip is now displayed for any contact in a meta contact which supports it.
+  * The tune tooltip is now displayed for any contact in a meta contact which supports it. (#11122)
  
  Logging
   * You can now replace Logs folder with an alias to another folder (on, say, an encrypted disk image). (#992)
diff -r dc0331cdb426 -r 0822ac0f4c25 Frameworks/Adium Framework/Source/ESDebugAILog.m
--- a/Frameworks/Adium Framework/Source/ESDebugAILog.m	Mon Sep 20 07:23:34 2010 -0400
+++ b/Frameworks/Adium Framework/Source/ESDebugAILog.m	Fri Sep 24 22:55:16 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 dc0331cdb426 -r 0822ac0f4c25 Frameworks/libpurple.framework/Versions/0/libpurple
Binary file Frameworks/libpurple.framework/Versions/0/libpurple has changed
diff -r dc0331cdb426 -r 0822ac0f4c25 Plugins/Purple Service/CBPurpleAccount.m
--- a/Plugins/Purple Service/CBPurpleAccount.m	Mon Sep 20 07:23:34 2010 -0400
+++ b/Plugins/Purple Service/CBPurpleAccount.m	Fri Sep 24 22:55:16 2010 +0200
@@ -810,6 +810,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];