Stop using deprecated APIs.

2 files changed, 6 insertions, 10 deletions

diff --git a/src/api.c b/src/api.c
index c6ec1a7..72ea6cd 100644
--- a/src/api.c
+++ b/src/api.c
@@ -34,7 +34,7 @@ extern GRobot *robot;
 SCM
 api_robot_turn (SCM s_n)
 {
-  g_robot_turn (robot, scm_num2int (s_n, 0, NULL));
+  g_robot_turn (robot, scm_to_int (s_n));
 
   return SCM_BOOL (TRUE);
 }
@@ -42,7 +42,7 @@ api_robot_turn (SCM s_n)
 SCM
 api_robot_move (SCM s_n)
 {
-  return SCM_BOOL (g_robot_move (robot, scm_num2int (s_n, 0, NULL)));
+  return SCM_BOOL (g_robot_move (robot, scm_to_int (s_n)));
 }
 
 SCM
@@ -107,7 +107,7 @@ api_robot_get_shields (void)
   g_object_get (robot, "shields", &shields, NULL);
 
   /* Returns the robot shields */
-  return (scm_long2num (shields));
+  return (scm_from_long (shields));
 }
 
 SCM
@@ -118,7 +118,7 @@ api_robot_get_energy (void)
   g_object_get (robot, "energy", &energy, NULL);
 
   /* Returns the robot energy */
-  return (scm_long2num (energy));
+  return (scm_from_long (energy));
 }
 
 SCM
@@ -129,7 +129,7 @@ api_robot_get_score (void)
   g_object_get (robot, "score", &score, NULL);
 
   /* Returns the robot score */
-  return (scm_long2num (score));
+  return (scm_from_long (score));
 }
 
 void
diff --git a/src/main.c b/src/main.c
index ece7cbc..6518bbd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -83,9 +83,6 @@ gint main(gint argc, gchar *argv[])
 		{NULL, 0, NULL, 0}
 	};
 
-	/* Initialize the GType system first */
-	g_type_init();
-
 	/* Check command line */
 
 	/* Create a robot Object */
@@ -296,9 +293,8 @@ void main_prog(void *closure, gint argc, gchar *argv[])
 		exit_nicely();
 	}
 
-	g_thread_init(NULL);
 	gdk_threads_init();
-	g_thread_create(callback, &loading, FALSE, NULL);
+	g_thread_unref(g_thread_new(NULL, callback, &loading));
 
 	/* ensure the robot is placed properly */
 	MAP_SET_OBJECT(map, G_ROBOT_POSITION_Y(robot),