zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-10 20:33:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

s/ircnet/network/ - patch by Joost Vunderink

Browse source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3270 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2004-07-11 21:31:49 +00:00 • committed by cras
commit ab3ba54ab4
15 changed files with 114 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/fe-common/core/fe-channels.c
View file

@ -246,7 +246,7 @@ static void cmd_channel(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
}
/* SYNTAX: CHANNEL ADD [-auto | -noauto] [-bots <masks>] [-botcmd <command>]
<channel> <chatnet> [<password>] */
<channel> <network> [<password>] */
static void cmd_channel_add(const char *data)
{
GHashTable *optlist;
@ -298,7 +298,7 @@ static void cmd_channel_add(const char *data)
cmd_params_free(free_arg);
}
/* SYNTAX: CHANNEL REMOVE <channel> <chatnet> */
/* SYNTAX: CHANNEL REMOVE <channel> <network> */
static void cmd_channel_remove(const char *data)
{
CHANNEL_SETUP_REC *rec;

2
src/fe-common/core/fe-common-core.c
View file

@ -137,7 +137,7 @@ void fe_common_core_init(void)
static struct poptOption options[] = {
{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, version_options, 0, NULL, NULL },
POPT_AUTOHELP
{ "connect", 'c', POPT_ARG_STRING, &autocon_server, 0, "Automatically connect to server/ircnet", "SERVER" },
{ "connect", 'c', POPT_ARG_STRING, &autocon_server, 0, "Automatically connect to server/network", "SERVER" },
{ "password", 'w', POPT_ARG_STRING, &autocon_password, 0, "Autoconnect password", "PASSWORD" },
{ "port", 'p', POPT_ARG_INT, &autocon_port, 0, "Autoconnect port", "PORT" },
{ "noconnect", '!', POPT_ARG_NONE, &no_autoconnect, 0, "Disable autoconnecting", NULL },

14
src/fe-common/core/fe-ignore.c
View file

@ -64,7 +64,7 @@ static void ignore_print(int index, IGNORE_REC *rec)
if (rec->fullword) g_string_append(options, "-full ");
if (rec->replies) g_string_append(options, "-replies ");
if (rec->servertag != NULL)
g_string_sprintfa(options, "-ircnet %s ", rec->servertag);
g_string_sprintfa(options, "-network %s ", rec->servertag);
if (rec->pattern != NULL)
g_string_sprintfa(options, "-pattern %s ", rec->pattern);
@ -107,9 +107,10 @@ static void cmd_ignore_show(void)
}
/* SYNTAX: IGNORE [-regexp | -full] [-pattern <pattern>] [-except] [-replies]
[-ircnet <ircnet>] [-channels <channel>] [-time <secs>] <mask> [<levels>]
[-network <network>] [-channels <channel>] [-time <secs>] <mask> [<levels>]
IGNORE [-regexp | -full] [-pattern <pattern>] [-except] [-replies]
[-ircnet <ircnet>] [-time <secs>] <channels> [<levels>] */
[-network <network>] [-time <secs>] <channels> [<levels>] */
/* NOTE: -network replaces the old -ircnet flag. */
static void cmd_ignore(const char *data)
{
GHashTable *optlist;
@ -130,7 +131,10 @@ static void cmd_ignore(const char *data)
patternarg = g_hash_table_lookup(optlist, "pattern");
chanarg = g_hash_table_lookup(optlist, "channels");
servertag = g_hash_table_lookup(optlist, "ircnet");
servertag = g_hash_table_lookup(optlist, "network");
/* Allow -ircnet for backwards compatibility */
if (!servertag)
servertag = g_hash_table_lookup(optlist, "ircnet");
if (*mask == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
if (*levels == '\0') levels = "ALL";
@ -258,7 +262,7 @@ void fe_ignore_init(void)
signal_add("ignore created", (SIGNAL_FUNC) sig_ignore_created);
signal_add("ignore changed", (SIGNAL_FUNC) sig_ignore_created);
command_set_options("ignore", "regexp full except replies -ircnet -time -pattern -channels");
command_set_options("ignore", "regexp full except replies -network -ircnet -time -pattern -channels");
}
void fe_ignore_deinit(void)