Clear up the uses of g_type_init().

21 files changed, 0 insertions, 41 deletions

diff --git a/tests/glib-server-nomenu.c b/tests/glib-server-nomenu.c
index fb2c61e..e2bd48f 100644
--- a/tests/glib-server-nomenu.c
+++ b/tests/glib-server-nomenu.c
@@ -27,8 +27,6 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	DbusmenuServer * server = dbusmenu_server_new("/org/test");
 	DbusmenuMenuitem * menuitem = dbusmenu_menuitem_new();
 	dbusmenu_menuitem_property_set(menuitem, "test", "test");
diff --git a/tests/test-glib-events-client.c b/tests/test-glib-events-client.c
index 2cc5439..a284760 100644
--- a/tests/test-glib-events-client.c
+++ b/tests/test-glib-events-client.c
@@ -114,8 +114,6 @@ timer_func (gpointer data)
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
 	g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
 	g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_EVENT_RESULT, G_CALLBACK(event_status), GINT_TO_POINTER(USER_VALUE));
diff --git a/tests/test-glib-events-nogroup-client.c b/tests/test-glib-events-nogroup-client.c
index f87660b..b0fbc9f 100644
--- a/tests/test-glib-events-nogroup-client.c
+++ b/tests/test-glib-events-nogroup-client.c
@@ -118,8 +118,6 @@ timer_func (gpointer data)
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
 	g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
 	g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_EVENT_RESULT, G_CALLBACK(event_status), GINT_TO_POINTER(USER_VALUE));
