[balsa] Check for empty return from GpgME

[Peter Bloomfield <PeterB src gnome org>]

commit c0780de01b6c269637ca26c18a0028d54bbdb514
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Wed Feb 8 22:15:52 2012 -0500

    Check for empty return from GpgME
    
    	* libbalsa/gmime-part-rfc2440.c (g_mime_part_rfc2440_verify):
    	check for empty return from GpgME.

 ChangeLog                     |   24 ++++++++++++++++++++++++
 libbalsa/gmime-part-rfc2440.c |    2 +-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c508c46..7011644 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+<<<<<<< HEAD
+=======
+2012-02-08  Albrecht DreÃ
+
+	* libbalsa/gmime-part-rfc2440.c (g_mime_part_rfc2440_verify):
+	check for empty return from GpgME.
+
+2012-02-03  Peter Bloomfield
+
+	* configure.in: remove obsolete BUILD_WITH_GNOME.
+
+2011-12-20  Peter Bloomfield
+
+	* configure.in: use git tag to set version.
+
+2011-12-20  Peter Bloomfield
+
+	* Makefile.am: drop GNOME_Balsa.server.in from balsa_extra_dist.
+
+2011-12-20  Peter Bloomfield
+
+	* .gitignore: add .libs.
+
+>>>>>>> 971d850... Check for empty return from GpgME
 2011-12-20  Albrecht DreÃ
 
 	* libbalsa/rfc3156.c: suppress GLib warning when the message is
diff --git a/libbalsa/gmime-part-rfc2440.c b/libbalsa/gmime-part-rfc2440.c
index 4c032c6..e5b927a 100644
--- a/libbalsa/gmime-part-rfc2440.c
+++ b/libbalsa/gmime-part-rfc2440.c
@@ -259,7 +259,7 @@ g_mime_part_rfc2440_verify(GMimePart * part, GError ** err)
 			      TRUE, err);
 
     /* upon success, replace the signed content by the checked one */
-    if (result) {
+    if (result && g_mime_stream_length(plainstream) > 0) {
 	GMimeDataWrapper *wrapper = g_mime_data_wrapper_new();
 
 	g_mime_data_wrapper_set_stream(wrapper, plainstream);