changeset
merge of '173cc15a3abc360ac9bea0fea7424697fa937f20'
Fri, 01 Jun 2007 04:22:16 +0000
- author
- Sean Egan <seanegan@pidgin.im>
- date
- Fri, 01 Jun 2007 04:22:16 +0000
- changeset 17503
- ab96a7e22d86
- parent 17502
- 173cc15a3abc (current diff)
- parent 17490
- a227092a827f (diff)
- child 17504
- 45e375cfc669
- child 17764
- f9186fabb483
merge of '173cc15a3abc360ac9bea0fea7424697fa937f20'
and 'a227092a827fd0b124ecdd2dccbd4779aa5af864'
| pidgin/gtkconv.c | file | annotate | diff | comparison | revisions |
--- a/pidgin/gtkconv.c Fri Jun 01 04:20:37 2007 +0000 +++ b/pidgin/gtkconv.c Fri Jun 01 04:22:16 2007 +0000 @@ -6956,7 +6956,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");
--- a/pidgin/gtkprefs.c Fri Jun 01 04:20:37 2007 +0000 +++ b/pidgin/gtkprefs.c Fri Jun 01 04:22:16 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);
