- n = psensor_list_size(sensors);
- for (i = 0; i < n; i++)
- update_sensor_menu_item(sensor_menu_items[i],
- sensors[i],
- use_celcius);
+ for (s = sensors, m = menu_items; *s; s++, m++)
+ update_menu_item(*m, *s, use_celcius);
+}
+
+static void
+build_sensor_menu_items(const struct ui_psensor *ui,
+ GtkMenu *menu)
+{
+ int i, j, n, celcius;
+ const char *name;
+
+ free(menu_items);
+
+ celcius = ui->config->temperature_unit == CELCIUS;
+
+ n = psensor_list_size(ui->sensors);
+ menu_items = malloc(n * sizeof(GtkWidget *));
+ sensors = malloc((n + 1) * sizeof(struct psensor *));
+ for (i = 0, j = 0; i < n; i++) {
+ if (config_is_appindicator_enabled(ui->sensors[i]->id)) {
+ sensors[j] = ui->sensors[i];
+ name = sensors[j]->name;
+
+ menu_items[j] = GTK_MENU_ITEM
+ (gtk_menu_item_new_with_label(name));
+
+ gtk_menu_shell_insert(GTK_MENU_SHELL(menu),
+ GTK_WIDGET(menu_items[j]),
+ j+2);
+
+ update_menu_item(menu_items[j], sensors[j], celcius);
+
+ j++;
+ }
+ }
+
+ sensors[j] = NULL;