diff options
| -rw-r--r-- | src/command/command.c | 8 | ||||
| -rw-r--r-- | src/command/commands.c | 4 | ||||
| -rw-r--r-- | src/otr.h | 1 | ||||
| -rw-r--r-- | src/otr3.c | 6 | ||||
| -rw-r--r-- | src/otr4.c | 6 |
5 files changed, 22 insertions, 3 deletions
diff --git a/src/command/command.c b/src/command/command.c index 2393a734..e76027c1 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -593,9 +593,9 @@ static struct cmd_t command_defs[] = { "/otr", cmd_otr, parse_args, 1, 2, NULL, - { "/otr gen|myfp|theirfp|start|end|trust|untrust|log|warn", "Off The Record encryption commands.", - { "/otr gen|myfp|theirfp|start|end|trust|untrust|log|warn", - "------------------------------------------------------", + { "/otr gen|myfp|theirfp|start|end|trust|untrust|log|warn|libver", "Off The Record encryption commands.", + { "/otr gen|myfp|theirfp|start|end|trust|untrust|log|warn|libver", + "-------------------------------------------------------------", "gen - Generate your private key.", "myfp - Show your fingerprint.", "theirfp - Show contacts fingerprint.", @@ -605,6 +605,7 @@ static struct cmd_t command_defs[] = "untrust - Indicate the the contact's fingerprint is not verified,", "log - How to log OTR messages, options are 'on', 'off' and 'redact', with redaction being the default.", "warn - Show when unencrypted messaging is being used in the title bar, options are 'on' and 'off' with 'on' being the default.", + "libver - Show which version of the libotr library is being used.", NULL } } }, { "/outtype", @@ -1056,6 +1057,7 @@ cmd_init(void) autocomplete_add(otr_ac, "untrust"); autocomplete_add(otr_ac, "log"); autocomplete_add(otr_ac, "warn"); + autocomplete_add(otr_ac, "libver"); otr_log_ac = autocomplete_new(); autocomplete_add(otr_log_ac, "on"); diff --git a/src/command/commands.c b/src/command/commands.c index 368a644b..d0dda7ec 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -2593,6 +2593,10 @@ cmd_otr(gchar **args, struct cmd_help_t help) // update the current window ui_switch_win(wins_get_current_num()); return result; + } else if (strcmp(args[0], "libver") == 0) { + char *version = otr_libotr_version(); + cons_show("Using libotr version %s", version); + return TRUE; } if (jabber_get_connection_status() != JABBER_CONNECTED) { diff --git a/src/otr.h b/src/otr.h index 404e7e07..85ae09cc 100644 --- a/src/otr.h +++ b/src/otr.h @@ -26,6 +26,7 @@ #include "config/accounts.h" void otr_init(void); +char* otr_libotr_version(void); void otr_on_connect(ProfAccount *account); void otr_keygen(ProfAccount *account); diff --git a/src/otr3.c b/src/otr3.c index 8e603a00..6d5c9496 100644 --- a/src/otr3.c +++ b/src/otr3.c @@ -100,6 +100,12 @@ cb_gone_secure(void *opdata, ConnContext *context) ui_gone_secure(context->username, otr_is_trusted(context->username)); } +char * +otr_libotr_version(void) +{ + return OTRL_VERSION; +} + void otr_init(void) { diff --git a/src/otr4.c b/src/otr4.c index 84244dae..ddd4aeeb 100644 --- a/src/otr4.c +++ b/src/otr4.c @@ -129,6 +129,12 @@ cb_gone_secure(void *opdata, ConnContext *context) ui_gone_secure(context->username, otr_is_trusted(context->username)); } +char * +otr_libotr_version(void) +{ + return OTRL_VERSION; +} + void otr_init(void) { |