renamed enabled => graph_enabled

diff --git a/po/Makefile.in b/po/Makefile.in
index 92bf0ff..3ac1459 100644 (file)
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -21,7 +21,7 @@ srcdir = .
 top_srcdir = ..
 
 
-prefix = /usr/local
+prefix = /usr
 exec_prefix = ${prefix}
 datarootdir = ${prefix}/share
 datadir = ${datarootdir}

diff --git a/po/de.po b/po/de.po
index 90a44b1..e456d27 100644 (file)
--- 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: 2013-05-09 11:19+0200\n"
+"POT-Creation-Date: 2013-05-11 12:05+0200\n"
 "PO-Revision-Date: 2013-03-30 13:52+0000\n"
 "Last-Translator: Dennis Baudys <Unknown>\n"
 "Language-Team: German\n"
@@ -26,7 +26,7 @@ msgstr "Info"
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: src/glade/psensor.glade:13
+#: src/glade/psensor.glade:13 src/ui_appindicator.c:130
 msgid "Quit"
 msgstr "Beenden"
 
@@ -626,7 +626,11 @@ msgstr "Sensoreinstellungen"
 msgid "_About"
 msgstr "_Info"
 
-#: src/ui_appindicator.c:217
+#: src/ui_appindicator.c:129
+msgid "_Quit"
+msgstr "_Beenden"
+
+#: src/ui_appindicator.c:220
 #, c-format
 msgid "building menus failed: %s"
 msgstr "Erstellen der Menüs ist gescheitert: %s"
@@ -646,9 +650,6 @@ msgstr "Unbekannt"
 #~ msgid "Sensor Name"
 #~ msgstr "Sensor-Name"
 
-#~ msgid "_Quit"
-#~ msgstr "_Beenden"
-
 #~ msgid "Enabled"
 #~ msgstr "Aktiviert"
 

diff --git a/po/fr.po b/po/fr.po
index 5a6c1fe..e78e61b 100644 (file)
--- 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: 2013-05-09 11:19+0200\n"
+"POT-Creation-Date: 2013-05-11 12:05+0200\n"
 "PO-Revision-Date: 2013-03-02 03:05+0000\n"
 "Last-Translator: Hélion du Mas des Bourboux <helion331990@gmail.com>\n"
 "Language-Team: French <>\n"
@@ -26,7 +26,7 @@ msgstr "À propos"
 msgid "Preferences"
 msgstr "Préférences"
 
-#: src/glade/psensor.glade:13
+#: src/glade/psensor.glade:13 src/ui_appindicator.c:130
 msgid "Quit"
 msgstr "Quitter"
 
@@ -630,7 +630,11 @@ msgstr "Configuration des capteurs"
 msgid "_About"
 msgstr "À _propos"
 
-#: src/ui_appindicator.c:217
+#: src/ui_appindicator.c:129
+msgid "_Quit"
+msgstr "_Quitter"
+
+#: src/ui_appindicator.c:220
 #, c-format
 msgid "building menus failed: %s"
 msgstr "La construction des menus a échouée: %s"
@@ -650,9 +654,6 @@ msgstr "Inconnu"
 #~ msgid "Sensor Name"
 #~ msgstr "Nom de la Sonde"
 
-#~ msgid "_Quit"
-#~ msgstr "_Quitter"
-
 #~ msgid "Enabled"
 #~ msgstr "Activé"
 

diff --git a/po/hu.po b/po/hu.po
index 9f94fd2..081a0b0 100644 (file)
--- 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: 2013-05-09 11:19+0200\n"
+"POT-Creation-Date: 2013-05-11 12:05+0200\n"
 "PO-Revision-Date: 2012-10-29 09:41+0000\n"
 "Last-Translator: Bence Lukács <Unknown>\n"
 "Language-Team: Hungarian <gnome-hu-list-request@gnome.org>\n"
@@ -27,7 +27,7 @@ msgstr "Névjegy"
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: src/glade/psensor.glade:13
+#: src/glade/psensor.glade:13 src/ui_appindicator.c:130
 msgid "Quit"
 msgstr "Kilépés"
 
@@ -621,7 +621,11 @@ msgstr "Érzékelőbeállítások"
 msgid "_About"
 msgstr "_Névjegy"
 
-#: src/ui_appindicator.c:217
+#: src/ui_appindicator.c:129
+msgid "_Quit"
+msgstr "_Kilépés"
+
+#: src/ui_appindicator.c:220
 #, c-format
 msgid "building menus failed: %s"
 msgstr "menük építése meghiúsult: %s"