diff --git a/tests/test-glib-events-server.c b/tests/test-glib-events-server.c
index ab72c6b..148af29 100644
--- a/tests/test-glib-events-server.c
+++ b/tests/test-glib-events-server.c
@@ -68,8 +68,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	g_bus_own_name(G_BUS_TYPE_SESSION,
 	               "org.dbusmenu.test",
 	               G_BUS_NAME_OWNER_FLAGS_NONE,
diff --git a/tests/test-glib-layout-client.c b/tests/test-glib-layout-client.c
index 3afe042..83b47ee 100644
--- a/tests/test-glib-layout-client.c
+++ b/tests/test-glib-layout-client.c
@@ -114,8 +114,6 @@ timer_func (gpointer data)
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
 	g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
 
diff --git a/tests/test-glib-layout-server.c b/tests/test-glib-layout-server.c
index e289349..f92a18c 100644
--- a/tests/test-glib-layout-server.c
+++ b/tests/test-glib-layout-server.c
@@ -90,8 +90,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	g_bus_own_name(G_BUS_TYPE_SESSION,
 	               "org.dbusmenu.test",
 	               G_BUS_NAME_OWNER_FLAGS_NONE,
diff --git a/tests/test-glib-objects.c b/tests/test-glib-objects.c
index 9c99280..ff97e6f 100644
--- a/tests/test-glib-objects.c
+++ b/tests/test-glib-objects.c
@@ -324,7 +324,6 @@ test_glib_objects_suite (void)
 gint
 main (gint argc, gchar * argv[])
 {
-	g_type_init();
 	g_test_init(&argc, &argv, NULL);
 
 	/* Test suites */
diff --git a/tests/test-glib-properties-client.c b/tests/test-glib-properties-client.c
index ae7b80b..3d6aa9d 100644
--- a/tests/test-glib-properties-client.c
+++ b/tests/test-glib-properties-client.c
@@ -152,8 +152,6 @@ layout_verify_timer (gpointer data)
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	/* Make sure the server starts up and all that */
 	g_usleep(500000);
 
diff --git a/tests/test-glib-properties-server.c b/tests/test-glib-properties-server.c
index 4248ea2..283a05f 100644
--- a/tests/test-glib-properties-server.c
+++ b/tests/test-glib-properties-server.c
@@ -86,8 +86,6 @@ timer_func (gpointer data)
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	server = dbusmenu_server_new("/org/test");
 
 	timer_func(NULL);
diff --git a/tests/test-glib-proxy-client.c b/tests/test-glib-proxy-client.c
index d20c27c..8f760a2 100644
--- a/tests/test-glib-proxy-client.c
+++ b/tests/test-glib-proxy-client.c
@@ -159,8 +159,6 @@ layout_verify_timer (gpointer data)
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	DbusmenuClient * client = dbusmenu_client_new("test.proxy.first_proxy", "/org/test");
 	g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
 
diff --git a/tests/test-glib-proxy-proxy.c b/tests/test-glib-proxy-proxy.c
index 8a17ead..f5acc92 100644
--- a/tests/test-glib-proxy-proxy.c
+++ b/tests/test-glib-proxy-proxy.c
@@ -49,8 +49,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	if (argc != 3) {
 		g_error ("Need two params");
 		return 1;
diff --git a/tests/test-glib-proxy-server.c b/tests/test-glib-proxy-server.c
index a5dfd4e..6823cec 100644
--- a/tests/test-glib-proxy-server.c
+++ b/tests/test-glib-proxy-server.c
@@ -120,8 +120,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	g_bus_own_name(G_BUS_TYPE_SESSION,
 	               "test.proxy.server",
 	               G_BUS_NAME_OWNER_FLAGS_NONE,
diff --git a/tests/test-glib-simple-items.c b/tests/test-glib-simple-items.c
index 3ea5480..1fff8bf 100644
--- a/tests/test-glib-simple-items.c
+++ b/tests/test-glib-simple-items.c
@@ -32,8 +32,6 @@ quititall (gpointer data)
 int
 main (int argc, char ** argv)
 {
-    g_type_init();
-
     DbusmenuServer * server = dbusmenu_server_new("/test/object");
     root_menuitem = dbusmenu_menuitem_new();
     dbusmenu_server_set_root(server, root_menuitem);
diff --git a/tests/test-glib-submenu-client.c b/tests/test-glib-submenu-client.c
index 57762cd..29d7720 100644
--- a/tests/test-glib-submenu-client.c
+++ b/tests/test-glib-submenu-client.c
@@ -97,8 +97,6 @@ timer_func (gpointer data)
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
 	g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
 
diff --git a/tests/test-glib-submenu-server.c b/tests/test-glib-submenu-server.c
index 73362c1..ece2527 100644
--- a/tests/test-glib-submenu-server.c
+++ b/tests/test-glib-submenu-server.c
@@ -90,8 +90,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	g_bus_own_name(G_BUS_TYPE_SESSION,
 	               "org.dbusmenu.test",
 	               G_BUS_NAME_OWNER_FLAGS_NONE,
diff --git a/tests/test-gtk-label-server.c b/tests/test-gtk-label-server.c
index ddf8fcf..d7fe622 100644
--- a/tests/test-gtk-label-server.c
+++ b/tests/test-gtk-label-server.c
@@ -71,8 +71,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	JsonParser * parser = json_parser_new();
 	GError * error = NULL;
 	if (!json_parser_load_from_file(parser, argv[1], &error)) {
diff --git a/tests/test-gtk-reorder-server.c b/tests/test-gtk-reorder-server.c
index 44209f1..d0fba82 100644
--- a/tests/test-gtk-reorder-server.c
+++ b/tests/test-gtk-reorder-server.c
@@ -99,8 +99,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	g_bus_own_name(G_BUS_TYPE_SESSION,
 	               "glib.label.test",
 	               G_BUS_NAME_OWNER_FLAGS_NONE,
diff --git a/tests/test-gtk-shortcut-server.c b/tests/test-gtk-shortcut-server.c
index 5df4881..55974aa 100644
--- a/tests/test-gtk-shortcut-server.c
+++ b/tests/test-gtk-shortcut-server.c
@@ -83,8 +83,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	g_bus_own_name(G_BUS_TYPE_SESSION,
 	               "glib.label.test",
 	               G_BUS_NAME_OWNER_FLAGS_NONE,
diff --git a/tests/test-gtk-submenu-server.c b/tests/test-gtk-submenu-server.c
index 1d38a44..a705900 100644
--- a/tests/test-gtk-submenu-server.c
+++ b/tests/test-gtk-submenu-server.c
@@ -92,8 +92,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	g_bus_own_name(G_BUS_TYPE_SESSION,
 	               "glib.label.test",
 	               G_BUS_NAME_OWNER_FLAGS_NONE,
diff --git a/tests/test-json-client.c b/tests/test-json-client.c
index 8900902..d7933ce 100644
--- a/tests/test-json-client.c
+++ b/tests/test-json-client.c
@@ -53,8 +53,6 @@ timeout_func (gpointer user_data)
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	g_timeout_add_seconds(1, timeout_func, argv);
 
 	mainloop = g_main_loop_new(NULL, FALSE);
diff --git a/tests/test-json-server.c b/tests/test-json-server.c
index 7165838..9a2dd8e 100644
--- a/tests/test-json-server.c
+++ b/tests/test-json-server.c
@@ -76,8 +76,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	g_bus_own_name(G_BUS_TYPE_SESSION,
 	               "org.dbusmenu.test",
 	               G_BUS_NAME_OWNER_FLAGS_NONE,