From 764e512976f36cb2ec4b4fddcbd9fddc556fcb24 Mon Sep 17 00:00:00 2001
From: "av%netscape.com" <av%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 26 Aug 1998 19:30:58 +0000
Subject: [PATCH] Anthrax changes

git-svn-id: svn://10.0.0.236/trunk@8542 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/cmd/winfe/helpers.cpp         | 28 +++++++++++++++++++--------
 mozilla/modules/plugin/src/npglue.cpp |  3 ++-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/mozilla/cmd/winfe/helpers.cpp b/mozilla/cmd/winfe/helpers.cpp
index 2aae5b662cf..afbc373467d 100755
--- a/mozilla/cmd/winfe/helpers.cpp
+++ b/mozilla/cmd/winfe/helpers.cpp
@@ -186,12 +186,15 @@ void fe_AddTypeToList(NET_cdataStruct *cd_item)
 			app->how_handle = HANDLE_VIA_NETSCAPE;
 		else if (csCmd == MIME_PROMPT)
 			app->how_handle = HANDLE_UNKNOWN;	
-        else if (csCmd == MIME_OLE)	{
+    else if (csCmd == MIME_OLE)
 			app->how_handle = HANDLE_BY_OLE;
-		}
-        else if (csCmd == MIME_SHELLEXECUTE)	{
+    else if (csCmd == MIME_SHELLEXECUTE)
 			app->how_handle = HANDLE_SHELLEXECUTE;
-		}
+//~~~
+    else if (csCmd == MIME_PLUGIN)
+			app->how_handle = HANDLE_VIA_PLUGIN;
+    else if (csCmd == MIME_PLUGINAPPLET)
+			app->how_handle = HANDLE_VIA_PLUGINAPPLET;
 		else {
 			char	szFile[_MAX_FNAME];
 			
@@ -731,9 +734,11 @@ const char *GetMimeCmd(int load_action)
 
 		case HANDLE_UNKNOWN:
 			return MIME_SHELLEXECUTE;	//????? What should this be set to ???
-
+//~~~
 		case HANDLE_VIA_PLUGIN:
-			return MIME_SHELLEXECUTE;	//????? What should this be set to ???
+			return MIME_PLUGIN;
+		case HANDLE_VIA_PLUGINAPPLET:
+			return MIME_PLUGINAPPLET;
 
 		default:
 			return MIME_SHELLEXECUTE;	//????? What should this be set to ???			
@@ -1513,11 +1518,18 @@ fe_ChangeFileType(NET_cdataStruct *pcdata, LPCSTR lpszMimeType, int nHowToHandle
 		// Make sure we don't leave old Netscape specific information lying around. Note that
 		// for types that Netscape can handle internally it's assumed we're handling it unless
 		// it's marked as HANDLE_EXTERNAL in the Netscape specific information
-		if (pHelperApp->how_handle == HANDLE_EXTERNAL || pHelperApp->how_handle == HANDLE_SAVE) {
+		if (pHelperApp->how_handle == HANDLE_EXTERNAL || pHelperApp->how_handle == HANDLE_SAVE
+//~~~      
+        || pHelperApp->how_handle == HANDLE_VIA_PLUGIN || pHelperApp->how_handle == HANDLE_VIA_PLUGINAPPLET) {
 			// This gets saved in fe_CleanupFileFormatTypes()
 			if (pHelperApp->how_handle == HANDLE_SAVE)
 				pHelperApp->csCmd = MIME_SAVE;
-			pHelperApp->bChanged = TRUE;
+			if (pHelperApp->how_handle == HANDLE_VIA_PLUGIN)
+				pHelperApp->csCmd = MIME_PLUGIN;
+			if (pHelperApp->how_handle == HANDLE_VIA_PLUGINAPPLET)
+				pHelperApp->csCmd = MIME_PLUGINAPPLET;
+
+      pHelperApp->bChanged = TRUE;
 		
 		} else {
 			// Remove any existing entry for this MIME type. If the MIME type isn't listed in the
diff --git a/mozilla/modules/plugin/src/npglue.cpp b/mozilla/modules/plugin/src/npglue.cpp
index c69b8cfc530..9a2a07d1dbd 100644
--- a/mozilla/modules/plugin/src/npglue.cpp
+++ b/mozilla/modules/plugin/src/npglue.cpp
@@ -5117,7 +5117,8 @@ NPL_IteratePluginTypes(NPReference* ref, NPReference plugin, NPMIMEType* type, c
  * to know which plug-ins can handle a particular type to build their popup menu).
  * The caller is responsible for deleting the strings and the array itself. 
  */
-char**
+/*~~~*/
+PR_IMPLEMENT(char**)
 NPL_FindPluginsForType(const char* typeToFind)
 {
 	char** result;