2007-08-06 [wwp] 2.10.0cvs92

	* src/plugins/pgpcore/plugin.def
		Apply one more chunk from gpg4win's 03-w32-port patch.

diff --git a/ChangeLog b/ChangeLog
index e8512ffe7d79e2d6c557e7ea11f6ec35d746a877..b01ab1125ff03eaa4b6f1894002be4574090a943 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-06 [wwp]       2.10.0cvs92
+
+       * src/plugins/pgpcore/plugin.def
+               Apply one more chunk from gpg4win's 03-w32-port patch.
+

 2007-08-05 [colin]     2.10.0cvs91
 
        * src/compose.c
 2007-08-05 [colin]     2.10.0cvs91
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index f7cb40cd912bdb652121dcc6909794f64d7b57f6..0ce67034d4a33a37ae9773b6da52aed7040600ea 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2745,3 +2745,4 @@
 ( cvs diff -u -r 1.1.2.46 -r 1.1.2.47 src/prefs_summaries.c;  cvs diff -u -r 1.15.2.51 -r 1.15.2.52 src/summary_search.c;  ) > 2.10.0cvs89.patchset
 ( cvs diff -u -r 1.213.2.152 -r 1.213.2.153 src/folder.c;  ) > 2.10.0cvs90.patchset
 ( cvs diff -u -r 1.382.2.398 -r 1.382.2.399 src/compose.c;  cvs diff -u -r 1.50.2.39 -r 1.50.2.40 src/compose.h;  ) > 2.10.0cvs91.patchset
 ( cvs diff -u -r 1.1.2.46 -r 1.1.2.47 src/prefs_summaries.c;  cvs diff -u -r 1.15.2.51 -r 1.15.2.52 src/summary_search.c;  ) > 2.10.0cvs89.patchset
 ( cvs diff -u -r 1.213.2.152 -r 1.213.2.153 src/folder.c;  ) > 2.10.0cvs90.patchset
 ( cvs diff -u -r 1.382.2.398 -r 1.382.2.399 src/compose.c;  cvs diff -u -r 1.50.2.39 -r 1.50.2.40 src/compose.h;  ) > 2.10.0cvs91.patchset

+( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpcore/plugin.def;  ) > 2.10.0cvs92.patchset

diff --git a/configure.ac b/configure.ac
index 66087ee420d5899d4b17ef90c13c0da98d05ed11..3e730b790147b04888aaf7ace4d39de87df8ec8c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=91
+EXTRA_VERSION=92

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/pgpcore/plugin.def b/src/plugins/pgpcore/plugin.def
index 1bc043a15b802632369361b9b1c830112390aee3..9e75366fa883210d0aa9ed090a10330eccdee648 100644 (file)
--- a/src/plugins/pgpcore/plugin.def
+++ b/src/plugins/pgpcore/plugin.def
@@ -19,5 +19,8 @@ EXPORTS
         sgpgme_verify_signature
 
         gpgmegtk_passphrase_cb
         sgpgme_verify_signature
 
         gpgmegtk_passphrase_cb

+        prefs_gpg_add_skip_encryption_warning

         prefs_gpg_enable_agent
         prefs_gpg_enable_agent

+        prefs_gpg_remove_skip_encryption_warning
+        prefs_gpg_should_skip_encryption_warning

         prefs_gpg_get_config
         prefs_gpg_get_config