Added signal iwidget-init to GdaExQueryEditor.

diff --git a/.gitignore b/.gitignore
index b2ba4a2fd903998f750d2e59978fe2afe541149a..79f01f591789c888d760e5ac56868e62354ef05b 100644 (file)
--- 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 a56219254ea1ed35a56bd1611e8cc45dff79c94b..921d19a72416c1d08f7ac2d6b7ecb0b4938ca41f 100644 (file)
--- 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 f6640802c05934843bb012bc59e12318312e3189..90a9f97a96d471ce104d6d7345c83482cf0cafce 100644 (file)
--- 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 4aa0048f71a5120090b25653f6cd6781480c1e9b..5de9a654026a0b648b83bd1bc7996143def5bf19 100644 (file)
--- 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 abb8c77f3f4aaf1cfc57c77b5e3e7b13883a1585..11454115e8d36593d84de3a5d70cd707c4a2bc74 100644 (file)
--- 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 (file)
index 0000000..05ce335
--- /dev/null
+++ b/src/queryeditor_marshal.list
@@ -0,0 +1 @@
+VOID:OBJECT,STRING,STRING