Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-23 02:47:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug #286282 --> Thunderbird should be building toolkit\components\alerts instead of xpfe\components\alerts.

Browse Source 
Will work on converting the download manager next so we an remove the alerts service ifdef in xpfe\download-manager.

Also, port xpfe's API change to nsIAlertsService to use AString's to toolkit
This commit is contained in:
scott%scott-macgregor.org 2005-03-15 22:44:59 +00:00
parent 6e3bd24ced
commit fd991b113f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xpfe/components/download-manager/src/nsDownloadManager.cpp
View File

@ -63,7 +63,9 @@
#include "nsISound.h" #include "nsISound.h"
#include "nsIPrefService.h" #include "nsIPrefService.h"
#include "nsIFileURL.h" #include "nsIFileURL.h"
#ifndef MOZ_THUNDERBIRD
#include "nsIAlertsService.h" #include "nsIAlertsService.h"
#endif
#include "nsEmbedCID.h" #include "nsEmbedCID.h"
/* Outstanding issues/todo: /* Outstanding issues/todo:
@ -1158,6 +1160,7 @@ nsDownload::OnStatusChange(nsIWebProgress *aWebProgress,
void nsDownload::DisplayDownloadFinishedAlert() void nsDownload::DisplayDownloadFinishedAlert()
{ {
nsresult rv; nsresult rv;
#ifndef MOZ_THUNDERBIRD
nsCOMPtr<nsIAlertsService> alertsService(do_GetService(NS_ALERTSERVICE_CONTRACTID, &rv)); nsCOMPtr<nsIAlertsService> alertsService(do_GetService(NS_ALERTSERVICE_CONTRACTID, &rv));
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return; return;
@ -1188,6 +1191,7 @@ void nsDownload::DisplayDownloadFinishedAlert()
alertsService->ShowAlertNotification(NS_LITERAL_STRING("moz-icon://") + NS_ConvertUTF8toUTF16(url), alertsService->ShowAlertNotification(NS_LITERAL_STRING("moz-icon://") + NS_ConvertUTF8toUTF16(url),
finishedTitle, finishedText, PR_TRUE, finishedTitle, finishedText, PR_TRUE,
NS_LITERAL_STRING("download"), this); NS_LITERAL_STRING("download"), this);
#endif
} }
NS_IMETHODIMP NS_IMETHODIMP

1
xpfe/components/download-manager/src/nsDownloadManager.h
View File

@ -59,7 +59,6 @@
#include "nsIStringBundle.h" #include "nsIStringBundle.h"
#include "nsIProgressDialog.h" #include "nsIProgressDialog.h"
#include "nsIMIMEInfo.h" #include "nsIMIMEInfo.h"
#include "nsIAlertsService.h"
enum DownloadState { NOTSTARTED = -1, DOWNLOADING, FINISHED, FAILED, CANCELED }; enum DownloadState { NOTSTARTED = -1, DOWNLOADING, FINISHED, FAILED, CANCELED };