Mercurial > pidgin
changeset 22276:401462cbacb9
merge of '4c2c343355f23e33c5b251b3d61f07af3fd8ac8b'
and '8bec06d2cd0a64ece46cb3cd73db9b085b91e161'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sat, 09 Feb 2008 07:41:33 +0000 |
| parents | 4fced932324a (diff) bd25f8c9d94e (current diff) |
| children | ae719d4a2f41 |
| files | pidgin/gtkprefs.c |
| diffstat | 1 files changed, 1 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkprefs.c Sat Feb 09 07:26:12 2008 +0000 +++ b/pidgin/gtkprefs.c Sat Feb 09 07:41:33 2008 +0000 @@ -976,10 +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(); - if (font_name && strlen(font_name)) - gtk_font_button_set_font_name((GtkFontButton *)font_button, (const char*)font_name); - + 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"))