Bug fix: No toolbars on first entry

[geeqie.git] / src / layout-util.cc

diff --git a/src/layout-util.cc b/src/layout-util.cc
index 4b0ec52..d3b2f68 100644 (file)
--- a/src/layout-util.cc
+++ b/src/layout-util.cc
@@ -3139,10 +3139,21 @@ static void layout_actions_setup_editors(LayoutWindow *lw)
        g_list_free(editors_list);
 }
 
+void create_toolbars(LayoutWindow *lw)
+{
+       gint i;
+
+       for (i = 0; i < TOOLBAR_COUNT; i++)
+               {
+               layout_actions_toolbar(lw, static_cast<ToolbarType>(i));
+               layout_toolbar_clear(lw, static_cast<ToolbarType>(i));
+               layout_toolbar_add_default(lw, static_cast<ToolbarType>(i));
+               }
+}
+
 void layout_actions_setup(LayoutWindow *lw)
 {
        GError *error;
-       gint i;
 
        DEBUG_1("%s layout_actions_setup: start", get_exec_time());
        if (lw->ui_manager) return;
@@ -3191,13 +3202,6 @@ void layout_actions_setup(LayoutWindow *lw)
                exit(EXIT_FAILURE);
                }
 
-       DEBUG_1("%s layout_actions_setup: add toolbar", get_exec_time());
-       for (i = 0; i < TOOLBAR_COUNT; i++)
-               {
-               layout_toolbar_clear(lw, static_cast<ToolbarType>(i));
-               layout_toolbar_add_default(lw, static_cast<ToolbarType>(i));
-               }
-
        DEBUG_1("%s layout_actions_setup: marks", get_exec_time());
        layout_actions_setup_marks(lw);