зеркало из https://github.com/mozilla/pjs.git
whitespace cleanup only, no bug
This commit is contained in:
Родитель
93d892c63a
Коммит
d930cb4fb8
|
@ -2055,7 +2055,7 @@ nsImapIncomingServer::FEAlert(const PRUnichar* aString, nsIMsgWindow * aMsgWindo
|
||||||
|
|
||||||
NS_IMETHODIMP nsImapIncomingServer::FEAlertFromServer(const char *aString, nsIMsgWindow * aMsgWindow)
|
NS_IMETHODIMP nsImapIncomingServer::FEAlertFromServer(const char *aString, nsIMsgWindow * aMsgWindow)
|
||||||
{
|
{
|
||||||
nsresult rv = NS_OK;
|
nsresult rv = NS_OK;
|
||||||
|
|
||||||
nsCOMPtr<nsIPrompt> dialog;
|
nsCOMPtr<nsIPrompt> dialog;
|
||||||
if (aMsgWindow)
|
if (aMsgWindow)
|
||||||
|
@ -2063,34 +2063,34 @@ NS_IMETHODIMP nsImapIncomingServer::FEAlertFromServer(const char *aString, nsIM
|
||||||
|
|
||||||
if (dialog)
|
if (dialog)
|
||||||
{
|
{
|
||||||
if (aString)
|
if (aString)
|
||||||
{
|
{
|
||||||
// skip over the first two words, I guess.
|
// skip over the first two words, I guess.
|
||||||
char *whereRealMessage = PL_strchr(aString, ' ');
|
char *whereRealMessage = PL_strchr(aString, ' ');
|
||||||
if (whereRealMessage)
|
if (whereRealMessage)
|
||||||
whereRealMessage++;
|
whereRealMessage++;
|
||||||
if (whereRealMessage)
|
if (whereRealMessage)
|
||||||
whereRealMessage = PL_strchr(whereRealMessage, ' ');
|
whereRealMessage = PL_strchr(whereRealMessage, ' ');
|
||||||
if (whereRealMessage)
|
if (whereRealMessage)
|
||||||
{
|
{
|
||||||
PRInt32 len = PL_strlen(whereRealMessage)-1;
|
PRInt32 len = PL_strlen(whereRealMessage)-1;
|
||||||
if (len > 0 && whereRealMessage[len] != '.')
|
if (len > 0 && whereRealMessage[len] != '.')
|
||||||
whereRealMessage[len] = '.';
|
whereRealMessage[len] = '.';
|
||||||
}
|
}
|
||||||
|
|
||||||
PRUnichar *serverSaidPrefix = nsnull;
|
PRUnichar *serverSaidPrefix = nsnull;
|
||||||
GetImapStringByID(IMAP_SERVER_SAID, &serverSaidPrefix);
|
GetImapStringByID(IMAP_SERVER_SAID, &serverSaidPrefix);
|
||||||
if (serverSaidPrefix)
|
if (serverSaidPrefix)
|
||||||
{
|
{
|
||||||
nsAutoString message(serverSaidPrefix);
|
nsAutoString message(serverSaidPrefix);
|
||||||
// the alert string from the server IS UTF-8!!! We must convert it to unicode
|
// the alert string from the server IS UTF-8!!! We must convert it to unicode
|
||||||
// correctly before appending it to our error message string...
|
// correctly before appending it to our error message string...
|
||||||
AppendUTF8toUTF16(whereRealMessage ? whereRealMessage : aString, message);
|
AppendUTF8toUTF16(whereRealMessage ? whereRealMessage : aString, message);
|
||||||
rv = dialog->Alert(nsnull, message.get());
|
rv = dialog->Alert(nsnull, message.get());
|
||||||
|
|
||||||
PR_Free(serverSaidPrefix);
|
PR_Free(serverSaidPrefix);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return rv;
|
return rv;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче