1
0
mirror of https://github.com/weechat/weechat.git synced 2026-06-25 04:16:38 +02:00

Fixed bug with /topic when channel not open and topic not defined (bug #20141)

This commit is contained in:
Sebastien Helleu
2007-06-11 06:46:53 +00:00
parent 299d37a342
commit b80c53e87d
4 changed files with 30 additions and 38 deletions
+4 -2
View File
@@ -1,10 +1,12 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
ChangeLog - 2007-06-08
ChangeLog - 2007-06-11
Version 0.2.5 (under dev!):
Version 0.2.6 (under dev!):
* fixed bug with /topic when channel not open and topic not defined
(bug #20141)
* added hotlist sort with new option "look_hotlist_sort" (task #5870)
Version 0.2.5 (2007-06-07):
+11 -17
View File
@@ -3666,24 +3666,18 @@ irc_recv_cmd_331 (t_irc_server *server, char *host, char *nick, char *arguments)
}
ptr_channel = irc_channel_search (server, pos_channel);
if (ptr_channel)
command_ignored |= irc_ignore_check (host, "331",
(ptr_channel) ? ptr_channel->name : NULL,
server->name);
if (!command_ignored)
{
command_ignored |= irc_ignore_check (host, "331", ptr_channel->name, server->name);
if (!command_ignored)
{
irc_display_prefix (server, ptr_channel->buffer, PREFIX_INFO);
gui_printf (ptr_channel->buffer, _("No topic set for %s%s\n"),
GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
pos_channel);
}
}
else
{
irc_display_prefix (server, server->buffer, PREFIX_ERROR);
gui_printf_nolog (server->buffer,
_("%s channel \"%s\" not found for \"%s\" command\n"),
WEECHAT_ERROR, pos_channel, "331");
return -1;
irc_display_prefix (server,
(ptr_channel) ? ptr_channel->buffer : NULL,
PREFIX_INFO);
gui_printf ((ptr_channel) ? ptr_channel->buffer : NULL,
_("No topic set for %s%s\n"),
GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
pos_channel);
}
}
return 0;
+4 -2
View File
@@ -1,10 +1,12 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
ChangeLog - 2007-06-08
ChangeLog - 2007-06-11
Version 0.2.5 (under dev!):
Version 0.2.6 (under dev!):
* fixed bug with /topic when channel not open and topic not defined
(bug #20141)
* added hotlist sort with new option "look_hotlist_sort" (task #5870)
Version 0.2.5 (2007-06-07):
+11 -17
View File
@@ -3666,24 +3666,18 @@ irc_recv_cmd_331 (t_irc_server *server, char *host, char *nick, char *arguments)
}
ptr_channel = irc_channel_search (server, pos_channel);
if (ptr_channel)
command_ignored |= irc_ignore_check (host, "331",
(ptr_channel) ? ptr_channel->name : NULL,
server->name);
if (!command_ignored)
{
command_ignored |= irc_ignore_check (host, "331", ptr_channel->name, server->name);
if (!command_ignored)
{
irc_display_prefix (server, ptr_channel->buffer, PREFIX_INFO);
gui_printf (ptr_channel->buffer, _("No topic set for %s%s\n"),
GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
pos_channel);
}
}
else
{
irc_display_prefix (server, server->buffer, PREFIX_ERROR);
gui_printf_nolog (server->buffer,
_("%s channel \"%s\" not found for \"%s\" command\n"),
WEECHAT_ERROR, pos_channel, "331");
return -1;
irc_display_prefix (server,
(ptr_channel) ? ptr_channel->buffer : NULL,
PREFIX_INFO);
gui_printf ((ptr_channel) ? ptr_channel->buffer : NULL,
_("No topic set for %s%s\n"),
GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
pos_channel);
}
}
return 0;