diff --git a/generator/ReturnValue.cs b/generator/ReturnValue.cs index 40d139f7e..4d70d123a 100644 --- a/generator/ReturnValue.cs +++ b/generator/ReturnValue.cs @@ -160,7 +160,7 @@ namespace GtkSharp.Generation { string args = ", typeof (" + ElementType + "), " + (owned ? "true" : "false") + ", " + (elements_owned ? "true" : "false"); var = "new " + IGen.QualifiedName + "(" + var + args + ")"; } else if (is_null_term) - return String.Format ("GLib.Marshaller.StringArrayToNullTermPointer ({0})", var); + return String.Format ("GLib.Marshaller.StringArrayToNullTermStrvPointer ({0})", var); else if (is_array) return String.Format ("GLib.Marshaller.ArrayToArrayPtr ({0})", var); diff --git a/glib/Marshaller.cs b/glib/Marshaller.cs index d28d57e9b..49ec19086 100644 --- a/glib/Marshaller.cs +++ b/glib/Marshaller.cs @@ -170,7 +170,7 @@ namespace GLib { return ret.Replace ("%", "%%"); } - internal static IntPtr StringArrayToStrvPtr (string[] strs) + public static IntPtr StringArrayToStrvPtr (string[] strs) { IntPtr[] ptrs = StringArrayToNullTermPointer (strs); IntPtr ret = g_malloc (new UIntPtr ((ulong) (ptrs.Length * IntPtr.Size))); @@ -178,6 +178,11 @@ namespace GLib { return ret; } + public static IntPtr StringArrayToNullTermStrvPointer (string[] strs) + { + return StringArrayToStrvPtr (strs); + } + public static IntPtr[] StringArrayToNullTermPointer (string[] strs) { if (strs == null)