[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 a922fac8aedc9e50d91c2904c8cd91b4122ff13c
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jun 16 02:31:34 2002 +0000

    	* kwq/KWQKloader.mm: (-[KWQURLLoadClient initWithLoader:bridge:]):
            Fix bridge/m_bridge typo that was responsible for at least some of the breakage
            I caused.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1378 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 21616b1..3b77517 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-06-15  Darin Adler  <darin at apple.com>
+
+	* kwq/KWQKloader.mm: (-[KWQURLLoadClient initWithLoader:bridge:]):
+        Fix bridge/m_bridge typo that was responsible for at least some of the breakage
+        I caused.
+
 2002-06-15  Richard Williamson  <rjw at apple.com>
 
     Fixed factoring problem.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 21616b1..3b77517 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-06-15  Darin Adler  <darin at apple.com>
+
+	* kwq/KWQKloader.mm: (-[KWQURLLoadClient initWithLoader:bridge:]):
+        Fix bridge/m_bridge typo that was responsible for at least some of the breakage
+        I caused.
+
 2002-06-15  Richard Williamson  <rjw at apple.com>
 
     Fixed factoring problem.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 21616b1..3b77517 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-06-15  Darin Adler  <darin at apple.com>
+
+	* kwq/KWQKloader.mm: (-[KWQURLLoadClient initWithLoader:bridge:]):
+        Fix bridge/m_bridge typo that was responsible for at least some of the breakage
+        I caused.
+
 2002-06-15  Richard Williamson  <rjw at apple.com>
 
     Fixed factoring problem.
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index 69df0a8..c427e17 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -56,7 +56,7 @@ using khtml::Request;
 {
     if ((self = [super init])) {
         m_loader = loader;
-        m_bridge = [m_bridge retain];
+        m_bridge = [bridge retain];
         return self;
     }
     
@@ -153,6 +153,9 @@ using khtml::Request;
 {
     KWQDEBUGLEVEL(KWQ_LOG_LOADING, "url = %s", DEBUG_OBJECT(URL));
     
+    void *userData = [[handle attributeForKey:IFURLHandleUserData] pointerValue];
+    KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
+    KWQ_ASSERT(handle == job->handle());
     KWQ_ASSERT(m_currentURL != nil);
 
     [m_bridge didRedirectWithHandle:handle fromURL:m_currentURL];
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 69df0a8..c427e17 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -56,7 +56,7 @@ using khtml::Request;
 {
     if ((self = [super init])) {
         m_loader = loader;
-        m_bridge = [m_bridge retain];
+        m_bridge = [bridge retain];
         return self;
     }
     
@@ -153,6 +153,9 @@ using khtml::Request;
 {
     KWQDEBUGLEVEL(KWQ_LOG_LOADING, "url = %s", DEBUG_OBJECT(URL));
     
+    void *userData = [[handle attributeForKey:IFURLHandleUserData] pointerValue];
+    KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
+    KWQ_ASSERT(handle == job->handle());
     KWQ_ASSERT(m_currentURL != nil);
 
     [m_bridge didRedirectWithHandle:handle fromURL:m_currentURL];
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index 69df0a8..c427e17 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -56,7 +56,7 @@ using khtml::Request;
 {
     if ((self = [super init])) {
         m_loader = loader;
-        m_bridge = [m_bridge retain];
+        m_bridge = [bridge retain];
         return self;
     }
     
@@ -153,6 +153,9 @@ using khtml::Request;
 {
     KWQDEBUGLEVEL(KWQ_LOG_LOADING, "url = %s", DEBUG_OBJECT(URL));
     
+    void *userData = [[handle attributeForKey:IFURLHandleUserData] pointerValue];
+    KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
+    KWQ_ASSERT(handle == job->handle());
     KWQ_ASSERT(m_currentURL != nil);
 
     [m_bridge didRedirectWithHandle:handle fromURL:m_currentURL];

-- 
WebKit Debian packaging