[anjuta] symbol-db: some merge conflicts resolved

[Massimo Cora' <mcora src gnome org>]

commit 43f2ccac8b2a8079d179a91758f8eba78eb37847
Author: Massimo Corà <mcora src gnome org>
Date:   Wed Jul 22 00:01:00 2009 +0200

    symbol-db: some merge conflicts resolved

 plugins/symbol-db/symbol-db-engine-iterator.c |   13 ++++++++++++-
 plugins/symbol-db/symbol-db-engine-iterator.h |    7 +++++++
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/plugins/symbol-db/symbol-db-engine-iterator.c b/plugins/symbol-db/symbol-db-engine-iterator.c
index b41154a..b1dede7 100644
--- a/plugins/symbol-db/symbol-db-engine-iterator.c
+++ b/plugins/symbol-db/symbol-db-engine-iterator.c
@@ -58,7 +58,7 @@ sdb_engine_iterator_finalize (GObject *object)
 {
 	SymbolDBEngineIterator *dbi;
 	SymbolDBEngineIteratorPriv *priv;
-	
+
 	dbi = SYMBOL_DB_ENGINE_ITERATOR (object);	
 	priv = dbi->priv;
 
@@ -118,6 +118,17 @@ symbol_db_engine_iterator_new (GdaDataModel *model,
 	return dbi;
 }
 
+const GdaDataModel *
+symbol_db_engine_iterator_get_datamodel (SymbolDBEngineIterator *dbi)
+{
+	SymbolDBEngineIteratorPriv *priv;
+
+	g_return_val_if_fail (dbi != NULL, NULL);
+
+	priv = dbi->priv;
+	return priv->data_model;	
+}
+
 /**
  * Set the iterator at the first node.
  */
diff --git a/plugins/symbol-db/symbol-db-engine-iterator.h b/plugins/symbol-db/symbol-db-engine-iterator.h
index 95f1210..c89f52d 100644
--- a/plugins/symbol-db/symbol-db-engine-iterator.h
+++ b/plugins/symbol-db/symbol-db-engine-iterator.h
@@ -58,6 +58,10 @@ struct _SymbolDBEngineIterator
 GType sdb_engine_iterator_get_type (void) /*G_GNUC_CONST*/;
 
 
+/**
+ * The GdaDataModel passed as parameter will be unreffed when the user destroys
+ * the SymbolDBEngineIterator. No need then for the user to release GdaDataModel.
+ */
 SymbolDBEngineIterator *
 symbol_db_engine_iterator_new (GdaDataModel *model, 
 							   const GHashTable *sym_type_conversion_hash,
@@ -88,6 +92,9 @@ void
 symbol_db_engine_iterator_foreach (SymbolDBEngineIterator *dbi, GFunc callback, 
 								   gpointer user_data);
 
+const GdaDataModel *
+symbol_db_engine_iterator_get_datamodel (SymbolDBEngineIterator *dbi);
+
 G_END_DECLS
 
 #endif /* _SYMBOL_DB_ENGINE_ITERATOR_H_ */