diff options
author | James Booth <boothj5@gmail.com> | 2015-12-22 00:02:11 +0000 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-12-22 00:02:11 +0000 |
commit | 4b26dc5b5acef8f21712b21a14e5c6af3e02e712 (patch) | |
tree | f3f71d6f3241ff3ec7357265ca44b022cc073e58 | |
parent | d9f5a2bda65ff9b5a147a11caed1031be93809d6 (diff) | |
parent | bea246d81b303302756500f6a32bd5db77928345 (diff) | |
download | profani-tty-4b26dc5b5acef8f21712b21a14e5c6af3e02e712.tar.gz |
Merge remote-tracking branch 'pasis/disabled-pgp-fix'
-rw-r--r-- | src/event/server_events.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/event/server_events.c b/src/event/server_events.c index 12c34d76..176fc57b 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -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); |