[libgda] Misc. corrections

[Vivien Malerba <vivien src gnome org>]

commit b04fdabd6faaec20678896df8ac4e6ac7d1da88b
Author: Vivien Malerba <malerba gnome-db org>
Date:   Mon Dec 22 20:48:16 2014 +0100

    Misc. corrections

 libgda/gda-data-model-import.c |    8 +++++---
 libgda/gda-data-model.c        |    3 ---
 2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/libgda/gda-data-model-import.c b/libgda/gda-data-model-import.c
index df2aba0..af3b6e7 100644
--- a/libgda/gda-data-model-import.c
+++ b/libgda/gda-data-model-import.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2006 - 2011 Murray Cumming <murrayc murrayc com>
- * Copyright (C) 2006 - 2012 Vivien Malerba <malerba gnome-db org>
+ * Copyright (C) 2006 - 2014 Vivien Malerba <malerba gnome-db org>
  * Copyright (C) 2007 Brecht Sanders <brecht edustria be>
  * Copyright (C) 2009 Bas Driessen <bas driessen xobas com>
  * Copyright (C) 2010 David King <davidk openismus com>
@@ -1583,7 +1583,6 @@ init_node_import (GdaDataModelImport *model)
        GSList *list;
        gint pos;
        gchar *str;
-       GError *error = NULL;
 
        node = model->priv->extract.node.node;
        if (!node)
@@ -1716,8 +1715,11 @@ init_node_import (GdaDataModelImport *model)
        clean_field_specs (fields);
        model->priv->columns = g_slist_reverse (model->priv->columns);
 
-       if (cur && ! gda_data_model_add_data_from_xml_node (ramodel, cur, &error))
+       GError *error = NULL;
+       if (cur && ! gda_data_model_add_data_from_xml_node (ramodel, cur, &error)) {
                add_error (model, error && error->message ? error->message : _("No detail"));
+               g_clear_error (&error);
+       }
 }
 
 
diff --git a/libgda/gda-data-model.c b/libgda/gda-data-model.c
index d68b6b7..5aa5792 100644
--- a/libgda/gda-data-model.c
+++ b/libgda/gda-data-model.c
@@ -1938,9 +1938,6 @@ add_xml_row (GdaDataModel *model, xmlNodePtr xml_row, GError **error)
 
                if (strcmp ((gchar*)xml_field->name, "gda_value") && 
                    strcmp ((gchar*)xml_field->name, "gda_array_value")) {
-                       g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_XML_FORMAT_ERROR,
-                                    _("Expected tag <gda_value> or <gda_array_value>, "
-                                      "got <%s>, ignoring"), (gchar*)xml_field->name);
                        continue;
                }