cfg = ui->config;
while (1) {
- g_mutex_lock(ui->sensors_mutex);
+ pthread_mutex_lock(&ui->sensors_mutex);
sensors = ui->sensors;
if (!sensors)
psensor_log_measures(sensors);
- if (cfg->slog_enabled)
- slog_write_sensors(sensors);
-
period = cfg->sensor_update_interval;
- g_mutex_unlock(ui->sensors_mutex);
+ pthread_mutex_unlock(&ui->sensors_mutex);
sleep(period);
}
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);
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,
*/
static void cleanup(struct ui_psensor *ui)
{
- g_mutex_lock(ui->sensors_mutex);
+ pthread_mutex_lock(&ui->sensors_mutex);
log_debug("Cleanup...");
ui_status_cleanup();
- g_mutex_unlock(ui->sensors_mutex);
+ pthread_mutex_unlock(&ui->sensors_mutex);
config_cleanup();
gtk_init(NULL, NULL);
- ui.sensors_mutex = g_mutex_new();
+ pthread_mutex_init(&ui.sensors_mutex, NULL);
ui.config = config_load();
associate_cb_alarm_raised(ui.sensors, &ui);
if (ui.config->slog_enabled)
- slog_init(NULL, ui.sensors);
+ slog_activate(NULL,
+ ui.sensors,
+ &ui.sensors_mutex,
+ config_get_slog_interval());
#if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029)
ui_status_init(&ui);
/*
* hack, did not find a cleaner solution.
- * wait 2s to ensure that the status icon is attempted to be
+ * wait 30s 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);
+ if (ui.config->hide_on_startup)
+ g_timeout_add(30000, (GSourceFunc)initial_window_show, &ui);
+ else
+ initial_window_show(&ui);
/* main loop */
gtk_main();
- g_object_ref(app);
+ g_object_unref(app);
cleanup(&ui);
log_debug("Quitting...");
log_close();
+ if (url)
+ free(url);
+
return 0;
}