From eb5b205d07da9fb6b9dd9388a3d09b97fa66dc3f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Sun, 22 Jan 2012 15:55:53 +0000
Subject: [PATCH] not calling g_thread_init when compiled with glib >= 2.32.
 for 0.6.2.x branch

---
 NEWS       |  1 +
 src/main.c | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/NEWS b/NEWS
index 06315cd..29f241d 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
 
 ** psensor: fixed sensor type displayed in sensor preferences dialog.
 ** psensor: fixed compilation error on 64bits with ATI/AMD GPU support.
+** psensor: not calling g_thread_init when compiled with glib >= 2.32.
 
 * v0.6.2.16
 
diff --git a/src/main.c b/src/main.c
index 9d25a5a..afcd965 100644
--- a/src/main.c
+++ b/src/main.c
@@ -376,6 +376,19 @@ static gboolean initial_window_show(gpointer data)
 	return FALSE;
 }
 
+static void log_glib_info()
+{
+	log_debug("Compiled with GLib %d.%d.%d",
+		  GLIB_MAJOR_VERSION,
+		  GLIB_MINOR_VERSION,
+		  GLIB_MICRO_VERSION);
+
+	log_debug("Running with GLib %d.%d.%d",
+		  glib_major_version,
+		  glib_minor_version,
+		  glib_micro_version);
+}
+
 int main(int argc, char **argv)
 {
 	struct ui_psensor ui;
@@ -425,7 +438,17 @@ int main(int argc, char **argv)
 
 	log_init();
 
+	log_glib_info();
+#if !(GLIB_CHECK_VERSION(2, 32, 0))
+	/*
+	 * Since GLib 2.3.32 g_thread_init call is deprecated and not
+	 * needed. Documentation of this method is not clear whether
+	 * it is also useless with 2.3.31.
+	 */
+	log_debug("Calling g_thread_init(NULL)");
 	g_thread_init(NULL);
+#endif
+
 	gdk_threads_init();
 	/* gdk_threads_enter(); */
 
-- 
2.7.4