@@ -641,9 +645,6 @@ msgstr "Ismeretlen"
 #~ msgid "Sensor Name"
 #~ msgstr "Érzékelő neve"
 
-#~ msgid "_Quit"
-#~ msgstr "_Kilépés"
-
 #~ msgid "Enabled"
 #~ msgstr "Engedélyezés"
 

diff --git a/po/it.po b/po/it.po
index 9d7f2ba..238ef54 100644 (file)
--- 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: 2013-05-09 11:19+0200\n"
+"POT-Creation-Date: 2013-05-11 12:05+0200\n"
 "PO-Revision-Date: 2013-04-14 16:06+0000\n"
 "Last-Translator: Diego Pierotto <Unknown>\n"
 "Language-Team: Italian\n"
@@ -26,7 +26,7 @@ msgstr "Informazioni su..."
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: src/glade/psensor.glade:13
+#: src/glade/psensor.glade:13 src/ui_appindicator.c:130
 msgid "Quit"
 msgstr "Esci"
 
@@ -625,7 +625,11 @@ msgstr "SensorPreferenze"
 msgid "_About"
 msgstr "_Informazioni"
 
-#: src/ui_appindicator.c:217
+#: src/ui_appindicator.c:129
+msgid "_Quit"
+msgstr "_Esci"
+
+#: src/ui_appindicator.c:220
 #, c-format
 msgid "building menus failed: %s"
 msgstr "costruzione dei menù fallita: %s"
@@ -645,9 +649,6 @@ msgstr "Sconosciuto"
 #~ msgid "Sensor Name"
 #~ msgstr "Nome sensore"
 
-#~ msgid "_Quit"
-#~ msgstr "_Esci"
-
 #~ msgid "Enabled"
 #~ msgstr "Abilitato"
 

diff --git a/po/lv.po b/po/lv.po
index 51bf0d4..13ac366 100644 (file)
--- 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: 2013-05-09 11:19+0200\n"
+"POT-Creation-Date: 2013-05-11 12:05+0200\n"
 "PO-Revision-Date: 2012-11-11 10:38+0000\n"
 "Last-Translator: tuxmaniack <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
@@ -26,7 +26,7 @@ msgstr "Par"
 msgid "Preferences"
 msgstr "Iestatījumi"
 
-#: src/glade/psensor.glade:13
+#: src/glade/psensor.glade:13 src/ui_appindicator.c:130
 msgid "Quit"
 msgstr "Iziet"
 
@@ -606,7 +606,11 @@ msgstr "SensoraIestatījumi"
 msgid "_About"
 msgstr "P_ar"
 
-#: src/ui_appindicator.c:217
+#: src/ui_appindicator.c:129
+msgid "_Quit"
+msgstr "_Iziet"
+
+#: src/ui_appindicator.c:220
 #, c-format
 msgid "building menus failed: %s"
 msgstr "neizdevās izveidot izvēlnes: %s"
@@ -626,9 +630,6 @@ msgstr "Nezināms"
 #~ msgid "Sensor Name"
 #~ msgstr "Sensora nosaukums"
 
-#~ msgid "_Quit"
-#~ msgstr "_Iziet"
-
 #~ msgid "Enabled"
 #~ msgstr "Aktivizēts"
 

diff --git a/po/psensor.pot b/po/psensor.pot
index bdf852f..89376f2 100644 (file)
--- 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: 2013-05-09 11:19+0200\n"
+"POT-Creation-Date: 2013-05-11 12:05+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"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "Preferences"
 msgstr ""
 
-#: src/glade/psensor.glade:13
+#: src/glade/psensor.glade:13 src/ui_appindicator.c:130
 msgid "Quit"
 msgstr ""
 
@@ -585,7 +585,11 @@ msgstr ""
 msgid "_About"
 msgstr ""
 
-#: src/ui_appindicator.c:217
+#: src/ui_appindicator.c:129
+msgid "_Quit"
+msgstr ""
+
+#: src/ui_appindicator.c:220
 #, c-format
 msgid "building menus failed: %s"
 msgstr ""

diff --git a/po/pt_BR.po b/po/pt_BR.po
index cb05915..6205d20 100644 (file)
--- 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: 2013-05-09 11:19+0200\n"
+"POT-Creation-Date: 2013-05-11 12:05+0200\n"
 "PO-Revision-Date: 2013-03-12 16:07+0000\n"
 "Last-Translator: MestreLion <launchpad@rodrigosilva.com>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -26,7 +26,7 @@ msgstr "Sobre"
 msgid "Preferences"
 msgstr "Preferências"
 
