From 9c7531a69c5b3ed3225559f5e699b26d240b97a9 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Sun, 22 Jan 2012 16:42:51 +0000 Subject: [PATCH] g_thread_init should not be called since 2.31 (and not 2.32). Glib 2.31 is the devel version of 2.32 --- NEWS | 4 ++-- src/main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 56f53bd..62fbdf6 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ * v0.7.0.0 ** psensor: fixed sensor type displayed in sensor preferences dialog. -** psensor: not calling g_thread_init when compiled with glib >= 2.32. +** psensor: not calling g_thread_init when compiled with glib >= 2.31. ** psensor: added basic instruction in the README for compiling psensor with the ATI/AMD GPU support. ** psensor: fixed compilation error on 64bits with ATI/AMD GPU support. @@ -10,7 +10,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. +** psensor: not calling g_thread_init when compiled with glib >= 2.31. * v0.6.2.16 diff --git a/src/main.c b/src/main.c index 44d74a9..e2162e7 100644 --- a/src/main.c +++ b/src/main.c @@ -439,7 +439,7 @@ int main(int argc, char **argv) log_init(); log_glib_info(); -#if !(GLIB_CHECK_VERSION(2, 32, 0)) +#if !(GLIB_CHECK_VERSION(2, 31, 0)) /* * Since GLib 2.32 g_thread_init call is deprecated and not * needed. Documentation of this method is not clear whether -- 2.7.4