im.pidgin.pidgin: 4c2c343355f23e33c5b251b3d61f07af3fd8ac8b

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: 4c2c343355f23e33c5b251b3d61f07af3fd8ac8b
Ancestor: e1213913e6feb23196743f9c0c2b33dc36e4aab3
Author: deryni at pidgin.im
Date: 2008-02-09T06:11:27
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4c2c343355f23e33c5b251b3d61f07af3fd8ac8b

Modified files:
        pidgin/gtkprefs.c

ChangeLog: 

This may or may not fix a crash that may or may not affect the version of GTK+
we ship on Windows, but either way (font_name ? font_name : NULL) is a pretty
silly thing to do when font_name is a gchar *. So let's go with (font_name ?
font_name : "") instead, if this causes problems we can always back it out.

-------------- next part --------------
============================================================
--- pidgin/gtkprefs.c	a0f8fc52d627a946b45974d566ff70285d6bc75c
+++ pidgin/gtkprefs.c	6426d50328a0c88d7f11c73e2bdcc06ff1a9e778
@@ -976,7 +976,7 @@ 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);
+	font_button = gtk_font_button_new_with_font(font_name ? 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);
 	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/use_theme_font"))