[evolution-data-server] Remove all g_type_init() calls.



commit 8b1c444d3b466890beda9587a73f1846df0612de
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Sep 27 12:01:55 2013 -0400

    Remove all g_type_init() calls.
    
    g_type_init() is deprecated in GLib 2.36.

 addressbook/backends/google/tests/phone-numbers.c  |    1 -
 .../libedata-book/e-book-backend-sqlitedb-test.c   |    2 --
 calendar/backends/file/e-cal-backend-file.c        |    2 --
 camel/camel-sexp.c                                 |    2 --
 camel/tests/lib/camel-test.c                       |    2 --
 libedataserver/e-sexp.c                            |    2 --
 .../evolution-addressbook-factory.c                |    4 ----
 .../evolution-calendar-factory.c                   |    4 ----
 .../evolution-source-registry.c                    |    4 ----
 tests/libebook-contacts/test-contact-types.c       |    2 --
 tests/libebook-contacts/test-phone-number.c        |    2 --
 tests/libebook-contacts/test-query.c               |    2 --
 tests/libebook-contacts/test-untyped-phones.c      |    2 --
 tests/libebook-contacts/test-vcard-parsing.c       |    2 --
 .../client/test-client-add-and-get-async.c         |    3 ---
 .../libebook/client/test-client-add-and-get-sync.c |    3 ---
 tests/libebook/client/test-client-add-contact.c    |    3 ---
 tests/libebook/client/test-client-custom-summary.c |    3 ---
 tests/libebook/client/test-client-e164-param.c     |    3 ---
 .../libebook/client/test-client-get-contact-uids.c |    3 ---
 tests/libebook/client/test-client-get-contact.c    |    3 ---
 tests/libebook/client/test-client-get-revision.c   |    3 ---
 tests/libebook/client/test-client-get-view.c       |    3 ---
 tests/libebook/client/test-client-modify-contact.c |    3 ---
 tests/libebook/client/test-client-photo-is-uri.c   |    3 ---
 tests/libebook/client/test-client-preserve-uid.c   |    3 ---
 tests/libebook/client/test-client-refresh.c        |    3 ---
 .../client/test-client-remove-contact-by-uid.c     |    3 ---
 tests/libebook/client/test-client-remove-contact.c |    3 ---
 .../libebook/client/test-client-remove-contacts.c  |    3 ---
 tests/libebook/client/test-client-revision-view.c  |    3 ---
 tests/libebook/client/test-client-self.c           |    3 ---
 .../client/test-client-suppress-notifications.c    |    3 ---
 tests/libebook/client/test-client-uid-only-view.c  |    3 ---
 .../libebook/client/test-client-view-operations.c  |    3 ---
 tests/libebook/client/test-client-write-write.c    |    3 ---
 tests/libebook/test-ebook-add-contact.c            |    3 ---
 tests/libebook/test-ebook-commit-contact.c         |    3 ---
 tests/libebook/test-ebook-get-book-view.c          |    3 ---
 tests/libebook/test-ebook-get-contact.c            |    3 ---
 tests/libebook/test-ebook-get-required-fields.c    |    3 ---
 .../libebook/test-ebook-get-static-capabilities.c  |    3 ---
 .../test-ebook-get-supported-auth-methods.c        |    3 ---
 tests/libebook/test-ebook-get-supported-fields.c   |    3 ---
 tests/libebook/test-ebook-remove-contact-by-id.c   |    3 ---
 tests/libebook/test-ebook-remove-contact.c         |    3 ---
 tests/libebook/test-ebook-remove-contacts.c        |    3 ---
 tests/libebook/vcard/dump-vcard.c                  |    4 ----
 tests/libecal/client/test-client-add-timezone.c    |    3 ---
 tests/libecal/client/test-client-bulk-methods.c    |    3 ---
 tests/libecal/client/test-client-create-object.c   |    3 ---
 .../client/test-client-get-attachment-uris.c       |    3 ---
 tests/libecal/client/test-client-get-free-busy.c   |    3 ---
 tests/libecal/client/test-client-get-object-list.c |    3 ---
 tests/libecal/client/test-client-get-revision.c    |    3 ---
 tests/libecal/client/test-client-get-view.c        |    3 ---
 tests/libecal/client/test-client-modify-object.c   |    3 ---
 tests/libecal/client/test-client-receive-objects.c |    3 ---
 tests/libecal/client/test-client-refresh.c         |    3 ---
 tests/libecal/client/test-client-remove-object.c   |    3 ---
 tests/libecal/client/test-client-revision-view.c   |    3 ---
 tests/libecal/client/test-client-send-objects.c    |    3 ---
 tests/libecal/test-ecal-add-timezone.c             |    3 ---
 tests/libecal/test-ecal-create-object--2.c         |    3 ---
 tests/libecal/test-ecal-create-object.c            |    3 ---
 tests/libecal/test-ecal-get-alarm-email-address.c  |    3 ---
 tests/libecal/test-ecal-get-cal-address.c          |    3 ---
 tests/libecal/test-ecal-get-capabilities.c         |    3 ---
 tests/libecal/test-ecal-get-default-object.c       |    3 ---
 tests/libecal/test-ecal-get-free-busy.c            |    3 ---
 tests/libecal/test-ecal-get-ldap-attribute.c       |    3 ---
 tests/libecal/test-ecal-get-object-list.c          |    3 ---
 tests/libecal/test-ecal-get-objects-for-uid.c      |    3 ---
 tests/libecal/test-ecal-get-query.c                |    3 ---
 tests/libecal/test-ecal-get-timezone.c             |    3 ---
 tests/libecal/test-ecal-modify-object.c            |    3 ---
 tests/libecal/test-ecal-receive-objects.c          |    3 ---
 tests/libecal/test-ecal-remove-object.c            |    3 ---
 tests/libecal/test-ecal-send-objects.c             |    3 ---
 tests/libecal/test-ecal-set-default-timezone.c     |    3 ---
 tests/libedata-cal/test-cal-backend-sexp.c         |    5 ++---
 tests/libedata-cal/test-intervaltree.c             |    2 --
 tests/libedataserver/e-source-registry-test.c      |    2 --
 tests/libedataserver/e-source-test.c               |    2 --
 tests/libedataserver/e-user-prompter-test.c        |    2 --
 tests/test-server-utils/test-fixture.c             |    3 ---
 86 files changed, 2 insertions(+), 246 deletions(-)
