Fixed psensor does not start: Attempt to unlock mutex that was not locked during...

diff --git a/NEWS b/NEWS
index 5e2df56..995a86f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,9 +4,11 @@ Psensor NEWS
 v1.0.3
 ------
 
-* fixed bug: psensor not autostarted when $HOME/.config/autostart does
+* Fixed bug: psensor not autostarted when $HOME/.config/autostart does
   not exist.
-* fixed few swedish translations (Josef Andersson).
+* 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).
 
 v1.0.2
 ------

diff --git a/NEWS.html b/NEWS.html
index ccf68c4..5ab4633 100644 (file)
--- a/NEWS.html
+++ b/NEWS.html
@@ -381,6 +381,30 @@ 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
+</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 +2644,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 09:17:26 CEST\r
 </div>\r
 </div>\r
 </body>\r

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/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);