Consolidate color stripping for messages, topic and scrollback

This commit is contained in:
Berke Viktor
2012-09-01 21:38:00 +02:00
parent fb00928c9d
commit 4f887a1e53
5 changed files with 60 additions and 16 deletions

View File

@@ -552,13 +552,31 @@ fe_set_topic (session *sess, char *topic, char *stripped_topic)
{
if (!sess->gui->is_tab || sess == current_tab)
{
gtk_entry_set_text (GTK_ENTRY (sess->gui->topic_entry), stripped_topic);
if (prefs.text_stripcolor_topic)
{
gtk_entry_set_text (GTK_ENTRY (sess->gui->topic_entry), stripped_topic);
}
else
{
gtk_entry_set_text (GTK_ENTRY (sess->gui->topic_entry), topic);
}
mg_set_topic_tip (sess);
} else
}
else
{
if (sess->res->topic_text)
{
free (sess->res->topic_text);
sess->res->topic_text = strdup (stripped_topic);
}
if (prefs.text_stripcolor_topic)
{
sess->res->topic_text = strdup (stripped_topic);
}
else
{
sess->res->topic_text = strdup (topic);
}
}
}