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

Added check for caps in stanza

Browse Source
This commit is contained in:
James Booth 2013-01-20 21:01:30 +00:00
parent eeafd62716
commit dfeb884e9b
3 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/jabber.c
View File

@ -1175,7 +1175,10 @@ _room_presence_handler(const char * const jid, xmpp_stanza_t * const stanza)
} else { } else {
char *type = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_TYPE); char *type = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_TYPE);
char *show_str, *status_str; char *show_str, *status_str;
char *caps_str = stanza_get_caps_str(stanza); char *caps_str = NULL;
if (stanza_contains_caps(stanza)) {
caps_str = stanza_get_caps_str(stanza);
if (caps_str != NULL) { if (caps_str != NULL) {
if (!caps_contains(caps_str)) { if (!caps_contains(caps_str)) {
@ -1184,6 +1187,7 @@ _room_presence_handler(const char * const jid, xmpp_stanza_t * const stanza)
xmpp_stanza_release(iq); xmpp_stanza_release(iq);
} }
} }
}
xmpp_stanza_t *status = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_STATUS); xmpp_stanza_t *status = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_STATUS);
if (status != NULL) { if (status != NULL) {
@ -1265,7 +1269,9 @@ _presence_handler(xmpp_conn_t * const conn,
g_date_time_unref(now); g_date_time_unref(now);
} }
char *caps_str = stanza_get_caps_str(stanza); char *caps_str = NULL;
if (stanza_contains_caps(stanza)) {
caps_str = stanza_get_caps_str(stanza);
if (caps_str != NULL) { if (caps_str != NULL) {
if (!caps_contains(caps_str)) { if (!caps_contains(caps_str)) {
@ -1274,6 +1280,7 @@ _presence_handler(xmpp_conn_t * const conn,
xmpp_stanza_release(iq); xmpp_stanza_release(iq);
} }
} }
}
xmpp_stanza_t *status = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_STATUS); xmpp_stanza_t *status = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_STATUS);
if (status != NULL) if (status != NULL)

16
src/stanza.c
View File

@ -415,6 +415,22 @@ stanza_get_idle_time(xmpp_stanza_t * const stanza)
} }
} }
gboolean
stanza_contains_caps(xmpp_stanza_t * const stanza)
{
xmpp_stanza_t *caps = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_C);
if (caps == NULL) {
return FALSE;
}
if (strcmp(xmpp_stanza_get_ns(caps), STANZA_NS_CAPS) != 0) {
return FALSE;
}
return TRUE;
}
char * char *
stanza_get_caps_str(xmpp_stanza_t * const stanza) stanza_get_caps_str(xmpp_stanza_t * const stanza)
{ {

1
src/stanza.h
View File

@ -138,6 +138,7 @@ char * stanza_get_new_nick(xmpp_stanza_t * const stanza);
int stanza_get_idle_time(xmpp_stanza_t * const stanza); int stanza_get_idle_time(xmpp_stanza_t * const stanza);
char * stanza_get_caps_str(xmpp_stanza_t * const stanza); char * stanza_get_caps_str(xmpp_stanza_t * const stanza);
gboolean stanza_contains_caps(xmpp_stanza_t * const stanza);
DataForm * stanza_get_form(xmpp_stanza_t * const stanza); DataForm * stanza_get_form(xmpp_stanza_t * const stanza);