From 2462f8b8d85c17f105150af922521c5f04de92ba Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org" <scott%scott-macgregor.org>
Date: Sat, 12 Jul 2003 20:38:22 +0000
Subject: [PATCH] Thunderbird now uses a dynamically generated 3-pane. No more
 alternate 3-pane xul file, so remove the C++ code that tries to launch the
 alternate 3-pane.

Land the new vertical 3-pane for thunderbird. Folder pane | Thread Pane | Message pane.
---
 mailnews/base/src/nsMessengerBootstrap.cpp | 6 ++++++
 mailnews/news/src/nsNntpService.cpp        | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/mailnews/base/src/nsMessengerBootstrap.cpp b/mailnews/base/src/nsMessengerBootstrap.cpp
index d5f2eb586654..b3b708957321 100644
--- a/mailnews/base/src/nsMessengerBootstrap.cpp
+++ b/mailnews/base/src/nsMessengerBootstrap.cpp
@@ -73,6 +73,7 @@ CMDLINEHANDLER3_IMPL(nsMessengerBootstrap,"-mail","general.startup.mail","Start
 
 NS_IMETHODIMP nsMessengerBootstrap::GetChromeUrlForTask(char **aChromeUrlForTask) 
 { 
+#ifndef MOZ_THUNDERBIRD
   if (!aChromeUrlForTask) return NS_ERROR_FAILURE; 
   nsresult rv;
   nsCOMPtr<nsIPref> prefService(do_GetService(kPrefServiceCID, &rv));
@@ -92,6 +93,11 @@ NS_IMETHODIMP nsMessengerBootstrap::GetChromeUrlForTask(char **aChromeUrlForTask
     }	
   }
   *aChromeUrlForTask = PL_strdup("chrome://messenger/content/messenger.xul"); 
+#else
+  NS_ENSURE_ARG_POINTER(aChromeUrlForTask);
+  *aChromeUrlForTask = PL_strdup("chrome://messenger/content/"); 
+#endif
+
   return NS_OK; 
 }
 
diff --git a/mailnews/news/src/nsNntpService.cpp b/mailnews/news/src/nsNntpService.cpp
index 34ea52fab4b8..1f45b98c18f7 100644
--- a/mailnews/news/src/nsNntpService.cpp
+++ b/mailnews/news/src/nsNntpService.cpp
@@ -1721,6 +1721,7 @@ CMDLINEHANDLER3_IMPL(nsNntpService,"-news","general.startup.news","Start with ne
 
 NS_IMETHODIMP nsNntpService::GetChromeUrlForTask(char **aChromeUrlForTask) 
 { 
+#ifndef MOZ_THUNDERBIRD
     if (!aChromeUrlForTask) return NS_ERROR_FAILURE; 
 	nsresult rv;
 	nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
@@ -1741,6 +1742,10 @@ NS_IMETHODIMP nsNntpService::GetChromeUrlForTask(char **aChromeUrlForTask)
 	}
 	*aChromeUrlForTask = PL_strdup("chrome://messenger/content/messenger.xul"); 
     return NS_OK; 
+#else
+  NS_ENSURE_ARG_POINTER(aChromeUrlForTask);
+  *aChromeUrlForTask = PL_strdup("chrome://messenger/content/"); 
+#endif
 }