From: Thorsten Maerz <torte@netztorte.de>
Date: Sun, 3 Nov 2002 20:37:45 +0000 (+0000)
Subject: add check if gpg is active
X-Git-Tag: w0-1~82
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=0d00ee9a76165e26758840580836348042d38c80

add check if gpg is active
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e0987ec21..f9b57ddae 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2002-11-03 [thorsten]	0.8.5claws69
+
+	* src/main.c
+	  src/mimeview.c
+	  src/rfc2015.h
+	  	add check if gpg is active
+
 2002-11-03 [thorsten]	0.8.5claws68
 
 	* src/toolbar.h
diff --git a/configure.in b/configure.in
index 13f914a53..cda73439f 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws68
+EXTRA_VERSION=claws69
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/main.c b/src/main.c
index 5aaddc1b8..14f7c573b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -263,6 +263,7 @@ int main(int argc, char *argv[])
 	prefs_common_read_config();
 
 #if USE_GPGME
+	gpg_started = FALSE;
 	if (gpgme_check_engine()) {  /* Also does some gpgme init */
 		rfc2015_disable_all();
 		debug_print("gpgme_engine_version:\n%s\n",
@@ -278,7 +279,9 @@ int main(int argc, char *argv[])
 			if (val & G_ALERTDISABLE)
 				prefs_common.gpg_warning = FALSE;
 		}
-	}
+	} else
+		gpg_started = TRUE;
+
 	gpgme_register_idle(idle_function_for_gpgme);
 #endif
 
diff --git a/src/mimeview.c b/src/mimeview.c
index 65b8f701b..6116e6565 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -305,7 +305,8 @@ void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
 
 	procmime_scan_multipart_message(mimeinfo, fp);
 #if USE_GPGME
-	if (prefs_common.auto_check_signatures)
+	if ((prefs_common.auto_check_signatures)
+	    && (gpg_started))
 		rfc2015_check_signature(mimeinfo, fp);
 	else
 		set_unchecked_signature(mimeinfo);
@@ -1064,6 +1065,7 @@ void mimeview_check_signature(MimeView *mimeview)
 	FILE *fp;
 
 	g_return_if_fail (mimeview_is_signed(mimeview));
+	g_return_if_fail (gpg_started);
 
 	mimeinfo = gtk_ctree_node_get_row_data
 		(GTK_CTREE(mimeview->ctree), mimeview->opened);
diff --git a/src/rfc2015.h b/src/rfc2015.h
index d9def6fb4..cf6ca4f42 100644
--- a/src/rfc2015.h
+++ b/src/rfc2015.h
@@ -45,4 +45,5 @@ gint rfc2015_sign			(const gchar	*file,
 gint rfc2015_clearsign			(const gchar	*file,
 					 GSList		*key_list);
 
+gboolean gpg_started;
 #endif /* __RFC2015_H__ */