devs/cproof
1
2
Fork 1
Code Issues 42 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

Created config/conflists.c for shared config list handling

Browse Source
This commit is contained in:
James Booth
2015-11-23 23:54:14 +00:00
parent e8c0eeda8b
commit 97d1b964c3
4 changed files with 129 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/config/accounts.c
View File

@@ -42,6 +42,7 @@
#include "common.h"
#include "config/account.h"
#include "config/conflists.h"
#include "jid.h"
#include "log.h"
#include "tools/autocomplete.h"
@@ -55,7 +56,6 @@ static Autocomplete enabled_ac;
static void _save_accounts(void);
static gchar* _get_accounts_file(void);
static void _remove_from_list(GKeyFile *accounts, const char *const account_name, const char *const key, const char *const contact_jid);
void
accounts_load(void)
@@ -604,66 +604,22 @@ accounts_add_otr_policy(const char *const account_name, const char *const contac
// check for and remove from other lists
if (strcmp(policy, "manual") == 0) {
_remove_from_list(accounts, account_name, "otr.opportunistic", contact_jid);
_remove_from_list(accounts, account_name, "otr.always", contact_jid);
conf_string_list_remove(accounts, account_name, "otr.opportunistic", contact_jid);
conf_string_list_remove(accounts, account_name, "otr.always", contact_jid);
}
if (strcmp(policy, "opportunistic") == 0) {
_remove_from_list(accounts, account_name, "otr.manual", contact_jid);
_remove_from_list(accounts, account_name, "otr.always", contact_jid);
conf_string_list_remove(accounts, account_name, "otr.manual", contact_jid);
conf_string_list_remove(accounts, account_name, "otr.always", contact_jid);
}
if (strcmp(policy, "always") == 0) {
_remove_from_list(accounts, account_name, "otr.opportunistic", contact_jid);
_remove_from_list(accounts, account_name, "otr.manual", contact_jid);
conf_string_list_remove(accounts, account_name, "otr.opportunistic", contact_jid);
conf_string_list_remove(accounts, account_name, "otr.manual", contact_jid);
}
_save_accounts();
}
}
static void
_remove_from_list(GKeyFile *accounts, const char *const account_name, const char *const key, const char *const contact_jid)
{
gsize length;
gchar **list = g_key_file_get_string_list(accounts, account_name, key, &length, NULL);
if (list) {
int i = 0;
GList *glist = NULL;
gboolean deleted = FALSE;
for (i = 0; i < length; i++) {
// item found, mark as deleted
if (strcmp(list[i], contact_jid) == 0) {
deleted = TRUE;
} else {
// add item to our g_list
glist = g_list_append(glist, strdup(list[i]));
}
}
if (deleted) {
if (g_list_length(glist) == 0) {
g_key_file_remove_key(accounts, account_name, key, NULL);
} else {
// 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, new_list, g_list_length(glist));
}
}
g_list_free_full(glist, g_free);
}
g_strfreev(list);
}
void
accounts_set_muc_service(const char *const account_name, const char *const value)
{