2009-07-10 [colin] 3.7.2cvs7

	* src/plugins/pgpcore/plugin.def
	* src/common/utils.h
		Fix windows port

diff --git a/ChangeLog b/ChangeLog
index fcdc5944bfe08aa0998ec8dc626f1a213d9c5d3f..f74843f67399047d65e248617a2839481915db38 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-10 [colin]     3.7.2cvs7
+
+       * src/plugins/pgpcore/plugin.def
+       * src/common/utils.h
+               Fix windows port
+

 2009-07-10 [colin]     3.7.2cvs6
 
        * src/prefs_display_header.c
 2009-07-10 [colin]     3.7.2cvs6
 
        * src/prefs_display_header.c

diff --git a/PATCHSETS b/PATCHSETS
index 0cb8b2575e0f07ed62febe577beadcfd718b09a4..a892e3945b50dd2d21d4650b150c2ecd17bb4667 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3831,3 +3831,4 @@
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/spell_entry.c;  ) > 3.7.2cvs4.patchset
 ( cvs diff -u -r 1.207.2.213 -r 1.207.2.214 src/folderview.c;  ) > 3.7.2cvs5.patchset
 ( cvs diff -u -r 1.16.2.36 -r 1.16.2.37 src/prefs_display_header.c;  ) > 3.7.2cvs6.patchset
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/spell_entry.c;  ) > 3.7.2cvs4.patchset
 ( cvs diff -u -r 1.207.2.213 -r 1.207.2.214 src/folderview.c;  ) > 3.7.2cvs5.patchset
 ( cvs diff -u -r 1.16.2.36 -r 1.16.2.37 src/prefs_display_header.c;  ) > 3.7.2cvs6.patchset

+( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpcore/plugin.def;  cvs diff -u -r 1.20.2.71 -r 1.20.2.72 src/common/utils.h;  ) > 3.7.2cvs7.patchset

diff --git a/configure.ac b/configure.ac
index 17f8dfad420ff60a8828c754c66ad48c79a18bfc..c29a473a9bf069166bbf7277f6564e0d4d39fb34 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=6
+EXTRA_VERSION=7

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/utils.h b/src/common/utils.h
index 807e63188f6ff87e7974bedb6552395c8e663f83..6eca1ef9d7dd4429515a5dad4833cda5f70ea9a5 100644 (file)
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -45,6 +45,9 @@
 #endif
 
 #ifdef G_OS_WIN32
 #endif
 
 #ifdef G_OS_WIN32

+
+#define fsync _commit
+

 #if GLIB_CHECK_VERSION (2, 13, 2)
 #define pipe(phandles)  _pipe (phandles, 4096, _O_BINARY)
 #endif
 #if GLIB_CHECK_VERSION (2, 13, 2)
 #define pipe(phandles)  _pipe (phandles, 4096, _O_BINARY)
 #endif

diff --git a/src/plugins/pgpcore/plugin.def b/src/plugins/pgpcore/plugin.def
index 9e75366fa883210d0aa9ed090a10330eccdee648..8ba04621f8cecd7ff4c402e9ca3969325eefb93d 100644 (file)
--- a/src/plugins/pgpcore/plugin.def
+++ b/src/plugins/pgpcore/plugin.def
@@ -24,3 +24,5 @@ EXPORTS
         prefs_gpg_remove_skip_encryption_warning
         prefs_gpg_should_skip_encryption_warning
         prefs_gpg_get_config
         prefs_gpg_remove_skip_encryption_warning
         prefs_gpg_should_skip_encryption_warning
         prefs_gpg_get_config

+
+       cm_gpgme_data_rewind