[libgda] gdaui-set: include gda-set.h

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 4c0a9b6f57062b955faa2ed2aec4f8ae522c534e
Author: Daniel Espinosa <esodan gmail com>
Date:   Sat Sep 8 18:04:39 2018 -0500

    gdaui-set: include gda-set.h

 libgda-ui/gdaui-set.h            | 2 +-
 libgda/gda-data-model-dsn-list.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/libgda-ui/gdaui-set.h b/libgda-ui/gdaui-set.h
index df98efa7b..5035aa388 100644
--- a/libgda-ui/gdaui-set.h
+++ b/libgda-ui/gdaui-set.h
@@ -22,7 +22,7 @@
 #define __GDAUI_SET__
 
 #include <gtk/gtk.h>
-#include <libgda/gda-decl.h>
+#include <libgda/gda-set.h>
 
 G_BEGIN_DECLS
 
diff --git a/libgda/gda-data-model-dsn-list.c b/libgda/gda-data-model-dsn-list.c
index 2b1ec05d8..221e6068f 100644
--- a/libgda/gda-data-model-dsn-list.c
+++ b/libgda/gda-data-model-dsn-list.c
@@ -273,8 +273,10 @@ gda_data_model_dsn_list_get_n_rows (GdaDataModel *model)
 static gint
 gda_data_model_dsn_list_get_n_columns (GdaDataModel *model)
 {
+       g_return_val_if_fail (GDA_IS_DATA_MODEL (model), -1);
        GdaDataModelDsnList *dmodel = GDA_DATA_MODEL_DSN_LIST (model);
        GdaDataModelDsnListPrivate *priv = gda_data_model_dsn_list_get_instance_private (dmodel);
+       g_return_val_if_fail (priv->columns != NULL, -1);
 
        return g_slist_length (priv->columns);
 }