icedove-branding.patch

   1 --- icedove-3.0.old/comm-1.9.1/mozilla/configure.orig   2009-12-18 15:06:50.144206912 +0100
   2 +++ icedove-3.0.old/comm-1.9.1/mozilla/configure        2009-12-18 15:07:35.791285838 +0100
   3 @@ -13390,8 +13390,8 @@
   4    ;;
   5
   6  standalone)
   7 -  MOZ_APP_NAME=mozilla
   8 -  MOZ_APP_DISPLAYNAME=Mozilla
   9 +  MOZ_APP_NAME=icedove
  10 +  MOZ_APP_DISPLAYNAME=Icedove
  11    MOZ_APP_VERSION=$MOZILLA_VERSION
  12    ;;
  13
  14 --- icedove-3.0.old/comm-1.9.1/mozilla/configure.in.orig        2009-12-18 15:07:49.984408790 +0100
  15 +++ icedove-3.0.old/comm-1.9.1/mozilla/configure.in     2009-12-18 15:08:12.906912163 +0100
  16 @@ -4664,8 +4664,8 @@
  17    ;;
  18
  19  standalone)
  20 -  MOZ_APP_NAME=mozilla
  21 -  MOZ_APP_DISPLAYNAME=Mozilla
  22 +  MOZ_APP_NAME=icedove
  23 +  MOZ_APP_DISPLAYNAME=Icedove
  24    MOZ_APP_VERSION=$MOZILLA_VERSION
  25    ;;
  26
  27 --- icedove-3.0.old/comm-1.9.1/mail/confvars.sh 2009-12-05 02:53:48.000000000 +0100
  28 +++ icedove-3.0/comm-1.9.1.new/mail/confvars.sh 2009-12-21 09:55:06.346526172 +0100
  29 @@ -36,7 +36,7 @@
  30  #
  31  # ***** END LICENSE BLOCK *****
  32
  33 -MOZ_APP_NAME=thunderbird
  34 +MOZ_APP_NAME=icedove
  35  MOZ_UPDATER=1
  36  MOZ_THUNDERBIRD=1
  37  MOZ_NO_ACTIVEX_SUPPORT=1
  38 diff -ru icedove-3.0.old/comm-1.9.1/mail/branding/nightly/branding.nsi icedove-3.0/comm-1.9.1/mail/branding/nightly/branding.nsi
  39 --- icedove-3.0.old/comm-1.9.1/mail/branding/nightly/branding.nsi       2010-01-13 12:50:52.355011705 +0100
  40 +++ icedove-3.0/comm-1.9.1/mail/branding/nightly/branding.nsi   2010-01-13 12:52:49.625208158 +0100
  41 @@ -39,7 +39,7 @@
  42
  43  # BrandFullNameInternal is used for some registry and file system values
  44  # instead of BrandFullName and typically should not be modified.
  45 -!define BrandFullNameInternal "Shredder"
  46 +!define BrandFullNameInternal "Icedove"
  47  !define CompanyName           "mozilla.org"
  48  !define URLInfoAbout          "http://www.mozilla.org/"
  49  !define URLUpdateInfo         "http://www.mozilla.org/products/thunderbird/"
  50 diff -ru icedove-3.0.old/comm-1.9.1/mail/branding/nightly/configure.sh icedove-3.0/comm-1.9.1/mail/branding/nightly/configure.sh
  51 --- icedove-3.0.old/comm-1.9.1/mail/branding/nightly/configure.sh       2010-01-13 12:50:52.355011705 +0100
  52 +++ icedove-3.0/comm-1.9.1/mail/branding/nightly/configure.sh   2010-01-13 12:52:49.625208158 +0100
  53 @@ -1 +1 @@
  54 -MOZ_APP_DISPLAYNAME=Shredder
  55 +MOZ_APP_DISPLAYNAME=Icedove
  56 diff -ru icedove-3.0.old/comm-1.9.1/mail/branding/nightly/locales/en-US/brand.dtd icedove-3.0/comm-1.9.1/mail/branding/nightly/locales/en-US/brand.dtd
  57 --- icedove-3.0.old/comm-1.9.1/mail/branding/nightly/locales/en-US/brand.dtd    2010-01-13 12:50:52.358344857 +0100
  58 +++ icedove-3.0/comm-1.9.1/mail/branding/nightly/locales/en-US/brand.dtd        2010-01-13 12:53:00.268553944 +0100
  59 @@ -1,3 +1,3 @@
  60 -<!ENTITY  brandShortName        "Shredder">
  61 -<!ENTITY  brandFullName         "Shredder">
  62 +<!ENTITY  brandShortName        "Icedove">
  63 +<!ENTITY  brandFullName         "Icedove">
  64  <!ENTITY  vendorShortName       "mozilla.org">
  65 diff -ru icedove-3.0.old/comm-1.9.1/mail/branding/nightly/locales/en-US/brand.properties icedove-3.0/comm-1.9.1/mail/branding/nightly/locales/en-US/brand.properties
  66 --- icedove-3.0.old/comm-1.9.1/mail/branding/nightly/locales/en-US/brand.properties     2010-01-13 12:50:52.358344857 +0100
  67 +++ icedove-3.0/comm-1.9.1/mail/branding/nightly/locales/en-US/brand.properties 2010-01-13 12:53:00.268553944 +0100
  68 @@ -1,4 +1,4 @@
  69 -brandShortName=Shredder
  70 -brandFullName=Shredder
  71 +brandShortName=Icedove
  72 +brandFullName=Icedove
  73  vendorShortName=mozilla.org
  74
  75 diff -ru icedove-3.0.old/comm-1.9.1/mail/installer/windows/nsis/shared.nsh icedove-3.0/comm-1.9.1/mail/installer/windows/nsis/shared.nsh
  76 --- icedove-3.0.old/comm-1.9.1/mail/installer/windows/nsis/shared.nsh   2010-01-13 12:50:52.375011483 +0100
  77 +++ icedove-3.0/comm-1.9.1/mail/installer/windows/nsis/shared.nsh       2010-01-13 12:53:13.349789738 +0100
  78 @@ -518,19 +518,19 @@
  79      DeleteRegKey HKCU "$0\.eml\DefaultIcon"
  80    ${EndUnless}
  81
  82 -  ; Remove the Shredder clients key if its default icon contains thunderbird.exe
  83 +  ; Remove the Icedove clients key if its default icon contains thunderbird.exe
  84    ClearErrors
  85 -  ReadRegStr $1 HKLM "SOFTWARE\clients\mail\Shredder\DefaultIcon" ""
  86 +  ReadRegStr $1 HKLM "SOFTWARE\clients\mail\Icedove\DefaultIcon" ""
  87    ${WordFind} "$1" "${FileMainEXE}" "E+1{" $R1
  88    ${Unless} ${Errors}
  89 -    DeleteRegKey HKLM "SOFTWARE\clients\mail\Shredder"
  90 +    DeleteRegKey HKLM "SOFTWARE\clients\mail\Icedove"
  91    ${EndUnless}
  92
  93    ClearErrors
  94 -  ReadRegStr $1 HKLM "SOFTWARE\clients\news\Shredder\DefaultIcon" ""
  95 +  ReadRegStr $1 HKLM "SOFTWARE\clients\news\Icedove\DefaultIcon" ""
  96    ${WordFind} "$1" "${FileMainEXE}" "E+1{" $R1
  97    ${Unless} ${Errors}
  98 -    DeleteRegKey HKLM "SOFTWARE\clients\news\Shredder"
  99 +    DeleteRegKey HKLM "SOFTWARE\clients\news\Icedove"
 100    ${EndUnless}
 101
 102    ; The Vista shim for 1.5.0.10 writes out a set of bogus keys which we need to