Attachment #477340: patch for bug #597911

View | Details | Raw Unified | Return to bug 597911
Collapse All | Expand All

(-)a/browser/installer/windows/nsis/defines.nsi.in (+6 lines)
Line     Link Here 
 Lines 3-19    Link Here 
3 
# Win7: AppVendor, AppName, and AppVersion must match the application.ini values
 3 
# Win7: AppVendor, AppName, and AppVersion must match the application.ini values
4 
# of Vendor, Name, and Version. These values are used in registering shortcuts
 4 
# of Vendor, Name, and Version. These values are used in registering shortcuts
5 
# with the taskbar. ExplicitAppUserModelID registration when the app launches is
 5 
# with the taskbar. ExplicitAppUserModelID registration when the app launches is
6 
# handled in widget/src/windows/WinTaskbar.cpp.
 6 
# handled in widget/src/windows/WinTaskbar.cpp.
7 

          7
          

        

        

          8
          
!define AppVendor             "Mozilla"

          8
          
!define AppVendor             "Mozilla"

        

        

          9
          
!define AppName               "Firefox"

          9
          
!define AppName               "Firefox"

        

        

          10
          
!define AppVersion            "@APP_VERSION@"

          10
          
!define AppVersion            "@APP_VERSION@"

        

            

              
              
              11
              
#ifdef _WIN64

            

            

              12
              
!define AppUserModelID        "${AppVendor}.${AppName}.${AppVersion}.Win64"

            

            

              13
              
#elif _X86_

            

            

              14
              
!define AppUserModelID        "${AppVendor}.${AppName}.${AppVersion}.Win32"

            

            

              15
              
#else

            

        

          11
          
!define AppUserModelID        "${AppVendor}.${AppName}.${AppVersion}"

          16
          
!define AppUserModelID        "${AppVendor}.${AppName}.${AppVersion}"

        

            

              
              
              17
              
#endif

            

        

          12
          
!define GREVersion            @MOZILLA_VERSION@

          18
          
!define GREVersion            @MOZILLA_VERSION@

        

        

          13
          
!define AB_CD                 "@AB_CD@"

          19
          
!define AB_CD                 "@AB_CD@"

        

        

          14
          

          20
          

        

        

          15
          
!define FileMainEXE           "@MOZ_APP_NAME@.exe"

          21
          
!define FileMainEXE           "@MOZ_APP_NAME@.exe"

        

        

          16
          
!define WindowClass           "FirefoxMessageWindow"

          22
          
!define WindowClass           "FirefoxMessageWindow"

        

        

          17
          
!define DDEApplication        "Firefox"

          23
          
!define DDEApplication        "Firefox"

        

        

          18
          
!define AppRegName            "Firefox"

          24
          
!define AppRegName            "Firefox"

        

        

          19
          

          25
          

        



(-)a/widget/src/windows/WinTaskbar.cpp
      (-1 / +11 lines)




  

    

    

      Line 
      
    
  Link Here 
    

  

  

    

    

       Lines 288-304
      WinTaskbar::GetAppUserModelID(nsAString 
    
  Link Here 
    

  

        

          288
          
  if (NS_SUCCEEDED(appInfo->GetName(val))) {

          288
          
  if (NS_SUCCEEDED(appInfo->GetName(val))) {

        

        

          289
          
    AppendASCIItoUTF16(val, aDefaultGroupId);

          289
          
    AppendASCIItoUTF16(val, aDefaultGroupId);

        

        

          290
          
    aDefaultGroupId.Append(PRUnichar('.'));

          290
          
    aDefaultGroupId.Append(PRUnichar('.'));

        

        

          291
          
  }

          291
          
  }

        

        

          292
          
  if (NS_SUCCEEDED(appInfo->GetVersion(val))) {

          292
          
  if (NS_SUCCEEDED(appInfo->GetVersion(val))) {

        

        

          293
          
    AppendASCIItoUTF16(val, aDefaultGroupId);

          293
          
    AppendASCIItoUTF16(val, aDefaultGroupId);

        

        

          294
          
  }

          294
          
  }

        

        

          295
          

          295
          

        

          
            

              296
              
  return aDefaultGroupId.IsEmpty() ? PR_FALSE : PR_TRUE;


              296
              
  if (aDefaultGroupId.IsEmpty())

            

            

              
              

              297
              
    return PR_FALSE;

            

            


              298
              

            

            


              299
              
  // Differentiate builds

            

            


              300
              
#if defined(_WIN32)

            

            


              301
              
  aDefaultGroupId.AppendLiteral(".Win32");

            

            


              302
              
#elif defined(_WIN64)

            

            


              303
              
  aDefaultGroupId.AppendLiteral(".Win64");

            

            


              304
              
#endif

            

            


              305
              

            

            


              306
              
  return PR_TRUE;

            

        

          297
          
}

          307
          
}

        

        

          298
          

          308
          

        

        

          299
          
/* readonly attribute AString defaultGroupId; */

          309
          
/* readonly attribute AString defaultGroupId; */

        

        

          300
          
NS_IMETHODIMP

          310
          
NS_IMETHODIMP

        

        

          301
          
WinTaskbar::GetDefaultGroupId(nsAString & aDefaultGroupId) {

          311
          
WinTaskbar::GetDefaultGroupId(nsAString & aDefaultGroupId) {

        

        

          302
          
  if (!GetAppUserModelID(aDefaultGroupId))

          312
          
  if (!GetAppUserModelID(aDefaultGroupId))

        

        

          303
          
    return NS_ERROR_UNEXPECTED;

          313
          
    return NS_ERROR_UNEXPECTED;

        

        

          304
          

          314
          

        







  


  Return to bug 597911