# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1180671715 0
# Node ID 8e8da9a1eaac2cebe8dbff4550902061012b6d67
# Parent  0dbb403c90163750aa3d15d6768dacfdca19bdfd
Fix default custom font

diff -r 0dbb403c9016 -r 8e8da9a1eaac pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Thu May 31 03:02:13 2007 +0000
+++ b/pidgin/gtkconv.c	Fri Jun 01 04:21:55 2007 +0000
@@ -6952,7 +6952,7 @@
 	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/scrollback_lines", 4000);
 
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/use_theme_font", TRUE);
-	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/conversations/custom_font", "Sans 28");
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/conversations/custom_font", "");
 
 	/* Conversations -> Chat */
 	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/conversations/chat");
diff -r 0dbb403c9016 -r 8e8da9a1eaac pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Thu May 31 03:02:13 2007 +0000
+++ b/pidgin/gtkprefs.c	Fri Jun 01 04:21:55 2007 +0000
@@ -906,6 +906,7 @@
 	GtkWidget *hbox;
 	GtkWidget *label;
 	GtkWidget *font_button;
+	const char *font_name;
 #endif
 
 	ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
@@ -947,7 +948,8 @@
 	hbox = gtk_hbox_new(FALSE, 3);
 	label = gtk_label_new_with_mnemonic(_("Conversation _font:"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	font_button = gtk_font_button_new_with_font(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/custom_font"));
+	font_name = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/custom_font");
+	font_button = gtk_font_button_new_with_font(purple_prefs_get_string(font_name ? font_name : NULL));
 	gtk_font_button_set_show_style(GTK_FONT_BUTTON(font_button), TRUE);
 	gtk_box_pack_start(GTK_BOX(hbox), font_button, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);