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 configure

Browse Source
This commit is contained in:
James Booth 2017-01-16 00:24:30 +00:00
commit 5a1c1ba5fc
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/event/client_events.c
View File

@ -99,12 +99,12 @@ void
cl_ev_presence_send(const resource_presence_t presence_type, const int idle_secs) cl_ev_presence_send(const resource_presence_t presence_type, const int idle_secs)
{ {
char *signed_status = NULL; char *signed_status = NULL;
char *msg = connection_get_presence_msg();
#ifdef HAVE_LIBGPGME #ifdef HAVE_LIBGPGME
char *account_name = session_get_account_name(); char *account_name = session_get_account_name();
ProfAccount *account = accounts_get_account(account_name); ProfAccount *account = accounts_get_account(account_name);
if (account->pgp_keyid) { if (account->pgp_keyid) {
char *msg = connection_get_presence_msg();
signed_status = p_gpg_sign(msg, account->pgp_keyid); signed_status = p_gpg_sign(msg, account->pgp_keyid);
} }
account_free(account); account_free(account);

1
tests/unittests/test_cmd_account.c
View File

@ -806,7 +806,6 @@ void cmd_account_set_priority_updates_presence_when_account_connected_with_prese
expect_any(accounts_get_account, name); expect_any(accounts_get_account, name);
will_return(accounts_get_account, account); will_return(accounts_get_account, account);
#endif #endif
will_return(connection_get_presence_msg, "Free to chat");
expect_value(presence_send, status, RESOURCE_ONLINE); expect_value(presence_send, status, RESOURCE_ONLINE);
expect_value(presence_send, idle, 0); expect_value(presence_send, idle, 0);
expect_value(presence_send, signed_status, NULL); expect_value(presence_send, signed_status, NULL);