Imported Upstream version 1.0.3

diff --git a/NEWS b/NEWS
index ecda156..22cc6a9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,17 @@
 Psensor NEWS
 ============
 
+v1.0.3
+------
+
+* Fixed bug: psensor not autostarted when $HOME/.config/autostart does
+  not exist.
+* Fixed few swedish translations (Josef Andersson).
+* Fixed psensor does not start: Attempt to unlock mutex that was not
+  locked during startup with glib 2.41.2. (LP: #1346299).
+* Fixed FTBFS with clang instead of gcc. (Closes: #753061).
+* Fixed notification script call (wrong allocation of command string).
+
 v1.0.2
 ------
 

diff --git a/NEWS.html b/NEWS.html
index ccf68c4..2a935b6 100644 (file)
--- a/NEWS.html
+++ b/NEWS.html
@@ -381,6 +381,40 @@ asciidoc.install();
 </div>\r
 <div id="content">\r
 <div class="sect1">\r
+<h2 id="_v1_0_3">v1.0.3</h2>\r
+<div class="sectionbody">\r
+<div class="ulist"><ul>\r
+<li>\r
+<p>\r
+Fixed bug: psensor not autostarted when $HOME/.config/autostart does\r
+  not exist.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Fixed few swedish translations (Josef Andersson).\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Fixed psensor does not start: Attempt to unlock mutex that was not\r
+  locked during startup with glib 2.41.2. (LP: #1346299).\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Fixed FTBFS with clang instead of gcc. (Closes: #753061).\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Fixed notification script call (wrong allocation of command string).\r
+</p>\r
+</li>\r
+</ul></div>\r
+</div>\r
+</div>\r
+<div class="sect1">\r
 <h2 id="_v1_0_2">v1.0.2</h2>\r
 <div class="sectionbody">\r
 <div class="ulist"><ul>\r
@@ -2620,7 +2654,7 @@ Fixed BR1: crash when no temperature sensor is available
 <div id="footnotes"><hr /></div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2014-06-03 08:22:21 CEST\r
+Last updated 2014-08-04 23:22:47 CEST\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/configure b/configure
index fddfe7a..5042686 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for psensor 1.0.2.
+# Generated by GNU Autoconf 2.69 for psensor 1.0.3.
 #
 # Report bugs to <jeanfi@gmail.com>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='psensor'
 PACKAGE_TARNAME='psensor'
-PACKAGE_VERSION='1.0.2'
-PACKAGE_STRING='psensor 1.0.2'
+PACKAGE_VERSION='1.0.3'
+PACKAGE_STRING='psensor 1.0.3'
 PACKAGE_BUGREPORT='jeanfi@gmail.com'
 PACKAGE_URL='http://wpitchoune.net/psensor'
 
@@ -1402,7 +1402,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures psensor 1.0.2 to adapt to many kinds of systems.
+\`configure' configures psensor 1.0.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1476,7 +1476,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of psensor 1.0.2:";;
+     short | recursive ) echo "Configuration of psensor 1.0.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1625,7 +1625,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-psensor configure 1.0.2
+psensor configure 1.0.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2048,7 +2048,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by psensor $as_me 1.0.2, which was
+It was created by psensor $as_me 1.0.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2865,7 +2865,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='psensor'
- VERSION='1.0.2'
+ VERSION='1.0.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -9949,7 +9949,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by psensor $as_me 1.0.2, which was
+This file was extended by psensor $as_me 1.0.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10016,7 +10016,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-psensor config.status 1.0.2
+psensor config.status 1.0.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 0a2630a..c0cb22f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([psensor], [1.0.2],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
+AC_INIT([psensor], [1.0.3],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
 
 AM_INIT_AUTOMAKE([-Wall gnu])
 

diff --git a/doc/faq.html b/doc/faq.html
index 1ae0908..8d26d4f 100644 (file)
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -742,7 +742,7 @@ more general, but can be configured to display sensors
 <div id="footnotes"><hr /></div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2014-06-02 09:02:02 CEST\r
+Last updated 2014-08-04 09:16:55 CEST\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/po/sv.gmo b/po/sv.gmo
index 3dc465a..d4cc6ab 100644 (file)
Binary files a/po/sv.gmo and b/po/sv.gmo differ

diff --git a/po/sv.po b/po/sv.po
index 4cb8332..b518b16 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,15 +10,15 @@ msgstr ""
 "Project-Id-Version: psensor 1.0.0.0\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
 "POT-Creation-Date: 2014-06-01 00:22+0200\n"
-"PO-Revision-Date: 2014-06-01 13:09+0000\n"
+"PO-Revision-Date: 2014-06-03 15:21+0000\n"
 "Last-Translator: Josef Andersson <Unknown>\n"
 "Language-Team: Swedish\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-06-02 08:08+0000\n"
-"X-Generator: Launchpad (build 17031)\n"
+"X-Launchpad-Export-Date: 2014-06-14 08:04+0000\n"
+"X-Generator: Launchpad (build 17045)\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/glade/psensor.glade:6
@@ -102,7 +102,7 @@ msgstr "Fahrenheit"
 
 #: src/glade/psensor-pref.glade:254
 msgid "Temperature unit:"
-msgstr "Temperaturenheter:"
+msgstr "Temperaturenhet:"
 
 #: src/glade/psensor-pref.glade:272
 msgid "Position of sensors table:"
@@ -146,7 +146,7 @@ msgstr "<i>Min</i>"
 
 #: src/glade/psensor-pref.glade:504
 msgid "<i>Max</i>"
-msgstr "<i>Min</i>"
+msgstr "<i>Max</i>"
 
 #: src/glade/psensor-pref.glade:530
 msgid "Colors"
@@ -269,7 +269,7 @@ msgstr "Visa sensor i meny"
 
 #: src/glade/sensor-edit.glade:429
 msgid "Display sensor in the label (experimental)"
-msgstr "Visa sensor i etiketten (exprimentiell)"
+msgstr "Visa sensor i etiketten (experimentell)"
 
 #: src/glade/sensor-edit.glade:500
 msgid "-1"
@@ -312,7 +312,7 @@ msgstr "Disk"
 #: src/lib/hdd_atasmart.c:152
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
-msgstr "atasmart: sk_disk_open() fel: %s."
+msgstr "atasmart: sk_disk_open()-fel: %s."
 
 #: src/lib/hdd_hddtemp.c:59
 msgid "hddtemp: failed to open socket."
@@ -366,7 +366,7 @@ msgstr "Kan inte öppna loggfil: %s"
 msgid ""
 "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature."
 msgstr ""
-"Properitär NVIDIA-drivrutin ej använd, eller kan inte hämta NVIDIA GPU-"
+"Proprietär NVIDIA-drivrutin ej använd, eller kan inte hämta NVIDIA GPU-"
 "temperatur."
 
 #: src/lib/nvidia.c:95
@@ -424,7 +424,7 @@ msgstr ""
 #: src/main.c:88 src/server/server.c:94
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
-msgstr "Användning: %s [OPTION]...\n"
+msgstr "Användning: %s [FLAGGA]...\n"
 
 #: src/main.c:90
 msgid ""
@@ -459,8 +459,8 @@ msgid ""
 "  --use-libatasmart   use atasmart library for disk monitoring instead of\n"
 "                      hddtemp daemon"
 msgstr ""
-"  --use-libatasmart   använd atasmart library för diskövervakning istället "
-"för\n"
+"  --use-libatasmart   använd atasmart-biblioteket för diskövervakning "
+"istället för\n"
 "                      hddtemp-demon"
 
 #: src/main.c:107
@@ -488,7 +488,7 @@ msgstr "Psensor har inte kompilerats med fjärrsensorstöd."
 
 #: src/main.c:517
 msgid "Enables debug mode."
-msgstr "Aktivera felsökningsläge."
+msgstr "Aktiverar felsökningsläge."
 
 #: src/main.c:529 src/server/server.c:380
 #, c-format
@@ -557,7 +557,7 @@ msgstr "  -l, --log-file=PATH   ställ in loggfilen till PATH"
 
 #: src/server/server.c:112
 msgid "  --sensor-log-file=PATH set the sensor log file to PATH"
-msgstr "  --sensor-log-file=PATH ställ in loggintervall för sensor till PATH"
+msgstr "  --sensor-log-file=PATH ställ in loggfil för sensor till PATH"
 
 #: src/server/server.c:113
 msgid "  --sensor-log-interval=S set the sensor log interval to S (seconds)"
@@ -572,7 +572,7 @@ msgstr "HTTP-begäran: %s"
 #: src/server/server.c:360
 #, c-format
 msgid "Enables debug mode: %d"
-msgstr "Aktivera felsökningsläge: %d"
+msgstr "Aktiverar felsökningsläge: %d"
 
 #: src/server/server.c:402
 msgid "No sensors detected."

diff --git a/src/lib/pio.h b/src/lib/pio.h
index 26867f8..385ad33 100644 (file)
--- a/src/lib/pio.h
+++ b/src/lib/pio.h
@@ -20,7 +20,7 @@
 #ifndef _P_IO_H
 #define _P_IO_H
 
-#define P_IO_VER 3
+#define P_IO_VER 4
 
 /* Returns '1' if a given 'path' denotates a directory else returns
    0 */

diff --git a/src/main.c b/src/main.c
index 99d249e..9106b59 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -555,7 +555,16 @@ int main(int argc, char **argv)
        g_thread_init(NULL);
 #endif
 
+#ifdef HAVE_APPINDICATOR_029
+       /* gdk_thread_enter/leave only used to workaround mutex bug
+        * of appindicator < 0.2.9, so do not call gdk_threads_init
+        * if useless. Calling this function leads to
+        * crash "Attempt to unlock mutex that was not locked" with
+        * GLib 2.41.2 (new checking) probably due to bugs in GTK
+        * itself.
+        */
        gdk_threads_init();
+#endif
 
        gtk_init(NULL, NULL);
 

diff --git a/src/notify_cmd.c b/src/notify_cmd.c
index dfc1be1..793903a 100644 (file)
--- a/src/notify_cmd.c
+++ b/src/notify_cmd.c
@@ -38,6 +38,7 @@ void notify_cmd(struct psensor *s)
                             + 1
                             + strlen(s->id)
                             + 1
+                            + 1
                             + strlen(v)
                             + 1);
 

diff --git a/src/psensor.1 b/src/psensor.1
index 04a2eb6..83be6e9 100644 (file)
--- a/src/psensor.1
+++ b/src/psensor.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
-.TH PSENSOR "1" "June 2014" "psensor 1.0.2" "User Commands"
+.TH PSENSOR "1" "August 2014" "psensor 1.0.3" "User Commands"
 .SH NAME
 psensor \- Temperature monitoring application
 .SH SYNOPSIS

diff --git a/src/pxdg.c b/src/pxdg.c
index 7c3cffa..aa61e03 100644 (file)
--- a/src/pxdg.c
+++ b/src/pxdg.c
@@ -123,8 +123,8 @@ int pxdg_is_autostarted()
                                ret = is_user_desktop_autostarted(kfile);
                        else
                                ret = -1;
+                       g_key_file_free(kfile);
                }
-               g_key_file_free(kfile);
        }
 
        free(user_desktop);
@@ -160,7 +160,7 @@ static void enable_gnome_autostart(const char *path)
 
 void pxdg_set_autostart(unsigned int enable)
 {
-       char *user_desktop;
+       char *user_desktop, *dir;
 
        log_fct_enter();
 
@@ -171,8 +171,12 @@ void pxdg_set_autostart(unsigned int enable)
        log_fct("desktop file: %s", get_desktop_file());
 
        if (enable) {
-               if (!is_file_exists(user_desktop))
+               if (!is_file_exists(user_desktop)) {
+                       dir = get_user_autostart_dir();
+                       mkdirs(dir, 0700);
+                       free(dir);
                        file_copy(get_desktop_file(), user_desktop);
+               }
                enable_gnome_autostart(user_desktop);
        } else {
                /* because X-GNOME-Autostart-enabled does not turn off

diff --git a/src/server/psensor-server.1 b/src/server/psensor-server.1
index 8628bce..701d886 100644 (file)
--- a/src/server/psensor-server.1
+++ b/src/server/psensor-server.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
-.TH PSENSOR-SERVER "1" "June 2014" "psensor-server 1.0.2" "User Commands"
+.TH PSENSOR-SERVER "1" "August 2014" "psensor-server 1.0.3" "User Commands"
 .SH NAME
 psensor-server \- Temperature and system monitoring Web server
 .SH SYNOPSIS