avoid to store configuration in psensor struct

diff --git a/po/de.po b/po/de.po
index 298b385..7671046 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: 2014-09-25 17:58+0200\n"
+"POT-Creation-Date: 2014-09-25 20:31+0200\n"
 "PO-Revision-Date: 2014-09-20 11:25+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: German\n"
@@ -815,7 +815,7 @@ msgstr ""
 msgid "Select sensor color"
 msgstr "Wählen Sie eine Vordergrundfarbe"
 
-#: src/ui_appindicator.c:145
+#: src/ui_appindicator.c:148
 #, fuzzy, c-format
 msgid "Failed to load glade file %s: %s"
 msgstr "Aktivieren der Sensorenprotokollierung ist gescheitert."

diff --git a/po/es.po b/po/es.po
index 3709d01..c7ccf24 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 17:58+0200\n"
+"POT-Creation-Date: 2014-09-25 20:31+0200\n"
 "PO-Revision-Date: 2014-09-20 11:26+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -814,7 +814,7 @@ msgstr ""
 msgid "Select sensor color"
 msgstr "Seleccionar el color del primer plano"
 
-#: src/ui_appindicator.c:145
+#: src/ui_appindicator.c:148
 #, fuzzy, c-format
 msgid "Failed to load glade file %s: %s"
 msgstr "Error al activar el registro de sensores"

diff --git a/po/fr.po b/po/fr.po
index c1f3417..e501ad3 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: 2014-09-25 17:58+0200\n"
+"POT-Creation-Date: 2014-09-25 20:31+0200\n"
 "PO-Revision-Date: 2014-09-21 09:39+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: French <>\n"
@@ -821,7 +821,7 @@ msgstr ""
 msgid "Select sensor color"
 msgstr ""
 
-#: src/ui_appindicator.c:145
+#: src/ui_appindicator.c:148
 #, fuzzy, c-format
 msgid "Failed to load glade file %s: %s"
 msgstr "Échec du chargement de l’icône de Psensor."

diff --git a/po/hr.po b/po/hr.po
index a5ed169..f0d36c3 100644 (file)
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 17:58+0200\n"
+"POT-Creation-Date: 2014-09-25 20:31+0200\n"
 "PO-Revision-Date: 2014-09-21 06:25+0000\n"
 "Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -806,7 +806,7 @@ msgstr "Sakrij"
 msgid "Select sensor color"
 msgstr "Odaberi boju senzora"
 
-#: src/ui_appindicator.c:145
+#: src/ui_appindicator.c:148
 #, fuzzy, c-format
 msgid "Failed to load glade file %s: %s"
 msgstr "Neuspjelo učitavanje datoteke podešavanja %s: %s"

diff --git a/po/hu.po b/po/hu.po
index 7e3b700..3af3afe 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: 2014-09-25 17:58+0200\n"
+"POT-Creation-Date: 2014-09-25 20:31+0200\n"
 "PO-Revision-Date: 2014-09-20 11:26+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Hungarian <gnome-hu-list-request@gnome.org>\n"
@@ -811,7 +811,7 @@ msgstr ""
 msgid "Select sensor color"
 msgstr "Előtérszín kiválasztása"
 
-#: src/ui_appindicator.c:145
+#: src/ui_appindicator.c:148
 #, fuzzy, c-format
 msgid "Failed to load glade file %s: %s"
 msgstr "Nem sikerült a konfigurációs fájlt beolvasni: %s"

diff --git a/po/it.po b/po/it.po
index ee85589..c9304b8 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: 2014-09-25 17:58+0200\n"
+"POT-Creation-Date: 2014-09-25 20:31+0200\n"
 "PO-Revision-Date: 2014-09-20 11:24+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Italian\n"
@@ -812,7 +812,7 @@ msgstr ""
 msgid "Select sensor color"
 msgstr "Colore di primo piano:"
 
-#: src/ui_appindicator.c:145
+#: src/ui_appindicator.c:148
 #, fuzzy, c-format
 msgid "Failed to load glade file %s: %s"
 msgstr "Attivazione registro dei sensori fallita."

diff --git a/po/lv.po b/po/lv.po
index d48acff..ca66bf4 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: 2014-09-25 17:58+0200\n"
+"POT-Creation-Date: 2014-09-25 20:31+0200\n"
 "PO-Revision-Date: 2014-09-20 11:26+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
