temperature displayed in the unity launcher entry is the maximum current temperature...

diff --git a/po/Makefile.in b/po/Makefile.in
index 78af544..120519a 100644 (file)
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -21,7 +21,7 @@ srcdir = .
 top_srcdir = ..
 
 
 top_srcdir = ..
 
 

-prefix = /usr/local
+prefix = /home/jporsini/tmp

 exec_prefix = ${prefix}
 datarootdir = ${prefix}/share
 datadir = ${datarootdir}
 exec_prefix = ${prefix}
 datarootdir = ${prefix}/share
 datadir = ${datarootdir}

diff --git a/po/fr.po b/po/fr.po
index c4be412..306eb13 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor 0.6.0.9\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
 msgstr ""
 "Project-Id-Version: psensor 0.6.0.9\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"

-"POT-Creation-Date: 2011-04-25 13:46+0200\n"
+"POT-Creation-Date: 2011-05-03 09:31+0200\n"

 "PO-Revision-Date: 2011-02-07 21:18+0100\n"
 "Last-Translator: Jean-Philippe Orsini <jeanfi@gmail.com>\n"
 "Language-Team: Oriya\n"
 "PO-Revision-Date: 2011-02-07 21:18+0100\n"
 "Last-Translator: Jean-Philippe Orsini <jeanfi@gmail.com>\n"
 "Language-Team: Oriya\n"


@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 

-#: src/main.c:73 src/server/server.c:80
+#: src/main.c:72 src/server/server.c:80

 #, fuzzy, c-format
 msgid ""
 "Copyright (C) %s jeanfi@gmail.com\n"
 #, fuzzy, c-format
 msgid ""
 "Copyright (C) %s jeanfi@gmail.com\n"


@@ -33,12 +33,12 @@ msgstr ""
 "Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n"
 "autorisees par la loi applicable.\n"
 
 "Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n"
 "autorisees par la loi applicable.\n"
 

-#: src/main.c:83 src/server/server.c:90
+#: src/main.c:82 src/server/server.c:90

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilisation: %s [OPTION]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilisation: %s [OPTION]...\n"
 

-#: src/main.c:85
+#: src/main.c:84

 msgid ""
 "psensor is a GTK application for monitoring hardware sensors, including "
 "temperatures and fan speeds."
 msgid ""
 "psensor is a GTK application for monitoring hardware sensors, including "
 "temperatures and fan speeds."


@@ -46,11 +46,11 @@ msgstr ""
 "psensor est une application GTK pour surveiller les sondes matérielles "
 "thermiques et les ventilateurs."
 
 "psensor est une application GTK pour surveiller les sondes matérielles "
 "thermiques et les ventilateurs."
 

-#: src/main.c:89
+#: src/main.c:88

 msgid "Options:"
 msgstr "Options:"
 
 msgid "Options:"
 msgstr "Options:"
 

-#: src/main.c:90 src/server/server.c:97
+#: src/main.c:89 src/server/server.c:97

 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"


@@ -58,34 +58,34 @@ msgstr ""
 "  -h, --help          afficher cette aider et quitter\n"
 "  -v, --version       afficher les informations de version et quitter"
 
 "  -h, --help          afficher cette aider et quitter\n"
 "  -v, --version       afficher les informations de version et quitter"
 

-#: src/main.c:96
+#: src/main.c:95

 msgid ""
 "  -u, --url=URL       the URL of the psensor-server, example: http://"
 "hostname:3131"
 msgstr ""
 "  -u, --url=URL       l'URL de psensor-server, example: http://hostname:3131"
 
 msgid ""
 "  -u, --url=URL       the URL of the psensor-server, example: http://"
 "hostname:3131"
 msgstr ""
 "  -u, --url=URL       l'URL de psensor-server, example: http://hostname:3131"
 

-#: src/main.c:102 src/server/server.c:110
+#: src/main.c:101 src/server/server.c:110

 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr "Signaler les bugs à: %s\n"
 
 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr "Signaler les bugs à: %s\n"
 

-#: src/main.c:104 src/server/server.c:112
+#: src/main.c:103 src/server/server.c:112

 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s page d'acceuil: <%s>\n"
 
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s page d'acceuil: <%s>\n"
 

