forked from PsychoticNinja/irssi
Merge pull request #437 from vague666/glob_matching
Use glob matching for activity_hide_targets
This commit is contained in:
commit
f7658640fb
@ -459,15 +459,24 @@ 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);
|
||||||
|
|
||||||
|
if (strarray_find(array, "*") != -1)
|
||||||
|
return TRUE;
|
||||||
|
|
||||||
if (strarray_find(array, dest->target) != -1)
|
if (strarray_find(array, dest->target) != -1)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
if (dest->server_tag != NULL) {
|
if (dest->server_tag != NULL) {
|
||||||
char *tagtarget = g_strdup_printf("%s/%s", dest->server_tag, dest->target);
|
char *tagtarget = g_strdup_printf("%s/%s", dest->server_tag, "*");
|
||||||
int ret = strarray_find(array, tagtarget);
|
int ret = strarray_find(array, tagtarget);
|
||||||
g_free(tagtarget);
|
g_free(tagtarget);
|
||||||
if (ret != -1)
|
if (ret != -1)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
|
tagtarget = g_strdup_printf("%s/%s", dest->server_tag, dest->target);
|
||||||
|
ret = strarray_find(array, tagtarget);
|
||||||
|
g_free(tagtarget);
|
||||||
|
if (ret != -1)
|
||||||
|
return TRUE;
|
||||||
}
|
}
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user