2006-09-13 [wwp] 2.4.0cvs181

	* src/plugins/pgpinline/sylpheed.def
	* src/textview.c
		merge more w32 patches from gpg4win sources (Marcus Brinkmann <marcus@g10code.de>):
		add privacy_reset_error to the .def file,
		do not fork for an external textviewer.

diff --git a/ChangeLog b/ChangeLog
index 6ea9d1634b5596e5cdbfd3f13343a92df6a2db66..762dce13fd6ff75164f2ec74c0d0dcd43626603f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-13 [wwp]       2.4.0cvs181
+
+       * src/plugins/pgpinline/sylpheed.def
+       * src/textview.c
+               merge more w32 patches from gpg4win sources (Marcus Brinkmann <marcus@g10code.de>):
+               add privacy_reset_error to the .def file,
+               do not fork for an external textviewer.
+

 2006-09-13 [wwp]       2.4.0cvs180
 
        * src/prefs_common.c
 2006-09-13 [wwp]       2.4.0cvs180
 
        * src/prefs_common.c

diff --git a/PATCHSETS b/PATCHSETS
index 16788ee051f13a768ef35e2e0f58af08c9b5bbea..a96576daea4c65d785953189a199cbf26d53bdc2 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1872,3 +1872,4 @@
 ( cvs diff -u -r 1.60.2.41 -r 1.60.2.42 src/prefs_actions.c;  cvs diff -u -r 1.1.4.29 -r 1.1.4.30 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.46 -r 1.43.2.47 src/prefs_matcher.c;  ) > 2.4.0cvs178.patchset
 ( cvs diff -u -r 1.87.2.29 -r 1.87.2.30 src/folder.h;  cvs diff -u -r 1.274.2.149 -r 1.274.2.150 src/mainwindow.c;  cvs diff -u -r 1.395.2.247 -r 1.395.2.248 src/summaryview.c;  cvs diff -u -r 1.68.2.25 -r 1.68.2.26 src/summaryview.h;  ) > 2.4.0cvs179.patchset
 ( cvs diff -u -r 1.204.2.100 -r 1.204.2.101 src/prefs_common.c;  ) > 2.4.0cvs180.patchset
 ( cvs diff -u -r 1.60.2.41 -r 1.60.2.42 src/prefs_actions.c;  cvs diff -u -r 1.1.4.29 -r 1.1.4.30 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.46 -r 1.43.2.47 src/prefs_matcher.c;  ) > 2.4.0cvs178.patchset
 ( cvs diff -u -r 1.87.2.29 -r 1.87.2.30 src/folder.h;  cvs diff -u -r 1.274.2.149 -r 1.274.2.150 src/mainwindow.c;  cvs diff -u -r 1.395.2.247 -r 1.395.2.248 src/summaryview.c;  cvs diff -u -r 1.68.2.25 -r 1.68.2.26 src/summaryview.h;  ) > 2.4.0cvs179.patchset
 ( cvs diff -u -r 1.204.2.100 -r 1.204.2.101 src/prefs_common.c;  ) > 2.4.0cvs180.patchset

+( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpinline/sylpheed.def;  cvs diff -u -r 1.96.2.146 -r 1.96.2.147 src/textview.c;  ) > 2.4.0cvs181.patchset

diff --git a/configure.ac b/configure.ac
index b22e9fc55af0dbad2362cc36d366fcead97afbf2..73c11a7474a1610475d458015f106fba3d9d7807 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=180
+EXTRA_VERSION=181

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/pgpinline/sylpheed.def b/src/plugins/pgpinline/sylpheed.def
index 998fc1c7e533d58c047cd5e70cc8293509637478..8c0dd1c5da71205a7bdd932277983b6609274871 100644 (file)
--- a/src/plugins/pgpinline/sylpheed.def
+++ b/src/plugins/pgpinline/sylpheed.def
@@ -19,3 +19,4 @@ procmime_write_mimeinfo
 sylpheed_get_version
 privacy_set_error
 privacy_get_error
 sylpheed_get_version
 privacy_set_error
 privacy_get_error

+privacy_reset_error

diff --git a/src/textview.c b/src/textview.c
index 0fe2b89d17312574e5d9d640af1ced7124953ef6..98cee2683ed4492910f76103644933c512bd69e6 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -35,7 +35,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>

+#if HAVE_SYS_WAIT_H

 #include <sys/wait.h>
 #include <sys/wait.h>

+#endif

 #if HAVE_LIBCOMPFACE
 #  include <compface.h>
 #endif
 #if HAVE_LIBCOMPFACE
 #  include <compface.h>
 #endif


@@ -926,6 +928,7 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
                        g_unlink(filename);
                }
                g_free(filename);
                        g_unlink(filename);
                }
                g_free(filename);

+#ifndef G_OS_WIN32

        } else if ( g_ascii_strcasecmp(mimeinfo->subtype, "plain") &&
                   (cmd = prefs_common.mime_textviewer) && *cmd &&
                   (p = strchr(cmd, '%')) && *(p + 1) == 's') {
        } else if ( g_ascii_strcasecmp(mimeinfo->subtype, "plain") &&
                   (cmd = prefs_common.mime_textviewer) && *cmd &&
                   (p = strchr(cmd, '%')) && *(p + 1) == 's') {


@@ -988,6 +991,7 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
                fclose(tmpfp);
                waitpid(pid, pfd, 0);
                unlink(fname);
                fclose(tmpfp);
                waitpid(pid, pfd, 0);
                unlink(fname);

+#endif

        } else {
 textview_default:
                lines = 0;
        } else {
 textview_default:
                lines = 0;