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

OX bug fix

Browse Source 
* Help / message description
 * C-Code format
This commit is contained in:
DebXWoody 2021-07-01 18:08:40 +02:00
parent 6173e015f5
commit d01ba72535
No known key found for this signature in database
GPG Key ID: CBD1B596579B7FFF
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/command/cmd_defs.c
View File

@ -1721,7 +1721,8 @@ static struct cmd_t command_defs[] = {
"/ox request <jid> <keyid>")
CMD_DESC(
"OpenPGP (OX) commands to manage keys, and perform OpenPGP encryption during chat sessions. "
"Your key need a OpenPGP UI with xmpp:local@domain.tld as name.")
"Your OpenPGP key needs a user-id with your JID URI (xmpp:local@domain.tld). "
"A key can be generated with \"gpg --quick-gen-key xmpp:local@domain.tld future-default default 3y\".")
CMD_ARGS(
{ "keys", "List all keys known to the system." },
{ "contacts", "Show contacts with assigned public keys." },
@ -1731,7 +1732,7 @@ static struct cmd_t command_defs[] = {
{ "log redact", "Log PGP encrypted messages, but replace the contents with [redacted]. This is the default." },
{ "char <char>", "Set the character to be displayed next to PGP encrypted messages." },
{ "announce <file>", "Announce a public key by pushing it on the XMPP Server" },
{ "discover <jid>", "Discover public keys of a jid. The keyids will be displayed" },
{ "discover <jid>", "Discover public keys of a jid. The OpenPGP Key IDs will be displayed" },
{ "request <jid>", "Request public keys" },
{ "sendfile on|off", "Allow /sendfile to send unencrypted files while otherwise using PGP." })
CMD_EXAMPLES(

2
src/command/cmd_funcs.c
View File

@ -7619,7 +7619,7 @@ cmd_ox(ProfWin* window, const char* const command, gchar** args)
if (args[1] && args[2]) {
ox_request_public_key(args[1], args[2]);
} else {
cons_show("JID and KeyID is required");
cons_show("JID and OpenPGP Key ID are required");
}
} else {
cons_show("OX not implemented");

1
src/xmpp/message.c
View File

@ -1489,7 +1489,6 @@ _handle_ox_chat(xmpp_stanza_t* const stanza, ProfMessage* message, gboolean is_m
log_warning("OX Stanza without openpgp stanza");
}
#endif // HAVE_LIBGPGME
}
static gboolean