[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.0-104-ge42f247

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, master has been updated
       via  e42f247def66b2a0509eff0ccaa58cd4cdc93012 (commit)
      from  3e8b0c39d128c097284d5261e8a44b310304b937 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e42f247def66b2a0509eff0ccaa58cd4cdc93012
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Feb 29 18:04:57 2016 +0100

    Install gpg4win-compact icon in theme dir
    
    * 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.

diff --git a/src/inst-kleopatra.nsi b/src/inst-kleopatra.nsi
index bbb2f23..0c48dc0 100644
--- a/src/inst-kleopatra.nsi
+++ b/src/inst-kleopatra.nsi
@@ -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"
diff --git a/src/uninst-kleopatra.nsi b/src/uninst-kleopatra.nsi
index 48383d1..aee5747 100644
--- a/src/uninst-kleopatra.nsi
+++ b/src/uninst-kleopatra.nsi
@@ -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"

-----------------------------------------------------------------------

Summary of changes:
 src/inst-kleopatra.nsi   | 2 +-
 src/uninst-kleopatra.nsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org