devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Moved OTR policy check to otr module

Browse Source
This commit is contained in:
James Booth
2014-05-11 15:03:10 +01:00
parent 95ff13136b
commit e8d84abb46
5 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/command/command.c
View File

@@ -1363,7 +1363,7 @@ cmd_execute_default(const char * const inp)
ui_current_print_line("You are not currently connected.");
} else {
#ifdef HAVE_LIBOTR
if ((strcmp(prefs_get_string(PREF_OTR_POLICY), "always") == 0) && !otr_is_secure(recipient)) {
if ((strcmp(otr_get_policy(recipient), "always") == 0) && !otr_is_secure(recipient)) {
cons_show_error("Failed to send message. Please check OTR policy");
return TRUE;
}

2
src/command/commands.c
View File

@@ -1004,7 +1004,7 @@ cmd_msg(gchar **args, struct cmd_help_t help)
cons_show_error("Failed to encrypt and send message,");
}
} else {
char *policy = prefs_get_string(PREF_OTR_POLICY);
char *policy = otr_get_policy(usr_jid);
if (strcmp(policy, "always") == 0) {
cons_show_error("Failed to send message. Please check OTR policy");