From 1d3685497b97bd1ad59bd5e0adbcfe93e869c369 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrg=20Billeter?= Date: Tue, 20 Mar 2007 14:10:39 +0000 Subject: [PATCH] wrap functions for escaping markup strings, patch by Mathias Hasselmann MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2007-03-20 Jürg Billeter * vapi/glib-2.0.vala: wrap functions for escaping markup strings, patch by Mathias Hasselmann svn path=/trunk/; revision=245 --- vala/ChangeLog | 5 +++++ vala/vapi/glib-2.0.vala | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/vala/ChangeLog b/vala/ChangeLog index b2e3e87..eaabac6 100644 --- a/vala/ChangeLog +++ b/vala/ChangeLog @@ -1,5 +1,10 @@ 2007-03-20 Jürg Billeter + * vapi/glib-2.0.vala: wrap functions for escaping markup strings, patch + by Mathias Hasselmann + +2007-03-20 Jürg Billeter + * vala/valacodegenerator.vala: free lists of interfaces correctly, patch by Mathias Hasselmann diff --git a/vala/vapi/glib-2.0.vala b/vala/vapi/glib-2.0.vala index 11f6373..d95b2e6 100644 --- a/vala/vapi/glib-2.0.vala +++ b/vala/vapi/glib-2.0.vala @@ -178,8 +178,7 @@ public struct string { public bool has_prefix (string! prefix); [CCode (cname = "g_str_has_suffix")] public bool has_suffix (string! suffix); - [CCode (cname = "g_strdup_printf")] - [PrintfFormat ()] + [CCode (cname = "g_strdup_printf"), PrintfFormat] public ref string printf (...); [CCode (cname = "g_strconcat")] public ref string concat (string string2, ...); @@ -964,7 +963,7 @@ namespace GLib { public bool parse (string text, long text_len, out Error error); } - [NoArrayLength ()] + [NoArrayLength] public callback void MarkupParserStartElementFunc (MarkupParseContext context, string element_name, string[] attribute_names, string[] attribute_values, pointer user_data, out Error error); public callback void MarkupParserEndElementFunc (MarkupParseContext context, string element_name, pointer user_data, out Error error); @@ -983,7 +982,13 @@ namespace GLib { public MarkupParserPassthroughFunc passthrough; public MarkupParserErrorFunc error; } - + + public struct Markup { + public static string! escape_text (string! text, long length = -1); + [PrintfFormat] + public static string! printf_escaped (string! format, ...); + } + /* Key-value file parser */ [ReferenceType (free_function = "g_key_file_free")] -- 2.7.4