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

Merge branch 'master' into osx-functional

Browse Source
This commit is contained in:
James Booth 2015-12-22 00:05:58 +00:00
commit 4862392e5c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/event/server_events.c
View File

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