X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=80d02c0275b564bbaedc5347534ee8c150e01528;hb=b0daed8dd52ebaa40fa993e5b9f23c823937c120;hp=bebab0332127844c467e89e215d003213ab0ade9;hpb=ca9539ba0d899780bee58009321afb67b0c7a27a;p=chaz%2Ftint2

diff --git a/src/config.c b/src/config.c
index bebab03..80d02c0 100644
--- a/src/config.c
+++ b/src/config.c
@@ -77,45 +77,6 @@ void cleanup_config()
 }
 
 
-void extract_values (const char *value, char **value1, char **value2, char **value3)
-{
-	char *b=0, *c=0;
-
-	if (*value1) free (*value1);
-	if (*value2) free (*value2);
-	if (*value3) free (*value3);
-
-	if ((b = strchr (value, ' '))) {
-		b[0] = '\0';
-		b++;
-	}
-	else {
-		*value2 = 0;
-		*value3 = 0;
-	}
-	*value1 = strdup (value);
-	g_strstrip(*value1);
-
-	if (b) {
-		if ((c = strchr (b, ' '))) {
-			c[0] = '\0';
-			c++;
-		}
-		else {
-			c = 0;
-			*value3 = 0;
-		}
-		*value2 = strdup (b);
-		g_strstrip(*value2);
-	}
-
-	if (c) {
-		*value3 = strdup (c);
-		g_strstrip(*value3);
-	}
-}
-
-
 void get_action (char *event, int *action)
 {
 	if (strcmp (event, "none") == 0)
@@ -257,7 +218,7 @@ void add_entry (char *key, char *value)
 				if (snapshot_path == 0)
 					systray_enabled = 1;
 			}
-			if (panel_items_order[j] == 'C')			
+			if (panel_items_order[j] == 'C')
 				clock_enabled = 1;
 		}
 	}
@@ -557,9 +518,22 @@ void add_entry (char *key, char *value)
 		panel_config.g_task.config_background_mask |= (1<<status);
 		if (status == TASK_NORMAL) panel_config.g_task.area.bg = panel_config.g_task.background[TASK_NORMAL];
 	}
+	// "tooltip" is deprecated but here for backwards compatibility
+	else if (strcmp (key, "task_tooltip") == 0 || strcmp(key, "tooltip") == 0)
+		panel_config.g_task.tooltip_enabled = atoi(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);
@@ -616,8 +590,6 @@ void add_entry (char *key, char *value)
 	}
 
 	/* Tooltip */
-	else if (strcmp (key, "tooltip") == 0)
-		g_tooltip.enabled = atoi(value);
 	else if (strcmp (key, "tooltip_show_timeout") == 0) {
 		int timeout_msec = 1000*atof(value);
 		g_tooltip.show_timeout_msec = timeout_msec;