From cb2b7143c2d307a423f899e30b6b0c1dd056e5b1 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Tue, 4 Sep 2012 11:22:42 +0000 Subject: [PATCH] implemented sensor logging --- po/de.po | 14 +++++++++----- po/es.po | 14 +++++++++----- po/fr.po | 14 +++++++++----- po/hu.po | 14 +++++++++----- po/it.po | 14 +++++++++----- po/lv.po | 14 +++++++++----- po/psensor.pot | 14 +++++++++----- po/pt_BR.po | 14 +++++++++----- po/ru.po | 14 +++++++++----- po/sl.po | 14 +++++++++----- po/sr.po | 14 +++++++++----- po/tr.po | 14 +++++++++----- po/uk.po | 14 +++++++++----- po/zh_CN.po | 14 +++++++++----- src/cfg.c | 21 ++++++++++++++++++--- src/cfg.h | 5 +++++ src/lib/slog.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------ src/main.c | 4 ++++ src/ui.c | 20 ++++++++++++++++++++ 19 files changed, 225 insertions(+), 79 deletions(-) diff --git a/po/de.po b/po/de.po index c73dfa5..9667aa7 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-08-23 09:50+0200\n" +"POT-Creation-Date: 2012-08-26 14:20+0200\n" "PO-Revision-Date: 2012-06-09 17:45+0000\n" "Last-Translator: Daniel Winzen \n" "Language-Team: German\n" @@ -251,16 +251,20 @@ msgstr "U/min" msgid "%" msgstr "%" -#: src/lib/slog.c:38 +#: src/lib/slog.c:59 +msgid "slog_get_default_path: no HOME variable" +msgstr "" + +#: src/lib/slog.c:69 #, fuzzy, c-format -msgid "Cannot open sensor log file: %s" +msgid "slog_init: cannot open sensor log file: %s" msgstr "Protokolldatei kann nicht geöffnet werden: %s" -#: src/lib/slog.c:43 +#: src/lib/slog.c:74 msgid "slog_init: gettimeofday failed." msgstr "" -#: src/lib/slog.c:67 +#: src/lib/slog.c:101 msgid "slog_write_sensors: gettimeofday failed." msgstr "" diff --git a/po/es.po b/po/es.po index 0a61a7e..95074b4 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-08-23 09:50+0200\n" +"POT-Creation-Date: 2012-08-26 14:20+0200\n" "PO-Revision-Date: 2012-08-19 01:12+0000\n" "Last-Translator: Javier \n" "Language-Team: Spanish \n" @@ -251,17 +251,21 @@ msgstr "RPM" msgid "%" msgstr "%" -#: src/lib/slog.c:38 +#: src/lib/slog.c:59 +msgid "slog_get_default_path: no HOME variable" +msgstr "" + +#: src/lib/slog.c:69 #, fuzzy, c-format -msgid "Cannot open sensor log file: %s" +msgid "slog_init: cannot open sensor log file: %s" msgstr "Imposible abrir el archivo de registro: %s" -#: src/lib/slog.c:43 +#: src/lib/slog.c:74 #, fuzzy msgid "slog_init: gettimeofday failed." msgstr "Error en la adquisición del horario." -#: src/lib/slog.c:67 +#: src/lib/slog.c:101 #, fuzzy msgid "slog_write_sensors: gettimeofday failed." msgstr "Error en la adquisición del horario." diff --git a/po/fr.po b/po/fr.po index 37cd2b5..8d3fa93 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-08-23 09:50+0200\n" +"POT-Creation-Date: 2012-08-26 14:20+0200\n" "PO-Revision-Date: 2012-05-13 18:15+0000\n" "Last-Translator: jeanfi \n" "Language-Team: French <>\n" @@ -253,17 +253,21 @@ msgstr "RPM" msgid "%" msgstr "%" -#: src/lib/slog.c:38 +#: src/lib/slog.c:59 +msgid "slog_get_default_path: no HOME variable" +msgstr "" + +#: src/lib/slog.c:69 #, fuzzy, c-format -msgid "Cannot open sensor log file: %s" +msgid "slog_init: cannot open sensor log file: %s" msgstr "Impossible d'ouvrir le journal: %s" -#: src/lib/slog.c:43 +#: src/lib/slog.c:74 #, fuzzy msgid "slog_init: gettimeofday failed." msgstr "Échec de gettimeofday." -#: src/lib/slog.c:67 +#: src/lib/slog.c:101 #, fuzzy msgid "slog_write_sensors: gettimeofday failed." msgstr "Échec de gettimeofday." diff --git a/po/hu.po b/po/hu.po index c53bb5d..50334cf 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-08-23 09:50+0200\n" +"POT-Creation-Date: 2012-08-26 14:20+0200\n" "PO-Revision-Date: 2012-07-09 17:56+0000\n" "Last-Translator: Richard Somlói \n" "Language-Team: Hungarian \n" @@ -252,17 +252,21 @@ msgstr "RPM" msgid "%" msgstr "%" -#: src/lib/slog.c:38 +#: src/lib/slog.c:59 +msgid "slog_get_default_path: no HOME variable" +msgstr "" + +#: src/lib/slog.c:69 #, fuzzy, c-format -msgid "Cannot open sensor log file: %s" +msgid "slog_init: cannot open sensor log file: %s" msgstr "A naplófájl megnyitása sikertelen: %s" -#: src/lib/slog.c:43 +#: src/lib/slog.c:74 #, fuzzy msgid "slog_init: gettimeofday failed." msgstr "gettimeofday meghiúsult." -#: src/lib/slog.c:67 +#: src/lib/slog.c:101 #, fuzzy msgid "slog_write_sensors: gettimeofday failed." msgstr "gettimeofday meghiúsult." diff --git a/po/it.po b/po/it.po index 389e9cf..366bde0 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-08-23 09:50+0200\n" +"POT-Creation-Date: 2012-08-26 14:20+0200\n" "PO-Revision-Date: 2012-08-13 08:20+0000\n" "Last-Translator: Andrea Bernini \n" "Language-Team: Italian\n" @@ -251,17 +251,21 @@ msgstr "RPM" msgid "%" msgstr "%" -#: src/lib/slog.c:38 +#: src/lib/slog.c:59 +msgid "slog_get_default_path: no HOME variable" +msgstr "" + +#: src/lib/slog.c:69 #, fuzzy, c-format -msgid "Cannot open sensor log file: %s" +msgid "slog_init: cannot open sensor log file: %s" msgstr "Impossibile aprire il file di log: %s" -#: src/lib/slog.c:43 +#: src/lib/slog.c:74 #, fuzzy msgid "slog_init: gettimeofday failed." msgstr "gettimeofday fallito." -#: src/lib/slog.c:67 +#: src/lib/slog.c:101 #, fuzzy msgid "slog_write_sensors: gettimeofday failed." msgstr "gettimeofday fallito." diff --git a/po/lv.po b/po/lv.po index ad634b7..3608f0c 100644 --- a/po/lv.po +++ b/po/lv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-08-23 09:50+0200\n" +"POT-Creation-Date: 2012-08-26 14:20+0200\n" "PO-Revision-Date: 2012-07-15 16:16+0000\n" "Last-Translator: tuxmaniack \n" "Language-Team: Latvian \n" @@ -251,16 +251,20 @@ msgstr "" msgid "%" msgstr "%" -#: src/lib/slog.c:38 +#: src/lib/slog.c:59 +msgid "slog_get_default_path: no HOME variable" +msgstr "" + +#: src/lib/slog.c:69 #, c-format -msgid "Cannot open sensor log file: %s" +msgid "slog_init: cannot open sensor log file: %s" msgstr "" -#: src/lib/slog.c:43 +#: src/lib/slog.c:74 msgid "slog_init: gettimeofday failed." msgstr "" -#: src/lib/slog.c:67 +#: src/lib/slog.c:101 msgid "slog_write_sensors: gettimeofday failed." msgstr "" diff --git a/po/psensor.pot b/po/psensor.pot index 8898c0c..3807ce8 100644 --- a/po/psensor.pot +++ b/po/psensor.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-08-23 09:50+0200\n" +"POT-Creation-Date: 2012-08-26 14:20+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -249,16 +249,20 @@ msgstr "" msgid "%" msgstr "" -#: src/lib/slog.c:38 +#: src/lib/slog.c:59 +msgid "slog_get_default_path: no HOME variable" +msgstr "" + +#: src/lib/slog.c:69 #, c-format -msgid "Cannot open sensor log file: %s" +msgid "slog_init: cannot open sensor log file: %s" msgstr "" -#: src/lib/slog.c:43 +#: src/lib/slog.c:74 msgid "slog_init: gettimeofday failed." msgstr "" -#: src/lib/slog.c:67 +#: src/lib/slog.c:101 msgid "slog_write_sensors: gettimeofday failed." msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 7e0715e..523275e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-08-23 09:50+0200\n" +"POT-Creation-Date: 2012-08-26 14:20+0200\n" "PO-Revision-Date: 2012-06-25 13:26+0000\n" "Last-Translator: Rafael Neri \n" "Language-Team: Brazilian Portuguese\n" @@ -251,16 +251,20 @@ msgstr "RPM" msgid "%" msgstr "%" -#: src/lib/slog.c:38 +#: src/lib/slog.c:59 +msgid "slog_get_default_path: no HOME variable" +msgstr "" + +#: src/lib/slog.c:69 #, c-format -msgid "Cannot open sensor log file: %s" +msgid "slog_init: cannot open sensor log file: %s" msgstr "" -#: src/lib/slog.c:43 +#: src/lib/slog.c:74 msgid "slog_init: gettimeofday failed." msgstr "" -#: src/lib/slog.c:67 +#: src/lib/slog.c:101 msgid "slog_write_sensors: gettimeofday failed." msgstr "" diff --git a/po/ru.po b/po/ru.po index 8fb1cfb..ba22ef5 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-08-23 09:50+0200\n" +"POT-Creation-Date: 2012-08-26 14:20+0200\n" "PO-Revision-Date: 2012-07-17 14:16+0000\n" "Last-Translator: Ilya Volchanetskiy \n" "Language-Team: Russian\n" @@ -251,17 +251,21 @@ msgstr "об/мин" msgid "%" msgstr "%" -#: src/lib/slog.c:38 +#: src/lib/slog.c:59 +msgid "slog_get_default_path: no HOME variable" +msgstr "" + +#: src/lib/slog.c:69 #, fuzzy, c-format -msgid "Cannot open sensor log file: %s" +msgid "slog_init: cannot open sensor log file: %s" msgstr "Ошибка открытия файла журнала: %s" -#: src/lib/slog.c:43 +#: src/lib/slog.c:74 #, fuzzy msgid "slog_init: gettimeofday failed." msgstr "ошибка gettimeofday." -#: src/lib/slog.c:67 +#: src/lib/slog.c:101 #, fuzzy msgid "slog_write_sensors: gettimeofday failed." msgstr "ошибка gettimeofday." diff --git a/po/sl.po b/po/sl.po index a1e6df7..66406f5 100644 --- a/po/sl.po +++ b/po/sl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-08-23 09:50+0200\n" +"POT-Creation-Date: 2012-08-26 14:20+0200\n" "PO-Revision-Date: 2012-04-14 21:02+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Slovenian \n" @@ -250,16 +250,20 @@ msgstr "" msgid "%" msgstr "" -#: src/lib/slog.c:38 +#: src/lib/slog.c:59 +msgid "slog_get_default_path: no HOME variable" +msgstr "" + +#: src/lib/slog.c:69 #, c-format -msgid "Cannot open sensor log file: %s" +msgid "slog_init: cannot open sensor log file: %s" msgstr "" -#: src/lib/slog.c:43 +#: src/lib/slog.c:74 msgid "slog_init: gettimeofday failed." msgstr "" -#: src/lib/slog.c:67 +#: src/lib/slog.c:101 msgid "slog_write_sensors: gettimeofday failed." msgstr "" diff --git a/po/sr.po b/po/sr.po index 2273adb..70290dd 100644 --- a/po/sr.po +++ b/po/sr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-08-23 09:50+0200\n" +"POT-Creation-Date: 2012-08-26 14:20+0200\n" "PO-Revision-Date: 2012-05-03 02:31+0000\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian \n" @@ -251,16 +251,20 @@ msgstr "" msgid "%" msgstr "" -#: src/lib/slog.c:38 +#: src/lib/slog.c:59 +msgid "slog_get_default_path: no HOME variable" +msgstr "" + +#: src/lib/slog.c:69 #, c-format -msgid "Cannot open sensor log file: %s" +msgid "slog_init: cannot open sensor log file: %s" msgstr "" -#: src/lib/slog.c:43 +#: src/lib/slog.c:74 msgid "slog_init: gettimeofday failed." msgstr "" -#: src/lib/slog.c:67 +#: src/lib/slog.c:101 msgid "slog_write_sensors: gettimeofday failed." msgstr "" diff --git a/po/tr.po b/po/tr.po index 5eaeb1b..8a77a61 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-08-23 09:50+0200\n" +"POT-Creation-Date: 2012-08-26 14:20+0200\n" "PO-Revision-Date: 2012-04-28 11:24+0000\n" "Last-Translator: zeugma \n" "Language-Team: Turkish \n" @@ -250,16 +250,20 @@ msgstr "" msgid "%" msgstr "" -#: src/lib/slog.c:38 +#: src/lib/slog.c:59 +msgid "slog_get_default_path: no HOME variable" +msgstr "" + +#: src/lib/slog.c:69 #, c-format -msgid "Cannot open sensor log file: %s" +msgid "slog_init: cannot open sensor log file: %s" msgstr "" -#: src/lib/slog.c:43 +#: src/lib/slog.c:74 msgid "slog_init: gettimeofday failed." msgstr "" -#: src/lib/slog.c:67 +#: src/lib/slog.c:101 msgid "slog_write_sensors: gettimeofday failed." msgstr "" diff --git a/po/uk.po b/po/uk.po index 8199583..955f122 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-08-23 09:50+0200\n" +"POT-Creation-Date: 2012-08-26 14:20+0200\n" "PO-Revision-Date: 2012-05-13 18:15+0000\n" "Last-Translator: Ilya Volchanetskiy \n" "Language-Team: Ukrainian \n" @@ -250,17 +250,21 @@ msgstr "об/хв" msgid "%" msgstr "%" -#: src/lib/slog.c:38 +#: src/lib/slog.c:59 +msgid "slog_get_default_path: no HOME variable" +msgstr "" + +#: src/lib/slog.c:69 #, fuzzy, c-format -msgid "Cannot open sensor log file: %s" +msgid "slog_init: cannot open sensor log file: %s" msgstr "Не вдалося відкрити лог-файл: %s" -#: src/lib/slog.c:43 +#: src/lib/slog.c:74 #, fuzzy msgid "slog_init: gettimeofday failed." msgstr "помилка gettimeofday." -#: src/lib/slog.c:67 +#: src/lib/slog.c:101 #, fuzzy msgid "slog_write_sensors: gettimeofday failed." msgstr "помилка gettimeofday." diff --git a/po/zh_CN.po b/po/zh_CN.po index 0f163ea..395732f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-08-23 09:50+0200\n" +"POT-Creation-Date: 2012-08-26 14:20+0200\n" "PO-Revision-Date: 2012-08-10 09:26+0000\n" "Last-Translator: Wang Dianjin \n" "Language-Team: Chinese (simplified)\n" @@ -251,17 +251,21 @@ msgstr "转速" msgid "%" msgstr "%" -#: src/lib/slog.c:38 +#: src/lib/slog.c:59 +msgid "slog_get_default_path: no HOME variable" +msgstr "" + +#: src/lib/slog.c:69 #, fuzzy, c-format -msgid "Cannot open sensor log file: %s" +msgid "slog_init: cannot open sensor log file: %s" msgstr "无法打开日志文件：%s" -#: src/lib/slog.c:43 +#: src/lib/slog.c:74 #, fuzzy msgid "slog_init: gettimeofday failed." msgstr "获取时间失败。" -#: src/lib/slog.c:67 +#: src/lib/slog.c:101 #, fuzzy msgid "slog_write_sensors: gettimeofday failed." msgstr "获取时间失败。" diff --git a/src/cfg.c b/src/cfg.c index 5a6f8e8..820dd4d 100644 --- a/src/cfg.c +++ b/src/cfg.c @@ -21,9 +21,8 @@ #include #include -#include - #include "cfg.h" +#include "log.h" static const char *KEY_SENSORS = "/apps/psensor/sensors"; @@ -387,7 +386,7 @@ void config_set_appindicator_enabled(const char *sid, bool enabled) free(key); } -static bool is_slog_enabled() +bool is_slog_enabled() { return gconf_client_get_bool(client, KEY_SLOG_ENABLED, NULL); } @@ -397,6 +396,22 @@ static void set_slog_enabled(bool enabled) gconf_client_set_bool(client, KEY_SLOG_ENABLED, enabled, NULL); } + +void config_slog_enabled_notify_add(GConfClientNotifyFunc cbk, void *data) +{ + log_debug("config_slog_enabled_notify_add"); + gconf_client_add_dir(client, + KEY_SLOG_ENABLED, + GCONF_CLIENT_PRELOAD_NONE, + NULL); + gconf_client_notify_add(client, + KEY_SLOG_ENABLED, + cbk, + data, + NULL, + NULL); +} + static bool is_window_decoration_enabled() { return !gconf_client_get_bool(client, diff --git a/src/cfg.h b/src/cfg.h index 97fe357..d739b8c 100644 --- a/src/cfg.h +++ b/src/cfg.h @@ -19,6 +19,8 @@ #ifndef _PSENSOR_CONFIG_H_ #define _PSENSOR_CONFIG_H_ +#include + #include "bool.h" #include "color.h" @@ -106,4 +108,7 @@ void config_set_sensor_name(const char *, const char *); bool config_is_appindicator_enabled(const char *); void config_set_appindicator_enabled(const char *, bool); +void config_slog_enabled_notify_add(GConfClientNotifyFunc cbk, void *data); +bool is_slog_enabled(); + #endif diff --git a/src/lib/slog.c b/src/lib/slog.c index effd223..7e832ef 100644 --- a/src/lib/slog.c +++ b/src/lib/slog.c @@ -22,7 +22,11 @@ #include #include +#include +#include #include +#include + #include "bool.h" #include "config.h" @@ -33,17 +37,55 @@ static FILE *file; static struct timeval stv; static double *last_values; +static const char *DEFAULT_FILENAME = "sensors.log"; + +static char *get_default_path() +{ + char *home, *path, *dir; + + home = getenv("HOME"); + + if (home) { + dir = malloc(strlen(home)+1+strlen(".psensor")+1); + sprintf(dir, "%s/%s", home, ".psensor"); + mkdir(dir, 0777); + + path = malloc(strlen(dir)+1+strlen(DEFAULT_FILENAME)+1); + sprintf(path, "%s/%s", dir, DEFAULT_FILENAME); + + free(dir); + + return path; + } else { + log_warn(_("HOME variable not set.")); + return strdup(DEFAULT_FILENAME); + } +} + int slog_init(const char *path, struct psensor **sensors) { - file = fopen(path, "a"); + char *lpath; - if (!file) { - log_err(_("slog_init: cannot open sensor log file: %s"), path); + if (file) { + log_err(_("Sensor log file already open.")); return 0; } + lpath = path ? (char *)path : get_default_path(); + + file = fopen(lpath, "a"); + + if (!file) + log_err(_("Cannot open sensor log file: %s."), lpath); + + if (!path) + free((char *)lpath); + + if (!file) + return 0; + if (gettimeofday(&stv, NULL)) { - log_err(_("slog_init: gettimeofday failed.")); + log_err(_("gettimeofday failed.")); return 0; } @@ -66,11 +108,13 @@ void slog_write_sensors(struct psensor **sensors) struct timeval tv; bool first_call; - if (!file) + if (!file) { + log_err(_("Sensor log file not open.")); return ; + } if (gettimeofday(&tv, NULL)) { - log_err(_("slog_write_sensors: gettimeofday failed.")); + log_err(_("gettimeofday failed.")); return ; } @@ -107,5 +151,7 @@ void slog_close() file = NULL; free(last_values); last_values = NULL; + } else { + log_err(_("Sensor log not open, cannot close.")); } } diff --git a/src/main.c b/src/main.c index a5e7878..164f10a 100644 --- 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" @@ -165,6 +166,9 @@ static void update_measures(struct ui_psensor *ui) psensor_log_measures(sensors); + if (cfg->slog_enabled) + slog_write_sensors(sensors); + period = cfg->sensor_update_interval; g_mutex_unlock(ui->sensors_mutex); diff --git a/src/ui.c b/src/ui.c index d03da27..d310bb2 100644 --- a/src/ui.c +++ b/src/ui.c @@ -17,6 +17,7 @@ * 02110-1301 USA */ #include "cfg.h" +#include "slog.h" #include "ui.h" #include "ui_graph.h" #include "ui_pref.h" @@ -213,6 +214,23 @@ void ui_enable_alpha_channel(struct ui_psensor *ui) } +static void on_slog_enabled_cb(GConfClient *client, + guint cnxn_id, + GConfEntry *entry, + gpointer user_data) +{ + struct psensor **sensors; + + sensors = (struct psensor **)user_data; + + log_debug("cbk_slog_enabled"); + + if (is_slog_enabled()) + slog_init(NULL, sensors); + else + slog_close(NULL, sensors); +} + void ui_window_create(struct ui_psensor *ui) { GtkWidget *window, *menubar; @@ -228,6 +246,8 @@ void ui_window_create(struct ui_psensor *ui) cfg->window_x, cfg->window_y); + config_slog_enabled_notify_add(on_slog_enabled_cb, ui->sensors); + gtk_window_set_default_size(GTK_WINDOW(window), cfg->window_w, cfg->window_h); -- 2.7.4