[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 bc3270a5043f8b247451c4017920f28394cb3a48
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 25 01:24:33 2003 +0000

    WebKit:
            Final API review changes.
    
            Reviewed by Chris.
    
            * BrowserWindowController.m:
            (-[BrowserWindowController updateSnapBackButtons]):
            * GlobalHistory.m:
            (-[GlobalHistory updateDisplayTitleForHistoryItem:]):
            (-[GlobalHistory _addHistoryEntry:toMenu:]):
    
    WebBrowser:
            Final API review changes.
    
            * History.subproj/WebHistoryItem.h:
            * History.subproj/WebHistoryItem.m:
            (-[WebHistoryItem setAlternateTitle:]):
            (-[WebHistoryItem initFromDictionaryRepresentation:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4181 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b02f68e..47ae997 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,6 +1,15 @@
 2003-04-24  Richard Williamson   <rjw at apple.com>
 
         Final API review changes.
+
+        * History.subproj/WebHistoryItem.h:
+        * History.subproj/WebHistoryItem.m:
+        (-[WebHistoryItem setAlternateTitle:]):
+        (-[WebHistoryItem initFromDictionaryRepresentation:]):
+
+2003-04-24  Richard Williamson   <rjw at apple.com>
+
+        Final API review changes.
         
         Reviewed by Chris.
 
diff --git a/WebKit/History.subproj/WebHistoryItem.h b/WebKit/History.subproj/WebHistoryItem.h
index 7a8b355..7a1b8e0 100644
--- a/WebKit/History.subproj/WebHistoryItem.h
+++ b/WebKit/History.subproj/WebHistoryItem.h
@@ -46,17 +46,17 @@
 - (NSString *)title;
 
 /*!
-    @method setDisplayTitle:
-    @param displayTitle The new display title for this item.
+    @method setAlternateTitle:
+    @param alternateTitle The new display title for this item.
     @abstract A title that may be used by the client to display this item.
 */
-- (void)setDisplayTitle:(NSString *)displayTitle;
+- (void)setAlternateTitle:(NSString *)alternateTitle;
 
 /*
     @method title
     @abstract A title that may be used by the client to display this item.
 */
-- (NSString *)displayTitle;
+- (NSString *)alternateTitle;
 
 /*!
     @method icon
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 9390cb1..38fbbfe 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -125,20 +125,20 @@
     return _private->title;
 }
 
-- (void)setDisplayTitle:(NSString *)displayTitle
+- (void)setAlternateTitle:(NSString *)alternateTitle
 {
     NSString *newDisplayTitle;
-    if (displayTitle && [displayTitle isEqualToString:_private->title]) {
+    if (alternateTitle && [alternateTitle isEqualToString:_private->title]) {
         newDisplayTitle = [_private->title retain];
     } else {
-        newDisplayTitle = [displayTitle copy];
+        newDisplayTitle = [alternateTitle copy];
     }
     [_private->displayTitle release];
     _private->displayTitle = newDisplayTitle;
 }
 
 
-- (NSString *)displayTitle;
+- (NSString *)alternateTitle;
 {
     return _private->displayTitle;
 }
@@ -502,7 +502,7 @@
 
     self = [self initWithURL:(URLString ? [NSURL _web_URLWithString:URLString] : nil) title:title];
 
-    [self setDisplayTitle:[dict _web_stringForKey:@"displayTitle"]];
+    [self setAlternateTitle:[dict _web_stringForKey:@"displayTitle"]];
 
     NSString *date = [dict _web_stringForKey:@"lastVisitedDate"];
     if (date) {

-- 
WebKit Debian packaging