From: Jürg Billeter <j@bitron.ch>
Date: Thu, 9 Nov 2006 09:21:51 +0000 (+0000)
Subject: some fixes and additions
X-Git-Tag: VALA_0_0_6~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=024a162376ec3562290b05aec0f76d8634332e7f;p=thirdparty%2Fvala.git

some fixes and additions

2006-11-09  Jürg Billeter  <j@bitron.ch>

	* vapi/libxml-2.0.vala: some fixes and additions

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

diff --git a/vala/ChangeLog b/vala/ChangeLog
index 6f2a4cc4e..434d48765 100644
--- a/vala/ChangeLog
+++ b/vala/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-09  Jürg Billeter  <j@bitron.ch>
+
+	* vapi/libxml-2.0.vala: some fixes and additions
+
 2006-11-08  Jürg Billeter  <j@bitron.ch>
 
 	* vala/valacodegenerator.vala: support interfaces in header cycles
diff --git a/vala/vapi/libxml-2.0.vala b/vala/vapi/libxml-2.0.vala
index a2b17bd00..c1b3b125f 100644
--- a/vala/vapi/libxml-2.0.vala
+++ b/vala/vapi/libxml-2.0.vala
@@ -22,14 +22,14 @@
  */
 
 namespace Xml {
-	[ReferenceType ()]
+	[ReferenceType (free_function = "xmlFreeTextReader")]
 	[CCode (cname = "xmlTextReader", cheader_filename = "libxml/xmlreader.h")]
 	public struct TextReader {
 		[CCode (cname = "xmlNewTextReaderFilename")]
-		public static ref TextReader new_with_filename (string uri);
+		public construct with_filename (string uri);
 		
 		[CCode (cname = "xmlReaderForFile")]
-		public static ref TextReader new_from_file (string filename, string encoding, int options);
+		public construct from_file (string filename, string encoding, int options);
 		
 		[CCode (cname = "xmlTextReaderRead")]
 		public int read ();
@@ -50,13 +50,22 @@ namespace Xml {
 		public int read_state ();
 		
 		[CCode (cname = "xmlTextReaderNodeType")]
-		public int node_type ();
+		public ReaderType node_type ();
+		
+		[CCode (cname = "xmlTextReaderConstLocalName")]
+		public string local_name ();
 		
 		[CCode (cname = "xmlTextReaderConstName")]
-		public string const_name ();
+		public string name ();
+		
+		[CCode (cname = "xmlTextReaderConstNamespaceUri")]
+		public string namespace_uri ();
+		
+		[CCode (cname = "xmlTextReaderConstPrefix")]
+		public string prefix ();
 		
 		[CCode (cname = "xmlTextReaderConstValue")]
-		public string const_value ();
+		public string @value ();
 		
 		[CCode (cname = "xmlTextReaderDepth")]
 		public int depth ();
@@ -68,7 +77,6 @@ namespace Xml {
 		public int has_value ();		
 	}
 
-/*	
 	[CCode (cname = "xmlTextReaderMode", cheader_filename = "liReaderTypesReaderTypesbxml/xmlreader.h")]
 	public enum ReaderMode {
 		INITIAL,
@@ -80,7 +88,7 @@ namespace Xml {
 	}
 	
 	[CCode (cname = "xmlReaderTypes",  cheader_filename = "libxml/xmlreader.h")]
-	public enum ReaderTypes {
+	public enum ReaderType {
 		NONE,
 		ELEMENT,
 		ATTRIBUTE,
@@ -100,5 +108,4 @@ namespace Xml {
 		END_ENTITY,
 		XML_DECLARATION
 	}
-*/
 }