avoid local var

[psensor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index ad4b06d..dce4573 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -53,8 +53,6 @@
 #include <ui_status.h>
 #include <ui_unity.h>
 
-
-
 static const char *program_name;
 
 static void print_version(void)
@@ -226,71 +224,31 @@ static void cb_alarm_raised(struct psensor *sensor, void *data)
        }
 }
 
-static void associate_colors(struct psensor **sensors)
-{
-       GdkRGBA rgba;
-       /* copied from the default colors of the gtk color color
-        * chooser. */
-       const char *default_colors[27] = {
-               "#ef2929",  /* Scarlet Red */
-               "#fcaf3e",  /* Orange */
-               "#fce94f",  /* Butter */
-               "#8ae234",  /* Chameleon */
-               "#729fcf",  /* Sky Blue */
-               "#ad7fa8",  /* Plum */
-               "#e9b96e",  /* Chocolate */
-               "#888a85",  /* Aluminum 1 */
-               "#eeeeec",  /* Aluminum 2 */
-               "#cc0000",
-               "#f57900",
-               "#edd400",
-               "#73d216",
-               "#3465a4",
-               "#75507b",
-               "#c17d11",
-               "#555753",
-               "#d3d7cf",
-               "#a40000",
-               "#ce5c00",
-               "#c4a000",
-               "#4e9a06",
-               "#204a87",
-               "#5c3566",
-               "#8f5902",
-               "#2e3436",
-               "#babdb6"
-       };
-       int i;
-       struct psensor **cur;
-       struct color c;
-
-       for (cur = sensors, i = 0; *cur; cur++, i++) {
-               gdk_rgba_parse(&rgba, default_colors[i % 27]);
-               c.red = rgba.red;
-               c.green = rgba.green;
-               c.blue = rgba.blue;
-
-               (*cur)->color = config_get_sensor_color((*cur)->id, &c);
-       }
-}
-
 static void
 associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 {
-       struct psensor **sensor_cur = sensors;
+       bool ret;
+       struct psensor *s;
 
-       while (*sensor_cur) {
-               struct psensor *s = *sensor_cur;
+       while (*sensors) {
+               s = *sensors;
 
                s->cb_alarm_raised = cb_alarm_raised;
                s->cb_alarm_raised_data = ui;
 
-               s->alarm_high_threshold
-                       = config_get_sensor_alarm_high_threshold(s->id);
-               s->alarm_low_threshold
-                       = config_get_sensor_alarm_low_threshold(s->id);
+               ret = config_get_sensor_alarm_high_threshold
+                       (s->id, &s->alarm_high_threshold);
 
-               sensor_cur++;
+               if (!ret && s->max != UNKNOWN_DBL_VALUE)
+                       s->alarm_high_threshold = s->max;
+
+               ret = config_get_sensor_alarm_low_threshold
+                       (s->id, &s->alarm_low_threshold);
+
+               if (!ret && s->min != UNKNOWN_DBL_VALUE)
+                       s->alarm_low_threshold = s->min;
+
+               sensors++;
        }
 }
 
@@ -453,7 +411,6 @@ static struct psensor **create_sensors_list(const char *url)
        }
 
        associate_preferences(sensors);
-       associate_colors(sensors);
 
        return sensors;
 }
@@ -581,8 +538,6 @@ int main(int argc, char **argv)
        else
                initial_window_show(&ui);
 
-       log_debug("translators: %s\n", _("translator-credits"));
-
        /* main loop */
        gtk_main();