diff options
| author | Timo Sirainen <cras@irssi.org> | 2000-09-06 23:24:12 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2000-09-06 23:24:12 +0000 |
| commit | 8478a63c368eeea56a7d799dde12e551ab491a4e (patch) | |
| tree | d1779e9730f15cd08255659dc6ca6526b65b70a9 /src/irc/core/irc-servers-setup.c | |
| parent | ecb334b6cc9b332d589034d10f848d68b5170442 (diff) | |
| download | irssi-8478a63c368eeea56a7d799dde12e551ab491a4e.zip | |
/SET default_nick -> /SET nick
/FORMAT own_me -> /FORMAT own_action
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@654 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/irc/core/irc-servers-setup.c')
| -rw-r--r-- | src/irc/core/irc-servers-setup.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c index 0dbd6297..d23b051b 100644 --- a/src/irc/core/irc-servers-setup.c +++ b/src/irc/core/irc-servers-setup.c @@ -84,7 +84,7 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn, static void init_userinfo(void) { - const char *set, *default_nick, *user_name; + const char *set, *nick, *user_name; char *str; /* check if nick/username/realname wasn't read from setup.. */ @@ -106,22 +106,22 @@ static void init_userinfo(void) } /* nick */ - default_nick = settings_get_str("default_nick"); - if (default_nick == NULL || *default_nick == '\0') { + nick = settings_get_str("nick"); + if (nick == NULL || *nick == '\0') { str = g_getenv("IRCNICK"); - iconfig_set_str("settings", "default_nick", + iconfig_set_str("settings", "nick", str != NULL ? str : user_name); - default_nick = settings_get_str("default_nick"); + nick = settings_get_str("nick"); } /* alternate nick */ set = settings_get_str("alternate_nick"); if (set == NULL || *set == '\0') { - if (strlen(default_nick) < 9) - str = g_strconcat(default_nick, "_", NULL); + if (strlen(nick) < 9) + str = g_strconcat(nick, "_", NULL); else { - str = g_strdup(default_nick); + str = g_strdup(nick); str[strlen(str)-1] = '_'; } iconfig_set_str("settings", "alternate_nick", str); |