-#: src/main.c:328 src/server/server.c:376
+#: src/main.c:323 src/server/server.c:376

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Essayez `%s --help' pour plus d'informations.\n"
 
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Essayez `%s --help' pour plus d'informations.\n"
 

-#: src/main.c:351
+#: src/main.c:346

 #, fuzzy, c-format
 msgid "ERROR: lmsensor init failure: %s\n"
 msgstr "ERREUR: Echec de l'initialisation de 'lm-sensors'\n"
 
 #, fuzzy, c-format
 msgid "ERROR: lmsensor init failure: %s\n"
 msgstr "ERREUR: Echec de l'initialisation de 'lm-sensors'\n"
 

-#: src/main.c:362
+#: src/main.c:357

 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""
 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""

diff --git a/po/psensor.pot b/po/psensor.pot
index 94935cb..ea03cd1 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"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"

-"POT-Creation-Date: 2011-04-25 13:46+0200\n"
+"POT-Creation-Date: 2011-05-03 09: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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: src/main.c:73 src/server/server.c:80
+#: src/main.c:72 src/server/server.c:80

 #, c-format
 msgid ""
 "Copyright (C) %s jeanfi@gmail.com\n"
 #, c-format
 msgid ""
 "Copyright (C) %s jeanfi@gmail.com\n"


@@ -27,54 +27,54 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 

-#: src/main.c:83 src/server/server.c:90
+#: src/main.c:82 src/server/server.c:90

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 

-#: src/main.c:85
+#: src/main.c:84

 msgid ""
 "psensor is a GTK application for monitoring hardware sensors, including "
 "temperatures and fan speeds."
 msgstr ""
 
 msgid ""
 "psensor is a GTK application for monitoring hardware sensors, including "
 "temperatures and fan speeds."
 msgstr ""
 

-#: src/main.c:89
+#: src/main.c:88

 msgid "Options:"
 msgstr ""
 
 msgid "Options:"
 msgstr ""
 

-#: src/main.c:90 src/server/server.c:97
+#: src/main.c:89 src/server/server.c:97

 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"
 msgstr ""
 
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"
 msgstr ""
 

-#: src/main.c:96
+#: src/main.c:95

 msgid ""
 "  -u, --url=URL       the URL of the psensor-server, example: http://"
 "hostname:3131"
 msgstr ""
 
 msgid ""
 "  -u, --url=URL       the URL of the psensor-server, example: http://"
 "hostname:3131"
 msgstr ""
 

-#: src/main.c:102 src/server/server.c:110
+#: src/main.c:101 src/server/server.c:110

 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr ""
 

-#: src/main.c:104 src/server/server.c:112
+#: src/main.c:103 src/server/server.c:112

 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
 
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
 

-#: src/main.c:328 src/server/server.c:376
+#: src/main.c:323 src/server/server.c:376

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 

-#: src/main.c:351
+#: src/main.c:346

 #, c-format
 msgid "ERROR: lmsensor init failure: %s\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: lmsensor init failure: %s\n"
 msgstr ""
 

-#: src/main.c:362
+#: src/main.c:357

 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""
 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""

diff --git a/po/tr.po b/po/tr.po
index 3ac5385..ed6c35c 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"
 msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"

-"POT-Creation-Date: 2011-04-25 13:46+0200\n"
+"POT-Creation-Date: 2011-05-03 09:31+0200\n"

 "PO-Revision-Date: 2011-04-10 13:11+0000\n"
 "Last-Translator: zeugma <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "PO-Revision-Date: 2011-04-10 13:11+0000\n"
 "Last-Translator: zeugma <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"


@@ -18,7 +18,7 @@ msgstr ""
 "X-Launchpad-Export-Date: 2011-04-11 05:41+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 "X-Launchpad-Export-Date: 2011-04-11 05:41+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 

-#: src/main.c:73 src/server/server.c:80
+#: src/main.c:72 src/server/server.c:80

 #, c-format
 msgid ""
 "Copyright (C) %s jeanfi@gmail.com\n"
 #, c-format
 msgid ""
 "Copyright (C) %s jeanfi@gmail.com\n"


