summaryrefslogtreecommitdiff
path: root/src/fe-common/irc
diff options
context:
space:
mode:
Diffstat (limited to 'src/fe-common/irc')
-rw-r--r--src/fe-common/irc/fe-common-irc.c2
-rw-r--r--src/fe-common/irc/fe-events.c2
-rw-r--r--src/fe-common/irc/module-formats.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/fe-common/irc/fe-common-irc.c b/src/fe-common/irc/fe-common-irc.c
index a7dfd74e..e45d4bab 100644
--- a/src/fe-common/irc/fe-common-irc.c
+++ b/src/fe-common/irc/fe-common-irc.c
@@ -151,7 +151,7 @@ void fe_common_irc_finish_init(void)
if (cmdline_nick != NULL) {
/* override nick found from setup */
- iconfig_set_str("settings", "default_nick", cmdline_nick);
+ iconfig_set_str("settings", "nick", cmdline_nick);
}
if (cmdline_hostname != NULL) {
diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index 09e4d121..f6c85961 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -476,7 +476,7 @@ static void event_connected(IRC_SERVER_REC *server)
g_return_if_fail(server != NULL);
- nick = settings_get_str("default_nick");
+ nick = settings_get_str("nick");
if (*nick == '\0' || g_strcasecmp(server->nick, nick) == 0)
return;
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index 18149994..52c81d18 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -127,7 +127,7 @@ FORMAT_REC fecommon_irc_formats[] = {
{ "own_msg_private", "%K[%rmsg%K(%R$0%K)]%n $1", 2, { 0, 0 } },
{ "own_msg_private_query", "%K<%W$2%K>%n %|$1", 3, { 0, 0, 0 } },
{ "own_notice", "%K[%rnotice%K(%R$0%K)]%n $1", 2, { 0, 0 } },
- { "own_me", "%W * $0%n $1", 2, { 0, 0 } },
+ { "own_action", "%W * $0%n $1", 2, { 0, 0 } },
{ "own_ctcp", "%K[%rctcp%K(%R$0%K)]%n $1 $2", 3, { 0, 0, 0 } },
{ "own_wall", "%K[%WWall%K/%c$0%K]%n $1", 2, { 0, 0 } },