[svn] gpgme - r1127 - trunk/gpgme

[svn author marcus]

Author: marcus
Date: 2005-10-16 21:38:32 +0200 (Sun, 16 Oct 2005)
New Revision: 1127

Modified:
   trunk/gpgme/ChangeLog
   trunk/gpgme/rungpg.c
Log:
2005-10-16  Marcus Brinkmann  <marcus at g10code.de>

	* rungpg.c (gpg_edit): Don't add a key argument if in card edit
	mode.


Modified: trunk/gpgme/ChangeLog
===================================================================
--- trunk/gpgme/ChangeLog	2005-10-07 13:34:22 UTC (rev 1126)
+++ trunk/gpgme/ChangeLog	2005-10-16 19:38:32 UTC (rev 1127)
@@ -1,3 +1,8 @@
+2005-10-16  Marcus Brinkmann  <marcus at g10code.de>
+
+	* rungpg.c (gpg_edit): Don't add a key argument if in card edit
+	mode.
+
 2005-10-06  Marcus Brinkmann  <marcus at g10code.de>
 
 	* Makefile.am (gpgme.dll gpgme.dll.a): Use $(srcdir) for

Modified: trunk/gpgme/rungpg.c
===================================================================
--- trunk/gpgme/rungpg.c	2005-10-07 13:34:22 UTC (rev 1126)
+++ trunk/gpgme/rungpg.c	2005-10-16 19:38:32 UTC (rev 1127)
@@ -1356,7 +1356,7 @@
     err = add_data (gpg, out, 1, 1);
   if (!err)
     err = add_arg (gpg, "--");
-  if (!err)
+  if (!err && type == 0)
     {
       const char *s = key->subkeys ? key->subkeys->fpr : NULL;
       if (!s)