[evolution-kolab/gnome-3-4-0: 2/3] Bug #672988 - evolution-kolab fails to build with GLib 2.32
- From: Christian Hilberg <chilberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab/gnome-3-4-0: 2/3] Bug #672988 - evolution-kolab fails to build with GLib 2.32
- Date: Thu, 29 Mar 2012 09:53:33 +0000 (UTC)
commit 7e533ea972e0b9c3f156a928134d14787b7b59c7
Author: Christian Hilberg <hilberg kernelconcepts de>
Date: Thu Mar 29 10:16:29 2012 +0200
Bug #672988 - evolution-kolab fails to build with GLib 2.32
* removed the g_thread_init() calls from evolution-kolab
GLib initialization
* thread system init is done automatically when initializing
the GLib type system and the g_thread_init symbol has been
deprecated in current GLib versions
* evolution-kolab now builds and runs with both, GLib 2.30
and GLib 2.32
src/libekolabutil/kolab-util-glib.c | 1 -
.../test-camel-kolab-imapx-provider.c | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/src/libekolabutil/kolab-util-glib.c b/src/libekolabutil/kolab-util-glib.c
index c66414b..f21a41e 100644
--- a/src/libekolabutil/kolab-util-glib.c
+++ b/src/libekolabutil/kolab-util-glib.c
@@ -40,7 +40,6 @@ kolab_util_glib_init (void)
if (is_initialized == TRUE)
return;
- g_thread_init (NULL);
g_type_init ();
is_initialized = TRUE;
diff --git a/src/tests/integration/libcamelkolab/test-camel-kolab-imapx-provider.c b/src/tests/integration/libcamelkolab/test-camel-kolab-imapx-provider.c
index da2fb74..3b38920 100644
--- a/src/tests/integration/libcamelkolab/test-camel-kolab-imapx-provider.c
+++ b/src/tests/integration/libcamelkolab/test-camel-kolab-imapx-provider.c
@@ -63,7 +63,7 @@ main (gint argc, gchar *argv [])
}
uri = argv [1];
- g_thread_init (NULL);
+ g_type_init ();
system ("rm -rf /tmp/test-camel-imapx");
camel_init ("/tmp/test-camel-imapx", TRUE);
camel_provider_init ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]