[nautilus] all: don't call g_thread_init()
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] all: don't call g_thread_init()
- Date: Tue, 18 Oct 2011 15:28:26 +0000 (UTC)
commit 04975e6cbc8f82238e3611a26b474b56c46ec1d3
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Tue Oct 18 11:21:03 2011 -0400
all: don't call g_thread_init()
GLib does that for us now.
configure.in | 2 +-
src/nautilus-main.c | 1 -
test/test-copy.c | 2 --
test/test-nautilus-search-engine.c | 2 --
4 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/configure.in b/configure.in
index 268208d..8603f34 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_PREREQ(2.54)
dnl ===========================================================================
-m4_define(glib_minver, 2.29.13)
+m4_define(glib_minver, 2.31.0)
m4_define(gnome_desktop_minver, 3.0.0)
m4_define(pango_minver, 1.28.3)
m4_define(gtk_minver, 3.1.6)
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index 17af97d..f174e5c 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -76,7 +76,6 @@ main (int argc, char *argv[])
#endif
g_type_init ();
- g_thread_init (NULL);
/* This will be done by gtk+ later, but for now, force it to GNOME */
g_desktop_app_info_set_desktop_env ("GNOME");
diff --git a/test/test-copy.c b/test/test-copy.c
index f21a403..94ed239 100644
--- a/test/test-copy.c
+++ b/test/test-copy.c
@@ -47,8 +47,6 @@ main (int argc, char* argv[])
NautilusProgressInfoManager *manager;
NautilusProgressInfo *progress_info;
- g_thread_init (NULL);
-
test_init (&argc, &argv);
if (argc < 3) {
diff --git a/test/test-nautilus-search-engine.c b/test/test-nautilus-search-engine.c
index 3113ce4..6dac732 100644
--- a/test/test-nautilus-search-engine.c
+++ b/test/test-nautilus-search-engine.c
@@ -33,8 +33,6 @@ main (int argc, char* argv[])
{
NautilusSearchEngine *engine;
NautilusQuery *query;
-
- g_thread_init (NULL);
gtk_init (&argc, &argv);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]