1
From 78a941e2163194c263df1ca4f5b9104019ca0c3b Mon Sep 17 00:00:00 2001
2
From: Martin Pitt <martin.pitt@ubuntu.com>
3
Date: Tue, 3 Jan 2012 13:11:05 +0100
4
Subject: [PATCH] Don't call g_thread_init()
6
This completes commit f5c1a48 and removes the remaining calls.
8
docs/libyelp/Makefile.am | 2 +-
9
tests/test-location-entry.c | 2 +-
10
tests/test-settings.c | 2 +-
11
tests/test-transform.c | 1 -
12
tests/test-uri.c | 1 -
13
tests/test-view.c | 2 +-
14
6 files changed, 4 insertions(+), 6 deletions(-)
16
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=663285
17
Bug-Ubuntu: https://launchpad.net/bugs/911125
19
Index: yelp-3.3.2/docs/libyelp/Makefile.am
20
===================================================================
21
--- yelp-3.3.2.orig/docs/libyelp/Makefile.am 2011-03-17 16:51:13.000000000 +0100
22
+++ yelp-3.3.2/docs/libyelp/Makefile.am 2012-01-03 13:17:18.161058950 +0100
25
SCAN_OPTIONS = --deprecated-guards="G_DISABLE_DEPRECATED" --rebuild-types
27
-SCANGOBJ_OPTIONS = --type-init-func="g_type_init();g_thread_init(NULL);"
28
+SCANGOBJ_OPTIONS = --type-init-func="g_type_init();"
30
DOC_SOURCE_DIR = $(top_srcdir)/libyelp
32
Index: yelp-3.3.2/tests/test-settings.c
33
===================================================================
34
--- yelp-3.3.2.orig/tests/test-settings.c 2011-03-17 16:51:13.000000000 +0100
35
+++ yelp-3.3.2/tests/test-settings.c 2012-01-03 13:17:18.161058950 +0100
37
GtkWidget *window, *hbox, *vbox, *widget, *scroll, *table;
40
- g_thread_init (NULL);
42
gtk_init (&argc, &argv);
44
settings = yelp_settings_get_default ();
45
Index: yelp-3.3.2/tests/test-transform.c
46
===================================================================
47
--- yelp-3.3.2.orig/tests/test-transform.c 2011-03-17 16:51:13.000000000 +0100
48
+++ yelp-3.3.2/tests/test-transform.c 2012-01-03 13:17:18.161058950 +0100
53
- g_thread_init (NULL);
55
context = g_option_context_new ("[STYLESHEET] FILE");
56
g_option_context_add_main_entries (context, options, NULL);
57
Index: yelp-3.3.2/tests/test-uri.c
58
===================================================================
59
--- yelp-3.3.2.orig/tests/test-uri.c 2011-03-17 16:51:13.000000000 +0100
60
+++ yelp-3.3.2/tests/test-uri.c 2012-01-03 13:17:18.165058951 +0100
65
- g_thread_init (NULL);
66
g_log_set_always_fatal (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL);
69
Index: yelp-3.3.2/tests/test-view.c
70
===================================================================
71
--- yelp-3.3.2.orig/tests/test-view.c 2011-03-17 16:51:13.000000000 +0100
72
+++ yelp-3.3.2/tests/test-view.c 2012-01-03 13:17:18.165058951 +0100
74
YelpDocument *document;
75
GCancellable *cancellable;
77
- g_thread_init (NULL);
79
gtk_init (&argc, &argv);
81
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
82
Index: yelp-3.3.2/docs/libyelp/Makefile.in
83
===================================================================
84
--- yelp-3.3.2.orig/docs/libyelp/Makefile.in 2011-12-21 15:29:19.000000000 +0100
85
+++ yelp-3.3.2/docs/libyelp/Makefile.in 2012-01-03 13:17:54.921060731 +0100
88
DOC_MAIN_SGML_FILE = libyelp-docs.xml
89
SCAN_OPTIONS = --deprecated-guards="G_DISABLE_DEPRECATED" --rebuild-types
90
-SCANGOBJ_OPTIONS = --type-init-func="g_type_init();g_thread_init(NULL);"
91
+SCANGOBJ_OPTIONS = --type-init-func="g_type_init();"
92
DOC_SOURCE_DIR = $(top_srcdir)/libyelp