[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-3.1.2-14-g237a857
by Andre Heinecke
cvs at cvs.gnupg.org
Wed Jul 18 15:22:38 CEST 2018
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 237a8576c21ddcb0ffd5b60a2605ace1c1fee863 (commit)
via c8487281ac86dd12cc2d5a09c8f3b824f6cd7558 (commit)
via 8c35e6c684a4b605c184f1a6faec7a3640ff4d40 (commit)
via f465dbd13ab93762f01ed5d72d0ec798ff87aa59 (commit)
from 52a454a9f2be554c8ab374189eab0b5fca1294f1 (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 237a8576c21ddcb0ffd5b60a2605ace1c1fee863
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Jul 18 15:21:09 2018 +0200
Fix p7m and p7s file extensions for Windows 7
* src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Register
for P7MFile and P7SFile.
--
On windows 7 those two are used instead of .p7m and .p7s
GnuPG-Bug-Id: T3890
diff --git a/src/inst-kleopatra.nsi b/src/inst-kleopatra.nsi
index 7cb2500..75cd7ef 100644
--- a/src/inst-kleopatra.nsi
+++ b/src/inst-kleopatra.nsi
@@ -275,6 +275,13 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
WriteRegStr SHCTX "Software\Classes\openpgp4fpr\DefaultIcon" "" "$INSTDIR\bin\kleopatra.exe,0"
WriteRegStr SHCTX "Software\Classes\openpgp4fpr\shell\open\command" "" "$\"$INSTDIR\bin\kleopatra.exe$\" --query $\"%1$\""
+ # p7s / p7m are special because they are already known
+ WriteRegExpandStr SHCTX "Software\Classes\P7MFile\shell\open\command" "" "$\"$INSTDIR\bin\kleopatra.exe$\" $\"%1$\""
+ WriteRegStr SHCTX "Software\Classes\P7MFile\DefaultIcon" "" "$INSTDIR\share\gpg4win\file-ext.ico"
+
+ WriteRegExpandStr SHCTX "Software\Classes\P7SFile\shell\open\command" "" "$\"$INSTDIR\bin\kleopatra.exe$\" $\"%1$\""
+ WriteRegStr SHCTX "Software\Classes\P7SFile\DefaultIcon" "" "$INSTDIR\share\gpg4win\file-ext.ico"
+
!endif
${MementoSectionEnd}
diff --git a/src/uninst-kleopatra.nsi b/src/uninst-kleopatra.nsi
index 797aaf7..d6d96aa 100644
--- a/src/uninst-kleopatra.nsi
+++ b/src/uninst-kleopatra.nsi
@@ -229,6 +229,11 @@ Section "-un.kleopatra"
DeleteRegValue SHCTX "Software\Classes\.crl" "gpg4win.AssocFile.kleopatra.CMS"
DeleteRegValue SHCTX "Software\Classes\.crl" "gpg4win.AssocFile.kleopatra.CMS"
+ DeleteRegKey SHCTX "Software\Classes\P7SFile\DefaultIcon"
+ DeleteRegKey SHCTX "Software\Classes\P7SFile\shell\open\command"
+ DeleteRegKey SHCTX "Software\Classes\P7MFile\DefaultIcon"
+ DeleteRegKey SHCTX "Software\Classes\P7MFile\shell\open\command"
+
DeleteRegKey SHCTX "Software\Classes\openpgp4fpr"
DeleteRegKey /ifempty SHCTX "Software\Classes\.gpg"
commit c8487281ac86dd12cc2d5a09c8f3b824f6cd7558
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Jul 18 15:20:36 2018 +0200
Fix string for PEM file extension
* src/installer-finish.nsi: Fix string for PEM ext.
diff --git a/src/installer-finish.nsi b/src/installer-finish.nsi
index fea7e36..9725552 100644
--- a/src/installer-finish.nsi
+++ b/src/installer-finish.nsi
@@ -171,7 +171,7 @@ LangString T_File_Type_sig_Name ${LANG_ENGLISH} \
LangString T_File_Type_pgp_key_Name ${LANG_ENGLISH} \
"OpenPGP Certificate File"
-LangString T_File_Type_asc_Name ${LANG_ENGLISH} \
+LangString T_File_Type_pem_Name ${LANG_ENGLISH} \
"CMS (S/MIME) File"
LangString T_File_Type_x509_Name ${LANG_ENGLISH} \
commit 8c35e6c684a4b605c184f1a6faec7a3640ff4d40
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Jul 18 15:19:47 2018 +0200
Remove duplicated shell open commands
* src/installer-finish.nsi: Don't overwrite the ExpandStr values
with normal strings.
diff --git a/src/installer-finish.nsi b/src/installer-finish.nsi
index 9285128..fea7e36 100644
--- a/src/installer-finish.nsi
+++ b/src/installer-finish.nsi
@@ -22,23 +22,23 @@ Var MYTMP
Function SetupExtRegKeys
Pop $0
# .gpg
+ WriteRegExpandStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.GPG\shell\open\command" "" "$\"$INSTDIR\bin\$0.exe$\" $\"%1$\""
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.GPG" "" "$(T_File_Type_gpg_Name)"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.GPG" "FriendlyTypeName" "$(T_File_Type_gpg_Name)"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.GPG" "PercievedType" "Document"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.GPG" "InfoTip" "$(T_File_Type_info_tip)"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.GPG\CurVer" "" "${VERSION}"
- WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.GPG\shell\open\command" "" "$\"$INSTDIR\bin\$0.exe$\" $\"%1$\""
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.GPG\DefaultIcon" "" "$INSTDIR\share\gpg4win\file-ext.ico"
WriteRegBin SHCTX "Software\Classes\.gpg\OpenWithProgIDs" "gpg4win.AssocFile.$0.GPG" 0
# .asc
+ WriteRegExpandStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.ASC\shell\open\command" "" "$\"$INSTDIR\bin\$0.exe$\" $\"%1$\""
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.ASC" "" "$(T_File_Type_asc_Name)"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.ASC" "FriendlyTypeName" "$(T_File_Type_asc_Name)"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.ASC" "PercievedType" "Document"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.ASC" "InfoTip" "$(T_File_Type_info_tip)"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.ASC\CurVer" "" "${VERSION}"
- WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.ASC\shell\open\command" "" "$\"$INSTDIR\bin\$0.exe$\" $\"%1$\""
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.ASC\DefaultIcon" "" "$INSTDIR\share\gpg4win\file-ext.ico"
WriteRegBin SHCTX "Software\Classes\.asc\OpenWithProgIDs" "gpg4win.AssocFile.$0.ASC" 0
@@ -47,33 +47,32 @@ Function SetupExtRegKeys
# .sig
WriteRegExpandStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.PGPSIG\shell\open\command" "" "$\"$INSTDIR\bin\$0.exe$\" $\"%1$\""
+ WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.PGPSIG" "" "$(T_File_Type_sig_Name)"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.PGPSIG" "FriendlyTypeName" "$(T_File_Type_sig_Name)"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.PGPSIG" "PercievedType" "Document"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.PGPSIG" "InfoTip" "$(T_File_Type_sig_info_tip)"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.PGPSIG\CurVer" "" "${VERSION}"
- WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.PGPSIG\shell\open\command" "" "$\"$INSTDIR\bin\$0.exe$\" $\"%1$\""
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.PGPSIG\DefaultIcon" "" "$INSTDIR\share\gpg4win\file-ext.ico"
WriteRegBin SHCTX "Software\Classes\.sig\OpenWithProgIDs" "gpg4win.AssocFile.$0.PGPSIG" 0
# OpenPGP Key to be used in mime registry
WriteRegExpandStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.PGPKEY\shell\open\command" "" "$\"$INSTDIR\bin\$0.exe$\" $\"%1$\""
+ WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.PGPKEY" "" "$(T_File_Type_pgp_key_Name)"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.PGPKEY" "FriendlyTypeName" "$(T_File_Type_pgp_key_Name)"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.PGPKEY" "PercievedType" "Document"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.PGPKEY" "InfoTip" "$(T_File_Type_pgp_key_info_tip)"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.PGPKEY\CurVer" "" "${VERSION}"
- WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.PGPKEY\shell\open\command" "" "$\"$INSTDIR\bin\$0.exe$\" $\"%1$\""
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.PGPKEY\DefaultIcon" "" "$INSTDIR\share\gpg4win\file-ext.ico"
# CMS
WriteRegExpandStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.CMS\shell\open\command" "" "$\"$INSTDIR\bin\$0.exe$\" $\"%1$\""
+ WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.CMS" "" "$(T_File_Type_pem_Name)"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.CMS" "FriendlyTypeName" "$(T_File_Type_pem_Name)"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.CMS" "PercievedType" "Document"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.CMS" "InfoTip" "$(T_File_Type_info_tip)"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.CMS\CurVer" "" "${VERSION}"
- WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.CMS\shell\open\command" "" "$\"$INSTDIR\bin\$0.exe$\" $\"%1$\""
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.CMS\DefaultIcon" "" "$INSTDIR\share\gpg4win\file-ext.ico"
-# WriteRegBin SHCTX "Software\Classes\gpg4win.AssocFile.$0.CMS" "AllowSilentDefaultTakeOver" 0
WriteRegBin SHCTX "Software\Classes\.p7s\OpenWithProgIDs" "gpg4win.AssocFile.$0.CMS" 0
WriteRegBin SHCTX "Software\Classes\.p7m\OpenWithProgIDs" "gpg4win.AssocFile.$0.CMS" 0
@@ -87,7 +86,6 @@ Function SetupExtRegKeys
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.X509" "PercievedType" "Document"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.X509" "InfoTip" "$(T_File_Type_x509_info_tip)"
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.X509\CurVer" "" "${VERSION}"
- WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.X509\shell\open\command" "" "$\"$INSTDIR\bin\$0.exe$\" $\"%1$\""
WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.$0.X509\DefaultIcon" "" "$INSTDIR\share\gpg4win\file-ext.ico"
WriteRegBin SHCTX "Software\Classes\gpg4win.AssocFile.$0.X509" "AllowSilentDefaultTakeOver" 0
commit f465dbd13ab93762f01ed5d72d0ec798ff87aa59
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Jul 18 15:18:28 2018 +0200
Add installer-finish to POTFILES
* po/POTFILES.in: Add installer-finish.
--
This should fix the file extension names.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5cac064..c0c58d2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,3 +11,4 @@ src/inst-gpgol.nsi
src/inst-gpgme-browser.nsi
src/inst-kleopatra.nsi
src/inst-compendium.nsi
+src/installer-finish.nsi
-----------------------------------------------------------------------
Summary of changes:
po/POTFILES.in | 1 +
src/inst-kleopatra.nsi | 7 +++++++
src/installer-finish.nsi | 14 ++++++--------
src/uninst-kleopatra.nsi | 5 +++++
4 files changed, 19 insertions(+), 8 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list