[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 4061142f538dde028272ae4be04cc18f797d254f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 9 21:23:15 2002 +0000

    	- fixed 2945441 -- base target is ignored
    
            * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::urlSelected):
    	Add code to respect the base target in the document. It would be way better
    	to use more of the KHTML code instead of copying it a line at a time into
    	KWQ -- that can come later when the fire drill is over.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1787 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index ae5582c..511dbe1 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-08-09  Darin Adler  <darin at apple.com>
+
+	- fixed 2945441 -- base target is ignored
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::urlSelected):
+	Add code to respect the base target in the document. It would be way better
+	to use more of the KHTML code instead of copying it a line at a time into
+	KWQ -- that can come later when the fire drill is over.
+
 === milestone 0.5 ===
 
 === Alexander-16 ===
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ae5582c..511dbe1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-08-09  Darin Adler  <darin at apple.com>
+
+	- fixed 2945441 -- base target is ignored
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::urlSelected):
+	Add code to respect the base target in the document. It would be way better
+	to use more of the KHTML code instead of copying it a line at a time into
+	KWQ -- that can come later when the fire drill is over.
+
 === milestone 0.5 ===
 
 === Alexander-16 ===
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ae5582c..511dbe1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-08-09  Darin Adler  <darin at apple.com>
+
+	- fixed 2945441 -- base target is ignored
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::urlSelected):
+	Add code to respect the base target in the document. It would be way better
+	to use more of the KHTML code instead of copying it a line at a time into
+	KWQ -- that can come later when the fire drill is over.
+
 === milestone 0.5 ===
 
 === Alexander-16 ===
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 931816e..ad62710 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -142,6 +142,11 @@ void KWQKHTMLPartImpl::slotData(NSString *encoding, bool forceEncoding, const ch
 
 void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, const QString &_target, KParts::URLArgs )
 {
+    QString target = _target;
+    if (target.isEmpty() && d->m_doc) {
+        target = d->m_doc->baseTarget();
+    }
+
     if ( url.find( "javascript:", 0, false ) == 0 )
     {
         part->executeScript( url.right( url.length() - 11) );
@@ -173,7 +178,7 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
     }
     
     WebCoreBridge *frame;
-    if (_target.isEmpty()) {
+    if (target.isEmpty()) {
         // If we're the only frame in a frameset then pop the frame.
         KHTMLPart *parentPart = part->parentPart();
         frame = parentPart ? parentPart->impl->bridge : nil;
@@ -181,9 +186,9 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
             frame = bridge;
         }
     } else {
-        frame = [bridge descendantFrameNamed:_target.getNSString()];
+        frame = [bridge descendantFrameNamed:target.getNSString()];
         if (frame == nil) {
-            NSLog (@"WARNING: unable to find frame named %@, creating new window with \"_blank\" name.  New window will not be named until 2959902 is fixed.\n", _target.getNSString());
+            NSLog (@"WARNING: unable to find frame named %@, creating new window with \"_blank\" name.  New window will not be named until 2959902 is fixed.\n", target.getNSString());
                 frame = [bridge descendantFrameNamed:@"_blank"];
         }
     }
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 931816e..ad62710 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -142,6 +142,11 @@ void KWQKHTMLPartImpl::slotData(NSString *encoding, bool forceEncoding, const ch
 
 void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, const QString &_target, KParts::URLArgs )
 {
+    QString target = _target;
+    if (target.isEmpty() && d->m_doc) {
+        target = d->m_doc->baseTarget();
+    }
+
     if ( url.find( "javascript:", 0, false ) == 0 )
     {
         part->executeScript( url.right( url.length() - 11) );
@@ -173,7 +178,7 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
     }
     
     WebCoreBridge *frame;
-    if (_target.isEmpty()) {
+    if (target.isEmpty()) {
         // If we're the only frame in a frameset then pop the frame.
         KHTMLPart *parentPart = part->parentPart();
         frame = parentPart ? parentPart->impl->bridge : nil;
@@ -181,9 +186,9 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
             frame = bridge;
         }
     } else {
-        frame = [bridge descendantFrameNamed:_target.getNSString()];
+        frame = [bridge descendantFrameNamed:target.getNSString()];
         if (frame == nil) {
-            NSLog (@"WARNING: unable to find frame named %@, creating new window with \"_blank\" name.  New window will not be named until 2959902 is fixed.\n", _target.getNSString());
+            NSLog (@"WARNING: unable to find frame named %@, creating new window with \"_blank\" name.  New window will not be named until 2959902 is fixed.\n", target.getNSString());
                 frame = [bridge descendantFrameNamed:@"_blank"];
         }
     }

-- 
WebKit Debian packaging