661363 - Port bug 562753 (On upgrade, old win7 taskbar entries should have their app model id upgraded, based on install path) to Thunderbird

Status: RESOLVED FIXED

(Thunderbird :: Installer, defect)

Description

[Rain [:rain1] (inactive)]

This sounds like something we need to do for pinned shortcuts.

Comment 1

[Rain [:rain1] (inactive)]

Marking as blocking-thunderbird3.3? because otherwise the app will need to be re-pinned after every update.

Comment 2

[Rain [:rain1] (inactive)]

Attachment: patch v1

This is mostly a port, with the changes in bug 621873 included.

Comment 3

[David :Bienvenu]

Comment on attachment 536787 [details] [diff] [review]
patch v1

nsWindowsShellService::ShortcutMaintenance()

+  nsCOMPtr<nsIPrefService> prefs =
+    do_GetService(NS_PREFSERVICE_CONTRACTID);
+  if (!prefs)
+    return NS_ERROR_UNEXPECTED;
+
+  nsCOMPtr<nsIPrefBranch> prefBranch;
+  prefs->GetBranch(nsnull, getter_AddRefs(prefBranch));

I think we should use &rv here and NS_ENSURE_SUCCESS(rv, rv); instead of NS_ERROR_UNEXPECTED (I'd like to avoid NS_ERROR_UNEXPECTED where possible)

Comment 4

[David :Bienvenu]

Comment on attachment 536787 [details] [diff] [review]
patch v1

sr=me, modulo the NS_ERROR_UNEXPECTED

Comment 5

[Mark Banner (:standard8)]

Comment on attachment 536787 [details] [diff] [review]
patch v1

Review of attachment 536787 [details] [diff] [review]:
-----------------------------------------------------------------

This looks good. We can do a bit more testing on it once we land it, but I think this looks fine.

Please land on comm-central and comm-miramar once you've fixed the comment.

::: mail/installer/windows/nsis/installer.nsi
@@ +489,5 @@
>      ${EndIf}
>    ${EndUnless}
>  
> +  ; Win7 taskbar and start menu link maintenance
> +  ${UpdateShortcutAppModelIDs} "$INSTDIR\${FileMainEXE}" "${AppUserModelID}"

I believe this should have $0 on the end, or do

Call FixShortcutAppModelIDs

Comment 6

[Rain [:rain1] (inactive)]

https://hg.mozilla.org/comm-central/rev/995678d4c911
http://hg.mozilla.org/releases/comm-miramar/rev/5dd631a1f6b5

Comment 8

[Mark Banner (:standard8)]

Checked into aurora: http://hg.mozilla.org/releases/comm-aurora/rev/027a1bf18740