Bug fix: No toolbars on first entry

When Geeqie is started for the first time and geeqierc.xml does not
exist, the toolbars were not set to the default values.

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);
 

diff --git a/src/layout-util.h b/src/layout-util.h
index 2c7ea04..a82aa0e 100644 (file)
--- a/src/layout-util.h
+++ b/src/layout-util.h
@@ -78,5 +78,8 @@ void layout_exif_window_new(LayoutWindow *lw);
 gboolean is_help_key(GdkEventKey *event);
 void layout_menu_close_cb(GtkAction *action, gpointer data);
 GtkWidget *layout_actions_menu_tool_bar(LayoutWindow *lw);
+
+void create_toolbars(LayoutWindow *lw);
+
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */

diff --git a/src/layout.cc b/src/layout.cc
index 0451c23..c478a79 100644 (file)
--- a/src/layout.cc
+++ b/src/layout.cc
@@ -1847,6 +1847,7 @@ static void layout_grid_setup(LayoutWindow *lw)
        GtkWidget *files;
 
        layout_actions_setup(lw);
+       create_toolbars(lw);
 
        lw->group_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
        DEBUG_NAME(lw->group_box);