aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-06-16 21:35:24 +00:00
Code

Fix PGP

Browse Source 
Fix of PGP and potentially other encryption methods by calling correct function that would initiate them in case if someone writes.
This commit is contained in:
John Hernandez 2023-03-31 02:48:20 +02:00
parent 2093fe417f
commit 99c9f150f6
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/event/server_events.c
View File

@ -645,8 +645,8 @@ sv_ev_incoming_message(ProfMessage* message)
chatwin = wins_get_chat(looking_for_jid);
if (!chatwin) {
ProfWin* window = wins_new_chat(looking_for_jid);
chatwin = (ProfChatWin*)window;
chatwin = chatwin_new(looking_for_jid);
ProfWin* window = (ProfWin*)chatwin;
new_win = TRUE;
if (prefs_get_boolean(PREF_MAM)) {
@ -689,8 +689,7 @@ sv_ev_incoming_carbon(ProfMessage* message)
gboolean new_win = FALSE;
ProfChatWin* chatwin = wins_get_chat(message->from_jid->barejid);
if (!chatwin) {
ProfWin* window = wins_new_chat(message->from_jid->barejid);
chatwin = (ProfChatWin*)window;
chatwin = chatwin_new(message->from_jid->barejid);
new_win = TRUE;
#ifdef HAVE_OMEMO

2
src/otr/otr.c
View File

@ -151,7 +151,7 @@ cb_gone_secure(void* opdata, ConnContext* context)
{
ProfChatWin* chatwin = wins_get_chat(context->username);
if (!chatwin) {
chatwin = (ProfChatWin*)wins_new_chat(context->username);
chatwin = chatwin_new(context->username);
}
chatwin_otr_secured(chatwin, otr_is_trusted(context->username));

14
src/ui/core.c
View File

@ -768,20 +768,18 @@ ui_print_system_msg_from_recipient(const char* const barejid, const char* messag
return;
ProfChatWin* chatwin = wins_get_chat(barejid);
ProfWin* window = (ProfWin*)chatwin;
if (window == NULL) {
window = wins_new_chat(barejid);
if (window) {
chatwin = (ProfChatWin*)window;
int num = wins_get_num(window);
if (chatwin == NULL) {
chatwin = chatwin_new(barejid);
if (chatwin) {
int num = wins_get_num((ProfWin*)chatwin);
status_bar_active(num, WIN_CHAT, chatwin->barejid);
} else {
window = wins_get_console();
chatwin = (ProfChatWin*)wins_get_console();
status_bar_active(1, WIN_CONSOLE, "console");
}
}
win_println(window, THEME_DEFAULT, "-", "*%s %s", barejid, message);
win_println((ProfWin*)chatwin, THEME_DEFAULT, "-", "*%s %s", barejid, message);
}
void