[svn] GpgOL - r334 - in trunk: . src

[svn author marcus]

Author: marcus
Date: 2010-04-21 05:23:36 +0200 (Wed, 21 Apr 2010)
New Revision: 334

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/ChangeLog
   trunk/src/engine-assuan.c
Log:
2010-04-21  Marcus Brinkmann  <marcus at g10code.de>

	* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION): Bump
	to 2/2.0.0.
	(_ASSUAN_ONLY_GPG_ERRORS): Remove.

src/
2010-04-21  Marcus Brinkmann  <marcus at g10code.de>

	* engine-assuan.c (connect_uiserver): Update to new libassuan
	interface.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-01-13 11:33:39 UTC (rev 333)
+++ trunk/ChangeLog	2010-04-21 03:23:36 UTC (rev 334)
@@ -1,3 +1,9 @@
+2010-04-21  Marcus Brinkmann  <marcus at g10code.de>
+
+	* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION): Bump
+	to 2/2.0.0.
+	(_ASSUAN_ONLY_GPG_ERRORS): Remove.
+
 2010-01-13  Werner Koch  <wk at g10code.com>
 
 	Release 1.1.1.

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-01-13 11:33:39 UTC (rev 333)
+++ trunk/src/ChangeLog	2010-04-21 03:23:36 UTC (rev 334)
@@ -1,3 +1,8 @@
+2010-04-21  Marcus Brinkmann  <marcus at g10code.de>
+
+	* engine-assuan.c (connect_uiserver): Update to new libassuan
+	interface.
+
 2010-01-13  Werner Koch  <wk at g10code.com>
 
 	* README.icons: Change instructions to better cope with alpha

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2010-01-13 11:33:39 UTC (rev 333)
+++ trunk/configure.ac	2010-04-21 03:23:36 UTC (rev 334)
@@ -16,8 +16,8 @@
 # Remember to change the version number immediately *after* a release.
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [1.1.1])
-m4_define([my_issvn], [no])
+m4_define([my_version], [1.1.2])
+m4_define([my_issvn], [yes])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
             || echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
@@ -28,8 +28,8 @@
 NEED_GPG_ERROR_VERSION=1.4
 NEED_GPGME_API=1
 NEED_GPGME_VERSION=1.1.0
-NEED_LIBASSUAN_API=1
-NEED_LIBASSUAN_VERSION=1.0.4
+NEED_LIBASSUAN_API=2
+NEED_LIBASSUAN_VERSION=2.0.0
 
 
 SVN_REVISION=svn_revision
@@ -156,13 +156,7 @@
 AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
                   have_libassuan=yes,have_libassuan=no)
 
-AH_BOTTOM([
-/* We don't want the old assuan codes anymore. */
-#define _ASSUAN_ONLY_GPG_ERRORS 1
-])
 
-
-
 # Note, that autogen.sh greps for the next line.
 AM_GNU_GETTEXT_VERSION(0.12.1)
 AM_GNU_GETTEXT([external])

Modified: trunk/src/engine-assuan.c
===================================================================
--- trunk/src/engine-assuan.c	2010-01-13 11:33:39 UTC (rev 333)
+++ trunk/src/engine-assuan.c	2010-04-21 03:23:36 UTC (rev 334)
@@ -1,5 +1,5 @@
 /* engine-assuan.c - Crypto engine using an Assuan server
- *	Copyright (C) 2007, 2008, 2009 g10 Code GmbH
+ *	Copyright (C) 2007, 2008, 2009, 2010 g10 Code GmbH
  *
  * This file is part of GpgOL.
  *
@@ -463,8 +463,15 @@
   *r_ctx = NULL;
   *r_pid = (pid_t)(-1);
   *r_cmdid = 0;
+  err = assuan_new (&ctx);
+  if (err)
+    {
+      InterlockedExchange (&retry_counter, 0);
+      return 0;
+    }
+      
  retry:
-  err = assuan_socket_connect (&ctx, get_socket_name (), -1);
+  err = assuan_socket_connect (ctx, get_socket_name (), -1, 0);
   if (err)
     {
       /* Let only one thread start an UI server but all allow threads
@@ -519,7 +526,7 @@
     }
   else if ((err = send_options (ctx, hwnd, r_pid)))
     {
-      assuan_disconnect (ctx);
+      assuan_release (ctx);
     }
   else
     {
@@ -583,7 +590,7 @@
   if (!err)
     {
       err = assuan_transact (ctx, "NOP", NULL, NULL, NULL, NULL, NULL, NULL);
-      assuan_disconnect (ctx);
+      assuan_release (ctx);
     }
   if (err)
     return err;
@@ -1729,7 +1736,7 @@
       close_pipe (inpipe);
       close_pipe (outpipe);
       xfree (cld);
-      assuan_disconnect (ctx);
+      assuan_release (ctx);
     }
   else
     engine_private_set_cancel (filter, ctx);
@@ -1767,7 +1774,7 @@
       close_pipe (encstate->outpipe);
       if (cancel)
         destroy_command (encstate->cmdid, 1);
-      assuan_disconnect (encstate->ctx);
+      assuan_release (encstate->ctx);
       encstate->ctx = NULL;
     }
   else
@@ -1897,7 +1904,7 @@
       close_pipe (inpipe);
       close_pipe (outpipe);
       xfree (cld);
-      assuan_disconnect (ctx);
+      assuan_release (ctx);
     }
   else
     engine_private_set_cancel (filter, ctx);
@@ -1995,7 +2002,7 @@
       close_pipe (inpipe);
       close_pipe (outpipe);
       xfree (cld);
-      assuan_disconnect (ctx);
+      assuan_release (ctx);
     }
   else
     engine_private_set_cancel (filter, ctx);
@@ -2152,7 +2159,7 @@
       close_pipe (outpipe);
       gpgme_data_release (sigdata);
       xfree (cld);
-      assuan_disconnect (ctx);
+      assuan_release (ctx);
     }
   else
     engine_private_set_cancel (filter, ctx);
@@ -2175,7 +2182,7 @@
     {
       err = assuan_transact (ctx, "START_KEYMANAGER",
                              NULL, NULL, NULL, NULL, NULL, NULL);
-      assuan_disconnect (ctx);
+      assuan_release (ctx);
     }
   return err;
 }
@@ -2196,7 +2203,7 @@
     {
       err = assuan_transact (ctx, "START_CONFDIALOG",
                              NULL, NULL, NULL, NULL, NULL, NULL);
-      assuan_disconnect (ctx);
+      assuan_release (ctx);
     }
   return err;
 }