fixed style

[psensor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 1781038..150b9c9 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -87,7 +87,7 @@ static void print_help()
 {
        printf(_("Usage: %s [OPTION]...\n"), program_name);
 
-       puts(_("psensor is a GTK application for monitoring hardware sensors, "
+       puts(_("Psensor is a GTK+ application for monitoring hardware sensors, "
               "including temperatures and fan speeds."));
 
        puts("");
@@ -97,13 +97,14 @@ static void print_help()
 
        puts("");
 
-       puts(_("  -u, --url=URL       "
-              "the URL of the psensor-server, example: http://hostname:3131"));
-       puts(_("  --use-libatasmart   "
-              "use atasmart library for disk monitoring "
-              "instead of hddtemp daemon"));
-       puts(_("  -n, --new-instance  "
-              "force the creation of a new Psensor application"));
+       puts(_(
+"  -u, --url=URL       the URL of the psensor-server,\n"
+"                      example: http://hostname:3131"));
+       puts(_(
+"  --use-libatasmart   use atasmart library for disk monitoring instead of\n"
+"                      hddtemp daemon"));
+       puts(_(
+"  -n, --new-instance  force the creation of a new Psensor application"));
        puts("");
 
        puts(_("  -d, --debug=LEVEL   "
@@ -241,7 +242,7 @@ gboolean ui_refresh_thread(gpointer data)
 static void cb_alarm_raised(struct psensor *sensor, void *data)
 {
 #ifdef HAVE_LIBNOTIFY
-       if (sensor->enabled)
+       if (sensor->alarm_enabled)
                ui_notify(sensor, (struct ui_psensor *)data);
 #endif
 }
@@ -291,13 +292,16 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
                s->cb_alarm_raised = cb_alarm_raised;
                s->cb_alarm_raised_data = ui;
 
-               if (is_temp_type(s->type)) {
-                       s->alarm_limit
-                           = config_get_sensor_alarm_limit(s->id, 60);
+               s->alarm_high_threshold
+                       = config_get_sensor_alarm_high_threshold(s->id);
+               s->alarm_low_threshold
+                       = config_get_sensor_alarm_low_threshold(s->id);
+
+               if (is_temp_type(s->type) || is_fan_type(s->type)) {
                        s->alarm_enabled
                            = config_get_sensor_alarm_enabled(s->id);
                } else {
-                       s->alarm_limit = 0;
+                       s->alarm_high_threshold = 0;
                        s->alarm_enabled = 0;
                }
 
@@ -433,8 +437,6 @@ static void cleanup(struct ui_psensor *ui)
        config_cleanup();
 
        log_debug("Cleanup done, closing log");
-
-       log_close();
 }
 
 /*
@@ -453,8 +455,8 @@ static struct psensor **create_sensors_list(const char *url,
                rsensor_init();
                sensors = get_remote_sensors(url, 600);
 #else
-               fprintf(stderr,
-                       _("ERROR: Not compiled with remote sensor support.\n"));
+               log_err(_("Psensor has not been compiled with remote "
+                         "sensor support."));
                exit(EXIT_FAILURE);
 #endif
        } else {
@@ -541,7 +543,7 @@ int main(int argc, char **argv)
 
        if (!new_instance && g_application_get_is_remote(app)) {
                g_application_activate(app);
-               log_warn(_("Psensor instance already exists"));
+               log_warn(_("A Psensor instance already exists."));
                exit(EXIT_SUCCESS);
        }
 
@@ -601,22 +603,24 @@ int main(int argc, char **argv)
        ui_appindicator_init(&ui);
 #endif
 
-       /*
-        * show the window as soon as all gtk events have been processed
-        * in order to ensure that the status icon is attempted to be
-        * drawn before. If not, there is no way to detect that it is
-        * visible.
-       */
-       g_idle_add((GSourceFunc)initial_window_show, &ui);
-
        gdk_notify_startup_complete();
 
+       /*
+        * hack, did not find a cleaner solution.
+        * wait 2s to ensure that the status icon is attempted to be
+        * drawn before determining whether the main window must be
+        * show.
+        */
+       g_timeout_add(2000, (GSourceFunc)initial_window_show, &ui);
+
        /* main loop */
        gtk_main();
 
        g_object_ref(app);
        cleanup(&ui);
+
        log_debug("Quitting...");
+       log_close();
 
        return 0;
 }