status

[psensor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index f5ff0b3..5e008db 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -134,7 +134,7 @@ static void log_measures(struct psensor **sensors)
 {
        if (log_level == LOG_DEBUG)
                while (*sensors) {
-                       log_printf(LOG_DEBUG, "Measure: %s %.2f",
+                       log_debug("Measure: %s %.2f",
                                   (*sensors)->name,
                                   psensor_get_current_value(*sensors));
 
@@ -355,16 +355,14 @@ static gboolean initial_window_show(gpointer data)
 {
        struct ui_psensor *ui;
 
-       log_printf(LOG_DEBUG, "initial_window_show()");
+       log_debug("initial_window_show()");
 
        ui = (struct ui_psensor *)data;
 
-       log_printf(LOG_DEBUG,
-                  "is_status_supported: %d", is_status_supported());
-       log_printf(LOG_DEBUG,
-                  "is_appindicator_supported: %d", is_appindicator_supported());
-       log_printf(LOG_DEBUG,
-                  "hide_on_startup: %d", ui->config->hide_on_startup);
+       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()))
@@ -464,7 +462,9 @@ int main(int argc, char **argv)
        associate_colors(ui.sensors);
        associate_cb_alarm_raised(ui.sensors, &ui);
 
+#if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029)
        ui_status_init(&ui);
+#endif
 
        /* main window */
        ui_window_create(&ui);