From: Jürg Billeter <j@bitron.ch>
Date: Tue, 20 Mar 2007 14:10:39 +0000 (+0000)
Subject: wrap functions for escaping markup strings, patch by Mathias Hasselmann
X-Git-Tag: VALA_0_0_8~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1d3685497b97bd1ad59bd5e0adbcfe93e869c369;p=platform%2Fupstream%2Fvala.git

wrap functions for escaping markup strings, patch by Mathias Hasselmann

2007-03-20  Jürg Billeter  <j@bitron.ch>

	* vapi/glib-2.0.vala: wrap functions for escaping markup strings, patch
	  by Mathias Hasselmann

svn path=/trunk/; revision=245
---

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  <j@bitron.ch>
 
+	* vapi/glib-2.0.vala: wrap functions for escaping markup strings, patch
+	  by Mathias Hasselmann
+
+2007-03-20  Jürg Billeter  <j@bitron.ch>
+
 	* 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")]