[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 19bd5e700a859b0bd0249d00666c5dc4b5967baa
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 11 17:11:05 2002 +0000

            Reviewed by John.
    
    	- fixed 3117611 -- REGRESSION: exception in mouseoverTextForElement with accented characters in status
    
            * WebView.subproj/WebHTMLViewPrivate.m:
            (-[NSMutableDictionary _web_setObjectIfNotNil:forKey:]):
    	Remove the object from the dictionary rather than just leaving the dictionary alone if it's nil.
    	This is needed since we now are reusing an already-existing dictionary.
    
            * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3001 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0263323..49e5415 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-12-11  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3117611 -- REGRESSION: exception in mouseoverTextForElement with accented characters in status
+
+        * WebView.subproj/WebHTMLViewPrivate.m:
+        (-[NSMutableDictionary _web_setObjectIfNotNil:forKey:]):
+	Remove the object from the dictionary rather than just leaving the dictionary alone if it's nil.
+	This is needed since we now are reusing an already-existing dictionary.
+
+        * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
+
 2002-12-11  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3118430 - crash / loop trying to copy url of link to clipboard
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index e9f374c..7f21f90 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -57,7 +57,6 @@
 "DirectionS"
 "DirectionWS"
 "Entries"
-"GET"
 "HREF="
 "Helvetica"
 "JoiningCausing"
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index a519daf..8e3cdd8 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -458,9 +458,10 @@ static BOOL inNSTextViewDrawRect;
 - (void)_web_setObjectIfNotNil:(id)object forKey:(id)key
 {
     if (object == nil) {
-        return;
+        [self removeObjectForKey:key];
+    } else {
+        [self setObject:object forKey:key];
     }
-    [self setObject:object forKey:key];
 }
 
 @end

-- 
WebKit Debian packaging