Browse Source

suite bustage fix

Bill Gianopoulos 2 years ago
parent
commit
5b96e15bdc

+ 31 - 0
comm-central/patches/9999999-windowsshell-suite-bustage.patch

@@ -0,0 +1,31 @@
+# HG changeset patch
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
+# Date 1663152036 0
+Bug 9999999 - Fix suite bustage in nsWindowsShellService.cpp.
+
+diff --git a/suite/components/shell/nsWindowsShellService.cpp b/suite/components/shell/nsWindowsShellService.cpp
+--- a/suite/components/shell/nsWindowsShellService.cpp
++++ b/suite/components/shell/nsWindowsShellService.cpp
+@@ -613,19 +613,19 @@ nsWindowsShellService::SetDesktopBackgro
+     return rv;
+ 
+   nsCOMPtr<imgIContainer> container;
+   rv = request->GetImage(getter_AddRefs(container));
+   if (!container)
+     return NS_ERROR_FAILURE;
+ 
+   // get the file name from localized strings
+-  nsCOMPtr<nsIStringBundleService> bundleService =
+-    mozilla::services::GetStringBundleService();
+-  NS_ENSURE_TRUE(bundleService, NS_ERROR_UNEXPECTED);
++  nsCOMPtr<nsIStringBundleService> bundleService(
++    do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv));
++  NS_ENSURE_SUCCESS(rv, rv);
+ 
+   nsCOMPtr<nsIStringBundle> shellBundle;
+   rv = bundleService->CreateBundle(SHELLSERVICE_PROPERTIES,
+                                    getter_AddRefs(shellBundle));
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+   // e.g. "Desktop Background.bmp"
+   nsAutoString fileLeafName;

+ 1 - 0
comm-central/patches/series

@@ -1,5 +1,6 @@
 9999999-port1787097-suite-bustage.patch
 9999999-port1788233-suite-bustage.patch
+9999999-windowsshell-suite-bustage.patch
 TOP-1642188-remove-nsDOMIEvent-cc.patch
 TOP-1611010-DOMEventListener-cc.patch
 TOP-1614671-port1456035-4-and-5-61a1-cc.patch