diff options
Diffstat (limited to 'irc_channel.c')
| -rw-r--r-- | irc_channel.c | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/irc_channel.c b/irc_channel.c index 3ccbce55..13af3cf1 100644 --- a/irc_channel.c +++ b/irc_channel.c @@ -822,17 +822,38 @@ static char *set_eval_by_account(set_t *set, char *value) struct irc_channel *ic = set->data; struct irc_control_channel *icc = ic->data; account_t *acc; + GSList *new_acc = NULL; + char **accounts, **account; - if (!(acc = account_get(ic->irc->b, value))) { - return SET_INVALID; + if (value == NULL) { + goto out; } - icc->account = acc; + accounts = g_strsplit(value, ",", 0); + for (account = accounts; *account; account++) { + if (!(acc = account_get(ic->irc->b, *account))) { + goto fail; + } else { + new_acc = g_slist_append(new_acc, acc); + } + } + g_strfreev(accounts); + +out: + g_slist_free(icc->account); + icc->account = new_acc; + if ((icc->type & IRC_CC_TYPE_MASK) == IRC_CC_TYPE_ACCOUNT) { bee_irc_channel_update(ic->irc, ic, NULL); } - return g_strdup(acc->tag); + return g_strdup(value); + +fail: + g_slist_free(new_acc); + g_strfreev(accounts); + + return SET_INVALID; } static char *set_eval_fill_by(set_t *set, char *value) @@ -952,6 +973,7 @@ fail: gboolean irc_channel_wants_user(irc_channel_t *ic, irc_user_t *iu) { struct irc_control_channel *icc = ic->data; + GSList *accl; gboolean ret = FALSE; if (iu->bu == NULL) { @@ -963,7 +985,13 @@ gboolean irc_channel_wants_user(irc_channel_t *ic, irc_user_t *iu) ret = iu->bu->group == icc->group; break; case IRC_CC_TYPE_ACCOUNT: - ret = iu->bu->ic->acc == icc->account; + for (accl = icc->account; accl; accl = accl->next) { + account_t *acc = accl->data; + if (iu->bu->ic->acc == acc) { + ret = TRUE; + break; + } + } break; case IRC_CC_TYPE_PROTOCOL: ret = iu->bu->ic->acc->prpl == icc->protocol; @@ -991,6 +1019,7 @@ static gboolean control_channel_free(irc_channel_t *ic) set_del(&ic->set, "protocol"); set_del(&ic->set, "show_users"); + g_slist_free(icc->account); g_free(icc); ic->data = NULL; |