[svn] GpgEX - r80 - in trunk: . src

[svn author marcus]

Author: marcus
Date: 2010-04-20 18:23:46 +0200 (Tue, 20 Apr 2010)
New Revision: 80

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/ChangeLog
   trunk/src/client.cc
   trunk/src/main.cc
Log:
2010-04-20  Marcus Brinkmann  <marcus at g10code.de>

	* configure.ac: Bump version to 0.9.6.
	(NEED_LIBASSUAN_API): Bump to 2.
	(NEED_LIBASSAUN_VERSION): Bump to 2.0.0.

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

	* client.cc (getinfo_pid_cb): Return gpg_error_t.
	(uiserver_connect): Port to new assuan interface.
	* main.cc (DllMain): Likewise.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-04-20 13:42:07 UTC (rev 79)
+++ trunk/ChangeLog	2010-04-20 16:23:46 UTC (rev 80)
@@ -1,3 +1,9 @@
+2010-04-20  Marcus Brinkmann  <marcus at g10code.de>
+
+	* configure.ac: Bump version to 0.9.6.
+	(NEED_LIBASSUAN_API): Bump to 2.
+	(NEED_LIBASSAUN_VERSION): Bump to 2.0.0.
+
 2010-04-20  Emanuel Schütze <emanuel at intevation.de>
 
 	* po/de.po: Use "pruefen" instead "ueberpruefen" for signatures.

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-04-20 13:42:07 UTC (rev 79)
+++ trunk/src/ChangeLog	2010-04-20 16:23:46 UTC (rev 80)
@@ -1,3 +1,9 @@
+2010-04-20  Marcus Brinkmann  <marcus at g10code.de>
+
+	* client.cc (getinfo_pid_cb): Return gpg_error_t.
+	(uiserver_connect): Port to new assuan interface.
+	* main.cc (DllMain): Likewise.
+
 2010-02-10  Marcus Brinkmann  <marcus at g10code.de>
 
 	* gpgex.cc (gpgex_t::Initialize): Default to sign/encrypt if a

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2010-04-20 13:42:07 UTC (rev 79)
+++ trunk/configure.ac	2010-04-20 16:23:46 UTC (rev 80)
@@ -16,7 +16,7 @@
 # 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], [0.9.5])
+m4_define([my_version], [0.9.6])
 m4_define([my_issvn], [no])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
@@ -31,8 +31,8 @@
 
 NEED_GPG_ERROR_VERSION=1.4
 
-NEED_LIBASSUAN_API=1
-NEED_LIBASSUAN_VERSION=0.9.3
+NEED_LIBASSUAN_API=2
+NEED_LIBASSUAN_VERSION=2.0.0
 
 AC_CONFIG_SRCDIR(src/gpgex.def)
 AM_CONFIG_HEADER(config.h)

Modified: trunk/src/client.cc
===================================================================
--- trunk/src/client.cc	2010-04-20 13:42:07 UTC (rev 79)
+++ trunk/src/client.cc	2010-04-20 16:23:46 UTC (rev 80)
@@ -191,7 +191,7 @@
 }
 
 
-static int
+static gpg_error_t
 getinfo_pid_cb (void *opaque, const void *buffer, size_t length)
 {
   pid_t *pid = (pid_t *) opaque;
@@ -238,10 +238,10 @@
 }
 
 
-static int
+static gpg_error_t
 uiserver_connect (assuan_context_t *ctx, HWND hwnd)
 {
-  int rc;
+  gpg_error_t rc;
   const char *socket_name = NULL;
   pid_t pid;
 
@@ -255,9 +255,16 @@
     }
 
   (void) TRACE_LOG1 ("socket name: %s", socket_name);
-  rc = assuan_socket_connect (ctx, socket_name, -1);
+  rc = assuan_new (ctx);
   if (rc)
     {
+      (void) TRACE_LOG ("could not allocate context");
+      return TRACE_GPGERR (rc);
+    }
+
+  rc = assuan_socket_connect (*ctx, socket_name, -1, 0);
+  if (rc)
+    {
       int count;
 
       (void) TRACE_LOG ("UI server not running, starting it");
@@ -271,7 +278,7 @@
       for (count = 0; count < 10; count++)
 	{
 	  Sleep (1000);
-	  rc = assuan_socket_connect (ctx, socket_name, -1);
+	  rc = assuan_socket_connect (*ctx, socket_name, -1, 0);
 	  if (!rc)
 	    break;
 	}
@@ -285,7 +292,7 @@
       rc = send_options (*ctx, hwnd, &pid);
       if (rc)
 	{
-	  assuan_disconnect (*ctx);
+	  assuan_release (*ctx);
 	  *ctx = NULL;
 	}
     }
@@ -343,7 +350,7 @@
  leave:
   TRACE_GPGERR (rc);
   if (ctx)
-    assuan_disconnect (ctx);
+    assuan_release (ctx);
   if (rc)
     {
       char buf[256];

Modified: trunk/src/main.cc
===================================================================
--- trunk/src/main.cc	2010-04-20 13:42:07 UTC (rev 79)
+++ trunk/src/main.cc	2010-04-20 16:23:46 UTC (rev 80)
@@ -219,7 +219,7 @@
 	  assuan_set_assuan_log_stream (debug_file);
 	  assuan_set_assuan_log_prefix ("gpgex:assuan");
 	}
-      assuan_set_assuan_err_source (GPG_ERR_SOURCE_DEFAULT);
+      assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
 
       (void) TRACE0 (DEBUG_INIT, "DllMain", hinst,
 		     "reason=DLL_PROCESS_ATTACH");