more work on pop3 global inbox, 30057, hide deferred accounts from folderpane sr=mscott

mailnews/base/resources/content/folderPane.xul

@@ -60,6 +60,7 @@
         <conditions>
           <content uri="?container"/>
           <member container="?container" child="?member" />
+          <triple subject="?member" predicate="http://home.netscape.com/NC-rdf#IsDeferred" object="false"/>
         </conditions>
 
         <bindings>

mailnews/base/src/nsMsgAccountManagerDS.cpp

@@ -177,6 +177,7 @@ nsMsgAccountManagerDataSource::nsMsgAccountManagerDataSource()
                                  &kNC_CanGetMessages);
     getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_CANGETINCOMINGMESSAGES),
                                  &kNC_CanGetIncomingMessages);
+
     getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_ACCOUNT), &kNC_Account);
     getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_SERVER), &kNC_Server);
     getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_IDENTITY), &kNC_Identity);
@@ -288,14 +289,16 @@ nsMsgAccountManagerDataSource::Init()
   nsCOMPtr<nsIMsgAccountManager> am;
 
   // get a weak ref to the account manager
-  if (!mAccountManager) {
+  if (!mAccountManager) 
+  {
     am = do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv);
     mAccountManager = do_GetWeakReference(am);
   }
   else
     am = do_QueryReferent(mAccountManager);
 
