devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 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 +12646 -35997
385 changed files with 12646 additions and 35997 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4253da99c5 - Show all commits

11
src/omemo/omemo.c
View File

@@ -729,17 +729,6 @@ omemo_start_device_session(const char* const jid, uint32_t device_id,
}
} else {
log_debug("[OMEMO] session with %s device %d exists", jid, device_id);
if (omemo_ctx.notifying) {
ProfChatWin* chatwin = wins_get_chat(jid);
if (chatwin) {
win_println((ProfWin*)chatwin, THEME_DEFAULT, "!", "OMEMO session with %s (device %u) already exists.", jid, device_id);
} else {
ProfMucWin* mucwin = wins_get_muc(jid);
if (mucwin) {
win_println((ProfWin*)mucwin, THEME_DEFAULT, "!", "OMEMO session with %s (device %u) already exists.", jid, device_id);
}
}
}
}
out: