Merge from master.

diff --cc src/form.c
index 10e81ee776369c73ba7bf94093d50598840696b3,d80725b91041c1e3b6a06a522d6598ff5106dcbe..0c3974744648f859cf7ddcb9812e210249ad0b5f
--- 1/src/form.c
--- 2/src/form.c
+++ b/src/form.c
@@@ -51,11 -50,10 +51,12 @@@ enu
        PROP_0,
        PROP_TABLE,
        PROP_KEY,
-       PROP_QUOTE
+       PROP_QUOTE,
+       PROP_GDAEX
  };
  
 +typedef GtkFormWidget *(* FormWidgetConstructorFunc) (void);
 +
  static void gtk_form_class_init (GtkFormClass *class);
  static void gtk_form_init (GtkForm *form);
  
@@@ -85,7 -81,7 +86,8 @@@ struct _GtkFormPrivat
                GtkFormKey *key;
                gchar quote;
  
 +              GList *modules;
+               GdaEx *gdaex;
        };
  
  G_DEFINE_TYPE (GtkForm, gtk_form, G_TYPE_OBJECT)