#ifdef NET_mail/news functionality with MOZ_MAIL_NEWS.

cmd/macfe/central/uapp.cp

@@ -984,9 +984,8 @@ CFrontApp::~CFrontApp()
 	// XP_Saves
 	GH_SaveGlobalHistory();
 	GH_FreeGlobalHistory();
-	NET_SaveNewsrcFileMappings();
-	
 #ifdef MOZ_MAIL_NEWS
+	NET_SaveNewsrcFileMappings();
 	CAddressBookManager::CloseAddressBookManager();
 	CCheckMailContext::Release(this);
 #endif // MOZ_MAIL_NEWS
@@ -1498,7 +1497,9 @@ void CFrontApp::ProperStartup( FSSpec* file, short fileType )
 	XP_AppVersion = (char*)XP_ALLOC( tmp.Length() + strlen( securityText )  + 1);
 	sprintf( XP_AppVersion, tmp, securityText );
 	
+#ifdef MOZ_MAIL_NEWS
 	NET_ReadNewsrcFileMappings();
+#endif
 
 	SplashProgress(  GetPString(MAC_PROGRESS_BOOKMARK));
 	InitBookmarks();

cmd/macfe/central/uprefd.cp

@@ -2437,7 +2437,9 @@ void CPrefs::PostInitializePref(PrefEnum id, Boolean changed)
 			break;
 		case PrintFlags:
 		case NewsArticlesMax:
+#ifdef MOZ_MAIL_NEWS
 			NET_SetNumberOfNewsArticlesInListing(GetLong(id));
+#endif
 			break;
 		case CheckDocuments:
 			NET_SetCacheUseMethod( (CacheUseEnum)GetLong(id) );
@@ -2461,7 +2463,9 @@ void CPrefs::PostInitializePref(PrefEnum id, Boolean changed)
 		case HomePage:
 			break;
 		case NewsHost:
+#ifdef MOZ_MAIL_NEWS
 			NET_SetNewsHost( GetCharPtr(id) );
+#endif
 			break;
 		case UserName:
 			break;
@@ -2482,11 +2486,13 @@ void CPrefs::PostInitializePref(PrefEnum id, Boolean changed)
 			// Should we reset mail window here too?
 			break;
 		case PopHost:
-//			MSG_SetPopHost( GetCharPtr(id) );
+#ifdef MOZ_MAIL_NEWS
+			MSG_SetPopHost( GetCharPtr(id) );
 			if ( GetBoolean( RememberMailPassword ) )
 				NET_SetPopPassword( GetCharPtr( MailPassword) );
 			else
 				NET_SetPopPassword(NULL);
+#endif
 			break;
 			
 		case DefaultMailCC:
@@ -2496,7 +2502,9 @@ void CPrefs::PostInitializePref(PrefEnum id, Boolean changed)
 		case ReplyTo:
 			break;
 		case PopID:
+#ifdef MOZ_MAIL_NEWS
 			NET_SetPopUsername(GetCharPtr(PopID));
+#endif
 			break;
 
 		case AcceptCookies:
@@ -2592,15 +2600,19 @@ void CPrefs::PostInitializePref(PrefEnum id, Boolean changed)
 		case AutoQuoteOnReply:
 			break;	
 		case MailPassword:
+#ifdef MOZ_MAIL_NEWS
 			NET_SetPopPassword( GetCharPtr( MailPassword) );
+#endif
 			break;
 		case RememberMailPassword:
+#ifdef MOZ_MAIL_NEWS
 		// This depends on the loading order
 		// Should be solved by the accumulator
 			if ( GetBoolean( RememberMailPassword ) )
 				NET_SetPopPassword( GetCharPtr( MailPassword) );
 			else
 				NET_SetPopPassword(NULL);
+#endif
 			break;
 		default:
 //			Assert_(FALSE);

cmd/macfe/utility/xp_file_mac.cp

@@ -355,12 +355,13 @@ OSErr XP_FileSpec(const char *inName, XP_FileType type, FSSpec* outSpec)
 /* NEWS */
 		case xpNewsRC:
 		case xpSNewsRC:
+#ifdef MOZ_MAIL_NEWS
 			_ftype = emNewsrcFile;
 			*outSpec = CPrefs::GetFilePrototype( CPrefs::NewsFolder );
 			if ( (inName == NULL) || (*inName == 0))
 			{
 				GetIndString( tempName, 300, newsrc );
-				/* NET_RegisterNewsrcFile( tempName, inName, type == xpSNewsRC, FALSE ); */
+				NET_RegisterNewsrcFile( tempName, inName, type == xpSNewsRC, FALSE );
 			}
 			else
 			{
@@ -470,7 +471,7 @@ OSErr XP_FileSpec(const char *inName, XP_FileType type, FSSpec* outSpec)
 			*outSpec = CPrefs::GetFilePrototype(CPrefs::NewsFolder);
 			GetIndString(outSpec->name, 300, newsHostDatabase);
 			break;
-
+#endif /* #ifdef MOZ_MAIL_NEWS */
 /* MAIL */
 		case xpJSMailFilters:
 			_ftype = emTextType;
@@ -1194,10 +1195,12 @@ int XP_FileRemove( const char* name, XP_FileType type )
 	if ( err == noErr )
 	{
 		err = ::FSpDelete( &spec );
+#ifdef MOZ_MAIL_NEWS
 		if ( type == xpNewsRC || type == xpNewsgroups )
 	        NET_UnregisterNewsHost( name, FALSE );
 		else if ( type == xpSNewsRC || type == xpSNewsgroups)
 	        NET_UnregisterNewsHost( name, TRUE );
+#endif
 	}
 	
 	if ( err == noErr )