devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-08-03 04:46:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix old chlog reference in help

Browse Source 
Fixes https://github.com/profanity-im/profanity/issues/1470
This commit is contained in:
Michael Vetter
2021-01-17 11:31:05 +01:00
parent 5bb2f47d45
commit 1038b97a7d
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/command/cmd_funcs.c
View File

@@ -6800,7 +6800,7 @@ cmd_history(ProfWin* window, const char* const command, gchar** args)
_cmd_set_boolean_preference(args[0], command, "Chat history", PREF_HISTORY); _cmd_set_boolean_preference(args[0], command, "Chat history", PREF_HISTORY);
// if set to on, set chlog // if set to on, set chlog (/logging chat on)
if (strcmp(args[0], "on") == 0) { if (strcmp(args[0], "on") == 0) {
prefs_set_boolean(PREF_CHLOG, TRUE); prefs_set_boolean(PREF_CHLOG, TRUE);
} }
@@ -7197,7 +7197,7 @@ cmd_pgp(ProfWin* window, const char* const command, gchar** args)
prefs_set_string(PREF_PGP_LOG, "on"); prefs_set_string(PREF_PGP_LOG, "on");
cons_show("PGP messages will be logged as plaintext."); cons_show("PGP messages will be logged as plaintext.");
if (!prefs_get_boolean(PREF_CHLOG)) { if (!prefs_get_boolean(PREF_CHLOG)) {
cons_show("Chat logging is currently disabled, use '/chlog on' to enable."); cons_show("Chat logging is currently disabled, use '/logging chat on' to enable.");
} }
} else if (g_strcmp0(choice, "off") == 0) { } else if (g_strcmp0(choice, "off") == 0) {
prefs_set_string(PREF_PGP_LOG, "off"); prefs_set_string(PREF_PGP_LOG, "off");
@@ -7206,7 +7206,7 @@ cmd_pgp(ProfWin* window, const char* const command, gchar** args)
prefs_set_string(PREF_PGP_LOG, "redact"); prefs_set_string(PREF_PGP_LOG, "redact");
cons_show("PGP messages will be logged as '[redacted]'."); cons_show("PGP messages will be logged as '[redacted]'.");
if (!prefs_get_boolean(PREF_CHLOG)) { if (!prefs_get_boolean(PREF_CHLOG)) {
cons_show("Chat logging is currently disabled, use '/chlog on' to enable."); cons_show("Chat logging is currently disabled, use '/logging chat on' to enable.");
} }
} else { } else {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
@@ -7624,7 +7624,7 @@ cmd_otr_log(ProfWin* window, const char* const command, gchar** args)
prefs_set_string(PREF_OTR_LOG, "on"); prefs_set_string(PREF_OTR_LOG, "on");
cons_show("OTR messages will be logged as plaintext."); cons_show("OTR messages will be logged as plaintext.");
if (!prefs_get_boolean(PREF_CHLOG)) { if (!prefs_get_boolean(PREF_CHLOG)) {
cons_show("Chat logging is currently disabled, use '/chlog on' to enable."); cons_show("Chat logging is currently disabled, use '/logging chat on' to enable.");
} }
} else if (g_strcmp0(choice, "off") == 0) { } else if (g_strcmp0(choice, "off") == 0) {
prefs_set_string(PREF_OTR_LOG, "off"); prefs_set_string(PREF_OTR_LOG, "off");
@@ -7633,7 +7633,7 @@ cmd_otr_log(ProfWin* window, const char* const command, gchar** args)
prefs_set_string(PREF_OTR_LOG, "redact"); prefs_set_string(PREF_OTR_LOG, "redact");
cons_show("OTR messages will be logged as '[redacted]'."); cons_show("OTR messages will be logged as '[redacted]'.");
if (!prefs_get_boolean(PREF_CHLOG)) { if (!prefs_get_boolean(PREF_CHLOG)) {
cons_show("Chat logging is currently disabled, use '/chlog on' to enable."); cons_show("Chat logging is currently disabled, use '/logging chat on' to enable.");
} }
} else { } else {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
@@ -8529,7 +8529,7 @@ cmd_omemo_log(ProfWin* window, const char* const command, gchar** args)
prefs_set_string(PREF_OMEMO_LOG, "on"); prefs_set_string(PREF_OMEMO_LOG, "on");
cons_show("OMEMO messages will be logged as plaintext."); cons_show("OMEMO messages will be logged as plaintext.");
if (!prefs_get_boolean(PREF_CHLOG)) { if (!prefs_get_boolean(PREF_CHLOG)) {
cons_show("Chat logging is currently disabled, use '/chlog on' to enable."); cons_show("Chat logging is currently disabled, use '/logging chat on' to enable.");
} }
} else if (g_strcmp0(choice, "off") == 0) { } else if (g_strcmp0(choice, "off") == 0) {
prefs_set_string(PREF_OMEMO_LOG, "off"); prefs_set_string(PREF_OMEMO_LOG, "off");
@@ -8538,7 +8538,7 @@ cmd_omemo_log(ProfWin* window, const char* const command, gchar** args)
prefs_set_string(PREF_OMEMO_LOG, "redact"); prefs_set_string(PREF_OMEMO_LOG, "redact");
cons_show("OMEMO messages will be logged as '[redacted]'."); cons_show("OMEMO messages will be logged as '[redacted]'.");
if (!prefs_get_boolean(PREF_CHLOG)) { if (!prefs_get_boolean(PREF_CHLOG)) {
cons_show("Chat logging is currently disabled, use '/chlog on' to enable."); cons_show("Chat logging is currently disabled, use '/logging chat on' to enable.");
} }
} else { } else {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);

4
tests/unittests/test_cmd_otr.c
View File

@@ -73,7 +73,7 @@ cmd_otr_log_on_shows_warning_when_chlog_disabled(void** state)
prefs_set_boolean(PREF_CHLOG, FALSE); prefs_set_boolean(PREF_CHLOG, FALSE);
expect_cons_show("OTR messages will be logged as plaintext."); expect_cons_show("OTR messages will be logged as plaintext.");
expect_cons_show("Chat logging is currently disabled, use '/chlog on' to enable."); expect_cons_show("Chat logging is currently disabled, use '/logging chat on' to enable.");
gboolean result = cmd_otr_log(NULL, CMD_OTR, args); gboolean result = cmd_otr_log(NULL, CMD_OTR, args);
assert_true(result); assert_true(result);
@@ -121,7 +121,7 @@ cmd_otr_log_redact_shows_warning_when_chlog_disabled(void** state)
prefs_set_boolean(PREF_CHLOG, FALSE); prefs_set_boolean(PREF_CHLOG, FALSE);
expect_cons_show("OTR messages will be logged as '[redacted]'."); expect_cons_show("OTR messages will be logged as '[redacted]'.");
expect_cons_show("Chat logging is currently disabled, use '/chlog on' to enable."); expect_cons_show("Chat logging is currently disabled, use '/logging chat on' to enable.");
gboolean result = cmd_otr_log(NULL, CMD_OTR, args); gboolean result = cmd_otr_log(NULL, CMD_OTR, args);
assert_true(result); assert_true(result);