-#: src/glade/psensor.glade:13
+#: src/glade/psensor.glade:13 src/ui_appindicator.c:130
 msgid "Quit"
 msgstr "Sair"
 
@@ -604,7 +604,11 @@ msgstr ""
 msgid "_About"
 msgstr "Sobre"
 
-#: src/ui_appindicator.c:217
+#: src/ui_appindicator.c:129
+msgid "_Quit"
+msgstr "Sair"
+
+#: src/ui_appindicator.c:220
 #, c-format
 msgid "building menus failed: %s"
 msgstr "falha na montagem dos menus: %s"
@@ -624,9 +628,6 @@ msgstr "Desconhecido"
 #~ msgid "Sensor Name"
 #~ msgstr "Nome do sensor"
 
-#~ msgid "_Quit"
-#~ msgstr "Sair"
-
 #~ msgid "Enabled"
 #~ msgstr "Habilitado"
 

diff --git a/po/ru.po b/po/ru.po
index 910dfed..85dd80f 100644 (file)
--- 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: 2013-05-09 11:19+0200\n"
+"POT-Creation-Date: 2013-05-11 12:05+0200\n"
 "PO-Revision-Date: 2012-12-25 06:05+0000\n"
 "Last-Translator: Ilya Volchanetskiy <Unknown>\n"
 "Language-Team: Russian\n"
@@ -26,7 +26,7 @@ msgstr "О программе"
 msgid "Preferences"
 msgstr "Параметры"
 
-#: src/glade/psensor.glade:13
+#: src/glade/psensor.glade:13 src/ui_appindicator.c:130
 msgid "Quit"
 msgstr "Выход"
 
@@ -604,7 +604,11 @@ msgstr ""
 msgid "_About"
 msgstr "_О программе"
 
-#: src/ui_appindicator.c:217
+#: src/ui_appindicator.c:129
+msgid "_Quit"
+msgstr "_Выход"
+
+#: src/ui_appindicator.c:220
 #, c-format
 msgid "building menus failed: %s"
 msgstr "не удалось создать меню: %s"
@@ -624,9 +628,6 @@ msgstr ""
 #~ msgid "Sensor Name"
 #~ msgstr "Название датчика"
 
-#~ msgid "_Quit"
-#~ msgstr "_Выход"
-
 #~ msgid "Enabled"
 #~ msgstr "Включён"
 

diff --git a/po/sl.po b/po/sl.po
index 97c9886..063bdaf 100644 (file)
--- 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: 2013-05-09 11:19+0200\n"
+"POT-Creation-Date: 2013-05-11 12:05+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"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Preferences"
 msgstr ""
 
-#: src/glade/psensor.glade:13
+#: src/glade/psensor.glade:13 src/ui_appindicator.c:130
 msgid "Quit"
 msgstr ""
 
@@ -586,7 +586,11 @@ msgstr ""
 msgid "_About"
 msgstr ""
 
-#: src/ui_appindicator.c:217
+#: src/ui_appindicator.c:129
+msgid "_Quit"
+msgstr ""
+
+#: src/ui_appindicator.c:220
 #, c-format
 msgid "building menus failed: %s"
 msgstr ""

diff --git a/po/sr.po b/po/sr.po
index 8749ed8..4153e67 100644 (file)
--- 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: 2013-05-09 11:19+0200\n"
+"POT-Creation-Date: 2013-05-11 12:05+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"
@@ -26,7 +26,7 @@ msgstr "О програму"
 msgid "Preferences"
 msgstr "Поставке"
 
-#: src/glade/psensor.glade:13
+#: src/glade/psensor.glade:13 src/ui_appindicator.c:130
 msgid "Quit"
 msgstr "Изађи"
 
@@ -586,7 +586,11 @@ msgstr ""
 msgid "_About"
 msgstr "О _програму"
 
-#: src/ui_appindicator.c:217
+#: src/ui_appindicator.c:129
+msgid "_Quit"
+msgstr "_Изађи"
+
+#: src/ui_appindicator.c:220
 #, c-format
 msgid "building menus failed: %s"
 msgstr ""
@@ -606,9 +610,6 @@ msgstr ""
 #~ msgid "Sensor Name"
 #~ msgstr "Назив сензора"
 
