From 94af0d03e7cff7618257cd25e1b4afc95a869434 Mon Sep 17 00:00:00 2001 From: "alecf%netscape.com" Date: Tue, 2 Feb 1999 04:13:24 +0000 Subject: [PATCH] rename old MOZ_MAIL_NEWS macro to OLD_MOZ_MAIL_NEWS so that we can turn on MOZ_MAIL_NEWS flag to build the whole client --- network/cache/mkmemcac.c | 10 +++++----- network/main/mkgeturl.c | 28 ++++++++++++++-------------- network/main/mkutils.c | 8 ++++---- network/module/nsNetFile.cpp | 4 ++-- network/protocol/Makefile.in | 2 +- network/protocol/file/mkfile.c | 12 ++++++------ network/protocol/ftp/mkftp.c | 4 ++-- 7 files changed, 34 insertions(+), 34 deletions(-) diff --git a/network/cache/mkmemcac.c b/network/cache/mkmemcac.c index e5848c066382..e4b543a854b9 100644 --- a/network/cache/mkmemcac.c +++ b/network/cache/mkmemcac.c @@ -1292,14 +1292,14 @@ typedef struct _MemCacheConData { /* begin the load, This is called from NET_GetURL */ -#ifdef MOZ_MAIL_NEWS +#ifdef OLD_MOZ_MAIL_NEWS extern int net_InitializeNewsFeData (ActiveEntry * cur_entry); extern int IMAP_InitializeImapFeData (ActiveEntry * cur_entry); extern void IMAP_URLFinished(URL_Struct *URL_s); -#endif /* MOZ_MAIL_NEWS */ +#endif /* OLD_MOZ_MAIL_NEWS */ PRIVATE int32 net_MemoryCacheLoad (ActiveEntry * cur_entry) @@ -1365,7 +1365,7 @@ net_MemoryCacheLoad (ActiveEntry * cur_entry) FE_EnableClicking(CE_WINDOW_ID); -#ifdef MOZ_MAIL_NEWS +#ifdef OLD_MOZ_MAIL_NEWS if (cur_entry->format_out == FO_PRESENT) { if (NET_URL_Type(cur_entry->URL_s->address) == NEWS_TYPE_URL) @@ -1389,7 +1389,7 @@ net_MemoryCacheLoad (ActiveEntry * cur_entry) } } } -#endif /* MOZ_MAIL_NEWS */ +#endif /* OLD_MOZ_MAIL_NEWS */ /* open the outgoing stream */ @@ -1593,7 +1593,7 @@ net_ProcessMemoryCache (ActiveEntry * cur_entry) CE_URL_S->content_length, CE_BYTES_RECEIVED); -#ifdef MOZ_MAIL_NEWS +#ifdef OLD_MOZ_MAIL_NEWS if (!PL_strncmp(CE_URL_S->address, "Mailbox://", 10)) /* #### DISGUSTING KLUDGE to make cacheing work for imap articles. */ IMAP_URLFinished(CE_URL_S); diff --git a/network/main/mkgeturl.c b/network/main/mkgeturl.c index 26da1e0b278c..68c35c278bcf 100644 --- a/network/main/mkgeturl.c +++ b/network/main/mkgeturl.c @@ -65,7 +65,7 @@ #endif /* 0 */ #ifdef XP_MAC -#ifdef MOZ_MAIL_NEWS +#ifdef OLD_MOZ_MAIL_NEWS #ifdef MOZ_SECURITY #include "mkcertld.h" #endif /* MOZ_SECURITY */ @@ -75,7 +75,7 @@ #include "mkpop3.h" #include "mkimap4.h" #include "mkldap.h" -#endif /* MOZ_MAIL_NEWS */ +#endif /* OLD_MOZ_MAIL_NEWS */ #endif /* XP_MAC */ #include "glhist.h" @@ -88,7 +88,7 @@ #include "mkldap.h" #endif -#ifdef MOZ_MAIL_NEWS +#ifdef OLD_MOZ_MAIL_NEWS #include "mkimap4.h" #endif @@ -686,7 +686,7 @@ NET_SetupPrefs(const char * prefChanged) } HG42422 -#ifdef MOZ_MAIL_NEWS +#ifdef OLD_MOZ_MAIL_NEWS if (bSetupAll || !PL_strcmp(prefChanged,pref_mailAllowSignInUName)) { XP_Bool prefBool; if ( (PREF_OK != PREF_GetBoolPref(pref_mailAllowSignInUName,&prefBool)) ) { @@ -694,7 +694,7 @@ NET_SetupPrefs(const char * prefChanged) } NET_SetAllowAtSignInMailUserName (prefBool); } -#endif /* MOZ_MAIL_NEWS */ +#endif /* OLD_MOZ_MAIL_NEWS */ if (bSetupAll || !PL_strcmp(prefChanged,pref_proxyACUrl)) { if ( (PREF_OK == PREF_CopyCharPref(pref_proxyACUrl,&proxy)) @@ -841,10 +841,10 @@ NET_InitNetLib(int socket_buffer_size, int max_number_of_connections) #endif NET_InitTotallyRandomStuffPeopleAddedProtocols(); -#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE) - NET_InitMailtoProtocol(); /* has a stub for MOZ_MAIL_NEWS */ -#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */ -#ifdef MOZ_MAIL_NEWS +#if defined(OLD_MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE) + NET_InitMailtoProtocol(); /* has a stub for OLD_MOZ_MAIL_NEWS */ +#endif /* OLD_MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */ +#ifdef OLD_MOZ_MAIL_NEWS NET_InitNewsProtocol(); NET_InitMailboxProtocol(); NET_InitMsgSearchProtocol(); @@ -855,7 +855,7 @@ NET_InitNetLib(int socket_buffer_size, int max_number_of_connections) #endif /* MOZ_SECURITY */ NET_InitAddressBookProtocol(); NET_InitIMAP4Protocol(); -#endif /* MOZ_MAIL_NEWS */ +#endif /* OLD_MOZ_MAIL_NEWS */ return(status); } @@ -912,9 +912,9 @@ NET_ChangeMaxNumberOfConnectionsPerContext(int max_number_of_connections) */ /* @@@@ NET_CleanupFTP(); */ #ifdef MOZILLA_CLIENT -#ifdef MOZ_MAIL_NEWS +#ifdef OLD_MOZ_MAIL_NEWS /* @@@@ NET_CleanupNews(); */ -#endif /* MOZ_MAIL_NEWS */ +#endif /* OLD_MOZ_MAIL_NEWS */ #endif /* MOZILLA_CLIENT */ } @@ -4942,7 +4942,7 @@ NET_DestroyEvidence() NET_SetMemoryCacheSize(oldSize); /* set it back up */ } -#if !defined(MOZ_MAIL_NEWS) && !defined(MOZ_MAIL_COMPOSE) +#if !defined(OLD_MOZ_MAIL_NEWS) && !defined(MOZ_MAIL_COMPOSE) /* this whole mess should get moved to the mksmtp.c file * where it can share the InitMailtoProtocol function @@ -5212,7 +5212,7 @@ NET_InitMailtoProtocol(void) NET_RegisterProtocolImplementation(&mailto_proto_impl, MAILTO_TYPE_URL); } -#endif /* MOZ_MAIL_NEWS */ +#endif /* OLD_MOZ_MAIL_NEWS */ #ifdef TRUST_LABELS /* given a URL search the list of URL_s structures for one that has diff --git a/network/main/mkutils.c b/network/main/mkutils.c index c78ca30da0fd..a0f2e791c48f 100644 --- a/network/main/mkutils.c +++ b/network/main/mkutils.c @@ -2396,7 +2396,7 @@ NET_AddLOSubmitDataToURLStruct(LO_FormSubmitData * sub_data, /* If we're posting to mailto, then generate the full complement of mail headers; and allow the url to specify additional headers as well. */ -#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE) +#if defined(OLD_MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE) if (!PL_strncasecmp(url_struct->address, "mailto:", 7)) { #ifdef MOZILLA_CLIENT @@ -2423,7 +2423,7 @@ NET_AddLOSubmitDataToURLStruct(LO_FormSubmitData * sub_data, PR_ASSERT(0); #endif /* MOZILLA_CLIENT */ } -#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */ +#endif /* OLD_MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */ if(encoding && !PL_strcasecmp(encoding, "text/plain")) { @@ -3430,7 +3430,7 @@ NET_InitWAISProtocol(void) NET_RegisterProtocolImplementation(&wais_proto_impl, WAIS_TYPE_URL); } -#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE) +#if defined(OLD_MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE) PUBLIC char * NET_Base64Encode (char *src, int32 srclen) @@ -3497,7 +3497,7 @@ NET_Base64Decode (char *src, return bs.buffer; } -#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */ +#endif /* OLD_MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */ /* A utility function to fetch a file from cache right away, * and update it (from the original server) after its used. diff --git a/network/module/nsNetFile.cpp b/network/module/nsNetFile.cpp index 21144cad3676..4afb2b4c0784 100644 --- a/network/module/nsNetFile.cpp +++ b/network/module/nsNetFile.cpp @@ -376,7 +376,7 @@ xp_TempFileName(int type, const char * request_prefix, const char * extension, ext = ".MOZ"; prefix = CACHE_PREFIX; break; -#ifdef MOZ_MAIL_NEWS +#ifdef OLD_MOZ_MAIL_NEWS case xpSNewsRC: case xpNewsRC: case xpNewsgroups: @@ -400,7 +400,7 @@ xp_TempFileName(int type, const char * request_prefix, const char * extension, prefix = "abook"; ext = ".nab"; break; -#endif // MOZ_MAIL_NEWS +#endif // OLD_MOZ_MAIL_NEWS case xpCacheFAT: directory = theApp.m_pCacheDir; prefix = "fat"; diff --git a/network/protocol/Makefile.in b/network/protocol/Makefile.in index 1206b66b016f..ed09b441f37a 100644 --- a/network/protocol/Makefile.in +++ b/network/protocol/Makefile.in @@ -58,7 +58,7 @@ ifdef MOZ_MAIL_NEWS DIRS += \ mailbox \ smtp \ - nntp \ +# nntp \ pop3 \ imap4 \ certld \ diff --git a/network/protocol/file/mkfile.c b/network/protocol/file/mkfile.c index 8a0f7694d09f..66bc37c89fde 100644 --- a/network/protocol/file/mkfile.c +++ b/network/protocol/file/mkfile.c @@ -548,10 +548,10 @@ net_open_file (ActiveEntry * cur_entry) #ifdef MOZILLA_CLIENT -#ifdef MOZ_MAIL_NEWS +#ifdef OLD_MOZ_MAIL_NEWS extern int net_InitializeNewsFeData (ActiveEntry * cur_entry); extern int IMAP_InitializeImapFeData (ActiveEntry * cur_entry); -#endif /* MOZ_MAIL_NEWS */ +#endif /* OLD_MOZ_MAIL_NEWS */ #endif /* MOZILLA_CLIENT */ PRIVATE int @@ -749,7 +749,7 @@ net_setup_file_stream (ActiveEntry * cur_entry) if (NET_URL_Type(cur_entry->URL_s->address) == NEWS_TYPE_URL) { #ifdef MOZILLA_CLIENT -#ifdef MOZ_MAIL_NEWS +#ifdef OLD_MOZ_MAIL_NEWS /* #### DISGUSTING KLUDGE to make cacheing work for news articles. */ CE_STATUS = net_InitializeNewsFeData (cur_entry); if (CE_STATUS < 0) @@ -757,7 +757,7 @@ net_setup_file_stream (ActiveEntry * cur_entry) /* #### what error message? */ return CE_STATUS; } -#endif /* MOZ_MAIL_NEWS */ +#endif /* OLD_MOZ_MAIL_NEWS */ #else PR_ASSERT(0); #endif /* MOZILLA_CLIENT */ @@ -765,7 +765,7 @@ net_setup_file_stream (ActiveEntry * cur_entry) else if (!PL_strncmp(cur_entry->URL_s->address, "IMAP://", 7)) { #ifdef MOZILLA_CLIENT -#ifdef MOZ_MAIL_NEWS +#ifdef OLD_MOZ_MAIL_NEWS /* #### DISGUSTING KLUDGE to make cacheing work for imap articles. */ CE_STATUS = IMAP_InitializeImapFeData (cur_entry); if (CE_STATUS < 0) @@ -773,7 +773,7 @@ net_setup_file_stream (ActiveEntry * cur_entry) /* #### what error message? */ return CE_STATUS; } -#endif /* MOZ_MAIL_NEWS */ +#endif /* OLD_MOZ_MAIL_NEWS */ #else PR_ASSERT(0); #endif /* MOZILLA_CLIENT */ diff --git a/network/protocol/ftp/mkftp.c b/network/protocol/ftp/mkftp.c index d80096a11c3f..2267b373bca3 100644 --- a/network/protocol/ftp/mkftp.c +++ b/network/protocol/ftp/mkftp.c @@ -3869,12 +3869,12 @@ net_FTPLoad (ActiveEntry * ce) PR_FREEIF(password); password = NULL; -#ifdef MOZ_MAIL_NEWS +#ifdef OLD_MOZ_MAIL_NEWS #ifdef MOZILLA_CLIENT if(net_get_send_email_address_as_password()) user = FE_UsersMailAddress(); #endif -#endif /* MOZ_MAIL_NEWS */ +#endif /* OLD_MOZ_MAIL_NEWS */ if(user && *user) {