2 files changed, 14 insertions, 13 deletions

diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index 061a37ac..4e544ffa 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -50,7 +50,7 @@ static void print_channel_msg(IRC_SERVER_REC *server, const char *msg,
 	IRC_CHANNEL_REC *chanrec;
 	NICK_REC *nickrec;
 	const char *nickmode;
-	int for_me, print_channel;
+	int for_me, print_channel, level;
 	char *color;
 
 	chanrec = irc_channel_find(server, target);
@@ -67,24 +67,27 @@ static void print_channel_msg(IRC_SERVER_REC *server, const char *msg,
 	    window_item_window((WI_ITEM_REC *) chanrec)->items->next != NULL)
 		print_channel = TRUE;
 
+	level = MSGLEVEL_PUBLIC |
+		(color != NULL ? MSGLEVEL_HILIGHT :
+		 (for_me ? MSGLEVEL_HILIGHT : MSGLEVEL_NOHILIGHT));
 	if (!print_channel) {
 		/* message to active channel in window */
 		if (color != NULL) {
 			/* highlighted nick */
-			printformat(server, target, MSGLEVEL_PUBLIC | MSGLEVEL_HILIGHT,
-				    IRCTXT_PUBMSG_HILIGHT, color, nick, msg, nickmode);
+			printformat(server, target, level, IRCTXT_PUBMSG_HILIGHT,
+				    color, nick, msg, nickmode);
 		} else {
-			printformat(server, target, MSGLEVEL_PUBLIC | (for_me ? MSGLEVEL_HILIGHT : 0),
+			printformat(server, target, level,
 				    for_me ? IRCTXT_PUBMSG_ME : IRCTXT_PUBMSG, nick, msg, nickmode);
 		}
 	} else {
 		/* message to not existing/active channel */
 		if (color != NULL) {
 			/* highlighted nick */
-			printformat(server, target, MSGLEVEL_PUBLIC | MSGLEVEL_HILIGHT,
-				    IRCTXT_PUBMSG_HILIGHT_CHANNEL, color, nick, target, msg, nickmode);
+			printformat(server, target, level, IRCTXT_PUBMSG_HILIGHT_CHANNEL,
+				    color, nick, target, msg, nickmode);
 		} else {
-			printformat(server, target, MSGLEVEL_PUBLIC | (for_me ? MSGLEVEL_HILIGHT : 0),
+			printformat(server, target, level,
 				    for_me ? IRCTXT_PUBMSG_ME_CHANNEL : IRCTXT_PUBMSG_CHANNEL,
 				    nick, target, msg, nickmode);
 		}
diff --git a/src/fe-common/irc/irc-completion.c b/src/fe-common/irc/irc-completion.c
index 1f2bde8e..381a09b1 100644
--- a/src/fe-common/irc/irc-completion.c
+++ b/src/fe-common/irc/irc-completion.c
@@ -139,7 +139,7 @@ static int nick_completion_timeout(void)
 {
 	MODULE_SERVER_REC *mserver;
 	MODULE_CHANNEL_REC *mchannel;
-	GSList *tmp, *link;
+	GSList *tmp;
 	time_t now;
 	int len;
 
@@ -153,8 +153,8 @@ static int nick_completion_timeout(void)
 		mserver = MODULE_DATA(rec);
 		len = g_slist_length(mserver->lastmsgs);
 		if (len > 0 && len >= settings_get_int("completion_keep_privates")) {
-			link = g_slist_last(mserver->lastmsgs);
-                        last_msg_free(mserver, link->data);
+                        /* remove the oldest msg nick. */
+			last_msg_free(mserver, mserver->lastmsgs->data);
 		}
 	}
 
@@ -341,10 +341,8 @@ static GList *convert_msglist(GSList *msglist)
 	while (msglist != NULL) {
 		LAST_MSG_REC *rec = msglist->data;
 
-                list = g_list_append(list, g_strdup(rec->nick));
-
+                list = g_list_append(list, rec->nick);
 		msglist = g_slist_remove(msglist, rec);
-		g_free(rec->nick);
 		g_free(rec);
 	}