X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=blobdiff_plain;f=src%2Fui_notify.c;h=719f50210cf7847946f7cc28a9a3d087db1df45d;hp=7e7217d820a5150d10a849e45197546ea68b59c9;hb=bd7036af56a4b61b2b473dccbeac5e26f78b57da;hpb=582a4101efc09e95899926f4415960733b72e18e diff --git a/src/ui_notify.c b/src/ui_notify.c index 7e7217d..719f502 100644 --- a/src/ui_notify.c +++ b/src/ui_notify.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2014 jeanfi@gmail.com + * Copyright (C) 2010-2016 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 @@ -40,7 +40,7 @@ void ui_notify(struct psensor *sensor, struct ui_psensor *ui) char *body, *svalue; const char *summary; NotifyNotification *notif; - unsigned int use_celcius; + unsigned int use_celsius; 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 - return ; + return; if (notify_is_initted() == FALSE) notify_init("psensor"); if (notify_is_initted() == TRUE) { - if (ui->config->temperature_unit == CELCIUS) - use_celcius = 1; + if (config_get_temperature_unit() == CELSIUS) + use_celsius = 1; else - use_celcius = 0; + use_celsius = 0; svalue = psensor_measure_to_str (psensor_get_current_measure(sensor), sensor->type, - use_celcius); + use_celsius); body = malloc(strlen(sensor->name) + 3 + strlen(svalue) + 1); sprintf(body, "%s : %s", sensor->name, svalue); @@ -75,8 +75,8 @@ void ui_notify(struct psensor *sensor, struct ui_psensor *ui) if (is_temp_type(sensor->type)) summary = _("Temperature alert"); - else if (is_fan_type(sensor->type)) - summary = _("Fan alert"); + else if (sensor->type & SENSOR_TYPE_RPM) + summary = _("Fan speed alert"); else summary = _("N/A");