Fixed restoration of the panel divider position.

[psensor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index a24c636..69df91b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -229,7 +229,7 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 {
        bool ret;
        struct psensor *s;
-       double high_temp;
+       double high_temp, high_default, low_default;
 
        high_temp = config_get_default_high_threshold_temperature();
 
@@ -239,23 +239,31 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
                s->cb_alarm_raised = cb_alarm_raised;
                s->cb_alarm_raised_data = ui;
 
-               ret = config_get_sensor_alarm_high_threshold
-                       (s->id, &s->alarm_high_threshold);
-
-               if (!ret) {
-                       if (s->max == UNKNOWN_DBL_VALUE) {
-                               if (s->type & SENSOR_TYPE_TEMP)
-                                       s->alarm_high_threshold = high_temp;
-                       } else {
-                               s->alarm_high_threshold = s->max;
-                       }
+               if (s->max == UNKNOWN_DBL_VALUE) {
+                       if (s->type & SENSOR_TYPE_TEMP)
+                               high_default = high_temp;
+                       else
+                               high_default = UNKNOWN_DBL_VALUE;
+               } else {
+                       high_default = s->max;
                }
 
+               ret = config_get_sensor_alarm_high_threshold
+                       (s->id, &s->alarm_high_threshold, high_default);
+
+               if (!ret)
+                       s->alarm_high_threshold = high_default;
+
+               if (s->min == UNKNOWN_DBL_VALUE)
+                       low_default = 0;
+               else
+                       low_default = s->min;
+
                ret = config_get_sensor_alarm_low_threshold
-                       (s->id, &s->alarm_low_threshold);
+                       (s->id, &s->alarm_low_threshold, low_default);
 
-               if (!ret && s->min != UNKNOWN_DBL_VALUE)
-                       s->alarm_low_threshold = s->min;
+               if (!ret)
+                       s->alarm_low_threshold = low_default;
 
                sensors++;
        }
@@ -307,25 +315,25 @@ static struct option long_options[] = {
        {NULL, 0, NULL, 0}
 };
 
-static gboolean initial_window_show(gpointer data)
+/*
+ * show the main window if there will be no way for the user to show
+ * it (no appindicator, no status icon).
+ */
+static gboolean check_ui_visible(gpointer data)
 {
        struct ui_psensor *ui;
 
-       log_debug("initial_window_show()");
+       log_debug("check_ui_visible()");
 
        ui = (struct ui_psensor *)data;
 
        log_debug("is_status_supported: %d", is_status_supported());
        log_debug("is_appindicator_supported: %d",
                   is_appindicator_supported());
-       log_debug("hide_on_startup: %d", ui->config->hide_on_startup);
 
-       if (!ui->config->hide_on_startup
-           || (!is_appindicator_supported() && !is_status_supported()))
+       if (!is_appindicator_supported() && !is_status_supported())
                ui_window_show(ui);
 
-       ui_window_update(ui);
-
        return FALSE;
 }
 
@@ -539,16 +547,16 @@ int main(int argc, char **argv)
 
        gdk_notify_startup_complete();
 
-       /*
-        * hack, did not find a cleaner solution.
-        * wait 30s to ensure that the status icon is attempted to be
-        * drawn before determining whether the main window must be
-        * show.
-        */
-       if  (ui.config->hide_on_startup)
-               g_timeout_add(30000, (GSourceFunc)initial_window_show, &ui);
+       log_debug("hide_on_startup: %d", ui.config->hide_on_startup);
+       if (ui.config->hide_on_startup)
+               /* Wait 30s to allow attempt to show status icon or other UI,
+                * then check whether any UI is accessible. If not, then main
+                * window must be shown despite hide_on_startup preference.
+                * There may be a cleaner way to deal with this.
+                */
+               g_timeout_add(30000, (GSourceFunc)check_ui_visible, &ui);
        else
-               initial_window_show(&ui);
+               ui_window_show(&ui);
 
        /* main loop */
        gtk_main();