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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit fe1a76e08171bcfa6c7f3a19d4632c6ac5dd1dbf
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 19 03:21:50 2002 +0000

    WebKit:
    
    	Reject the RealPlayer plug-in because we know it doesn't work.
    
            Reviewed by sullivan.
    
            * English.lproj/StringsNotToBeLocalized.txt:
            * Plugins.subproj/WebNetscapePluginPackage.m:
            (-[WebNetscapePluginPackage initWithPath:]): reject the RealPlayer plug-in
    
    WebBrowser:
    
    	Fixed: 3103603 - Safari becomes unresponsive while launching DiskCopy
    	Special case RealPlayer and WMP plug-ins. Provide the option to open the content in the apps.
    
            Reviewed by sullivan.
    
            * BrowserNSWorkspaceExtras.m:
            (-[NSWorkspace launchApplicationAtPath:processSerialNumber:makeFrontmost:event:]): enable async launching of DiskCopy
            * English.lproj/Localizable.strings:
            * English.lproj/StringsNotToBeLocalized.txt:
            * LoadProgressMonitor.m:
            (-[LoadProgressMonitor pluginFailedWithError:dataSource:]): special case RealPlayer and WMP plug-ins. Provide the option to open the content in the apps.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3127 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d61830d..dbbd53b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-12-18  Chris Blumenberg  <cblu at apple.com>
+
+	Reject the RealPlayer plug-in because we know it doesn't work.
+
+        Reviewed by sullivan.
+
+        * English.lproj/StringsNotToBeLocalized.txt:
+        * Plugins.subproj/WebNetscapePluginPackage.m:
+        (-[WebNetscapePluginPackage initWithPath:]): reject the RealPlayer plug-in
+
 2002-12-18  Maciej Stachowiak  <mjs at apple.com>
 
 	Reviewed by John.
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 921bf6c..4ed5277 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -233,7 +233,6 @@ History.subproj/WebHistoryItem.m:"title"
 Misc.subproj/WebKitLogging.m
 Plugins.subproj/WebBasePluginPackage.m:"name: %@\npath: %@\nmimeTypes:\n%@\npluginDescription:%@"
 Plugins.subproj/WebNetscapePluginPackage.m:"main"
-Plugins.subproj/npapi.m:"Microsoft Internet Explorer"
 WebCoreSupport.subproj/WebBridge.m:"height"
 WebCoreSupport.subproj/WebBridge.m:"width"
 WebCoreSupport.subproj/WebCookieAdapter.m:"Cookie"
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginPackage.m b/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
index 4c80100..0743c83 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
@@ -180,7 +180,7 @@ static TransitionVector tVectorForFunctionPointer(FunctionPointer);
     [self setPath:thePath];
     
     NSDictionary *fileInfo = [[NSFileManager defaultManager] fileAttributesAtPath:thePath traverseLink:YES];
-    UInt32 type = 0;
+    OSType type = 0;
 
     // bundle
     if ([[fileInfo objectForKey:NSFileType] isEqualToString:NSFileTypeDirectory]) {
@@ -194,11 +194,11 @@ static TransitionVector tVectorForFunctionPointer(FunctionPointer);
 #ifdef __ppc__
     // single-file plug-in with resource fork
     if ([[fileInfo objectForKey:NSFileType] isEqualToString:NSFileTypeRegular]) {
-        type = [[fileInfo objectForKey:NSFileHFSTypeCode] unsignedLongValue];
+        type = [fileInfo fileHFSTypeCode];
         isBundle = NO;
     }
 #endif
-
+    
     if (type != FOUR_CHAR_CODE('BRPL')) {
         [self release];
         return nil;
@@ -230,6 +230,14 @@ static TransitionVector tVectorForFunctionPointer(FunctionPointer);
         return nil;
     }
 
+    // Reject RealPlayer because we know it doesn't work.
+    // The Real folks can workaround this by not using the same creator code as Flash.
+    if ([[self filename] rangeOfString:@"RealPlayer"].location != NSNotFound &&
+        [fileInfo fileHFSCreatorCode] == 'MOSS') {
+        [self release];
+        return nil;
+    }
+
     return self;
 }
 
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 8e6a463..95b16b6 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -65,6 +65,7 @@
 				F58C8A07025BD3BC018635CA,
 				F531DDFF02F0C36F018635CA,
 			);
+			hasScannedForEncodings = 1;
 			isa = PBXProject;
 			knownRegions = (
 				English,
@@ -189,7 +190,6 @@
 </dict>
 </plist>
 ";
-			shouldUseHeadermap = 0;
 		};
 		0867D69DFE84028FC02AAC07 = {
 			buildActionMask = 2147483647;

-- 
WebKit Debian packaging