From 03590a6711d601ef3ddb48787e9f3f556705b5db Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Tue, 5 Nov 2019 18:27:14 -0500
Subject: Issue #1258 - Part 8: Ifdef MailNews OAuth2 Support

Use --disable-mailnews-oauth2 to exclude it. Confvars won't be respected.
---
 mailnews/imap/src/nsImapProtocol.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'mailnews/imap/src/nsImapProtocol.h')

diff --git a/mailnews/imap/src/nsImapProtocol.h b/mailnews/imap/src/nsImapProtocol.h
index 0341d87bb..5c4f43abd 100644
--- a/mailnews/imap/src/nsImapProtocol.h
+++ b/mailnews/imap/src/nsImapProtocol.h
@@ -463,8 +463,11 @@ private:
 
   // login related methods.
   nsresult GetPassword(nsCString &password, bool aNewPasswordRequested);
-  void InitPrefAuthMethods(int32_t authMethodPrefValue,
-                           nsIMsgIncomingServer *aServer);
+#ifdef MOZ_MAILNEWS_OAUTH2
+  void InitPrefAuthMethods(int32_t authMethodPrefValue, nsIMsgIncomingServer *aServer);
+#else
+  void InitPrefAuthMethods(int32_t authMethodPrefValue);
+#endif
   nsresult ChooseAuthMethod();
   void MarkAuthMethodAsFailed(eIMAPCapabilityFlags failedAuthMethod);
   void ResetAuthMethods();
@@ -675,7 +678,9 @@ private:
 
   nsString m_emptyMimePartString;
 
+#ifdef MOZ_MAILNEWS_OAUTH2
   RefPtr<mozilla::mailnews::OAuth2ThreadHelper> mOAuth2Support;
+#endif
 };
 
 // This small class is a "mock" channel because it is a mockery of the imap channel's implementation...
-- 
cgit v1.2.3