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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 497c603e95b7310684b92c16173284b29255eef6
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 14 16:01:33 2003 +0000

            Reviewed by Darin
    
    	Fix for this bug:
    
    	<rdar://problem/3450449>: assertion failure in WebBridge
    	_retrieveKeyboardUIModeFromPreferences
    
    	Can't assert that the preference always exists and is valid as I
    	thought you could. This could just mean that the a preference for full
    	keyboard access has not been specified by the user yet. If this is so,
    	just return the default keyboard access mode.
    
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge _retrieveKeyboardUIModeFromPreferences:])
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5182 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8397ab0..31e6c70 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2003-10-14  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin
+
+	Fix for this bug:
+
+	<rdar://problem/3450449>: assertion failure in WebBridge 
+	_retrieveKeyboardUIModeFromPreferences
+
+	Can't assert that the preference always exists and is valid as I
+	thought you could. This could just mean that the a preference for full
+	keyboard access has not been specified by the user yet. If this is so,
+	just return the default keyboard access mode.
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge _retrieveKeyboardUIModeFromPreferences:])
+
 2003-10-13  Richard Williamson  <rjw at apple.com>
 
 	Added support for small-caps.
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 09dae4a..2bfd471 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -975,9 +975,8 @@ static id <WebFormDelegate> formDelegate(WebBridge *self)
 {
     CFPreferencesAppSynchronize(UniversalAccessDomain);
 
-    BOOL sanityCheck;
-    int mode = CFPreferencesGetAppIntegerValue(AppleKeyboardUIMode, UniversalAccessDomain, &sanityCheck);
-    ASSERT(sanityCheck);
+    BOOL keyExistsAndHasValidFormat;
+    int mode = CFPreferencesGetAppIntegerValue(AppleKeyboardUIMode, UniversalAccessDomain, &keyExistsAndHasValidFormat);
     
     // The keyboard access mode is reported by two bits:
     // Bit 0 is set if feature is on

-- 
WebKit Debian packaging