-  if (am) {
+  if (am) 
+  {
     am->AddIncomingServerListener(this);
     am->AddRootFolderListener(this);
   }
@@ -308,7 +311,8 @@ void nsMsgAccountManagerDataSource::Cleanup()
 {
   nsCOMPtr<nsIMsgAccountManager> am = do_QueryReferent(mAccountManager);
 
-  if (am) {
+  if (am)
+  {
     am->RemoveIncomingServerListener(this);
     am->RemoveRootFolderListener(this);
   }
@@ -330,8 +334,8 @@ nsMsgAccountManagerDataSource::GetTarget(nsIRDFResource *source,
 
   nsAutoString str;
   if (property == kNC_Name || property == kNC_FolderTreeName ||
-      property == kNC_FolderTreeSimpleName) {
-
+      property == kNC_FolderTreeSimpleName) 
+  {
     rv = getStringBundle();
     NS_ENSURE_SUCCESS(rv, rv);
 
@@ -1202,12 +1206,12 @@ nsMsgAccountManagerDataSource::getServerForFolderNode(nsIRDFNode *aResource,
 {
   nsresult rv;
   nsCOMPtr<nsIMsgFolder> folder = do_QueryInterface(aResource, &rv);
-  if (NS_SUCCEEDED(rv)) {
+  if (NS_SUCCEEDED(rv)) 
+  {
     PRBool isServer;
     rv = folder->GetIsServer(&isServer);
-    if (NS_SUCCEEDED(rv) && isServer) {
+    if (NS_SUCCEEDED(rv) && isServer) 
       return folder->GetServer(aResult);
-    }
   }
   return NS_ERROR_FAILURE;
 }
@@ -1224,7 +1228,8 @@ nsMsgAccountManagerDataSource::findServerByKey(nsISupports *aElement,
 
   nsXPIDLCString key;
   server->GetKey(getter_Copies(key));
-  if (nsCRT::strcmp(key, entry->serverKey)==0) {
+  if (nsCRT::strcmp(key, entry->serverKey)==0) 
+  {
     entry->found = PR_TRUE;
     return PR_FALSE;        // stop when found
   }
@@ -1243,18 +1248,15 @@ nsMsgAccountManagerDataSource::getStringBundle()
       do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
   if (NS_FAILED(rv)) return rv;
 
-  rv = strBundleService->CreateBundle("chrome://messenger/locale/prefs.properties",
+  return strBundleService->CreateBundle("chrome://messenger/locale/prefs.properties",
                                       getter_AddRefs(mStringBundle));
-  return rv;
 }
 
 NS_IMETHODIMP
 nsMsgAccountManagerDataSource::OnServerLoaded(nsIMsgIncomingServer* aServer)
 {
-  nsresult rv;
-
   nsCOMPtr<nsIMsgFolder> serverFolder;
-  rv = aServer->GetRootFolder(getter_AddRefs(serverFolder));
+  nsresult rv = aServer->GetRootFolder(getter_AddRefs(serverFolder));
   if (NS_FAILED(rv)) return rv;
 
   nsCOMPtr<nsIRDFResource> serverResource = do_QueryInterface(serverFolder,&rv);
@@ -1283,10 +1285,8 @@ nsMsgAccountManagerDataSource::OnServerLoaded(nsIMsgIncomingServer* aServer)
 NS_IMETHODIMP
 nsMsgAccountManagerDataSource::OnServerUnloaded(nsIMsgIncomingServer* aServer)
 {
-  nsresult rv;
-
   nsCOMPtr<nsIMsgFolder> serverFolder;
-  rv = aServer->GetRootFolder(getter_AddRefs(serverFolder));
+  nsresult rv = aServer->GetRootFolder(getter_AddRefs(serverFolder));
   if (NS_FAILED(rv)) return rv;
 
   nsCOMPtr<nsIRDFResource> serverResource = do_QueryInterface(serverFolder,&rv);
@@ -1404,7 +1404,8 @@ nsMsgAccountManagerDataSource::IsIncomingServerForFakeAccount(nsIMsgIncomingServ
   rv = GetFakeAccountHostName(getter_Copies(fakeAccountHostName));
   NS_ENSURE_SUCCESS(rv,rv);
 
-  if (fakeAccountHostName.IsEmpty()) {
+  if (fakeAccountHostName.IsEmpty()) 
+  {
     *aResult = PR_FALSE;
     return NS_OK;
   }

mailnews/base/src/nsMsgFolderDataSource.h

@@ -131,6 +131,8 @@ protected:
   nsresult createFolderSpecialNode(nsIMsgFolder *folder, nsIRDFNode **target);
   nsresult createFolderServerTypeNode(nsIMsgFolder *folder,
                                       nsIRDFNode **target);
+  nsresult createServerIsDeferredNode(nsIMsgFolder* folder,
+                                      nsIRDFNode **target);
   nsresult createFolderRedirectorTypeNode(nsIMsgFolder *folder,
                                       nsIRDFNode **target);
   nsresult createFolderCanCreateFoldersOnServerNode(nsIMsgFolder *folder,
@@ -221,6 +223,7 @@ protected:
   static nsIRDFResource* kNC_MSGFolderRoot;
   static nsIRDFResource* kNC_SpecialFolder;
   static nsIRDFResource* kNC_ServerType;
+  static nsIRDFResource* kNC_IsDeferred;
   static nsIRDFResource* kNC_RedirectorType;
   static nsIRDFResource* kNC_CanCreateFoldersOnServer;
   static nsIRDFResource* kNC_CanFileMessagesOnServer;
@@ -245,6 +248,7 @@ protected:
   static nsIRDFResource* kNC_Synchronize;
   static nsIRDFResource* kNC_SyncDisabled;
   static nsIRDFResource* kNC_CanSearchMessages;
+  
 
   // commands
   static nsIRDFResource* kNC_Delete;

mailnews/base/src/nsMsgRDFUtils.h

@@ -87,6 +87,7 @@ typedef struct _nsMsgRDFNotification {
 #define NC_RDF_SYNCDISABLED         NC_NAMESPACE_URI "SyncDisabled"
 #define NC_RDF_KEY                      NC_NAMESPACE_URI "Key"
 #define NC_RDF_CANSEARCHMESSAGES			NC_NAMESPACE_URI "CanSearchMessages"
+#define NC_RDF_ISDEFERRED NC_NAMESPACE_URI "IsDeferred"
 
 //Sort Properties
 #define NC_RDF_SUBJECT_COLLATION_SORT	NC_NAMESPACE_URI "Subject?collation=true"