devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-23 04:26:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved error handling logic to server_events

Browse Source
This commit is contained in:
James Booth
2014-01-28 22:37:50 +00:00
parent b231133f9b
commit 5afb296e67
8 changed files with 53 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/server_events.c
View File

@@ -37,6 +37,7 @@
#include "otr.h"
#endif
// TODO - replace with stanza error handlers
void
handle_error_message(const char *from, const char *err_msg)
{
@@ -52,27 +53,28 @@ handle_error_message(const char *from, const char *err_msg)
}
}
// handle message stanza errors
void
handle_recipient_not_found(const char * const recipient, const char * const err_msg)
handle_message_error(const char * const from, const char * const type,
const char * const err_msg)
{
ui_handle_recipient_not_found(recipient, err_msg);
if (prefs_get_boolean(PREF_STATES) && chat_session_exists(recipient)) {
chat_session_set_recipient_supports(recipient, FALSE);
// handle recipient not found ('from' contains a value and type is 'cancel')
if ((from != NULL) && ((type != NULL && (strcmp(type, "cancel") == 0)))) {
ui_handle_recipient_not_found(from, err_msg);
if (prefs_get_boolean(PREF_STATES) && chat_session_exists(from)) {
chat_session_set_recipient_supports(from, FALSE);
}
// handle any other error from recipient
} else if (from != NULL) {
ui_handle_recipient_error(from, err_msg);
// handle errors from no recipient
} else {
ui_handle_error(err_msg);
}
}
void
handle_recipient_error(const char * const recipient, const char * const err_msg)
{
ui_handle_recipient_error(recipient, err_msg);
}
void
handle_error(const char * const err_msg)
{
ui_handle_error(err_msg);
}
void
handle_login_account_success(char *account_name)
{

5
src/server_events.h
View File

@@ -75,8 +75,7 @@ void handle_group_remove(const char * const contact,
void handle_roster_remove(const char * const barejid);
void handle_roster_add(const char * const barejid, const char * const name);
void handle_autoping_cancel(void);
void handle_recipient_not_found(const char * const recipient, const char * const err_msg);
void handle_recipient_error(const char * const recipient, const char * const err_msg);
void handle_error(const char * const err_msg);
void handle_message_error(const char * const from, const char * const type,
const char * const err_msg);
#endif

13
src/xmpp/message.c
View File

@@ -224,18 +224,7 @@ _message_error_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
g_string_free(log_msg, TRUE);
// handle recipient not found ('from' contains a value and type is 'cancel')
if ((from != NULL) && ((type != NULL && (strcmp(type, "cancel") == 0)))) {
handle_recipient_not_found(from, err_msg);
// handle any other error from recipient
} else if (from != NULL) {
handle_recipient_error(from, err_msg);
// handle errors from no recipient
} else {
handle_error(err_msg);
}
handle_message_error(from, type, err_msg);
free(err_msg);