diff options
| author | Jari Matilainen <jari.matilainen@gmail.com> | 2016-03-17 23:58:46 +0100 |
|---|---|---|
| committer | Jari Matilainen <jari.matilainen@gmail.com> | 2016-03-17 23:58:46 +0100 |
| commit | 857e27aef6d04edc1e47d52d74031ba279d2da1a (patch) | |
| tree | 52e97f5fc79dd9cf226cac2d279a5f56cce95fcb /src/fe-common/core | |
| parent | 94b823c3cd410abb2fa54ecbcf298550d5e2ba88 (diff) | |
| download | irssi-857e27aef6d04edc1e47d52d74031ba279d2da1a.zip | |
Don't use glob matching, just regular string comparisons
Diffstat (limited to 'src/fe-common/core')
| -rw-r--r-- | src/fe-common/core/fe-common-core.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index f0549358..1b2ab1e2 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -459,12 +459,21 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest) { g_return_val_if_fail(array != NULL, FALSE); + if (strarray_find(array, "*") != -1) + return TRUE; + if (strarray_find(array, dest->target) != -1) return TRUE; if (dest->server_tag != NULL) { - char *tagtarget = g_strdup_printf("%s/%s", dest->server_tag, dest->target); - int ret = strarray_find_glob(array, tagtarget); + char *tagtarget = g_strdup_printf("%s/%s", dest->server_tag, "*"); + int ret = strarray_find(array, tagtarget); + g_free(tagtarget); + if (ret != -1) + 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; |