summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2012-11-19 18:32:33 -0500
committerRyan Lortie <desrt@desrt.ca>2012-11-19 18:34:26 -0500
commite290b7857d853e9794d42a2a1d1857a1521f698f (patch)
treeada8292e1e976ba015ba4c029a3ce004334a2f56
parent8cda34cd9413ed9319531c86590bc8e7572fb95b (diff)
downloaddconf-e290b7857d853e9794d42a2a1d1857a1521f698f.tar.gz
Remove calls to g_type_init()
Since we now have a hard dependency on the newer GLib anyway.
-rw-r--r--gdbus/dconf-gdbus-filter.c1
-rw-r--r--gdbus/dconf-gdbus-thread.c1
-rw-r--r--service/dconf-service.c2
-rw-r--r--tests/client.c3
4 files changed, 0 insertions, 7 deletions
diff --git a/gdbus/dconf-gdbus-filter.c b/gdbus/dconf-gdbus-filter.c
index e1447b1..79b2dd7 100644
--- a/gdbus/dconf-gdbus-filter.c
+++ b/gdbus/dconf-gdbus-filter.c
@@ -306,6 +306,5 @@ dconf_engine_dbus_call_sync_func (GBusType bus_type,
void
dconf_engine_dbus_init_for_testing (void)
{
- g_type_init ();
}
#endif
diff --git a/gdbus/dconf-gdbus-thread.c b/gdbus/dconf-gdbus-thread.c
index 15cf70a..3b5302e 100644
--- a/gdbus/dconf-gdbus-thread.c
+++ b/gdbus/dconf-gdbus-thread.c
@@ -356,6 +356,5 @@ dconf_engine_dbus_call_sync_func (GBusType bus_type,
void
dconf_engine_dbus_init_for_testing (void)
{
- g_type_init ();
}
#endif
diff --git a/service/dconf-service.c b/service/dconf-service.c
index 088a9ba..f4b2515 100644
--- a/service/dconf-service.c
+++ b/service/dconf-service.c
@@ -228,8 +228,6 @@ dconf_service_class_init (GApplicationClass *class)
GApplication *
dconf_service_new (void)
{
- g_type_init ();
-
return g_object_new (DCONF_TYPE_SERVICE,
"application-id", "ca.desrt.dconf",
"flags", G_APPLICATION_IS_SERVICE,
diff --git a/tests/client.c b/tests/client.c
index ea6e4d9..7d0f95d 100644
--- a/tests/client.c
+++ b/tests/client.c
@@ -167,11 +167,8 @@ main (int argc, char **argv)
main_thread = g_thread_self ();
-
g_test_init (&argc, &argv, NULL);
- g_type_init ();
-
g_test_add_func ("/client/lifecycle", test_lifecycle);
g_test_add_func ("/client/basic-fast", test_fast);