aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-01-03 14:56:47 -05:00
Code

Add alternate_nick as a network-specific property.

Browse Source
This commit is contained in:
Paul Townsend 2017-10-11 21:33:14 +01:00
parent 016fd34436
commit 87955b69cb
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/help/in/network.in
View File

@ -11,6 +11,7 @@
REMOVE: Removes a network from your configuration. REMOVE: Removes a network from your configuration.
-nick: Specifies the nickname to use. -nick: Specifies the nickname to use.
-alternate_nick Specifies the alternate nickname to use.
-user: Specifies the user identity to use. -user: Specifies the user identity to use.
-realname: Specifies the real name to use. -realname: Specifies the real name to use.
-host: Specifies the hostname to use. -host: Specifies the hostname to use.

1
src/core/chatnet-rec.h
View File

@ -4,6 +4,7 @@ int chat_type; /* chat_protocol_lookup(xx) */
char *name; char *name;
char *nick; char *nick;
char *alternate_nick;
char *username; char *username;
char *realname; char *realname;

11
src/fe-common/irc/fe-ircnet.c
View File

@ -48,6 +48,8 @@ static void cmd_network_list(void)
g_string_truncate(str, 0); g_string_truncate(str, 0);
if (rec->nick != NULL) if (rec->nick != NULL)
g_string_append_printf(str, "nick: %s, ", rec->nick); g_string_append_printf(str, "nick: %s, ", rec->nick);
if (rec->alternate_nick != NULL)
g_string_append_printf(str, "alternate_nick: %s, ", rec->alternate_nick);
if (rec->username != NULL) if (rec->username != NULL)
g_string_append_printf(str, "username: %s, ", rec->username); g_string_append_printf(str, "username: %s, ", rec->username);
if (rec->realname != NULL) if (rec->realname != NULL)
@ -114,6 +116,7 @@ static void cmd_network_add_modify(const char *data, gboolean add)
rec->name = g_strdup(name); rec->name = g_strdup(name);
} else { } else {
if (g_hash_table_lookup(optlist, "nick")) g_free_and_null(rec->nick); if (g_hash_table_lookup(optlist, "nick")) g_free_and_null(rec->nick);
if (g_hash_table_lookup(optlist, "alternate_nick")) g_free_and_null(rec->alternate_nick);
if (g_hash_table_lookup(optlist, "user")) g_free_and_null(rec->username); if (g_hash_table_lookup(optlist, "user")) g_free_and_null(rec->username);
if (g_hash_table_lookup(optlist, "realname")) g_free_and_null(rec->realname); if (g_hash_table_lookup(optlist, "realname")) g_free_and_null(rec->realname);
if (g_hash_table_lookup(optlist, "host")) { if (g_hash_table_lookup(optlist, "host")) {
@ -145,6 +148,8 @@ static void cmd_network_add_modify(const char *data, gboolean add)
value = g_hash_table_lookup(optlist, "nick"); value = g_hash_table_lookup(optlist, "nick");
if (value != NULL && *value != '\0') rec->nick = g_strdup(value); if (value != NULL && *value != '\0') rec->nick = g_strdup(value);
value = g_hash_table_lookup(optlist, "alternate_nick");
if (value != NULL && *value != '\0') rec->alternate_nick = g_strdup(value);
value = g_hash_table_lookup(optlist, "user"); value = g_hash_table_lookup(optlist, "user");
if (value != NULL && *value != '\0') rec->username = g_strdup(value); if (value != NULL && *value != '\0') rec->username = g_strdup(value);
value = g_hash_table_lookup(optlist, "realname"); value = g_hash_table_lookup(optlist, "realname");
@ -175,7 +180,7 @@ static void cmd_network_add_modify(const char *data, gboolean add)
cmd_params_free(free_arg); cmd_params_free(free_arg);
} }
/* SYNTAX: NETWORK ADD|MODIFY [-nick <nick>] [-user <user>] [-realname <name>] /* SYNTAX: NETWORK ADD|MODIFY [-nick <nick>] [-alternate_nick <nick>] [-user <user>] [-realname <name>]
[-host <host>] [-usermode <mode>] [-autosendcmd <cmd>] [-host <host>] [-usermode <mode>] [-autosendcmd <cmd>]
[-querychans <count>] [-whois <count>] [-msgs <count>] [-querychans <count>] [-whois <count>] [-msgs <count>]
[-kicks <count>] [-modes <count>] [-cmdspeed <ms>] [-kicks <count>] [-modes <count>] [-cmdspeed <ms>]
@ -228,9 +233,9 @@ void fe_ircnet_init(void)
command_bind("network remove", NULL, (SIGNAL_FUNC) cmd_network_remove); command_bind("network remove", NULL, (SIGNAL_FUNC) cmd_network_remove);
command_set_options("network add", "-kicks -msgs -modes -whois -cmdspeed " command_set_options("network add", "-kicks -msgs -modes -whois -cmdspeed "
"-cmdmax -nick -user -realname -host -autosendcmd -querychans -usermode -sasl_mechanism -sasl_username -sasl_password"); "-cmdmax -nick -alternate_nick -user -realname -host -autosendcmd -querychans -usermode -sasl_mechanism -sasl_username -sasl_password");
command_set_options("network modify", "-kicks -msgs -modes -whois -cmdspeed " command_set_options("network modify", "-kicks -msgs -modes -whois -cmdspeed "
"-cmdmax -nick -user -realname -host -autosendcmd -querychans -usermode -sasl_mechanism -sasl_username -sasl_password"); "-cmdmax -nick -alternate_nick -user -realname -host -autosendcmd -querychans -usermode -sasl_mechanism -sasl_username -sasl_password");
} }
void fe_ircnet_deinit(void) void fe_ircnet_deinit(void)

9
src/irc/core/irc-servers-setup.c
View File

@ -69,7 +69,14 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
return; return;
g_return_if_fail(IS_IRCNET(ircnet)); g_return_if_fail(IS_IRCNET(ircnet));
if (ircnet->nick != NULL) g_free_and_null(conn->alternate_nick); if (ircnet->nick != NULL) {
g_free_and_null(conn->nick);
conn->nick = g_strdup(ircnet->nick);
}
if (ircnet->alternate_nick != NULL) {
g_free_and_null(conn->alternate_nick);
conn->alternate_nick = g_strdup(ircnet->alternate_nick);
}
if (ircnet->usermode != NULL) { if (ircnet->usermode != NULL) {
g_free_and_null(conn->usermode); g_free_and_null(conn->usermode);
conn->usermode = g_strdup(ircnet->usermode); conn->usermode = g_strdup(ircnet->usermode);