diff options
Diffstat (limited to 'core/Messenger.h')
-rw-r--r-- | core/Messenger.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/core/Messenger.h b/core/Messenger.h index 9621176f..a2add19d 100644 --- a/core/Messenger.h +++ b/core/Messenger.h | |||
@@ -111,28 +111,20 @@ typedef struct Messenger { | |||
111 | uint32_t numfriends; | 111 | uint32_t numfriends; |
112 | 112 | ||
113 | void (*friend_message)(struct Messenger *m, int, uint8_t *, uint16_t, void*); | 113 | void (*friend_message)(struct Messenger *m, int, uint8_t *, uint16_t, void*); |
114 | uint8_t friend_message_isset; | ||
115 | void* friend_message_userdata; | 114 | void* friend_message_userdata; |
116 | void (*friend_action)(struct Messenger *m, int, uint8_t *, uint16_t, void*); | 115 | void (*friend_action)(struct Messenger *m, int, uint8_t *, uint16_t, void*); |
117 | uint8_t friend_action_isset; | ||
118 | void* friend_action_userdata; | 116 | void* friend_action_userdata; |
119 | void (*friend_namechange)(struct Messenger *m, int, uint8_t *, uint16_t, void*); | 117 | void (*friend_namechange)(struct Messenger *m, int, uint8_t *, uint16_t, void*); |
120 | uint8_t friend_namechange_isset; | ||
121 | void* friend_namechange_userdata; | 118 | void* friend_namechange_userdata; |
122 | void (*friend_statusmessagechange)(struct Messenger *m, int, uint8_t *, uint16_t, void*); | 119 | void (*friend_statusmessagechange)(struct Messenger *m, int, uint8_t *, uint16_t, void*); |
123 | uint8_t friend_statusmessagechange_isset; | ||
124 | void* friend_statusmessagechange_userdata; | 120 | void* friend_statusmessagechange_userdata; |
125 | void (*friend_userstatuschange)(struct Messenger *m, int, USERSTATUS, void*); | 121 | void (*friend_userstatuschange)(struct Messenger *m, int, USERSTATUS, void*); |
126 | uint8_t friend_userstatuschange_isset; | ||
127 | void* friend_userstatuschange_userdata; | 122 | void* friend_userstatuschange_userdata; |
128 | void (*read_receipt)(struct Messenger *m, int, uint32_t, void*); | 123 | void (*read_receipt)(struct Messenger *m, int, uint32_t, void*); |
129 | uint8_t read_receipt_isset; | ||
130 | void* read_receipt_userdata; | 124 | void* read_receipt_userdata; |
131 | void (*friend_statuschange)(struct Messenger *m, int, uint8_t, void*); | 125 | void (*friend_statuschange)(struct Messenger *m, int, uint8_t, void*); |
132 | uint8_t friend_statuschange_isset; | ||
133 | void* friend_statuschange_userdata; | 126 | void* friend_statuschange_userdata; |
134 | void (*friend_connectionstatuschange)(struct Messenger *m, int, uint8_t, void*); | 127 | void (*friend_connectionstatuschange)(struct Messenger *m, int, uint8_t, void*); |
135 | uint8_t friend_connectionstatuschange_isset; | ||
136 | void* friend_connectionstatuschange_userdata; | 128 | void* friend_connectionstatuschange_userdata; |
137 | 129 | ||
138 | 130 | ||
@@ -141,7 +133,7 @@ typedef struct Messenger { | |||
141 | /* | 133 | /* |
142 | * returns a FRIEND_ADDRESS_SIZE byte address to give to others. | 134 | * returns a FRIEND_ADDRESS_SIZE byte address to give to others. |
143 | * format: [client_id (32 bytes)][nospam number (4 bytes)][checksum (2 bytes)] | 135 | * format: [client_id (32 bytes)][nospam number (4 bytes)][checksum (2 bytes)] |
144 | * | 136 | * |
145 | */ | 137 | */ |
146 | void getaddress(Messenger *m, uint8_t *address); | 138 | void getaddress(Messenger *m, uint8_t *address); |
147 | 139 | ||
@@ -157,7 +149,7 @@ void getaddress(Messenger *m, uint8_t *address); | |||
157 | * return -4 if friend request already sent or already a friend | 149 | * return -4 if friend request already sent or already a friend |
158 | * return -5 for unknown error | 150 | * return -5 for unknown error |
159 | * return -6 if bad checksum in address | 151 | * return -6 if bad checksum in address |
160 | * return -7 if the friend was already there but the nospam was different | 152 | * return -7 if the friend was already there but the nospam was different |
161 | * (the nospam for that friend was set to the new one) | 153 | * (the nospam for that friend was set to the new one) |
162 | */ | 154 | */ |
163 | int m_addfriend(Messenger *m, uint8_t *address, uint8_t *data, uint16_t length); | 155 | int m_addfriend(Messenger *m, uint8_t *address, uint8_t *data, uint16_t length); |