yetangitu/deltachat-core
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-core.git synced 2025-10-06 12:00:11 +02:00
Code Issues Releases Wiki Activity

Merge pull request #227 from ralphtheninja/master

Browse source 
Fix typos
This commit is contained in:
björn petersen 2018-07-28 14:37:27 +02:00 • committed by GitHub
commit 931ea99f34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/dc_apeerstate.c
View file

@ -533,7 +533,7 @@ cleanup:
* @param peerstate The peerstate object.
* @param which_key Which key should be marked as being verified? DC_PS_GOSSIP_KEY (1) or DC_PS_PUBLIC_KEY (2)
* @param fingerprint Fingerprint expected in the object
* @param verified DC_BIDIRECT_VERIFIED (2): contact verfied in both directions
* @param verified DC_BIDIRECT_VERIFIED (2): contact verified in both directions
* @return 1=the given fingerprint is equal to the peer's fingerprint and
* the verified-state is set; you should call dc_apeerstate_save_to_db()
* to permanently store this state.

2
src/dc_apeerstate.h
View file

@ -95,7 +95,7 @@ int dc_apeerstate_recalc_fingerprint (dc_apeerstate_t*);
#define DC_PS_GOSSIP_KEY 0
#define DC_PS_PUBLIC_KEY 1
int dc_apeerstate_set_verified (dc_apeerstate_t*, int which_key, const char* fingerprint, int verfied);
int dc_apeerstate_set_verified (dc_apeerstate_t*, int which_key, const char* fingerprint, int verified);
int dc_apeerstate_load_by_addr (dc_apeerstate_t*, dc_sqlite3_t*, const char* addr);
int dc_apeerstate_load_by_fingerprint (dc_apeerstate_t*, dc_sqlite3_t*, const char* fingerprint);

6
src/dc_chat.c
View file

@ -1472,8 +1472,8 @@ static int real_group_exists(dc_context_t* context, uint32_t chat_id)
*
* @memberof dc_context_t
* @param context The context as created by dc_context_new().
* @param verified If set to 1 the function creates a secure verfied group.
* Only secure-verified members are allowd in these groups and end-to-end-encryption is always enabled.
* @param verified If set to 1 the function creates a secure verified group.
* Only secure-verified members are allowed in these groups and end-to-end-encryption is always enabled.
* @param chat_name The name of the group chat to create.
* The name may be changed later using dc_set_chat_name().
* To find out the name of a group later, see dc_chat_get_name()
@ -1749,7 +1749,7 @@ int dc_add_contact_to_chat_ex(dc_context_t* context, uint32_t chat_id, uint32_t
if (chat->type==DC_CHAT_TYPE_VERIFIED_GROUP)
{
if (dc_contact_is_verified(contact)!=DC_BIDIRECT_VERIFIED) {
dc_log_error(context, 0, "Only bidirectional verified contacts can be added to verfied groups.");
dc_log_error(context, 0, "Only bidirectional verified contacts can be added to verified groups.");
goto cleanup;
}
}

4
src/dc_contact.h
View file

@ -68,8 +68,8 @@ struct _dc_contact
#define DC_ORIGIN_OUTGOING_TO 0x4000 /* message sent by us */
#define DC_ORIGIN_INTERNAL 0x40000 /* internal use */
#define DC_ORIGIN_ADRESS_BOOK 0x80000 /* address is in our address book */
#define DC_ORIGIN_SECUREJOIN_INVITED 0x1000000 /* set on Alice's side for contacts like Bob that have scanned the QR code offered by her. Only means the contact has once been established using the "securejoin" procedure in the past, getting the current key verification status requires calling dc_contact_is_verfied() ! */
#define DC_ORIGIN_SECUREJOIN_JOINED 0x2000000 /* set on Bob's side for contacts scanned and verified from a QR code. Only means the contact has once been established using the "securejoin" procedure in the past, getting the current key verification status requires calling dc_contact_is_verfied() ! */
#define DC_ORIGIN_SECUREJOIN_INVITED 0x1000000 /* set on Alice's side for contacts like Bob that have scanned the QR code offered by her. Only means the contact has once been established using the "securejoin" procedure in the past, getting the current key verification status requires calling dc_contact_is_verified() ! */
#define DC_ORIGIN_SECUREJOIN_JOINED 0x2000000 /* set on Bob's side for contacts scanned and verified from a QR code. Only means the contact has once been established using the "securejoin" procedure in the past, getting the current key verification status requires calling dc_contact_is_verified() ! */
#define DC_ORIGIN_MANUALLY_CREATED 0x4000000 /* contact added mannually by dc_create_contact(), this should be the largets origin as otherwise the user cannot modify the names */
#define DC_ORIGIN_MIN_CONTACT_LIST (DC_ORIGIN_INCOMING_REPLY_TO) /* contacts with at least this origin value are shown in the contact list */