diff options
| author |   Sardem FF7 <sardemff7.pub@gmail.com> | 2011-04-20 13:49:49 +0200 |
|---|---|---|
| committer | Sardem FF7 <sardemff7.pub@gmail.com> | 2011-04-20 13:49:49 +0200 |
| commit | 6335fa6dedd17fc123b08350043b7e2136461835 (patch) | |
| tree | 8c448685420ecd20fc066605e36b8f3629fea7cc /eclass | |
| parent | Fix (diff) | |
| download | sardemff7-6335fa6dedd17fc123b08350043b7e2136461835.tar.gz sardemff7-6335fa6dedd17fc123b08350043b7e2136461835.tar.bz2 sardemff7-6335fa6dedd17fc123b08350043b7e2136461835.zip | |
Fix icon names
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/mozilla-config.eclass | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/eclass/mozilla-config.eclass b/eclass/mozilla-config.eclass index b3f56f0..fea487c 100644 --- a/eclass/mozilla-config.eclass +++ b/eclass/mozilla-config.eclass @@ -299,25 +299,31 @@ function mozilla_application_install() { local size branding_path icon branding_path="${S}"/${MOZ_APPLICATION}/branding/${MOZ_BRANDING} source "${branding_path}"/configure.sh - icon="${MOZ_APP_DISPLAYNAME,,}" + iconsname=default + case "${MOZ_APPLICATION}" in + mail) iconsname=mailicon ;; + esac + targeticonname="${MOZ_APP_DISPLAYNAME,,}" # Install icons and .desktop for menu entry for size in 16 22 24 32 256; do insinto "/usr/share/icons/hicolor/${size}x${size}/apps" - [ -f "${branding_path}/default${size}.png" ] && { - newins "${branding_path}/default${size}.png" "${icon}.png" || die + [ -f "${branding_path}/${iconsname}${size}.png" ] && { + newins "${branding_path}/${iconsname}${size}.png" "${targeticonname}.png" || die } done # The 128x128 icon has a different name insinto "/usr/share/icons/hicolor/128x128/apps" - newins "${branding_path}/mozicon128.png" "${icon}.png" || die + [ -f "${branding_path}/mozicon128.png" ] && { + newins "${branding_path}/mozicon128.png" "${targeticonname}.png" || die + } # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs - newicon "${branding_path}/content/icon48.png" "${icon}.png" || die + newicon "${branding_path}/content/icon48.png" "${targeticonname}.png" || die newmenu "${FILESDIR}/${PN}.desktop" "${PN}.desktop" || die - sed -i -e "s:@NAME@:${MOZ_APP_DISPLAYNAME}:" -e "s:@ICON@:${icon}:" \ + sed -i -e "s:@NAME@:${MOZ_APP_DISPLAYNAME}:" -e "s:@ICON@:${targeticonname}:" \ "${ED}/usr/share/applications/${PN}.desktop" || die # Add StartupNotify=true bug 237317 |