зеркало из https://github.com/mozilla/pjs.git
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
This commit is contained in:
Родитель
e13c5da57f
Коммит
98c5e3d415
|
@ -358,7 +358,6 @@
|
||||||
#define NS_MSGFILTERDELEGATEFACTORY_IMAP_CONTRACTID \
|
#define NS_MSGFILTERDELEGATEFACTORY_IMAP_CONTRACTID \
|
||||||
NS_MSGFILTERDELEGATEFACTORY_CONTRACTID_PREFIX "imap"
|
NS_MSGFILTERDELEGATEFACTORY_CONTRACTID_PREFIX "imap"
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// nsMsgFilterDataSource
|
// nsMsgFilterDataSource
|
||||||
//
|
//
|
||||||
|
@ -472,5 +471,16 @@
|
||||||
//
|
//
|
||||||
#define NS_MESSENGEROSINTEGRATION_CONTRACTID \
|
#define NS_MESSENGEROSINTEGRATION_CONTRACTID \
|
||||||
"@mozilla.org/messenger/osintegration;1"
|
"@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__
|
#endif // nsMessageBaseCID_h__
|
||||||
|
|
|
@ -105,6 +105,7 @@
|
||||||
|
|
||||||
#include "nsMsgProgress.h"
|
#include "nsMsgProgress.h"
|
||||||
#include "nsSpamSettings.h"
|
#include "nsSpamSettings.h"
|
||||||
|
#include "nsCidProtocolHandler.h"
|
||||||
|
|
||||||
#ifdef XP_WIN
|
#ifdef XP_WIN
|
||||||
#include "nsMessengerWinIntegration.h"
|
#include "nsMessengerWinIntegration.h"
|
||||||
|
@ -153,6 +154,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgQuickSearchDBView);
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgOfflineManager);
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgOfflineManager);
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgProgress);
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgProgress);
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsSpamSettings);
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsSpamSettings);
|
||||||
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsCidProtocolHandler);
|
||||||
#ifdef XP_WIN
|
#ifdef XP_WIN
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMessengerWinIntegration, Init);
|
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMessengerWinIntegration, Init);
|
||||||
#endif
|
#endif
|
||||||
|
@ -169,7 +171,7 @@ static const nsModuleComponentInfo gComponents[] = {
|
||||||
{ "Netscape Messenger Window Service", NS_MESSENGERWINDOWSERVICE_CID,
|
{ "Netscape Messenger Window Service", NS_MESSENGERWINDOWSERVICE_CID,
|
||||||
NS_MESSENGERWINDOWSERVICE_CONTRACTID,
|
NS_MESSENGERWINDOWSERVICE_CONTRACTID,
|
||||||
nsMessengerBootstrapConstructor,
|
nsMessengerBootstrapConstructor,
|
||||||
},
|
},
|
||||||
{ "Mail Startup Handler", NS_MESSENGERBOOTSTRAP_CID,
|
{ "Mail Startup Handler", NS_MESSENGERBOOTSTRAP_CID,
|
||||||
NS_MAILSTARTUPHANDLER_CONTRACTID,
|
NS_MAILSTARTUPHANDLER_CONTRACTID,
|
||||||
nsMessengerBootstrapConstructor,
|
nsMessengerBootstrapConstructor,
|
||||||
|
@ -296,8 +298,8 @@ static const nsModuleComponentInfo gComponents[] = {
|
||||||
nsSubscribeDataSourceConstructor,
|
nsSubscribeDataSourceConstructor,
|
||||||
},
|
},
|
||||||
{ "Mail/News Subscribable Server", NS_SUBSCRIBABLESERVER_CID,
|
{ "Mail/News Subscribable Server", NS_SUBSCRIBABLESERVER_CID,
|
||||||
NS_SUBSCRIBABLESERVER_CONTRACTID,
|
NS_SUBSCRIBABLESERVER_CONTRACTID,
|
||||||
nsSubscribableServerConstructor,
|
nsSubscribableServerConstructor,
|
||||||
},
|
},
|
||||||
{ "Local folder compactor", NS_MSGLOCALFOLDERCOMPACTOR_CID,
|
{ "Local folder compactor", NS_MSGLOCALFOLDERCOMPACTOR_CID,
|
||||||
NS_MSGLOCALFOLDERCOMPACTOR_CONTRACTID,
|
NS_MSGLOCALFOLDERCOMPACTOR_CONTRACTID,
|
||||||
|
@ -339,6 +341,10 @@ static const nsModuleComponentInfo gComponents[] = {
|
||||||
NS_SPAMSETTINGS_CONTRACTID,
|
NS_SPAMSETTINGS_CONTRACTID,
|
||||||
nsSpamSettingsConstructor,
|
nsSpamSettingsConstructor,
|
||||||
},
|
},
|
||||||
|
{ "cid protocol", NS_CIDPROTOCOL_CID,
|
||||||
|
NS_CIDPROTOCOLHANDLER_CONTRACTID,
|
||||||
|
nsCidProtocolHandlerConstructor,
|
||||||
|
},
|
||||||
#ifdef XP_WIN
|
#ifdef XP_WIN
|
||||||
{ "Windows OS Integration", NS_MESSENGERWININTEGRATION_CID,
|
{ "Windows OS Integration", NS_MESSENGERWININTEGRATION_CID,
|
||||||
NS_MESSENGEROSINTEGRATION_CONTRACTID,
|
NS_MESSENGEROSINTEGRATION_CONTRACTID,
|
||||||
|
|
|
@ -104,6 +104,7 @@ CPPSRCS = \
|
||||||
nsMsgOfflineManager.cpp \
|
nsMsgOfflineManager.cpp \
|
||||||
nsMsgProgress.cpp \
|
nsMsgProgress.cpp \
|
||||||
nsSpamSettings.cpp \
|
nsSpamSettings.cpp \
|
||||||
|
nsCidProtocolHandler.cpp \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
ifeq ($(OS_ARCH),WINNT)
|
ifeq ($(OS_ARCH),WINNT)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче