adium 5345:8dd0d808e092: Backport 87047401414b for #16101. Refer...

commits at adium.im commits at adium.im
Thu Feb 21 21:34:53 UTC 2013


details:	http://hg.adium.im/adium/rev/8dd0d808e092
revision:	5345:8dd0d808e092
branch:		adium-1.5.5
author:		Robert Vehse <robertvehse at fastmail.fm>
date:		Thu Feb 21 22:34:20 2013 +0100

Backport 87047401414b for #16101. References #16101.

diffs (17 lines):

diff -r e5f5b3eeb541 -r 8dd0d808e092 Plugins/WebKit Message View/AIWebKitMessageViewController.m
--- a/Plugins/WebKit Message View/AIWebKitMessageViewController.m	Wed Feb 13 19:15:15 2013 +0100
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewController.m	Thu Feb 21 22:34:20 2013 +0100
@@ -872,9 +872,10 @@
 				(tag == WebMenuItemTagReload)) {
 				[webViewMenuItems removeObjectIdenticalTo:menuItem];
 			} else {
-				//This isn't as nice; there's no tag available. Use the localization from WebKit to look at the title.
-				if ([[menuItem title] isEqualToString:NSLocalizedStringFromTableInBundle(@"Open Link", nil, [NSBundle bundleForClass:[WebView class]], nil)])
-					[webViewMenuItems removeObjectIdenticalTo:menuItem];					
+				//This isn't as nice; there's no tag available. Use the localization from WebKit/WebCore, where it seems to be for some other people (#16101), to look at the title.
+				if ([[menuItem title] isEqualToString:NSLocalizedStringFromTableInBundle(@"Open Link", nil, [NSBundle bundleForClass:[WebView class]], nil)] ||
+					[[menuItem title] isEqualToString:NSLocalizedStringFromTableInBundle(@"Open Link", nil, [NSBundle bundleWithIdentifier:@"com.apple.WebCore"], nil)])
+					[webViewMenuItems removeObjectIdenticalTo:menuItem];
 			}
 		}
 	}




More information about the commits mailing list