X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=4b84e9412256220af65386c3a29fd3d589238f48;hb=a7a7c18504d5fdf7559a47ea649151a281cbd21d;hp=73732af5ca13e0de4d2543d497ba428b4840ef7d;hpb=bd230aca5f0289c9464aa98b29f672c28fc58243;p=chaz%2Ftint2

diff --git a/src/config.c b/src/config.c
index 73732af..4b84e94 100644
--- a/src/config.c
+++ b/src/config.c
@@ -461,7 +461,7 @@ void add_entry (char *key, char *value)
 	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.background_name[TASKBAR_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);
@@ -560,6 +560,16 @@ void add_entry (char *key, char *value)
 
 	/* Systray */
 	else if (strcmp (key, "systray_padding") == 0) {
+		if (new_config_file == 0 && systray_enabled == 0) {
+			systray_enabled = 1;
+			if (panel_items_order) {
+				char* tmp = g_strconcat(panel_items_order, "S", NULL);
+				g_free( panel_items_order );
+				panel_items_order = tmp;
+			}
+			else
+				panel_items_order = g_strdup("S");
+		}
 		extract_values(value, &value1, &value2, &value3);
 		systray.area.paddingxlr = systray.area.paddingx = atoi (value1);
 		if (value2) systray.area.paddingy = atoi (value2);