From 5e27c642d0f755771873254c936261126d20deb8 Mon Sep 17 00:00:00 2001
From: Stefano Karapetsas <stefano@karapetsas.com>
Date: Mon, 28 Oct 2013 11:17:47 +0100
Subject: Fix g_type_init deprecations

---
 src/mate-calc-cmd.c    | 2 ++
 src/mate-calc.c        | 2 ++
 src/test-mp-equation.c | 2 ++
 src/test-mp.c          | 2 ++
 4 files changed, 8 insertions(+)

(limited to 'src')

diff --git a/src/mate-calc-cmd.c b/src/mate-calc-cmd.c
index e65ac5a..ed6b556 100644
--- a/src/mate-calc-cmd.c
+++ b/src/mate-calc-cmd.c
@@ -74,7 +74,9 @@ main(int argc, char **argv)
     /* Seed random number generator. */
     srand48((long) time((time_t *) 0));
 
+#if !GLIB_CHECK_VERSION (2, 36, 0)
     g_type_init ();
+#endif
     setlocale(LC_ALL, "");
 
     result_serializer = mp_serializer_new(MP_DISPLAY_FORMAT_AUTOMATIC, 10, 9);
diff --git a/src/mate-calc.c b/src/mate-calc.c
index 39c7f23..0094be8 100644
--- a/src/mate-calc.c
+++ b/src/mate-calc.c
@@ -189,7 +189,9 @@ int main(int argc, char **argv)
     gchar *source_currency, *target_currency;
     gchar *source_units, *target_units;
 
+#if !GLIB_CHECK_VERSION (2, 36, 0)
     g_type_init();
+#endif
 
     setlocale(LC_ALL, "");
     bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
diff --git a/src/test-mp-equation.c b/src/test-mp-equation.c
index 95bb4a8..6460665 100644
--- a/src/test-mp-equation.c
+++ b/src/test-mp-equation.c
@@ -619,7 +619,9 @@ int
 main (int argc, char **argv)
 {
     setlocale(LC_ALL, "C");
+#if !GLIB_CHECK_VERSION (2, 36, 0)
     g_type_init ();
+#endif
 
     test_conversions();
     test_equations();
diff --git a/src/test-mp.c b/src/test-mp.c
index a750f2a..2b976ac 100644
--- a/src/test-mp.c
+++ b/src/test-mp.c
@@ -229,7 +229,9 @@ int
 main (int argc, char **argv)
 {
     setlocale(LC_ALL, "C");
+#if !GLIB_CHECK_VERSION (2, 36, 0)
     g_type_init ();
+#endif
 
     test_mp();
     test_numbers();
-- 
cgit v1.2.1