Merge master.

diff --cc configure.ac
Simple merge

diff --cc src/Makefile.am
index 176b3e8fc07cffb958d4d77c76844344eb35295e,b14a76c916395b7cf5fd57a9990a49e4f4ce0c3f..cbf8097e44124f827f5c072633e4df23a626e2d9
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -2,7 -2,7 +2,8 @@@ LIBS = $(GTKFORM_LIBS
  
  AM_CPPFLAGS = $(GTKFORM_CFLAGS) \
                -DLOCALEDIR=\"$(localedir)\" \
 +              -DMODULESDIR=\""$(libdir)/$(PACKAGE)/modules"\"
+               -DG_LOG_DOMAIN=\"GtkForm\"
  
  lib_LTLIBRARIES = libgtkform.la
  
@@@ -40,12 -41,7 +42,13 @@@ libgtkform_include_HEADERS = form.h 
                    widgetlabel.h \
                    widgetradio.h \
                    widgetspin.h \
-                   widgettextview.h
+                   widgettextview.h \
+                   group.h
  
  libgtkform_includedir = $(includedir)/libgtkform
 +
 +install-exec-hook:
 +      mkdir -p "$(libdir)/$(PACKAGE)/modules"
 +
 +uninstall-hook:
 +      rm -rf "$(libdir)/$(PACKAGE)"

diff --cc src/form.c
index b9c87cf2ca2f41fe9339b58573d3314dcf25a49d,9302be91799c58e9873ef2e4cd265241e6bfc2c5..0cc27838c0a293ffd2977bee6a91b9e755ec9d45
--- 1/src/form.c
--- 2/src/form.c
+++ b/src/form.c
@@@ -70,10 -80,9 +83,11 @@@ static void gtk_form_get_property (GObj
                                 GParamSpec *pspec);
  
  static void gtk_form_show_check_error_dialog (GtkFormWidget *fwidget,
-                                               GtkWidget *parent_window);
+                                               GtkWidget *parent_window,
+                                               const gchar *message);
  
 +static void gtk_form_load_modules (GtkForm *form);
 +
  #define GTK_FORM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_GTK_FORM, GtkFormPrivate))
  
  typedef struct _GtkFormPrivate GtkFormPrivate;
@@@ -86,8 -95,12 +100,13 @@@ struct _GtkFormPrivat
                GtkFormKey *key;
                gchar quote;
  
 +              GList *modules;
                GdaEx *gdaex;
+ 
+               GSList *groups;
+ 
+               guint debug;
+               GFileOutputStream *log_file;
        };
  
  G_DEFINE_TYPE (GtkForm, gtk_form, G_TYPE_OBJECT)
@@@ -148,15 -162,8 +168,16 @@@ gtk_form_init (GtkForm *form
  GtkForm
  *gtk_form_new ()
  {
 +      GtkForm *form;
 +
 +      form = GTK_FORM (g_object_new (gtk_form_get_type (), NULL));
 +      if (form == NULL)
 +              {
 +                      return NULL;
 +              }
 +
        setlocale (LC_ALL, "");
+       gda_locale_changed ();
        bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        textdomain (GETTEXT_PACKAGE);
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");