[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 64e1370974eafd9b8dedeba419e73c6b246c5a11
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 5 06:05:25 2002 +0000

    	Fix bug where doing a reload adds an entry to the back/forward list.
    
            * History.subproj/WebBackForwardList.m: (-[WebBackForwardList addEntry:]):
    	If URL, target, and parent all match, then don't add an entry.
    
            * WebKit.pbproj/project.pbxproj: Let Project Builder be the boss; I guess
    	this means Chris is still using the old version.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1965 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0f13024..10aab16 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-09-04  Darin Adler  <darin at apple.com>
+
+	Fix bug where doing a reload adds an entry to the back/forward list.
+
+        * History.subproj/WebBackForwardList.m: (-[WebBackForwardList addEntry:]):
+	If URL, target, and parent all match, then don't add an entry.
+
+        * WebKit.pbproj/project.pbxproj: Let Project Builder be the boss; I guess
+	this means Chris is still using the old version.
+
 2002-09-04  Chris Blumenberg  <cblu at apple.com>
 
 	- don't set nil data on the web file db
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 0f13024..10aab16 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-09-04  Darin Adler  <darin at apple.com>
+
+	Fix bug where doing a reload adds an entry to the back/forward list.
+
+        * History.subproj/WebBackForwardList.m: (-[WebBackForwardList addEntry:]):
+	If URL, target, and parent all match, then don't add an entry.
+
+        * WebKit.pbproj/project.pbxproj: Let Project Builder be the boss; I guess
+	this means Chris is still using the old version.
+
 2002-09-04  Chris Blumenberg  <cblu at apple.com>
 
 	- don't set nil data on the web file db
diff --git a/WebKit/History.subproj/WebBackForwardList.m b/WebKit/History.subproj/WebBackForwardList.m
index 335f7d7..d5414d1 100644
--- a/WebKit/History.subproj/WebBackForwardList.m
+++ b/WebKit/History.subproj/WebBackForwardList.m
@@ -35,6 +35,17 @@
 
 -(void)addEntry:(WebHistoryItem *)entry
 {
+    // If the last entry matches this new entry, don't add a new one, since we are
+    // presumably just doing a reload.
+    if ([uriList count] > index) {
+        WebHistoryItem *lastEntry = [uriList entryAtIndex:index];
+        if ([[lastEntry URL] isEqual:[entry URL]]
+            && ([lastEntry target] == [entry target] || [[lastEntry target] isEqual:[entry target]])
+            && ([lastEntry parent] == [entry parent] || [[lastEntry parent] isEqual:[entry parent]])) {
+            return;
+        }
+    }
+
     if (index > 0) {
         [uriList removeEntriesToIndex:index];
         index = 0;
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index c01cc74..caed43e 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -72,6 +72,7 @@
 				F58C8A07025BD3BC018635CA,
 				F531DDFF02F0C36F018635CA,
 			);
+			hasScannedForEncodings = 1;
 			isa = PBXProject;
 			knownRegions = (
 				English,

-- 
WebKit Debian packaging