[Gpg4win-commits] r433 - trunk/patches/claws-mail-2.10.0

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-07-03 00:24:43 +0200 (Tue, 03 Jul 2007)
New Revision: 433

Modified:
   trunk/patches/claws-mail-2.10.0/03-w32-port.patch
Log:
Fix patch.


Modified: trunk/patches/claws-mail-2.10.0/03-w32-port.patch
===================================================================
--- trunk/patches/claws-mail-2.10.0/03-w32-port.patch	2007-07-02 22:13:43 UTC (rev 432)
+++ trunk/patches/claws-mail-2.10.0/03-w32-port.patch	2007-07-02 22:24:43 UTC (rev 433)
@@ -1,7 +1,3 @@
-prefs_gpg_should_skip_encryption_warning
-prefs_gpg_add_skip_encryption_warning
-prefs_gpg_remove_skip_encryption_warning
-
 #! /bin/sh
 patch -p1 -f $* < $0
 exit $?
@@ -32,8 +28,8 @@
 	[G_OS_WIN32]: Implement memory mapped file access.
 	* src/common/log.c [G_OS_WIN32]: Include <w32lib.h>.
 	* src/common/src/mbox.c [G_OS_WIN32]: Include <w32lib.h>.
-	* src/prefs_summaries.c	[G_OS_WIN32]: Include <w32lib.h>.
-	* src/procheader.c	[G_OS_WIN32]: Include <w32lib.h>.
+	* src/prefs_summaries.c [G_OS_WIN32]: Include <w32lib.h>.
+	* src/procheader.c [G_OS_WIN32]: Include <w32lib.h>.
 
 	* src/plugins/pgpcore/Makefile.am (INCLUDES): Add
 	-I$(top_builddir)/src/common.
@@ -44,8 +40,10 @@
 	sys/wait.h.
 	* src/plugins/pgpcore/pgp_viewer.c: Ditto.
 	* src/plugins/pgpcore/plugin.def: Add
-	sgpgme_data_release_and_get_mem, prefs_gpg_enable_agent and
-	plugin_provides.
+	sgpgme_data_release_and_get_mem, prefs_gpg_enable_agent,
+	prefs_gpg_should_skip_encryption_warning,
+	prefs_gpg_add_skip_encryption_warning,
+	prefs_gpg_remove_skip_encryption_warning and plugin_provides.
 
 	* src/plugins/pgpinline/Makefile.am (INCLUDES): Add
 	-I$(top_builddir)/src/common.
@@ -730,11 +728,14 @@
          sgpgme_decrypt_verify
          sgpgme_get_encrypt_data
          sgpgme_setup_signers
-@@ -17,4 +19,5 @@ EXPORTS
+@@ -17,4 +19,8 @@ EXPORTS
          sgpgme_verify_signature
  
          gpgmegtk_passphrase_cb
++        prefs_gpg_add_skip_encryption_warning
 +        prefs_gpg_enable_agent
++        prefs_gpg_remove_skip_encryption_warning
++        prefs_gpg_should_skip_encryption_warning
          prefs_gpg_get_config
 diff -rup claws-mail-2.9.2-orig/src/plugins/pgpcore/sgpgme.c claws-mail-2.9.2/src/plugins/pgpcore/sgpgme.c
 --- claws-mail-2.9.2-orig/src/plugins/pgpcore/sgpgme.c	2007-05-08 09:59:23.000000000 +0200