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

Got rid of old naming convention on prof_autocomplete

Browse Source
This commit is contained in:
James Booth
2013-01-25 01:11:49 +00:00
parent 6b632625df
commit 527e739ac6
12 changed files with 247 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/accounts.c
View File

@@ -28,13 +28,13 @@
#include "accounts.h"
#include "files.h"
#include "log.h"
#include "prof_autocomplete.h"
#include "autocomplete.h"
static gchar *accounts_loc;
static GKeyFile *accounts;
static PAutocomplete all_ac;
static PAutocomplete enabled_ac;
static Autocomplete all_ac;
static Autocomplete enabled_ac;
static void _save_accounts(void);
@@ -42,8 +42,8 @@ void
accounts_load(void)
{
log_info("Loading accounts");
all_ac = p_autocomplete_new();
enabled_ac = p_autocomplete_new();
all_ac = autocomplete_new();
enabled_ac = autocomplete_new();
accounts_loc = files_get_accounts_file();
accounts = g_key_file_new();
@@ -58,9 +58,9 @@ accounts_load(void)
gsize i;
for (i = 0; i < njids; i++) {
if (g_key_file_get_boolean(accounts, jids[i], "enabled", NULL)) {
p_autocomplete_add(enabled_ac, strdup(jids[i]));
autocomplete_add(enabled_ac, strdup(jids[i]));
}
p_autocomplete_add(all_ac, strdup(jids[i]));
autocomplete_add(all_ac, strdup(jids[i]));
}
for (i = 0; i < njids; i++) {
@@ -72,33 +72,33 @@ accounts_load(void)
void
accounts_close(void)
{
p_autocomplete_free(all_ac);
p_autocomplete_free(enabled_ac);
autocomplete_free(all_ac);
autocomplete_free(enabled_ac);
g_key_file_free(accounts);
}
char *
accounts_find_enabled(char *prefix)
{
return p_autocomplete_complete(enabled_ac, prefix);
return autocomplete_complete(enabled_ac, prefix);
}
char *
accounts_find_all(char *prefix)
{
return p_autocomplete_complete(all_ac, prefix);
return autocomplete_complete(all_ac, prefix);
}
void
accounts_reset_all_search(void)
{
p_autocomplete_reset(all_ac);
autocomplete_reset(all_ac);
}
void
accounts_reset_enabled_search(void)
{
p_autocomplete_reset(enabled_ac);
autocomplete_reset(enabled_ac);
}
void
@@ -113,8 +113,8 @@ accounts_add_login(const char *jid, const char *altdomain)
}
_save_accounts();
p_autocomplete_add(all_ac, strdup(jid));
p_autocomplete_add(enabled_ac, strdup(jid));
autocomplete_add(all_ac, strdup(jid));
autocomplete_add(enabled_ac, strdup(jid));
// already exists, update old style accounts
} else {
@@ -184,7 +184,7 @@ accounts_enable(const char * const name)
if (g_key_file_has_group(accounts, name)) {
g_key_file_set_boolean(accounts, name, "enabled", TRUE);
_save_accounts();
p_autocomplete_add(enabled_ac, strdup(name));
autocomplete_add(enabled_ac, strdup(name));
return TRUE;
} else {
return FALSE;
@@ -197,7 +197,7 @@ accounts_disable(const char * const name)
if (g_key_file_has_group(accounts, name)) {
g_key_file_set_boolean(accounts, name, "enabled", FALSE);
_save_accounts();
p_autocomplete_remove(enabled_ac, strdup(name));
autocomplete_remove(enabled_ac, strdup(name));
return TRUE;
} else {
return FALSE;
@@ -233,11 +233,11 @@ accounts_rename(const char * const account_name, const char * const new_name)
g_key_file_remove_group(accounts, account_name, NULL);
_save_accounts();
p_autocomplete_remove(all_ac, strdup(account_name));
p_autocomplete_add(all_ac, strdup(new_name));
autocomplete_remove(all_ac, strdup(account_name));
autocomplete_add(all_ac, strdup(new_name));
if (g_key_file_get_boolean(accounts, new_name, "enabled", NULL)) {
p_autocomplete_remove(enabled_ac, strdup(account_name));
p_autocomplete_add(enabled_ac, strdup(new_name));
autocomplete_remove(enabled_ac, strdup(account_name));
autocomplete_add(enabled_ac, strdup(new_name));
}
return TRUE;