[libgda] Work in progress: Fixing GdaData.DataModelIterable implementing Gda.DataModel interface. Missing som

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 978f20a6d1c4eac2bb493fee16d2c44471c5a33c
Author: Daniel Espinosa <despinosa src gnome org>
Date:   Wed Dec 21 17:09:55 2011 -0600

    Work in progress: Fixing GdaData.DataModelIterable implementing Gda.DataModel
    interface. Missing some functions not correctly implemented.

 libgda/data/DataModelIterator.vala |   12 +++---
 libgda/data/DataObject.vala        |    3 +-
 libgda/data/GdaData-5.0.gir        |    4 +-
 libgda/data/libgdadata-5.0.pc.in   |    2 +-
 samples/vala/Makefile.am           |   77 ------------------------------------
 5 files changed, 10 insertions(+), 88 deletions(-)
---
diff --git a/libgda/data/DataModelIterator.vala b/libgda/data/DataModelIterator.vala
index 9cecdd3..c7f01f8 100644
--- a/libgda/data/DataModelIterator.vala
+++ b/libgda/data/DataModelIterator.vala
@@ -329,28 +329,28 @@
 		}
 		
 		public bool i_get_notify () {
-			return this.model.i_get_notify ();
+			return ((Gda.DataSelect)this.model).i_get_notify ();
 		}
 
 		public bool i_iter_at_row (Gda.DataModelIter iter, int row) {
-			return this.model.i_iter_at_row (iter, row);
+			return ((Gda.DataSelect)this.model).i_iter_at_row (iter, row);
 		}
 		
 		public bool i_iter_next (Gda.DataModelIter iter) {
-			return this.model.i_iter_next (iter);
+			return ((Gda.DataSelect)this.model).i_iter_next (iter);
 		}
 		
 		public bool i_iter_prev (Gda.DataModelIter iter) {
-			return this.model.i_iter_prev (iter);
+			return ((Gda.DataSelect)this.model).i_iter_prev (iter);
 		}
 		
 		public bool i_iter_set_value (Gda.DataModelIter iter, int col, GLib.Value value) throws GLib.Error {
-			return this.model.i_iter_set_value (iter, col, value);
+			return ((Gda.DataSelect)this.model).i_iter_set_value (iter, col, value);
 		}
 		
 		public void i_set_notify (bool do_notify_changes)
 		{
-			this.model.i_set_notify (do_notify_changes);
+			((Gda.DataSelect)this.model).i_set_notify (do_notify_changes);
 		}
 		public bool remove_row (int row) throws GLib.Error {
 			return this.model.remove_row (row);
diff --git a/libgda/data/DataObject.vala b/libgda/data/DataObject.vala
index 940db13..c31d431 100644
--- a/libgda/data/DataObject.vala
+++ b/libgda/data/DataObject.vala
@@ -19,8 +19,7 @@
 
 using Gda;
 
-[CCode (gir_namespace = "GdaData", gir_version = "5.0")]
-[CCode (cheader_filename="libgda/libgdadata.h")]
+[CCode (gir_namespace = "GdaData", gir_version = "5.0", cheader_filename="libgda/libgdadata.h")]
 namespace GdaData {
 
     public abstract class Object : GLib.Object {
diff --git a/libgda/data/GdaData-5.0.gir b/libgda/data/GdaData-5.0.gir
index 70108fc..94a2ee3 100644
--- a/libgda/data/GdaData-5.0.gir
+++ b/libgda/data/GdaData-5.0.gir
@@ -4,11 +4,11 @@
 <include name="Gda" version="5.0"/>
 <include name="Gee" version="0.8"/>
 <package name="gdadata-5.0"/>
-<c:include name="../../libgda/libgdadata.h"/>
+<c:include name="libgda/libgdadata.h"/>
 <namespace name="GdaData" version="5.0" c:prefix="GdaData">
 	<annotation key="ccode.gir-version" value="5.0"/>
-	<annotation key="ccode.gir-namespace" value="GdaData"/>
 	<annotation key="ccode.cheader-filename" value="libgda/libgdadata.h"/>
+	<annotation key="ccode.gir-namespace" value="GdaData"/>
 	<class name="Object" c:type="GdaDataObject" glib:type-name="GdaDataObject" glib:get-type="gda_data_object_get_type" glib:type-struct="ObjectClass" parent="GObject.Object" abstract="1">
 		<field name="parent_instance">
 			<type name="GObject.Object" c:type="GObject"/>
diff --git a/libgda/data/libgdadata-5.0.pc.in b/libgda/data/libgdadata-5.0.pc.in
index 044f291..424a502 100644
--- a/libgda/data/libgdadata-5.0.pc.in
+++ b/libgda/data/libgdadata-5.0.pc.in
@@ -8,6 +8,6 @@ includedir= includedir@
 Name: libgdadata- GDA_ABI_MAJOR_VERSION@  GDA_ABI_MINOR_VERSION@
 Description: Gda Data Library. Data oriented GObject implementations using Vala and Gee
 Version: @VERSION@
-Requires: gobject-2.0 gthread-2.0 libxml-2.0 libgda-5.0 libgee-0.8
+Requires: libgda-5.0 gee-0.8
 Libs: -L${libdir} -lgdadata- GDA_ABI_MAJOR_VERSION@  GDA_ABI_MINOR_VERSION@
 Cflags: -I${includedir}/libgda- GDA_ABI_MAJOR_VERSION@  GDA_ABI_MINOR_VERSION@ @GDA_DEBUG_FLAGS@