Install gpg4win-compact icon in theme dir
authorAndre Heinecke <aheinecke@intevation.de>
Mon, 29 Feb 2016 17:04:57 +0000 (18:04 +0100)
committerAndre Heinecke <aheinecke@intevation.de>
Mon, 29 Feb 2016 17:04:57 +0000 (18:04 +0100)
* src/inst-kleopatra.nsi (gpg4win_compact.png): Install into hicolor
 theme dir.
* src/uninst-kleopatra.nsi (gpg4win_compact.png): Remove it.

--
This fixes the about gpg4win menu entry icon.

src/inst-kleopatra.nsi
src/uninst-kleopatra.nsi

index bbb2f23..0c48dc0 100644 (file)
@@ -43,7 +43,6 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
 
   SetOutPath "$INSTDIR\share\kleopatra\pics"
 
-  File ${prefix}/share/kleopatra/pics/gpg4win-compact.png
   File ${prefix}/share/kleopatra/pics/gpg4win.png
   File ${prefix}/share/kleopatra/pics/kleopatra_splashscreen.png
   File ${prefix}/share/kleopatra/pics/kleopatra_splashscreen.svgz
@@ -176,6 +175,7 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
 
   SetOutPath "$INSTDIR\share\icons\hicolor\16x16\apps"
 
+  File ${prefix}/share/kleopatra/pics/gpg4win-compact.png
   File ${prefix}/share/icons/hicolor/16x16/apps/kleopatra.png
 
   SetOutPath "$INSTDIR\share\icons\hicolor\22x22\apps"
index 48383d1..aee5747 100644 (file)
@@ -41,6 +41,7 @@ Section "-un.kleopatra"
   Delete "$INSTDIR\share\icons\hicolor\256x256\apps\kleopatra.png"
   Delete "$INSTDIR\share\icons\hicolor\22x22\apps\kleopatra.png"
   Delete "$INSTDIR\share\icons\hicolor\16x16\apps\kleopatra.png"
+  Delete "$INSTDIR\share\icons\hicolor\16x16\apps\gpg4win-compact.png"
   Delete "$INSTDIR\share\icons\hicolor\128x128\apps\kleopatra.png"
   Delete "$INSTDIR\share\icons\hicolor\icon-theme.cache"
   Delete "$INSTDIR\share\icons\hicolor\index.theme"
@@ -184,7 +185,6 @@ Section "-un.kleopatra"
   Delete "$INSTDIR\share\kleopatra\pics\kleopatra_splashscreen.svgz"
   Delete "$INSTDIR\share\kleopatra\pics\kleopatra_splashscreen.png"
   Delete "$INSTDIR\share\kleopatra\pics\gpg4win.png"
-  Delete "$INSTDIR\share\kleopatra\pics\gpg4win-compact.png"
   Delete "$INSTDIR\share\kleopatra\kleopatra.rc"
   Delete "$INSTDIR\bin\libkleopatraclientgui.dll"
   Delete "$INSTDIR\bin\libkleopatraclientcore.dll"