[PATCH] corba: Replace deprecated constructs

[Detlev Zundel]

Signed-off-by: Detlev Zundel <address@hidden>
---
 gnome/corba/guile-gnome-corba-generic.c    |    2 +-
 gnome/corba/guile-gnome-corba-primitives.c |   14 +++++++-------
 gnome/corba/guile-gnome-corba-types.c      |   16 +++++++++-------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/gnome/corba/guile-gnome-corba-generic.c 
b/gnome/corba/guile-gnome-corba-generic.c
index 9515e6b..fe3418b 100644
--- a/gnome/corba/guile-gnome-corba-generic.c
+++ b/gnome/corba/guile-gnome-corba-generic.c
@@ -68,7 +68,7 @@ guile_corba_generic_make_type_name (const gchar *StudlyCaps)
                                   "gtype-name->class-name"));
     }
     
-    ret = scm_call_1 (de_studly_capsify, scm_makfrom0str (StudlyCaps));
+    ret = scm_call_1 (de_studly_capsify, scm_from_locale_string (StudlyCaps));
 
     return scm_to_locale_string (scm_symbol_to_string (ret));
 }
diff --git a/gnome/corba/guile-gnome-corba-primitives.c 
b/gnome/corba/guile-gnome-corba-primitives.c
index 0b63ff3..55effbb 100644
--- a/gnome/corba/guile-gnome-corba-primitives.c
+++ b/gnome/corba/guile-gnome-corba-primitives.c
@@ -90,7 +90,7 @@ make_scm_module_name (const gchar *module_name)
     parts = g_strsplit (module_name, ":", 0);
     for (ptr = parts; *ptr; ptr++)
        scm_name = scm_append_x (SCM_LIST2 (scm_name, SCM_LIST1 (
-                                                    scm_str2symbol (*ptr))));
+                                                    scm_from_locale_symbol 
(*ptr))));
     g_strfreev (parts);
 
     return scm_name;
