diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /xpcom/base/MacHelpers.mm | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'xpcom/base/MacHelpers.mm')
| -rw-r--r-- | xpcom/base/MacHelpers.mm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xpcom/base/MacHelpers.mm b/xpcom/base/MacHelpers.mm index 26c04c49dd..9d53fd5b56 100644 --- a/xpcom/base/MacHelpers.mm +++ b/xpcom/base/MacHelpers.mm @@ -24,8 +24,7 @@ nsresult GetSelectedCityInfo(nsAString& aCountryCode) { return NS_ERROR_FAILURE; } - return mozilla::CopyCocoaStringToXPCOMString((NSString*)countryCode, - aCountryCode); + mozilla::CopyNSStringToXPCOMString((NSString*)countryCode, aCountryCode); NS_OBJC_END_TRY_BLOCK_RETURN(NS_ERROR_FAILURE); } |