1
0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@560 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-07-31 20:40:24 +00:00 committed by cras
parent 5acdedd25a
commit 138079e3bd
2 changed files with 9 additions and 4 deletions

View File

@ -43,6 +43,8 @@ static void server_cant_connect(SERVER_REC *server, const char *msg)
signal_emit("server connect failed", 2, server, msg); signal_emit("server connect failed", 2, server, msg);
if (server->connect_tag != -1) if (server->connect_tag != -1)
g_source_remove(server->connect_tag); g_source_remove(server->connect_tag);
if (server->handle != NULL)
net_sendbuffer_destroy(server->handle, TRUE);
if (server->connect_pipe[0] != -1) { if (server->connect_pipe[0] != -1) {
close(server->connect_pipe[0]); close(server->connect_pipe[0]);
@ -50,8 +52,8 @@ static void server_cant_connect(SERVER_REC *server, const char *msg)
} }
MODULE_DATA_DEINIT(server); MODULE_DATA_DEINIT(server);
g_free_not_null(server->nick);
g_free(server->tag); g_free(server->tag);
g_free(server->nick);
g_free(server); g_free(server);
} }
@ -235,8 +237,10 @@ void server_disconnect(SERVER_REC *server)
MODULE_DATA_DEINIT(server); MODULE_DATA_DEINIT(server);
rawlog_destroy(server->rawlog); rawlog_destroy(server->rawlog);
line_split_free(server->buffer); line_split_free(server->buffer);
g_free(server->tag); g_free_not_null(server->version);
g_free_not_null(server->away_reason);
g_free(server->nick); g_free(server->nick);
g_free(server->tag);
g_free(server); g_free(server);
} }

View File

@ -231,15 +231,16 @@ static void sig_disconnected(IRC_SERVER_REC *server)
irc_server_connect_free(server->connrec); irc_server_connect_free(server->connrec);
g_free_not_null(server->real_address); g_free_not_null(server->real_address);
g_free_not_null(server->version);
g_free_not_null(server->usermode); g_free_not_null(server->usermode);
g_free_not_null(server->userhost); g_free_not_null(server->userhost);
g_free_not_null(server->last_invite); g_free_not_null(server->last_invite);
g_free_not_null(server->away_reason);
} }
static void sig_connect_failed(IRC_SERVER_REC *server) static void sig_connect_failed(IRC_SERVER_REC *server)
{ {
if (!irc_server_check(server))
return;
server_remove_channels(server); server_remove_channels(server);
irc_server_connect_free(server->connrec); irc_server_connect_free(server->connrec);
} }