aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Small tidy up in connection.c

Browse Source
This commit is contained in:
James Booth 2013-02-03 23:59:04 +00:00
parent 2cea263917
commit 99232b0530
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/xmpp/connection.c
View File

@ -108,9 +108,10 @@ jabber_connect_with_account(ProfAccount *account, const char * const passwd)
saved_account.name = strdup(account->name); saved_account.name = strdup(account->name);
saved_account.passwd = strdup(passwd); saved_account.passwd = strdup(passwd);
char *fulljid = create_fulljid(account->jid, account->resource); // connect with fulljid
jabber_conn_status_t result = _jabber_connect(fulljid, passwd, account->server); Jid *jidp = jid_create_from_bare_and_resource(account->jid, account->resource);
free(fulljid); jabber_conn_status_t result = _jabber_connect(jidp->fulljid, passwd, account->server);
free(jidp);
return result; return result;
} }
@ -119,6 +120,10 @@ jabber_conn_status_t
jabber_connect_with_details(const char * const jid, jabber_connect_with_details(const char * const jid,
const char * const passwd, const char * const altdomain) const char * const passwd, const char * const altdomain)
{ {
assert(jid != NULL);
assert(passwd != NULL);
// save details for reconnect, remember name for account creating on success
saved_details.name = strdup(jid); saved_details.name = strdup(jid);
saved_details.passwd = strdup(passwd); saved_details.passwd = strdup(passwd);
if (altdomain != NULL) { if (altdomain != NULL) {
@ -127,6 +132,7 @@ jabber_connect_with_details(const char * const jid,
saved_details.altdomain = NULL; saved_details.altdomain = NULL;
} }
// use 'profanity' when no resourcepart in provided jid
Jid *jidp = jid_create(jid); Jid *jidp = jid_create(jid);
if (jidp->resourcepart == NULL) { if (jidp->resourcepart == NULL) {
jid_destroy(jidp); jid_destroy(jidp);
@ -137,6 +143,7 @@ jabber_connect_with_details(const char * const jid,
} }
jid_destroy(jidp); jid_destroy(jidp);
// connect with fulljid
log_info("Connecting without account, JID: %s", saved_details.jid); log_info("Connecting without account, JID: %s", saved_details.jid);
return _jabber_connect(saved_details.jid, passwd, saved_details.altdomain); return _jabber_connect(saved_details.jid, passwd, saved_details.altdomain);
} }