Reviewed by Darin Adler.
authorthatcher <thatcher@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 19 Feb 2007 23:09:51 +0000 (23:09 +0000)
committerthatcher <thatcher@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 19 Feb 2007 23:09:51 +0000 (23:09 +0000)
        <rdar://problem/4841078> Remove the Mail.app editable link clicking behavior workaround when it is no longer needed

        * WebKit.xcodeproj/project.pbxproj:
        * WebView/WebView.mm:
        (-[WebView setPreferences:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@19711 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/ChangeLog
WebKit/WebKit.xcodeproj/project.pbxproj
WebKit/WebView/WebView.mm

index 1eadd139e7a14e2397c61bda68f2452401a5104d..66ecb940e1cc1aec8c91bbcf61e1172860d89f7a 100644 (file)
@@ -1,3 +1,13 @@
+2007-02-19  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/4841078> Remove the Mail.app editable link clicking behavior workaround when it is no longer needed
+
+        * WebKit.xcodeproj/project.pbxproj:
+        * WebView/WebView.mm:
+        (-[WebView setPreferences:]):
+
 2007-02-19  Anders Carlsson  <acarlsson@apple.com>
 
         Reviewed by Adam.
index 4db7215ec02fc24d18fcfd7c900222faead64a9b..a2a05568b80129e3f9316006cefb58ccf4674b3c 100644 (file)
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */;
-                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
                        mainGroup = 0867D691FE84028FC02AAC07 /* WebKit */;
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                        projectDirPath = "";
-                       projectRoot = "";
-                       shouldCheckCompatibility = 1;
                        targets = (
                                9398100A0824BF01008DF038 /* WebKit */,
                        );
                                GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
                                GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
                                GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-                               PER_CONFIGURATION_PREPROCESSOR_DEFINES = DISABLE_EDITABLE_LINKS_IN_MAIL;
                                WARNING_CFLAGS = (
                                        "-Wall",
                                        "-W",
index a4ddf90b72fbb0ac7c962f19f11edbb5e4e34e24..b00d2a6cad38bfbb11cf22ef7e18f650f6d36601 100644 (file)
@@ -1493,18 +1493,6 @@ NSMutableDictionary *countInvocations;
 }
 #endif
 
-#ifdef DISABLE_EDITABLE_LINKS_IN_MAIL
-+(void)initialize
-{
-    static BOOL tooLate = NO;
-    if (!tooLate) {
-        if ([[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.apple.mail"] && [[WebPreferences standardPreferences] editableLinkBehavior] == WebKitEditableLinkDefaultBehavior)
-            [[WebPreferences standardPreferences] setEditableLinkBehavior:WebKitEditableLinkOnlyLiveWithShiftKey];
-        tooLate = YES;
-    }
-}
-#endif
-
 + (BOOL)canShowMIMEType:(NSString *)MIMEType
 {
     return [self _viewClass:nil andRepresentationClass:nil forMIMEType:MIMEType];
@@ -1836,10 +1824,6 @@ NS_ENDHANDLER
 - (void)setPreferences:(WebPreferences *)prefs
 {
     if (_private->preferences != prefs) {
-#ifdef DISABLE_EDITABLE_LINKS_IN_MAIL
-        if ([[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.apple.mail"] && [prefs editableLinkBehavior] == WebKitEditableLinkDefaultBehavior)
-            [prefs setEditableLinkBehavior:WebKitEditableLinkOnlyLiveWithShiftKey];
-#endif
         [[NSNotificationCenter defaultCenter] removeObserver:self name:WebPreferencesChangedNotification object:[self preferences]];
         [WebPreferences _removeReferenceForIdentifier:[_private->preferences identifier]];
         [_private->preferences release];