mirror of
https://github.com/irssi/irssi.git
synced 2024-11-03 04:27:19 -05:00
Merge pull request #967 from vague666/hide_targets_no_item
allow activity_hide_targets to hide activity in itemless windows
This commit is contained in:
commit
8054b5c2bd
@ -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(array != NULL, FALSE);
|
||||||
g_return_val_if_fail(dest != 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->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);
|
item = window_item_find_window(dest->window, dest->server, dest->target);
|
||||||
if (item == NULL) {
|
if (item == NULL) {
|
||||||
|
@ -86,7 +86,7 @@ static void sig_hilight_text(TEXT_DEST_REC *dest, const char *msg)
|
|||||||
DATA_LEVEL_MSG : DATA_LEVEL_TEXT;
|
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 */
|
/* check for both target and tag/target */
|
||||||
if (strarray_find_dest(hide_targets, dest))
|
if (strarray_find_dest(hide_targets, dest))
|
||||||
return;
|
return;
|
||||||
|
Loading…
Reference in New Issue
Block a user