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

Tidied accounts_load in accounts

Browse Source
This commit is contained in:
James Booth 2013-01-27 17:59:37 +00:00
parent 91c31f3bb8
commit e9ce6b94ec
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/accounts.c
View File

@ -53,48 +53,53 @@ accounts_load(void)
NULL); NULL);
// create the logins searchable list for autocompletion // create the logins searchable list for autocompletion
gsize njids; gsize naccounts;
gchar **jids = gchar **account_names =
g_key_file_get_groups(accounts, &njids); g_key_file_get_groups(accounts, &naccounts);
gsize i; gsize i;
for (i = 0; i < njids; i++) { for (i = 0; i < naccounts; i++) {
if (g_key_file_get_boolean(accounts, jids[i], "enabled", NULL)) { if (g_key_file_get_boolean(accounts, account_names[i], "enabled", NULL)) {
autocomplete_add(enabled_ac, strdup(jids[i])); autocomplete_add(enabled_ac, strdup(account_names[i]));
} }
// fix old style accounts (no jid, or resource setting) // fix old style accounts (no jid, or resource setting)
char *barejid = jids[i]; char *barejid = account_names[i];
char *resource = NULL; char *resource = NULL;
Jid *jid = jid_create(jids[i]); Jid *jid = jid_create(account_names[i]);
if (jid != NULL) { if (jid != NULL) {
barejid = jid->barejid; barejid = jid->barejid;
resource = jid->resourcepart; resource = jid->resourcepart;
} }
if (!g_key_file_has_key(accounts, jids[i], "jid", NULL)) { // old accounts with no jid, use barejid (either account name,
g_key_file_set_string(accounts, jids[i], "jid", barejid); // or account name with resource stripped)
if (!g_key_file_has_key(accounts, account_names[i], "jid", NULL)) {
g_key_file_set_string(accounts, account_names[i], "jid", barejid);
_save_accounts(); _save_accounts();
} }
if (!g_key_file_has_key(accounts, jids[i], "resource", NULL)) {
// old accounts with no resource, use resourcepart of account name,
// or "profanity" if there was no resourcepart
if (!g_key_file_has_key(accounts, account_names[i], "resource", NULL)) {
if (resource != NULL) { if (resource != NULL) {
g_key_file_set_string(accounts, jids[i], "resource", resource); g_key_file_set_string(accounts, account_names[i], "resource", resource);
} else { } else {
g_key_file_set_string(accounts, jids[i], "resource", "profanity"); g_key_file_set_string(accounts, account_names[i], "resource", "profanity");
} }
_save_accounts(); _save_accounts();
} }
autocomplete_add(all_ac, strdup(jids[i])); autocomplete_add(all_ac, strdup(account_names[i]));
jid_destroy(jid); jid_destroy(jid);
} }
for (i = 0; i < njids; i++) { for (i = 0; i < naccounts; i++) {
free(jids[i]); free(account_names[i]);
} }
free(jids); free(account_names);
} }
void void