1544222 - Port Bug 1526243 "[Linux] Don't use nsGConfService in nsGNOMEShellService.cpp" to SeaMonkey

Status: RESOLVED FIXED

(SeaMonkey :: OS Integration, enhancement)

Description

[Frank-Rainer Grahl (:frg)]

nsGConfService was removed in Bug 1433685. We need to remove its usage from our nsGNOMEShellService.cpp.

Comment 1

[Frank-Rainer Grahl (:frg)]

Attachment: port-1526243.patch

Taking the bug for Bill. Initial WIP patch from him.

Comment 2

[Ian Neal]

Attachment: port-1526243.patch

Comment 3

[Ian Neal]

Comment on attachment 9058153 [details] [diff] [review]
port-1526243.patch

>+++ b/suite/components/shell/nsGNOMEShellService.cpp
> NS_IMETHODIMP
> nsGNOMEShellService::SetDefaultClient(bool aForAllUsers,
>                                       bool aClaimAllTypes, uint16_t aApps)
> {
>   nsresult rv;
> 
>   nsCOMPtr<nsIGIOMimeApp> app;
>   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
>   if (giovfs) {
>-    nsCString brandName;
>-    rv = GetBrandName(brandName);
Leave these two lines in please.

>+    nsresult rv;
>+    nsCOMPtr<nsIStringBundleService> bundleService =
>+        do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
>+    NS_ENSURE_SUCCESS(rv, rv);
>+
>+    nsCOMPtr<nsIStringBundle> brandBundle;
>+    rv = bundleService->CreateBundle(BRAND_PROPERTIES,
>+                                     getter_AddRefs(brandBundle));
Don't need this whole section.

>     NS_ENSURE_SUCCESS(rv, rv);
> 
Keep this.

>+    nsAutoString brandName;
>+    brandBundle->GetStringFromName("brandName", brandName);
>+
>+    NS_ConvertUTF16toUTF8 id(brandName);
Don't need this whole section.

>+    rv = giovfs->FindAppFromCommand(mAppPath, getter_AddRefs(app));
>+    if (NS_FAILED(rv)) {
>+      // Application was not found in the list of installed applications
>+      // provided by OS. Fallback to create appInfo from command and name.
>+      rv = giovfs->CreateAppFromCommand(mAppPath, id, getter_AddRefs(app));
Now would use brandName rather than id here.

Other than that looks good, r=me

Comment 4

[Ian Neal]

Attachment: port-1526243.patch

Carrying forward r+

Comment 5

[Ian Neal]

Comment on attachment 9058158 [details] [diff] [review]
port-1526243.patch

a=me if needed

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/38970ece368e
Port bug 1526243 [Don't use nsGConfService in nsGNOMEShellService.cpp] to suite. r=IanN

Comment 7

[Frank-Rainer Grahl (:frg)]

Lets decide later if we take it to 2.57.

Comment 8

[Frank-Rainer Grahl (:frg)]

https://hg.mozilla.org/releases/comm-esr60/rev/05dc1e1fd835