From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Mon, 4 Aug 2014 07:18:40 +0000 (+0200)
Subject: Fixed psensor does not start: Attempt to unlock mutex that was not locked during... 
X-Git-Tag: v1.0.3~3
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=2483bfff28a350561abaf9c6d4c8d190768ddd2e

Fixed psensor does not start: Attempt to unlock mutex that was not locked during startup with glib 2.41.2. (LP: #1346299).
---

diff --git a/NEWS b/NEWS
index 5e2df56..995a86f 100644
--- 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
--- a/NEWS.html
+++ b/NEWS.html
@@ -381,6 +381,30 @@ asciidoc.install();
 </div>
 <div id="content">
 <div class="sect1">
+<h2 id="_v1_0_3">v1.0.3</h2>
+<div class="sectionbody">
+<div class="ulist"><ul>
+<li>
+<p>
+Fixed bug: psensor not autostarted when $HOME/.config/autostart does
+  not exist.
+</p>
+</li>
+<li>
+<p>
+Fixed few swedish translations (Josef Andersson).
+</p>
+</li>
+<li>
+<p>
+Fixed psensor does not start: Attempt to unlock mutex that was not
+  locked during startup with glib 2.41.2. (LP: #1346299).
+</p>
+</li>
+</ul></div>
+</div>
+</div>
+<div class="sect1">
 <h2 id="_v1_0_2">v1.0.2</h2>
 <div class="sectionbody">
 <div class="ulist"><ul>
@@ -2620,7 +2644,7 @@ Fixed BR1: crash when no temperature sensor is available
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-06-03 08:22:21 CEST
+Last updated 2014-08-04 09:17:26 CEST
 </div>
 </div>
 </body>
diff --git a/doc/faq.html b/doc/faq.html
index 1ae0908..8d26d4f 100644
--- 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>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-06-02 09:02:02 CEST
+Last updated 2014-08-04 09:16:55 CEST
 </div>
 </div>
 </body>
diff --git a/src/main.c b/src/main.c
index 99d249e..9106b59 100644
--- 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);