Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2025-07-01 06:16:44 +02:00
Code Issues Projects Releases Wiki Activity

Add further explanation to the beep_on* options

Browse Source 
This also renames beep_on* to bell_on*.
This commit is contained in:
Marvin Ewald
2016-07-21 11:25:40 +02:00
parent 9aedcf7753
commit 5b1b420ac0
7 changed files with 87 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/settings.c
View File

@ -51,10 +51,10 @@ static struct ui_strings {
const char* timestamp_format;
const char* log_timestamp_format;
const char* alerts;
const char* beep_on_message;
const char* beep_on_filetrans;
const char* beep_on_filetrans_accept;
const char* beep_on_invite;
const char* bell_on_message;
const char* bell_on_filetrans;
const char* bell_on_filetrans_accept;
const char* bell_on_invite;
const char* native_colors;
const char* autolog;
const char* history_size;
@ -77,10 +77,10 @@ static struct ui_strings {
"timestamp_format",
"log_timestamp_format",
"alerts",
"beep_on_message",
"beep_on_filetrans",
"beep_on_filetrans_accept",
"beep_on_invite",
"bell_on_message",
"bell_on_filetrans",
"bell_on_filetrans_accept",
"bell_on_invite",
"native_colors",
"autolog",
"history_size",
@ -104,10 +104,10 @@ static void ui_defaults(struct user_settings* settings)
settings->autolog = AUTOLOG_OFF;
settings->alerts = ALERTS_ENABLED;
settings->beep_on_message = 0;
settings->beep_on_filetrans = 0;
settings->beep_on_filetrans_accept = 0;
settings->beep_on_invite = 0;
settings->bell_on_message = 0;
settings->bell_on_filetrans = 0;
settings->bell_on_filetrans_accept = 0;
settings->bell_on_invite = 0;
settings->colour_theme = DFLT_COLS;
settings->history_size = 700;
settings->show_typing_self = SHOW_TYPING_ON;
@ -332,17 +332,17 @@ int settings_load(struct user_settings *s, const char *patharg)
config_setting_lookup_bool(setting, ui_strings.alerts, &s->alerts);
if (config_setting_lookup_bool(setting, ui_strings.beep_on_message, &s->beep_on_message)) {
s->beep_on_message = s->beep_on_message ? NT_BEEP : 0;
if (config_setting_lookup_bool(setting, ui_strings.bell_on_message, &s->bell_on_message)) {
s->bell_on_message = s->bell_on_message ? NT_BEEP : 0;
}
if (config_setting_lookup_bool(setting, ui_strings.beep_on_filetrans, &s->beep_on_filetrans)) {
s->beep_on_filetrans = s->beep_on_filetrans ? NT_BEEP : 0;
if (config_setting_lookup_bool(setting, ui_strings.bell_on_filetrans, &s->bell_on_filetrans)) {
s->bell_on_filetrans = s->bell_on_filetrans ? NT_BEEP : 0;
}
if (config_setting_lookup_bool(setting, ui_strings.beep_on_filetrans_accept, &s->beep_on_filetrans_accept)) {
s->beep_on_filetrans_accept = s->beep_on_filetrans_accept ? NT_BEEP : 0;
if (config_setting_lookup_bool(setting, ui_strings.bell_on_filetrans_accept, &s->bell_on_filetrans_accept)) {
s->bell_on_filetrans_accept = s->bell_on_filetrans_accept ? NT_BEEP : 0;
}
if (config_setting_lookup_bool(setting, ui_strings.beep_on_invite, &s->beep_on_invite)) {
s->beep_on_invite = s->beep_on_invite ? NT_BEEP : 0;
if (config_setting_lookup_bool(setting, ui_strings.bell_on_invite, &s->bell_on_invite)) {
s->bell_on_invite = s->bell_on_invite ? NT_BEEP : 0;
}
config_setting_lookup_bool(setting, ui_strings.autolog, &s->autolog);