added slog interval support

[psensor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 5824b72..91b7b1e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -37,6 +37,7 @@
 #include "ui_sensorlist.h"
 #include "ui_color.h"
 #include "lmsensor.h"
+#include "slog.h"
 #include "ui_pref.h"
 #include "ui_graph.h"
 #include "ui_status.h"
@@ -144,7 +145,7 @@ static void update_measures(struct ui_psensor *ui)
        cfg = ui->config;
 
        while (1) {
-               g_mutex_lock(ui->sensors_mutex);
+               pthread_mutex_lock(&ui->sensors_mutex);
 
                sensors = ui->sensors;
                if (!sensors)
@@ -167,7 +168,7 @@ static void update_measures(struct ui_psensor *ui)
 
                period = cfg->sensor_update_interval;
 
-               g_mutex_unlock(ui->sensors_mutex);
+               pthread_mutex_unlock(&ui->sensors_mutex);
 
                sleep(period);
        }
@@ -207,7 +208,7 @@ gboolean ui_refresh_thread(gpointer data)
        ret = TRUE;
        cfg = ui->config;
 
-       g_mutex_lock(ui->sensors_mutex);
+       pthread_mutex_lock(&ui->sensors_mutex);
 
        graph_update(ui->sensors, ui->w_graph, ui->config, ui->main_window);
 
@@ -227,7 +228,7 @@ gboolean ui_refresh_thread(gpointer data)
                ret = FALSE;
        }
 
-       g_mutex_unlock(ui->sensors_mutex);
+       pthread_mutex_unlock(&ui->sensors_mutex);
 
        if (ret == FALSE)
                g_timeout_add(1000 * ui->graph_update_interval,
@@ -322,6 +323,8 @@ static void associate_preferences(struct psensor **sensors)
                        s->name = n;
                }
 
+               s->appindicator_enabled = config_is_appindicator_enabled(s->id);
+
                sensor_cur++;
        }
 }
@@ -404,7 +407,7 @@ static void cb_activate(GApplication *application,
  */
 static void cleanup(struct ui_psensor *ui)
 {
-       g_mutex_lock(ui->sensors_mutex);
+       pthread_mutex_lock(&ui->sensors_mutex);
 
        log_debug("Cleanup...");
 
@@ -429,7 +432,7 @@ static void cleanup(struct ui_psensor *ui)
 
        ui_status_cleanup();
 
-       g_mutex_unlock(ui->sensors_mutex);
+       pthread_mutex_unlock(&ui->sensors_mutex);
 
        config_cleanup();
 
@@ -515,7 +518,7 @@ int main(int argc, char **argv)
                        exit(EXIT_SUCCESS);
                case 'd':
                        log_level = atoi(optarg);
-                       log_printf(LOG_INFO, _("Enables debug mode."));
+                       log_info(_("Enables debug mode."));
                        break;
                case 'n':
                        new_instance = 1;
@@ -560,7 +563,7 @@ int main(int argc, char **argv)
 
        gtk_init(NULL, NULL);
 
-       ui.sensors_mutex = g_mutex_new();
+       pthread_mutex_init(&ui.sensors_mutex, NULL);
 
        ui.config = config_load();
 
@@ -569,6 +572,12 @@ int main(int argc, char **argv)
        ui.sensors = create_sensors_list(url, use_libatasmart);
        associate_cb_alarm_raised(ui.sensors, &ui);
 
+       if (ui.config->slog_enabled)
+               slog_activate(NULL,
+                             ui.sensors,
+                             &ui.sensors_mutex,
+                             config_get_slog_interval());
+
 #if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029)
        ui_status_init(&ui);
        ui_status_set_visible(1);