# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1258359044 0
# Node ID afced6be9972075c65f9d57262d419203217b6ad
# Parent  ab538f3edcce095d8a584d9bf31192e64e0d38f8# Parent  8c2ba3cc69212c0c6c7b74f1deff66c55968abff
merge of '79639d895e39ef23c24691d0736a265373e2b49c'
     and 'c2bb3f04f91d3f491daf5295fd5e484750ba506b'

diff -r ab538f3edcce -r afced6be9972 pidgin/plugins/pidginrc.c
--- a/pidgin/plugins/pidginrc.c	Mon Nov 16 08:06:20 2009 +0000
+++ b/pidgin/plugins/pidginrc.c	Mon Nov 16 08:10:44 2009 +0000
@@ -75,16 +75,19 @@
 
 static const gchar *font_prefs[] = {
 	"/plugins/gtk/purplerc/font/*pidgin_conv_entry",
+	"/plugins/gtk/purplerc/font/*pidgin_conv_imhtml",
 	"/plugins/gtk/purplerc/font/*pidgin_request_imhtml",
 	"/plugins/gtk/purplerc/font/*pidgin_notify_imhtml",
 };
 static const gchar *font_prefs_set[] = {
 	"/plugins/gtk/purplerc/set/font/*pidgin_conv_entry",
+	"/plugins/gtk/purplerc/set/font/*pidgin_conv_imhtml",
 	"/plugins/gtk/purplerc/set/font/*pidgin_request_imhtml",
 	"/plugins/gtk/purplerc/set/font/*pidgin_notify_imhtml",
 };
 static const gchar *font_names[] = {
 	N_("Conversation Entry"),
+	N_("Conversation History"),
 	N_("Request Dialog"),
 	N_("Notify Dialog")
 };