r23178 - gnucash/branches/2.4/src - Don't call g_type_init in tests if Glib is v 2.36 or later.

[John Ralls]

Author: jralls
Date: 2013-09-19 12:32:40 -0400 (Thu, 19 Sep 2013)
New Revision: 23178
Trac: http://svn.gnucash.org/trac/changeset/23178

Modified:
   gnucash/branches/2.4/src/app-utils/test/test-sx.c
   gnucash/branches/2.4/src/backend/xml/test/test-load-xml2.c
   gnucash/branches/2.4/src/gnome-utils/test/test-gnc-dialog.c
Log:
Don't call g_type_init in tests if Glib is v 2.36 or later.

Modified: gnucash/branches/2.4/src/app-utils/test/test-sx.c
===================================================================
--- gnucash/branches/2.4/src/app-utils/test/test-sx.c	2013-09-19 16:32:25 UTC (rev 23177)
+++ gnucash/branches/2.4/src/app-utils/test/test-sx.c	2013-09-19 16:32:40 UTC (rev 23178)
@@ -193,7 +193,9 @@
 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);
 

Modified: gnucash/branches/2.4/src/backend/xml/test/test-load-xml2.c
===================================================================
--- gnucash/branches/2.4/src/backend/xml/test/test-load-xml2.c	2013-09-19 16:32:25 UTC (rev 23177)
+++ gnucash/branches/2.4/src/backend/xml/test/test-load-xml2.c	2013-09-19 16:32:40 UTC (rev 23178)
@@ -109,7 +109,9 @@
     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),

Modified: gnucash/branches/2.4/src/gnome-utils/test/test-gnc-dialog.c
===================================================================
--- gnucash/branches/2.4/src/gnome-utils/test/test-gnc-dialog.c	2013-09-19 16:32:25 UTC (rev 23177)
+++ gnucash/branches/2.4/src/gnome-utils/test/test-gnc-dialog.c	2013-09-19 16:32:40 UTC (rev 23178)
@@ -133,7 +133,9 @@
 
     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);