[libgda] Remove deprecated gdaui_combo_set_model

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 2f5e2643b1a946da802a1207e9d80143b3e182ed
Author: Daniel Espinosa <esodan gmail com>
Date:   Sun Jul 8 08:36:40 2018 -0500

    Remove deprecated gdaui_combo_set_model

 libgda-ui/Gdaui-6.0.metadata               |  2 --
 libgda-ui/data-entries/gdaui-entry-combo.c |  2 +-
 libgda-ui/demos/ddl_queries.c              |  2 +-
 libgda-ui/gdaui-combo.c                    | 30 +++---------------------------
 libgda-ui/gdaui-combo.h                    |  1 -
 libgda-ui/gdaui-provider-selector.c        |  2 +-
 libgda-ui/internal/gdaui-dsn-selector.c    |  2 +-
 7 files changed, 7 insertions(+), 34 deletions(-)
---
diff --git a/libgda-ui/Gdaui-6.0.metadata b/libgda-ui/Gdaui-6.0.metadata
index 64d4ff344..e69de29bb 100644
--- a/libgda-ui/Gdaui-6.0.metadata
+++ b/libgda-ui/Gdaui-6.0.metadata
@@ -1,2 +0,0 @@
-// Gda UI metadata
-Combo.set_model name="set_data"
diff --git a/libgda-ui/data-entries/gdaui-entry-combo.c b/libgda-ui/data-entries/gdaui-entry-combo.c
index b2bcfd190..c0bae7baa 100644
--- a/libgda-ui/data-entries/gdaui-entry-combo.c
+++ b/libgda-ui/data-entries/gdaui-entry-combo.c
@@ -244,7 +244,7 @@ uiset_source_model_changed_cb (G_GNUC_UNUSED GdauiSet *paramlist, GdauiSetSource
                        cvalue = gda_holder_get_value (gda_set_node_get_holder (GDA_SET_NODE (list->data)));
                        values = g_slist_append (values, (GValue *) cvalue);
                }
