X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=2ff77f548a6122fa2ed3fcf944cb085dd03c704a;hb=54c21917514f31f3c69ef747e609e93dc4b38dbe;hp=dc4a30ace2397a89e60b99afc111edf3e164c883;hpb=fc22af941cf7b9db65a703e9e697490119c70ec2;p=chaz%2Ftint2

diff --git a/src/config.c b/src/config.c
index dc4a30a..2ff77f5 100644
--- a/src/config.c
+++ b/src/config.c
@@ -454,15 +454,14 @@ void add_entry (char *key, char *value)
 	else if (strcmp (key, "taskbar_background_id") == 0) {
 		int id = atoi (value);
 		id = (id < backgrounds->len && id >= 0) ? id : 0;
-		panel_config.g_taskbar.bg = &g_array_index(backgrounds, Background, id);
-		if (panel_config.g_taskbar.bg_active == 0)
-			panel_config.g_taskbar.bg_active = panel_config.g_taskbar.bg;
-		panel_config.g_taskbar.area.bg = panel_config.g_taskbar.bg;
+		panel_config.g_taskbar.background[TASKBAR_NORMAL] = &g_array_index(backgrounds, Background, id);
+		if (panel_config.g_taskbar.background[TASKBAR_ACTIVE] == 0)
+			panel_config.g_taskbar.background[TASKBAR_ACTIVE] = panel_config.g_taskbar.background[TASKBAR_NORMAL];
 	}
 	else if (strcmp (key, "taskbar_active_background_id") == 0) {
 		int id = atoi (value);
 		id = (id < backgrounds->len && id >= 0) ? id : 0;
-		panel_config.g_taskbar.bg_active = &g_array_index(backgrounds, Background, id);
+		panel_config.g_taskbar.background[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, id);
 	}
 	else if (strcmp (key, "taskbar_name") == 0) {
 		taskbarname_enabled = atoi (value);
@@ -471,9 +470,11 @@ void add_entry (char *key, char *value)
 	}
 	else if (strcmp (key, "taskbar_name_active_background_id") == 0) {
 	}
-	else if (strcmp (key, "taskbar_font_color") == 0) {
+	else if (strcmp (key, "taskbar_name_font") == 0) {
 	}
-	else if (strcmp (key, "taskbar_active_font_color") == 0) {
+	else if (strcmp (key, "taskbar_name_font_color") == 0) {
+	}
+	else if (strcmp (key, "taskbar_name_active_font_color") == 0) {
 	}
 
 	/* Task */