we don't want this warning, as it is default now, and that some people may

want not to use gpg at all.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/lib-crypt/crypt-gpgme.c b/lib-crypt/crypt-gpgme.c
index 7c24186..d9f86da 100644 (file)
--- a/lib-crypt/crypt-gpgme.c
+++ b/lib-crypt/crypt-gpgme.c
@@ -82,17 +82,6 @@ typedef struct crypt_entry {
 static struct crypt_cache *id_defaults = NULL;
 static gpgme_key_t signature_key = NULL;
 
 static struct crypt_cache *id_defaults = NULL;
 static gpgme_key_t signature_key = NULL;
 

-/* Initialization.  */
-void crypt_init(void)
-{
-    /* Make sure that gpg-agent is running.  */
-    if (!getenv ("GPG_AGENT_INFO")) {
-        mutt_error ("\nUsing GPGME backend, although no gpg-agent is running");
-        if (mutt_any_key_to_continue (NULL) == -1)
-            mutt_exit (1);
-    }
-}
-

 /* Show a message that a backend will be invoked. */
 void crypt_invoke_message (int type)
 {
 /* Show a message that a backend will be invoked. */
 void crypt_invoke_message (int type)
 {

diff --git a/lib-crypt/crypt.h b/lib-crypt/crypt.h
index 06bfd1d..130daef 100644 (file)
--- a/lib-crypt/crypt.h
+++ b/lib-crypt/crypt.h
@@ -203,6 +203,4 @@ int crypt_smime_send_menu (HEADER * msg, int *redraw);
 /* fixme: needs documentation */
 int crypt_smime_verify_one (BODY * sigbdy, STATE * s, const char *tempf);
 
 /* fixme: needs documentation */
 int crypt_smime_verify_one (BODY * sigbdy, STATE * s, const char *tempf);
 

-void crypt_init (void);
-

 #endif /*MUTT_CRYPT_H */
 #endif /*MUTT_CRYPT_H */

diff --git a/main.c b/main.c
index 371c557..a02ecbc 100644 (file)
--- a/main.c
+++ b/main.c
@@ -580,9 +580,6 @@ int main (int argc, char **argv)
   mutt_init (flags & M_NOSYSRC, commands);
   string_list_wipe(&commands);
 
   mutt_init (flags & M_NOSYSRC, commands);
   string_list_wipe(&commands);
 

-  /* Initialize crypto */
-  crypt_init ();
-

   if (queries)
     return mutt_query_variables (queries);
   if (dump_variables > 0)
   if (queries)
     return mutt_query_variables (queries);
   if (dump_variables > 0)

diff --git a/mutt.h b/mutt.h
index 51e4ec2..1e6498d 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -317,7 +317,6 @@ enum {
   OPTTILDE,
   OPTUNCOLLAPSEJUMP,
   OPTUSEFROM,
   OPTTILDE,
   OPTUNCOLLAPSEJUMP,
   OPTUSEFROM,

-  OPTUSEGPGAGENT,

 #ifdef HAVE_LIBIDN
   OPTUSEIDN,
 #endif
 #ifdef HAVE_LIBIDN
   OPTUSEIDN,
 #endif