diff --git a/mailnews/imap/src/nsImapMailFolder.cpp b/mailnews/imap/src/nsImapMailFolder.cpp index 56349bc205d6..819404bee3ae 100644 --- a/mailnews/imap/src/nsImapMailFolder.cpp +++ b/mailnews/imap/src/nsImapMailFolder.cpp @@ -41,7 +41,6 @@ #include "nsMsgUtils.h" #include "nsIMsgMailSession.h" #include "nsImapMessage.h" -#include "nsIWebShell.h" #include "nsMsgBaseCID.h" #include "nsMsgLocalCID.h" #include "nsImapUndoTxn.h" diff --git a/mailnews/imap/src/nsImapProtocol.cpp b/mailnews/imap/src/nsImapProtocol.cpp index 4edfd4075512..306ee93e69d6 100644 --- a/mailnews/imap/src/nsImapProtocol.cpp +++ b/mailnews/imap/src/nsImapProtocol.cpp @@ -42,7 +42,6 @@ #include "nsImapServerResponseParser.h" #include "nspr.h" #include "plbase64.h" -#include "nsIWebShell.h" #include "nsIImapService.h" #include "nsISocketTransportService.h" #include "nsNetUtil.h" @@ -68,7 +67,6 @@ const char *kImapTrashFolderName = "Trash"; // **** needs to be localized **** static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID); -static NS_DEFINE_IID(kIWebShell, NS_IWEB_SHELL_IID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_CID(kCImapService, NS_IMAPSERVICE_CID); static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); diff --git a/mailnews/local/src/nsMailboxProtocol.cpp b/mailnews/local/src/nsMailboxProtocol.cpp index 02a4d3d23430..67cd47a78f2b 100644 --- a/mailnews/local/src/nsMailboxProtocol.cpp +++ b/mailnews/local/src/nsMailboxProtocol.cpp @@ -44,7 +44,6 @@ #include "nsFileStream.h" PRLogModuleInfo *MAILBOX; -static NS_DEFINE_IID(kIWebShell, NS_IWEB_SHELL_IID); static NS_DEFINE_CID(kCMailDB, NS_MAILDB_CID); diff --git a/mailnews/news/src/nsNNTPProtocol.cpp b/mailnews/news/src/nsNNTPProtocol.cpp index 276b59076283..d436ad0b3f3c 100644 --- a/mailnews/news/src/nsNNTPProtocol.cpp +++ b/mailnews/news/src/nsNNTPProtocol.cpp @@ -35,10 +35,6 @@ #include "nsIPipe.h" #include "nsCOMPtr.h" -// mscott: this is a short term hack for the demo...we should be able to remove this webshell -// dependency at a later date.... -#include "nsIWebShell.h" - #include "nsMsgBaseCID.h" #include "nsMsgNewsCID.h" @@ -136,7 +132,6 @@ char * NET_SACat (char **destination, const char *source); } -static NS_DEFINE_IID(kIWebShell, NS_IWEB_SHELL_IID); static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); static NS_DEFINE_CID(kCHeaderParserCID, NS_MSGHEADERPARSER_CID); static NS_DEFINE_CID(kNNTPArticleListCID, NS_NNTPARTICLELIST_CID);