aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Log instead of showing error message when chat recipient not found

Browse Source
This commit is contained in:
James Booth 2015-01-06 21:51:41 +00:00
parent c04b90ce30
commit ab963499b5
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server_events.c
View File

@ -86,7 +86,7 @@ handle_message_error(const char * const jid, const char * const type,
// handle recipient not found ('from' contains a value and type is 'cancel') // handle recipient not found ('from' contains a value and type is 'cancel')
} else if (type != NULL && (strcmp(type, "cancel") == 0)) { } else if (type != NULL && (strcmp(type, "cancel") == 0)) {
ui_handle_recipient_not_found(jid, err_msg); log_info("Recipient %s not found: %s", jid, err_msg);
chat_session_on_cancel(jid); chat_session_on_cancel(jid);
// handle any other error from recipient // handle any other error from recipient

19
src/ui/core.c
View File

@ -586,14 +586,6 @@ ui_update_presence(const resource_presence_t resource_presence,
void void
ui_handle_recipient_not_found(const char * const recipient, const char * const err_msg) ui_handle_recipient_not_found(const char * const recipient, const char * const err_msg)
{ {
// unknown chat recipient
ProfChatWin *chatwin = wins_get_chat(recipient);
if (chatwin) {
cons_show_error("Recipient %s not found: %s", recipient, err_msg);
win_save_vprint((ProfWin*) chatwin, '!', NULL, 0, THEME_ERROR, "", "Recipient %s not found: %s", recipient, err_msg);
return;
}
// intended recipient was invalid chat room // intended recipient was invalid chat room
ProfMucWin *mucwin = wins_get_muc(recipient); ProfMucWin *mucwin = wins_get_muc(recipient);
if (mucwin) { if (mucwin) {
@ -601,17 +593,6 @@ ui_handle_recipient_not_found(const char * const recipient, const char * const e
win_save_vprint((ProfWin*) mucwin, '!', NULL, 0, THEME_ERROR, "", "Room %s not found: %s", recipient, err_msg); win_save_vprint((ProfWin*) mucwin, '!', NULL, 0, THEME_ERROR, "", "Room %s not found: %s", recipient, err_msg);
return; return;
} }
// unknown private recipient
ProfPrivateWin *privatewin = wins_get_private(recipient);
if (privatewin) {
cons_show_error("Recipient %s not found: %s", recipient, err_msg);
win_save_vprint((ProfWin*) privatewin, '!', NULL, 0, THEME_ERROR, "", "Recipient %s not found: %s", recipient, err_msg);
return;
}
// no window
cons_show_error("Recipient %s not found: %s", recipient, err_msg);
} }
void void