Reviewed by Darin.

        Test for 10.4 because of <rdar://problem/4243463>

        * WebView.subproj/WebHTMLView.m:
        (-[WebHTMLView conversationIdentifier]):

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index fa850952ed059caa7590ece038cd17c3f2cd296d..105ccf085103cfd98423f597da4814a320f3e0a4 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2005-10-11  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Darin.
+        
+        Test for 10.4 because of <rdar://problem/4243463>
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView conversationIdentifier]):
+
 2005-10-11  Adele Peterson  <adele@apple.com>
 
         Rolling out fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=5195

diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 8d3be0fea6016c412234cc082242f8c61c1479bd..a33a35fe470765c6703ffe5c5420ff7680f9fe97 100644 (file)
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -4940,10 +4940,18 @@ static NSArray *validAttributes = nil;
     return nil;
 }
 
+// test for 10.4 because of <rdar://problem/4243463>
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
 - (long)conversationIdentifier
 {
     return (long)self;
 }
+#else
+- (NSInt)conversationIdentifier
+{
+    return (NSInt)self;
+}
+#endif
 
 - (BOOL)hasMarkedText
 {