summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stefw@collabora.co.uk>2011-10-29 21:34:21 +0200
committerStef Walter <stefw@collabora.co.uk>2011-10-29 21:34:21 +0200
commitd2210cc236c1f0fcddfcba19ce2787b24b6327da (patch)
treef6849a4d563865a74ba881f68230697c502460c5
parent49201f9d22f6466887bf73ba62ea6644e439c902 (diff)
downloadgcr-d2210cc236c1f0fcddfcba19ce2787b24b6327da.tar.gz
Remove g_thread_init() calls.
* g_type_init() initializes threads since 2.24 and is no longer needed since 2.32
-rw-r--r--egg/egg-testing.c4
-rw-r--r--gcr/gcr-viewer-tool.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/egg/egg-testing.c b/egg/egg-testing.c
index 0235ac0..cd7f5c2 100644
--- a/egg/egg-testing.c
+++ b/egg/egg-testing.c
@@ -25,6 +25,8 @@
#include "egg-testing.h"
+#include <glib-object.h>
+
#include <errno.h>
#include <unistd.h>
@@ -136,7 +138,7 @@ egg_tests_run_in_thread_with_loop (void)
GMainLoop *loop;
gpointer ret;
- g_thread_init (NULL);
+ g_type_init ();
loop = g_main_loop_new (NULL, FALSE);
wait_condition = g_cond_new ();
diff --git a/gcr/gcr-viewer-tool.c b/gcr/gcr-viewer-tool.c
index e3510f4..1ca34f9 100644
--- a/gcr/gcr-viewer-tool.c
+++ b/gcr/gcr-viewer-tool.c
@@ -88,7 +88,6 @@ main (int argc, char *argv[])
GtkWindow *window;
g_type_init ();
- g_thread_init (NULL);
#ifdef HAVE_LOCALE_H
/* internationalisation */