aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-22 19:45:54 -04:00
Code

Merge branch 'master' into plugins

Browse Source
This commit is contained in:
James Booth 2016-05-02 00:44:43 +01:00
commit 9e5229f8f7
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/xmpp/connection.c
View File

@ -121,7 +121,7 @@ _info_destroy(DiscoInfo *info)
if (info) {
free(info->item);
if (info->features) {
g_hash_table_remove_all(info->features);
g_hash_table_destroy(info->features);
}
free(info);
}
@ -699,7 +699,7 @@ _connection_handler(xmpp_conn_t *const conn, const xmpp_conn_event_t status, con
// items discovery
DiscoInfo *info = malloc(sizeof(struct disco_info_t));
info->item = strdup(jabber_conn.domain);
info->features = g_hash_table_new_full(g_str_hash, g_str_equal, free, NULL);
info->features = g_hash_table_new_full(g_str_hash, g_str_equal, free, free);
disco_items = g_slist_append(disco_items, info);
iq_disco_info_request_onconnect(info->item);
iq_disco_items_request_onconnect(jabber_conn.domain);

5
src/xmpp/iq.c
View File

@ -125,6 +125,7 @@ _iq_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *const us
size_t text_size;
xmpp_stanza_to_text(stanza, &text, &text_size);
gboolean cont = plugins_on_iq_stanza_receive(text);
xmpp_free(connection_get_ctx(), text);
if (!cont) {
return 1;
}
@ -2049,7 +2050,7 @@ _disco_items_result_handler(xmpp_stanza_t *const stanza)
DiscoItem *item = res_items->data;
DiscoInfo *info = malloc(sizeof(struct disco_info_t));
info->item = strdup(item->jid);
info->features = g_hash_table_new_full(g_str_hash, g_str_equal, free, NULL);
info->features = g_hash_table_new_full(g_str_hash, g_str_equal, free, free);
jabber_set_disco_items(g_slist_append(jabber_get_disco_items(), info));
iq_disco_info_request_onconnect(info->item);
res_items = g_slist_next(res_items);
@ -2071,7 +2072,9 @@ send_iq_stanza(xmpp_stanza_t *const stanza)
char *plugin_text = plugins_on_iq_stanza_send(text);
if (plugin_text) {
xmpp_send_raw_string(conn, "%s", plugin_text);
free(plugin_text);
} else {
xmpp_send_raw_string(conn, "%s", text);
}
xmpp_free(connection_get_ctx(), text);
}

3
src/xmpp/message.c
View File

@ -81,6 +81,7 @@ _message_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *con
size_t text_size;
xmpp_stanza_to_text(stanza, &text, &text_size);
gboolean cont = plugins_on_message_stanza_receive(text);
xmpp_free(connection_get_ctx(), text);
if (!cont) {
return 1;
}
@ -872,7 +873,9 @@ _send_message_stanza(xmpp_stanza_t *const stanza)
char *plugin_text = plugins_on_message_stanza_send(text);
if (plugin_text) {
xmpp_send_raw_string(conn, "%s", plugin_text);
free(plugin_text);
} else {
xmpp_send_raw_string(conn, "%s", text);
}
xmpp_free(connection_get_ctx(), text);
}

3
src/xmpp/presence.c
View File

@ -93,6 +93,7 @@ _presence_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *co
size_t text_size;
xmpp_stanza_to_text(stanza, &text, &text_size);
gboolean cont = plugins_on_presence_stanza_receive(text);
xmpp_free(connection_get_ctx(), text);
if (!cont) {
return 1;
}
@ -841,7 +842,9 @@ _send_presence_stanza(xmpp_stanza_t *const stanza)
char *plugin_text = plugins_on_presence_stanza_send(text);
if (plugin_text) {
xmpp_send_raw_string(conn, "%s", plugin_text);
free(plugin_text);
} else {
xmpp_send_raw_string(conn, "%s", text);
}
xmpp_free(connection_get_ctx(), text);
}