1
0
mirror of https://github.com/weechat/weechat.git synced 2026-06-29 22:36:38 +02:00

irc: auto-connect to servers created with "irc://" on command line but not other servers if "-a" ("--no-connect") is given

This commit is contained in:
Sebastien Helleu
2011-11-03 13:11:10 +01:00
parent c87558d3db
commit e62cf7c57d
4 changed files with 11 additions and 5 deletions
+2
View File
@@ -17,6 +17,8 @@ Version 0.3.7 (under dev!)
* core: fix compilation error with "pid_t" on Mac OS X (bug #34639)
* core: enable background process under Cygwin to connect to servers, fix
reconnection problem (bug #34626)
* irc: auto-connect to servers created with "irc://" on command line but not
other servers if "-a" ("--no-connect") is given
* guile: new script plugin for scheme (task #7289)
* ruby: fix crash when reloading ruby plugin (bug #34474)
+7 -2
View File
@@ -3497,17 +3497,22 @@ irc_server_reconnect (struct t_irc_server *server)
/*
* irc_server_auto_connect: auto-connect to servers (called at startup)
* if auto_connect = 1, auto connect to all servers
* with flag "autoconnect"
* = 0, auto connect to temp servers
* only (created with "irc://..")
*/
void
irc_server_auto_connect ()
irc_server_auto_connect (int auto_connect)
{
struct t_irc_server *ptr_server;
for (ptr_server = irc_servers; ptr_server;
ptr_server = ptr_server->next_server)
{
if (IRC_SERVER_OPTION_BOOLEAN(ptr_server, IRC_SERVER_OPTION_AUTOCONNECT))
if ((auto_connect || ptr_server->temp_server)
&& (IRC_SERVER_OPTION_BOOLEAN(ptr_server, IRC_SERVER_OPTION_AUTOCONNECT)))
{
if (!irc_server_connect (ptr_server))
irc_server_reconnect_schedule (ptr_server);
+1 -1
View File
@@ -250,7 +250,7 @@ extern struct t_irc_server *irc_server_search (const char *server_name);
extern void irc_server_set_buffer_title (struct t_irc_server *server);
extern struct t_gui_buffer *irc_server_create_buffer (struct t_irc_server *server);
extern int irc_server_connect (struct t_irc_server *server);
extern void irc_server_auto_connect ();
extern void irc_server_auto_connect (int auto_connect);
extern void irc_server_autojoin_channels ();
extern int irc_server_recv_cb (void *data, int fd);
extern int irc_server_timer_sasl_cb (void *data, int remaining_calls);
+1 -2
View File
@@ -233,8 +233,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
}
else
{
if (auto_connect)
irc_server_auto_connect ();
irc_server_auto_connect (auto_connect);
}
irc_hook_timer = weechat_hook_timer (1 * 1000, 0, 0,