Allow building against Glib 1.x.

[gob-dx.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 0e6c55c84c1709aeed581a94f1a7ac679a0bd689..4aea007800c761d77af255e9996f38c33348b01e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -153,9 +153,9 @@ make_bases (void)
        filebase = replace_sep (((Class *)class)->otype, file_sep);
        gob_strdown (filebase);
 
-       if (output_dir != NULL &&
-           output_dir[0] != '\0') {
-               fullfilebase = g_build_filename (output_dir, filebase, NULL);
+       if (output_dir != NULL && output_dir[0] != '\0') {
+               fullfilebase = g_strdup_printf("%s%c%s", output_dir,
+                                              G_DIR_SEPARATOR, filebase);
        } else {
                fullfilebase = g_strdup (filebase);
        }
@@ -3165,6 +3165,7 @@ static char *
 get_arg_names_for_macro (Method *m)
 {
        const char *sep;
+       char *ret;
        GList *li;
        GString *gs = g_string_new(NULL);
        sep = "";
@@ -3173,7 +3174,10 @@ get_arg_names_for_macro (Method *m)
                g_string_append_printf(gs, "%s___%s", sep, arg->name);
                sep = ",";
        }
-       return g_string_free (gs, FALSE);
+
+       ret = gs->str;
+       g_string_free(gs, FALSE);
+       return ret;
 }
 
 static gboolean method_is_void(Method *m)