From 480589f0aec93b5b83d287a221c69d0388f2ec3f Mon Sep 17 00:00:00 2001 From: Tomás Senart Date: Mon, 14 Oct 2013 20:15:51 +0200 Subject: Use passwords from the accounts file This commit makes it so that if the password in an account in the accounts file is present, then use it. Otherwise ask for the password to the user. --- src/xmpp/connection.c | 9 ++++----- src/xmpp/xmpp.h | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'src/xmpp') diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c index 40a1ea05..a1cb31c4 100644 --- a/src/xmpp/connection.c +++ b/src/xmpp/connection.c @@ -109,21 +109,20 @@ jabber_init(const int disable_tls) } jabber_conn_status_t -jabber_connect_with_account(const ProfAccount * const account, - const char * const passwd) +jabber_connect_with_account(const ProfAccount * const account) { assert(account != NULL); - assert(passwd != NULL); log_info("Connecting using account: %s", account->name); // save account name and password for reconnect saved_account.name = strdup(account->name); - saved_account.passwd = strdup(passwd); + saved_account.passwd = strdup(account->password); // connect with fulljid Jid *jidp = jid_create_from_bare_and_resource(account->jid, account->resource); - jabber_conn_status_t result = _jabber_connect(jidp->fulljid, passwd, account->server); + jabber_conn_status_t result = + _jabber_connect(jidp->fulljid, account->password, account->server); jid_destroy(jidp); return result; diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h index 61f07e5e..407fe0e2 100644 --- a/src/xmpp/xmpp.h +++ b/src/xmpp/xmpp.h @@ -78,8 +78,7 @@ typedef struct disco_identity_t { void jabber_init(const int disable_tls); jabber_conn_status_t jabber_connect_with_details(const char * const jid, const char * const passwd, const char * const altdomain); -jabber_conn_status_t jabber_connect_with_account(const ProfAccount * const account, - const char * const passwd); +jabber_conn_status_t jabber_connect_with_account(const ProfAccount * const account); void jabber_disconnect(void); void jabber_shutdown(void); void jabber_process_events(void); -- cgit 1.4.1-2-gfad0 From c5f76721ce9d10b127d54e127ac34e555c749465 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 10 Nov 2013 18:48:55 +0000 Subject: Fixed compile error for -Wduplicate-decl-specifier on OSX --- src/contact.h | 2 +- src/ui/core.c | 4 ++-- src/xmpp/roster.c | 2 +- src/xmpp/xmpp.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/xmpp') diff --git a/src/contact.h b/src/contact.h index e71e0f7d..20c0e3dd 100644 --- a/src/contact.h +++ b/src/contact.h @@ -35,7 +35,7 @@ gboolean p_contact_remove_resource(PContact contact, const char * const resource void p_contact_free(PContact contact); const char* p_contact_barejid(PContact contact); const char* p_contact_name(PContact contact); -const char * p_contact_name_or_jid(const PContact contact); +const char* p_contact_name_or_jid(const PContact contact); const char* p_contact_presence(PContact contact); const char* p_contact_status(PContact contact); const char* p_contact_subscription(const PContact contact); diff --git a/src/ui/core.c b/src/ui/core.c index 2249a944..a6c54faf 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -965,8 +965,8 @@ ui_new_chat_win(const char * const to) if (contact != NULL) { if (strcmp(p_contact_presence(contact), "offline") == 0) { - const char const *show = p_contact_presence(contact); - const char const *status = p_contact_status(contact); + const char * const show = p_contact_presence(contact); + const char * const status = p_contact_status(contact); _show_status_string(window, to, show, status, NULL, "--", "offline"); } } diff --git a/src/xmpp/roster.c b/src/xmpp/roster.c index c073464d..5fbb7be7 100644 --- a/src/xmpp/roster.c +++ b/src/xmpp/roster.c @@ -518,7 +518,7 @@ roster_barejid_from_name(const char * const name) } PContact -roster_get_contact(const char const *barejid) +roster_get_contact(const char * const barejid) { return g_hash_table_lookup(contacts, barejid); } diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h index 407fe0e2..f1b3ba6c 100644 --- a/src/xmpp/xmpp.h +++ b/src/xmpp/xmpp.h @@ -127,7 +127,7 @@ void caps_close(void); void roster_clear(void); gboolean roster_update_presence(const char * const barejid, Resource *resource, GDateTime *last_activity); -PContact roster_get_contact(const char const *barejid); +PContact roster_get_contact(const char * const barejid); gboolean roster_contact_offline(const char * const barejid, const char * const resource, const char * const status); void roster_reset_search_attempts(void); -- cgit 1.4.1-2-gfad0