@@ -115,22 +115,22 @@ scm_c_corba_handle_exception (CORBA_Environment *ev)
 {
     SCM name;
 
-    name = scm_mem2string (ev->_id, strlen (ev->_id));
+    name = scm_from_locale_stringn (ev->_id, strlen (ev->_id));
 
     if (ev->_major == CORBA_SYSTEM_EXCEPTION) {
        CORBA_SystemException *se = CORBA_exception_value (ev);
        SCM minor, completed;
 
-       minor = scm_long2num (se->minor);;
+       minor = scm_from_long (se->minor);;
        switch (se->completed) {
        case CORBA_COMPLETED_YES:
-           completed = scm_str2symbol ("completed");
+           completed = scm_from_locale_symbol ("completed");
            break;
        case CORBA_COMPLETED_NO:
-           completed = scm_str2symbol ("not-completed");
+           completed = scm_from_locale_symbol ("not-completed");
            break;
        default:
-           completed = scm_str2symbol ("maybe-completed");
+           completed = scm_from_locale_symbol ("maybe-completed");
            break;
        }
 
@@ -338,7 +338,7 @@ repo_id_to_symbol (const gchar *format, const gchar 
*repo_id)
     SCM retval;
 
     new_repo_id = guile_corba_generic_repo_id_to_name (format, repo_id);
-    retval = scm_mem2symbol (new_repo_id, strlen (new_repo_id));
+    retval = scm_from_locale_symboln (new_repo_id, strlen (new_repo_id));
     g_free (new_repo_id);
     return retval;
 }
diff --git a/gnome/corba/guile-gnome-corba-types.c 
b/gnome/corba/guile-gnome-corba-types.c
index dce2c77..57a9dfb 100644
--- a/gnome/corba/guile-gnome-corba-types.c
+++ b/gnome/corba/guile-gnome-corba-types.c
@@ -64,7 +64,7 @@ print_corba_struct (SCM corba_struct, SCM port)
     tc = SCM_CORBA_STRUCT_TYPECODE (corba_struct);
 
     message = g_strdup_printf ("<CORBA-struct %p - %s>", corba_struct, 
tc->repo_id);
-    retval = scm_simple_format (port, scm_makfrom0str (message), SCM_EOL);
+    retval = scm_simple_format (port, scm_from_locale_string (message), 
SCM_EOL);
     g_free (message);
 
     return retval;
@@ -84,7 +84,7 @@ print_corba_sequence (SCM corba_sequence, SCM port)
     tc = SCM_CORBA_SEQUENCE_TYPECODE (corba_sequence);
 
     message = g_strdup_printf ("<CORBA-sequence %p - %s>", corba_sequence, 
tc->subtypes [0]->repo_id);
-    retval = scm_simple_format (port, scm_makfrom0str (message), SCM_EOL);
+    retval = scm_simple_format (port, scm_from_locale_string (message), 
SCM_EOL);
     g_free (message);
 
     return retval;
@@ -105,7 +105,7 @@ SCM_DEFINE (scm_corba_struct_fields, "corba-struct-fields", 
1, 0, 0,
 
     fields = SCM_EOL;
     for (i = 0; i < tc->sub_parts; i++) {
-       SCM sym = scm_mem2symbol (tc->subnames [i], strlen (tc->subnames [i]));
+       SCM sym = scm_from_locale_symboln (tc->subnames [i], strlen 
(tc->subnames [i]));
        fields = scm_append_x (SCM_LIST2 (fields, SCM_LIST1 (sym)));
     }
 
@@ -489,7 +489,7 @@ case CORBA_tk_ ## k:                                        
                        \
     }
 
     case CORBA_tk_string:
-       retval = scm_mem2string (* (CORBA_char **) any->_value,
+       retval = scm_from_locale_stringn (* (CORBA_char **) any->_value,
                                 strlen (* (CORBA_char **) any->_value));
        break;
 
@@ -666,7 +666,7 @@ guile_corba_typecode_print (SCM typecode_smob, SCM port, 
scm_print_state *pstate
     CORBA_TypeCode tc = (CORBA_TypeCode) SCM_SMOB_DATA (typecode_smob);
      
     scm_puts ("#<CORBA-TypeCode ", port);
-    scm_display (scm_makfrom0str (tc->repo_id), port);
+    scm_display (scm_from_locale_string (tc->repo_id), port);
     scm_puts (">", port);
      
     /* non-zero means success */
@@ -814,7 +814,8 @@ scm_init_gnome_corba_types (void)
 
     gsubr = scm_c_make_gsubr ("%print-corba-struct", 2, 0, 0, 
print_corba_struct);
     scm_corba_struct_vtable = scm_permanent_object
-        (scm_make_vtable_vtable (scm_makfrom0str ("srprprprpopopW"), 
scm_from_int (0), SCM_LIST1 (gsubr)));
+        (scm_make_vtable_vtable (scm_from_locale_string ("srprprprpopopW"),
+                                scm_from_int (0), SCM_LIST1 (gsubr)));
     SCM_SET_CORBA_STRUCT_TYPECODE (scm_corba_struct_vtable, TC_CORBA_TypeCode);
     scm_c_define ("%corba-struct-vtable", scm_corba_struct_vtable);
     scm_c_define ("%corba-struct-vtable-offset-user", scm_from_int 
(scm_corba_struct_vtable_offset_user));
@@ -822,7 +823,8 @@ scm_init_gnome_corba_types (void)
 
     gsubr = scm_c_make_gsubr ("%print-corba-sequence", 2, 0, 0, 
print_corba_sequence);
     scm_corba_sequence_vtable = scm_permanent_object
-        (scm_make_vtable_vtable (scm_makfrom0str ("srprprprpopW"), 
scm_from_int (0), SCM_LIST1 (gsubr)));
+        (scm_make_vtable_vtable (scm_from_locale_string ("srprprprpopW"),
+                                scm_from_int (0), SCM_LIST1 (gsubr)));
     SCM_SET_CORBA_SEQUENCE_TYPECODE (scm_corba_sequence_vtable, 
TC_CORBA_TypeCode);
     scm_c_define ("%corba-sequence-vtable", scm_corba_sequence_vtable);
     scm_c_define ("%corba-sequence-vtable-offset-user", scm_from_int 
(scm_corba_sequence_vtable_offset_user));
-- 
1.7.1