grim/guifications3
Clone
Summary
Browse
Changes
Graph
this was missed in the mtn->hg conversion
org.guifications.gf3
2009-09-12, Gary Kramlich
9b4ef0d250e7
Parents
533d97000e2e
Children
5469f5a2521c
this was missed in the mtn->hg conversion
We should be checking if gthread is initalized and if not, doing so. This could cause problems for external programs, but we'll work on that later.
Anyways, this is needed for some of our plugins like gflib-dbus, gflib-eggdbus, and guifications-daemon-web
2 files changed, 8 insertions(+), 1 deletions(-)
+1
-1
gflib/configure.ac
+7
-0
gflib/gflib/gf_core.c
--- a/gflib/configure.ac Thu Sep 10 22:58:55 2009 -0500
+++ b/gflib/configure.ac Sat Sep 12 22:08:38 2009 -0500
@@ -158,7 +158,7 @@
dnl #######################################################################
dnl # check for glib and other glib dependencies
dnl #######################################################################
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.14.0 gobject-2.0 >= 2.14.0])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.14.0 gobject-2.0 >= 2.14.0 gthread-2.0 >= 2.14.0])
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
--- a/gflib/gflib/gf_core.c Thu Sep 10 22:58:55 2009 -0500
+++ b/gflib/gflib/gf_core.c Sat Sep 12 22:08:38 2009 -0500
@@ -113,6 +113,13 @@
/* Initialize the GType system */
g_type_init();
+ /* initialize gthread, we don't use this directly but a few plugins do, and
+ * if it's not initialized before the mainloop is run, it gets all sorts of
+ * messed up.
+ */
+ if(!g_thread_supported())
+ g_thread_init(NULL);
+
/* setup the system log */
gf_log_init();