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

Added resource handling in account module

Browse Source 
Handle old accounts on load
This commit is contained in:
James Booth
2013-01-27 00:02:28 +00:00
parent 43841ee9ee
commit 1a30ee15e0
3 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/accounts.c
View File

@@ -62,7 +62,33 @@ accounts_load(void)
if (g_key_file_get_boolean(accounts, jids[i], "enabled", NULL)) {
autocomplete_add(enabled_ac, strdup(jids[i]));
}
// fix old style accounts (no jid, or resource setting)
char *barejid = jids[i];
char *resource = NULL;
Jid *jid = jid_create(jids[i]);
if (jid != NULL) {
barejid = jid->barejid;
resource = jid->resourcepart;
}
if (!g_key_file_has_key(accounts, jids[i], "jid", NULL)) {
g_key_file_set_string(accounts, jids[i], "jid", barejid);
_save_accounts();
}
if (!g_key_file_has_key(accounts, jids[i], "resource", NULL)) {
if (resource != NULL) {
g_key_file_set_string(accounts, jids[i], "resource", resource);
} else {
g_key_file_set_string(accounts, jids[i], "resource", "profanity");
}
_save_accounts();
}
autocomplete_add(all_ac, strdup(jids[i]));
jid_destroy(jid);
}
for (i = 0; i < njids; i++) {
@@ -133,16 +159,6 @@ accounts_add_login(const char *account_name, const char *altdomain)
_save_accounts();
autocomplete_add(all_ac, strdup(account_name));
autocomplete_add(enabled_ac, strdup(account_name));
// already exists, update old style accounts
} else {
g_key_file_set_string(accounts, account_name, "jid", barejid);
if (resource != NULL) {
g_key_file_set_string(accounts, account_name, "resource", resource);
} else {
g_key_file_set_string(accounts, account_name, "resource", "profanity");
}
_save_accounts();
}
jid_destroy(jid);