Make the barconfig list a TAILQ

diff --git a/include/config.h b/include/config.h
index 200d393f3420f1995a559e23302600aefa26bc34..a4a274cf9fd39008b827eaa8fbe1ff8d22276b4a 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -26,7 +26,7 @@ typedef struct Barconfig Barconfig;
 extern char *current_configpath;
 extern Config config;
 extern SLIST_HEAD(modes_head, Mode) modes;
-extern SLIST_HEAD(barconfig_head, Barconfig) barconfigs;
+extern TAILQ_HEAD(barconfig_head, Barconfig) barconfigs;
 
 /**
  * Used during the config file lexing/parsing to keep the state of the lexer
@@ -235,7 +235,7 @@ struct Barconfig {
         char *urgent_workspace_bg;
     } colors;
 
-    SLIST_ENTRY(Barconfig) configs;
+    TAILQ_ENTRY(Barconfig) configs;
 };
 
 /**

diff --git a/src/config.c b/src/config.c
index 3ea18258a4e7ea3b9f38595b7daeae89a60a9ebb..d39a57611db4ff6ec02379fa24cf24a79a0afce4 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -21,7 +21,7 @@
 char *current_configpath = NULL;
 Config config;
 struct modes_head modes;
-struct barconfig_head barconfigs;
+struct barconfig_head barconfigs = TAILQ_HEAD_INITIALIZER(barconfigs);
 
 /**
  * Ungrabs all keys, to be called before re-grabbing the keys because of a

diff --git a/src/ipc.c b/src/ipc.c
index 60f55966c3c18562b2d4fce5029d760938ed4656..1ae6bb0a032adb694c7088768113e26dc46c4a5b 100644 (file)
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -487,7 +487,7 @@ IPC_HANDLER(get_bar_config) {
     strncpy(bar_id, (const char*)message, message_size);
     LOG("IPC: looking for config for bar ID \"%s\"\n", bar_id);
     Barconfig *current, *config = NULL;
-    SLIST_FOREACH(current, &barconfigs, configs) {
+    TAILQ_FOREACH(current, &barconfigs, configs) {
         if (strcmp(current->id, bar_id) != 0)
             continue;