[svn] gpgme - r1479 - trunk/src

[svn author marcus]

Author: marcus
Date: 2010-06-10 18:13:14 +0200 (Thu, 10 Jun 2010)
New Revision: 1479

Modified:
   trunk/src/ChangeLog
   trunk/src/engine-gpgsm.c
Log:
2010-06-10  Marcus Brinkmann  <marcus at g10code.de>

	* engine-gpgsm.c (gpgsm_new): Translate returned achild_fds back
	to child_fds.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-06-10 13:49:19 UTC (rev 1478)
+++ trunk/src/ChangeLog	2010-06-10 16:13:14 UTC (rev 1479)
@@ -1,5 +1,8 @@
 2010-06-10  Marcus Brinkmann  <marcus at g10code.de>
 
+	* engine-gpgsm.c (gpgsm_new): Translate returned achild_fds back
+	to child_fds.
+
 	* debug.h (TRACE_SUC6): New macro.
 	* w32-io.c (MAX_SLAFD): New macro.
 	(fd_table): New static variable.

Modified: trunk/src/engine-gpgsm.c
===================================================================
--- trunk/src/engine-gpgsm.c	2010-06-10 13:49:19 UTC (rev 1478)
+++ trunk/src/engine-gpgsm.c	2010-06-10 16:13:14 UTC (rev 1479)
@@ -351,6 +351,10 @@
     err = assuan_pipe_connect
       (gpgsm->assuan_ctx, file_name ? file_name : _gpgme_get_gpgsm_path (),
        argv, achild_fds, NULL, NULL, 0);
+
+    /* For now... */
+    for (i = 0; i < 4; i++)
+      child_fds[i] = (int) achild_fds[i];
   }
 
   /* On Windows, handles are inserted in the spawned process with