adium 5590:bcbe9530aa5c: -setInformativeText: has been public si...

commits at adium.im commits at adium.im
Tue Jun 25 19:30:05 UTC 2013


details:	http://hg.adium.im/adium/rev/bcbe9530aa5c
revision:	5590:bcbe9530aa5c
branch:		adium-1.6
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Tue Jun 25 21:29:29 2013 +0200

-setInformativeText: has been public since ancient times.

diffs (35 lines):

diff -r fcf2f55a4bb2 -r bcbe9530aa5c Plugins/Purple Service/AIPurpleCertificateTrustWarningAlert.m
--- a/Plugins/Purple Service/AIPurpleCertificateTrustWarningAlert.m	Tue Jun 25 21:11:54 2013 +0200
+++ b/Plugins/Purple Service/AIPurpleCertificateTrustWarningAlert.m	Tue Jun 25 21:29:29 2013 +0200
@@ -39,10 +39,6 @@
 - (void)certificateTrustSheetDidEnd:(SFCertificateTrustPanel *)trustpanel returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
 @end
 
- at interface SFCertificateTrustPanel (SecretsIKnow)
-- (void)setInformativeText:(NSString *)inString;
- at end
-
 @implementation AIPurpleCertificateTrustWarningAlert
 
 + (void)displayTrustWarningAlertWithAccount:(AIAccount *)account
@@ -257,17 +253,10 @@
 	//	CSSM_TP_APPLE_EVIDENCE_INFO *statusChain;
 	//	err = SecTrustGetResult(trustRef, &result, &certChain, &statusChain);
 	
-	NSString *title;
+	NSString *title = [NSString stringWithFormat:AILocalizedString(@"Adium can't verify the identity of \"%@\".", nil), hostname];
+	
 	NSString *informativeText = [NSString stringWithFormat:AILocalizedString(@"The certificate of the server %@ is not trusted, which means that the server's identity cannot be automatically verified. Do you want to continue connecting?\n\nFor more information, click \"Show Certificate\".",nil), hostname];
-	if ([trustPanel respondsToSelector:@selector(setInformativeText:)]) {
-		[trustPanel setInformativeText:informativeText];
-		title = [NSString stringWithFormat:AILocalizedString(@"Adium can't verify the identity of \"%@\".", nil), hostname];
-	} else {
-		/* We haven't seen a version of SFCertificateTrustPanel which doesn't respond to setInformativeText:, but we're using a private
-		 * call found via class-dump, so have a sane backup strategy in case it changes.
-		 */
-		title = informativeText;
-	}
+	[trustPanel setInformativeText:informativeText];
 
 	[trustPanel setAlternateButtonTitle:AILocalizedString(@"Cancel",nil)];
 	[trustPanel setShowsHelp:YES];




More information about the commits mailing list