Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backing out changes until I get them working correctly.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@36154 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
putterman%netscape.com
1999-06-21 23:34:27 +00:00
parent b1b65d9178
commit 0e6ed45527
2 changed files with 2 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mozilla/mailnews/base/src/nsMsgNotificationManager.cpp
View File

@@ -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<nsIRDFResource> 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<nsIRDFResource> 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<nsIRDFResource> 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;
}

1
mozilla/mailnews/base/src/nsMsgNotificationManager.h
View File

@@ -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<nsIRDFDataSource> mInMemoryDataSource;