[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 f20e287056f1f5d7386c9cb551a4e6e564e83c1f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 17 22:02:21 2002 +0000

            * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::requestFrame):
    	Take out bogus check for nil path -- a URL with a nil path is OK, for example "about:blank".
    	Also improved log message.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1581 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index c6b754a..70431e8 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-07-17  Darin Adler  <darin at apple.com>
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::requestFrame):
+	Take out bogus check for nil path -- a URL with a nil path is OK, for example "about:blank".
+	Also improved log message.
+
 2002-07-16  Maciej Stachowiak  <mjs at apple.com>
 
         Moved URL mouseover status to KWQKHTMLPartImpl, and made it
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c6b754a..70431e8 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-07-17  Darin Adler  <darin at apple.com>
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::requestFrame):
+	Take out bogus check for nil path -- a URL with a nil path is OK, for example "about:blank".
+	Also improved log message.
+
 2002-07-16  Maciej Stachowiak  <mjs at apple.com>
 
         Moved URL mouseover status to KWQKHTMLPartImpl, and made it
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c6b754a..70431e8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-07-17  Darin Adler  <darin at apple.com>
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::requestFrame):
+	Take out bogus check for nil path -- a URL with a nil path is OK, for example "about:blank".
+	Also improved log message.
+
 2002-07-16  Maciej Stachowiak  <mjs at apple.com>
 
         Moved URL mouseover status to KWQKHTMLPartImpl, and made it
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index b715699..25f75c7 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -426,8 +426,8 @@ bool KWQKHTMLPartImpl::requestFrame( khtml::RenderPart *frame, const QString &ur
                                      const QStringList &params, bool isIFrame )
 {
     NSURL *childURL = part->completeURL(url).getNSURL();
-    if (childURL == nil || [childURL path] == nil) {
-        NSLog (@"ERROR (probably need to fix CFURL): unable to create URL with path");
+    if (childURL == nil) {
+        NSLog (@"ERROR (probably need to fix CFURL): unable to create URL with path (base URL %s, relative URL %s)", m_baseURL.prettyURL().ascii(), url.ascii());
         return false;
     }
     
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index b715699..25f75c7 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -426,8 +426,8 @@ bool KWQKHTMLPartImpl::requestFrame( khtml::RenderPart *frame, const QString &ur
                                      const QStringList &params, bool isIFrame )
 {
     NSURL *childURL = part->completeURL(url).getNSURL();
-    if (childURL == nil || [childURL path] == nil) {
-        NSLog (@"ERROR (probably need to fix CFURL): unable to create URL with path");
+    if (childURL == nil) {
+        NSLog (@"ERROR (probably need to fix CFURL): unable to create URL with path (base URL %s, relative URL %s)", m_baseURL.prettyURL().ascii(), url.ascii());
         return false;
     }
     

-- 
WebKit Debian packaging