1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-06-23 21:45:30 +00:00

Merge remote-tracking branch 'pasis/disabled-pgp-fix'

This commit is contained in:
James Booth 2015-12-22 00:02:11 +00:00
commit 4b26dc5b5a

View File

@ -104,6 +104,7 @@ sv_ev_roster_received(void)
char *account_name = jabber_get_account_name();
#ifdef HAVE_LIBGPGME
// check pgp key valid if specified
ProfAccount *account = accounts_get_account(account_name);
if (account && account->pgp_keyid) {
@ -113,6 +114,7 @@ sv_ev_roster_received(void)
}
free(err_str);
}
#endif
// send initial presence
resource_presence_t conn_presence = accounts_get_login_presence(account_name);