adium 3839:379c5cf7138a: Remove some 10.5-compatibility code.

commits at adium.im commits at adium.im
Sun Apr 3 11:01:43 UTC 2011


details:	http://hg.adium.im/adium/rev/379c5cf7138a
revision:	3839:379c5cf7138a
branch:		(none)
author:		Robert Vehse
date:		Sun Apr 03 12:56:17 2011 +0200

Remove some 10.5-compatibility code.

diffs (146 lines):

diff -r 3e73bc208398 -r 379c5cf7138a Frameworks/AIUtilities Framework/Source/AISegmentedControl.m
--- a/Frameworks/AIUtilities Framework/Source/AISegmentedControl.m	Sat Apr 02 23:19:57 2011 +0300
+++ b/Frameworks/AIUtilities Framework/Source/AISegmentedControl.m	Sun Apr 03 12:56:17 2011 +0200
@@ -34,18 +34,7 @@
 - (void)showMenuForSegment:(NSInteger)segment
 {
 	NSView *view = [self window].contentView;
-	if ([NSApp isOnSnowLeopardOrBetter])
-		[self.menu popUpMenuPositioningItem:nil atLocation:self.frame.origin inView:view];
-	else{
-		NSRect frame = self.frame;
-		frame.origin.x += 10.0f;
-		frame.origin.y -= 23.0f;
-		
-		NSPopUpButtonCell *popUpButtonCell = [[[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO] autorelease];
-		[popUpButtonCell setMenu:self.menu];
-		[popUpButtonCell selectItem:nil];
-		[popUpButtonCell performClickWithFrame:frame inView:view];
-	}
+	[self.menu popUpMenuPositioningItem:nil atLocation:self.frame.origin inView:view];
 }
 
 @end
diff -r 3e73bc208398 -r 379c5cf7138a Frameworks/AIUtilities Framework/Source/AISharedWriterQueue.m
--- a/Frameworks/AIUtilities Framework/Source/AISharedWriterQueue.m	Sat Apr 02 23:19:57 2011 +0300
+++ b/Frameworks/AIUtilities Framework/Source/AISharedWriterQueue.m	Sun Apr 03 12:56:17 2011 +0200
@@ -42,8 +42,7 @@
 			 [newWriterQueue release];
 			 
 		[sharedWriterQueue setMaxConcurrentOperationCount:1];
-		if ([NSApp isOnSnowLeopardOrBetter])
-			[sharedWriterQueue performSelector:@selector(setName:) withObject:@"AISharedWriterQueue"];
+		[sharedWriterQueue setName:@"AISharedWriterQueue"];
 	}
 	
 	return sharedWriterQueue;
diff -r 3e73bc208398 -r 379c5cf7138a Frameworks/Adium Framework/Source/AIMessageEntryTextView.m
--- a/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m	Sat Apr 02 23:19:57 2011 +0300
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m	Sun Apr 03 12:56:17 2011 +0200
@@ -419,22 +419,20 @@
 			[self setContinuousSpellCheckingEnabled:[[prefDict objectForKey:KEY_SPELL_CHECKING] boolValue]];
 		}
 		
-		if ([NSApp isOnSnowLeopardOrBetter]) {
-			if (!key || [key isEqualToString:KEY_SUBSTITUTION_DASH]) {
+		if (!key || [key isEqualToString:KEY_SUBSTITUTION_DASH]) {
 				[self setAutomaticDashSubstitutionEnabled:[[prefDict objectForKey:KEY_SUBSTITUTION_DASH] boolValue]];
-			}
+		}
 		
-			if (!key || [key isEqualToString:KEY_SUBSTITUTION_DATA_DETECTORS]) {
+		if (!key || [key isEqualToString:KEY_SUBSTITUTION_DATA_DETECTORS]) {
 				[self setAutomaticDataDetectionEnabled:[[prefDict objectForKey:KEY_SUBSTITUTION_DATA_DETECTORS] boolValue]];
-			}
+		}
 		
-			if (!key || [key isEqualToString:KEY_SUBSTITUTION_REPLACEMENT]) {
+		if (!key || [key isEqualToString:KEY_SUBSTITUTION_REPLACEMENT]) {
 				[self setAutomaticTextReplacementEnabled:[[prefDict objectForKey:KEY_SUBSTITUTION_REPLACEMENT] boolValue]];
-			}
+		}
 		
-			if (!key || [key isEqualToString:KEY_SUBSTITUTION_SPELLING]) {
+		if (!key || [key isEqualToString:KEY_SUBSTITUTION_SPELLING]) {
 				[self setAutomaticSpellingCorrectionEnabled:[[prefDict objectForKey:KEY_SUBSTITUTION_SPELLING] boolValue]];
-			}
 		}
 		
 		if (!key || [key isEqualToString:KEY_SUBSTITUTION_COPY_PASTE]) {
diff -r 3e73bc208398 -r 379c5cf7138a Plugins/Link Management/SHLinkManagementPlugin.m
--- a/Plugins/Link Management/SHLinkManagementPlugin.m	Sat Apr 02 23:19:57 2011 +0300
+++ b/Plugins/Link Management/SHLinkManagementPlugin.m	Sun Apr 03 12:56:17 2011 +0200
@@ -57,15 +57,6 @@
 															  keyEquivalent:@""] autorelease];
     [adium.menuController addContextualMenuItem:menuItem toLocation:Context_TextView_LinkEditing];
     [self registerToolbarItem];
