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 <d@winzen4.de>\n"
"Language-Team: German\n"
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 ""
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 <buik8roadmaster@hotmail.com>\n"
"Language-Team: Spanish <es@li.org>\n"
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."
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 <Unknown>\n"
"Language-Team: French <>\n"
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."
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 <ricsipontaz@gmail.com>\n"
"Language-Team: Hungarian <gnome-hu-list-request@gnome.org>\n"
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."
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 <andrea.bernini@gmail.com>\n"
"Language-Team: Italian\n"
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."
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 <Unknown>\n"
"Language-Team: Latvian <lv@li.org>\n"
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 ""
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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
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 ""
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 <Unknown>\n"
"Language-Team: Brazilian Portuguese\n"
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 ""
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 <Unknown>\n"
"Language-Team: Russian\n"
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."
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 <EMAIL@ADDRESS>\n"
"Language-Team: Slovenian <sl@li.org>\n"
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 ""
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: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
"Language-Team: Serbian <sr@li.org>\n"
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 ""
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 <Unknown>\n"
"Language-Team: Turkish <tr@li.org>\n"
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 ""
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 <Unknown>\n"
"Language-Team: Ukrainian <uk@li.org>\n"
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."
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 <Unknown>\n"
"Language-Team: Chinese (simplified)\n"
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 "获取时间失败。"
#include <string.h>
#include <ctype.h>
-#include <gconf/gconf-client.h>
-
#include "cfg.h"
+#include "log.h"
static const char *KEY_SENSORS = "/apps/psensor/sensors";
free(key);
}
-static bool is_slog_enabled()
+bool is_slog_enabled()
{
return gconf_client_get_bool(client, KEY_SLOG_ENABLED, NULL);
}
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,
#ifndef _PSENSOR_CONFIG_H_
#define _PSENSOR_CONFIG_H_
+#include <gconf/gconf-client.h>
+
#include "bool.h"
#include "color.h"
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
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
#include <sys/time.h>
+#include <sys/types.h>
+
#include "bool.h"
#include "config.h"
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;
}
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 ;
}
file = NULL;
free(last_values);
last_values = NULL;
+ } else {
+ log_err(_("Sensor log not open, cannot close."));
}
}
#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"
psensor_log_measures(sensors);
+ if (cfg->slog_enabled)
+ slog_write_sensors(sensors);
+
period = cfg->sensor_update_interval;
g_mutex_unlock(ui->sensors_mutex);
* 02110-1301 USA
*/
#include "cfg.h"
+#include "slog.h"
#include "ui.h"
#include "ui_graph.h"
#include "ui_pref.h"
}
+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;
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);