Attachment 477340 Details for Bug 597911

[patch] patch

tmp.txt (text/plain), 2.14 KB, created by Jim Mathies [:jimm]

(hide)

Description:

Filename:

MIME Type:

Creator: Jim Mathies [:jimm]

Size: 2.14 KB

patch

obsolete

>diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in
>--- a/browser/installer/windows/nsis/defines.nsi.in
>+++ b/browser/installer/windows/nsis/defines.nsi.in
>@@ -3,17 +3,23 @@
> # Win7: AppVendor, AppName, and AppVersion must match the application.ini values
> # of Vendor, Name, and Version. These values are used in registering shortcuts
> # with the taskbar. ExplicitAppUserModelID registration when the app launches is
> # handled in widget/src/windows/WinTaskbar.cpp.
> 
> !define AppVendor             "Mozilla"
> !define AppName               "Firefox"
> !define AppVersion            "@APP_VERSION@"
>+#ifdef _WIN64
>+!define AppUserModelID        "${AppVendor}.${AppName}.${AppVersion}.Win64"
>+#elif _X86_
>+!define AppUserModelID        "${AppVendor}.${AppName}.${AppVersion}.Win32"
>+#else
> !define AppUserModelID        "${AppVendor}.${AppName}.${AppVersion}"
>+#endif
> !define GREVersion            @MOZILLA_VERSION@
> !define AB_CD                 "@AB_CD@"
> 
> !define FileMainEXE           "@MOZ_APP_NAME@.exe"
> !define WindowClass           "FirefoxMessageWindow"
> !define DDEApplication        "Firefox"
> !define AppRegName            "Firefox"
> 
>diff --git a/widget/src/windows/WinTaskbar.cpp b/widget/src/windows/WinTaskbar.cpp
>--- a/widget/src/windows/WinTaskbar.cpp
>+++ b/widget/src/windows/WinTaskbar.cpp
>@@ -288,17 +288,27 @@ WinTaskbar::GetAppUserModelID(nsAString 
>   if (NS_SUCCEEDED(appInfo->GetName(val))) {
>     AppendASCIItoUTF16(val, aDefaultGroupId);
>     aDefaultGroupId.Append(PRUnichar('.'));
>   }
>   if (NS_SUCCEEDED(appInfo->GetVersion(val))) {
>     AppendASCIItoUTF16(val, aDefaultGroupId);
>   }
> 
>-  return aDefaultGroupId.IsEmpty() ? PR_FALSE : PR_TRUE;
>+  if (aDefaultGroupId.IsEmpty())
>+    return PR_FALSE;
>+
>+  // Differentiate builds
>+#if defined(_WIN32)
>+  aDefaultGroupId.AppendLiteral(".Win32");
>+#elif defined(_WIN64)
>+  aDefaultGroupId.AppendLiteral(".Win64");
>+#endif
>+
>+  return PR_TRUE;
> }
> 
> /* readonly attribute AString defaultGroupId; */
> NS_IMETHODIMP
> WinTaskbar::GetDefaultGroupId(nsAString & aDefaultGroupId) {
>   if (!GetAppUserModelID(aDefaultGroupId))
>     return NS_ERROR_UNEXPECTED;
>

Flags:

jimm: review-

Actions: View | Diff | Review

Attachments on bug 597911: 477035 | 477036 | 477199 | 477237 | 477267 | 477287 | 477340 | 477346 | 477476