jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

Don't set channel->server = NULL when disconnecting, so scripts can still

Browse Source 
use it in eg. "channel destroyed". Patch by Qrczak


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2648 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2002-03-31 19:07:23 +00:00 committed by cras
parent dc4b7456dc
commit bfae72766e
6 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/channels.c
View File

@ -64,7 +64,7 @@ void channel_destroy(CHANNEL_REC *channel)
channel->destroying = TRUE; channel->destroying = TRUE;
channels = g_slist_remove(channels, channel); channels = g_slist_remove(channels, channel);
if (channel->server != NULL) if (!channel->server->disconnected)
channel->server->channels = g_slist_remove(channel->server->channels, channel); channel->server->channels = g_slist_remove(channel->server->channels, channel);
signal_emit("channel destroyed", 1, channel); signal_emit("channel destroyed", 1, channel);

1
src/core/servers.c
View File

@ -331,7 +331,6 @@ static int server_remove_channels(SERVER_REC *server)
for (tmp = server->channels; tmp != NULL; tmp = tmp->next) { for (tmp = server->channels; tmp != NULL; tmp = tmp->next) {
CHANNEL_REC *channel = tmp->data; CHANNEL_REC *channel = tmp->data;
channel->server = NULL;
channel_destroy(channel); channel_destroy(channel);
found = TRUE; found = TRUE;
} }

2
src/fe-common/core/fe-channels.c
View File

@ -67,7 +67,7 @@ static void signal_channel_destroyed(CHANNEL_REC *channel)
window_item_destroy((WI_ITEM_REC *) channel); window_item_destroy((WI_ITEM_REC *) channel);
if (channel->joined && !channel->left && if (channel->joined && !channel->left &&
channel->server != NULL) { !channel->server->disconnected) {
/* kicked out from channel */ /* kicked out from channel */
window_bind_add(window, channel->server->tag, window_bind_add(window, channel->server->tag,
channel->name); channel->name);

2
src/irc/core/channel-rejoin.c
View File

@ -162,7 +162,7 @@ static void sig_remove_rejoin(IRC_CHANNEL_REC *channel)
{ {
REJOIN_REC *rec; REJOIN_REC *rec;
if (!IS_IRC_CHANNEL(channel) || channel->server == NULL) if (!IS_IRC_CHANNEL(channel))
return; return;
rec = rejoin_find(channel->server, channel->name); rec = rejoin_find(channel->server, channel->name);

2
src/irc/core/channels-query.c
View File

@ -132,7 +132,7 @@ static void sig_channel_destroyed(IRC_CHANNEL_REC *channel)
{ {
g_return_if_fail(channel != NULL); g_return_if_fail(channel != NULL);
if (IS_IRC_CHANNEL(channel) && channel->server != NULL && if (IS_IRC_CHANNEL(channel) && !channel->server->disconnected &&
!channel->synced) !channel->synced)
query_remove_all(channel); query_remove_all(channel);
} }

2
src/irc/core/irc-channels.c
View File

@ -192,7 +192,7 @@ static void sig_channel_destroyed(IRC_CHANNEL_REC *channel)
if (!IS_IRC_CHANNEL(channel)) if (!IS_IRC_CHANNEL(channel))
return; return;
if (channel->server != NULL && !channel->left && !channel->kicked) { if (!channel->server->disconnected && !channel->left && !channel->kicked) {
/* destroying channel record without actually /* destroying channel record without actually
having left the channel yet */ having left the channel yet */
signal_emit("command part", 3, "", channel->server, channel); signal_emit("command part", 3, "", channel->server, channel);