changeset 28579:afced6be9972

merge of '79639d895e39ef23c24691d0736a265373e2b49c' and 'c2bb3f04f91d3f491daf5295fd5e484750ba506b'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 16 Nov 2009 08:10:44 +0000
parents ab538f3edcce (current diff) 8c2ba3cc6921 (diff)
children 11909a84be9f
files
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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")
 };