projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added german translation of right (Max)
[psensor.git]
/
src
/
ui_notify.c
diff --git
a/src/ui_notify.c
b/src/ui_notify.c
index
8993a18
..
719f502
100644
(file)
--- a/
src/ui_notify.c
+++ b/
src/ui_notify.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2010-201
2
jeanfi@gmail.com
+ * Copyright (C) 2010-201
6
jeanfi@gmail.com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@
-40,7
+40,7
@@
void ui_notify(struct psensor *sensor, struct ui_psensor *ui)
char *body, *svalue;
const char *summary;
NotifyNotification *notif;
char *body, *svalue;
const char *summary;
NotifyNotification *notif;
- unsigned int use_cel
c
ius;
+ unsigned int use_cel
s
ius;
log_debug("last_notification %d", last_notification_tv.tv_sec);
log_debug("last_notification %d", last_notification_tv.tv_sec);
@@
-53,21
+53,21
@@
void ui_notify(struct psensor *sensor, struct ui_psensor *ui)
|| t.tv_sec - last_notification_tv.tv_sec >= 60)
last_notification_tv = t;
else
|| t.tv_sec - last_notification_tv.tv_sec >= 60)
last_notification_tv = t;
else
- return
;
+ return;
if (notify_is_initted() == FALSE)
notify_init("psensor");
if (notify_is_initted() == TRUE) {
if (notify_is_initted() == FALSE)
notify_init("psensor");
if (notify_is_initted() == TRUE) {
- if (
ui->config->temperature_unit == CELC
IUS)
- use_cel
c
ius = 1;
+ if (
config_get_temperature_unit() == CELS
IUS)
+ use_cel
s
ius = 1;
else
else
- use_cel
c
ius = 0;
+ use_cel
s
ius = 0;
svalue = psensor_measure_to_str
(psensor_get_current_measure(sensor),
sensor->type,
svalue = psensor_measure_to_str
(psensor_get_current_measure(sensor),
sensor->type,
- use_cel
c
ius);
+ use_cel
s
ius);
body = malloc(strlen(sensor->name) + 3 + strlen(svalue) + 1);
sprintf(body, "%s : %s", sensor->name, svalue);
body = malloc(strlen(sensor->name) + 3 + strlen(svalue) + 1);
sprintf(body, "%s : %s", sensor->name, svalue);
@@
-75,6
+75,8
@@
void ui_notify(struct psensor *sensor, struct ui_psensor *ui)
if (is_temp_type(sensor->type))
summary = _("Temperature alert");
if (is_temp_type(sensor->type))
summary = _("Temperature alert");
+ else if (sensor->type & SENSOR_TYPE_RPM)
+ summary = _("Fan speed alert");
else
summary = _("N/A");
else
summary = _("N/A");