-#~ msgid "_Quit"
-#~ msgstr "_Изађи"
-
 #~ msgid "Enabled"
 #~ msgstr "Укључено"
 

diff --git a/po/tr.po b/po/tr.po
index a6aa707..348a865 100644 (file)
--- 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: 2013-05-09 11:19+0200\n"
+"POT-Creation-Date: 2013-05-11 12:05+0200\n"
 "PO-Revision-Date: 2012-04-28 11:24+0000\n"
 "Last-Translator: zeugma <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: src/glade/psensor.glade:13
+#: src/glade/psensor.glade:13 src/ui_appindicator.c:130
 msgid "Quit"
 msgstr ""
 
@@ -586,7 +586,11 @@ msgstr "Tercihleri düzenle"
 msgid "_About"
 msgstr ""
 
-#: src/ui_appindicator.c:217
+#: src/ui_appindicator.c:129
+msgid "_Quit"
+msgstr ""
+
+#: src/ui_appindicator.c:220
 #, c-format
 msgid "building menus failed: %s"
 msgstr ""

diff --git a/po/uk.po b/po/uk.po
index 234fb7b..0f61225 100644 (file)
--- 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: 2013-05-09 11:19+0200\n"
+"POT-Creation-Date: 2013-05-11 12:05+0200\n"
 "PO-Revision-Date: 2012-10-13 16:24+0000\n"
 "Last-Translator: Ilya Volchanetskiy <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -26,7 +26,7 @@ msgstr "Про програму"
 msgid "Preferences"
 msgstr "Налаштування"
 
-#: src/glade/psensor.glade:13
+#: src/glade/psensor.glade:13 src/ui_appindicator.c:130
 msgid "Quit"
 msgstr "Вихід"
 
@@ -599,7 +599,11 @@ msgstr ""
 msgid "_About"
 msgstr "_Про програму"
 
-#: src/ui_appindicator.c:217
+#: src/ui_appindicator.c:129
+msgid "_Quit"
+msgstr "_Вихід"
+
+#: src/ui_appindicator.c:220
 #, c-format
 msgid "building menus failed: %s"
 msgstr "не вдалося створити меню: %s"
@@ -619,9 +623,6 @@ msgstr ""
 #~ msgid "Sensor Name"
 #~ msgstr "Назва датчика"
 
-#~ msgid "_Quit"
-#~ msgstr "_Вихід"
-
 #~ msgid "Enabled"
 #~ msgstr "Увімкнен"
 

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 36d850f..62d214f 100644 (file)
--- 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: 2013-05-09 11:19+0200\n"
+"POT-Creation-Date: 2013-05-11 12:05+0200\n"
 "PO-Revision-Date: 2013-01-15 12:24+0000\n"
 "Last-Translator: Wang Dianjin <Unknown>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -26,7 +26,7 @@ msgstr "关于"
 msgid "Preferences"
 msgstr "首选项"
 
-#: src/glade/psensor.glade:13
+#: src/glade/psensor.glade:13 src/ui_appindicator.c:130
 msgid "Quit"
 msgstr "退出"
 
@@ -608,7 +608,11 @@ msgstr "传感器首选项"
 msgid "_About"
 msgstr "关于(_A)"
 
-#: src/ui_appindicator.c:217
+#: src/ui_appindicator.c:129
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: src/ui_appindicator.c:220
 #, c-format
 msgid "building menus failed: %s"
 msgstr "创建菜单失败：%s"
@@ -628,9 +632,6 @@ msgstr "未知"
 #~ msgid "Sensor Name"
 #~ msgstr "传感器名称"
 
-#~ msgid "_Quit"
-#~ msgstr "退出(_Q)"
-
 #~ msgid "Enabled"
 #~ msgstr "激活"
 

