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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit ad70c1e735f04a243e254988e114a8e31a2527f5
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon May 27 21:32:58 2002 +0000

    	Part of fix for 2922772 -- page title & location field don't
    	show redirected URLs.
    
    	* WebView.subproj/IFWebDataSource.mm:
    	(-[IFWebDataSource wasRedirected]): Fixed this method, now that
    	we have a client that relies on it. Its logic was backwards, and
    	it didn't handle the null _finalURL case.
    
    	WebBrowser part of fix for 2922772 -- page title & location field don't
    	show redirected URLs.
    
    	* BrowserDocument.h: added BrowserDocumentRedirectedNotification
    	* BrowserDocument.m:
    	(-[BrowserDocument currentURL]): Return redirectedURL if appropriate.
    
    	* BrowserWindow.m:
    	(-[BrowserWindow windowDidLoad]): register for BrowserDocumentRedirectedNotification
    	(-[BrowserWindow frameLoadRedirected:]): Update location field if appropriate.
    
    	* LocationChangeHandler.m:
    	(-[LocationChangeHandler serverRedirectTo:forDataSource:]):
    	Send BrowserDocumentRedirectedNotification and title-changed
    	messages if the frame is the top-level frame.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1222 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 76ef0f0..19bb23a 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,6 +1,7 @@
 2002-05-27  John Sullivan  <sullivan at apple.com>
 
-	* Resources/linkCursor.tiff: Added.
+	* Resources/linkCursor.tiff: Added. Maciej forgot to cvs add
+	this new file. I stole the one from haircut.
 
 2002-05-27  Maciej Stachowiak  <mjs at apple.com>
 
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 76ef0f0..19bb23a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,6 +1,7 @@
 2002-05-27  John Sullivan  <sullivan at apple.com>
 
-	* Resources/linkCursor.tiff: Added.
+	* Resources/linkCursor.tiff: Added. Maciej forgot to cvs add
+	this new file. I stole the one from haircut.
 
 2002-05-27  Maciej Stachowiak  <mjs at apple.com>
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 76ef0f0..19bb23a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,6 +1,7 @@
 2002-05-27  John Sullivan  <sullivan at apple.com>
 
-	* Resources/linkCursor.tiff: Added.
+	* Resources/linkCursor.tiff: Added. Maciej forgot to cvs add
+	this new file. I stole the one from haircut.
 
 2002-05-27  Maciej Stachowiak  <mjs at apple.com>
 
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f3a1553..49205bd 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,9 +1,19 @@
+2002-05-27  John Sullivan  <sullivan at apple.com>
+
+	Part of fix for 2922772 -- page title & location field don't
+	show redirected URLs.
+
+	* WebView.subproj/IFWebDataSource.mm:
+	(-[IFWebDataSource wasRedirected]): Fixed this method, now that
+	we have a client that relies on it. Its logic was backwards, and
+	it didn't handle the null _finalURL case.
+
 2002-05-26  Maciej Stachowiak  <mjs at apple.com>
 
 	Fixed Radar 936147 - debug output in console "keyUp: NSEvent: type=KeyUp"
 
 	* WebView.subproj/IFWebView.mm:
-	(-[IFWebView keyDown:]): Turned NSLog into WEBKITDEBUGLEBEL.
+	(-[IFWebView keyDown:]): Turned NSLog into WEBKITDEBUGLEVEL.
 	(-[IFWebView keyUp:]): Likewise.
 
 2002-05-26  Maciej Stachowiak  <mjs at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f3a1553..49205bd 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,9 +1,19 @@
+2002-05-27  John Sullivan  <sullivan at apple.com>
+
+	Part of fix for 2922772 -- page title & location field don't
+	show redirected URLs.
+
+	* WebView.subproj/IFWebDataSource.mm:
+	(-[IFWebDataSource wasRedirected]): Fixed this method, now that
+	we have a client that relies on it. Its logic was backwards, and
+	it didn't handle the null _finalURL case.
+
 2002-05-26  Maciej Stachowiak  <mjs at apple.com>
 
 	Fixed Radar 936147 - debug output in console "keyUp: NSEvent: type=KeyUp"
 
 	* WebView.subproj/IFWebView.mm:
-	(-[IFWebView keyDown:]): Turned NSLog into WEBKITDEBUGLEBEL.
+	(-[IFWebView keyDown:]): Turned NSLog into WEBKITDEBUGLEVEL.
 	(-[IFWebView keyUp:]): Likewise.
 
 2002-05-26  Maciej Stachowiak  <mjs at apple.com>
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index 1ee207c..dd03c87 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -177,7 +177,7 @@ static id IFWebDataSourceMake(void *url, void *attributes, unsigned flags)
 // i.e. inputURL != redirectedURL.
 - (BOOL)wasRedirected
 {
-    return [_private->inputURL isEqual: [self redirectedURL]];
+    return [self redirectedURL] != nil && ![_private->inputURL isEqual: [self redirectedURL]];
 }
 
 
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 1ee207c..dd03c87 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -177,7 +177,7 @@ static id IFWebDataSourceMake(void *url, void *attributes, unsigned flags)
 // i.e. inputURL != redirectedURL.
 - (BOOL)wasRedirected
 {
-    return [_private->inputURL isEqual: [self redirectedURL]];
+    return [self redirectedURL] != nil && ![_private->inputURL isEqual: [self redirectedURL]];
 }
 
 

-- 
WebKit Debian packaging