From 5652e958ac79368c51b882b5f4d64fd4d6d1e93d Mon Sep 17 00:00:00 2001
From: Andrea Zagli <andrea.zagli@email.it>
Date: Mon, 11 Jan 2016 17:33:02 +0100
Subject: [PATCH] Added signal iwidget-init to GdaExQueryEditor.

---
 .gitignore                   |  1 +
 configure.ac                 |  5 +++++
 src/Makefile.am              | 10 ++++++++++
 src/queryeditor.c            | 31 +++++++++++++++++++++++++++++--
 src/queryeditor.h            |  2 ++
 src/queryeditor_marshal.list |  1 +
 6 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 src/queryeditor_marshal.list

diff --git a/.gitignore b/.gitignore
index b2ba4a2..79f01f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ docs/reference/html/
 docs/reference/xml/
 src/.libs/
 src/.deps/
+src/*marshal.[ch]
 tests/.libs/
 tests/.deps/
 po/POTFILES
diff --git a/configure.ac b/configure.ac
index a562192..921d19a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,11 @@ AC_PROG_RANLIB
 GTK_DOC_CHECK(1.0)
 IT_PROG_INTLTOOL
 
+dnl ******************************
+dnl glib-genmarshal
+dnl ******************************
+AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+
 dnl ******************************
 dnl Translations
 dnl ******************************
diff --git a/src/Makefile.am b/src/Makefile.am
index f664080..90a9f97 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,14 @@ LIBS = $(GDAEX_LIBS)
 
 lib_LTLIBRARIES = libgdaex.la
 
+queryeditormarshal.c: queryeditormarshal.h queryeditor_marshal.list $(GLIB_GENMARSHAL)
+	$(GLIB_GENMARSHAL) $(srcdir)/queryeditor_marshal.list --body --prefix=_gdaex_query_editor_marshal > $(srcdir)/$@
+
+queryeditormarshal.h: queryeditor_marshal.list $(GLIB_GENMARSHAL)
+	$(GLIB_GENMARSHAL) $(srcdir)/queryeditor_marshal.list --header --prefix=_gdaex_query_editor_marshal > $(srcdir)/$@
+
 libgdaex_la_SOURCES = gdaex.c \
+                      queryeditormarshal.c \
                       queryeditor.c \
                       queryeditor_widget_interface.c \
                       queryeditorentry.c \
@@ -30,6 +37,9 @@ libgdaex_include_HEADERS = libgdaex.h \
 
 libgdaex_includedir = $(includedir)/libgdaex
 
+noinst_HEADERS = \
+                 queryeditormarshal.h
+
 install-exec-hook:
 	mkdir -p "$(libdir)/$(PACKAGE)/modules"
 
diff --git a/src/queryeditor.c b/src/queryeditor.c
index 4aa0048..5de9a65 100644
--- a/src/queryeditor.c
+++ b/src/queryeditor.c
@@ -28,6 +28,7 @@
 #include <libxml/parser.h>
 #include <libxml/xpath.h>
 
+#include "queryeditormarshal.h"
 #include "queryeditor.h"
 #include "queryeditorentry.h"
 #include "queryeditorentrydate.h"
@@ -282,9 +283,9 @@ enum
 	};
 
 static void
-gdaex_query_editor_class_init (GdaExQueryEditorClass *class)
+gdaex_query_editor_class_init (GdaExQueryEditorClass *klass)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (class);
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
 	object_class->set_property = gdaex_query_editor_set_property;
 	object_class->get_property = gdaex_query_editor_get_property;
@@ -293,6 +294,23 @@ gdaex_query_editor_class_init (GdaExQueryEditorClass *class)
 	object_class->finalize = gdaex_query_editor_finalize;
 
 	g_type_class_add_private (object_class, sizeof (GdaExQueryEditorPrivate));
+
+	/**
+	 * GdaExQueryEditor::iwidget-init:
+	 *
+	 */
+	klass->iwidget_init_signal_id = g_signal_new ("iwidget-init",
+											G_TYPE_FROM_CLASS (object_class),
+											G_SIGNAL_RUN_LAST,
+											0,
+											NULL,
+											NULL,
+											_gdaex_query_editor_marshal_VOID__OBJECT_STRING_STRING,
+											G_TYPE_NONE,
+											3,
+											G_TYPE_OBJECT,
+											G_TYPE_STRING,
+											G_TYPE_STRING);
 }
 
 static void
@@ -1116,6 +1134,7 @@ gdaex_query_editor_load_tables_from_xml (GdaExQueryEditor *qe,
                                          gboolean clean)
 {
 	GdaExQueryEditorPrivate *priv;
+	GdaExQueryEditorClass *klass;
 
 	xmlDoc *xdoc;
 	xmlXPathContextPtr xpcontext;
@@ -1150,6 +1169,8 @@ gdaex_query_editor_load_tables_from_xml (GdaExQueryEditor *qe,
 	g_return_if_fail (root != NULL);
 	g_return_if_fail (xmlStrcmp (root->name, "gdaex_query_editor") == 0);
 
+	klass = GDAEX_QUERY_EDITOR_GET_CLASS (qe);
+
 	priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
 
 	if (clean)
@@ -1361,6 +1382,12 @@ gdaex_query_editor_load_tables_from_xml (GdaExQueryEditor *qe,
 																			iwidget = iwidget_constructor ();
 																			if (iwidget != NULL)
 																				{
+																					g_signal_emit (qe, klass->iwidget_init_signal_id,
+																								   0,
+																								   iwidget,
+																								   table_name,
+																								   field->name);
+
 																					if (g_module_symbol ((GModule *)g_ptr_array_index (priv->ar_modules, i),
 																										 g_strconcat (type, "_xml_parsing", NULL),
 																										 (gpointer *)&iwidget_xml_parsing))
diff --git a/src/queryeditor.h b/src/queryeditor.h
index abb8c77..1145411 100644
--- a/src/queryeditor.h
+++ b/src/queryeditor.h
@@ -49,6 +49,8 @@ struct _GdaExQueryEditor
 struct _GdaExQueryEditorClass
 	{
 		GObjectClass parent_class;
+
+		guint iwidget_init_signal_id;
 	};
 
 GType gdaex_query_editor_get_type (void) G_GNUC_CONST;
diff --git a/src/queryeditor_marshal.list b/src/queryeditor_marshal.list
new file mode 100644
index 0000000..05ce335
--- /dev/null
+++ b/src/queryeditor_marshal.list
@@ -0,0 +1 @@
+VOID:OBJECT,STRING,STRING
-- 
2.49.0