From 1cd42bc1b4f0591712bf1504bb4149add07e361f Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Thu, 19 Sep 2013 16:32:40 +0000
Subject: [PATCH] Don't call g_type_init in tests if Glib is v 2.36 or later.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/2.4@23178 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/app-utils/test/test-sx.c           | 2 ++
 src/backend/xml/test/test-load-xml2.c  | 2 ++
 src/gnome-utils/test/test-gnc-dialog.c | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/app-utils/test/test-sx.c b/src/app-utils/test/test-sx.c
index b765a1966d..380fda8c8c 100644
--- a/src/app-utils/test/test-sx.c
+++ b/src/app-utils/test/test-sx.c
@@ -193,7 +193,9 @@ int
 main(int argc, char **argv)
 {
     g_setenv ("GNC_UNINSTALLED", "1", TRUE);
+#ifndef HAVE_GLIB_2_36
     g_type_init();
+#endif
     qof_init();
     gnc_engine_init(0, NULL);
 
diff --git a/src/backend/xml/test/test-load-xml2.c b/src/backend/xml/test/test-load-xml2.c
index 1629a14a79..f41202656a 100644
--- a/src/backend/xml/test/test-load-xml2.c
+++ b/src/backend/xml/test/test-load-xml2.c
@@ -109,7 +109,9 @@ main (int argc, char ** argv)
     const char *location = g_getenv("GNC_TEST_FILES");
     GDir *xml2_dir;
 
+#ifndef HAVE_GLIB_2_36
     g_type_init();
+#endif
     qof_init();
     cashobjects_register();
     do_test(qof_load_backend_library ("../.libs/", GNC_LIB_NAME),
diff --git a/src/gnome-utils/test/test-gnc-dialog.c b/src/gnome-utils/test/test-gnc-dialog.c
index 2ffabec044..da024f699f 100644
--- a/src/gnome-utils/test/test-gnc-dialog.c
+++ b/src/gnome-utils/test/test-gnc-dialog.c
@@ -133,7 +133,9 @@ int main (int argc, char ** argv)
 
     gtk_init(&argc, &argv);
 
+#ifndef HAVE_GLIB_2_36
     g_type_init();
+#endif
     pw = gnc_dialog_new("budget.glade", "SampleOptions");
     gnc_dialog_set_cb(pw, apply_cb, close_cb, NULL, NULL);