X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=0aafa15440396c69628cd4b4706c7f80c7504d7e;hb=1410f23801330c83c83caf21353860ff2bc18399;hp=9aab7848cf837e0511aec18ca45b043e1df0c7da;hpb=cc35e177d57bc4ee2cc57ae25f130dfc168aa61d;p=psensor.git

diff --git a/src/main.c b/src/main.c
index 9aab784..0aafa15 100644
--- a/src/main.c
+++ b/src/main.c
@@ -68,8 +68,6 @@
 #include "cpu.h"
 #endif
 
-#include "compat.h"
-
 static const char *program_name;
 
 static void print_version()
@@ -212,7 +210,7 @@ gboolean ui_refresh_thread(gpointer data)
 
 	graph_update(ui->sensors, ui->w_graph, ui->config, ui->main_window);
 
-	ui_sensorlist_update(ui);
+	ui_sensorlist_update(ui, 0);
 
 	if (is_appindicator_supported() || is_status_supported())
 		indicators_update(ui);
@@ -261,22 +259,17 @@ static void associate_colors(struct psensor **sensors)
 		{0x0000, 0x0000, 0x7fff},	/* dark blue */
 		{0x0000, 0x7fff, 0x0000}	/* dark green */
 	};
+	struct psensor **cur;
+	int i;
+	struct color c;
 
-	struct psensor **sensor_cur = sensors;
-	int i = 0;
-	while (*sensor_cur) {
-		struct color default_color;
-		color_set(&default_color,
+	for (cur = sensors, i = 0; *cur; cur++) {
+		color_set(&c,
 			  colors[i % COLORS_COUNT][0],
 			  colors[i % COLORS_COUNT][1],
 			  colors[i % COLORS_COUNT][2]);
 
-		(*sensor_cur)->color
-		    = config_get_sensor_color((*sensor_cur)->id,
-					      &default_color);
-
-		sensor_cur++;
-		i++;
+		(*cur)->color = config_get_sensor_color((*cur)->id, &c);
 	}
 }
 
@@ -314,7 +307,7 @@ static void associate_preferences(struct psensor **sensors)
 		char *n;
 		struct psensor *s = *sensor_cur;
 
-		s->enabled = config_is_sensor_enabled(s->id);
+		s->graph_enabled = config_is_sensor_enabled(s->id);
 
 		n = config_get_sensor_name(s->id);
 
@@ -585,16 +578,9 @@ int main(int argc, char **argv)
 
 	/* main window */
 	ui_window_create(&ui);
-	ui.sensor_box = NULL;
-
-	/* drawing box */
-	ui.w_graph = ui_graph_create(&ui);
 
 	ui_enable_alpha_channel(&ui);
 
-	/* sensor list */
-	ui_sensorlist_create(&ui);
-
 	thread = g_thread_create((GThreadFunc) update_measures,
 				 &ui, TRUE, &error);