aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

Reverted some previous changes to fix login attempt and reconnect issues

Browse Source 
fixes #142
fixes #143
This commit is contained in:
James Booth 2013-01-26 21:03:04 +00:00
parent c03a936789
commit 4092498de8
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/connection.c
View File

@ -108,12 +108,20 @@ jabber_restart(void)
jabber_conn_status_t jabber_conn_status_t
jabber_connect_with_account(ProfAccount *account, const char * const passwd) jabber_connect_with_account(ProfAccount *account, const char * const passwd)
{ {
FREE_SET_NULL(saved_user.account);
if (account->name == NULL)
return JABBER_UNDEFINED;
saved_user.account = strdup(account->name); saved_user.account = strdup(account->name);
if (saved_user.jid == NULL) {
saved_user.jid = strdup(account->jid);
}
if (saved_user.passwd == NULL) {
saved_user.passwd = strdup(passwd);
}
if (saved_user.altdomain == NULL) {
if (account->server != NULL) {
saved_user.altdomain = strdup(account->server);
}
}
log_info("Connecting with account: %s", account->name); log_info("Connecting with account: %s", account->name);
return jabber_connect(account->jid, passwd, account->server); return jabber_connect(account->jid, passwd, account->server);
} }
@ -122,17 +130,22 @@ jabber_conn_status_t
jabber_connect(const char * const jid, jabber_connect(const char * const jid,
const char * const passwd, const char * const altdomain) const char * const passwd, const char * const altdomain)
{ {
FREE_SET_NULL(saved_user.jid); if (saved_user.account != NULL) {
FREE_SET_NULL(saved_user.passwd); free(saved_user.account);
FREE_SET_NULL(saved_user.altdomain); saved_user.account = NULL;
}
if (jid == NULL || passwd == NULL)
return JABBER_UNDEFINED;
if (saved_user.jid == NULL) {
saved_user.jid = strdup(jid); saved_user.jid = strdup(jid);
}
if (saved_user.passwd == NULL) {
saved_user.passwd = strdup(passwd); saved_user.passwd = strdup(passwd);
if (altdomain != NULL) }
if (saved_user.altdomain == NULL) {
if (altdomain != NULL) {
saved_user.altdomain = strdup(altdomain); saved_user.altdomain = strdup(altdomain);
}
}
log_info("Connecting as %s", jid); log_info("Connecting as %s", jid);
xmpp_initialize(); xmpp_initialize();