CpEpEngine.h
branchkeysync
changeset 164 1971112a0cc0
parent 162 38cdf441c2cb
child 165 77dfd1defafa
     1.1 --- a/CpEpEngine.h	Wed Sep 28 11:34:40 2016 +0200
     1.2 +++ b/CpEpEngine.h	Fri Sep 30 22:21:09 2016 +0200
     1.3 @@ -37,7 +37,7 @@
     1.4          PEP_STATUS status = ::init(&m_session);
     1.5          assert(status == PEP_STATUS_OK);
     1.6          ::register_examine_function(m_session, CpEpEngine::examine_identity, (void *)this);
     1.7 -        ::register_sync_callbacks(m_session, (void*)this, messageToSend, showHandshake);
     1.8 +        ::register_sync_callbacks(m_session, (void*)this, messageToSend, showHandshake, NULL, NULL);
     1.9          ::log_event(m_session, "Startup", "pEp COM Adapter", NULL, NULL);
    1.10      }
    1.11  
    1.12 @@ -137,8 +137,8 @@
    1.13  
    1.14      typedef locked_queue<pEp_identity_cpp> identity_queue_t;
    1.15      static ::pEp_identity * retrieve_next_identity(void *management);
    1.16 -    static PEP_STATUS messageToSend(void *obj, const message *msg);
    1.17 -    static PEP_STATUS showHandshake(void * obj, const pEp_identity *self, const pEp_identity *partner);
    1.18 +    static PEP_STATUS messageToSend(void *obj, message *msg);
    1.19 +    static PEP_STATUS showHandshake(void * obj, pEp_identity *self, pEp_identity *partner);
    1.20  
    1.21      HRESULT error(_bstr_t msg);
    1.22  
    1.23 @@ -204,7 +204,7 @@
    1.24      STDMETHOD(verify)(BSTR text, BSTR signature, LPSAFEARRAY * key_list, pEp_STATUS * verify_status);
    1.25      STDMETHOD(myself)(struct pEp_identity_s *ident, struct pEp_identity_s *result);
    1.26      STDMETHOD(update_identity)(struct pEp_identity_s *ident, struct pEp_identity_s *result);
    1.27 -    STDMETHOD(key_compromized)(struct pEp_identity_s *ident);
    1.28 +    STDMETHOD(key_mistrusted)(struct pEp_identity_s *ident);
    1.29      STDMETHOD(key_reset_trust)(struct pEp_identity_s *ident);
    1.30      STDMETHOD(trust_personal_key)(struct pEp_identity_s *ident, struct pEp_identity_s *result);
    1.31  
    1.32 @@ -218,9 +218,10 @@
    1.33      // Message API
    1.34  
    1.35      STDMETHOD(encrypt_message)(text_message * src, text_message * dst, SAFEARRAY * extra);
    1.36 -    STDMETHOD(decrypt_message)(text_message * src, text_message * dst, SAFEARRAY ** keylist, pEp_color *rating);
    1.37 -    STDMETHOD(outgoing_message_color)(text_message *msg, pEp_color * pVal);
    1.38 -    STDMETHOD(identity_color)(pEp_identity_s * ident, pEp_color * pVal);
    1.39 +    STDMETHOD(decrypt_message)(text_message * src, text_message * dst, SAFEARRAY ** keylist, pEp_rating *rating);
    1.40 +    STDMETHOD(outgoing_message_rating)(text_message *msg, pEp_rating * pVal);
    1.41 +    STDMETHOD(identity_rating)(pEp_identity_s * ident, pEp_rating * pVal);
    1.42 +	STDMETHOD(color_from_rating)(pEp_rating rating, pEp_color * pVal);
    1.43  
    1.44  	// Event callbacks
    1.45