aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Merge branch 'master' into plugins

Browse Source
This commit is contained in:
James Booth 2016-08-17 23:34:59 +01:00
commit 806b18e181
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/xmpp/capabilities.c
View File

@ -113,17 +113,19 @@ caps_get_features(void)
GList *curr = prof_features; GList *curr = prof_features;
while (curr) { while (curr) {
result = g_list_append(result, curr->data); result = g_list_append(result, strdup(curr->data));
curr = g_list_next(curr); curr = g_list_next(curr);
} }
GList *plugin_features = plugins_get_disco_features(); GList *plugin_features = plugins_get_disco_features();
curr = plugin_features; curr = plugin_features;
while (curr) { while (curr) {
result = g_list_append(result, curr->data); result = g_list_append(result, strdup(curr->data));
curr = g_list_next(curr); curr = g_list_next(curr);
} }
g_list_free(plugin_features);
return result; return result;
} }

2
src/xmpp/stanza.c
View File

@ -1096,7 +1096,7 @@ stanza_create_caps_query_element(xmpp_ctx_t *ctx)
curr = g_list_next(curr); curr = g_list_next(curr);
} }
g_list_free(features); g_list_free_full(features, free);
return query; return query;
} }