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

Added conf_string_list_add

Browse Source
This commit is contained in:
James Booth 2015-11-24 00:02:21 +00:00
parent 97d1b964c3
commit a2f5e921f2
3 changed files with 52 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/config/accounts.c
View File

@ -558,48 +558,7 @@ accounts_add_otr_policy(const char *const account_name, const char *const contac
if (accounts_account_exists(account_name)) {
GString *key = g_string_new("otr.");
g_string_append(key, policy);
gsize length;
gchar **list = g_key_file_get_string_list(accounts, account_name, key->str, &length, NULL);
GList *glist = NULL;
// list found
if (list) {
int i = 0;
for (i = 0; i < length; i++) {
// item already in list, exit function
if (strcmp(list[i], contact_jid) == 0) {
g_list_free_full(glist, g_free);
g_strfreev(list);
return;
}
// add item to our g_list
glist = g_list_append(glist, strdup(list[i]));
}
// item not found, add to our g_list
glist = g_list_append(glist, strdup(contact_jid));
// create the new list entry
const gchar* new_list[g_list_length(glist)+1];
GList *curr = glist;
i = 0;
while (curr) {
new_list[i++] = strdup(curr->data);
curr = g_list_next(curr);
}
new_list[i] = NULL;
g_key_file_set_string_list(accounts, account_name, key->str, new_list, g_list_length(glist));
// list not found
} else {
const gchar* new_list[2];
new_list[0] = strdup(contact_jid);
new_list[1] = NULL;
g_key_file_set_string_list(accounts, account_name, key->str, new_list, 1);
}
g_strfreev(list);
g_list_free_full(glist, g_free);
conf_string_list_add(accounts, account_name, key->str, contact_jid);
g_string_free(key, TRUE);
// check for and remove from other lists

49
src/config/conflists.c
View File

@ -35,6 +35,55 @@
#include <string.h>
#include <glib.h>
gboolean
conf_string_list_add(GKeyFile *keyfile, const char *const group, const char *const key, const char *const item)
{
gsize length;
gchar **list = g_key_file_get_string_list(keyfile, group, key, &length, NULL);
GList *glist = NULL;
// list found
if (list) {
int i = 0;
for (i = 0; i < length; i++) {
// item already in list, exit function
if (strcmp(list[i], item) == 0) {
g_list_free_full(glist, g_free);
g_strfreev(list);
return FALSE;
}
// add item to our g_list
glist = g_list_append(glist, strdup(list[i]));
}
// item not found, add to our g_list
glist = g_list_append(glist, strdup(item));
// create the new list entry
const gchar* new_list[g_list_length(glist)+1];
GList *curr = glist;
i = 0;
while (curr) {
new_list[i++] = strdup(curr->data);
curr = g_list_next(curr);
}
new_list[i] = NULL;
g_key_file_set_string_list(keyfile, group, key, new_list, g_list_length(glist));
// list not found
} else {
const gchar* new_list[2];
new_list[0] = strdup(item);
new_list[1] = NULL;
g_key_file_set_string_list(keyfile, group, key, new_list, 1);
}
g_strfreev(list);
g_list_free_full(glist, g_free);
return TRUE;
}
gboolean
conf_string_list_remove(GKeyFile *keyfile, const char *const group, const char *const key, const char *const item)
{

2
src/config/conflists.h
View File

@ -34,5 +34,7 @@
#include <glib.h>
gboolean conf_string_list_add(GKeyFile *keyfile, const char *const group, const char *const key,
const char *const item);
gboolean conf_string_list_remove(GKeyFile *keyfile, const char *const group, const char *const key,
const char *const item);