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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 15aa01eebf53a6e1d9f6951e59339226b982aa48
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 9 07:46:49 2002 +0000

            * History.subproj/WebHistoryItem.m:
            (-[WebHistoryItem setTitle:]): Use display title if it matches, so
    	we don't end up with two identical strings, as when reading from
    	the property list.
            (-[WebHistoryItem setDisplayTitle:]): The same thing, the other way round.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2613 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4cc3602..d8b99de 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,13 @@
 2002-11-08  Darin Adler  <darin at apple.com>
 
+        * History.subproj/WebHistoryItem.m:
+        (-[WebHistoryItem setTitle:]): Use display title if it matches, so
+	we don't end up with two identical strings, as when reading from
+	the property list.
+        (-[WebHistoryItem setDisplayTitle:]): The same thing, the other way round.
+
+2002-11-08  Darin Adler  <darin at apple.com>
+
 	- fixed 3095078 -- image loop counts still not handled right
 
         * WebCoreSupport.subproj/WebImageRenderer.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4cc3602..d8b99de 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-11-08  Darin Adler  <darin at apple.com>
 
+        * History.subproj/WebHistoryItem.m:
+        (-[WebHistoryItem setTitle:]): Use display title if it matches, so
+	we don't end up with two identical strings, as when reading from
+	the property list.
+        (-[WebHistoryItem setDisplayTitle:]): The same thing, the other way round.
+
+2002-11-08  Darin Adler  <darin at apple.com>
+
 	- fixed 3095078 -- image loop counts still not handled right
 
         * WebCoreSupport.subproj/WebImageRenderer.m:
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 26a3463..b029919 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -139,9 +139,14 @@
 
 - (void)setTitle:(NSString *)title
 {
-    NSString *copy = [title copy];
+    NSString *newTitle;
+    if (title && [title isEqualToString:_displayTitle]) {
+        newTitle = [_displayTitle retain];
+    } else {
+        newTitle = [title copy];
+    }
     [_title release];
-    _title = copy;
+    _title = newTitle;
 }
 
 - (void)setTarget:(NSString *)target
@@ -160,9 +165,14 @@
 
 - (void)setDisplayTitle:(NSString *)displayTitle
 {
-    NSString *copy = [displayTitle copy];
+    NSString *newDisplayTitle;
+    if (displayTitle && [displayTitle isEqualToString:_title]) {
+        newDisplayTitle = [_title retain];
+    } else {
+        newDisplayTitle = [displayTitle copy];
+    }
     [_displayTitle release];
-    _displayTitle = copy;
+    _displayTitle = newDisplayTitle;
 }
 
 - (void)setLastVisitedDate:(NSCalendarDate *)date

-- 
WebKit Debian packaging