Mercurial > pidgin
changeset 22274:4fced932324a
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.
| author | Etan Reisner <pidgin@unreliablesource.net> |
|---|---|
| date | Sat, 09 Feb 2008 06:11:27 +0000 |
| parents | c2115e5e613d |
| children | 401462cbacb9 be419fb6eb20 |
| files | pidgin/gtkprefs.c |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkprefs.c Sat Feb 09 03:09:13 2008 +0000 +++ b/pidgin/gtkprefs.c Sat Feb 09 06:11:27 2008 +0000 @@ -976,7 +976,7 @@ 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"))