diff --git a/src/graph.c b/src/graph.c
index a19bc48..71e8396 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -359,7 +359,7 @@ graph_update(struct psensor **sensors,
                while (*sensor_cur) {
                        struct psensor *s = *sensor_cur;
 
-                       if (s->enabled) {
+                       if (s->graph_enabled) {
                                no_graphs = 0;
                                if (is_fan_type(s->type)) {
                                        min = min_rpm;

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index ff9bc73..995ad45 100644 (file)
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -43,7 +43,6 @@ struct psensor *psensor_create(char *id,
        psensor->id = id;
        psensor->name = name;
        psensor->chip = chip;
-       psensor->enabled = 1;
        psensor->min = UNKNOWN_DBL_VALUE;
        psensor->max = UNKNOWN_DBL_VALUE;
 
@@ -64,6 +63,7 @@ struct psensor *psensor_create(char *id,
 
        psensor->color = NULL;
 
+       psensor->graph_enabled = 1;
        psensor->appindicator_enabled = 0;
 
        return psensor;
@@ -307,7 +307,7 @@ double get_min_value(struct psensor **sensors, int type)
        while (*s) {
                struct psensor *sensor = *s;
 
-               if (sensor->enabled && (sensor->type & type)) {
+               if (sensor->graph_enabled && (sensor->type & type)) {
                        int i;
                        double t;
 
@@ -339,7 +339,7 @@ double get_max_value(struct psensor **sensors, int type)
        while (*s) {
                struct psensor *sensor = *s;
 
-               if (sensor->enabled && (sensor->type & type)) {
+               if (sensor->graph_enabled && (sensor->type & type)) {
                        int i;
                        double t;
                        for (i = 0; i < sensor->values_max_length; i++) {
@@ -367,7 +367,7 @@ psensor_get_max_current_value(struct psensor **sensors, unsigned int type)
        while (*s_cur) {
                struct psensor *s = *s_cur;
 
-               if (s->enabled && (s->type & type)) {
+               if (s->graph_enabled && (s->type & type)) {
                        double v = psensor_get_current_value(s);
 
                        if (m == UNKNOWN_DBL_VALUE || v > m)

diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index 0390773..fafcf3b 100644 (file)
--- a/src/lib/psensor.h
+++ b/src/lib/psensor.h
@@ -84,7 +84,7 @@ struct psensor {
        struct color *color;
 
        /* Whether the graph sensor is displayed. */
-       bool enabled;
+       bool graph_enabled;
 
        /* see psensor_type */
        unsigned int type;

diff --git a/src/main.c b/src/main.c
index 627043c..0aafa15 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -307,7 +307,7 @@ static void associate_preferences(struct psensor **sensors)
                char *n;
                struct psensor *s = *sensor_cur;
 
-               s->enabled = config_is_sensor_enabled(s->id);
+               s->graph_enabled = config_is_sensor_enabled(s->id);
 
                n = config_get_sensor_name(s->id);
 

diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c
index f02730e..f21a82e 100644 (file)
--- a/src/ui_sensorlist.c
+++ b/src/ui_sensorlist.c
@@ -80,7 +80,7 @@ static void populate(struct ui_psensor *ui)
                gtk_list_store_set(store, &iter,
                                   COL_NAME, s->name,
                                   COL_COLOR_STR, scolor,
-                                  COL_ENABLED, s->enabled,
+                                  COL_ENABLED, s->graph_enabled,
                                   COL_SENSOR, s,
                                   -1);
                free(scolor);
@@ -275,11 +275,11 @@ toggled_cbk(GtkCellRendererToggle *cell, gchar *path_str, gpointer data)
 
        gtk_tree_model_get(model, &iter, COL_SENSOR, &s, -1);
 
-       s->enabled ^= 1;
-       config_set_sensor_enabled(s->id, s->enabled);
+       s->graph_enabled ^= 1;
+       config_set_sensor_enabled(s->id, s->graph_enabled);
 
        gtk_list_store_set(GTK_LIST_STORE(model), &iter,
-                          COL_ENABLED, s->enabled, -1);
+                          COL_ENABLED, s->graph_enabled, -1);
 
        gtk_tree_path_free(path);
 }

diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index 1b7ee16..ecf2655 100644 (file)
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -60,7 +60,7 @@ sensor_pref_new(struct psensor *s, struct config *cfg)
 
        p->sensor = s;
        p->name = strdup(s->name);
-       p->enabled = s->enabled;
+       p->enabled = s->graph_enabled;
        p->alarm_enabled = s->alarm_enabled;
        p->color = color_dup(s->color);
 
@@ -352,9 +352,9 @@ static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg)
                config_set_sensor_name(s->id, s->name);
        }
 
-       if (s->enabled != p->enabled) {
-               s->enabled = p->enabled;
-               config_set_sensor_enabled(s->id, s->enabled);
+       if (s->graph_enabled != p->enabled) {
+               s->graph_enabled = p->enabled;
+               config_set_sensor_enabled(s->id, s->graph_enabled);
        }
 
        if (is_temp_type(s->type) && cfg->temperature_unit == FAHRENHEIT) {