X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fconfig.c;h=7c87339cf86660bea8793843a69640ed874cfca0;hb=055e4228a91f9957771e44cbdc540f20b2c3aa17;hp=dc4a30ace2397a89e60b99afc111edf3e164c883;hpb=fc22af941cf7b9db65a703e9e697490119c70ec2;p=chaz%2Ftint2

diff --git a/src/config.c b/src/config.c
index dc4a30a..7c87339 100644
--- a/src/config.c
+++ b/src/config.c
@@ -3,7 +3,7 @@
 * Tint2 : read/write config file
 *
 * Copyright (C) 2007 PÃ¥l Staurland (staura@gmail.com)
-* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
+* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2
@@ -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 */