gnomemm r1756 - in libgdamm/trunk: . libgda/libgdamm libgda/src tools/m4

[jhs svn gnome org]

Author: jhs
Date: Thu Oct 30 13:18:37 2008
New Revision: 1756
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1756&view=rev

Log:
2008-10-30  Johannes Schmid  <jschmid openismus com>

        * libgda/libgdamm/value_tools.h:
        * libgda/src/libgda_methods.defs:
        * libgda/src/serverprovider.hg:
        * tools/m4/convert_libgdamm.m4:

        Fixed build with latest libgda



Modified:
   libgdamm/trunk/ChangeLog
   libgdamm/trunk/libgda/libgdamm/value_tools.h
   libgdamm/trunk/libgda/src/libgda_methods.defs
   libgdamm/trunk/libgda/src/serverprovider.hg
   libgdamm/trunk/tools/m4/convert_libgdamm.m4

Modified: libgdamm/trunk/libgda/libgdamm/value_tools.h
==============================================================================
--- libgdamm/trunk/libgda/libgdamm/value_tools.h	(original)
+++ libgdamm/trunk/libgda/libgdamm/value_tools.h	Thu Oct 30 13:18:37 2008
@@ -40,4 +40,5 @@
 
 } // namespace Gnome
 
-#endif // VALUE_TOOLS_H
\ No newline at end of file
+#endif // VALUE_TOOLS_H
+

Modified: libgdamm/trunk/libgda/src/libgda_methods.defs
==============================================================================
--- libgdamm/trunk/libgda/src/libgda_methods.defs	(original)
+++ libgdamm/trunk/libgda/src/libgda_methods.defs	Thu Oct 30 13:18:37 2008
@@ -686,16 +686,6 @@
   )
 )
 
-(define-flags SetHint
-  (in-module "Gda")
-  (c-name "GdaSetHint")
-  (gtype-id "GDA_TYPE_SET_HINT")
-  (values
-    '("read-only" "GDA_SET_HOLDER_READ_ONLY")
-    '("hide" "GDA_SET_HOLDER_HIDE")
-  )
-)
-
 (define-enum StatementError
   (in-module "Gda")
   (c-name "GdaStatementError")
@@ -1897,7 +1887,7 @@
   (c-name "gda_data_comparator_set_key_columns")
   (return-type "none")
   (parameters
-    '("gint*" "col_numbers")
+    '("const-gint*" "col_numbers")
     '("gint" "nb_cols")
   )
 )
@@ -3056,6 +3046,15 @@
   )
 )
 
+(define-method compute_columns_attributes
+  (of-object "GdaDataSelect")
+  (c-name "gda_data_select_compute_columns_attributes")
+  (return-type "gboolean")
+  (parameters
+    '("GError**" "error")
+  )
+)
+
 
 
 ;; From gda-debug-macros.h
@@ -3382,11 +3381,6 @@
   (return-type "GType")
 )
 
-(define-function gda_set_hint_get_type
-  (c-name "gda_set_hint_get_type")
-  (return-type "GType")
-)
-
 (define-function gda_server_operation_type_get_type
   (c-name "gda_server_operation_type_get_type")
   (return-type "GType")
@@ -3439,6 +3433,15 @@
 
 
 
+;; From gda-error.h
+
+(define-function gda_error_get_type
+  (c-name "gda_error_get_type")
+  (return-type "GType")
+)
+
+
+
 ;; From gda-holder.h
 
 (define-function gda_holder_get_type
@@ -4534,9 +4537,9 @@
   )
 )
 
-(define-method get_data_handler_gtype
+(define-method get_data_handler_g_type
   (of-object "GdaServerProvider")
-  (c-name "gda_server_provider_get_data_handler_gtype")
+  (c-name "gda_server_provider_get_data_handler_g_type")
   (return-type "GdaDataHandler*")
   (parameters
     '("GdaConnection*" "cnc")

Modified: libgdamm/trunk/libgda/src/serverprovider.hg
==============================================================================
--- libgdamm/trunk/libgda/src/serverprovider.hg	(original)
+++ libgdamm/trunk/libgda/src/serverprovider.hg	Thu Oct 30 13:18:37 2008
@@ -67,7 +67,7 @@
   _WRAP_METHOD(Glib::RefPtr<DataHandler> get_data_handler_dbms(const Glib::RefPtr<Connection>& cnc,  const Glib::ustring& for_type), gda_server_provider_get_data_handler_dbms, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const DataHandler> get_data_handler_dbms(const Glib::RefPtr<Connection>& cnc,  const Glib::ustring& for_type) const, gda_server_provider_get_data_handler_dbms, constversion)
 
-  _WRAP_METHOD(Glib::RefPtr<DataHandler> get_data_handler_gtype(const Glib::RefPtr<Connection>& cnc, GType for_type), gda_server_provider_get_data_handler_gtype, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<DataHandler> get_data_handler_g_type(const Glib::RefPtr<Connection>& cnc, GType for_type), gda_server_provider_get_data_handler_g_type, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const DataHandler> get_data_handler_gtype(const Glib::RefPtr<Connection>& cnc, GType for_type) const, gda_server_provider_get_data_handler_gtype, refreturn, constversion)
 
   _WRAP_METHOD(Glib::ustring get_default_dbms_type(const Glib::RefPtr<Connection>& cnc, GType type), gda_server_provider_get_default_dbms_type)

Modified: libgdamm/trunk/tools/m4/convert_libgdamm.m4
==============================================================================
--- libgdamm/trunk/tools/m4/convert_libgdamm.m4	(original)
+++ libgdamm/trunk/tools/m4/convert_libgdamm.m4	Thu Oct 30 13:18:37 2008
@@ -139,7 +139,7 @@
 
 # Arrays
 _CONVERSION(`gchar**',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3)')
-_CONVERSION(`const Glib::ArrayHandle<int>&',`gint*', `(gint*)$3.data()')
+_CONVERSION(`const Glib::ArrayHandle<int>&',`const gint*', `$3.data()')
 
 
 # For signals: