[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 60fef03fb22961eb7efa121f545a5d49658627f3
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 23 23:20:56 2002 +0000

            Reviewed by Darin and Gramps
    
    	Workaround for this bug:
    
    	Radar 3134219 (MPEG-4 files don't work with the QuickTime plugin in Safari,
    	work fine in Mozilla, IE)
    
    	For beta 1, we For beta 1, when getting the MIME information for the QuickTime
    	plugin, we directly insert the information to handle MP4.
    
    	In the future, we will use the additional plugin entry points to dynamically load
    	this information from the plugin itself.
    
            * Plugins.subproj/WebNetscapePluginPackage.m:
            (-[WebNetscapePluginPackage getMIMEInformation])
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3178 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a1f372d..2541901 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,21 @@
+2002-12-23  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin and Gramps
+
+	Workaround for this bug:
+
+	Radar 3134219 (MPEG-4 files don't work with the QuickTime plugin in Safari, 
+	work fine in Mozilla, IE)
+
+	For beta 1, we For beta 1, when getting the MIME information for the QuickTime 
+	plugin, we directly insert the information to handle MP4.
+
+	In the future, we will use the additional plugin entry points to dynamically load 
+	this information from the plugin itself.
+
+        * Plugins.subproj/WebNetscapePluginPackage.m:
+        (-[WebNetscapePluginPackage getMIMEInformation])
+
 2002-12-23  Darin Adler  <darin at apple.com>
 
         Reviewed by John and Don.
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index c05ffa6..9326d5a 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -70,6 +70,8 @@
 "Library/Internet Plug-Ins"
 "Library/Preferences/Explorer/Favorites.html"
 "Lucida Grande"
+"MP4 Audio"
+"MP4 Video"
 "Mozilla/4.0 (compatible; MSIE 5.2; Mac_PowerPC) AppleWebKit/%@ %@"
 "Mozilla/4.0 (compatible; MSIE 5.2; Mac_PowerPC) AppleWebKit/%@"
 "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; %@) AppleWebKit/%@ (like Gecko) %@"
@@ -82,6 +84,7 @@
 "NSEvent"
 "POST"
 "Papyrus"
+"QuickTime Plugin.plugin"
 "Set-Cookie"
 "Times New Roman"
 "URIDictionary"
@@ -207,6 +210,7 @@
 "application/pdf"
 "application/x-java-applet"
 "application/x-javascript"
+"audio/mp4"
 "com.apple.WebKit"
 "displayTitle"
 "en"
@@ -215,6 +219,8 @@
 "http"
 "https"
 "lastVisitedDate"
+"mp4"
+"mpg4"
 "nullplugin"
 "text/"
 "text/html"
@@ -222,6 +228,7 @@
 "text/xml"
 "tiff"
 "url_icon"
+"video/mp4"
 "x"
 "~"
 Bookmarks.subproj/WebBookmarkLeaf.m:"%@: %@"
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginPackage.m b/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
index 0743c83..6d6d05c 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
@@ -120,6 +120,20 @@ static TransitionVector tVectorForFunctionPointer(FunctionPointer);
         }
     }
 
+    // Workaround for this bug:
+    // Radar 3134219 (MPEG-4 files don't work with the QuickTime plugin in Safari, work fine in Mozilla, IE)
+    // For beta 1, when getting the MIME information for the QuickTime plugin, we directly insert the 
+    // information to handle MP4. 
+    // In the future, we will use the additional plugin entry points to dynamically load this information
+    // from the plugin itself.
+    if ([[self filename] isEqualToString:@"QuickTime Plugin.plugin"]) {
+        NSArray *extensions = [NSArray arrayWithObjects:@"mp4", @"mpg4", nil];
+        [MIMEToExtensionsDictionary setObject:extensions forKey:@"video/mp4"];
+        [MIMEToDescriptionDictionary setObject:@"MP4 Video" forKey:@"video/mp4"];
+        [MIMEToExtensionsDictionary setObject:extensions forKey:@"audio/mp4"];
+        [MIMEToDescriptionDictionary setObject:@"MP4 Audio" forKey:@"audio/mp4"];
+    }
+
     [self setMIMEToDescriptionDictionary:MIMEToDescriptionDictionary];
     [self setMIMEToExtensionsDictionary:MIMEToExtensionsDictionary];
 

-- 
WebKit Debian packaging