From: Andrea Zagli <azagli@libero.it>
Date: Sat, 30 Apr 2011 06:54:58 +0000 (+0200)
Subject: Merge master.
X-Git-Tag: 0.3.0~6
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=3909ee26b24766bf434c39143208f327c5f6ebc3;p=libgtkform

Merge master.
---

3909ee26b24766bf434c39143208f327c5f6ebc3
diff --cc src/Makefile.am
index 176b3e8,b14a76c..cbf8097
--- a/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 b9c87cf,9302be9..0cc2783
--- a/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");