aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-11-03 04:27:19 -05:00
Code

Merge pull request #565 from ahf/bug/524

Browse Source 
Kill bell_beeps.
This commit is contained in:
LemonBoy 2016-11-29 22:13:53 +01:00 committed by GitHub
commit 5efb3077d5
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/fe-common/core/fe-common-core.c
View File

@ -150,7 +150,6 @@ void fe_common_core_init(void)
settings_add_level("lookandfeel", "timestamp_level", "ALL"); settings_add_level("lookandfeel", "timestamp_level", "ALL");
settings_add_time("lookandfeel", "timestamp_timeout", "0"); settings_add_time("lookandfeel", "timestamp_timeout", "0");
settings_add_bool("lookandfeel", "bell_beeps", FALSE);
settings_add_level("lookandfeel", "beep_msg_level", ""); settings_add_level("lookandfeel", "beep_msg_level", "");
settings_add_bool("lookandfeel", "beep_when_window_active", TRUE); settings_add_bool("lookandfeel", "beep_when_window_active", TRUE);
settings_add_bool("lookandfeel", "beep_when_away", TRUE); settings_add_bool("lookandfeel", "beep_when_away", TRUE);

6
src/fe-common/core/formats.c
View File

@ -1224,11 +1224,7 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
} }
} }
if (type == 7) { if (type == 4 && *ptr == FORMAT_STYLE_CLRTOEOL) {
/* bell */
if (settings_get_bool("bell_beeps"))
signal_emit("beep", 0);
} else if (type == 4 && *ptr == FORMAT_STYLE_CLRTOEOL) {
/* clear to end of line */ /* clear to end of line */
flags |= GUI_PRINT_FLAG_CLRTOEOL; flags |= GUI_PRINT_FLAG_CLRTOEOL;
} }

6
src/fe-text/gui-readline.c
View File

@ -611,12 +611,8 @@ static void key_yank_next_cutbuffer(void)
guint length = 0; guint length = 0;
char *cutbuffer; char *cutbuffer;
if (!previous_yank_preceded) { if (!previous_yank_preceded)
if (settings_get_bool("bell_beeps")) {
signal_emit("beep", 0);
}
return; return;
}
if (active_entry->kill_ring == NULL) if (active_entry->kill_ring == NULL)
return; return;