diff options
| author | Alexander Færøy <ahf@0x90.dk> | 2016-10-23 21:23:52 +0200 |
|---|---|---|
| committer | Alexander Færøy <ahf@0x90.dk> | 2016-10-23 21:24:12 +0200 |
| commit | 6a6196eebe791e193d5f625c0a87f381b4100f30 (patch) | |
| tree | 767cf2a104b7320baed419fc41f00e45dc4912e5 | |
| parent | fb78787d4e2098612979b45df3237b67effbbc3a (diff) | |
| download | irssi-6a6196eebe791e193d5f625c0a87f381b4100f30.zip | |
Kill bell_beeps.
Fixes #524
| -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 1b2ab1e2..74b3f0c7 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -147,7 +147,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; |