mirror of
https://github.com/irssi/irssi.git
synced 2024-09-08 04:26:01 -04:00
/SERVER and /DISCONNECT handlers moved from irc to core.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2969 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
fe4cdce6e6
commit
37995ea05f
@ -229,6 +229,17 @@ static void cmd_server_connect(const char *data)
|
|||||||
cmd_params_free(free_arg);
|
cmd_params_free(free_arg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void server_command(const char *data, SERVER_REC *server,
|
||||||
|
WI_ITEM_REC *item)
|
||||||
|
{
|
||||||
|
if (server == NULL) {
|
||||||
|
/* this command accepts non-connected server too */
|
||||||
|
server = active_win->connect_server;
|
||||||
|
}
|
||||||
|
|
||||||
|
signal_continue(3, data, server, item);
|
||||||
|
}
|
||||||
|
|
||||||
static void sig_server_looking(SERVER_REC *server)
|
static void sig_server_looking(SERVER_REC *server)
|
||||||
{
|
{
|
||||||
g_return_if_fail(server != NULL);
|
g_return_if_fail(server != NULL);
|
||||||
@ -330,6 +341,8 @@ void fe_server_init(void)
|
|||||||
command_bind("server connect", NULL, (SIGNAL_FUNC) cmd_server_connect);
|
command_bind("server connect", NULL, (SIGNAL_FUNC) cmd_server_connect);
|
||||||
command_bind("server add", NULL, (SIGNAL_FUNC) cmd_server_add);
|
command_bind("server add", NULL, (SIGNAL_FUNC) cmd_server_add);
|
||||||
command_bind("server remove", NULL, (SIGNAL_FUNC) cmd_server_remove);
|
command_bind("server remove", NULL, (SIGNAL_FUNC) cmd_server_remove);
|
||||||
|
command_bind_first("server", NULL, (SIGNAL_FUNC) server_command);
|
||||||
|
command_bind_first("disconnect", NULL, (SIGNAL_FUNC) server_command);
|
||||||
command_set_options("server add", "4 6 ssl auto noauto proxy noproxy -host -port");
|
command_set_options("server add", "4 6 ssl auto noauto proxy noproxy -host -port");
|
||||||
|
|
||||||
signal_add("server looking", (SIGNAL_FUNC) sig_server_looking);
|
signal_add("server looking", (SIGNAL_FUNC) sig_server_looking);
|
||||||
@ -352,6 +365,8 @@ void fe_server_deinit(void)
|
|||||||
command_unbind("server connect", (SIGNAL_FUNC) cmd_server_connect);
|
command_unbind("server connect", (SIGNAL_FUNC) cmd_server_connect);
|
||||||
command_unbind("server add", (SIGNAL_FUNC) cmd_server_add);
|
command_unbind("server add", (SIGNAL_FUNC) cmd_server_add);
|
||||||
command_unbind("server remove", (SIGNAL_FUNC) cmd_server_remove);
|
command_unbind("server remove", (SIGNAL_FUNC) cmd_server_remove);
|
||||||
|
command_unbind("server", (SIGNAL_FUNC) server_command);
|
||||||
|
command_unbind("disconnect", (SIGNAL_FUNC) server_command);
|
||||||
|
|
||||||
signal_remove("server looking", (SIGNAL_FUNC) sig_server_looking);
|
signal_remove("server looking", (SIGNAL_FUNC) sig_server_looking);
|
||||||
signal_remove("server connecting", (SIGNAL_FUNC) sig_server_connecting);
|
signal_remove("server connecting", (SIGNAL_FUNC) sig_server_connecting);
|
||||||
|
@ -119,22 +119,9 @@ static void cmd_server_list(const char *data)
|
|||||||
g_string_free(str, TRUE);
|
g_string_free(str, TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void server_command(const char *data, SERVER_REC *server,
|
|
||||||
WI_ITEM_REC *item)
|
|
||||||
{
|
|
||||||
if (server == NULL) {
|
|
||||||
/* this command accepts non-connected server too */
|
|
||||||
server = active_win->connect_server;
|
|
||||||
}
|
|
||||||
|
|
||||||
signal_continue(3, data, server, item);
|
|
||||||
}
|
|
||||||
|
|
||||||
void fe_irc_server_init(void)
|
void fe_irc_server_init(void)
|
||||||
{
|
{
|
||||||
signal_add("server add fill", (SIGNAL_FUNC) sig_server_add_fill);
|
signal_add("server add fill", (SIGNAL_FUNC) sig_server_add_fill);
|
||||||
command_bind_first("server", NULL, (SIGNAL_FUNC) server_command);
|
|
||||||
command_bind_first("disconnect", NULL, (SIGNAL_FUNC) server_command);
|
|
||||||
command_bind("server list", NULL, (SIGNAL_FUNC) cmd_server_list);
|
command_bind("server list", NULL, (SIGNAL_FUNC) cmd_server_list);
|
||||||
|
|
||||||
command_set_options("server add", "-ircnet -cmdspeed -cmdmax -querychans");
|
command_set_options("server add", "-ircnet -cmdspeed -cmdmax -querychans");
|
||||||
@ -143,7 +130,5 @@ void fe_irc_server_init(void)
|
|||||||
void fe_irc_server_deinit(void)
|
void fe_irc_server_deinit(void)
|
||||||
{
|
{
|
||||||
signal_remove("server add fill", (SIGNAL_FUNC) sig_server_add_fill);
|
signal_remove("server add fill", (SIGNAL_FUNC) sig_server_add_fill);
|
||||||
command_unbind("server", (SIGNAL_FUNC) server_command);
|
|
||||||
command_unbind("disconnect", (SIGNAL_FUNC) server_command);
|
|
||||||
command_unbind("server list", (SIGNAL_FUNC) cmd_server_list);
|
command_unbind("server list", (SIGNAL_FUNC) cmd_server_list);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user