adium 5599:b208c06fd43a: Removed now unused function.
commits at adium.im
commits at adium.im
Wed Jun 26 10:13:48 UTC 2013
details: http://hg.adium.im/adium/rev/b208c06fd43a
revision: 5599:b208c06fd43a
branch: (none)
author: Thijs Alkemade <me at thijsalkema.de>
date: Tue Jun 25 10:16:03 2013 +0200
Removed now unused function.
Subject: adium 5600:04bacccdbf87: Merged with Frank.
details: http://hg.adium.im/adium/rev/04bacccdbf87
revision: 5600:04bacccdbf87
branch: (none)
author: Thijs Alkemade <me at thijsalkema.de>
date: Wed Jun 26 12:13:40 2013 +0200
Merged with Frank.
diffs (190 lines):
diff -r 551c610ece99 -r 04bacccdbf87 Plugins/Link Management/SHAutoValidatingTextView.m
--- a/Plugins/Link Management/SHAutoValidatingTextView.m Tue Jun 25 10:04:55 2013 +0200
+++ b/Plugins/Link Management/SHAutoValidatingTextView.m Wed Jun 26 12:13:40 2013 +0200
@@ -126,7 +126,7 @@
escapedURLString = nil;
}
- return (escapedURLString ? (__bridge NSString *)escapedURLString : linkURL);
+ return (escapedURLString ? (__bridge_transfer NSString *)escapedURLString : linkURL);
}
@end
diff -r 551c610ece99 -r 04bacccdbf87 Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c
--- a/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c Tue Jun 25 10:04:55 2013 +0200
+++ b/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c Wed Jun 26 12:13:40 2013 +0200
@@ -50,8 +50,6 @@
#define PURPLE_SSL_CDSA_BUGGY_TLS_WORKAROUND "ssl_cdsa_buggy_tls_workaround"
-static OSStatus ssl_cdsa_set_enabled_ciphers(SSLContextRef ctx, const SSLCipherSuite *ciphers);
-
/*
* query_cert_chain - callback for letting the user review the certificate before accepting it
*
@@ -801,68 +799,3 @@
{
purple_debug_error("cdsa", "%s: %s\n", op, ssl_cdsa_sslGetSSLErrString(err));
}
-
-/*
- * Given an SSLContextRef and an array of SSLCipherSuites, terminated by
- * SSL_NO_SUCH_CIPHERSUITE, select those SSLCipherSuites which the library
- * supports and do a SSLSetEnabledCiphers() specifying those.
- */
-static OSStatus ssl_cdsa_set_enabled_ciphers(SSLContextRef ctx, const SSLCipherSuite *ciphers)
-{
- size_t numSupported;
- OSStatus ortn;
- SSLCipherSuite *supported = NULL;
- SSLCipherSuite *enabled = NULL;
- unsigned enabledDex = 0; // index into enabled
- unsigned supportedDex = 0; // index into supported
- unsigned inDex = 0; // index into ciphers
-
- /* first get all the supported ciphers */
- ortn = SSLGetNumberSupportedCiphers(ctx, &numSupported);
- if(ortn != noErr) {
- ssl_cdsa_printSslErrStr("SSLGetNumberSupportedCiphers", ortn);
- return ortn;
- }
- supported = (SSLCipherSuite *)malloc(numSupported * sizeof(SSLCipherSuite));
- ortn = SSLGetSupportedCiphers(ctx, supported, &numSupported);
- if(ortn != noErr) {
- ssl_cdsa_printSslErrStr("SSLGetSupportedCiphers", ortn);
- return ortn;
- }
-
- /*
- * Malloc an array we'll use for SSLGetEnabledCiphers - this will be
- * bigger than the number of suites we actually specify
- */
- enabled = (SSLCipherSuite *)malloc(numSupported * sizeof(SSLCipherSuite));
-
- /*
- * For each valid suite in ciphers, see if it's in the list of
- * supported ciphers. If it is, add it to the list of ciphers to be
- * enabled.
- */
- for(inDex=0; ciphers[inDex] != SSL_NO_SUCH_CIPHERSUITE; inDex++) {
- bool isSupported = false;
-
- for(supportedDex=0; supportedDex<numSupported; supportedDex++) {
- if(ciphers[inDex] == supported[supportedDex]) {
- enabled[enabledDex++] = ciphers[inDex];
- isSupported = true;
- break;
- }
- }
-
- if (!isSupported)
- purple_debug_info("cdsa", "cipher %i not supported; disabled.", ciphers[inDex]);
- }
-
- /* send it on down. */
- ortn = SSLSetEnabledCiphers(ctx, enabled, enabledDex);
- if(ortn != noErr) {
- ssl_cdsa_printSslErrStr("SSLSetEnabledCiphers", ortn);
- }
- free(enabled);
- free(supported);
- return ortn;
-}
-
diff -r 551c610ece99 -r 04bacccdbf87 Source/AIAppearancePreferences.m
--- a/Source/AIAppearancePreferences.m Tue Jun 25 10:04:55 2013 +0200
+++ b/Source/AIAppearancePreferences.m Wed Jun 26 12:13:40 2013 +0200
@@ -138,6 +138,9 @@
if (!type || UTTypeEqual(type, CFSTR("com.adiumx.menubaricons"))) {
[self configureMenuBarIconsMenu];
}
+
+ if (type)
+ CFRelease(type);
}
/*!
diff -r 551c610ece99 -r 04bacccdbf87 Source/AILogViewerWindowController.m
--- a/Source/AILogViewerWindowController.m Tue Jun 25 10:04:55 2013 +0200
+++ b/Source/AILogViewerWindowController.m Wed Jun 26 12:13:40 2013 +0200
@@ -2585,7 +2585,7 @@
- (void)deleteLogsAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
{
- NSArray *selectedLogs = (__bridge NSArray *)contextInfo;
+ NSArray *selectedLogs = (__bridge_transfer NSArray *)contextInfo;
if (returnCode == NSAlertFirstButtonReturn) {
[resultsLock lock];
@@ -2653,7 +2653,7 @@
} else if ([selectedLogs count] == 1) {
[self deleteLogsAlertDidEnd:nil
returnCode:NSAlertFirstButtonReturn
- contextInfo:(__bridge_retained void *)(selectedLogs)];
+ contextInfo:(__bridge void *)(selectedLogs)];
}
}
@@ -2721,7 +2721,7 @@
- (void)deleteSelectedContactsFromSourceListAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
{
- NSArray *allSelectedToGroups = (__bridge NSArray *)contextInfo;
+ NSArray *allSelectedToGroups = (__bridge_transfer NSArray *)contextInfo;
if (returnCode == NSAlertFirstButtonReturn) {
AILogToGroup *logToGroup;
NSMutableSet *logPaths = [NSMutableSet set];
@@ -2769,7 +2769,7 @@
} else {
[self deleteSelectedContactsFromSourceListAlertDidEnd:nil
returnCode:NSAlertFirstButtonReturn
- contextInfo:(__bridge_retained void *)(allSelectedToGroups)];
+ contextInfo:(__bridge void *)(allSelectedToGroups)];
}
}
diff -r 551c610ece99 -r 04bacccdbf87 Source/AIPreferenceWindowController.m
--- a/Source/AIPreferenceWindowController.m Tue Jun 25 10:04:55 2013 +0200
+++ b/Source/AIPreferenceWindowController.m Wed Jun 26 12:13:40 2013 +0200
@@ -199,6 +199,7 @@
doc,
(__bridge CFStringRef)contents,
NO);
+ CFRelease(doc);
}];
}];
}
@@ -218,6 +219,7 @@
doc,
(__bridge CFStringRef)paneName,
NO);
+ CFRelease(doc);
};
[generalPaneArray enumerateObjectsUsingBlock:_skPaneNames];
[appearancePaneArray enumerateObjectsUsingBlock:_skPaneNames];
diff -r 551c610ece99 -r 04bacccdbf87 Source/ESContactListAdvancedPreferences.m
--- a/Source/ESContactListAdvancedPreferences.m Tue Jun 25 10:04:55 2013 +0200
+++ b/Source/ESContactListAdvancedPreferences.m Wed Jun 26 12:13:40 2013 +0200
@@ -136,6 +136,9 @@
[popUp_listLayout selectItemWithRepresentedObject:[adium.preferenceController preferenceForKey:KEY_LIST_LAYOUT_NAME
group:PREF_GROUP_APPEARANCE]];
}
+
+ if (type)
+ CFRelease(type);
}
/*!
diff -r 551c610ece99 -r 04bacccdbf87 xcconfigs/Release.xcconfig
--- a/xcconfigs/Release.xcconfig Tue Jun 25 10:04:55 2013 +0200
+++ b/xcconfigs/Release.xcconfig Wed Jun 26 12:13:40 2013 +0200
@@ -3,7 +3,7 @@
DEPLOYMENT_POSTPROCESSING = YES
APPLY_RULES_IN_COPY_FILES = YES
GCC_DEBUGGING_SYMBOLS = used
-COPY_PHASE_STRIP = YES
+COPY_PHASE_STRIP = NO
INFOPLIST_OUTPUT_FORMAT = binary
PLIST_FILE_OUTPUT_FORMAT = binary
STRINGS_FILE_OUTPUT_ENCODING = binary
\ No newline at end of file
More information about the commits
mailing list