@@ -28,54 +28,54 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 

-#: src/main.c:83 src/server/server.c:90
+#: src/main.c:82 src/server/server.c:90

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kullanım: %s [SEÇENEK]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kullanım: %s [SEÇENEK]...\n"
 

-#: src/main.c:85
+#: src/main.c:84

 msgid ""
 "psensor is a GTK application for monitoring hardware sensors, including "
 "temperatures and fan speeds."
 msgstr ""
 
 msgid ""
 "psensor is a GTK application for monitoring hardware sensors, including "
 "temperatures and fan speeds."
 msgstr ""
 

-#: src/main.c:89
+#: src/main.c:88

 msgid "Options:"
 msgstr ""
 
 msgid "Options:"
 msgstr ""
 

-#: src/main.c:90 src/server/server.c:97
+#: src/main.c:89 src/server/server.c:97

 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"
 msgstr ""
 
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"
 msgstr ""
 

-#: src/main.c:96
+#: src/main.c:95

 msgid ""
 "  -u, --url=URL       the URL of the psensor-server, example: http://"
 "hostname:3131"
 msgstr ""
 
 msgid ""
 "  -u, --url=URL       the URL of the psensor-server, example: http://"
 "hostname:3131"
 msgstr ""
 

-#: src/main.c:102 src/server/server.c:110
+#: src/main.c:101 src/server/server.c:110

 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr "Hataları rapor et:%s\n"
 
 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr "Hataları rapor et:%s\n"
 

-#: src/main.c:104 src/server/server.c:112
+#: src/main.c:103 src/server/server.c:112

 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s ana sayfa: <%s>\n"
 
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s ana sayfa: <%s>\n"
 

-#: src/main.c:328 src/server/server.c:376
+#: src/main.c:323 src/server/server.c:376

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgi için `%s --help' yazın.\n"
 
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgi için `%s --help' yazın.\n"
 

-#: src/main.c:351
+#: src/main.c:346

 #, c-format
 msgid "ERROR: lmsensor init failure: %s\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: lmsensor init failure: %s\n"
 msgstr ""
 

-#: src/main.c:362
+#: src/main.c:357

 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""
 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 579a31b..e9e3d59 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor 0.6.0.10\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
 msgstr ""
 "Project-Id-Version: psensor 0.6.0.10\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"

-"POT-Creation-Date: 2011-04-25 13:46+0200\n"
+"POT-Creation-Date: 2011-05-03 09:31+0200\n"

 "PO-Revision-Date: 2011-02-07 22:21+0100\n"
 "Last-Translator: 大宝 <linux.dabao@gmail.com>\n"
 "Language-Team: Chinese (simplified)\n"
 "PO-Revision-Date: 2011-02-07 22:21+0100\n"
 "Last-Translator: 大宝 <linux.dabao@gmail.com>\n"
 "Language-Team: Chinese (simplified)\n"


@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: src/main.c:73 src/server/server.c:80
+#: src/main.c:72 src/server/server.c:80

 #, c-format
 msgid ""
 "Copyright (C) %s jeanfi@gmail.com\n"
 #, c-format
 msgid ""
 "Copyright (C) %s jeanfi@gmail.com\n"


@@ -26,54 +26,54 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 

-#: src/main.c:83 src/server/server.c:90
+#: src/main.c:82 src/server/server.c:90

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 

-#: src/main.c:85
+#: src/main.c:84

 msgid ""
 "psensor is a GTK application for monitoring hardware sensors, including "
 "temperatures and fan speeds."
 msgstr ""
 
 msgid ""
 "psensor is a GTK application for monitoring hardware sensors, including "
 "temperatures and fan speeds."
 msgstr ""
 

-#: src/main.c:89
+#: src/main.c:88

 msgid "Options:"
 msgstr ""
 
 msgid "Options:"
 msgstr ""
 

-#: src/main.c:90 src/server/server.c:97
+#: src/main.c:89 src/server/server.c:97

 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"
 msgstr ""
 
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"
 msgstr ""
 

