projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated copyright end date to 2016
[psensor.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
484addd
..
5686f5b
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2010-201
4
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
@@
-185,27
+185,20
@@
static gboolean ui_refresh_thread(gpointer data)
struct config *cfg;
gboolean ret;
struct ui_psensor *ui = (struct ui_psensor *)data;
struct config *cfg;
gboolean ret;
struct ui_psensor *ui = (struct ui_psensor *)data;
- int use_celsius;
ret = TRUE;
cfg = ui->config;
pmutex_lock(&ui->sensors_mutex);
ret = TRUE;
cfg = ui->config;
pmutex_lock(&ui->sensors_mutex);
- graph_update(ui->sensors, ui
->w_graph
, ui->config, ui->main_window);
+ graph_update(ui->sensors, ui
_get_graph()
, ui->config, ui->main_window);
ui_sensorlist_update(ui, 0);
if (is_appindicator_supported() || is_status_supported())
indicators_update(ui);
ui_sensorlist_update(ui, 0);
if (is_appindicator_supported() || is_status_supported())
indicators_update(ui);
- if (config_get_temperature_unit() == CELSIUS)
- use_celsius = 1;
- else
- use_celsius = 0;
- ui_unity_launcher_entry_update(ui->sensors,
- !cfg->unity_launcher_count_disabled,
- use_celsius);
+ ui_unity_launcher_entry_update(ui->sensors);
if (ui->graph_update_interval != cfg->graph_update_interval) {
ui->graph_update_interval = cfg->graph_update_interval;
if (ui->graph_update_interval != cfg->graph_update_interval) {
ui->graph_update_interval = cfg->graph_update_interval;
@@
-234,7
+227,7
@@
associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
{
bool ret;
struct psensor *s;
{
bool ret;
struct psensor *s;
- double
d,
high_temp;
+ double high_temp;
high_temp = config_get_default_high_threshold_temperature();
high_temp = config_get_default_high_threshold_temperature();
@@
-538,6
+531,7
@@
int main(int argc, char **argv)
g_timeout_add(1000 * ui.graph_update_interval, ui_refresh_thread, &ui);
ui_appindicator_init(&ui);
g_timeout_add(1000 * ui.graph_update_interval, ui_refresh_thread, &ui);
ui_appindicator_init(&ui);
+ ui_unity_init();
gdk_notify_startup_complete();
gdk_notify_startup_complete();