[gmime] Always run gpg in batch mode

[Jeffrey Stedfast <fejj src gnome org>]

commit ac620000c5a7b97fc6c03d5781587b51ae0ba55a
Author: Jeffrey Stedfast <jestedfa microsoft com>
Date:   Tue Jul 19 12:06:16 2016 -0400

    Always run gpg in batch mode
    
    2016-07-19  Jeffrey Stedfast  <jeff xamarin com>
    
        * gmime/gmime-gpg-context.c (gpg_ctx_get_argv): Always use --batch mode and
        don't pass --yes.

 ChangeLog                 |    5 +++++
 gmime/gmime-gpg-context.c |   10 +---------
 2 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 70bd761..573dcbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-19  Jeffrey Stedfast  <jeff xamarin com>
+
+       * gmime/gmime-gpg-context.c (gpg_ctx_get_argv): Always use --batch mode and
+       don't pass --yes.
+
 2016-07-14  Jeffrey Stedfast  <fejj gnome org>
 
        * gmime/gmime-parser.c (parser_construct_part): When parsing individual
diff --git a/gmime/gmime-gpg-context.c b/gmime/gmime-gpg-context.c
index 56a2dbc..0a05ed2 100644
--- a/gmime/gmime-gpg-context.c
+++ b/gmime/gmime-gpg-context.c
@@ -608,15 +608,7 @@ gpg_ctx_get_argv (struct _GpgCtx *gpg, int status_fd, int secret_fd, char ***str
        g_ptr_array_add (args, "--no-secmem-warning");
        g_ptr_array_add (args, "--no-greeting");
        g_ptr_array_add (args, "--no-tty");
-       
-       if (!gpg->need_passwd) {
-               /* only use batch mode if we don't intend on using the
-                   interactive --command-fd option to send it the
-                   user's password */
-               g_ptr_array_add (args, "--batch");
-               g_ptr_array_add (args, "--yes");
-       }
-       
+       g_ptr_array_add (args, "--batch");
        g_ptr_array_add (args, "--charset=UTF-8");
        
        (*strv)[v++] = buf = g_strdup_printf ("--status-fd=%d", status_fd);