aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-11-03 04:27:19 -05:00
Code

Changes based on comments in pull #771.

Browse Source
This commit is contained in:
Paul Townsend 2017-10-14 17:42:45 +01:00
parent 87955b69cb
commit 7b94015f8f
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,6 @@ 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;

7
src/irc/core/irc-chatnets.c
View File

@ -43,6 +43,9 @@ static void sig_chatnet_read(IRC_CHATNET_REC *rec, CONFIG_NODE *node)
value = config_node_get_str(node, "usermode", NULL); value = config_node_get_str(node, "usermode", NULL);
rec->usermode = (value != NULL && *value != '\0') ? g_strdup(value) : NULL; rec->usermode = (value != NULL && *value != '\0') ? g_strdup(value) : NULL;
value = config_node_get_str(node, "alternate_nick", NULL);
rec->alternate_nick = (value != NULL && *value != '\0') ? g_strdup(value) : NULL;
rec->max_cmds_at_once = config_node_get_int(node, "cmdmax", 0); rec->max_cmds_at_once = config_node_get_int(node, "cmdmax", 0);
rec->cmd_queue_speed = config_node_get_int(node, "cmdspeed", 0); rec->cmd_queue_speed = config_node_get_int(node, "cmdspeed", 0);
rec->max_query_chans = config_node_get_int(node, "max_query_chans", 0); rec->max_query_chans = config_node_get_int(node, "max_query_chans", 0);
@ -65,6 +68,9 @@ static void sig_chatnet_saved(IRC_CHATNET_REC *rec, CONFIG_NODE *node)
if (rec->usermode != NULL) if (rec->usermode != NULL)
iconfig_node_set_str(node, "usermode", rec->usermode); iconfig_node_set_str(node, "usermode", rec->usermode);
if (rec->alternate_nick != NULL)
iconfig_node_set_str(node, "alternate_nick", rec->alternate_nick);
if (rec->max_cmds_at_once > 0) if (rec->max_cmds_at_once > 0)
iconfig_node_set_int(node, "cmdmax", rec->max_cmds_at_once); iconfig_node_set_int(node, "cmdmax", rec->max_cmds_at_once);
if (rec->cmd_queue_speed > 0) if (rec->cmd_queue_speed > 0)
@ -93,6 +99,7 @@ static void sig_chatnet_destroyed(IRC_CHATNET_REC *rec)
{ {
if (IS_IRC_CHATNET(rec)) { if (IS_IRC_CHATNET(rec)) {
g_free(rec->usermode); g_free(rec->usermode);
g_free(rec->alternate_nick);
g_free(rec->sasl_mechanism); g_free(rec->sasl_mechanism);
g_free(rec->sasl_username); g_free(rec->sasl_username);
g_free(rec->sasl_password); g_free(rec->sasl_password);

1
src/irc/core/irc-chatnets.h
View File

@ -18,6 +18,7 @@ struct _IRC_CHATNET_REC {
#include "chatnet-rec.h" #include "chatnet-rec.h"
char *usermode; char *usermode;
char *alternate_nick;
char *sasl_mechanism; char *sasl_mechanism;
char *sasl_username; char *sasl_username;

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

@ -69,10 +69,6 @@ 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->nick);
conn->nick = g_strdup(ircnet->nick);
}
if (ircnet->alternate_nick != NULL) { if (ircnet->alternate_nick != NULL) {
g_free_and_null(conn->alternate_nick); g_free_and_null(conn->alternate_nick);
conn->alternate_nick = g_strdup(ircnet->alternate_nick); conn->alternate_nick = g_strdup(ircnet->alternate_nick);