[Gpa-commits] r953 - trunk/src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2009-02-24 15:19:00 +0100 (Tue, 24 Feb 2009)
New Revision: 953

Modified:
   trunk/src/ChangeLog
   trunk/src/cardman.c
   trunk/src/cm-openpgp.c
Log:
Adjust for changed gpgme_op_assuan interface.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-02-20 18:41:46 UTC (rev 952)
+++ trunk/src/ChangeLog	2009-02-24 14:19:00 UTC (rev 953)
@@ -1,3 +1,9 @@
+2009-02-24  Werner Koch  <wk at g10code.com>
+
+	* cardman.c (scd_inq_cb): Adjust for changed gpgme API.
+	(card_reload): Ditto.
+	* cm-openpgp.c (reload_data): Ditto.
+
 2009-02-20  Werner Koch  <wk at g10code.com>
 
 	* cm-openpgp.c: Implemented an entry edit framework.

Modified: trunk/src/cardman.c
===================================================================
--- trunk/src/cardman.c	2009-02-20 18:41:46 UTC (rev 952)
+++ trunk/src/cardman.c	2009-02-24 14:19:00 UTC (rev 953)
@@ -179,8 +179,7 @@
 
 static gpg_error_t
 scd_inq_cb (void *opaque, const char *name, const char *args,
-            gpgme_assuan_sendfnc_t sendfnc,
-            gpgme_assuan_sendfnc_ctx_t sendfnc_value)
+            gpgme_data_t *r_data)
 {
 /*   g_debug ("INQ_CB: name=`%s' args=`%s'", name, args); */
 
@@ -255,7 +254,7 @@
                                       scd_inq_cb, NULL,
                                       scd_status_cb, cardman);
       if (!err)
-        err = gpgme_op_assuan_result (cardman->gpgagent);
+        err = gpgme_op_assuan_result (cardman->gpgagent)->err;
 
       if (gpg_err_code (err) == GPG_ERR_CARD_NOT_PRESENT)
         ;
@@ -278,7 +277,7 @@
                                           scd_inq_cb, NULL,
                                           scd_status_cb, cardman);
           if (!err)
-            err = gpgme_op_assuan_result (cardman->gpgagent);
+            err = gpgme_op_assuan_result (cardman->gpgagent)->err;
 
           if (gpg_err_code (err) == GPG_ERR_CARD_NOT_PRESENT)
             statusbar_update (cardman, _("No card"));
@@ -357,7 +356,7 @@
                                   "SCD GETINFO deny_admin",
                                   NULL, NULL, NULL, NULL, NULL, NULL);
   if (!err)
-    err = gpgme_op_assuan_result (cardman->gpgagent);
+    err = gpgme_op_assuan_result (cardman->gpgagent)->err;
   if (!err)
     {
       gpa_window_error ("Admin commands are disabled in scdamon.\n"

Modified: trunk/src/cm-openpgp.c
===================================================================
--- trunk/src/cm-openpgp.c	2009-02-20 18:41:46 UTC (rev 952)
+++ trunk/src/cm-openpgp.c	2009-02-24 14:19:00 UTC (rev 953)
@@ -348,7 +348,7 @@
                                       NULL, NULL,
                                       scd_getattr_cb, &parm);
       if (!err)
-        err = gpgme_op_assuan_result (gpgagent);
+        err = gpgme_op_assuan_result (gpgagent)->err;
 
       if (err)
         {