From f7966d9c081641ff5b1adca2bd8c217a331bcaa6 Mon Sep 17 00:00:00 2001 From: vague666 Date: Sat, 27 Oct 2018 20:51:29 +0200 Subject: [PATCH 1/2] allow activity_hide_targets to hide activity in itemless windows --- src/fe-common/core/fe-common-core.c | 4 +++- src/fe-common/core/window-activity.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index ef5d2113..0e654e4d 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -480,7 +480,9 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest) g_return_val_if_fail(array != NULL, FALSE); g_return_val_if_fail(dest != NULL, FALSE); g_return_val_if_fail(dest->window != NULL, FALSE); - g_return_val_if_fail(dest->target != NULL, FALSE); + + if (dest->target == NULL) { + return strarray_find(array, dest->window->name) != -1 ? TRUE : FALSE; item = window_item_find_window(dest->window, dest->server, dest->target); if (item == NULL) { diff --git a/src/fe-common/core/window-activity.c b/src/fe-common/core/window-activity.c index 48e909a4..06c24a2f 100644 --- a/src/fe-common/core/window-activity.c +++ b/src/fe-common/core/window-activity.c @@ -86,7 +86,7 @@ static void sig_hilight_text(TEXT_DEST_REC *dest, const char *msg) DATA_LEVEL_MSG : DATA_LEVEL_TEXT; } - if (hide_targets != NULL && (dest->level & MSGLEVEL_HILIGHT) == 0 && dest->target != NULL) { + if (hide_targets != NULL && (dest->level & MSGLEVEL_HILIGHT) == 0) { /* check for both target and tag/target */ if (strarray_find_dest(hide_targets, dest)) return; From ec577f9265fff6b36b0e25c3e1a04ef8f0aee9d6 Mon Sep 17 00:00:00 2001 From: vague666 Date: Sat, 27 Oct 2018 20:52:14 +0200 Subject: [PATCH 2/2] typo --- src/fe-common/core/fe-common-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index 0e654e4d..dc3a6f6d 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -481,7 +481,7 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest) g_return_val_if_fail(dest != NULL, FALSE); g_return_val_if_fail(dest->window != NULL, FALSE); - if (dest->target == NULL) { + if (dest->target == NULL) return strarray_find(array, dest->window->name) != -1 ? TRUE : FALSE; item = window_item_find_window(dest->window, dest->server, dest->target);