summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/plugins/irc/irc-command.c35
2 files changed, 26 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 7319833d8..9990925aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
-v0.3.6-dev, 2011-08-26
+v0.3.6-dev, 2011-08-27
Version 0.3.6 (under dev!)
@@ -71,6 +71,7 @@ Version 0.3.6 (under dev!)
description for option when function is called)
* scripts: fix crash with scripts not auto-loaded having a buffer opened after
/upgrade (input/close callbacks for buffer not set properly)
+* irc: allow server name for commands /die and /restart
* irc: add new info_hashtable "irc_message_split"
* irc: improve split of privmsg message (keep ctcp), add split of ison, join,
notice, wallops, 005, 353 (bug #29879)
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index 7495262de..6c5697c29 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -1311,11 +1311,18 @@ irc_command_die (void *data, struct t_gui_buffer *buffer, int argc,
/* make C compiler happy */
(void) data;
- (void) argc;
(void) argv;
- (void) argv_eol;
- irc_server_sendf (ptr_server, 0, NULL, "DIE");
+ if (argc > 1)
+ {
+ irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
+ "DIE %s", argv_eol[1]);
+ }
+ else
+ {
+ irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
+ "DIE");
+ }
return WEECHAT_RC_OK;
}
@@ -3468,12 +3475,18 @@ irc_command_restart (void *data, struct t_gui_buffer *buffer, int argc,
/* make C compiler happy */
(void) data;
- (void) argc;
(void) argv;
- (void) argv_eol;
- irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
- "RESTART");
+ if (argc > 1)
+ {
+ irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
+ "RESTART %s", argv_eol[1]);
+ }
+ else
+ {
+ irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
+ "RESTART");
+ }
return WEECHAT_RC_OK;
}
@@ -4851,8 +4864,8 @@ irc_command_init ()
"%(nicks)|%*", &irc_command_devoice, NULL);
weechat_hook_command ("die",
N_("shutdown the server"),
- "",
- "",
+ N_("[<target>]"),
+ N_("target: server name"),
NULL, &irc_command_die, NULL);
weechat_hook_command ("disconnect",
N_("disconnect from IRC server(s)"),
@@ -5164,8 +5177,8 @@ irc_command_init ()
NULL, &irc_command_rehash, NULL);
weechat_hook_command ("restart",
N_("tell the server to restart itself"),
- "",
- "",
+ N_("[<target>]"),
+ N_("target: server name"),
NULL, &irc_command_restart, NULL);
weechat_hook_command ("sajoin",
N_("force a user to join channel(s)"),