resolving name clash
authorVolker Birk <vb@pep.foundation>
Thu, 08 Dec 2016 10:34:14 +0100
changeset 1473a950d0678a33
parent 1471 7b4a5322de16
child 1474 c8ac0e2a7ff2
resolving name clash
src/sync.h
     1.1 --- a/src/sync.h	Thu Dec 08 10:18:32 2016 +0100
     1.2 +++ b/src/sync.h	Thu Dec 08 10:34:14 2016 +0100
     1.3 @@ -80,22 +80,22 @@
     1.4  typedef PEP_STATUS (*messageToSend_t)(void *obj, message *msg);
     1.5  
     1.6  typedef enum _sync_handshake_signal {
     1.7 -    SYNC_HANDSHAKE_UNDEFINED = 0,
     1.8 +    SYNC_NOTIFY_UNDEFINED = 0,
     1.9  
    1.10      // request show handshake dialog
    1.11 -    SYNC_HANDSHAKE_INIT_ADD_OUR_DEVICE,
    1.12 -    SYNC_HANDSHAKE_INIT_ADD_OTHER_DEVICE,
    1.13 -    SYNC_HANDSHAKE_INIT_FORM_GROUP,
    1.14 +    SYNC_NOTIFY_INIT_ADD_OUR_DEVICE,
    1.15 +    SYNC_NOTIFY_INIT_ADD_OTHER_DEVICE,
    1.16 +    SYNC_NOTIFY_INIT_FORM_GROUP,
    1.17  
    1.18      // handshake process was cancelled
    1.19 -    SYNC_HANDSHAKE_CANCELED,
    1.20 +    SYNC_NOTIFY_CANCELED,
    1.21  
    1.22      // handshake accepted by user
    1.23 -    SYNC_HANDSHAKE_ACCEPTED_DEVICE_ADDED,
    1.24 -    SYNC_HANDSHAKE_ACCEPTED_GROUP_CREATED,
    1.25 +    SYNC_NOTIFY_ACCEPTED_DEVICE_ADDED,
    1.26 +    SYNC_NOTIFY_ACCEPTED_GROUP_CREATED,
    1.27  
    1.28      // handshake was rejected by user
    1.29 -    SYNC_HANDSHAKE_REJECTED
    1.30 +    SYNC_NOTIFY_REJECTED
    1.31  } sync_handshake_signal;
    1.32  
    1.33  // notifyHandshake() - notify UI about sync handshaking process