merge/upstream-full #105

Manually merged
jabber.developer merged 407 commits from merge/upstream-full into master 2026-05-26 17:54:34 +00:00
203 changed files with 5965 additions and 27417 deletions
Showing only changes of commit b6a70aa47e - Show all commits

View File

@@ -87,7 +87,7 @@ _p_gpg_free_pubkeyid(ProfPGPPubKeyId* pubkeyid)
free(pubkeyid); free(pubkeyid);
} }
static gpgme_error_t* 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) {
@@ -109,7 +109,7 @@ _p_gpg_passphrase_cb(void* hook, const char* uid_hint, const char* passphrase_in
gpgme_io_write(fd, passphrase_attempt, strlen(passphrase_attempt)); gpgme_io_write(fd, passphrase_attempt, strlen(passphrase_attempt));
} }
return 0; return GPG_ERR_NO_ERROR;
} }
static void static void