2006-10-17 [colin] 2.5.5cvs10

	* src/plugins/pgpcore/pgp_viewer.c
		Fix return status

diff --git a/ChangeLog b/ChangeLog
index 4a19ba24598ff52da0c765e08c8c6fec506d0414..db112bf92cad998ce38a38086945405e46e80839 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-17 [colin]     2.5.5cvs10
+
+       * src/plugins/pgpcore/pgp_viewer.c
+               Fix return status
+
 2006-10-17 [colin]     2.5.5cvs9
 
        * src/quote_fmt.c

diff --git a/PATCHSETS b/PATCHSETS
index 61b35460b203a7198b6e702c735c555db2ee02d5..f0d7a3d6fd68b1f57c967712c11685c559ec5474 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1995,3 +1995,4 @@
 ( cvs diff -u -r 1.12.2.32 -r 1.12.2.33 src/prefs_template.c;  ) > 2.5.5cvs7.patchset
 ( cvs diff -u -r 1.96.2.155 -r 1.96.2.156 src/textview.c;  ) > 2.5.5cvs8.patchset
 ( cvs diff -u -r 1.8.2.11 -r 1.8.2.12 src/quote_fmt.c;  ) > 2.5.5cvs9.patchset
+( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpcore/pgp_viewer.c;  ) > 2.5.5cvs10.patchset

diff --git a/configure.ac b/configure.ac
index b412d0218d2eb8c2c2a39eaa4335912d2a63efdd..6eeb75681966fed837f71b9e73b6606c3af14bbe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=9
+EXTRA_VERSION=10
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/pgpcore/pgp_viewer.c b/src/plugins/pgpcore/pgp_viewer.c
index 41559f7e61796b889e5c9a6499ad6f835deb9998..fffc82a71d56a120e779d7dd7c9fcf3b6aa2a9d6 100644 (file)
--- a/src/plugins/pgpcore/pgp_viewer.c
+++ b/src/plugins/pgpcore/pgp_viewer.c
@@ -147,6 +147,7 @@ static void pgpview_show_mime_part(TextView *textview, MimeInfo *partinfo)
                        } else if (pid == 0) {
                                /* son */
                                res = system(cmd);
+                               res = WEXITSTATUS(res);
                                _exit(res);
                        } else {
                                int status = 0;