aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Added resource to ProfAccount

Browse Source
This commit is contained in:
James Booth 2013-01-26 22:25:00 +00:00
parent a8d80ef558
commit 43841ee9ee
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/accounts.c
View File

@ -27,6 +27,7 @@
#include "accounts.h" #include "accounts.h"
#include "autocomplete.h" #include "autocomplete.h"
#include "common.h"
#include "files.h" #include "files.h"
#include "jid.h" #include "jid.h"
#include "log.h" #include "log.h"
@ -176,6 +177,12 @@ accounts_get_account(const char * const name)
} else { } else {
account->server = NULL; account->server = NULL;
} }
gchar *resource = g_key_file_get_string(accounts, name, "resource", NULL);
if (resource != NULL) {
account->resource = strdup(resource);
} else {
account->resource = NULL;
}
return account; return account;
} }
@ -185,19 +192,11 @@ void
accounts_free_account(ProfAccount *account) accounts_free_account(ProfAccount *account)
{ {
if (account != NULL) { if (account != NULL) {
if (account->name != NULL) { FREE_SET_NULL(account->name);
free(account->name); FREE_SET_NULL(account->jid);
account->name = NULL; FREE_SET_NULL(account->resource);
} FREE_SET_NULL(account->server);
if (account->jid != NULL) { FREE_SET_NULL(account);
free(account->jid);
account->jid = NULL;
}
if (account->server != NULL) {
free(account->server);
account->server = NULL;
}
account = NULL;
} }
} }
@ -253,6 +252,12 @@ accounts_rename(const char * const account_name, const char * const new_name)
free(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);
_save_accounts(); _save_accounts();

1
src/accounts.h
View File

@ -26,6 +26,7 @@
typedef struct prof_account_t { typedef struct prof_account_t {
gchar *name; gchar *name;
gchar *jid; gchar *jid;
gchar *resource;
gchar *server; gchar *server;
gboolean enabled; gboolean enabled;
} ProfAccount; } ProfAccount;