wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-26 00:57:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/tracking' into custom

Browse source
This commit is contained in:
roytam1 2023-11-18 07:08:31 +08:00
commit a1608dd4c7
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dom/base/EventSource.cpp
View file

@ -190,7 +190,6 @@ public:
bool IsClosed() bool IsClosed()
{ {
MutexAutoLock lock(mMutex);
return ReadyState() == CLOSED; return ReadyState() == CLOSED;
} }

21
mailnews/compose/src/nsMsgCompUtils.cpp
View file

@ -9,7 +9,7 @@
#include "prmem.h" #include "prmem.h"
#include "nsMsgSend.h" #include "nsMsgSend.h"
#include "nsIIOService.h" #include "nsIIOService.h"
#include "nsIHttpProtocolHandler.h" #include "nsIXULAppInfo.h"
#include "nsMailHeaders.h" #include "nsMailHeaders.h"
#include "nsMsgI18N.h" #include "nsMsgI18N.h"
#include "nsINntpService.h" #include "nsINntpService.h"
@ -357,14 +357,21 @@ nsresult mime_generate_headers(nsIMsgCompFields *fields,
finalHeaders->SetRawHeader(HEADER_X_MOZILLA_DRAFT_INFO, draftInfo, nullptr); finalHeaders->SetRawHeader(HEADER_X_MOZILLA_DRAFT_INFO, draftInfo, nullptr);
} }
nsCOMPtr<nsIHttpProtocolHandler> pHTTPHandler = do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &rv); nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
if (NS_SUCCEEDED(rv) && pHTTPHandler) if (appInfo) {
{ nsAutoCString userAgentString;
nsAutoCString userAgentString; nsAutoCString userAgentName;
pHTTPHandler->GetUserAgent(userAgentString); nsAutoCString userAgentVersion;
appInfo->GetName(userAgentName);
appInfo->GetVersion(userAgentVersion);
if (!userAgentName.IsEmpty() && !userAgentVersion.IsEmpty()) {
userAgentString += userAgentName;
userAgentString += '/';
userAgentString += userAgentVersion;
}
if (!userAgentString.IsEmpty()) if (!userAgentString.IsEmpty())
finalHeaders->SetUnstructuredHeader("User-Agent", finalHeaders->SetUnstructuredHeader("X-Mailer",
NS_ConvertUTF8toUTF16(userAgentString)); NS_ConvertUTF8toUTF16(userAgentString));
} }