-               gdaui_combo_set_model (GDAUI_COMBO (combo->priv->combo_entry),
+               gdaui_combo_set_data (GDAUI_COMBO (combo->priv->combo_entry),
                                       gda_set_source_get_data_model (s),
                                       gdaui_set_source_get_shown_n_cols (combo->priv->source), 
                                       gdaui_set_source_get_shown_columns (combo->priv->source));
diff --git a/libgda-ui/demos/ddl_queries.c b/libgda-ui/demos/ddl_queries.c
index f48dca9e4..d91755667 100644
--- a/libgda-ui/demos/ddl_queries.c
+++ b/libgda-ui/demos/ddl_queries.c
@@ -175,7 +175,7 @@ update_possible_operations (DemoData *data)
        if (!model) {
                gint columns[] = {1};
                model = gda_data_model_array_new_with_g_types (2, G_TYPE_INT, G_TYPE_STRING);
-               gdaui_combo_set_model (GDAUI_COMBO (data->op_combo), model, 1, columns);
+               gdaui_combo_set_data (GDAUI_COMBO (data->op_combo), model, 1, columns);
        }
        else
                gda_data_model_array_clear (GDA_DATA_MODEL_ARRAY (model));
diff --git a/libgda-ui/gdaui-combo.c b/libgda-ui/gdaui-combo.c
index 5960d5af0..096e2a0a7 100644
--- a/libgda-ui/gdaui-combo.c
+++ b/libgda-ui/gdaui-combo.c
@@ -207,7 +207,7 @@ gdaui_combo_set_property (GObject *object,
 
        switch (param_id) {
        case PROP_MODEL :
-               gdaui_combo_set_model (combo,
+               gdaui_combo_set_data (combo,
                                       GDA_DATA_MODEL (g_value_get_object (value)),
                                       0, NULL);
                break;
@@ -334,7 +334,7 @@ gdaui_combo_new ()
  * @n_cols: number of columns in the model to be shown
  * @cols_index: an array of columns to be shown, its size must be @n_cols
  *
- * Create a new GdauiCombo widget with a model. See gdaui_combo_set_model() for
+ * Create a new GdauiCombo widget with a model. See gdaui_combo_set_data() for
  * more information about the @n_cols and @cols_index usage.
  *
  * Returns: (transfer full): the newly-created widget.
@@ -349,7 +349,7 @@ gdaui_combo_new_with_model (GdaDataModel *model, gint n_cols, gint *cols_index)
        g_return_val_if_fail (GDA_IS_DATA_MODEL (model), NULL);
 
        combo = GDAUI_COMBO (gdaui_combo_new ()); 
-       gdaui_combo_set_model (GDAUI_COMBO (combo), GDA_DATA_MODEL (model), n_cols, cols_index);
+       gdaui_combo_set_data (GDAUI_COMBO (combo), GDA_DATA_MODEL (model), n_cols, cols_index);
 
        return GTK_WIDGET (combo);
 }
@@ -357,30 +357,6 @@ gdaui_combo_new_with_model (GdaDataModel *model, gint n_cols, gint *cols_index)
 static void cell_layout_data_func (GtkCellLayout *cell_layout, GtkCellRenderer *cell,
                                   GtkTreeModel *tree_model, GtkTreeIter *iter, GdauiCombo *combo);
 
-/**
- * gdaui_combo_set_model:
- * @combo: a #GdauiCombo widget.
- * @model: a #GdaDataModel object.
- * @n_cols: number of columns in the model to be shown
- * @cols_index: (array length=n_cols): an array of columns to be shown, its size must be @n_cols
- *
- * Makes @combo display data stored in @model (makes the
- * combo widget refresh its list of values and display the values contained
- * in the model). A NULL @model will make the combo empty
- * and disassociate the previous model, if any.
- *
- * if @n_cols is %0, then all the columns of @model will be displayed in @combo.
- *
- * Since: 4.2
- *
- * Deprecated: 5.2
- */
-void
-gdaui_combo_set_model (GdauiCombo *combo, GdaDataModel *model, gint n_cols, gint *cols_index)
-{
-       gdaui_combo_set_data (combo, model, n_cols, cols_index);
-}
-
 /**
  * gdaui_combo_set_data:
  * @combo: a #GdauiCombo widget.
diff --git a/libgda-ui/gdaui-combo.h b/libgda-ui/gdaui-combo.h
index ad6add52e..0a884f681 100644
--- a/libgda-ui/gdaui-combo.h
+++ b/libgda-ui/gdaui-combo.h
@@ -59,7 +59,6 @@ GType         gdaui_combo_get_type         (void) G_GNUC_CONST;
 GtkWidget    *gdaui_combo_new              (void);
 GtkWidget    *gdaui_combo_new_with_model   (GdaDataModel *model, gint n_cols, gint *cols_index);
 
-void          gdaui_combo_set_model        (GdauiCombo *combo, GdaDataModel *model, gint n_cols, gint 
*cols_index);
 void                                   gdaui_combo_set_data                             (GdauiCombo *combo, 
GdaDataModel *model, gint n_cols, gint *cols_index);
 void          gdaui_combo_add_null         (GdauiCombo *combo, gboolean add_null);
 gboolean      gdaui_combo_is_null_selected (GdauiCombo *combo);
diff --git a/libgda-ui/gdaui-provider-selector.c b/libgda-ui/gdaui-provider-selector.c
index 7fbbced6a..32bd245ac 100644
--- a/libgda-ui/gdaui-provider-selector.c
+++ b/libgda-ui/gdaui-provider-selector.c
@@ -48,7 +48,7 @@ show_providers (GdauiProviderSelector *selector)
        GdaDataModel *model;
 
        model = gda_config_list_providers ();
-       gdaui_combo_set_model (GDAUI_COMBO (selector), model, 1, cols);
+       gdaui_combo_set_data (GDAUI_COMBO (selector), model, 1, cols);
        g_object_unref (model);
 }
 
diff --git a/libgda-ui/internal/gdaui-dsn-selector.c b/libgda-ui/internal/gdaui-dsn-selector.c
index 2b4cb6cd4..95a3ffa96 100644
--- a/libgda-ui/internal/gdaui-dsn-selector.c
+++ b/libgda-ui/internal/gdaui-dsn-selector.c
@@ -83,7 +83,7 @@ gdaui_dsn_selector_init (GdauiDsnSelector *selector,
        selector->priv = g_new0 (GdauiDsnSelectorPrivate, 1);
 
        model = gda_config_list_dsn ();
-       gdaui_combo_set_model (GDAUI_COMBO (selector), model, 1, cols_index);
+       gdaui_combo_set_data (GDAUI_COMBO (selector), model, 1, cols_index);
        g_object_unref (model);
 }