summaryrefslogtreecommitdiff
path: root/src/irc/core/irc-channels-setup.c
diff options
context:
space:
mode:
authorailin-nemui <ailin-nemui@users.noreply.github.com>2016-09-21 15:59:33 +0200
committerailin-nemui <ailin-nemui@users.noreply.github.com>2016-09-21 15:59:33 +0200
commitac73255483a42851db6a54ae4f0d5040e94608a2 (patch)
tree23c38bc6224171640d44be3269053948dd1a92e8 /src/irc/core/irc-channels-setup.c
parent13f4026ae0f0d5422f3163576d4c2eff8754176a (diff)
parentd9b4cb34dccd7fb77e1d222333f3018ff947899c (diff)
downloadirssi-ac73255483a42851db6a54ae4f0d5040e94608a2.zip
Merge branch 'master' into integrate/0.8.20
Diffstat (limited to 'src/irc/core/irc-channels-setup.c')
-rw-r--r--src/irc/core/irc-channels-setup.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/irc/core/irc-channels-setup.c b/src/irc/core/irc-channels-setup.c
index 2320352d..bbbc095c 100644
--- a/src/irc/core/irc-channels-setup.c
+++ b/src/irc/core/irc-channels-setup.c
@@ -24,10 +24,12 @@
void irc_channels_setup_init(void)
{
- signal_add("channel wholist", (SIGNAL_FUNC) channel_send_autocommands);
+ signal_add("channel wholist", (SIGNAL_FUNC) channel_send_botcommands);
+ signal_add("channel joined", (SIGNAL_FUNC) channel_send_autocommands);
}
void irc_channels_setup_deinit(void)
{
- signal_remove("channel wholist", (SIGNAL_FUNC) channel_send_autocommands);
+ signal_remove("channel wholist", (SIGNAL_FUNC) channel_send_botcommands);
+ signal_remove("channel joined", (SIGNAL_FUNC) channel_send_autocommands);
}