devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-29 08:06:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use server features for account muc service

Browse Source 
issue #878
This commit is contained in:
James Booth
2016-11-20 02:09:34 +00:00
parent 44979ac754
commit 609d05366c
14 changed files with 133 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/config/account.c
View File

@@ -115,17 +115,10 @@ account_new(const gchar *const name, const gchar *const jid,
new_account->priority_xa = priority_xa;
new_account->priority_dnd = priority_dnd;
if (muc_service == NULL) {
GString *g_muc_service = g_string_new("conference.");
Jid *jidp = jid_create(new_account->jid);
g_string_append(g_muc_service, jidp->domainpart);
new_account->muc_service = g_muc_service->str;
g_string_free(g_muc_service, FALSE);
jid_destroy(jidp);
} else {
if (muc_service) {
new_account->muc_service = strdup(muc_service);
} else {
new_account->muc_service = NULL;
}
if (muc_nick == NULL) {
@@ -224,25 +217,27 @@ account_eval_password(ProfAccount *account)
void
account_free(ProfAccount *account)
{
if (account) {
free(account->name);
free(account->jid);
free(account->password);
free(account->eval_password);
free(account->resource);
free(account->server);
free(account->last_presence);
free(account->login_presence);
free(account->muc_service);
free(account->muc_nick);
free(account->otr_policy);
free(account->pgp_keyid);
free(account->startscript);
free(account->theme);
free(account->tls_policy);
g_list_free_full(account->otr_manual, g_free);
g_list_free_full(account->otr_opportunistic, g_free);
g_list_free_full(account->otr_always, g_free);
free(account);
if (account == NULL) {
return;
}
free(account->name);
free(account->jid);
free(account->password);
free(account->eval_password);
free(account->resource);
free(account->server);
free(account->last_presence);
free(account->login_presence);
free(account->muc_service);
free(account->muc_nick);
free(account->otr_policy);
free(account->pgp_keyid);
free(account->startscript);
free(account->theme);
free(account->tls_policy);
g_list_free_full(account->otr_manual, g_free);
g_list_free_full(account->otr_opportunistic, g_free);
g_list_free_full(account->otr_always, g_free);
free(account);
}