-#: src/main.c:96
+#: src/main.c:95

 msgid ""
 "  -u, --url=URL       the URL of the psensor-server, example: http://"
 "hostname:3131"
 msgstr ""
 
 msgid ""
 "  -u, --url=URL       the URL of the psensor-server, example: http://"
 "hostname:3131"
 msgstr ""
 

-#: src/main.c:102 src/server/server.c:110
+#: src/main.c:101 src/server/server.c:110

 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr ""
 

-#: src/main.c:104 src/server/server.c:112
+#: src/main.c:103 src/server/server.c:112

 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
 
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
 

-#: src/main.c:328 src/server/server.c:376
+#: src/main.c:323 src/server/server.c:376

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 

-#: src/main.c:351
+#: src/main.c:346

 #, c-format
 msgid "ERROR: lmsensor init failure: %s\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: lmsensor init failure: %s\n"
 msgstr ""
 

-#: src/main.c:362
+#: src/main.c:357

 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""
 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index 8a71781..a385dda 100644 (file)
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -324,6 +324,28 @@ static double get_max_value(struct psensor **sensors, int type)
        return m;
 }
 
        return m;
 }
 

+double
+psensor_get_max_current_value(struct psensor **sensors, unsigned int type)
+{
+       double m = UNKNOWN_VALUE;
+       struct psensor **s_cur = sensors;
+
+       while (*s_cur) {
+               struct psensor *s = *s_cur;
+
+               if (s->enabled && (s->type & type)) {
+                       double v = psensor_get_current_value(s);
+
+                       if (m == UNKNOWN_VALUE || v > m)
+                               m = v;
+               }
+
+               s_cur++;
+       }
+
+       return m;
+}
+

 double get_min_temp(struct psensor **sensors)
 {
        return get_min_value(sensors, SENSOR_TYPE_TEMP);
 double get_min_temp(struct psensor **sensors)
 {
        return get_min_value(sensors, SENSOR_TYPE_TEMP);

diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index 3df12ae..321bfa1 100644 (file)
--- a/src/lib/psensor.h
+++ b/src/lib/psensor.h
@@ -125,6 +125,12 @@ double get_min_rpm(struct psensor **sensors);
 double get_max_rpm(struct psensor **sensors);
 
 /*
 double get_max_rpm(struct psensor **sensors);
 
 /*

+  Get the maximal current value of all sensors of a given type.
+*/
+double
+psensor_get_max_current_value(struct psensor **sensors, unsigned int type);
+
+/*

   Converts the value of a sensor to a string.
 
   parameter 'type' is SENSOR_TYPE_LMSENSOR_TEMP, SENSOR_TYPE_NVIDIA,
   Converts the value of a sensor to a string.
 
   parameter 'type' is SENSOR_TYPE_LMSENSOR_TEMP, SENSOR_TYPE_NVIDIA,

diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index acb3920..0dddc68 100644 (file)
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -41,7 +41,7 @@ static void cb_menu_quit(gpointer data, guint cb_action, GtkWidget *item)
        ui_psensor_quit(data);
 }
 
        ui_psensor_quit(data);
 }
 

-static void 
+static void

 cb_menu_preferences(gpointer data, guint cb_action, GtkWidget *item)
 {
 #ifdef HAVE_APPINDICATOR_029
 cb_menu_preferences(gpointer data, guint cb_action, GtkWidget *item)
 {
 #ifdef HAVE_APPINDICATOR_029

diff --git a/src/unity/ui_unity.c b/src/unity/ui_unity.c
index 57f61f8..0629db0 100644 (file)
--- a/src/unity/ui_unity.c
+++ b/src/unity/ui_unity.c
@@ -47,7 +47,7 @@ void ui_unity_launcher_entry_update(struct psensor **sensors,
        }
 
        if (sensors && *sensors) {
        }
 
        if (sensors && *sensors) {

-               double v = get_max_temp(sensors);
+               double v = psensor_get_max_current_value(sensors, SENSOR_TYPE_TEMP);

 
                unity_launcher_entry_set_count(psensor_entry, v);
        }
 
                unity_launcher_entry_set_count(psensor_entry, v);
        }