From 2ecf55d9682d6888ba6c2aa4f3a397ba723d4c42 Mon Sep 17 00:00:00 2001
From: "sspitzer%netscape.com" <sspitzer%netscape.com>
Date: Fri, 17 Jan 2003 01:27:40 +0000
Subject: [PATCH] stub out cid: protocol handler to silence alert on linux (and
 probably mac) for message with cid: links the next step is to actually
 implement the protocol handler and fix mime so that we support cid: links
 (see rfc 2111) r/sr=bienvenu

---
 mailnews/base/build/nsMsgBaseCID.h   | 14 ++++++++++++--
 mailnews/base/build/nsMsgFactory.cpp | 12 +++++++++---
 mailnews/base/src/Makefile.in        |  1 +
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/mailnews/base/build/nsMsgBaseCID.h b/mailnews/base/build/nsMsgBaseCID.h
index e7f05f4fe238..e827887227dc 100644
--- a/mailnews/base/build/nsMsgBaseCID.h
+++ b/mailnews/base/build/nsMsgBaseCID.h
@@ -358,7 +358,6 @@
 #define NS_MSGFILTERDELEGATEFACTORY_IMAP_CONTRACTID \
   NS_MSGFILTERDELEGATEFACTORY_CONTRACTID_PREFIX "imap"
 
-
 //
 // nsMsgFilterDataSource
 //
@@ -472,5 +471,16 @@
 //
 #define NS_MESSENGEROSINTEGRATION_CONTRACTID \
   "@mozilla.org/messenger/osintegration;1"
- 
+
+//
+// cid protocol handler
+//
+#define NS_CIDPROTOCOLHANDLER_CONTRACTID \
+ NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "cid"
+
+#define NS_CIDPROTOCOL_CID \
+{ /* b3db9392-1b15-48ba-a136-0cc3db13d87b */ \
+ 0xb3db9392, 0x1b15, 0x48ba,      \
+ {0xa1, 0x36, 0x0c, 0xc3, 0xdb, 0x13, 0xd8, 0x7b }}
+
 #endif // nsMessageBaseCID_h__
diff --git a/mailnews/base/build/nsMsgFactory.cpp b/mailnews/base/build/nsMsgFactory.cpp
index 04eb687b44df..d5d7c839dc06 100644
--- a/mailnews/base/build/nsMsgFactory.cpp
+++ b/mailnews/base/build/nsMsgFactory.cpp
@@ -105,6 +105,7 @@
 
 #include "nsMsgProgress.h"
 #include "nsSpamSettings.h"
+#include "nsCidProtocolHandler.h"
 
 #ifdef XP_WIN
 #include "nsMessengerWinIntegration.h"
@@ -153,6 +154,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgQuickSearchDBView);
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgOfflineManager);
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgProgress);
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSpamSettings);
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsCidProtocolHandler);
 #ifdef XP_WIN
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMessengerWinIntegration, Init);
 #endif
@@ -169,7 +171,7 @@ static const nsModuleComponentInfo gComponents[] = {
     { "Netscape Messenger Window Service", NS_MESSENGERWINDOWSERVICE_CID,
       NS_MESSENGERWINDOWSERVICE_CONTRACTID,
       nsMessengerBootstrapConstructor,
-	},
+    },
     { "Mail Startup Handler", NS_MESSENGERBOOTSTRAP_CID,
       NS_MAILSTARTUPHANDLER_CONTRACTID,
       nsMessengerBootstrapConstructor,
@@ -296,8 +298,8 @@ static const nsModuleComponentInfo gComponents[] = {
       nsSubscribeDataSourceConstructor,
     },
     { "Mail/News Subscribable Server", NS_SUBSCRIBABLESERVER_CID,
-	  NS_SUBSCRIBABLESERVER_CONTRACTID,
-	  nsSubscribableServerConstructor,
+      NS_SUBSCRIBABLESERVER_CONTRACTID,
+      nsSubscribableServerConstructor,
     },
     { "Local folder compactor", NS_MSGLOCALFOLDERCOMPACTOR_CID,
       NS_MSGLOCALFOLDERCOMPACTOR_CONTRACTID,
@@ -339,6 +341,10 @@ static const nsModuleComponentInfo gComponents[] = {
       NS_SPAMSETTINGS_CONTRACTID,
       nsSpamSettingsConstructor,
     },
+    { "cid protocol", NS_CIDPROTOCOL_CID,
+      NS_CIDPROTOCOLHANDLER_CONTRACTID,
+      nsCidProtocolHandlerConstructor,
+    },
 #ifdef XP_WIN
     { "Windows OS Integration", NS_MESSENGERWININTEGRATION_CID,
       NS_MESSENGEROSINTEGRATION_CONTRACTID,
diff --git a/mailnews/base/src/Makefile.in b/mailnews/base/src/Makefile.in
index be2784a25abd..78eb00f1da02 100644
--- a/mailnews/base/src/Makefile.in
+++ b/mailnews/base/src/Makefile.in
@@ -104,6 +104,7 @@ CPPSRCS		= \
 		nsMsgOfflineManager.cpp \
 		nsMsgProgress.cpp \
 		nsSpamSettings.cpp \
+		nsCidProtocolHandler.cpp \
 		$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)