GNOME.org
 

[libgda] Honors --enable-introspection. Removed non public API. Updated bindings GI and Vala.

commit a167aa2d9fd3106da975f5042827ddca584a1edb
Author: Daniel Espinosa <esodan gmail com>
Date:   Mon Jun 3 15:03:37 2013 -0500

    Honors --enable-introspection. Removed non public API. Updated bindings GI and Vala.

 configure.ac            |   41 +++++++-------------
 libgda/Gda-5.0.gir      |   98 -----------------------------------------------
 libgda/Makefile.am      |   18 ++++----
 libgda/gda-data-model.c |    2 +-
 libgda/gda-meta-store.h |    4 +-
 libgda/libgda-5.0.vapi  |   33 ++++++----------
 6 files changed, 38 insertions(+), 158 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5e30fc9..f39a363 100644
--- a/configure.ac
+++ b/configure.ac
@@ -470,21 +470,14 @@ AC_ARG_ENABLE([gda-gi],
     AS_HELP_STRING([--enable-gda-gi[=@<:@no/auto/yes@:>@]], [Enable GObject Introspection for libgda 
[default=no]]),
     [enable_gda_gi=$enableval],[enable_gda_gi=no])
 
-if test "x$found_introspection" = "xyes"
+if test "x$enable_introspection" = "xyes" -a "x$found_introspection" = "xyes"
+then
+  enable_gda_gi=yes
+fi
+
+if test "x$enable_gda_gi" = "xyes" -a "x$found_introspection" != "xyes"
 then
-    if test "x$enable_gda_gi" = xauto
-    then
-        enable_gda_gi=yes
-    fi
-else
-    if test "x$enable_gda_gi" = xyes
-    then
        AC_MSG_ERROR([Introspection for Libgda is requested but not available])
-    fi
-    if test "x$enable_gda_gi" = xauto
-    then
-       enable_gda_gi=no
-    fi
 fi
 
 AM_CONDITIONAL(ENABLE_GDA_GI, [test "$enable_gda_gi" = "yes"])
@@ -493,22 +486,16 @@ AC_ARG_ENABLE([gdaui-gi],
     AS_HELP_STRING([--enable-gdaui-gi[=@<:@no/auto/yes@:>@]], [Enable GObject Introspection for libgda-ui 
[default=no]]),
     [enable_gdaui_gi=$enableval],[enable_gdaui_gi=no])
 
-if test "x$found_introspection" = "xyes"
+if test "x$enable_gda_gi" != "xyes" -a "$enable_gdaui_gi" = "xyes"
 then
-    if test "x$enable_gdaui_gi" = xauto
-    then
-        enable_gdaui_gi=yes
-    fi
-else
-    if test "x$enable_gdaui_gi" = xyes
-    then
        AC_MSG_ERROR([Introspection for Libgda UI is requested but not available])
-    fi
-    if test "x$enable_gdaui_gi" = xauto
-    then
-       enable_gdaui_gi=no
-    fi
 fi
