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

Bug #44163 --> FEAlert and FEAlertFromServer need a message window

Browse Source 
r=bienvenu


git-svn-id: svn://10.0.0.236/trunk@75914 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mscott%netscape.com
2000-08-09 22:32:45 +00:00
parent c75a8a89fb
commit 5139d46ef4
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/mailnews/imap/public/nsIImapServerSink.idl
View File

@@ -42,8 +42,8 @@ interface nsIImapServerSink : nsISupports {
void LoadNextQueuedUrl(out boolean urlRun);
void GetImapStringByID(in long aMsgId, out wstring aString);
void FEAlert(in wstring aString);
void FEAlertFromServer(in string aString);
void FEAlert(in wstring aString, in nsIMsgWindow aMsgWindow);
void FEAlertFromServer(in string aString, in nsIMsgWindow aMsgWindow);
void CommitNamespaces();
void PromptForPassword(out string aString, in nsIMsgWindow aMsgWindow);
void SetUserAuthenticated(in boolean authenticated);

18
mozilla/mailnews/imap/src/nsImapProtocol.cpp
View File

@@ -3946,8 +3946,9 @@ nsImapProtocol::AlertUserEventUsingId(PRUint32 aMessageId)
{
PRUnichar *progressString = nsnull;
m_imapServerSink->GetImapStringByID(aMessageId, &progressString);
m_imapServerSink->FEAlert(progressString);
nsCOMPtr<nsIMsgWindow> msgWindow;
GetMsgWindow(getter_AddRefs(msgWindow));
m_imapServerSink->FEAlert(progressString, msgWindow);
PR_FREEIF(progressString);
}
}
@@ -3955,10 +3956,11 @@ nsImapProtocol::AlertUserEventUsingId(PRUint32 aMessageId)
void
nsImapProtocol::AlertUserEvent(const char * message)
{
if (m_imapServerSink)
if (m_imapServerSink)
{
nsAutoString uniString; uniString.AssignWithConversion(message);
m_imapServerSink->FEAlert(uniString.GetUnicode());
nsCOMPtr<nsIMsgWindow> msgWindow;
GetMsgWindow(getter_AddRefs(msgWindow));
m_imapServerSink->FEAlert(NS_LITERAL_STRING(message), msgWindow);
}
}
@@ -3966,7 +3968,11 @@ void
nsImapProtocol::AlertUserEventFromServer(const char * aServerEvent)
{
if (m_imapServerSink)
m_imapServerSink->FEAlertFromServer(aServerEvent);
{
nsCOMPtr<nsIMsgWindow> msgWindow;
GetMsgWindow(getter_AddRefs(msgWindow));
m_imapServerSink->FEAlertFromServer(aServerEvent, msgWindow);
}
}
void nsImapProtocol::ResetProgressInfo()