summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2012-01-03 13:11:05 +0100
committerShaun McCance <shaunm@gnome.org>2012-01-21 11:40:12 -0500
commit52fc51bae2244d2b9a9441914f3f4d81eb82eb8a (patch)
tree45081ec713feb4b8e5ac8df6b8599dd2324e665c
parent5ce1d0c421380d94be97a3003698a29672926e4d (diff)
downloadyelp-52fc51bae2244d2b9a9441914f3f4d81eb82eb8a.tar.gz
Don't call g_thread_init()
This completes commit f5c1a48 and removes the remaining calls. https://bugzilla.gnome.org/show_bug.cgi?id=663285
-rw-r--r--docs/libyelp/Makefile.am2
-rw-r--r--tests/test-location-entry.c1
-rw-r--r--tests/test-settings.c1
-rw-r--r--tests/test-transform.c1
-rw-r--r--tests/test-uri.c1
-rw-r--r--tests/test-view.c1
6 files changed, 1 insertions, 6 deletions
diff --git a/docs/libyelp/Makefile.am b/docs/libyelp/Makefile.am
index 945dbfcb..c1a13ef4 100644
--- a/docs/libyelp/Makefile.am
+++ b/docs/libyelp/Makefile.am
@@ -6,7 +6,7 @@ DOC_MAIN_SGML_FILE = libyelp-docs.xml
SCAN_OPTIONS = --deprecated-guards="G_DISABLE_DEPRECATED" --rebuild-types
-SCANGOBJ_OPTIONS = --type-init-func="g_type_init();g_thread_init(NULL);"
+SCANGOBJ_OPTIONS = --type-init-func="g_type_init();"
DOC_SOURCE_DIR = $(top_srcdir)/libyelp
diff --git a/tests/test-location-entry.c b/tests/test-location-entry.c
index ed80abf9..0b4c8510 100644
--- a/tests/test-location-entry.c
+++ b/tests/test-location-entry.c
@@ -220,7 +220,6 @@ main (int argc, char **argv)
GtkListStore *model;
GtkTreeIter iter;
- g_thread_init (NULL);
gtk_init (&argc, &argv);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
diff --git a/tests/test-settings.c b/tests/test-settings.c
index 392f5601..e78bb780 100644
--- a/tests/test-settings.c
+++ b/tests/test-settings.c
@@ -207,7 +207,6 @@ main (int argc, char **argv)
GtkWidget *window, *hbox, *vbox, *widget, *scroll, *table;
gint i;
- g_thread_init (NULL);
gtk_init (&argc, &argv);
settings = yelp_settings_get_default ();
diff --git a/tests/test-transform.c b/tests/test-transform.c
index 141a4ce1..a814be3a 100644
--- a/tests/test-transform.c
+++ b/tests/test-transform.c
@@ -119,7 +119,6 @@ main (gint argc, gchar **argv)
gchar *file;
g_type_init ();
- g_thread_init (NULL);
context = g_option_context_new ("[STYLESHEET] FILE");
g_option_context_add_main_entries (context, options, NULL);
diff --git a/tests/test-uri.c b/tests/test-uri.c
index 5586fc48..cd521832 100644
--- a/tests/test-uri.c
+++ b/tests/test-uri.c
@@ -226,7 +226,6 @@ main (int argc, char **argv)
YelpUri *uri = NULL;
g_type_init ();
- g_thread_init (NULL);
g_log_set_always_fatal (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL);
if (argc < 2) {
diff --git a/tests/test-view.c b/tests/test-view.c
index 211144c1..73eeb37e 100644
--- a/tests/test-view.c
+++ b/tests/test-view.c
@@ -68,7 +68,6 @@ main (int argc, char **argv)
YelpDocument *document;
GCancellable *cancellable;
- g_thread_init (NULL);
gtk_init (&argc, &argv);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);