Mercurial > pidgin.yaz
diff src/gtkimhtmltoolbar.c @ 10125:ee50e4797352
[gaim-migrate @ 11162]
I fixed the problem described in patch 1038166 in a slightly different way.
While I was at it I got carried away and made it not show size and stuff
in the dialog. The way I did it is probably very evil, and someone will
probably revert it. Just delete the realize_ function.
But this is HEAD, so we can try it anyway.
committer: Tailor Script <tailor@pidgin.im>
| author | Tim Ringenbach <marv@pidgin.im> |
|---|---|
| date | Tue, 19 Oct 2004 04:39:55 +0000 |
| parents | 9c174a7f9afc |
| children | 0aca774bef87 |
line wrap: on
line diff
--- a/src/gtkimhtmltoolbar.c Tue Oct 19 04:32:56 2004 +0000 +++ b/src/gtkimhtmltoolbar.c Tue Oct 19 04:39:55 2004 +0000 @@ -125,6 +125,18 @@ } static void +realize_toolbar_font(GtkWidget *widget, GtkIMHtmlToolbar *toolbar) +{ + GtkFontSelection *sel; + + sel = GTK_FONT_SELECTION(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog)->fontsel); + gtk_widget_hide_all(gtk_widget_get_parent(sel->size_entry)); + gtk_widget_show_all(sel->family_list); + gtk_widget_show(gtk_widget_get_parent(sel->family_list)); + gtk_widget_show(gtk_widget_get_parent(gtk_widget_get_parent(sel->family_list))); +} + +static void cancel_toolbar_font(GtkWidget *widget, GtkIMHtmlToolbar *toolbar) { destroy_toolbar_font(widget, NULL, toolbar); @@ -164,7 +176,7 @@ toolbar->font_dialog = gtk_font_selection_dialog_new(_("Select Font")); g_object_set_data(G_OBJECT(toolbar->font_dialog), "gaim_toolbar", toolbar); - + if(fontname) { char fonttif[128]; g_snprintf(fonttif, sizeof(fonttif), "%s 12", fontname); @@ -181,6 +193,8 @@ G_CALLBACK(apply_font), toolbar->font_dialog); g_signal_connect(G_OBJECT(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog)->cancel_button), "clicked", G_CALLBACK(cancel_toolbar_font), toolbar); + g_signal_connect_after(G_OBJECT(toolbar->font_dialog), "realize", + G_CALLBACK(realize_toolbar_font), toolbar); gtk_window_present(GTK_WINDOW(toolbar->font_dialog)); } else {