aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-29 19:56:07 -04:00
Code

Merge branch 'master' into priority

Browse Source
This commit is contained in:
James Booth 2013-01-31 01:51:48 +00:00
commit 4886577302
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/accounts.c
View File

@ -39,6 +39,8 @@ static GKeyFile *accounts;
static Autocomplete all_ac; static Autocomplete all_ac;
static Autocomplete enabled_ac; static Autocomplete enabled_ac;
static gchar *string_keys[] = {"jid", "server", "resource", "presence.last", "presence.login"};
static void _fix_legacy_accounts(const char * const account_name); static void _fix_legacy_accounts(const char * const account_name);
static void _save_accounts(void); static void _save_accounts(void);
@ -129,6 +131,8 @@ accounts_add(const char *account_name, const char *altdomain)
if (altdomain != NULL) { if (altdomain != NULL) {
g_key_file_set_string(accounts, account_name, "server", altdomain); g_key_file_set_string(accounts, account_name, "server", altdomain);
} }
g_key_file_set_string(accounts, account_name, "presence.last", "online");
g_key_file_set_string(accounts, account_name, "presence.login", "online");
_save_accounts(); _save_accounts();
autocomplete_add(all_ac, strdup(account_name)); autocomplete_add(all_ac, strdup(account_name));
@ -254,22 +258,13 @@ accounts_rename(const char * const account_name, const char * const new_name)
g_key_file_set_boolean(accounts, new_name, "enabled", g_key_file_set_boolean(accounts, new_name, "enabled",
g_key_file_get_boolean(accounts, account_name, "enabled", NULL)); g_key_file_get_boolean(accounts, account_name, "enabled", NULL));
char *jid = g_key_file_get_string(accounts, account_name, "jid", NULL); int i;
if (jid != NULL) { for (i = 0; i < ARRAY_SIZE(string_keys); i++) {
g_key_file_set_string(accounts, new_name, "jid", jid); char *value = g_key_file_get_string(accounts, account_name, string_keys[i], NULL);
free(jid); if (value != NULL) {
} g_key_file_set_string(accounts, new_name, string_keys[i], value);
free(value);
char *server = g_key_file_get_string(accounts, account_name, "server", NULL); }
if (server != NULL) {
g_key_file_set_string(accounts, new_name, "server", server);
free(server);
}
char *resource = g_key_file_get_string(accounts, account_name, "resource", NULL);
if (resource != NULL) {
g_key_file_set_string(accounts, new_name, "resource", resource);
free(resource);
} }
g_key_file_remove_group(accounts, account_name, NULL); g_key_file_remove_group(accounts, account_name, NULL);