diff options
| author | LemonBoy <LemonBoy@users.noreply.github.com> | 2016-11-29 22:13:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-29 22:13:53 +0100 |
| commit | 5efb3077d5c055475644dac8c5e0aa48b308d456 (patch) | |
| tree | f9d68bc4a7b42bcbba5689a2ff6a56bdfc5d8930 /src | |
| parent | 22ce6637c7acbdda27395521cc7dce23fa98b8b9 (diff) | |
| parent | 6a6196eebe791e193d5f625c0a87f381b4100f30 (diff) | |
| download | irssi-5efb3077d5c055475644dac8c5e0aa48b308d456.zip | |
Merge pull request #565 from ahf/bug/524
Kill bell_beeps.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fe-common/core/fe-common-core.c | 1 | ||||
| -rw-r--r-- | src/fe-common/core/formats.c | 6 | ||||
| -rw-r--r-- | src/fe-text/gui-readline.c | 6 |
3 files changed, 2 insertions, 11 deletions
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index fd0e6cf0..512fc84c 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -150,7 +150,6 @@ void fe_common_core_init(void) settings_add_level("lookandfeel", "timestamp_level", "ALL"); settings_add_time("lookandfeel", "timestamp_timeout", "0"); - settings_add_bool("lookandfeel", "bell_beeps", FALSE); settings_add_level("lookandfeel", "beep_msg_level", ""); settings_add_bool("lookandfeel", "beep_when_window_active", TRUE); settings_add_bool("lookandfeel", "beep_when_away", TRUE); diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c index 9aa7698d..a58d839a 100644 --- a/src/fe-common/core/formats.c +++ b/src/fe-common/core/formats.c @@ -1224,11 +1224,7 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text) } } - if (type == 7) { - /* bell */ - if (settings_get_bool("bell_beeps")) - signal_emit("beep", 0); - } else if (type == 4 && *ptr == FORMAT_STYLE_CLRTOEOL) { + if (type == 4 && *ptr == FORMAT_STYLE_CLRTOEOL) { /* clear to end of line */ flags |= GUI_PRINT_FLAG_CLRTOEOL; } diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c index 7c71edd7..2c2eac21 100644 --- a/src/fe-text/gui-readline.c +++ b/src/fe-text/gui-readline.c @@ -611,12 +611,8 @@ static void key_yank_next_cutbuffer(void) guint length = 0; char *cutbuffer; - if (!previous_yank_preceded) { - if (settings_get_bool("bell_beeps")) { - signal_emit("beep", 0); - } + if (!previous_yank_preceded) return; - } if (active_entry->kill_ring == NULL) return; |