From 0e6ed455271a065307160a767647ce45d3593c35 Mon Sep 17 00:00:00 2001 From: "putterman%netscape.com" Date: Mon, 21 Jun 1999 23:34:27 +0000 Subject: [PATCH] backing out changes until I get them working correctly. git-svn-id: svn://10.0.0.236/trunk@36154 18797224-902f-48f8-a5cc-f745e15eee43 --- .../base/src/nsMsgNotificationManager.cpp | 30 ++----------------- .../base/src/nsMsgNotificationManager.h | 1 - 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/mozilla/mailnews/base/src/nsMsgNotificationManager.cpp b/mozilla/mailnews/base/src/nsMsgNotificationManager.cpp index a4e207fab50..d25d01c8c10 100644 --- a/mozilla/mailnews/base/src/nsMsgNotificationManager.cpp +++ b/mozilla/mailnews/base/src/nsMsgNotificationManager.cpp @@ -23,7 +23,6 @@ #include "nsIMsgMailSession.h" #include "nsMsgBaseCID.h" #include "MailNewsTypes.h" -#include "nsIAllocator.h" static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID); @@ -234,14 +233,9 @@ nsresult nsMsgNotificationManager::AddNewMailNotification(nsIMsgFolder *folder) //If there's currently a notification for this folder, remove it. RemoveNewMailNotification(folder); - nsAutoString2 newMailURI("", eOneByte); - rv = BuildNewMailURI(folder, newMailURI); - if(NS_FAILED(rv)) - return rv; - nsCOMPtr notificationResource; - rv = rdfService->GetResource(newMailURI.GetBuffer(), getter_AddRefs(notificationResource)); + rv = rdfService->GetResource("newmail:test", getter_AddRefs(notificationResource)); if(NS_FAILED(rv)) return rv; @@ -309,13 +303,8 @@ nsresult nsMsgNotificationManager::RemoveNewMailNotification(nsIMsgFolder *folde if(NS_FAILED(rv)) return rv; - nsAutoString2 newMailURI("", eOneByte); - rv = BuildNewMailURI(folder, newMailURI); - if(NS_FAILED(rv)) - return rv; - nsCOMPtr notificationResource; - rv = rdfService->GetResource(newMailURI.GetBuffer(), getter_AddRefs(notificationResource)); + rv = rdfService->GetResource("newmail:test", getter_AddRefs(notificationResource)); if(NS_FAILED(rv)) return rv; RemoveOldValues(notificationResource); @@ -354,19 +343,4 @@ nsresult nsMsgNotificationManager::RemoveOldValues(nsIRDFResource *notificationR } -nsresult nsMsgNotificationManager::BuildNewMailURI(nsIMsgFolder *folder, nsAutoString2 &newMailURI) -{ - nsresult rv; - nsCOMPtr folderResource = do_QueryInterface(folder); - if(!folderResource) - return NS_ERROR_NO_INTERFACE; - char *folderURI; - rv = folderResource->GetValue(&folderURI); - if(!(NS_SUCCEEDED(rv) && folderURI)) - return rv; - - newMailURI += folderURI; - nsAllocator::Free(folderURI); - return NS_OK; -} diff --git a/mozilla/mailnews/base/src/nsMsgNotificationManager.h b/mozilla/mailnews/base/src/nsMsgNotificationManager.h index f8bd941afe5..dee91877819 100644 --- a/mozilla/mailnews/base/src/nsMsgNotificationManager.h +++ b/mozilla/mailnews/base/src/nsMsgNotificationManager.h @@ -46,7 +46,6 @@ protected: nsresult AddNewMailNotification(nsIMsgFolder *folder); nsresult RemoveNewMailNotification(nsIMsgFolder *folder); nsresult RemoveOldValues(nsIRDFResource *notificationResource); - nsresult BuildNewMailURI(nsIMsgFolder *folder, nsAutoString2 &newMailURI); protected: nsCOMPtr mInMemoryDataSource;