devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 10 Actions Packages Projects 1 Releases Wiki Activity

merge/upstream-full #105

Manually merged
jabber.developer merged 407 commits from merge/upstream-full into master 2026-05-26 17:54:34 +00:00
Conversation 6 Commits 407 Files Changed 303 +12649 -35997
385 changed files with 12649 additions and 35997 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b7c8f8235c - Show all commits

3
src/omemo/omemo.c
View File

@@ -515,6 +515,8 @@ omemo_set_device_list(const char* const from, GList* device_list)
} }
if (!found) { if (!found) {
auto_gchar gchar* dev_id_str = g_strdup_printf("%u", dev_id);
if (!g_key_file_has_key(omemo_ctx.knowndevices.keyfile, jid->barejid, dev_id_str, NULL)) {
if (equals_our_barejid(jid->barejid)) { if (equals_our_barejid(jid->barejid)) {
if (dev_id != omemo_ctx.device_id) { if (dev_id != omemo_ctx.device_id) {
cons_show("New OMEMO device (ID: %u) added to your account.", dev_id); cons_show("New OMEMO device (ID: %u) added to your account.", dev_id);
@@ -533,6 +535,7 @@ omemo_set_device_list(const char* const from, GList* device_list)
} }
} }
} }
}
g_hash_table_insert(omemo_ctx.device_list, strdup(jid->barejid), device_list); g_hash_table_insert(omemo_ctx.device_list, strdup(jid->barejid), device_list);