From: Colin Leroy <colin@colino.net>
Date: Tue, 17 Oct 2006 06:01:59 +0000 (+0000)
Subject: 2006-10-17 [colin]	2.5.5cvs11
X-Git-Tag: rel_2_6_0~31
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=30ef5f10f1bfbe368a5ada3df699f6c353fc0285;hp=e3a8ee402709ce3fa96579e1d096e163e43b91c4

2006-10-17 [colin]	2.5.5cvs11

	* src/plugins/pgpcore/sgpgme.c
		Fix return status
---

diff --git a/ChangeLog b/ChangeLog
index db112bf92..1fdf14346 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-17 [colin]	2.5.5cvs11
+
+	* src/plugins/pgpcore/sgpgme.c
+		Fix return status
+
 2006-10-17 [colin]	2.5.5cvs10
 
 	* src/plugins/pgpcore/pgp_viewer.c
diff --git a/PATCHSETS b/PATCHSETS
index f0d7a3d6f..88b9f0d75 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1996,3 +1996,4 @@
 ( 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
+( cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/plugins/pgpcore/sgpgme.c;  ) > 2.5.5cvs11.patchset
diff --git a/configure.ac b/configure.ac
index 6eeb75681..87b1ad973 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=10
+EXTRA_VERSION=11
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 77295a684..a4c744475 100644
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -719,6 +719,7 @@ again:
 			} else if (pid == 0) {
 				/* son */
 				res = system(cmd);
+				res = WEXITSTATUS(res);
 				_exit(res);
 			} else {
 				int status = 0;