pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-27 13:26:38 +02:00
Code Activity

Fixed buffer search by server/channel: now if only channel is specified, a channel of another server can be found

Browse Source
This commit is contained in:
Sebastien Helleu
2006-09-16 14:47:15 +00:00
parent f325b5a71f
commit cb95bfc846
4 changed files with 50 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+3 -1
View File
@@ -1,10 +1,12 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
ChangeLog - 2006-09-12
ChangeLog - 2006-09-16
Version 0.2.1 (under dev!):
* fixed buffer search by server/channel: now if only channel is specified,
a channel of another server can be found
* fixed highlight for DCC, invite and notice: when a window is displaying
buffer, there's no highlight
* command "/away -all" now allowed when not connected to current server
src/gui/gui-buffer.c
+22 -8
View File
@@ -238,8 +238,8 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int type,
t_gui_buffer *
gui_buffer_search (char *server, char *channel)
{
t_irc_server *ptr_server;
t_irc_channel *ptr_channel;
t_irc_server *ptr_server, *ptr_srv;
t_irc_channel *ptr_channel, *ptr_chan;
t_gui_buffer *ptr_buffer;
ptr_server = NULL;
@@ -257,12 +257,6 @@ gui_buffer_search (char *server, char *channel)
if (!ptr_server)
return NULL;
}
else
{
ptr_server = SERVER(gui_current_window->buffer);
if (!ptr_server)
ptr_server = SERVER(gui_buffers);
}
if (channel && channel[0])
{
@@ -272,6 +266,26 @@ gui_buffer_search (char *server, char *channel)
if (ptr_channel)
ptr_buffer = ptr_channel->buffer;
}
else
{
for (ptr_srv = irc_servers; ptr_srv;
ptr_srv = ptr_srv->next_server)
{
for (ptr_chan = ptr_srv->channels; ptr_chan;
ptr_chan = ptr_chan->next_channel)
{
if (ascii_strcasecmp (ptr_chan->name, channel) == 0)
{
ptr_channel = ptr_chan;
break;
}
}
if (ptr_channel)
break;
}
if (ptr_channel)
ptr_buffer = ptr_channel->buffer;
}
}
else
{
weechat/ChangeLog
+3 -1
View File
@@ -1,10 +1,12 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
ChangeLog - 2006-09-12
ChangeLog - 2006-09-16
Version 0.2.1 (under dev!):
* fixed buffer search by server/channel: now if only channel is specified,
a channel of another server can be found
* fixed highlight for DCC, invite and notice: when a window is displaying
buffer, there's no highlight
* command "/away -all" now allowed when not connected to current server
weechat/src/gui/gui-buffer.c
+22 -8
View File
@@ -238,8 +238,8 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int type,
t_gui_buffer *
gui_buffer_search (char *server, char *channel)
{
t_irc_server *ptr_server;
t_irc_channel *ptr_channel;
t_irc_server *ptr_server, *ptr_srv;
t_irc_channel *ptr_channel, *ptr_chan;
t_gui_buffer *ptr_buffer;
ptr_server = NULL;
@@ -257,12 +257,6 @@ gui_buffer_search (char *server, char *channel)
if (!ptr_server)
return NULL;
}
else
{
ptr_server = SERVER(gui_current_window->buffer);
if (!ptr_server)
ptr_server = SERVER(gui_buffers);
}
if (channel && channel[0])
{
@@ -272,6 +266,26 @@ gui_buffer_search (char *server, char *channel)
if (ptr_channel)
ptr_buffer = ptr_channel->buffer;
}
else
{
for (ptr_srv = irc_servers; ptr_srv;
ptr_srv = ptr_srv->next_server)
{
for (ptr_chan = ptr_srv->channels; ptr_chan;
ptr_chan = ptr_chan->next_channel)
{
if (ascii_strcasecmp (ptr_chan->name, channel) == 0)
{
ptr_channel = ptr_chan;
break;
}
}
if (ptr_channel)
break;
}
if (ptr_channel)
ptr_buffer = ptr_channel->buffer;
}
}
else
{