summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2017-03-15 14:37:12 +0300
committermonsta <[email protected]>2017-03-15 14:37:12 +0300
commitd495cacd8d21bc1362816fab0cd8b10dba728bb6 (patch)
treec3d7fc08bec640cade69d017396503b9ec380454
parent7744d11bc6322f4db86a88af21bf9c16ed464a27 (diff)
downloadmate-calc-d495cacd8d21bc1362816fab0cd8b10dba728bb6.tar.bz2
mate-calc-d495cacd8d21bc1362816fab0cd8b10dba728bb6.tar.xz
drop old GLib code
-rw-r--r--src/mate-calc-cmd.c3
-rw-r--r--src/mate-calc.c4
-rw-r--r--src/math-equation.c12
-rw-r--r--src/test-mp-equation.c3
-rw-r--r--src/test-mp.c3
5 files changed, 2 insertions, 23 deletions
diff --git a/src/mate-calc-cmd.c b/src/mate-calc-cmd.c
index ed6b556..9c424af 100644
--- a/src/mate-calc-cmd.c
+++ b/src/mate-calc-cmd.c
@@ -74,9 +74,6 @@ 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 0094be8..891bc7e 100644
--- a/src/mate-calc.c
+++ b/src/mate-calc.c
@@ -189,10 +189,6 @@ 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);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
diff --git a/src/math-equation.c b/src/math-equation.c
index 8312511..3073804 100644
--- a/src/math-equation.c
+++ b/src/math-equation.c
@@ -1331,11 +1331,7 @@ math_equation_solve(MathEquation *equation)
equation->priv->in_solve = true;
math_equation_set_number_mode(equation, NORMAL);
- #if GLIB_CHECK_VERSION(2, 32, 0)
- g_thread_new("", math_equation_solve_real, equation);
- #else
- g_thread_create(math_equation_solve_real, equation, TRUE, NULL);
- #endif
+ g_thread_new("", math_equation_solve_real, equation);
g_timeout_add(50, math_equation_look_for_answer, equation);
g_timeout_add(100, math_equation_show_in_progress, equation);
@@ -1397,11 +1393,7 @@ math_equation_factorize(MathEquation *equation)
equation->priv->in_solve = true;
- #if GLIB_CHECK_VERSION(2, 32, 0)
- g_thread_new("", math_equation_factorize_real, equation);
- #else
- g_thread_create(math_equation_factorize_real, equation, TRUE, NULL);
- #endif
+ g_thread_new("", math_equation_factorize_real, equation);
g_timeout_add(50, math_equation_look_for_answer, equation);
g_timeout_add(100, math_equation_show_in_progress, equation);
diff --git a/src/test-mp-equation.c b/src/test-mp-equation.c
index 6460665..a3dfd70 100644
--- a/src/test-mp-equation.c
+++ b/src/test-mp-equation.c
@@ -619,9 +619,6 @@ 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 2b976ac..126b2df 100644
--- a/src/test-mp.c
+++ b/src/test-mp.c
@@ -229,9 +229,6 @@ 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();