From: Andrea Zagli <azagli@libero.it>
Date: Sat, 17 Jul 2010 17:07:16 +0000 (+0200)
Subject: Merge from master.
X-Git-Tag: 0.3.0~8
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=9da5fb4308ca02ed36bf6ffcb0a0cef23b907bb7;p=libgtkform

Merge from master.
---

9da5fb4308ca02ed36bf6ffcb0a0cef23b907bb7
diff --cc src/form.c
index 10e81ee,d80725b..0c39747
--- a/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)