preinit in config.c

awesome.c

@@ -135,9 +135,6 @@ setup(int screen)
 
     grabkeys(phys_screen);
 
-    for(statusbar = globalconf.screens[screen].statusbar; statusbar; statusbar = statusbar->next)
-        statusbar_preinit(statusbar, screen);
-
     for(statusbar = globalconf.screens[screen].statusbar; statusbar; statusbar = statusbar->next)
         statusbar_init(statusbar);
 }

config.c

@@ -341,7 +341,9 @@ config_parse_screen(cfg_t *cfg, int screen)
         statusbar->height = cfg_getint(cfgsectmp, "height");
         statusbar->width = cfg_getint(cfgsectmp, "width");
         statusbar->name = a_strdup(cfg_title(cfgsectmp));
+        statusbar->screen = screen;
         create_widgets(cfgsectmp, statusbar);
+        statusbar_preinit(statusbar);
         statusbar_list_push(&virtscreen->statusbar, statusbar);
     }
 

statusbar.c

@@ -162,12 +162,10 @@ statusbar_display(Statusbar *statusbar)
 }
 
 void
-statusbar_preinit(Statusbar *statusbar, int screen)
+statusbar_preinit(Statusbar *statusbar)
 {
     Widget *widget;
 
-    statusbar->screen = screen;
-
     if(statusbar->height <= 0)
     {
         /* 1.5 as default factor, it fits nice but no one know why */

statusbar.h

@@ -25,7 +25,7 @@
 #include "structs.h"
 
 void statusbar_refresh(void);
-void statusbar_preinit(Statusbar *, int);
+void statusbar_preinit(Statusbar *);
 void statusbar_init(Statusbar *);
 void statusbar_display(Statusbar *);
 Position statusbar_get_position_from_str(const char *);