pidgin: f5c204cf: This may or may not fix #9579 but it sho...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: f5c204cf6e72a06d173a5fcec9420ae91e632a17
Ancestor: 4963ec9e57fc1b7b43b5a42bbd2acf796dbcd33d
Author: deryni at pidgin.im
Date: 2009-07-05T06:50:39
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f5c204cf6e72a06d173a5fcec9420ae91e632a17

Modified files:
        pidgin/gtkprefs.c

ChangeLog: 

This may or may not fix #9579 but it shouldn't hurt anything even if it
doesn't and we worked around the issue in the ticket.

Closes #9579.

-------------- next part --------------
============================================================
--- pidgin/gtkprefs.c	ccb4e873a18d4fefd897f163e1b0f4ec93f0d51a
+++ pidgin/gtkprefs.c	8ca64d91859ab982919d9bbdd5ee15f31e748058
@@ -1593,7 +1593,11 @@ conv_page(void)
 		fontpref = pidgin_prefs_checkbox(_("Use font from _theme"), PIDGIN_PREFS_ROOT "/conversations/use_theme_font", vbox);
 
 	font_name = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/custom_font");
-	font_button = gtk_font_button_new_with_font(font_name ? font_name : NULL);
+	if ((font_name == NULL) || (*font_name == '\0')) {
+		font_button = gtk_font_button_new();
+	} else {
+		font_button = gtk_font_button_new_with_font(font_name);
+	}
 
 	gtk_font_button_set_show_style(GTK_FONT_BUTTON(font_button), TRUE);
 	hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("Conversation _font:"), NULL, font_button, FALSE, NULL);