1.1 --- a/src/Makefile	Wed Apr 22 12:13:22 2015 +0200
     1.2 +++ b/src/Makefile	Wed Apr 22 12:38:51 2015 +0200
     1.3 @@ -85,7 +85,7 @@
     1.4  install: $(TARGET)
     1.5  	cp $< $(PREFIX)/lib/
     1.6  	mkdir -p $(PREFIX)/include/pEp
     1.7 -	cp pEpEngine.h keymanagement.h message_api.h dynamic_api.h stringlist.h $(PREFIX)/include/pEp/
     1.8 +	cp pEpEngine.h keymanagement.h message_api.h dynamic_api.h stringlist.h timestamp.h identity_list.h bloblist.h stringpair.h message.h mime.h $(PREFIX)/include/pEp/
     1.9  
    1.10  uninstall:
    1.11  	rm -f $(PREFIX)/lib/$(TARGET)

     2.1 --- a/src/keymanagement.c	Wed Apr 22 12:13:22 2015 +0200
     2.2 +++ b/src/keymanagement.c	Wed Apr 22 12:38:51 2015 +0200
     2.3 @@ -279,7 +279,7 @@
     2.4  
     2.5      while ((identity = retrieve_next_identity(management))) {
     2.6          assert(identity->address);
     2.7 -        DEBUG_LOG("do_keymanagement", "debug", identity->address);
     2.8 +        DEBUG_LOG("do_keymanagement", "retrieve_next_identity", identity->address);
     2.9          if (identity->me) {
    2.10              status = myself(session, identity);
    2.11              assert(status != PEP_OUT_OF_MEMORY);

     3.1 --- a/src/message_api.c	Wed Apr 22 12:13:22 2015 +0200
     3.2 +++ b/src/message_api.c	Wed Apr 22 12:38:51 2015 +0200
     3.3 @@ -2,6 +2,7 @@
     3.4  #include "message_api.h"
     3.5  
     3.6  #include "platform.h"
     3.7 +#include "mime.h"
     3.8  
     3.9  #include <assert.h>
    3.10  #include <string.h>

     4.1 --- a/src/message_api.h	Wed Apr 22 12:13:22 2015 +0200
     4.2 +++ b/src/message_api.h	Wed Apr 22 12:38:51 2015 +0200
     4.3 @@ -3,7 +3,6 @@
     4.4  #include "pEpEngine.h"
     4.5  #include "keymanagement.h"
     4.6  #include "message.h"
     4.7 -#include "mime.h"
     4.8  
     4.9  #ifdef __cplusplus
    4.10  extern "C" {

     5.1 --- a/src/pgp_gpg.c	Wed Apr 22 12:13:22 2015 +0200
     5.2 +++ b/src/pgp_gpg.c	Wed Apr 22 12:38:51 2015 +0200
     5.3 @@ -1479,9 +1479,9 @@
     5.4      struct gpgme_data_cbs data_cbs;
     5.5      memset(&data_cbs, 0, sizeof(struct gpgme_data_cbs));
     5.6      data_cbs.write = _nullwriter;
     5.7 -    gpgme_data_new_from_cbs(&output, &data_cbs, &handle);
     5.8 +    gpg.gpgme_data_new_from_cbs(&output, &data_cbs, &handle);
     5.9  
    5.10 -    gpgme_error = gpgme_op_edit(session->ctx, key, renew_fsm, &handle,
    5.11 +    gpgme_error = gpg.gpgme_op_edit(session->ctx, key, renew_fsm, &handle,
    5.12              output);
    5.13      assert(gpgme_error == GPG_ERR_NO_ERROR);
    5.14  
    5.15 @@ -1662,9 +1662,9 @@
    5.16      struct gpgme_data_cbs data_cbs;
    5.17      memset(&data_cbs, 0, sizeof(struct gpgme_data_cbs));
    5.18      data_cbs.write = _nullwriter;
    5.19 -    gpgme_data_new_from_cbs(&output, &data_cbs, &handle);
    5.20 +    gpg.gpgme_data_new_from_cbs(&output, &data_cbs, &handle);
    5.21  
    5.22 -    gpgme_error = gpgme_op_edit(session->ctx, key, revoke_fsm, &handle,
    5.23 +    gpgme_error = gpg.gpgme_op_edit(session->ctx, key, revoke_fsm, &handle,
    5.24              output);
    5.25      assert(gpgme_error == GPG_ERR_NO_ERROR);
    5.26  

     6.1 --- a/src/pgp_gpg_internal.h	Wed Apr 22 12:13:22 2015 +0200
     6.2 +++ b/src/pgp_gpg_internal.h	Wed Apr 22 12:38:51 2015 +0200
     6.3 @@ -18,6 +18,8 @@
     6.4  typedef gpgme_error_t(*gpgme_data_new_t)(gpgme_data_t *DH);
     6.5  typedef gpgme_error_t(*gpgme_data_new_from_mem_t)(gpgme_data_t *DH,
     6.6      const char *BUFFER, size_t SIZE, int COPY);
     6.7 +typedef gpgme_error_t (*gpgme_data_new_from_cbs_t)(gpgme_data_t *DH,
     6.8 +        gpgme_data_cbs_t CBS, void *HANDLE);
     6.9  typedef void(*gpgme_data_release_t)(gpgme_data_t DH);
    6.10  typedef gpgme_data_type_t(*gpgme_data_identify_t)(gpgme_data_t DH);
    6.11  typedef size_t(*gpgme_data_seek_t)(gpgme_data_t DH, size_t OFFSET,
    6.12 @@ -66,6 +68,8 @@
    6.13      gpgme_key_t *KEYS);
    6.14  typedef void(*gpgme_key_ref_t)(gpgme_key_t KEY);
    6.15  typedef void(*gpgme_key_unref_t)(gpgme_key_t KEY);
    6.16 +typedef gpgme_error_t (*gpgme_op_edit_t)(gpgme_ctx_t CTX, gpgme_key_t KEY,
    6.17 +        gpgme_edit_cb_t FNC, void *HANDLE, gpgme_data_t OUT);
    6.18  
    6.19  struct gpg_s {
    6.20      const char * version;
    6.21 @@ -78,6 +82,7 @@
    6.22  
    6.23      gpgme_data_new_t gpgme_data_new;
    6.24      gpgme_data_new_from_mem_t gpgme_data_new_from_mem;
    6.25 +    gpgme_data_new_from_cbs_t gpgme_data_new_from_cbs;
    6.26      gpgme_data_release_t gpgme_data_release;
    6.27      gpgme_data_identify_t gpgme_data_identify;
    6.28      gpgme_data_seek_t gpgme_data_seek;
    6.29 @@ -106,4 +111,5 @@
    6.30      gpgme_op_import_keys_t gpgme_op_import_keys;
    6.31      gpgme_key_ref_t gpgme_key_ref;
    6.32      gpgme_key_unref_t gpgme_key_unref;
    6.33 +    gpgme_op_edit_t gpgme_op_edit;
    6.34  };