updates.

[silc.git] / apps / irssi / src / fe-common / core / fe-messages.c

diff --git a/apps/irssi/src/fe-common/core/fe-messages.c b/apps/irssi/src/fe-common/core/fe-messages.c
index 4b4e4db4f758776a561bdc1cd9324b8354f604b8..44c9fb35f635c4929c7ecd6c77788aed28d90028 100644 (file)
--- a/apps/irssi/src/fe-common/core/fe-messages.c
+++ b/apps/irssi/src/fe-common/core/fe-messages.c
@@ -152,7 +152,8 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
        if (nickrec == NULL && chanrec != NULL)
                 nickrec = nicklist_find(chanrec, nick);
 
-       for_me = nick_match_msg(chanrec, msg, server->nick);
+       for_me = !settings_get_bool("hilight_nick_matches") ? FALSE :
+               nick_match_msg(chanrec, msg, server->nick);
        color = for_me ? NULL :
                hilight_match_nick(server, target, nick, address, MSGLEVEL_PUBLIC, msg);
 
@@ -396,7 +397,7 @@ static void sig_message_kick(SERVER_REC *server, const char *channel,
                             const char *address, const char *reason)
 {
        printformat(server, channel, MSGLEVEL_KICKS,
-                   TXT_KICK, nick, channel, kicker, reason);
+                   TXT_KICK, nick, channel, kicker, reason, address);
 }
 
 static void print_nick_change_channel(SERVER_REC *server, const char *channel,
@@ -415,7 +416,7 @@ static void print_nick_change_channel(SERVER_REC *server, const char *channel,
 
        printformat(server, channel, level,
                    ownnick ? TXT_YOUR_NICK_CHANGED : TXT_NICK_CHANGED,
-                   oldnick, newnick, channel);
+                   oldnick, newnick, channel, address);
 }
 
 static void print_nick_change(SERVER_REC *server, const char *newnick,
@@ -449,7 +450,8 @@ static void print_nick_change(SERVER_REC *server, const char *newnick,
 
        if (!msgprint && ownnick) {
                printformat(server, NULL, MSGLEVEL_NICKS,
-                           TXT_YOUR_NICK_CHANGED, oldnick, newnick, "");
+                           TXT_YOUR_NICK_CHANGED, oldnick, newnick, "",
+                           address);
        }
 }
 
@@ -466,7 +468,8 @@ static void sig_message_own_nick(SERVER_REC *server, const char *newnick,
                print_nick_change(server, newnick, oldnick, address, TRUE);
        else {
                printformat(server, NULL, MSGLEVEL_NICKS,
-                           TXT_YOUR_NICK_CHANGED, oldnick, newnick, "");
+                           TXT_YOUR_NICK_CHANGED, oldnick, newnick, "",
+                           address);
        }
 }
 
@@ -477,7 +480,7 @@ static void sig_message_invite(SERVER_REC *server, const char *channel,
 
        str = show_lowascii(channel);
        printformat(server, NULL, MSGLEVEL_INVITES,
-                   TXT_INVITE, nick, str);
+                   TXT_INVITE, nick, str, address);
        g_free(str);
 }
 
@@ -487,7 +490,7 @@ static void sig_message_topic(SERVER_REC *server, const char *channel,
 {
        printformat(server, channel, MSGLEVEL_TOPICS,
                    *topic != '\0' ? TXT_NEW_TOPIC : TXT_TOPIC_UNSET,
-                   nick, channel, topic);
+                   nick, channel, topic, address);
 }
 
 static int printnick_exists(NICK_REC *first, NICK_REC *ignore,
@@ -622,6 +625,7 @@ void fe_messages_init(void)
        printnicks = g_hash_table_new((GHashFunc) g_direct_hash,
                                      (GCompareFunc) g_direct_equal);
 
+       settings_add_bool("lookandfeel", "hilight_nick_matches", TRUE);
        settings_add_bool("lookandfeel", "emphasis", TRUE);
        settings_add_bool("lookandfeel", "emphasis_replace", FALSE);
        settings_add_bool("lookandfeel", "emphasis_multiword", FALSE);