Commit 9295f595 authored by Jürg Billeter's avatar Jürg Billeter

Remove g_thread_init calls

Calling g_thread_init with GLib 2.31 requires explicit dependency on
gthread-2.0. However, g_type_init initializes threads since GLib 2.24,
so it is no longer needed.
parent 4c2e0b43
......@@ -246,7 +246,6 @@ PKG_CHECK_MODULES(LIBTRACKER_EXTRACT, [$LIBTRACKER_EXTRACT_REQUIRED])
# Check requirements for libtracker-fts
LIBTRACKER_FTS_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
gthread-2.0 >= $GLIB_REQUIRED
sqlite3 >= $SQLITE_REQUIRED"
PKG_CHECK_MODULES(LIBTRACKER_FTS, [$LIBTRACKER_FTS_REQUIRED])
......@@ -267,7 +266,6 @@ PKG_CHECK_MODULES(LIBTRACKER_SPARQL, [$LIBTRACKER_SPARQL_REQUIRED])
# Check requirements for tracker-control
TRACKER_CONTROL_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
gthread-2.0 >= $GLIB_REQUIRED
uuid"
PKG_CHECK_MODULES(TRACKER_CONTROL, [$TRACKER_CONTROL_REQUIRED])
......@@ -275,7 +273,6 @@ PKG_CHECK_MODULES(TRACKER_CONTROL, [$TRACKER_CONTROL_REQUIRED])
# Check requirements for tracker-explorer
TRACKER_EXPLORER_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
gthread-2.0 >= $GLIB_REQUIRED
gmodule-2.0 >= $GLIB_REQUIRED
gtk+-3.0 >= $GTK_REQUIRED
gee-1.0 >= $GEE_REQUIRED"
......@@ -294,7 +291,6 @@ PKG_CHECK_MODULES(TRACKER_RESDUMP, [$TRACKER_RESDUMP_REQUIRED],
# Check requirements for tracker-store
TRACKER_STORE_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
gthread-2.0 >= $GLIB_REQUIRED
gmodule-2.0 >= $GLIB_REQUIRED
sqlite3 >= $SQLITE_REQUIRED"
......@@ -305,7 +301,6 @@ TRACKER_STORE_LIBS="$TRACKER_STORE_LIBS -lz -lm"
# Check requirements for tracker-extract
TRACKER_EXTRACT_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
gthread-2.0 >= $GLIB_REQUIRED
gmodule-2.0 >= $GLIB_REQUIRED"
PKG_CHECK_MODULES(TRACKER_EXTRACT, [$TRACKER_EXTRACT_REQUIRED])
......@@ -318,7 +313,6 @@ PKG_CHECK_MODULES(TRACKER_EXTRACT_MODULES, [$TRACKER_EXTRACT_MODULES_REQUIRED])
# Check requirements for tracker-writeback
TRACKER_WRITEBACK_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
gthread-2.0 >= $GLIB_REQUIRED
gmodule-2.0 >= $GLIB_REQUIRED"
PKG_CHECK_MODULES(TRACKER_WRITEBACK, [$TRACKER_WRITEBACK_REQUIRED])
......@@ -326,7 +320,6 @@ PKG_CHECK_MODULES(TRACKER_WRITEBACK, [$TRACKER_WRITEBACK_REQUIRED])
# Check requirements for tracker-miner-fs
TRACKER_MINER_FS_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
gthread-2.0 >= $GLIB_REQUIRED
gmodule-2.0 >= $GLIB_REQUIRED"
PKG_CHECK_MODULES(TRACKER_MINER_FS, [$TRACKER_MINER_FS_REQUIRED])
......@@ -429,15 +422,13 @@ TRACKER_MINER_FLICKR_LIBS="$TRACKER_MINER_FLICKR_LIBS -lz -lm"
# Check requirements for tracker-utils
TRACKER_UTILS_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
gthread-2.0 >= $GLIB_REQUIRED"
gio-unix-2.0 >= $GLIB_REQUIRED"
PKG_CHECK_MODULES(TRACKER_UTILS, [$TRACKER_UTILS_REQUIRED])
# Check requirements for tracker-needle
TRACKER_NEEDLE_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
gthread-2.0 >= $GLIB_REQUIRED
gmodule-2.0 >= $GLIB_REQUIRED
gtk+-3.0 >= $GTK_REQUIRED"
......@@ -448,7 +439,6 @@ PKG_CHECK_MODULES(TRACKER_NEEDLE, [$TRACKER_NEEDLE_REQUIRED],
# Check requirements for tracker-preferences
TRACKER_PREFERENCES_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
gthread-2.0 >= $GLIB_REQUIRED
gmodule-2.0 >= $GLIB_REQUIRED
gtk+-3.0 >= $GTK_REQUIRED"
......@@ -459,7 +449,6 @@ PKG_CHECK_MODULES(TRACKER_PREFERENCES, [$TRACKER_PREFERENCES_REQUIRED],
# Check requirements for tracker-search-bar
TRACKER_SEARCH_BAR_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
gthread-2.0 >= $GLIB_REQUIRED
gmodule-2.0 >= $GLIB_REQUIRED
gtk+-3.0 >= $GTK_REQUIRED
gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED
......
......@@ -195,10 +195,6 @@ main (int argc, char *argv[])
g_type_init ();
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
main_loop = g_main_loop_new (NULL, FALSE);
miner = tracker_miner_test_new ("test");
......
......@@ -696,10 +696,6 @@ main (gint argc, gchar *argv[])
g_type_init ();
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
setlocale (LC_ALL, "");
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
......
......@@ -61,7 +61,6 @@ main (int argc, char **argv)
const gchar *error_message;
g_type_init ();
g_thread_init (NULL);
setlocale (LC_ALL, "");
......
......@@ -68,10 +68,6 @@ main (int argc, char **argv)
g_type_init ();
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
/* Translators: this messagge will apper immediately after the */
/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE> */
context = g_option_context_new (_(" - Manage Tracker processes and data"));
......
......@@ -104,10 +104,6 @@ main (int argc, char **argv)
g_type_init ();
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
connection = tracker_sparql_connection_get (NULL, &error);
if (!connection) {
......
......@@ -349,10 +349,6 @@ main (int argc, char **argv)
g_type_init ();
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
connection = tracker_sparql_connection_get (NULL, &error);
if (!connection) {
......
......@@ -1465,10 +1465,6 @@ main (int argc, char **argv)
g_type_init ();
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
#if HAVE_TRACKER_FTS
/* Only check stopwords if FTS is enabled */
......
......@@ -280,10 +280,6 @@ main (int argc, char **argv)
g_type_init ();
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
connection = tracker_sparql_connection_get (NULL, &error);
if (!connection) {
......
......@@ -81,10 +81,6 @@ main (int argc, char **argv)
g_type_init ();
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
connection = tracker_sparql_connection_get (NULL, &error);
if (!connection) {
......
......@@ -933,10 +933,6 @@ main (int argc, char **argv)
g_type_init ();
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
connection = tracker_sparql_connection_get (NULL, &error);
if (!connection) {
......
......@@ -85,8 +85,6 @@ main (int argc,
gchar *log_filename;
guint shutdown_timeout;
g_thread_init (NULL);
g_type_init ();
/* Set up locale */
......
......@@ -234,7 +234,6 @@ gint
main (gint argc, gchar **argv)
{
g_type_init ();
g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
......
......@@ -289,7 +289,6 @@ main (int argc, char **argv) {
gint result;
g_type_init ();
g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
/*
......
......@@ -219,10 +219,6 @@ main (int argc, char **argv)
g_type_init ();
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
g_test_init (&argc, &argv, NULL);
current_dir = g_get_current_dir ();
......
......@@ -366,7 +366,6 @@ main (int argc, char **argv)
int result;
g_type_init ();
g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
#ifndef DISABLE_JOURNAL
......
......@@ -314,10 +314,6 @@ main (int argc, char **argv)
g_type_init ();
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
g_test_init (&argc, &argv, NULL);
data_dir = g_build_filename (g_get_current_dir (), "test-cache", NULL);
......
......@@ -278,10 +278,6 @@ main (int argc, char **argv)
g_type_init ();
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
g_test_init (&argc, &argv, NULL);
data_dir = g_build_filename (g_get_current_dir (), "test-cache", NULL);
......
......@@ -127,10 +127,6 @@ main (int argc, char **argv)
g_type_init ();
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
g_test_init (&argc, &argv, NULL);
current_dir = g_get_current_dir ();
......
......@@ -326,10 +326,6 @@ main (int argc, char **argv)
g_type_init ();
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
g_test_init (&argc, &argv, NULL);
setlocale (LC_COLLATE, "en_US.utf8");
......
......@@ -598,7 +598,6 @@ main (int argc,
gint result;
g_type_init ();
g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
g_test_message ("Testing XMP");
......
......@@ -183,10 +183,6 @@ main (int argc, char **argv)
g_type_init ();
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
g_test_init (&argc, &argv, NULL);
current_dir = g_get_current_dir ();
......
......@@ -349,9 +349,6 @@ main (int argc, char **argv)
gint i;
g_type_init ();
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
g_test_init (&argc, &argv, NULL);
/* We want the tests to properly find the stopwords dictionaries, so we
......
......@@ -221,9 +221,6 @@ int
main (int argc, char **argv)
{
g_type_init ();
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
/* Setup locale */
setlocale (LC_ALL, "");
......
......@@ -320,7 +320,6 @@ main (int argc,
char **argv)
{
g_type_init ();
g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
g_test_message ("Testing filesystem crawler");
......
......@@ -138,7 +138,6 @@ main (int argc,
gint result;
g_type_init ();
g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
g_test_message ("Testing miner manager");
......
......@@ -1874,7 +1874,6 @@ gint
main (gint argc,
gchar **argv)
{
g_thread_init (NULL);
g_type_init ();
g_test_init (&argc, &argv, NULL);
......
......@@ -106,7 +106,6 @@ main (int argc, char **argv)
g_type_init ();
g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
/* Set test environment up */
......
......@@ -226,7 +226,6 @@ main (int argc,
char **argv)
{
g_type_init ();
g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/libtracker-miner/tracker-priority-queue/emptiness",
......
......@@ -161,7 +161,6 @@ gint
main (gint argc, gchar **argv)
{
g_type_init ();
g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/libtracker-miner/tracker-task-pool/limit_set",
......
......@@ -133,7 +133,6 @@ main (int argc,
char **argv)
{
g_type_init ();
g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
g_test_message ("Testing thumbnailer");
......
......@@ -357,7 +357,6 @@ main (gint argc, gchar **argv)
{
int result;
g_thread_init (NULL);
g_type_init ();
g_test_init (&argc, &argv, NULL);
......
......@@ -530,7 +530,6 @@ check_duplicates (void)
int main (int argc, char **argv)
{
/* Initialize stuff */
g_thread_init (NULL);
g_type_init ();
/* Initialize locale support! */
......
......@@ -92,9 +92,6 @@ main (int argc, char **argv)
g_option_context_free (context);
g_type_init ();
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
if (file) {
gchar *path_in_utf8;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment