1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

Merge branch 'master' into osx-functional

This commit is contained in:
James Booth 2015-09-01 21:52:57 +01:00
commit 9ad5011622

View File

@ -83,7 +83,7 @@ static gpgme_error_t *
_p_gpg_passphrase_cb(void *hook, const char *uid_hint, const char *passphrase_info, int prev_was_bad, int fd) _p_gpg_passphrase_cb(void *hook, const char *uid_hint, const char *passphrase_info, int prev_was_bad, int fd)
{ {
if (passphrase) { if (passphrase) {
gpgme_io_writen(fd, passphrase, strlen(passphrase)); gpgme_io_write(fd, passphrase, strlen(passphrase));
} else { } else {
GString *pass_term = g_string_new(""); GString *pass_term = g_string_new("");