Reduced warnings

8 files changed, 4 insertions, 9 deletions

diff --git a/test/c/test-datasource.c b/test/c/test-datasource.c
index 485c228d..14bac27e 100644
--- a/test/c/test-datasource.c
+++ b/test/c/test-datasource.c
@@ -108,6 +108,7 @@ test_to_from_variant (Fixture *fix, gconstpointer data)
   gint64               now;
   GError**             error;
 
+  error = NULL;
   /* Build the data source to serialize */
   orig = zeitgeist_data_source_new_full ("my-id", "my-name",
                                         "my description", NULL);
@@ -142,7 +143,6 @@ int
 main (int   argc,
       char *argv[])
 {
-  g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add ("/Zeitgeist/DataSource/CreateEmpty", Fixture, NULL,
diff --git a/test/c/test-event.c b/test/c/test-event.c
index d2396799..3a09600d 100644
--- a/test/c/test-event.c
+++ b/test/c/test-event.c
@@ -144,8 +144,9 @@ test_from_variant (Fixture *fix, gconstpointer data)
   ZeitgeistEvent *ev;
   ZeitgeistSubject *su;
   GByteArray *payload;
-  GError *error;
+  GError **error;
 
+  error = NULL;
   g_variant_builder_init (&b, G_VARIANT_TYPE ("(" ZEITGEIST_EVENT_SIGNATURE ")"));
 
   /* Build event data */
@@ -424,7 +425,6 @@ int
 main (int   argc,
       char *argv[])
 {
-  g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add ("/Zeitgeist/Event/CreateEmpty", Fixture, NULL,
diff --git a/test/c/test-log.c b/test/c/test-log.c
index 98e12594..b392ea90 100644
--- a/test/c/test-log.c
+++ b/test/c/test-log.c
@@ -202,7 +202,6 @@ int
 main (int   argc,
       char *argv[])
 {
-  g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add ("/Zeitgeist/Log/InsertGetDelete", Fixture, NULL,
diff --git a/test/c/test-mimetypes.c b/test/c/test-mimetypes.c
index 370c84cd..799656f8 100644
--- a/test/c/test-mimetypes.c
+++ b/test/c/test-mimetypes.c
@@ -79,7 +79,6 @@ int
 main (int   argc,
       char *argv[])
 {
-  g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add ("/Zeitgeist/Mime/TextPlain", Fixture, NULL,
diff --git a/test/c/test-monitor.c b/test/c/test-monitor.c
index 6a28fc14..5ee76402 100644
--- a/test/c/test-monitor.c
+++ b/test/c/test-monitor.c
@@ -67,7 +67,6 @@ int
 main (int   argc,
       char *argv[])
 {
-  g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add ("/Zeitgeist/Monitor/Create", Fixture, NULL,
diff --git a/test/c/test-symbols.c b/test/c/test-symbols.c
index 3a63ebe3..636db6fd 100644
--- a/test/c/test-symbols.c
+++ b/test/c/test-symbols.c
@@ -181,7 +181,6 @@ int
 main (int   argc,
       char *argv[])
 {
-  g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add ("/Zeitgeist/Symbols/NullNull", Fixture, NULL,
diff --git a/test/c/test-timerange.c b/test/c/test-timerange.c
index 4fad4183..e52c0b00 100644
--- a/test/c/test-timerange.c
+++ b/test/c/test-timerange.c
@@ -104,6 +104,7 @@ test_from_variant (Fixture *fix, gconstpointer data)
   gint64              i,j;
   GError             **error;
 
+  error = NULL;
   v = g_variant_new ("(xx)",
                      G_GINT64_CONSTANT(0), G_MAXINT64);
   g_variant_get (v, "(xx)", &i, &j);
@@ -137,7 +138,6 @@ int
 main (int   argc,
       char *argv[])
 {
-  g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add ("/Zeitgeist/TimeRange/Create", Fixture, NULL,
diff --git a/test/c/test-timestamp.c b/test/c/test-timestamp.c
index 83aaee3e..7f4307e3 100644
--- a/test/c/test-timestamp.c
+++ b/test/c/test-timestamp.c
@@ -159,7 +159,6 @@ int
 main (int   argc,
       char *argv[])
 {
-  g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add ("/Zeitgeist/Timestamp/FromISO8601", Fixture, NULL,