[Gpg4win-commits] r1465 - in trunk: . patches/gpgex

[scm-commit@wald.intevation.org]

Author: emanuel
Date: 2010-07-08 17:23:08 +0200 (Thu, 08 Jul 2010)
New Revision: 1465

Removed:
   trunk/patches/gpgex/01-no-checksums.patch
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
Log:
Removed gpgex/01-no-checksums.patch.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-07-06 15:20:36 UTC (rev 1464)
+++ trunk/ChangeLog	2010-07-08 15:23:08 UTC (rev 1465)
@@ -1,3 +1,8 @@
+2010-07-08  Emanuel Schuetze <emanuel at intevation.de>
+
+	* Makefile.am (EXTRA_DIST): Remove patches/gpgex/01-no-checksums.patch.
+	* patches/gpgex/01-no-checksums.patch: Remove file.
+
 2010-05-21  Emanuel Schuetze <emanuel at intevation.de>
 
 	* configure.ac: Change compendium-de date.

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2010-07-06 15:20:36 UTC (rev 1464)
+++ trunk/Makefile.am	2010-07-08 15:23:08 UTC (rev 1465)
@@ -38,7 +38,6 @@
 	patches/gpgme-1.2.0/03-w32-socket.patch \
         patches/gpgme-1.2.0/04-check-agent.patch \
         patches/gpgme-1.2.0/05-is-socket.patch \
-	patches/gpgex/01-no-checksums.patch \
 	patches/gpgex-0.9.5/01-default-no-suffix.patch \
 	patches/gnupg2/01-version.patch.in \
 	patches/gnupg2-2.0.9/01-close-all-handle.patch \

Deleted: trunk/patches/gpgex/01-no-checksums.patch
===================================================================
--- trunk/patches/gpgex/01-no-checksums.patch	2010-07-06 15:20:36 UTC (rev 1464)
+++ trunk/patches/gpgex/01-no-checksums.patch	2010-07-08 15:23:08 UTC (rev 1465)
@@ -1,26 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-Disable checksum commands.
-
-
-diff -rup src/gpgex.cc src/gpgex.cc
---- src/gpgex.cc	2008-09-09 11:02:17.000000000 +0200
-+++ src/gpgex.cc	2009-02-25 14:24:44.000000000 +0100
-@@ -356,12 +356,14 @@ gpgex_t::QueryContextMenu (HMENU hMenu, 
-   if (res)
-     res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_STRING,
- 		      idCmdFirst + ID_CMD_IMPORT, ID_CMD_STR_IMPORT);
-+#if 0
-   if (res)
-     res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_STRING,
- 		      idCmdFirst + ID_CMD_CREATE_CHECKSUMS, ID_CMD_STR_CREATE_CHECKSUMS);
-   if (res)
-     res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_STRING,
- 		      idCmdFirst + ID_CMD_VERIFY_CHECKSUMS, ID_CMD_STR_VERIFY_CHECKSUMS);
-+#endif
-   if (res)
-     res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
-   if (res)
-