void layout_actions_setup(LayoutWindow *lw);
void layout_actions_add_window(LayoutWindow *lw, GtkWidget *window);
GtkWidget *layout_actions_menu_bar(LayoutWindow *lw);
+void layout_toolbar_add_from_config(LayoutWindow *lw, const gchar **attribute_names, const gchar **attribute_values);
+GtkWidget *layout_actions_toolbar(LayoutWindow *lw);
+
+void layout_toolbar_clear(LayoutWindow *lw);
+void layout_toolbar_add(LayoutWindow *lw, const gchar *action);
+void layout_toolbar_add_default(LayoutWindow *lw);
+void layout_toolbar_write_config(LayoutWindow *lw, GString *outstr, gint indent);
-GtkWidget *layout_button_bar(LayoutWindow *lw);
void layout_keyboard_init(LayoutWindow *lw, GtkWidget *window);