@@ -805,7 +805,7 @@ msgstr ""
 msgid "Select sensor color"
 msgstr "Izvēlieties priekšplāna krāsu"
 
-#: src/ui_appindicator.c:145
+#: src/ui_appindicator.c:148
 #, fuzzy, c-format
 msgid "Failed to load glade file %s: %s"
 msgstr "Neizdevās aktivizēt sensoru žurnalēšanu."

diff --git a/po/nl.po b/po/nl.po
index 63e7d42..71d358b 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 17:58+0200\n"
+"POT-Creation-Date: 2014-09-25 20:31+0200\n"
 "PO-Revision-Date: 2014-09-20 11:25+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -820,7 +820,7 @@ msgstr ""
 msgid "Select sensor color"
 msgstr "Kies voorgrondkleur"
 
-#: src/ui_appindicator.c:145
+#: src/ui_appindicator.c:148
 #, fuzzy, c-format
 msgid "Failed to load glade file %s: %s"
 msgstr "Kon logboeken bijhouden niet inschakelen voor sensoren."

diff --git a/po/psensor.pot b/po/psensor.pot
index 2bd0083..6c3a8cd 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: 2014-09-25 17:58+0200\n"
+"POT-Creation-Date: 2014-09-25 20:31+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"
@@ -771,7 +771,7 @@ msgstr ""
 msgid "Select sensor color"
 msgstr ""
 
-#: src/ui_appindicator.c:145
+#: src/ui_appindicator.c:148
 #, c-format
 msgid "Failed to load glade file %s: %s"
 msgstr ""

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 08fbc7e..a37f03e 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: 2014-09-25 17:58+0200\n"
+"POT-Creation-Date: 2014-09-25 20:31+0200\n"
 "PO-Revision-Date: 2014-09-11 21:22+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -790,7 +790,7 @@ msgstr ""
 msgid "Select sensor color"
 msgstr "Selecionar cor do primeiro plano"
 
-#: src/ui_appindicator.c:145
+#: src/ui_appindicator.c:148
 #, fuzzy, c-format
 msgid "Failed to load glade file %s: %s"
 msgstr "Falhou ao criar servidor web."

diff --git a/po/ru.po b/po/ru.po
index 93d6083..abea4c8 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor 0.7.0.x\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 17:58+0200\n"
+"POT-Creation-Date: 2014-09-25 20:31+0200\n"
 "PO-Revision-Date: 2014-09-11 21:23+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Russian\n"
@@ -804,7 +804,7 @@ msgstr ""
 msgid "Select sensor color"
 msgstr "Выберите цвет переднего плана"
 
-#: src/ui_appindicator.c:145
+#: src/ui_appindicator.c:148
 #, fuzzy, c-format
 msgid "Failed to load glade file %s: %s"
 msgstr "Не удалось включить журналирование датчиков."

diff --git a/po/sl.po b/po/sl.po
index 792b394..399e7a0 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: 2014-09-25 17:58+0200\n"
+"POT-Creation-Date: 2014-09-25 20:31+0200\n"
 "PO-Revision-Date: 2014-09-11 21:22+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -775,7 +775,7 @@ msgstr ""
 msgid "Select sensor color"
 msgstr ""
 
-#: src/ui_appindicator.c:145
+#: src/ui_appindicator.c:148
 #, c-format
 msgid "Failed to load glade file %s: %s"
 msgstr ""

diff --git a/po/sr.po b/po/sr.po
index fe3f594..186fc1c 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: 2014-09-25 17:58+0200\n"
+"POT-Creation-Date: 2014-09-25 20:31+0200\n"
 "PO-Revision-Date: 2014-09-11 21:25+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
@@ -776,7 +776,7 @@ msgstr ""
 msgid "Select sensor color"
 msgstr "Одаберите боју текста"
 
-#: src/ui_appindicator.c:145
+#: src/ui_appindicator.c:148
 #, c-format
 msgid "Failed to load glade file %s: %s"
 msgstr ""

diff --git a/po/sv.po b/po/sv.po
index f9e2ea0..af1aa8b 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor 1.0.0.0\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 17:58+0200\n"
+"POT-Creation-Date: 2014-09-25 20:31+0200\n"
 "PO-Revision-Date: 2014-09-20 11:26+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Swedish\n"
@@ -811,7 +811,7 @@ msgstr ""
 msgid "Select sensor color"
 msgstr "Välj förgrundsfärg"
 
