[Gpa-commits] r1003 - trunk/src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2009-06-10 10:19:28 +0200 (Wed, 10 Jun 2009)
New Revision: 1003

Modified:
   trunk/src/ChangeLog
   trunk/src/gpgmetools.c
Log:
Fix autostart of gpg-agent


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-06-09 17:53:28 UTC (rev 1002)
+++ trunk/src/ChangeLog	2009-06-10 08:19:28 UTC (rev 1003)
@@ -1,3 +1,8 @@
+2009-06-10  Werner Koch  <wk at g10code.com>
+
+	* gpgmetools.c (gpa_start_simple_gpg_command): Do not use
+	status-fd with gpg-connect-agent.
+
 2009-06-09  Werner Koch  <wk at g10code.com>
 
 	* gpgmeedit.c (edit_fnc): Use gpgme_io_write.

Modified: trunk/src/gpgmetools.c
===================================================================
--- trunk/src/gpgmetools.c	2009-06-09 17:53:28 UTC (rev 1002)
+++ trunk/src/gpgmetools.c	2009-06-10 08:19:28 UTC (rev 1003)
@@ -1420,7 +1420,8 @@
     argv[0] = NULL;
   g_return_val_if_fail (argv[0], gpg_error (GPG_ERR_INV_ARG));
   argc = 1;
-  if (protocol != GPGME_PROTOCOL_GPGCONF)
+  if (protocol != GPGME_PROTOCOL_GPGCONF
+      && protocol != GPGME_PROTOCOL_ASSUAN)
     {
       argv[argc++] = (char*)"--status-fd";
       argv[argc++] = (char*)"2";