[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit e75a0bbd027ef9ad7a7aa087fc02c15b226d39b4
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 31 22:36:39 2003 +0000

    WebKit:
            Reviewed by darin.
    
            * History.subproj/WebHistory.h:
            Added use of WebHistoryItemsKey instead of @"Entries".
    
            * History.subproj/WebHistory.m:(-[WebHistory _sendNotification:entries:]):
            Use WebHistoryItemsKey as key instead of @"Entries".
    
            * History.subproj/WebHistoryItem.m: (-[WebHistoryItem init]):
            Fix double allocation of WebHistoryPrivate.
    
            * WebKit/WebKit.exp
            Added export for WebHistoryItemsKey
    
            * WebKit/API-Issues.rtf
            Notes.
    
    WebBrowser:
            Use WebHistoryItemsKey as key instead of @"Entries".
    
            Reviewed by darin.
    
            * URLCompletionController.m:
            (+[URLCompletionController _historyAdded:]):
            (+[URLCompletionController _historyRemoved:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3975 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/API-Issues.rtf b/WebKit/API-Issues.rtf
index 56e34c6..a6cba24 100644
--- a/WebKit/API-Issues.rtf
+++ b/WebKit/API-Issues.rtf
@@ -189,5 +189,21 @@ See NSArray, NSMutableArray, NSBundle, and NSSet for similar method names.\
 \
 - Nancy\
 \
-P.S. The WebHistory.h file you dropped a few days ago doesn't contain the file->URL changes you mentioned. Can't write the method descriptions for this class until I get the new headers.\cf2 \
+P.S. The WebHistory.h file you dropped a few days ago doesn't contain the file->URL changes you mentioned. Can't write the method descriptions for this class until I get the new headers.\
+\
+\
+From WebHistory.h:\
+\
+// Notifications sent when history is modified.\
+// The first two come with a userInfo dictionary with a single key "Entries", which contains\
+// an array of items that were added or removed.\
+\
+The API has been updated to always call the things items instead of entries, but this key is:\
+\
+    1) still "Entries"\
+    2) still a constant in a comment, rather than an NSString constant\
+\
+I think we should fix this.\
+\
+    -- Darin\
 }
\ No newline at end of file
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4521bd9..0089991 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,22 @@
+2003-03-31  Richard Williamson  <rjw at apple.com>
+
+        Reviewed by darin.
+
+        * History.subproj/WebHistory.h:
+        Added use of WebHistoryItemsKey instead of @"Entries".
+        
+        * History.subproj/WebHistory.m:(-[WebHistory _sendNotification:entries:]):
+        Use WebHistoryItemsKey as key instead of @"Entries".
+        
+        * History.subproj/WebHistoryItem.m: (-[WebHistoryItem init]):
+        Fix double allocation of WebHistoryPrivate.
+
+        * WebKit/WebKit.exp
+        Added export for WebHistoryItemsKey
+        
+        * WebKit/API-Issues.rtf
+        Notes.
+        
 2003-03-31  Darin Adler  <darin at apple.com>
 
         Reviewed by Chris.
diff --git a/WebKit/History.subproj/WebHistory.h b/WebKit/History.subproj/WebHistory.h
index fe26e73..c0d4d46 100644
--- a/WebKit/History.subproj/WebHistory.h
+++ b/WebKit/History.subproj/WebHistory.h
@@ -9,19 +9,24 @@
 @class WebHistoryItem;
 @class WebHistoryPrivate;
 
-// Notifications sent when history is modified.
-// The first two come with a userInfo dictionary with a single key "Entries", which contains
-// an array of items that were added or removed.
-
-// posted from addItems:
+/*
+    @discussion Notifications sent when history is modified. 
+    @constant WebHistoryItemsAddedNotification Posted from addItems:.  This 
+    notification comes with a userInfo dictionary that contains the array of
+    items added.  The key for the array is WebHistoryItemsKey.
+    @constant WebHistoryItemsRemovedNotification Posted from and removeItems:.  
+    This notification comes with a userInfo dictionary that contains the array of
+    items removed.  The key for the array is WebHistoryItemsKey.
+    @constant WebHistoryAllItemsRemovedNotification Posted from removeAllItems
+    @constant WebHistoryLoadedNotification Posted from loadHistory.
+*/
 extern NSString *WebHistoryItemsAddedNotification;
-// posted from and removeItemss:
 extern NSString *WebHistoryItemsRemovedNotification;
-// posted from removeAllItems
 extern NSString *WebHistoryAllItemsRemovedNotification;
-// posted from loadHistory
 extern NSString *WebHistoryLoadedNotification;
 
+extern NSString *WebHistoryItemsKey;
+
 /*!
     @class WebHistory
     @discussion WebHistory is used to track pages that have been loaded
diff --git a/WebKit/History.subproj/WebHistory.m b/WebKit/History.subproj/WebHistory.m
index 1e1e1de..a8bf93b 100644
--- a/WebKit/History.subproj/WebHistory.m
+++ b/WebKit/History.subproj/WebHistory.m
@@ -20,6 +20,7 @@ NSString *WebHistoryItemsAddedNotification = @"WebHistoryItemsAddedNotification"
 NSString *WebHistoryItemsRemovedNotification = @"WebHistoryItemsRemovedNotification";
 NSString *WebHistoryAllItemsRemovedNotification = @"WebHistoryAllItemsRemovedNotification";
 NSString *WebHistoryLoadedNotification = @"WebHistoryLoadedNotification";
+NSString *WebHistoryItemsKey = @"WebHistoryItems";
 
 static WebHistory *_sharedHistory = nil;
 
@@ -88,7 +89,7 @@ static WebHistory *_sharedHistory = nil;
 
 - (void)_sendNotification:(NSString *)name entries:(NSArray *)entries
 {
-    NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:entries, @"Entries", nil];
+    NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:entries, WebHistoryItemsKey, nil];
     [[NSNotificationCenter defaultCenter]
         postNotificationName: name object: self userInfo: userInfo];
 }
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index ed05d9f..6ea5e93 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -66,7 +66,6 @@
 
 - (id)init
 {
-    _private = [[WebHistoryItemPrivate alloc] init];
     return [self initWithURL:nil title:nil];
 }
 
@@ -457,7 +456,6 @@
     NSString *URLString = [dict _web_stringForKey:@""];
     NSString *title = [dict _web_stringForKey:@"title"];
 
-    _private = [[WebHistoryItemPrivate alloc] init];
     [self initWithURL:(URLString ? [NSURL _web_URLWithString:URLString] : nil) title:title];
 
     [self setDisplayTitle:[dict _web_stringForKey:@"displayTitle"]];
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index 6bf2ecd..7cc5339 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -45,6 +45,7 @@ _WebElementLinkURLKey
 _WebErrorDomainWebKit
 _WebHistoryAllItemsRemovedNotification
 _WebHistoryItemsAddedNotification
+_WebHistoryItemsKey
 _WebHistoryItemsRemovedNotification
 _WebHistoryLoadedNotification
 _WebIconDatabaseDidAddIconNotification

-- 
WebKit Debian packaging