summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog2
-rw-r--r--src/irc/irc-commands.c6
-rw-r--r--src/irc/irc-recv.c43
-rw-r--r--src/irc/irc.h1
-rw-r--r--weechat/ChangeLog2
-rw-r--r--weechat/src/irc/irc-commands.c6
-rw-r--r--weechat/src/irc/irc-recv.c43
-rw-r--r--weechat/src/irc/irc.h1
8 files changed, 10 insertions, 94 deletions
diff --git a/ChangeLog b/ChangeLog
index 515b2f3c0..5689cefd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@ ChangeLog - 2007-06-06
Version 0.2.5 (under dev!):
- * added missing IRC command 327
+ * added missing IRC commands (327, 378, 379) (bug #20091)
* fixed hotlist when exiting search mode: current buffer is removed from
hotlist
* added "%M" for completion with nicks of current server (nicks on open
diff --git a/src/irc/irc-commands.c b/src/irc/irc-commands.c
index f4cb90b45..3c6057ddb 100644
--- a/src/irc/irc-commands.c
+++ b/src/irc/irc-commands.c
@@ -393,8 +393,10 @@ t_irc_command irc_commands[] =
NULL, 0, 0, 0, 1, NULL, NULL, irc_recv_cmd_367 },
{ "368", N_("end of banlist"), "", "",
NULL, 0, 0, 0, 1, NULL, NULL, irc_recv_cmd_368 },
- { "378", N_("connecting from"), "", "",
- NULL, 0, 0, 0, 1, NULL, NULL, irc_recv_cmd_378 },
+ { "378", N_("whois (connecting from)"), "", "",
+ NULL, 0, 0, 0, 1, NULL, NULL, irc_recv_cmd_whois_nick_msg },
+ { "379", N_("whois (using modes)"), "", "",
+ NULL, 0, 0, 0, 1, NULL, NULL, irc_recv_cmd_whois_nick_msg },
{ "401", N_("no such nick/channel"), "", "",
NULL, 0, 0, MAX_ARGS, 1, NULL, NULL, irc_recv_cmd_error },
{ "402", N_("no such server"), "", "",
diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c
index d88737aa0..962737f61 100644
--- a/src/irc/irc-recv.c
+++ b/src/irc/irc-recv.c
@@ -4890,49 +4890,6 @@ irc_recv_cmd_368 (t_irc_server *server, char *host, char *nick, char *arguments)
}
/*
- * irc_recv_cmd_378: '378' command received (connecting from)
- */
-
-int
-irc_recv_cmd_378 (t_irc_server *server, char *host, char *nick, char *arguments)
-{
- char *pos, *pos2;
-
- /* make C compiler happy */
- (void) host;
- (void) nick;
-
- if (!command_ignored)
- {
- /* skip nickname if at beginning of server message */
- if (strncmp (server->nick, arguments, strlen (server->nick)) == 0)
- {
- arguments += strlen (server->nick) + 1;
- while (arguments[0] == ' ')
- arguments++;
- }
-
- irc_display_prefix (server, server->buffer, PREFIX_SERVER);
- pos = strchr (arguments, ':');
- if (pos)
- {
- pos[0] = '\0';
- pos2 = pos - 1;
- while (pos2[0] == ' ')
- pos2--;
- pos2[1] = '\0';
- gui_printf (server->buffer, "%s%s %s\n",
- GUI_COLOR(COLOR_WIN_CHAT), arguments, pos + 1);
- }
- else
- gui_printf (server->buffer, "%s%s\n",
- GUI_COLOR(COLOR_WIN_CHAT), arguments);
- }
-
- return 0;
-}
-
-/*
* irc_recv_cmd_432: '432' command received (erroneous nickname)
*/
diff --git a/src/irc/irc.h b/src/irc/irc.h
index cde4032ba..ec61a98ef 100644
--- a/src/irc/irc.h
+++ b/src/irc/irc.h
@@ -600,7 +600,6 @@ extern int irc_recv_cmd_365 (t_irc_server *, char *, char *, char *);
extern int irc_recv_cmd_366 (t_irc_server *, char *, char *, char *);
extern int irc_recv_cmd_367 (t_irc_server *, char *, char *, char *);
extern int irc_recv_cmd_368 (t_irc_server *, char *, char *, char *);
-extern int irc_recv_cmd_378 (t_irc_server *, char *, char *, char *);
extern int irc_recv_cmd_432 (t_irc_server *, char *, char *, char *);
extern int irc_recv_cmd_433 (t_irc_server *, char *, char *, char *);
extern int irc_recv_cmd_438 (t_irc_server *, char *, char *, char *);
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 515b2f3c0..5689cefd1 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -5,7 +5,7 @@ ChangeLog - 2007-06-06
Version 0.2.5 (under dev!):
- * added missing IRC command 327
+ * added missing IRC commands (327, 378, 379) (bug #20091)
* fixed hotlist when exiting search mode: current buffer is removed from
hotlist
* added "%M" for completion with nicks of current server (nicks on open
diff --git a/weechat/src/irc/irc-commands.c b/weechat/src/irc/irc-commands.c
index f4cb90b45..3c6057ddb 100644
--- a/weechat/src/irc/irc-commands.c
+++ b/weechat/src/irc/irc-commands.c
@@ -393,8 +393,10 @@ t_irc_command irc_commands[] =
NULL, 0, 0, 0, 1, NULL, NULL, irc_recv_cmd_367 },
{ "368", N_("end of banlist"), "", "",
NULL, 0, 0, 0, 1, NULL, NULL, irc_recv_cmd_368 },
- { "378", N_("connecting from"), "", "",
- NULL, 0, 0, 0, 1, NULL, NULL, irc_recv_cmd_378 },
+ { "378", N_("whois (connecting from)"), "", "",
+ NULL, 0, 0, 0, 1, NULL, NULL, irc_recv_cmd_whois_nick_msg },
+ { "379", N_("whois (using modes)"), "", "",
+ NULL, 0, 0, 0, 1, NULL, NULL, irc_recv_cmd_whois_nick_msg },
{ "401", N_("no such nick/channel"), "", "",
NULL, 0, 0, MAX_ARGS, 1, NULL, NULL, irc_recv_cmd_error },
{ "402", N_("no such server"), "", "",
diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c
index d88737aa0..962737f61 100644
--- a/weechat/src/irc/irc-recv.c
+++ b/weechat/src/irc/irc-recv.c
@@ -4890,49 +4890,6 @@ irc_recv_cmd_368 (t_irc_server *server, char *host, char *nick, char *arguments)
}
/*
- * irc_recv_cmd_378: '378' command received (connecting from)
- */
-
-int
-irc_recv_cmd_378 (t_irc_server *server, char *host, char *nick, char *arguments)
-{
- char *pos, *pos2;
-
- /* make C compiler happy */
- (void) host;
- (void) nick;
-
- if (!command_ignored)
- {
- /* skip nickname if at beginning of server message */
- if (strncmp (server->nick, arguments, strlen (server->nick)) == 0)
- {
- arguments += strlen (server->nick) + 1;
- while (arguments[0] == ' ')
- arguments++;
- }
-
- irc_display_prefix (server, server->buffer, PREFIX_SERVER);
- pos = strchr (arguments, ':');
- if (pos)
- {
- pos[0] = '\0';
- pos2 = pos - 1;
- while (pos2[0] == ' ')
- pos2--;
- pos2[1] = '\0';
- gui_printf (server->buffer, "%s%s %s\n",
- GUI_COLOR(COLOR_WIN_CHAT), arguments, pos + 1);
- }
- else
- gui_printf (server->buffer, "%s%s\n",
- GUI_COLOR(COLOR_WIN_CHAT), arguments);
- }
-
- return 0;
-}
-
-/*
* irc_recv_cmd_432: '432' command received (erroneous nickname)
*/
diff --git a/weechat/src/irc/irc.h b/weechat/src/irc/irc.h
index cde4032ba..ec61a98ef 100644
--- a/weechat/src/irc/irc.h
+++ b/weechat/src/irc/irc.h
@@ -600,7 +600,6 @@ extern int irc_recv_cmd_365 (t_irc_server *, char *, char *, char *);
extern int irc_recv_cmd_366 (t_irc_server *, char *, char *, char *);
extern int irc_recv_cmd_367 (t_irc_server *, char *, char *, char *);
extern int irc_recv_cmd_368 (t_irc_server *, char *, char *, char *);
-extern int irc_recv_cmd_378 (t_irc_server *, char *, char *, char *);
extern int irc_recv_cmd_432 (t_irc_server *, char *, char *, char *);
extern int irc_recv_cmd_433 (t_irc_server *, char *, char *, char *);
extern int irc_recv_cmd_438 (t_irc_server *, char *, char *, char *);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 09:36:09 +0000