Move disco info struct to connection

This commit is contained in:
James Booth
2016-05-07 23:28:16 +01:00
parent 9596591610
commit 6ce8edc194
8 changed files with 71 additions and 61 deletions

View File

@@ -309,7 +309,7 @@ iq_disable_carbons(void)
void
iq_http_upload_request(HTTPUpload *upload)
{
GSList *disco_items = session_get_disco_items();
GSList *disco_items = connection_get_disco_items();
DiscoInfo *disco_info;
if (disco_items && (g_slist_length(disco_items) > 0)) {
while (disco_items) {
@@ -1920,7 +1920,7 @@ _disco_info_response_id_handler_onconnect(xmpp_stanza_t *const stanza, void *con
if (query) {
xmpp_stanza_t *child = xmpp_stanza_get_children(query);
GSList *disco_items = session_get_disco_items();
GSList *disco_items = connection_get_disco_items();
DiscoInfo *disco_info;
if (disco_items && (g_slist_length(disco_items) > 0)) {
while (disco_items) {
@@ -2055,7 +2055,7 @@ _disco_items_result_handler(xmpp_stanza_t *const stanza)
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);
session_set_disco_items(g_slist_append(session_get_disco_items(), info));
connection_set_disco_items(g_slist_append(connection_get_disco_items(), info));
iq_disco_info_request_onconnect(info->item);
res_items = g_slist_next(res_items);
}