-	
-    //rm link context
-	if (![NSApp isOnSnowLeopardOrBetter]) {
-		menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:RM_LINK_TITLE
-																		 target:self
-																		 action:@selector(removeFormattedLink:)
-																  keyEquivalent:@""] autorelease];
-		[adium.menuController addContextualMenuItem:menuItem toLocation:Context_TextView_LinkEditing];
-	}
 }
 
 - (void)uninstallPlugin
diff -r 3e73bc208398 -r 379c5cf7138a Plugins/WebKit Message View/AIWebkitMessageViewStyle.m
--- a/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m	Sat Apr 02 23:19:57 2011 +0300
+++ b/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m	Sun Apr 03 12:56:17 2011 +0200
@@ -685,11 +685,7 @@
 	}
 	
 	//Alphabetize the variants
-	if ([NSApp isOnSnowLeopardOrBetter]) {
-		[availableVariants sortUsingSelector:@selector(localizedStandardCompare:)];
-	} else {
-		[availableVariants sortUsingSelector:@selector(compare:)];
-	}
+	[availableVariants sortUsingSelector:@selector(localizedStandardCompare:)];
 	
 	return availableVariants;
 }
diff -r 3e73bc208398 -r 379c5cf7138a Source/AILoggerPlugin.m
--- a/Source/AILoggerPlugin.m	Sat Apr 02 23:19:57 2011 +0300
+++ b/Source/AILoggerPlugin.m	Sun Apr 03 12:56:17 2011 +0200
@@ -247,8 +247,7 @@
 			[newQueue release];
 		
 		[loggerQueue setMaxConcurrentOperationCount:1];
-		if([NSApp isOnSnowLeopardOrBetter])
-			[loggerQueue performSelector:@selector(setName:) withObject:@"AILoggerPluginOperationQueue"];
+		[loggerQueue setName:@"AILoggerPluginOperationQueue"]
 	}
 	
 	return loggerQueue;
diff -r 3e73bc208398 -r 379c5cf7138a Source/AdiumPasswords.m
--- a/Source/AdiumPasswords.m	Sat Apr 02 23:19:57 2011 +0300
+++ b/Source/AdiumPasswords.m	Sun Apr 03 12:56:17 2011 +0200
@@ -66,8 +66,7 @@
 		if(!OSAtomicCompareAndSwapPtrBarrier(nil, newQueue, (void *)&passwordQueue))
 			[newQueue release];
 		
-		if([NSApp isOnSnowLeopardOrBetter])
-			[passwordQueue performSelector:@selector(setName:) withObject:@"AdiumPasswordsOperationQueue"];
+		[passwordQueue setName:@"AdiumPasswordsOperationQueue"];
 	}
 	
 	return passwordQueue;
diff -r 3e73bc208398 -r 379c5cf7138a Source/OWSpellingPerContactPlugin.m
--- a/Source/OWSpellingPerContactPlugin.m	Sat Apr 02 23:19:57 2011 +0300
+++ b/Source/OWSpellingPerContactPlugin.m	Sun Apr 03 12:56:17 2011 +0200
@@ -58,11 +58,7 @@
 	
 	//Find the first language the user prefers which the spellchecker knows about, then keep it around for future reference
 	NSArray *preferredLanguages = nil;
-	if ([NSApp isOnSnowLeopardOrBetter]) {
-		preferredLanguages = [[NSSpellChecker sharedSpellChecker] userPreferredLanguages];
-	} else {
-		preferredLanguages = [[NSUserDefaults standardUserDefaults] objectForKey:@"AppleLanguages"];
-	}
+	preferredLanguages = [[NSSpellChecker sharedSpellChecker] userPreferredLanguages];
 	
 	for (NSString *language in preferredLanguages) {
 		if ([[NSSpellChecker sharedSpellChecker] setLanguage:language]) {




More information about the commits mailing list