-#: src/ui_appindicator.c:145
+#: src/ui_appindicator.c:148
 #, fuzzy, c-format
 msgid "Failed to load glade file %s: %s"
 msgstr "Misslyckades med att tolka konfigurationsfilen: %s"

diff --git a/po/tr.po b/po/tr.po
index 3c6091b..6c964fe 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: 2014-09-25 17:58+0200\n"
+"POT-Creation-Date: 2014-09-25 20:31+0200\n"
 "PO-Revision-Date: 2014-09-20 11:27+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -814,7 +814,7 @@ msgstr ""
 msgid "Select sensor color"
 msgstr "Önplan rengini seçin"
 
-#: src/ui_appindicator.c:145
+#: src/ui_appindicator.c:148
 #, fuzzy, c-format
 msgid "Failed to load glade file %s: %s"
 msgstr "Algılayıcıların günlük kaydı etkinleştirilemedi."

diff --git a/po/uk.po b/po/uk.po
index bc0e42c..63b8124 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: 2014-09-25 17:58+0200\n"
+"POT-Creation-Date: 2014-09-25 20:31+0200\n"
 "PO-Revision-Date: 2014-09-11 21:23+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -796,7 +796,7 @@ msgstr ""
 msgid "Select sensor color"
 msgstr "Оберіть колір переднього плану"
 
-#: src/ui_appindicator.c:145
+#: src/ui_appindicator.c:148
 #, fuzzy, c-format
 msgid "Failed to load glade file %s: %s"
 msgstr "Не вдалося створити веб-сервер."

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 956329f..ceb1c1c 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: 2014-09-25 17:58+0200\n"
+"POT-Creation-Date: 2014-09-25 20:31+0200\n"
 "PO-Revision-Date: 2014-09-11 21:24+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -803,7 +803,7 @@ msgstr ""
 msgid "Select sensor color"
 msgstr "选择前景色"
 
-#: src/ui_appindicator.c:145
+#: src/ui_appindicator.c:148
 #, fuzzy, c-format
 msgid "Failed to load glade file %s: %s"
 msgstr "无法激活监测器日志。"

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index 0e0479b..c8dc6a9 100644 (file)
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -63,7 +63,6 @@ struct psensor *psensor_create(char *id,
        psensor->color = NULL;
 
        psensor->graph_enabled = 1;
-       psensor->appindicator_enabled = 0;
 
        psensor->provider_data = NULL;
        psensor->provider_data_free_fct = &free;

diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index 57aac1b..a04c0ac 100644 (file)
--- a/src/lib/psensor.h
+++ b/src/lib/psensor.h
@@ -114,8 +114,6 @@ struct psensor {
        void (*provider_data_free_fct)(void *);
 
        char *url;
-
-       bool appindicator_enabled;
 };
 
 struct psensor *psensor_create(char *id,

diff --git a/src/main.c b/src/main.c
index 175568e..f817c14 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -342,8 +342,6 @@ static void associate_preferences(struct psensor **sensors)
                        s->name = n;
                }
 
-               s->appindicator_enabled = config_is_appindicator_enabled(s->id);
-
                sensor_cur++;
        }
 }

diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index ff93a02..9dce476 100644 (file)
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -42,7 +42,7 @@ struct sensor_pref {
        int alarm_enabled;
        int alarm_high_threshold;
        int alarm_low_threshold;
-       unsigned int appindicator_enabled;
+       bool appindicator_enabled;
        unsigned int appindicator_label_enabled;
        unsigned int display_enabled;
 };
@@ -76,7 +76,7 @@ sensor_pref_new(struct psensor *s, struct config *cfg)
                        = celsius_to_fahrenheit(s->alarm_low_threshold);
        }
 
-       p->appindicator_enabled = s->appindicator_enabled;
+       p->appindicator_enabled = config_is_appindicator_enabled(s->id);
        p->appindicator_label_enabled
                = config_is_appindicator_label_enabled(s->id);
 
@@ -395,10 +395,7 @@ static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg)
                  p->color->blue);
        config_set_sensor_color(s->id, s->color);
 
-       if (s->appindicator_enabled != p->appindicator_enabled) {
-               s->appindicator_enabled = p->appindicator_enabled;
-               config_set_appindicator_enabled(s->id, s->appindicator_enabled);
-       }
+       config_set_appindicator_enabled(s->id, p->appindicator_enabled);
 
        config_set_appindicator_label_enabled(s->id,
                                              p->appindicator_label_enabled);