pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-10 04:05:41 +02:00
Code Activity

Fixed bug when destroying last server

Browse Source
This commit is contained in:
Sebastien Helleu
2003-10-01 21:50:50 +00:00
parent 77e0d01d7a
commit d0bb1e0c2a
10 changed files with 118 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/command.c
+2 -2
View File
@@ -552,7 +552,7 @@ weechat_cmd_connect (int argc, char **argv)
return -1;
}
if (!ptr_server->window)
server_create_window (ptr_server);
gui_window_new (ptr_server, NULL);
if (server_connect (ptr_server))
{
irc_login (ptr_server);
@@ -935,7 +935,7 @@ weechat_cmd_server (int argc, char **argv)
if (new_server->autoconnect)
{
server_create_window (new_server);
gui_window_new (new_server, NULL);
if (server_connect (new_server))
irc_login (new_server);
}
src/gui/curses/gui-display.c
+53 -13
View File
File diff suppressed because it is too large Load Diff
src/irc/irc-server.c
+2 -16
View File
@@ -113,22 +113,6 @@ server_alloc ()
return new_server;
}
/*
* server_create_window: create windows for a server
*/
void
server_create_window (t_irc_server *server)
{
if (!SERVER(gui_windows))
{
server->window = gui_windows;
SERVER(gui_windows) = server;
}
else
gui_window_new (server, NULL);
}
/*
* server_destroy: free server data (not struct himself)
*/
@@ -181,6 +165,8 @@ server_free (t_irc_server *server)
(server->next_server)->prev_server = server->prev_server;
server_destroy (server);
if (server->window)
gui_window_free (server->window);
free (server);
irc_servers = new_irc_servers;
}
src/irc/irc.h
-1
View File
@@ -140,7 +140,6 @@ extern t_irc_channel *current_channel;
extern void server_init (t_irc_server *);
extern t_irc_server *server_alloc ();
extern void server_create_window (t_irc_server *);
extern void server_destroy (t_irc_server *);
extern void server_free (t_irc_server *);
extern void server_free_all ();
src/weechat.c
+2 -2
View File
@@ -211,8 +211,8 @@ wee_init_log ()
void
wee_shutdown ()
{
gui_end ();
server_free_all ();
gui_end ();
if (log_file)
fclose (log_file);
exit (0);
@@ -298,7 +298,7 @@ main (int argc, char *argv[])
{
if (ptr_server->autoconnect)
{
server_create_window (ptr_server);
gui_window_new (ptr_server, NULL);
if (server_connect (ptr_server))
irc_login (ptr_server);
}
weechat/src/command.c
+2 -2
View File
@@ -552,7 +552,7 @@ weechat_cmd_connect (int argc, char **argv)
return -1;
}
if (!ptr_server->window)
server_create_window (ptr_server);
gui_window_new (ptr_server, NULL);
if (server_connect (ptr_server))
{
irc_login (ptr_server);
@@ -935,7 +935,7 @@ weechat_cmd_server (int argc, char **argv)
if (new_server->autoconnect)
{
server_create_window (new_server);
gui_window_new (new_server, NULL);
if (server_connect (new_server))
irc_login (new_server);
}
weechat/src/gui/curses/gui-display.c
+53 -13
View File
File diff suppressed because it is too large Load Diff
weechat/src/irc/irc-server.c
+2 -16
View File
@@ -113,22 +113,6 @@ server_alloc ()
return new_server;
}
/*
* server_create_window: create windows for a server
*/
void
server_create_window (t_irc_server *server)
{
if (!SERVER(gui_windows))
{
server->window = gui_windows;
SERVER(gui_windows) = server;
}
else
gui_window_new (server, NULL);
}
/*
* server_destroy: free server data (not struct himself)
*/
@@ -181,6 +165,8 @@ server_free (t_irc_server *server)
(server->next_server)->prev_server = server->prev_server;
server_destroy (server);
if (server->window)
gui_window_free (server->window);
free (server);
irc_servers = new_irc_servers;
}
weechat/src/irc/irc.h
-1
View File
@@ -140,7 +140,6 @@ extern t_irc_channel *current_channel;
extern void server_init (t_irc_server *);
extern t_irc_server *server_alloc ();
extern void server_create_window (t_irc_server *);
extern void server_destroy (t_irc_server *);
extern void server_free (t_irc_server *);
extern void server_free_all ();
weechat/src/weechat.c
+2 -2
View File
@@ -211,8 +211,8 @@ wee_init_log ()
void
wee_shutdown ()
{
gui_end ();
server_free_all ();
gui_end ();
if (log_file)
fclose (log_file);
exit (0);
@@ -298,7 +298,7 @@ main (int argc, char *argv[])
{
if (ptr_server->autoconnect)
{
server_create_window (ptr_server);
gui_window_new (ptr_server, NULL);
if (server_connect (ptr_server))
irc_login (ptr_server);
}