[libgda] GdaDataProxy: allow the "model" property to be set even after construction
- From: Vivien Malerba <vivien src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] GdaDataProxy: allow the "model" property to be set even after construction
- Date: Wed, 18 Apr 2012 18:57:56 +0000 (UTC)
commit 7ee10f185c4e64c52401a57d7bc94222debf65c9
Author: Vivien Malerba <malerba gnome-db org>
Date: Wed Apr 18 20:17:53 2012 +0200
GdaDataProxy: allow the "model" property to be set even after construction
libgda/gda-data-proxy.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/libgda/gda-data-proxy.c b/libgda/gda-data-proxy.c
index 1876413..5787e66 100644
--- a/libgda/gda-data-proxy.c
+++ b/libgda/gda-data-proxy.c
@@ -920,7 +920,6 @@ gda_data_proxy_finalize (GObject *object)
parent_class->finalize (object);
}
-
static void
gda_data_proxy_set_property (GObject *object,
guint param_id,
@@ -937,7 +936,11 @@ gda_data_proxy_set_property (GObject *object,
gda_mutex_lock (proxy->priv->mutex);
switch (param_id) {
case PROP_MODEL:
- g_assert (!proxy->priv->model);
+ if (proxy->priv->model) {
+ clean_proxy (proxy);
+ gda_data_proxy_init (proxy);
+ }
+
model = (GdaDataModel*) g_value_get_object (value);
g_return_if_fail (GDA_IS_DATA_MODEL (model));
@@ -946,8 +949,7 @@ gda_data_proxy_set_property (GObject *object,
gda_mutex_unlock (proxy->priv->mutex);
return;
}
- proxy->priv->model = model;
- g_object_ref (model);
+ proxy->priv->model = g_object_ref (model);
proxy->priv->model_nb_cols = gda_data_model_get_n_columns (model);
proxy->priv->model_nb_rows = gda_data_model_get_n_rows (model);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]