pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-29 06:16:40 +02:00
Code Activity

irc: remove server "freenode" from default config file (closes #309)

Browse Source
This commit is contained in:
Sébastien Helleu
2015-01-24 13:55:29 +01:00
parent 1a68242f95
commit ac8ccba8c8
29 changed files with 218 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/irc/irc-command.c
+6 -7
View File
@@ -6526,14 +6526,13 @@ irc_command_init ()
"\n"
"Examples:\n"
" /server listfull\n"
" /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
" /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
" /server add freenode2 chat.eu.freenode.net/6667,"
" /server add freenode chat.freenode.net\n"
" /server add freenode chat.freenode.net/6697 -ssl -autoconnect\n"
" /server add freenode chat.eu.freenode.net/6667,"
"chat.us.freenode.net/6667\n"
" /server add freenode3 chat.freenode.net -password=mypass\n"
" /server copy oftc oftcbis\n"
" /server rename oftc newoftc\n"
" /server reorder oftc freenode\n"
" /server copy freenode freenode-test\n"
" /server rename freenode-test freenode2\n"
" /server reorder freenode2 freenode\n"
" /server del freenode\n"
" /server deloutq"),
"list %(irc_servers)"
src/plugins/irc/irc-config.c
+1 -44
View File
@@ -1496,49 +1496,6 @@ irc_config_ignore_write_cb (void *data, struct t_config_file *config_file,
return WEECHAT_CONFIG_WRITE_OK;
}
/*
* Writes default server section in IRC configuration file.
*/
int
irc_config_server_write_default_cb (void *data,
struct t_config_file *config_file,
const char *section_name)
{
int i;
char option_name[128];
/* make C compiler happy */
(void) data;
if (!weechat_config_write_line (config_file, section_name, NULL))
return WEECHAT_CONFIG_WRITE_ERROR;
for (i = 0; i < IRC_SERVER_NUM_OPTIONS; i++)
{
snprintf (option_name, sizeof (option_name),
"freenode.%s",
irc_server_options[i][0]);
switch (i)
{
case IRC_SERVER_OPTION_ADDRESSES:
if (!weechat_config_write_line (config_file,
option_name,
"%s", "\"chat.freenode.net/6667\""))
return WEECHAT_CONFIG_WRITE_ERROR;
break;
default:
if (!weechat_config_write_line (config_file,
option_name,
WEECHAT_CONFIG_OPTION_NULL))
return WEECHAT_CONFIG_WRITE_ERROR;
break;
}
}
return WEECHAT_CONFIG_WRITE_OK;
}
/*
* Creates a new option for a server.
*
@@ -3076,7 +3033,7 @@ irc_config_init ()
0, 0,
&irc_config_server_read_cb, NULL,
&irc_config_server_write_cb, NULL,
&irc_config_server_write_default_cb, NULL,
NULL, NULL,
NULL, NULL,
NULL, NULL);
if (!ptr_section)