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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 474a26ea8746f8bcf2508e07aa16c05a265b53e1
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 30 01:44:15 2002 +0000

    Fix for John.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@565 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/WebView.subproj/IFBaseWebController.mm b/WebKit/WebView.subproj/IFBaseWebController.mm
index 7a426c1..7e31178 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.mm
+++ b/WebKit/WebView.subproj/IFBaseWebController.mm
@@ -126,7 +126,8 @@
         [data->dataSourceMap setObject: dataSource forKey: [WKObjectHolder holderWithObject:view]];
     }
     
-    [view dataSourceChanged];
+    if (dataSource != nil)
+        [view dataSourceChanged];
 }
 
 
diff --git a/WebKit/WebView.subproj/IFDefaultWebController.mm b/WebKit/WebView.subproj/IFDefaultWebController.mm
index 7a426c1..7e31178 100644
--- a/WebKit/WebView.subproj/IFDefaultWebController.mm
+++ b/WebKit/WebView.subproj/IFDefaultWebController.mm
@@ -126,7 +126,8 @@
         [data->dataSourceMap setObject: dataSource forKey: [WKObjectHolder holderWithObject:view]];
     }
     
-    [view dataSourceChanged];
+    if (dataSource != nil)
+        [view dataSourceChanged];
 }
 
 
diff --git a/WebKit/WebView.subproj/WKDefaultWebController.mm b/WebKit/WebView.subproj/WKDefaultWebController.mm
index 7a426c1..7e31178 100644
--- a/WebKit/WebView.subproj/WKDefaultWebController.mm
+++ b/WebKit/WebView.subproj/WKDefaultWebController.mm
@@ -126,7 +126,8 @@
         [data->dataSourceMap setObject: dataSource forKey: [WKObjectHolder holderWithObject:view]];
     }
     
-    [view dataSourceChanged];
+    if (dataSource != nil)
+        [view dataSourceChanged];
 }
 
 

-- 
WebKit Debian packaging