[PATCH] glib: Replace deprecated constructs

[Detlev Zundel]

Signed-off-by: Detlev Zundel <address@hidden>
---
 gnome/gobject/gobject.c |    7 ++++---
 gnome/gobject/gutil.c   |    8 ++++----
 gnome/gobject/gvalue.c  |    8 ++++----
 gnome/gw/glib-support.c |    4 ++--
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/gnome/gobject/gobject.c b/gnome/gobject/gobject.c
index 1a8a891..b4b92bd 100644
--- a/gnome/gobject/gobject.c
+++ b/gnome/gobject/gobject.c
@@ -78,7 +78,7 @@ scm_with_c_gobject_get_property (GObject *gobject, guint 
param_id,
     scm_c_gvalue_set (dest_gvalue,
                       scm_call_2 (_gobject_get_property,
                                   scm_c_gtype_instance_to_scm (gobject),
-                                  scm_str2symbol (pspec->name)));
+                                  scm_from_locale_symbol (pspec->name)));
 }
 
 static void
@@ -94,7 +94,7 @@ scm_with_c_gobject_set_property (GObject *gobject, guint 
param_id, const GValue
 {
     scm_call_3 (_gobject_set_property,
                 scm_c_gtype_instance_to_scm (gobject),
-                scm_str2symbol (pspec->name),
+                scm_from_locale_symbol (pspec->name),
                 scm_c_gvalue_to_scm (src_value));
 }
 
@@ -490,7 +490,8 @@ SCM_DEFINE (scm_gobject_class_install_property, 
"gobject-class-install-property"
     if (g_object_class_find_property (gclass, gparam->name))
         scm_error (sym_gruntime_error, FUNC_NAME,
                    "There is already a property with this name in class ~S: 
~S",
-                   SCM_LIST2 (class, scm_makfrom0str (gparam->name)), SCM_EOL);
+                   SCM_LIST2 (class, scm_from_locale_string (gparam->name)),
+                  SCM_EOL);
 
     guile_class = g_type_get_qdata (gtype, quark_guile_gtype_class);
     if (!guile_class)
diff --git a/gnome/gobject/gutil.c b/gnome/gobject/gutil.c
index 8906eb4..adf212b 100644
--- a/gnome/gobject/gutil.c
+++ b/gnome/gobject/gutil.c
@@ -26,9 +26,9 @@
 SCM
 scm_c_gerror_to_scm (GError *error)
 {
-  return scm_list_3 (scm_ulong2num(error->domain),
-                     scm_ulong2num(error->code),
-                     scm_makfrom0str(error->message));
+  return scm_list_3 (scm_from_ulong(error->domain),
+                     scm_from_ulong(error->code),
+                     scm_from_locale_string(error->message));
 }
 
 void
@@ -36,5 +36,5 @@ scm_c_raise_gerror (GError *error)
 {
   SCM scm_gerror = scm_c_gerror_to_scm (error);
   g_error_free (error);
-  scm_throw (scm_str2symbol("g-error"), scm_gerror);
+  scm_throw (scm_from_locale_symbol("g-error"), scm_gerror);
 }
diff --git a/gnome/gobject/gvalue.c b/gnome/gobject/gvalue.c
index fbdd23a..1b9327e 100644
--- a/gnome/gobject/gvalue.c
+++ b/gnome/gobject/gvalue.c
@@ -237,10 +237,10 @@ scm_c_gvalue_ref (const GValue *gvalue)
        return scm_from_ulong_long (g_value_get_uint64 (gvalue));
 
     case G_TYPE_FLOAT:
-       return scm_make_real ((double) g_value_get_float (gvalue));
+       return scm_from_double ((double) g_value_get_float (gvalue));
 
     case G_TYPE_DOUBLE:
-       return scm_make_real (g_value_get_double (gvalue));
+       return scm_from_double (g_value_get_double (gvalue));
 
     case G_TYPE_STRING:
         {
@@ -339,14 +339,14 @@ scm_c_gvalue_set (GValue *gvalue, SCM value)
        break;
 
     case G_TYPE_FLOAT: {
-       double x = scm_num2dbl (value, FUNC_NAME);
+       double x = scm_to_double (value);
        SCM_ASSERT_RANGE (2, value, (- G_MAXFLOAT < x) && (x < G_MAXFLOAT));
        g_value_set_float (gvalue, (float) x);
        break;
     }
 
     case G_TYPE_DOUBLE:
-       g_value_set_double (gvalue, scm_num2dbl (value, FUNC_NAME));
+       g_value_set_double (gvalue, scm_to_double (value));
        break;
 
     case G_TYPE_STRING:
diff --git a/gnome/gw/glib-support.c b/gnome/gw/glib-support.c
index 1cf1e3c..0776d29 100644
--- a/gnome/gw/glib-support.c
+++ b/gnome/gw/glib-support.c
@@ -260,7 +260,7 @@ _wrap_g_main_loop_run (GMainLoop *loop)
 SCM
 _wrap_g_string_get_str (GString *str)
 {
-    return scm_mem2string (str->str, str->len);
+    return scm_from_locale_stringn (str->str, str->len);
 }
 
 struct io_args {
@@ -277,7 +277,7 @@ _with_io_func (gpointer data)
 
     result = scm_call_2 (args->proc,
                          gw_wcp_assimilate_ptr (args->source, iochannel_type),
-                         scm_long2num (args->condition));
+                         scm_from_long (args->condition));
     return result != SCM_BOOL_F ? (void*)1 : (void*)0;
 }
     
-- 
1.7.1