[libgda] Misc small corrections



commit 8f146efd6805a853d601756b03c4d8a307e1dcef
Author: Vivien Malerba <malerba gnome-db org>
Date:   Mon May 6 22:33:28 2013 +0200

    Misc small corrections

 libgda-ui/gdaui-raw-grid.c         |    2 +-
 libgda-ui/gdaui-tree-store.c       |    2 +-
 libgda/gda-init.c                  |    3 +++
 libgda/handlers/gda-handler-time.c |    4 +---
 4 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/libgda-ui/gdaui-raw-grid.c b/libgda-ui/gdaui-raw-grid.c
index 9e1da3f..ca97063 100644
--- a/libgda-ui/gdaui-raw-grid.c
+++ b/libgda-ui/gdaui-raw-grid.c
@@ -1316,7 +1316,7 @@ data_cell_values_changed (GtkCellRenderer *renderer, const gchar *path,
        g_assert (gda_set_group_get_source (sg));
 
        if (new_values)
-               g_return_if_fail (gda_set_group_get_n_nodes (sg) == g_slist_length (new_values));
+               g_return_if_fail (gda_set_group_get_n_nodes (sg) == (gint) g_slist_length (new_values));
        else
                /* the reason for not having any value is that the GdauiDataCellRendererCombo had no selected 
item */
                return;
diff --git a/libgda-ui/gdaui-tree-store.c b/libgda-ui/gdaui-tree-store.c
index 2104009..517512b 100644
--- a/libgda-ui/gdaui-tree-store.c
+++ b/libgda-ui/gdaui-tree-store.c
@@ -536,7 +536,7 @@ gdaui_tree_store_get_node (GdauiTreeStore *store, GtkTreeIter *iter)
 gboolean
 gdaui_tree_store_get_iter (GdauiTreeStore *store, GtkTreeIter *iter, GdaTreeNode *node)
 {
-       gdaui_tree_store_get_iter_from_node (store, iter, node);
+       return gdaui_tree_store_get_iter_from_node (store, iter, node);
 }
 
 
diff --git a/libgda/gda-init.c b/libgda/gda-init.c
index 3ae26ec..d2b796c 100644
--- a/libgda/gda-init.c
+++ b/libgda/gda-init.c
@@ -155,7 +155,10 @@ gda_init (void)
        }
 #endif
 
+#if GLIB_CHECK_VERSION(2,36,0)
+#else
        g_type_init ();
+#endif
 
        if (!g_module_supported ())
                g_error (_("libgda needs GModule. Finishing..."));
diff --git a/libgda/handlers/gda-handler-time.c b/libgda/handlers/gda-handler-time.c
index bdd43df..9374867 100644
--- a/libgda/handlers/gda-handler-time.c
+++ b/libgda/handlers/gda-handler-time.c
@@ -1288,16 +1288,14 @@ make_time (G_GNUC_UNUSED GdaHandlerTime *hdl, GdaTime *timegda, const gchar *val
 
 
 static GValue *
-gda_handler_time_get_sane_init_value (GdaDataHandler *iface, GType type)
+gda_handler_time_get_sane_init_value (G_GNUC_UNUSED GdaDataHandler *iface, GType type)
 {
-       GdaHandlerTime *hdl;
        GValue *value = NULL;
        
        time_t now;
        struct tm *stm;
 
        g_return_val_if_fail (GDA_IS_HANDLER_TIME (iface), NULL);
-       hdl = (GdaHandlerTime*) (iface);
 
        now = time (NULL);
 #ifdef HAVE_LOCALTIME_R


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]