[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 75f08488d221128f44d7f95f97180b16d8164cfd
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jun 17 00:54:18 2004 +0000

    	Fixed <rdar://problem/3696112>: nil from an Objective-C class seems to get wrapped as a JavaScript proxy that will not print.
    
    	This turned out to be a show stopper for Dashboard.  We now
    	return Undefined() when nil is returned from a ObjC method
    	that returns an object type.
    
            Reviewed by Maciej.
    
            * bindings/objc/objc_utility.mm:
            (KJS::Bindings::convertObjcValueToValue):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6871 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 2e0a2cc..c85093b 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2004-06-16  Richard Williamson   <rjw at apple.com>
+
+	Fixed <rdar://problem/3696112>: nil from an Objective-C class seems to get wrapped as a JavaScript proxy that will not print.
+
+	This turned out to be a show stopper for Dashboard.  We now
+	return Undefined() when nil is returned from a ObjC method
+	that returns an object type.
+	
+        Reviewed by Maciej.
+
+        * bindings/objc/objc_utility.mm:
+        (KJS::Bindings::convertObjcValueToValue):
+
 === Safari-145 ===
 
 2004-06-15  Richard Williamson   <rjw at apple.com>
diff --git a/JavaScriptCore/bindings/objc/objc_utility.mm b/JavaScriptCore/bindings/objc/objc_utility.mm
index 9ca994b..5ee5f7d 100644
--- a/JavaScriptCore/bindings/objc/objc_utility.mm
+++ b/JavaScriptCore/bindings/objc/objc_utility.mm
@@ -204,6 +204,9 @@ Value KJS::Bindings::convertObjcValueToValue (KJS::ExecState *exec, void *buffer
                     WebScriptObject *jsobject = (WebScriptObject *)*obj;
                     aValue = Object([jsobject _imp]);
                 }
+                else if (*obj == 0) {
+                    return Undefined();
+                }
                 else {
                     aValue = Object(new RuntimeObjectImp(new ObjcInstance (*obj)));
                 }

-- 
WebKit Debian packaging