+
+if test "x$enable_gdaui_gi" = "xyes" -a "x$have_ui" != "xyes"
+then
+       AC_MSG_ERROR([Introspection for Libgda UI is requested but no GTK+ is available])
+fi
+
 AM_CONDITIONAL(ENABLE_GDAUI_GI, [test "$enable_gdaui_gi" = "yes"])
 
 AC_ARG_ENABLE([gi-system-install],
@@ -1055,7 +1042,7 @@ echo "   Installation prefix = $prefix"
 echo "   Building GTK+ UI extension: `if test x$have_ui != xno; then echo yes; else echo no; fi`"
 echo "   Installing Glade GTK+ UI extension catalog: `if test x$have_glade != xno; then echo yes; else echo 
no; fi`"
 echo "   Building Libxslt extension: `if test x$have_xslt != xno; then echo yes; else echo no; fi`"
-echo "   Building libgda GObject Introspection: `if test x$enable_gda_gi != xno; then echo yes; else echo 
no; fi`"
+echo "   Building libgda GObject Introspection: `if test x$enable_gda_gi = xyes; then echo yes; else echo 
no; fi`"
 echo "   Building libgda-ui GObject Introspection: `if test x$enable_gdaui_gi != xno; then echo yes; else 
echo no; fi`"
 echo "   Building Gtk-Doc: `if test x$enable_gtk_doc != xno; then echo yes; else echo no; fi`"
 echo "   Building GDA Vala Bindings (--enable-vala): `if test x$vapigen_pkg_found != xyes; then echo no; 
else echo yes; fi`"
diff --git a/libgda/Gda-5.0.gir b/libgda/Gda-5.0.gir
index b07844c..b9f96e9 100644
--- a/libgda/Gda-5.0.gir
+++ b/libgda/Gda-5.0.gir
@@ -5461,58 +5461,6 @@ if the @str string does not correspond to a valid string for the requested type,
         </callback>
       </field>
     </record>
-    <record name="DataMetaWrapper" c:type="GdaDataMetaWrapper">
-      <field name="object" writable="1">
-        <type name="GObject.Object" c:type="GObject"/>
-      </field>
-      <field name="priv" writable="1">
-        <type name="DataMetaWrapperPrivate"
-              c:type="GdaDataMetaWrapperPrivate*"/>
-      </field>
-    </record>
-    <record name="DataMetaWrapperClass" c:type="GdaDataMetaWrapperClass">
-      <field name="parent_class" writable="1">
-        <type name="GObject.ObjectClass" c:type="GObjectClass"/>
-      </field>
-      <field name="_gda_reserved1" introspectable="0">
-        <callback name="_gda_reserved1">
-          <return-value transfer-ownership="none">
-            <type name="none" c:type="void"/>
-          </return-value>
-        </callback>
-      </field>
-      <field name="_gda_reserved2" introspectable="0">
-        <callback name="_gda_reserved2">
-          <return-value transfer-ownership="none">
-            <type name="none" c:type="void"/>
-          </return-value>
-        </callback>
-      </field>
-      <field name="_gda_reserved3" introspectable="0">
-        <callback name="_gda_reserved3">
-          <return-value transfer-ownership="none">
-            <type name="none" c:type="void"/>
-          </return-value>
-        </callback>
-      </field>
-      <field name="_gda_reserved4" introspectable="0">
-        <callback name="_gda_reserved4">
-          <return-value transfer-ownership="none">
-            <type name="none" c:type="void"/>
-          </return-value>
-        </callback>
-      </field>
-    </record>
-    <enumeration name="DataMetaWrapperMode" c:type="GdaDataMetaWrapperMode">
-      <member name="lc" value="0" c:identifier="GDA_DATA_META_WRAPPER_MODE_LC">
-      </member>
-      <member name="uc" value="1" c:identifier="GDA_DATA_META_WRAPPER_MODE_UC">
-      </member>
-    </enumeration>
-    <record name="DataMetaWrapperPrivate"
-            c:type="GdaDataMetaWrapperPrivate"
-            disguised="1">
-    </record>
     <interface name="DataModel"
                c:symbol-prefix="data_model"
                c:type="GdaDataModel"
@@ -7565,52 +7513,6 @@ Also clears @model's contents.</doc>
             c:type="GdaDataModelDirPrivate"
             disguised="1">
     </record>
-    <record name="DataModelDsnList" c:type="GdaDataModelDsnList">
-      <field name="object" writable="1">
-        <type name="GObject.Object" c:type="GObject"/>
-      </field>
-      <field name="priv" writable="1">
-        <type name="DataModelDsnListPrivate"
-              c:type="GdaDataModelDsnListPrivate*"/>
-      </field>
-    </record>
-    <record name="DataModelDsnListClass" c:type="GdaDataModelDsnListClass">
-      <field name="object_class" writable="1">
-        <type name="GObject.ObjectClass" c:type="GObjectClass"/>
-      </field>
-      <field name="_gda_reserved1" introspectable="0">
-        <callback name="_gda_reserved1">
-          <return-value transfer-ownership="none">
-            <type name="none" c:type="void"/>
-          </return-value>
-        </callback>
-      </field>
-      <field name="_gda_reserved2" introspectable="0">
-        <callback name="_gda_reserved2">
-          <return-value transfer-ownership="none">
-            <type name="none" c:type="void"/>
-          </return-value>
-        </callback>
-      </field>
-      <field name="_gda_reserved3" introspectable="0">
-        <callback name="_gda_reserved3">
-          <return-value transfer-ownership="none">
-            <type name="none" c:type="void"/>
-          </return-value>
-        </callback>
-      </field>
-      <field name="_gda_reserved4" introspectable="0">
-        <callback name="_gda_reserved4">
-          <return-value transfer-ownership="none">
-            <type name="none" c:type="void"/>
-          </return-value>
-        </callback>
-      </field>
-    </record>
-    <record name="DataModelDsnListPrivate"
-            c:type="GdaDataModelDsnListPrivate"
-            disguised="1">
-    </record>
     <enumeration name="DataModelError"
                  c:type="GdaDataModelError"
                  glib:error-domain="gda_data_model_error">
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index 376f410..f7cdb2a 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -127,13 +127,9 @@ gda_sources= \
        $(GDA_LDAP_S) \
        gda-data-model.c \
        gda-data-model-dir.c \
-       gda-data-model-dsn-list.c \
-       gda-data-model-dsn-list.h \
        gda-data-model-import.c \
        gda-data-model-iter.c \
        gda-data-access-wrapper.c \
-       gda-data-meta-wrapper.c \
-       gda-data-meta-wrapper.h \
        gda-data-proxy.c \
        gda-data-select.c \
        gda-holder.c \
@@ -148,7 +144,6 @@ gda_sources= \
        gda-row.c \
        gda-set.c \
        gda-server-operation.c \
-       gda-server-operation-private.h \
        gda-server-provider.c \
        gda-server-provider-extra.c \
        gda-statement.c \
@@ -178,13 +173,18 @@ libgda_sources =  \
        gda-connection-sqlite.h \
        gda-custom-marshal.c \
        gda-custom-marshal.h \
+       gda-data-meta-wrapper.c \
+       gda-data-meta-wrapper.h \
+       gda-data-model-dsn-list.c \
+       gda-data-model-dsn-list.h \
        gda-data-select-extra.h \
-       gda-types.c \
-       gda-types.h \
-       gda-marshal.c \
        gda-meta-store-extra.h \
        gda-meta-struct-private.h \
+       gda-marshal.c \
        gda-mutex.c \
+       gda-server-operation-private.h \
+       gda-types.c \
+       gda-types.h \
        gda-statement-priv.h \
        global.h \
        md5.h \
@@ -385,4 +385,4 @@ clean-local:
        @if ! test -d "$(top_srcdir)/.git"; \
        then \
                rm -f $(gir_DATA) $(vapi_DATA); \
-       fi
\ No newline at end of file
+       fi
diff --git a/libgda/gda-data-model.c b/libgda/gda-data-model.c
index ebad146..aed1619 100644
--- a/libgda/gda-data-model.c
+++ b/libgda/gda-data-model.c
@@ -1223,7 +1223,7 @@ gda_data_model_send_hint (GdaDataModel *model, GdaDataModelHint hint, const GVal
  * data models where some rows may be missing because the LDAP search has reached a limit
  * imposed by the LDAP server.
  *
- * Returns: (transfer none) (element-type GError) (array zero-terminated=1): a pointer to a %NULL terminated 
array of #GError, or %NULL.
+ * Returns: (transfer none) (element-type GLib.Error) (array zero-terminated=1): a pointer to a %NULL 
terminated array of #GError, or %NULL.
  *
  * Since: 4.2.6
  *
diff --git a/libgda/gda-meta-store.h b/libgda/gda-meta-store.h
index afdf87a..8191a17 100644
--- a/libgda/gda-meta-store.h
+++ b/libgda/gda-meta-store.h
@@ -84,8 +84,8 @@ typedef struct {
  * GdaMetaContext:
  * @table_name: the name of the table <emphasis>in the GdaMetaStore's internal database</emphasis>
  * @size: the size of the @column_names and @column_values arrays
- * @column_names: (array length=size): an array of column names (columns of the @table_name table)
- * @column_values: (array length=size): an array of values, one for each column named in @column_names
+ * @column_names: (array length=size) (transfer container): an array of column names (columns of the 
@table_name table)
+ * @column_values: (array length=size)  (transfer container): an array of values, one for each column named 
in @column_names
  * @columns: (element-type utf8 GObject.Value): A #GHashTable storing columns' name as key and #GValue as 
column's
  * value.
  *
diff --git a/libgda/libgda-5.0.vapi b/libgda/libgda-5.0.vapi
index 2172353..e9e945e 100644
--- a/libgda/libgda-5.0.vapi
+++ b/libgda/libgda-5.0.vapi
@@ -254,6 +254,7 @@ namespace Gda {
                [CCode (has_construct_function = false)]
                protected DataModelDir ();
                public void clean_errors ();
+               public unowned GLib.SList<GLib.Error> get_errors ();
                public static Gda.DataModel @new (string basedir);
                [NoAccessorMethod]
                public string basedir { owned get; construct; }
@@ -263,6 +264,7 @@ namespace Gda {
                [CCode (has_construct_function = false)]
                protected DataModelImport ();
                public void clean_errors ();
+               public unowned GLib.SList<GLib.Error> get_errors ();
                public static Gda.DataModel new_file (string filename, bool random_access, Gda.Set? options);
                public static Gda.DataModel new_mem (string data, bool random_access, Gda.Set? options);
                public static Gda.DataModel new_xml_node ([CCode (type = "xmlNodePtr")] Xml.Node* node);
@@ -582,6 +584,7 @@ namespace Gda {
                public weak string[] column_names;
                [CCode (array_length_cname = "size")]
                public weak GLib.Value[] column_values;
+               public weak GLib.HashTable<string,GLib.Value?> columns;
                public int size;
                public weak string table_name;
                [CCode (has_construct_function = false)]
@@ -590,6 +593,7 @@ namespace Gda {
                public void free ();
                public unowned string get_table ();
                public void set_column (string column, GLib.Value value, Gda.Connection? cnc);
+               public void set_columns (GLib.HashTable<string,GLib.Value?> columns, Gda.Connection? cnc);
                public void set_table (string table);
        }
        [CCode (cheader_filename = "libgda/libgda.h", type_id = "gda_meta_store_get_type ()")]
@@ -675,6 +679,7 @@ namespace Gda {
                public int ncols;
                public weak GLib.SList<string> param_ids;
                public weak string sql;
+               public weak GLib.SList<Gda.Column> tmpl_columns;
                public GLib.Type types;
                [CCode (has_construct_function = false)]
                protected PStmt ();
@@ -1246,6 +1251,8 @@ namespace Gda {
                public bool add_data_from_xml_node ([CCode (type = "xmlNodePtr")] Xml.Node* node) throws 
GLib.Error;
                [CCode (vfunc_name = "i_append_row")]
                public abstract int append_row () throws GLib.Error;
+               [CCode (vfunc_name = "i_append_values")]
+               public abstract int append_values (GLib.List<GLib.Value?>? values) throws GLib.Error;
                public Gda.DataModelArray array_copy_model () throws GLib.Error;
                public Gda.DataModelArray array_copy_model_ext ([CCode (array_length_cname = "ncols", 
array_length_pos = 0.5)] int[] cols) throws GLib.Error;
                [CCode (vfunc_name = "i_create_iter")]
@@ -1273,6 +1280,8 @@ namespace Gda {
                public abstract int get_n_rows ();
                [CCode (vfunc_name = "i_get_notify")]
                public abstract bool get_notify ();
+               [CCode (vfunc_name = "i_find_row")]
+               public abstract int get_row_from_values (GLib.SList<GLib.Value?> values, [CCode (array_length 
= false)] int[] cols_index);
                public unowned GLib.Value? get_typed_value_at (int col, int row, GLib.Type expected_type, 
bool nullok) throws GLib.Error;
                [CCode (vfunc_name = "i_get_value_at")]
                public abstract unowned GLib.Value? get_value_at (int col, int row) throws GLib.Error;
@@ -1302,6 +1311,8 @@ namespace Gda {
                public abstract void set_notify (bool do_notify_changes);
                [CCode (vfunc_name = "i_set_value_at")]
                public abstract bool set_value_at (int col, int row, GLib.Value value) throws GLib.Error;
+               [CCode (vfunc_name = "i_set_values")]
+               public abstract bool set_values (int row, GLib.List<GLib.Value?>? values) throws GLib.Error;
                public void thaw ();
                public virtual signal void access_changed ();
                public virtual signal void changed ();
@@ -1327,22 +1338,6 @@ namespace Gda {
                public void unlock ();
        }
        [CCode (cheader_filename = "libgda/libgda.h", has_type_id = false)]
-       public struct DataMetaWrapper {
-               public weak GLib.Object object;
-       }
-       [CCode (cheader_filename = "libgda/libgda.h", has_type_id = false)]
-       public struct DataMetaWrapperClass {
-               public weak GLib.ObjectClass parent_class;
-       }
-       [CCode (cheader_filename = "libgda/libgda.h", has_type_id = false)]
-       public struct DataModelDsnList {
-               public weak GLib.Object object;
-       }
-       [CCode (cheader_filename = "libgda/libgda.h", has_type_id = false)]
-       public struct DataModelDsnListClass {
-               public weak GLib.ObjectClass object_class;
-       }
-       [CCode (cheader_filename = "libgda/libgda.h", has_type_id = false)]
        public struct Diff {
                public Gda.DiffType type;
                public int old_row;
@@ -1369,6 +1364,7 @@ namespace Gda {
        public struct MetaStoreChange {
                public Gda.MetaStoreChangeType c_type;
                public weak string table_name;
+               public weak GLib.HashTable<string,GLib.Value?> keys;
        }
        [CCode (cheader_filename = "libgda/libgda.h", has_type_id = false)]
        public struct MetaTable {
@@ -1586,11 +1582,6 @@ namespace Gda {
                MODEL_ACCESS_ERROR,
                USER_CANCELLED_ERROR
        }
-       [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_META_WRAPPER_MODE_", has_type_id = 
false)]
-       public enum DataMetaWrapperMode {
-               LC,
-               UC
-       }
        [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_MODEL_ACCESS_", has_type_id = 
false)]
        [Flags]
        public enum DataModelAccessFlags {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]