--- a/src/gtkconv.c Tue Feb 24 02:38:52 2004 +0000 +++ b/src/gtkconv.c Tue Feb 24 04:27:58 2004 +0000 @@ -272,7 +272,7 @@ GaimConnection *gc = gaim_conversation_get_gc(conv); gtkconv = GAIM_GTK_CONVERSATION(conv); - + if (gc && gc->flags & GAIM_CONNECTION_HTML) buf = gtk_imhtml_get_markup(GTK_IMHTML(gtkconv->entry)); else @@ -4065,6 +4065,9 @@ gtkconv->show_formatting_toolbar = gaim_prefs_get_bool( "/gaim/gtk/conversations/show_formatting_toolbar"); + if (gtkconv->show_formatting_toolbar) + gtk_widget_show(gtkconv->toolbar); + g_signal_connect_swapped(G_OBJECT(pane), "focus", G_CALLBACK(gtk_widget_grab_focus), gtkconv->entry);