adium-1.4 3269:b210771b9121: Patch from ShawnRisk to remove an e...

commits at adium.im commits at adium.im
Tue Nov 16 05:48:34 UTC 2010


details:	http://hg.adium.im/adium-1.4/rev/b210771b9121
revision:	3269:b210771b9121
author:		Frank Dowsett <wixardy at adium.im>
date:		Tue Nov 16 00:02:03 2010 -0500

Patch from ShawnRisk to remove an extra "Remove Link" on 10.6. Fixes #14454
(transplanted from 42f17d17845e595d6d048e9609bc679ce3aa9778)

diffs (30 lines):

diff -r 4bae351bc9bc -r b210771b9121 Plugins/Link Management/SHLinkManagementPlugin.m
--- a/Plugins/Link Management/SHLinkManagementPlugin.m	Mon Nov 15 20:08:46 2010 -0600
+++ b/Plugins/Link Management/SHLinkManagementPlugin.m	Tue Nov 16 00:02:03 2010 -0500
@@ -24,6 +24,7 @@
 #import <AIUtilities/AIToolbarUtilities.h>
 #import <AIUtilities/AIImageAdditions.h>
 #import <AIUtilities/AIWindowAdditions.h>
+#import <AIUtilities/AIApplicationAdditions.h>
 
 #define ADD_LINK_TITLE			[AILocalizedString(@"Add Link",nil) stringByAppendingEllipsis]
 #define EDIT_LINK_TITLE			[AILocalizedString(@"Edit Link",nil) stringByAppendingEllipsis]
@@ -56,11 +57,13 @@
     [self registerToolbarItem];
 	
     //rm link context
-    menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:RM_LINK_TITLE
-																	 target:self
-																	 action:@selector(removeFormattedLink:)
-															  keyEquivalent:@""] autorelease];
-    [adium.menuController addContextualMenuItem:menuItem toLocation:Context_TextView_LinkEditing];
+	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




More information about the commits mailing list