diff options
| author | James Booth <boothj5@gmail.com> | 2015-04-23 23:48:43 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-04-23 23:48:43 +0100 |
| commit | 7a44e171410c97f2fa4a649287cfb509ba5c5d8b (patch) | |
| tree | f023aeb5b3f08af524794968e689f15bff45745b /src/config/account.h | |
| parent | 5f2c6cbd28f6d2519f826fa47628995c787689bf (diff) | |
| parent | bc9e6b79cdc246f7e97f6ddff7ea81474a698b05 (diff) | |
| download | profani-tty-7a44e171410c97f2fa4a649287cfb509ba5c5d8b.tar.gz | |
Merge branch 'master' into pgp
Conflicts: src/config/account.h
Diffstat (limited to 'src/config/account.h')
| -rw-r--r-- | src/config/account.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/config/account.h b/src/config/account.h index a49aebd0..22c29161 100644 --- a/src/config/account.h +++ b/src/config/account.h @@ -70,9 +70,8 @@ ProfAccount* account_new(const gchar * const name, const gchar * const jid, const gchar * const muc_service, const gchar * const muc_nick, const gchar * const otr_policy, GList *otr_manual, GList *otr_opportunistic, GList *otr_always, const gchar * const pgp_keyid); - char* account_create_full_jid(ProfAccount *account); - +gboolean account_eval_password(ProfAccount *account); void account_free(ProfAccount *account); #endif |