[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 80d8706a80fc1d44b57269e46c7c2593001be1c2
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 6 18:00:41 2002 +0000

            * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::urlSelected):
    	Put in a check for nil that I missed.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1750 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index ec9b396..3a77107 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,10 @@
 2002-08-06  Darin Adler  <darin at apple.com>
 
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::urlSelected):
+	Put in a check for nil that I missed.
+
+2002-08-06  Darin Adler  <darin at apple.com>
+
 	- fixed 2948805 -- Need WebKit API for larger/smaller font feature
 
         * khtml/khtml_part.cpp:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ec9b396..3a77107 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,10 @@
 2002-08-06  Darin Adler  <darin at apple.com>
 
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::urlSelected):
+	Put in a check for nil that I missed.
+
+2002-08-06  Darin Adler  <darin at apple.com>
+
 	- fixed 2948805 -- Need WebKit API for larger/smaller font feature
 
         * khtml/khtml_part.cpp:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ec9b396..3a77107 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,10 @@
 2002-08-06  Darin Adler  <darin at apple.com>
 
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::urlSelected):
+	Put in a check for nil that I missed.
+
+2002-08-06  Darin Adler  <darin at apple.com>
+
 	- fixed 2948805 -- Need WebKit API for larger/smaller font feature
 
         * khtml/khtml_part.cpp:
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 507a139..2370b0d 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -155,7 +155,8 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
     WebCoreBridge *frame;
     if (_target.isEmpty()) {
         // If we're the only frame in a frameset then pop the frame.
-        frame = part->parentPart()->impl->bridge;
+        KHTMLPart *parentPart = part->parentPart();
+        frame = parentPart ? parentPart->impl->bridge : nil;
         if ([[frame childFrames] count] != 1) {
             frame = bridge;
         }
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 507a139..2370b0d 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -155,7 +155,8 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
     WebCoreBridge *frame;
     if (_target.isEmpty()) {
         // If we're the only frame in a frameset then pop the frame.
-        frame = part->parentPart()->impl->bridge;
+        KHTMLPart *parentPart = part->parentPart();
+        frame = parentPart ? parentPart->impl->bridge : nil;
         if ([[frame childFrames] count] != 1) {
             frame = bridge;
         }

-- 
WebKit Debian packaging