adium 4040:cb723a4c523e: Improve the wording of this message. Pr...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/cb723a4c523e
revision:	4040:cb723a4c523e
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Tue Jul 05 19:17:27 2011 +0200

Improve the wording of this message. Propose to delete the account for the user.
Subject: adium 4041:0c9badab1e68: This seems to be required to keep building with Xcode 3.

details:	http://hg.adium.im/adium/rev/0c9badab1e68
revision:	4041:0c9badab1e68
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Tue Jul 05 19:17:58 2011 +0200

This seems to be required to keep building with Xcode 3.

diffs (39 lines):

diff -r 75877e632dbc -r 0c9badab1e68 Frameworks/Adium Framework/Source/AIListBookmark.m
--- a/Frameworks/Adium Framework/Source/AIListBookmark.m	Tue Jul 05 17:34:21 2011 +0200
+++ b/Frameworks/Adium Framework/Source/AIListBookmark.m	Tue Jul 05 19:17:58 2011 +0200
@@ -298,9 +298,12 @@
 - (AIChat *)openChatWithoutActivating
 {
 	if (!self.chatCreationDictionary) {
-		NSRunAlertPanel(AILocalizedString(@"Joining Bookmark Failed!", nil),
-						AILocalizedString(@"There was a problem joining the bookmark %@. Please remove and add the bookmark again.", nil),
-						AILocalizedString(@"OK", nil), nil, nil, [self displayName]);
+		if (NSRunAlertPanel(AILocalizedString(@"Joining Bookmark Failed!", nil),
+									   AILocalizedString(@"There was a problem joining the bookmark %@, it needs to be recreated.\nWould you like to remove this bookmark?", nil),
+									   AILocalizedStringFromTable(@"Delete", @"Buttons", nil), AILocalizedStringFromTable(@"Cancel", @"Buttons", nil), nil, [self displayName]) == NSAlertDefaultReturn) {
+			NSLog(@"Removing %@", self);
+			[adium.contactController removeBookmark:self];
+		}
 		return nil;
 	}
 	
diff -r 75877e632dbc -r 0c9badab1e68 Frameworks/FriBidi Framework/FriBidi.xcodeproj/project.pbxproj
--- a/Frameworks/FriBidi Framework/FriBidi.xcodeproj/project.pbxproj	Tue Jul 05 17:34:21 2011 +0200
+++ b/Frameworks/FriBidi Framework/FriBidi.xcodeproj/project.pbxproj	Tue Jul 05 19:17:58 2011 +0200
@@ -323,7 +323,6 @@
 			};
 			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "FriBidi" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				en,
@@ -398,7 +397,7 @@
 				INFOPLIST_FILE = Info.plist;
 				LD_DYLIB_INSTALL_NAME = "@rpath/FriBidi.framework/Versions/A/FriBidi";
 				PRODUCT_NAME = FriBidi;
-				SDKROOT = macosx;
+				SDKROOT = macosx10.6;
 				VALID_ARCHS = "i386 x86_64";
 				WRAPPER_EXTENSION = framework;
 			};