---
diff --git a/addressbook/backends/google/tests/phone-numbers.c 
b/addressbook/backends/google/tests/phone-numbers.c
index de8c3ec..a77065a 100644
--- a/addressbook/backends/google/tests/phone-numbers.c
+++ b/addressbook/backends/google/tests/phone-numbers.c
@@ -116,7 +116,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-       g_type_init ();
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("https://bugzilla.gnome.org/";);
 
diff --git a/addressbook/libedata-book/e-book-backend-sqlitedb-test.c 
b/addressbook/libedata-book/e-book-backend-sqlitedb-test.c
index 68e3b19..29062fc 100644
--- a/addressbook/libedata-book/e-book-backend-sqlitedb-test.c
+++ b/addressbook/libedata-book/e-book-backend-sqlitedb-test.c
@@ -193,8 +193,6 @@ gint
 main (gint argc,
       gchar *argv[])
 {
-       g_type_init ();
-
        if (argc != 2) {
                g_print ("Please enter a path to store the cache \n");
                return -1;
diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c
index 0fcc2a3..e50c610 100644
--- a/calendar/backends/file/e-cal-backend-file.c
+++ b/calendar/backends/file/e-cal-backend-file.c
@@ -3909,8 +3909,6 @@ main (gint argc,
        GOptionContext *context;
        FILE * fin = NULL;
 
-       g_type_init ();
-
        context = g_option_context_new ("- test utility for e-d-s file backend");
        g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
        if (!g_option_context_parse (context, &argc, &argv, &error))
diff --git a/camel/camel-sexp.c b/camel/camel-sexp.c
index c4fc6c7..39d6c7d 100644
--- a/camel/camel-sexp.c
+++ b/camel/camel-sexp.c
@@ -1833,8 +1833,6 @@ main (gint argc,
        gchar *t = "(+ \"foo\" \"\\\"\" \"bar\" \"\\\\ blah \\x \")";
        CamelSExpResult *result;
 
-       g_type_init ();
-
        sexp = camel_sexp_new ();
 
        camel_sexp_add_variable (sexp, 0, "test", NULL);
diff --git a/camel/tests/lib/camel-test.c b/camel/tests/lib/camel-test.c
index 280a455..2f6ffea 100644
--- a/camel/tests/lib/camel-test.c
+++ b/camel/tests/lib/camel-test.c
@@ -102,8 +102,6 @@ camel_test_init (gint argc,
 
        setup = 1;
 
-       g_type_init ();
-
        path = g_strdup_printf ("/tmp/camel-test");
        if (mkdir (path, 0700) == -1 && errno != EEXIST)
                abort ();
diff --git a/libedataserver/e-sexp.c b/libedataserver/e-sexp.c
index 67ad75b..bbf898d 100644
--- a/libedataserver/e-sexp.c
+++ b/libedataserver/e-sexp.c
@@ -1794,8 +1794,6 @@ gint main (gint argc, gchar **argv)
        gchar *t = "(+ \"foo\" \"\\\"\" \"bar\" \"\\\\ blah \\x \")";
        ESExpResult *r;
 
-       g_type_init ();
-
        f = e_sexp_new ();
 
        e_sexp_add_variable (f, 0, "test", NULL);
diff --git a/services/evolution-addressbook-factory/evolution-addressbook-factory.c 
b/services/evolution-addressbook-factory/evolution-addressbook-factory.c
index 26b1193..81eade6 100644
--- a/services/evolution-addressbook-factory/evolution-addressbook-factory.c
+++ b/services/evolution-addressbook-factory/evolution-addressbook-factory.c
@@ -97,10 +97,6 @@ main (gint argc,
                /* This is only to load gtk-modules, like
                 * bug-buddy's gnomesegvhandler, if possible */
                gtk_init_check (&argc, &argv);
-       else
-               g_type_init ();
-#else
-       g_type_init ();
 #endif
 
        context = g_option_context_new (NULL);
diff --git a/services/evolution-calendar-factory/evolution-calendar-factory.c 
b/services/evolution-calendar-factory/evolution-calendar-factory.c
index e5ba912..d9bc59e 100644
--- a/services/evolution-calendar-factory/evolution-calendar-factory.c
+++ b/services/evolution-calendar-factory/evolution-calendar-factory.c
@@ -101,10 +101,6 @@ main (gint argc,
                /* This is only to load gtk-modules, like
                 * bug-buddy's gnomesegvhandler, if possible */
                gtk_init_check (&argc, &argv);
-       else
-               g_type_init ();
-#else
-       g_type_init ();
 #endif
 
        context = g_option_context_new (NULL);
diff --git a/services/evolution-source-registry/evolution-source-registry.c 
b/services/evolution-source-registry/evolution-source-registry.c
index 1bb6497..b0d040f 100644
--- a/services/evolution-source-registry/evolution-source-registry.c
+++ b/services/evolution-source-registry/evolution-source-registry.c
@@ -125,10 +125,6 @@ main (gint argc,
                /* This is only to load gtk-modules, like
                 * bug-buddy's gnomesegvhandler, if possible */
                gtk_init_check (&argc, &argv);
-       else
-               g_type_init ();
-#else
-       g_type_init ();
 #endif
 
        e_gdbus_templates_init_main_thread ();
diff --git a/tests/libebook-contacts/test-contact-types.c b/tests/libebook-contacts/test-contact-types.c
index b590457..16f9a97 100644
--- a/tests/libebook-contacts/test-contact-types.c
+++ b/tests/libebook-contacts/test-contact-types.c
@@ -171,8 +171,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-       g_type_init ();
-
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook-contacts/test-phone-number.c b/tests/libebook-contacts/test-phone-number.c
index ac1a9e4..4e5f122 100644
--- a/tests/libebook-contacts/test-phone-number.c
+++ b/tests/libebook-contacts/test-phone-number.c
@@ -423,8 +423,6 @@ main (gint argc,
                return 0;
        }
 
-       g_type_init ();
-
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook-contacts/test-query.c b/tests/libebook-contacts/test-query.c
index 41a21df..2453401 100644
--- a/tests/libebook-contacts/test-query.c
+++ b/tests/libebook-contacts/test-query.c
@@ -94,8 +94,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-       g_type_init ();
-
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook-contacts/test-untyped-phones.c b/tests/libebook-contacts/test-untyped-phones.c
index 828462b..7791f01 100644
--- a/tests/libebook-contacts/test-untyped-phones.c
+++ b/tests/libebook-contacts/test-untyped-phones.c
@@ -47,8 +47,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-       g_type_init ();
-
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook-contacts/test-vcard-parsing.c b/tests/libebook-contacts/test-vcard-parsing.c
index bd85f87..0341bb0 100644
--- a/tests/libebook-contacts/test-vcard-parsing.c
+++ b/tests/libebook-contacts/test-vcard-parsing.c
@@ -264,8 +264,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-       g_type_init ();
-
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-add-and-get-async.c 
b/tests/libebook/client/test-client-add-and-get-async.c
index 2f48767..f34dd84 100644
--- a/tests/libebook/client/test-client-add-and-get-async.c
+++ b/tests/libebook/client/test-client-add-and-get-async.c
@@ -197,9 +197,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-add-and-get-sync.c 
b/tests/libebook/client/test-client-add-and-get-sync.c
index 45ecec5..4f7d072 100644
--- a/tests/libebook/client/test-client-add-and-get-sync.c
+++ b/tests/libebook/client/test-client-add-and-get-sync.c
@@ -89,9 +89,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-add-contact.c b/tests/libebook/client/test-client-add-contact.c
index 62fc0a9..b3a7af5 100644
--- a/tests/libebook/client/test-client-add-contact.c
+++ b/tests/libebook/client/test-client-add-contact.c
@@ -65,9 +65,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-custom-summary.c 
b/tests/libebook/client/test-client-custom-summary.c
index 70a619b..12f1e7c 100644
--- a/tests/libebook/client/test-client-custom-summary.c
+++ b/tests/libebook/client/test-client-custom-summary.c
@@ -312,9 +312,6 @@ main (gint argc,
                { uid_test,    TRUE,  TRUE,  "/EBookClient/Custom/DirectAccess/SearchUID" }
        };
 
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-e164-param.c b/tests/libebook/client/test-client-e164-param.c
index f96d5af..45f8651 100644
--- a/tests/libebook/client/test-client-e164-param.c
+++ b/tests/libebook/client/test-client-e164-param.c
@@ -134,9 +134,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-get-contact-uids.c 
b/tests/libebook/client/test-client-get-contact-uids.c
index c7f435f..97b1290 100644
--- a/tests/libebook/client/test-client-get-contact-uids.c
+++ b/tests/libebook/client/test-client-get-contact-uids.c
@@ -93,9 +93,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-get-contact.c b/tests/libebook/client/test-client-get-contact.c
index 831e050..f11818c 100644
--- a/tests/libebook/client/test-client-get-contact.c
+++ b/tests/libebook/client/test-client-get-contact.c
@@ -68,9 +68,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-get-revision.c 
b/tests/libebook/client/test-client-get-revision.c
index c31e6f9..d5e392b 100644
--- a/tests/libebook/client/test-client-get-revision.c
+++ b/tests/libebook/client/test-client-get-revision.c
@@ -64,9 +64,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-get-view.c b/tests/libebook/client/test-client-get-view.c
index 2917447..846f0e2 100644
--- a/tests/libebook/client/test-client-get-view.c
+++ b/tests/libebook/client/test-client-get-view.c
@@ -143,9 +143,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-modify-contact.c 
b/tests/libebook/client/test-client-modify-contact.c
index 4d2fc41..ae20908 100644
--- a/tests/libebook/client/test-client-modify-contact.c
+++ b/tests/libebook/client/test-client-modify-contact.c
@@ -129,9 +129,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-photo-is-uri.c 
b/tests/libebook/client/test-client-photo-is-uri.c
index 1a0b33c..0c5d4e5 100644
--- a/tests/libebook/client/test-client-photo-is-uri.c
+++ b/tests/libebook/client/test-client-photo-is-uri.c
@@ -332,9 +332,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-preserve-uid.c 
b/tests/libebook/client/test-client-preserve-uid.c
index 6558b3d..28e8e85 100644
--- a/tests/libebook/client/test-client-preserve-uid.c
+++ b/tests/libebook/client/test-client-preserve-uid.c
@@ -88,9 +88,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-refresh.c b/tests/libebook/client/test-client-refresh.c
index 75a0276..654c479 100644
--- a/tests/libebook/client/test-client-refresh.c
+++ b/tests/libebook/client/test-client-refresh.c
@@ -75,9 +75,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-remove-contact-by-uid.c 
b/tests/libebook/client/test-client-remove-contact-by-uid.c
index e2abde8..f19ac00 100644
--- a/tests/libebook/client/test-client-remove-contact-by-uid.c
+++ b/tests/libebook/client/test-client-remove-contact-by-uid.c
@@ -91,9 +91,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-remove-contact.c 
b/tests/libebook/client/test-client-remove-contact.c
index 52ae74a..2579a53 100644
--- a/tests/libebook/client/test-client-remove-contact.c
+++ b/tests/libebook/client/test-client-remove-contact.c
@@ -112,9 +112,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-remove-contacts.c 
b/tests/libebook/client/test-client-remove-contacts.c
index eb1fb16..5d8d4a4 100644
--- a/tests/libebook/client/test-client-remove-contacts.c
+++ b/tests/libebook/client/test-client-remove-contacts.c
@@ -123,9 +123,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-revision-view.c 
b/tests/libebook/client/test-client-revision-view.c
index 88a72ec..eaf902f 100644
--- a/tests/libebook/client/test-client-revision-view.c
+++ b/tests/libebook/client/test-client-revision-view.c
@@ -219,9 +219,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-self.c b/tests/libebook/client/test-client-self.c
index 94544f8..ee69a67 100644
--- a/tests/libebook/client/test-client-self.c
+++ b/tests/libebook/client/test-client-self.c
@@ -80,9 +80,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-suppress-notifications.c 
b/tests/libebook/client/test-client-suppress-notifications.c
index fd6bf2e..d745d9e 100644
--- a/tests/libebook/client/test-client-suppress-notifications.c
+++ b/tests/libebook/client/test-client-suppress-notifications.c
@@ -184,9 +184,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-uid-only-view.c 
b/tests/libebook/client/test-client-uid-only-view.c
index a989c4e..819d972 100644
--- a/tests/libebook/client/test-client-uid-only-view.c
+++ b/tests/libebook/client/test-client-uid-only-view.c
@@ -303,9 +303,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-view-operations.c 
b/tests/libebook/client/test-client-view-operations.c
index 54699d5..86de774 100644
--- a/tests/libebook/client/test-client-view-operations.c
+++ b/tests/libebook/client/test-client-view-operations.c
@@ -373,9 +373,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/client/test-client-write-write.c b/tests/libebook/client/test-client-write-write.c
index 4425302..4fc29ee 100644
--- a/tests/libebook/client/test-client-write-write.c
+++ b/tests/libebook/client/test-client-write-write.c
@@ -320,9 +320,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/test-ebook-add-contact.c b/tests/libebook/test-ebook-add-contact.c
index 236898d..667c749 100644
--- a/tests/libebook/test-ebook-add-contact.c
+++ b/tests/libebook/test-ebook-add-contact.c
@@ -48,9 +48,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/test-ebook-commit-contact.c b/tests/libebook/test-ebook-commit-contact.c
index 5f05a01..e088f36 100644
--- a/tests/libebook/test-ebook-commit-contact.c
+++ b/tests/libebook/test-ebook-commit-contact.c
@@ -98,9 +98,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/test-ebook-get-book-view.c b/tests/libebook/test-ebook-get-book-view.c
index a4961d5..cd57d4f 100644
--- a/tests/libebook/test-ebook-get-book-view.c
+++ b/tests/libebook/test-ebook-get-book-view.c
@@ -143,9 +143,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/test-ebook-get-contact.c b/tests/libebook/test-ebook-get-contact.c
index ce6c407..f9325de 100644
--- a/tests/libebook/test-ebook-get-contact.c
+++ b/tests/libebook/test-ebook-get-contact.c
@@ -46,9 +46,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/test-ebook-get-required-fields.c b/tests/libebook/test-ebook-get-required-fields.c
index 467258f..c3ca138 100644
--- a/tests/libebook/test-ebook-get-required-fields.c
+++ b/tests/libebook/test-ebook-get-required-fields.c
@@ -72,9 +72,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/test-ebook-get-static-capabilities.c 
b/tests/libebook/test-ebook-get-static-capabilities.c
index ac6dcc3..bd81802 100644
--- a/tests/libebook/test-ebook-get-static-capabilities.c
+++ b/tests/libebook/test-ebook-get-static-capabilities.c
@@ -26,9 +26,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/test-ebook-get-supported-auth-methods.c 
b/tests/libebook/test-ebook-get-supported-auth-methods.c
index 9f7ec30..cbf39db 100644
--- a/tests/libebook/test-ebook-get-supported-auth-methods.c
+++ b/tests/libebook/test-ebook-get-supported-auth-methods.c
@@ -96,9 +96,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/test-ebook-get-supported-fields.c 
b/tests/libebook/test-ebook-get-supported-fields.c
index 771abdb..5af368c 100644
--- a/tests/libebook/test-ebook-get-supported-fields.c
+++ b/tests/libebook/test-ebook-get-supported-fields.c
@@ -74,9 +74,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/test-ebook-remove-contact-by-id.c 
b/tests/libebook/test-ebook-remove-contact-by-id.c
index dd672a6..bab79d9 100644
--- a/tests/libebook/test-ebook-remove-contact-by-id.c
+++ b/tests/libebook/test-ebook-remove-contact-by-id.c
@@ -29,9 +29,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/test-ebook-remove-contact.c b/tests/libebook/test-ebook-remove-contact.c
index c3aa8f5..04114bc 100644
--- a/tests/libebook/test-ebook-remove-contact.c
+++ b/tests/libebook/test-ebook-remove-contact.c
@@ -54,9 +54,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/test-ebook-remove-contacts.c b/tests/libebook/test-ebook-remove-contacts.c
index 8a2842b..41effa8 100644
--- a/tests/libebook/test-ebook-remove-contacts.c
+++ b/tests/libebook/test-ebook-remove-contacts.c
@@ -70,9 +70,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libebook/vcard/dump-vcard.c b/tests/libebook/vcard/dump-vcard.c
index c8c9260..685acbd 100644
--- a/tests/libebook/vcard/dump-vcard.c
+++ b/tests/libebook/vcard/dump-vcard.c
@@ -17,10 +17,6 @@ main (gint argc,
                return 1;
        }
 
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init_with_debug_flags (G_TYPE_DEBUG_OBJECTS);
-#endif
-
        fp = fopen (argv[1], "r");
        if (fp == NULL) {
                g_warning ("Faile to open vCard file '%s'", argv[1]);
diff --git a/tests/libecal/client/test-client-add-timezone.c b/tests/libecal/client/test-client-add-timezone.c
index 8ef5a65..b450dc2 100644
--- a/tests/libecal/client/test-client-add-timezone.c
+++ b/tests/libecal/client/test-client-add-timezone.c
@@ -128,9 +128,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/client/test-client-bulk-methods.c b/tests/libecal/client/test-client-bulk-methods.c
index 9f2d3c8..689e5cc 100644
--- a/tests/libecal/client/test-client-bulk-methods.c
+++ b/tests/libecal/client/test-client-bulk-methods.c
@@ -199,9 +199,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/client/test-client-create-object.c 
b/tests/libecal/client/test-client-create-object.c
index c8d1a8c..a7c5881 100644
--- a/tests/libecal/client/test-client-create-object.c
+++ b/tests/libecal/client/test-client-create-object.c
@@ -206,9 +206,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/client/test-client-get-attachment-uris.c 
b/tests/libecal/client/test-client-get-attachment-uris.c
index 78c32f0..7390267 100644
--- a/tests/libecal/client/test-client-get-attachment-uris.c
+++ b/tests/libecal/client/test-client-get-attachment-uris.c
@@ -143,9 +143,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/client/test-client-get-free-busy.c 
b/tests/libecal/client/test-client-get-free-busy.c
index c24df2d..79acb98 100644
--- a/tests/libecal/client/test-client-get-free-busy.c
+++ b/tests/libecal/client/test-client-get-free-busy.c
@@ -172,9 +172,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/client/test-client-get-object-list.c 
b/tests/libecal/client/test-client-get-object-list.c
index 04ac694..45f296c 100644
--- a/tests/libecal/client/test-client-get-object-list.c
+++ b/tests/libecal/client/test-client-get-object-list.c
@@ -130,9 +130,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/client/test-client-get-revision.c b/tests/libecal/client/test-client-get-revision.c
index 3087368..5a27307 100644
--- a/tests/libecal/client/test-client-get-revision.c
+++ b/tests/libecal/client/test-client-get-revision.c
@@ -70,9 +70,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/client/test-client-get-view.c b/tests/libecal/client/test-client-get-view.c
index 6ef0118..32d0783 100644
--- a/tests/libecal/client/test-client-get-view.c
+++ b/tests/libecal/client/test-client-get-view.c
@@ -207,9 +207,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/client/test-client-modify-object.c 
b/tests/libecal/client/test-client-modify-object.c
index 7da3dcd..44be09f 100644
--- a/tests/libecal/client/test-client-modify-object.c
+++ b/tests/libecal/client/test-client-modify-object.c
@@ -127,9 +127,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/client/test-client-receive-objects.c 
b/tests/libecal/client/test-client-receive-objects.c
index aaaa789..2ba68fa 100644
--- a/tests/libecal/client/test-client-receive-objects.c
+++ b/tests/libecal/client/test-client-receive-objects.c
@@ -82,9 +82,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/client/test-client-refresh.c b/tests/libecal/client/test-client-refresh.c
index 3aaa845..93cc1b4 100644
--- a/tests/libecal/client/test-client-refresh.c
+++ b/tests/libecal/client/test-client-refresh.c
@@ -91,9 +91,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/client/test-client-remove-object.c 
b/tests/libecal/client/test-client-remove-object.c
index 4b4287f..601209e 100644
--- a/tests/libecal/client/test-client-remove-object.c
+++ b/tests/libecal/client/test-client-remove-object.c
@@ -108,9 +108,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/client/test-client-revision-view.c 
b/tests/libecal/client/test-client-revision-view.c
index 396298b..663d867 100644
--- a/tests/libecal/client/test-client-revision-view.c
+++ b/tests/libecal/client/test-client-revision-view.c
@@ -257,9 +257,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/client/test-client-send-objects.c b/tests/libecal/client/test-client-send-objects.c
index 1d1a809..2d85f73 100644
--- a/tests/libecal/client/test-client-send-objects.c
+++ b/tests/libecal/client/test-client-send-objects.c
@@ -149,9 +149,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/test-ecal-add-timezone.c b/tests/libecal/test-ecal-add-timezone.c
index 65935fe..e51f215 100644
--- a/tests/libecal/test-ecal-add-timezone.c
+++ b/tests/libecal/test-ecal-add-timezone.c
@@ -49,9 +49,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/test-ecal-create-object--2.c b/tests/libecal/test-ecal-create-object--2.c
index 11ea3f6..881c14b 100644
--- a/tests/libecal/test-ecal-create-object--2.c
+++ b/tests/libecal/test-ecal-create-object--2.c
@@ -45,9 +45,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/test-ecal-create-object.c b/tests/libecal/test-ecal-create-object.c
index 4a235ce..3c40d66 100644
--- a/tests/libecal/test-ecal-create-object.c
+++ b/tests/libecal/test-ecal-create-object.c
@@ -40,9 +40,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/test-ecal-get-alarm-email-address.c 
b/tests/libecal/test-ecal-get-alarm-email-address.c
index 106aba3..454ed65 100644
--- a/tests/libecal/test-ecal-get-alarm-email-address.c
+++ b/tests/libecal/test-ecal-get-alarm-email-address.c
@@ -27,9 +27,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/test-ecal-get-cal-address.c b/tests/libecal/test-ecal-get-cal-address.c
index 2950d96..a433a1e 100644
--- a/tests/libecal/test-ecal-get-cal-address.c
+++ b/tests/libecal/test-ecal-get-cal-address.c
@@ -27,9 +27,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/test-ecal-get-capabilities.c b/tests/libecal/test-ecal-get-capabilities.c
index b9fe9ce..037d9ca 100644
--- a/tests/libecal/test-ecal-get-capabilities.c
+++ b/tests/libecal/test-ecal-get-capabilities.c
@@ -23,9 +23,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/test-ecal-get-default-object.c b/tests/libecal/test-ecal-get-default-object.c
index 8faae69..4cbb851 100644
--- a/tests/libecal/test-ecal-get-default-object.c
+++ b/tests/libecal/test-ecal-get-default-object.c
@@ -31,9 +31,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/test-ecal-get-free-busy.c b/tests/libecal/test-ecal-get-free-busy.c
index b302c8c..016bd36 100644
--- a/tests/libecal/test-ecal-get-free-busy.c
+++ b/tests/libecal/test-ecal-get-free-busy.c
@@ -105,9 +105,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/test-ecal-get-ldap-attribute.c b/tests/libecal/test-ecal-get-ldap-attribute.c
index 81af267..b8d0e4e 100644
--- a/tests/libecal/test-ecal-get-ldap-attribute.c
+++ b/tests/libecal/test-ecal-get-ldap-attribute.c
@@ -33,9 +33,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/test-ecal-get-object-list.c b/tests/libecal/test-ecal-get-object-list.c
index a801cbc..d90d83e 100644
--- a/tests/libecal/test-ecal-get-object-list.c
+++ b/tests/libecal/test-ecal-get-object-list.c
@@ -54,9 +54,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/test-ecal-get-objects-for-uid.c b/tests/libecal/test-ecal-get-objects-for-uid.c
index 334adc0..6bb4414 100644
--- a/tests/libecal/test-ecal-get-objects-for-uid.c
+++ b/tests/libecal/test-ecal-get-objects-for-uid.c
@@ -53,9 +53,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/test-ecal-get-query.c b/tests/libecal/test-ecal-get-query.c
index f2c2a31..8ef7ff2 100644
--- a/tests/libecal/test-ecal-get-query.c
+++ b/tests/libecal/test-ecal-get-query.c
@@ -190,9 +190,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/test-ecal-get-timezone.c b/tests/libecal/test-ecal-get-timezone.c
index 30271b8..0789f19 100644
--- a/tests/libecal/test-ecal-get-timezone.c
+++ b/tests/libecal/test-ecal-get-timezone.c
@@ -30,9 +30,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/test-ecal-modify-object.c b/tests/libecal/test-ecal-modify-object.c
index fd79753..eaf594b 100644
--- a/tests/libecal/test-ecal-modify-object.c
+++ b/tests/libecal/test-ecal-modify-object.c
@@ -69,9 +69,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/test-ecal-receive-objects.c b/tests/libecal/test-ecal-receive-objects.c
index 840fa05..a726852 100644
--- a/tests/libecal/test-ecal-receive-objects.c
+++ b/tests/libecal/test-ecal-receive-objects.c
@@ -38,9 +38,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/test-ecal-remove-object.c b/tests/libecal/test-ecal-remove-object.c
index 39422c5..dd0d9f8 100644
--- a/tests/libecal/test-ecal-remove-object.c
+++ b/tests/libecal/test-ecal-remove-object.c
@@ -41,9 +41,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/test-ecal-send-objects.c b/tests/libecal/test-ecal-send-objects.c
index 48553fd..e47890c 100644
--- a/tests/libecal/test-ecal-send-objects.c
+++ b/tests/libecal/test-ecal-send-objects.c
@@ -47,9 +47,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libecal/test-ecal-set-default-timezone.c b/tests/libecal/test-ecal-set-default-timezone.c
index d8c40a4..0d951c8 100644
--- a/tests/libecal/test-ecal-set-default-timezone.c
+++ b/tests/libecal/test-ecal-set-default-timezone.c
@@ -53,9 +53,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libedata-cal/test-cal-backend-sexp.c b/tests/libedata-cal/test-cal-backend-sexp.c
index 957c534..52951f0 100644
--- a/tests/libedata-cal/test-cal-backend-sexp.c
+++ b/tests/libedata-cal/test-cal-backend-sexp.c
@@ -15,10 +15,9 @@ test_query (const gchar *query)
        }
 }
 
-gint main (gint argc, gchar **argv)
+gint
+main (gint argc, gchar **argv)
 {
-       g_type_init ();
-
        /* e_sexp_add_variable(f, 0, "test", NULL); */
 
        if (argc < 2 || !argv[1])
diff --git a/tests/libedata-cal/test-intervaltree.c b/tests/libedata-cal/test-intervaltree.c
index 248cf7c..b14a56b 100644
--- a/tests/libedata-cal/test-intervaltree.c
+++ b/tests/libedata-cal/test-intervaltree.c
@@ -463,8 +463,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-       g_type_init ();
-
        myrand = g_rand_new ();
        mem_test ();
        random_test ();
diff --git a/tests/libedataserver/e-source-registry-test.c b/tests/libedataserver/e-source-registry-test.c
index 6c2080c..a4f66fc 100644
--- a/tests/libedataserver/e-source-registry-test.c
+++ b/tests/libedataserver/e-source-registry-test.c
@@ -78,8 +78,6 @@ main (gint argc,
 {
        gint retval;
 
-       g_type_init ();
-
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libedataserver/e-source-test.c b/tests/libedataserver/e-source-test.c
index ca383c1..24f0478 100644
--- a/tests/libedataserver/e-source-test.c
+++ b/tests/libedataserver/e-source-test.c
@@ -230,8 +230,6 @@ gint
 main (gint argc,
       gchar **argv)
 {
-       g_type_init ();
-
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/libedataserver/e-user-prompter-test.c b/tests/libedataserver/e-user-prompter-test.c
index 701353d..46a1e9f 100644
--- a/tests/libedataserver/e-user-prompter-test.c
+++ b/tests/libedataserver/e-user-prompter-test.c
@@ -294,8 +294,6 @@ main (gint argc,
        TestClosure closure;
        gint retval;
 
-       g_type_init ();
-
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 
diff --git a/tests/test-server-utils/test-fixture.c b/tests/test-server-utils/test-fixture.c
index e976063..022e73d 100644
--- a/tests/test-server-utils/test-fixture.c
+++ b/tests/test-server-utils/test-fixture.c
@@ -49,9 +49,6 @@ main (gint argc,
        gint i;
        gint ret;
 
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-       g_type_init ();
-#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/";);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]