[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 116facd34481f36416f4849779f2df33972fb0b8
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 3 16:30:37 2002 +0000

    	Fix a reproducible crash pulling down the Go menu.
    
            * Misc.subproj/WebIconDatabase.m: (-[WebIconDatabase _iconForFileURL:withSize:]):
    	Add a missing retain.
    
            * WebKit.pbproj/project.pbxproj: Project Builder wants what it wants.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1951 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 07d9175..2f57aff 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-09-03  Darin Adler  <darin at apple.com>
+
+	Fix a reproducible crash pulling down the Go menu.
+
+        * Misc.subproj/WebIconDatabase.m: (-[WebIconDatabase _iconForFileURL:withSize:]):
+	Add a missing retain.
+
+        * WebKit.pbproj/project.pbxproj: Project Builder wants what it wants.
+
 2002-09-02  Chris Blumenberg  <cblu at apple.com>
 
 	Icon DB.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 07d9175..2f57aff 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-09-03  Darin Adler  <darin at apple.com>
+
+	Fix a reproducible crash pulling down the Go menu.
+
+        * Misc.subproj/WebIconDatabase.m: (-[WebIconDatabase _iconForFileURL:withSize:]):
+	Add a missing retain.
+
+        * WebKit.pbproj/project.pbxproj: Project Builder wants what it wants.
+
 2002-09-02  Chris Blumenberg  <cblu at apple.com>
 
 	Icon DB.
diff --git a/WebKit/Misc.subproj/WebIconDatabase.m b/WebKit/Misc.subproj/WebIconDatabase.m
index ecd03e9..abc652a 100644
--- a/WebKit/Misc.subproj/WebIconDatabase.m
+++ b/WebKit/Misc.subproj/WebIconDatabase.m
@@ -353,7 +353,7 @@ NSSize WebIconMediumSize = {32, 32};
     if([[[fileURL path] pathExtension] rangeOfString:@"htm"].length > 0){
         if(!_private->htmlIcons){
             icon = [workspace iconForFileType:@"html"];
-            _private->htmlIcons = [NSMutableArray arrayWithObject:icon];
+            _private->htmlIcons = [[NSMutableArray arrayWithObject:icon] retain];
         }
         return [self _cachedIconFromArray:_private->htmlIcons withSize:size];
     }else{
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 4882dd5..44ac563 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -72,6 +72,7 @@
 				F58C8A07025BD3BC018635CA,
 				F531DDFF02F0C36F018635CA,
 			);
+			hasScannedForEncodings = 1;
 			isa = PBXProject;
 			knownRegions = (
 				English,

-- 
WebKit Debian packaging