From: Andrea Zagli Date: Sun, 21 May 2017 13:00:19 +0000 (+0200) Subject: Debian pkg: updates due to upstream changes. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=6c1e6330ef0bf9a296b635fc7aee5aa793b42f00;p=zakform%2Flibzakform Debian pkg: updates due to upstream changes. --- diff --git a/debian/changelog b/debian/changelog index 2d245a1..45e884f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -libzakform (0.0.1-4~4.gbp5ab586) UNRELEASED; urgency=medium +libzakform (0.0.1-4~5.gbp9fc7ab) UNRELEASED; urgency=medium - ** SNAPSHOT build @5ab586d1411e8bc359b53fd3711d9c4acae5f3a4 ** + ** SNAPSHOT build @9fc7ab00af41a88b2167eda9cfee72280979b0c7 ** [ Andrea Zagli ] * Initial release @@ -25,4 +25,28 @@ libzakform (0.0.1-4~4.gbp5ab586) UNRELEASED; urgency=medium [ tux ] - -- tux Sat, 25 Mar 2017 09:54:50 +0100 + [ Andrea Zagli ] + * Debian pkg: missing parenthesis in patch. + * g_strcmp0 may returns other values than -1, 0 and 1. + * Added property id to ZakFormValidator (refs #1102). + * Added ZakForm::get_validator_by_id. + * Added property id to FormElementValidator (refs #1102). + * Added function ZakFormElement::get_validator_by_id. + * Refactored ZakFormElementFilter::xml_parsing. + * Added property id to ZakFormElementFilter (closes #1102). + * Wrong prototype zak_form_element_set_to_is_key in formelement.h (closes #1111). + * Added signals ZakFormElement before and after validating. + * Added commons functions ZakForm::get_compare_type_from_string and ::get_compare_type_stringify. + * ZakFormElementValidatorDate can now compare the value. + * Xml parsing of long-name in ZakFormElement. + * Migration to GValue for element value. + * Added functions ZakFormElement::[get|set]_original_value_gvalue. + * Started implementation (only one level) of ZakFormValidatorComposite. + * Multilevel for ZakFormValidatorComposite. + * Added condition (only one) to ZakFormValidatorComposite. + * Missing file in translation. + * Debian pkg: updated patches for upstream changes. + + [ tux ] + + -- tux Sun, 21 May 2017 14:59:51 +0200 diff --git a/debian/patches/0001-DESTDIR-support.patch b/debian/patches/0001-DESTDIR-support.patch index b1a4825..5f287e8 100644 --- a/debian/patches/0001-DESTDIR-support.patch +++ b/debian/patches/0001-DESTDIR-support.patch @@ -7,10 +7,10 @@ Subject: DESTDIR support. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am -index 1947bbc..b57b6ef 100644 +index 6c6f9b6..ee33785 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -45,7 +45,7 @@ libzakform_include_HEADERS = \ +@@ -55,7 +55,7 @@ libzakform_include_HEADERS = \ libzakform_includedir = $(includedir)/libzakform install-exec-hook: diff --git a/debian/patches/0003-Glib-old-version.patch b/debian/patches/0003-Glib-old-version.patch index 3c61a75..4dbf132 100644 --- a/debian/patches/0003-Glib-old-version.patch +++ b/debian/patches/0003-Glib-old-version.patch @@ -8,10 +8,10 @@ Subject: Glib old version. 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index d86c09b..3e41632 100644 +index 1f2bffe..e4f599e 100644 --- a/configure.ac +++ b/configure.ac -@@ -42,8 +42,8 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", +@@ -47,8 +47,8 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", AM_GLIB_GNU_GETTEXT # Checks for libraries. diff --git a/debian/patches/0004-Glib-old-version-gobject-macro.patch b/debian/patches/0004-Glib-old-version-gobject-macro.patch index c1d38fd..39071b2 100644 --- a/debian/patches/0004-Glib-old-version-gobject-macro.patch +++ b/debian/patches/0004-Glib-old-version-gobject-macro.patch @@ -19,13 +19,13 @@ Subject: Glib old version - gobject macro. 13 files changed, 214 insertions(+), 27 deletions(-) diff --git a/src/form.h b/src/form.h -index 33b65ea..d10d3ed 100644 +index 55e7991..a2f3eb8 100644 --- a/src/form.h +++ b/src/form.h @@ -31,9 +31,20 @@ - + G_BEGIN_DECLS - + - -#define ZAK_FORM_TYPE_FORM zak_form_form_get_type () -G_DECLARE_DERIVABLE_TYPE (ZakFormForm, zak_form_form, ZAK_FORM, FORM, GObject) @@ -43,17 +43,17 @@ index 33b65ea..d10d3ed 100644 + { + GObject parent; + }; - + struct _ZakFormFormClass { diff --git a/src/formelement.h b/src/formelement.h -index d68f6a5..d03ae81 100644 +index c3fd519..c513e18 100644 --- a/src/formelement.h +++ b/src/formelement.h @@ -31,8 +31,20 @@ G_BEGIN_DECLS - - + + -#define ZAK_FORM_TYPE_ELEMENT zak_form_element_get_type () -G_DECLARE_DERIVABLE_TYPE (ZakFormElement, zak_form_element, ZAK_FORM, ELEMENT, GObject) +#define ZAK_FORM_TYPE_ELEMENT (zak_form_element_get_type ()) @@ -70,17 +70,17 @@ index d68f6a5..d03ae81 100644 + { + GObject parent; + }; - + struct _ZakFormElementClass { diff --git a/src/formelementfilter.h b/src/formelementfilter.h -index 1dffefb..74cafad 100644 +index 468c74a..6f6dcc4 100644 --- a/src/formelementfilter.h +++ b/src/formelementfilter.h -@@ -25,8 +25,20 @@ +@@ -27,8 +27,20 @@ G_BEGIN_DECLS - - + + -#define ZAK_FORM_TYPE_ELEMENT_FILTER zak_form_element_filter_get_type () -G_DECLARE_DERIVABLE_TYPE (ZakFormElementFilter, zak_form_element_filter, ZAK_FORM, ELEMENT_FILTER, GObject) +#define ZAK_FORM_TYPE_ELEMENT_FILTER (zak_form_element_filter_get_type ()) @@ -97,17 +97,17 @@ index 1dffefb..74cafad 100644 + { + GObject parent; + }; - + struct _ZakFormElementFilterClass { diff --git a/src/formelementfilterluc.h b/src/formelementfilterluc.h -index eb00250..4c91a79 100644 +index 6710a15..09feb43 100644 --- a/src/formelementfilterluc.h +++ b/src/formelementfilterluc.h @@ -30,8 +30,25 @@ G_BEGIN_DECLS - - + + -#define ZAK_FORM_TYPE_ELEMENT_FILTER_LUC zak_form_element_filter_luc_get_type () -G_DECLARE_FINAL_TYPE (ZakFormElementFilterLuc, zak_form_element_filter_luc, ZAK_FORM, ELEMENT_FILTER_LUC, ZakFormElementFilter) +#define ZAK_FORM_TYPE_ELEMENT_FILTER_LUC (zak_form_element_filter_luc_get_type ()) @@ -129,17 +129,17 @@ index eb00250..4c91a79 100644 +{ + ZakFormElementFilterClass parent_cleass; +}; - + ZakFormElementFilterLuc *zak_form_element_filter_luc_new (void); diff --git a/src/formelementfiltertrim.h b/src/formelementfiltertrim.h -index d74e0bf..0cb37e8 100644 +index aa50296..7f3d660 100644 --- a/src/formelementfiltertrim.h +++ b/src/formelementfiltertrim.h @@ -30,8 +30,26 @@ G_BEGIN_DECLS - - + + -#define ZAK_FORM_TYPE_ELEMENT_FILTER_TRIM zak_form_element_filter_trim_get_type () -G_DECLARE_FINAL_TYPE (ZakFormElementFilterTrim, zak_form_element_filter_trim, ZAK_FORM, ELEMENT_FILTER_TRIM, ZakFormElementFilter) +#define ZAK_FORM_TYPE_ELEMENT_FILTER_TRIM (zak_form_element_filter_trim_get_type ()) @@ -162,17 +162,17 @@ index d74e0bf..0cb37e8 100644 + ZakFormElementFilterClass parent_cleass; +}; + - + ZakFormElementFilterTrim *zak_form_element_filter_trim_new (void); diff --git a/src/formelementvalidator.h b/src/formelementvalidator.h -index 2ef9407..9711b60 100644 +index 4f9d9c5..f4dbb3e 100644 --- a/src/formelementvalidator.h +++ b/src/formelementvalidator.h -@@ -25,8 +25,20 @@ +@@ -27,8 +27,20 @@ G_BEGIN_DECLS - - + + -#define ZAK_FORM_TYPE_ELEMENT_VALIDATOR zak_form_element_validator_get_type () -G_DECLARE_DERIVABLE_TYPE (ZakFormElementValidator, zak_form_element_validator, ZAK_FORM, ELEMENT_VALIDATOR, GObject) +#define ZAK_FORM_TYPE_ELEMENT_VALIDATOR (zak_form_element_validator_get_type ()) @@ -189,17 +189,17 @@ index 2ef9407..9711b60 100644 + { + GObject parent; + }; - + struct _ZakFormElementValidatorClass { diff --git a/src/formelementvalidatordate.h b/src/formelementvalidatordate.h -index 13b5f38..0406cee 100644 +index d5d489d..fad3cf3 100644 --- a/src/formelementvalidatordate.h +++ b/src/formelementvalidatordate.h -@@ -30,8 +30,25 @@ +@@ -31,8 +31,25 @@ G_BEGIN_DECLS - - + + -#define ZAK_FORM_TYPE_ELEMENT_VALIDATOR_DATE zak_form_element_validator_date_get_type () -G_DECLARE_FINAL_TYPE (ZakFormElementValidatorDate, zak_form_element_validator_date, ZAK_FORM, ELEMENT_VALIDATOR_DATE, ZakFormElementValidator) +#define ZAK_FORM_TYPE_ELEMENT_VALIDATOR_DATE (zak_form_element_validator_date_get_type ()) @@ -221,17 +221,17 @@ index 13b5f38..0406cee 100644 + { + ZakFormElementValidatorClass parent_class; + }; - + ZakFormElementValidatorDate *zak_form_element_validator_date_new (void); - + diff --git a/src/formelementvalidatornotempty.h b/src/formelementvalidatornotempty.h -index 5a6b662..c6e3a20 100644 +index f64d06c..2fba186 100644 --- a/src/formelementvalidatornotempty.h +++ b/src/formelementvalidatornotempty.h @@ -30,8 +30,25 @@ G_BEGIN_DECLS - - + + -#define ZAK_FORM_TYPE_ELEMENT_VALIDATOR_NOTEMPTY zak_form_element_validator_notempty_get_type () -G_DECLARE_FINAL_TYPE (ZakFormElementValidatorNotempty, zak_form_element_validator_notempty, ZAK_FORM, ELEMENT_VALIDATOR_NOTEMPTY, ZakFormElementValidator) +#define ZAK_FORM_TYPE_ELEMENT_VALIDATOR_NOTEMPTY (zak_form_element_validator_notempty_get_type ()) @@ -253,17 +253,17 @@ index 5a6b662..c6e3a20 100644 + { + ZakFormElementValidatorClass parent_class; + }; - + ZakFormElementValidatorNotempty *zak_form_element_validator_notempty_new (void); - + diff --git a/src/formelementvalidatorregex.h b/src/formelementvalidatorregex.h -index 4bb8b42..f8e62e0 100644 +index 127e1a0..4308b7a 100644 --- a/src/formelementvalidatorregex.h +++ b/src/formelementvalidatorregex.h @@ -30,8 +30,25 @@ G_BEGIN_DECLS - - + + -#define ZAK_FORM_TYPE_ELEMENT_VALIDATOR_REGEX zak_form_element_validator_regex_get_type () -G_DECLARE_FINAL_TYPE (ZakFormElementValidatorRegex, zak_form_element_validator_regex, ZAK_FORM, ELEMENT_VALIDATOR_REGEX, ZakFormElementValidator) +#define ZAK_FORM_TYPE_ELEMENT_VALIDATOR_REGEX (zak_form_element_validator_regex_get_type ()) @@ -285,7 +285,7 @@ index 4bb8b42..f8e62e0 100644 + { + ZakFormElementValidatorClass parent_class; + }; - + ZakFormElementValidatorRegex *zak_form_element_validator_regex_new (void); diff --git a/src/formiprovider.h b/src/formiprovider.h @@ -294,8 +294,8 @@ index cabb51e..be970ae 100644 +++ b/src/formiprovider.h @@ -25,8 +25,15 @@ G_BEGIN_DECLS - - + + -#define ZAK_FORM_TYPE_IPROVIDER zak_form_iprovider_get_type () -G_DECLARE_INTERFACE (ZakFormIProvider, zak_form_iprovider, ZAK_FORM, IPROVIDER, GObject) +#define ZAK_FORM_TYPE_IPROVIDER (zak_form_iprovider_get_type ()) @@ -307,17 +307,17 @@ index cabb51e..be970ae 100644 + +typedef struct _ZakFormIProvider ZakFormIProvider; +typedef struct _ZakFormIProviderInterface ZakFormIProviderInterface; - + struct _ZakFormIProviderInterface { diff --git a/src/formvalidator.h b/src/formvalidator.h -index c4586ec..5c7d768 100644 +index bdc01a1..40ef5c5 100644 --- a/src/formvalidator.h +++ b/src/formvalidator.h -@@ -25,8 +25,20 @@ +@@ -28,8 +28,20 @@ G_BEGIN_DECLS - - + + -#define ZAK_FORM_TYPE_VALIDATOR zak_form_validator_get_type () -G_DECLARE_DERIVABLE_TYPE (ZakFormValidator, zak_form_validator, ZAK_FORM, VALIDATOR, GObject) +#define ZAK_FORM_TYPE_VALIDATOR (zak_form_validator_get_type ()) @@ -334,17 +334,17 @@ index c4586ec..5c7d768 100644 + { + GObject parent; + }; - + struct _ZakFormValidatorClass { diff --git a/src/formvalidatorcompare.h b/src/formvalidatorcompare.h -index 02139d0..d4ab5ac 100644 +index 07b48bb..45690ca 100644 --- a/src/formvalidatorcompare.h +++ b/src/formvalidatorcompare.h @@ -30,8 +30,26 @@ G_BEGIN_DECLS - - + + -#define ZAK_FORM_TYPE_VALIDATOR_COMPARE zak_form_validator_compare_get_type () -G_DECLARE_FINAL_TYPE (ZakFormValidatorCompare, zak_form_validator_compare, ZAK_FORM, VALIDATOR_COMPARE, ZakFormValidator) +#define ZAK_FORM_TYPE_VALIDATOR_COMPARE (zak_form_validator_compare_get_type ()) @@ -367,17 +367,17 @@ index 02139d0..d4ab5ac 100644 + ZakFormValidatorClass parent_class; +}; + - + ZakFormValidatorCompare *zak_form_validator_compare_new (void); diff --git a/src/formvalidatorcomparedate.h b/src/formvalidatorcomparedate.h -index c8940ca..ec11584 100644 +index 52fac52..a68f3af 100644 --- a/src/formvalidatorcomparedate.h +++ b/src/formvalidatorcomparedate.h @@ -30,8 +30,25 @@ G_BEGIN_DECLS - - + + -#define ZAK_FORM_TYPE_VALIDATOR_COMPARE_DATE zak_form_validator_compare_date_get_type () -G_DECLARE_FINAL_TYPE (ZakFormValidatorCompareDate, zak_form_validator_compare_date, ZAK_FORM, VALIDATOR_COMPARE_DATE, ZakFormValidator) +#define ZAK_FORM_TYPE_VALIDATOR_COMPARE_DATE (zak_form_validator_compare_date_get_type ()) @@ -399,6 +399,6 @@ index c8940ca..ec11584 100644 +{ + ZakFormValidatorClass parent_class; +}; - + ZakFormValidatorCompareDate *zak_form_validator_compare_date_new (void); diff --git a/debian/patches/0005-Glib-old-version-private.patch b/debian/patches/0005-Glib-old-version-private.patch index a79f7cd..cbc8e3c 100644 --- a/debian/patches/0005-Glib-old-version-private.patch +++ b/debian/patches/0005-Glib-old-version-private.patch @@ -23,10 +23,10 @@ Subject: Glib old version - private. 17 files changed, 93 insertions(+), 126 deletions(-) diff --git a/src/form.c b/src/form.c -index c1b54cf..7670029 100644 +index 226ca90..03c076f 100644 --- a/src/form.c +++ b/src/form.c -@@ -61,6 +61,8 @@ static void zak_form_form_finalize (GObject *gobject); +@@ -57,6 +57,8 @@ static void zak_form_form_finalize (GObject *gobject); static void zak_form_form_load_modules (ZakFormForm *zakform); @@ -35,7 +35,7 @@ index c1b54cf..7670029 100644 typedef struct { GPtrArray *ar_modules; -@@ -69,7 +71,7 @@ typedef struct +@@ -65,7 +67,7 @@ typedef struct GPtrArray *ar_messages; } ZakFormFormPrivate; @@ -44,7 +44,7 @@ index c1b54cf..7670029 100644 #ifdef G_OS_WIN32 static HMODULE backend_dll = NULL; -@@ -105,6 +107,8 @@ zak_form_form_class_init (ZakFormFormClass *class) +@@ -101,6 +103,8 @@ zak_form_form_class_init (ZakFormFormClass *class) object_class->dispose = zak_form_form_dispose; object_class->finalize = zak_form_form_finalize; @@ -53,7 +53,7 @@ index c1b54cf..7670029 100644 class->get_elements = zak_form_form_get_elements; } -@@ -176,7 +180,7 @@ zak_form_form_element_xml_parsing (ZakFormForm *zakform, ZakFormElement *element +@@ -170,7 +174,7 @@ zak_form_form_element_xml_parsing (ZakFormForm *zakform, ZakFormElement *element gboolean to_unlink; xmlNode *xnode_tmp; @@ -62,7 +62,7 @@ index c1b54cf..7670029 100644 xnode = xnode->children; while (xnode) -@@ -354,7 +358,7 @@ zak_form_form_load_from_xml (ZakFormForm *zakform, xmlDoc *xmldoc) +@@ -356,7 +360,7 @@ zak_form_form_load_from_xml (ZakFormForm *zakform, xmlDoc *xmldoc) { ret = TRUE; @@ -71,7 +71,7 @@ index c1b54cf..7670029 100644 cur = cur->children; while (cur) -@@ -503,7 +507,7 @@ zak_form_form_add_element (ZakFormForm *zakform, ZakFormElement *element) +@@ -497,7 +501,7 @@ zak_form_form_add_element (ZakFormForm *zakform, ZakFormElement *element) ZakFormFormPrivate *priv; @@ -80,7 +80,7 @@ index c1b54cf..7670029 100644 g_ptr_array_add (priv->ar_elements, g_object_ref (element)); ret = TRUE; -@@ -532,7 +536,7 @@ ZakFormElement +@@ -526,7 +530,7 @@ ZakFormElement guint i; @@ -89,7 +89,7 @@ index c1b54cf..7670029 100644 ret = NULL; for (i = 0; i < priv->ar_elements->len; i++) -@@ -607,7 +611,7 @@ zak_form_form_add_validator (ZakFormForm *zakform, ZakFormValidator *validator) +@@ -601,7 +605,7 @@ zak_form_form_add_validator (ZakFormForm *zakform, ZakFormValidator *validator) ZakFormFormPrivate *priv; @@ -98,7 +98,7 @@ index c1b54cf..7670029 100644 g_ptr_array_add (priv->ar_validators, g_object_ref (validator)); ret = TRUE; -@@ -673,7 +677,7 @@ zak_form_form_clear (ZakFormForm *zakform) +@@ -697,7 +701,7 @@ zak_form_form_clear (ZakFormForm *zakform) g_return_if_fail (ZAK_FORM_IS_FORM (zakform)); @@ -107,7 +107,7 @@ index c1b54cf..7670029 100644 for (i = 0; i < priv->ar_elements->len; i++) { -@@ -697,7 +701,7 @@ zak_form_form_set_as_original (ZakFormForm *zakform) +@@ -721,7 +725,7 @@ zak_form_form_set_as_original (ZakFormForm *zakform) g_return_if_fail (ZAK_FORM_IS_FORM (zakform)); @@ -116,7 +116,7 @@ index c1b54cf..7670029 100644 for (i = 0; i < priv->ar_elements->len; i++) { -@@ -722,7 +726,7 @@ zak_form_form_set_editable (ZakFormForm *zakform, gboolean editable) +@@ -746,7 +750,7 @@ zak_form_form_set_editable (ZakFormForm *zakform, gboolean editable) g_return_if_fail (ZAK_FORM_IS_FORM (zakform)); @@ -125,7 +125,7 @@ index c1b54cf..7670029 100644 for (i = 0; i < priv->ar_elements->len; i++) { -@@ -749,7 +753,7 @@ zak_form_form_is_valid (ZakFormForm *zakform) +@@ -773,7 +777,7 @@ zak_form_form_is_valid (ZakFormForm *zakform) GPtrArray *ar_messages; @@ -134,7 +134,7 @@ index c1b54cf..7670029 100644 ret = TRUE; -@@ -786,7 +790,7 @@ GPtrArray +@@ -810,7 +814,7 @@ GPtrArray { ZakFormFormPrivate *priv; @@ -143,7 +143,7 @@ index c1b54cf..7670029 100644 return priv->ar_messages; } -@@ -806,7 +810,7 @@ zak_form_form_is_changed (ZakFormForm *zakform) +@@ -830,7 +834,7 @@ zak_form_form_is_changed (ZakFormForm *zakform) ZakFormFormPrivate *priv; @@ -152,7 +152,7 @@ index c1b54cf..7670029 100644 ret = FALSE; -@@ -834,7 +838,7 @@ zak_form_form_load (ZakFormForm *zakform, ZakFormIProvider *provider) +@@ -858,7 +862,7 @@ zak_form_form_load (ZakFormForm *zakform, ZakFormIProvider *provider) { ZakFormFormPrivate *priv; @@ -161,7 +161,7 @@ index c1b54cf..7670029 100644 return zak_form_iprovider_load (provider, priv->ar_elements); } -@@ -850,7 +854,7 @@ zak_form_form_insert (ZakFormForm *zakform, ZakFormIProvider *provider) +@@ -874,7 +878,7 @@ zak_form_form_insert (ZakFormForm *zakform, ZakFormIProvider *provider) { ZakFormFormPrivate *priv; @@ -170,7 +170,7 @@ index c1b54cf..7670029 100644 return zak_form_iprovider_insert (provider, priv->ar_elements); } -@@ -866,7 +870,7 @@ zak_form_form_update (ZakFormForm *zakform, ZakFormIProvider *provider) +@@ -890,7 +894,7 @@ zak_form_form_update (ZakFormForm *zakform, ZakFormIProvider *provider) { ZakFormFormPrivate *priv; @@ -179,7 +179,7 @@ index c1b54cf..7670029 100644 return zak_form_iprovider_update (provider, priv->ar_elements); } -@@ -882,7 +886,7 @@ zak_form_form_delete (ZakFormForm *zakform, ZakFormIProvider *provider) +@@ -906,7 +910,7 @@ zak_form_form_delete (ZakFormForm *zakform, ZakFormIProvider *provider) { ZakFormFormPrivate *priv; @@ -188,7 +188,7 @@ index c1b54cf..7670029 100644 return zak_form_iprovider_delete (provider, priv->ar_elements); } -@@ -895,7 +899,7 @@ zak_form_form_set_property (GObject *object, +@@ -919,7 +923,7 @@ zak_form_form_set_property (GObject *object, GParamSpec *pspec) { ZakFormForm *zak_form_form = (ZakFormForm *)object; @@ -197,7 +197,7 @@ index c1b54cf..7670029 100644 switch (property_id) { -@@ -912,7 +916,7 @@ zak_form_form_get_property (GObject *object, +@@ -936,7 +940,7 @@ zak_form_form_get_property (GObject *object, GParamSpec *pspec) { ZakFormForm *zak_form_form = (ZakFormForm *)object; @@ -206,7 +206,7 @@ index c1b54cf..7670029 100644 switch (property_id) { -@@ -926,7 +930,7 @@ static void +@@ -950,7 +954,7 @@ static void zak_form_form_dispose (GObject *gobject) { ZakFormForm *zak_form_form = (ZakFormForm *)gobject; @@ -215,7 +215,7 @@ index c1b54cf..7670029 100644 -@@ -938,7 +942,7 @@ static void +@@ -962,7 +966,7 @@ static void zak_form_form_finalize (GObject *gobject) { ZakFormForm *zak_form_form = (ZakFormForm *)gobject; @@ -224,7 +224,7 @@ index c1b54cf..7670029 100644 -@@ -960,7 +964,7 @@ zak_form_form_load_modules (ZakFormForm* zakform) +@@ -984,7 +988,7 @@ zak_form_form_load_modules (ZakFormForm* zakform) if (g_module_supported ()) { @@ -234,10 +234,10 @@ index c1b54cf..7670029 100644 modulesdir = (gchar *)g_getenv ("LIBZAKFORM_MODULESDIR"); if (modulesdir == NULL) diff --git a/src/formelement.c b/src/formelement.c -index 9e6db5e..c0eb87e 100644 +index eb9a601..ea3542c 100644 --- a/src/formelement.c +++ b/src/formelement.c -@@ -64,6 +64,8 @@ static void zak_form_element_finalize (GObject *gobject); +@@ -65,6 +65,8 @@ static void zak_form_element_finalize (GObject *gobject); static void zak_form_element_xml_parsing (ZakFormElement *element, xmlNode *xmlnode); @@ -246,7 +246,7 @@ index 9e6db5e..c0eb87e 100644 typedef struct { gchar *name; -@@ -85,7 +87,7 @@ typedef struct +@@ -86,7 +88,7 @@ typedef struct GPtrArray *pa_messages; } ZakFormElementPrivate; @@ -255,7 +255,7 @@ index 9e6db5e..c0eb87e 100644 static void zak_form_element_class_init (ZakFormElementClass *class) -@@ -99,6 +101,8 @@ zak_form_element_class_init (ZakFormElementClass *class) +@@ -100,6 +102,8 @@ zak_form_element_class_init (ZakFormElementClass *class) class->xml_parsing = zak_form_element_xml_parsing; @@ -264,7 +264,7 @@ index 9e6db5e..c0eb87e 100644 g_object_class_install_property (object_class, PROP_NAME, g_param_spec_string ("name", "Name", -@@ -217,7 +221,7 @@ zak_form_element_add_extension (ZakFormElement *element, GObject *extension) +@@ -250,7 +254,7 @@ zak_form_element_add_extension (ZakFormElement *element, GObject *extension) { ZakFormElementPrivate *priv; @@ -273,7 +273,7 @@ index 9e6db5e..c0eb87e 100644 g_ptr_array_add (priv->pa_extensions, extension); } -@@ -364,7 +368,7 @@ zak_form_element_set_name (ZakFormElement *element, const gchar *name) +@@ -426,7 +430,7 @@ zak_form_element_set_name (ZakFormElement *element, const gchar *name) { ZakFormElementPrivate *priv; @@ -282,7 +282,7 @@ index 9e6db5e..c0eb87e 100644 if (priv->name != NULL) { -@@ -386,7 +390,7 @@ gchar +@@ -448,7 +452,7 @@ gchar gchar *ret; @@ -291,7 +291,7 @@ index 9e6db5e..c0eb87e 100644 ret = g_strdup (priv->name); -@@ -404,7 +408,7 @@ zak_form_element_set_long_name (ZakFormElement *element, const gchar *long_name) +@@ -466,7 +470,7 @@ zak_form_element_set_long_name (ZakFormElement *element, const gchar *long_name) { ZakFormElementPrivate *priv; @@ -300,7 +300,7 @@ index 9e6db5e..c0eb87e 100644 if (priv->long_name != NULL) { -@@ -426,7 +430,7 @@ gchar +@@ -495,7 +499,7 @@ gchar gchar *ret; @@ -309,7 +309,7 @@ index 9e6db5e..c0eb87e 100644 if (priv->long_name == NULL) { -@@ -451,7 +455,7 @@ zak_form_element_set_is_key (ZakFormElement *element, gboolean is_key) +@@ -520,7 +524,7 @@ zak_form_element_set_is_key (ZakFormElement *element, gboolean is_key) { ZakFormElementPrivate *priv; @@ -318,7 +318,7 @@ index 9e6db5e..c0eb87e 100644 priv->is_key = is_key; } -@@ -466,7 +470,7 @@ zak_form_element_get_is_key (ZakFormElement *element) +@@ -535,7 +539,7 @@ zak_form_element_get_is_key (ZakFormElement *element) { ZakFormElementPrivate *priv; @@ -327,7 +327,7 @@ index 9e6db5e..c0eb87e 100644 return priv->is_key; } -@@ -482,7 +486,7 @@ zak_form_element_set_provider_type (ZakFormElement *element, const gchar *type) +@@ -551,7 +555,7 @@ zak_form_element_set_provider_type (ZakFormElement *element, const gchar *type) { ZakFormElementPrivate *priv; @@ -336,7 +336,7 @@ index 9e6db5e..c0eb87e 100644 if (priv->type != NULL) { -@@ -504,7 +508,7 @@ gchar +@@ -573,7 +577,7 @@ gchar gchar *ret; @@ -345,7 +345,7 @@ index 9e6db5e..c0eb87e 100644 ret = g_strdup (priv->type); -@@ -722,7 +726,7 @@ zak_form_element_set_value (ZakFormElement *element, const gchar *value) +@@ -819,7 +823,7 @@ zak_form_element_set_value_gvalue (ZakFormElement *element, GValue *value) ret = TRUE; @@ -354,7 +354,7 @@ index 9e6db5e..c0eb87e 100644 if (priv->value != NULL) { -@@ -848,7 +848,7 @@ gchar +@@ -848,7 +852,7 @@ GValue GValue *ret; @@ -363,7 +363,7 @@ index 9e6db5e..c0eb87e 100644 if (ZAK_FORM_ELEMENT_GET_CLASS (element)->get_value != NULL) { -@@ -780,7 +784,7 @@ zak_form_element_set_default_value (ZakFormElement *element, const gchar *value) +@@ -900,7 +904,7 @@ zak_form_element_set_default_value_gvalue (ZakFormElement *element, GValue *valu ret = TRUE; @@ -372,7 +372,7 @@ index 9e6db5e..c0eb87e 100644 if (priv->default_value != NULL) { -@@ -802,7 +806,7 @@ gchar +@@ -923,7 +927,7 @@ GValue { ZakFormElementPrivate *priv; @@ -381,7 +381,7 @@ index 9e6db5e..c0eb87e 100644 return priv->default_value; } -@@ -822,7 +826,7 @@ zak_form_element_set_original_value (ZakFormElement *element, const gchar *value +@@ -966,7 +970,7 @@ zak_form_element_set_original_value_gvalue (ZakFormElement *element, GValue *val ret = TRUE; @@ -390,7 +390,7 @@ index 9e6db5e..c0eb87e 100644 if (priv->original_value != NULL) { -@@ -844,7 +848,7 @@ gchar +@@ -989,7 +993,7 @@ GValue { ZakFormElementPrivate *priv; @@ -399,7 +399,7 @@ index 9e6db5e..c0eb87e 100644 return priv->original_value; } -@@ -882,7 +886,7 @@ zak_form_element_set_format (ZakFormElement *element, GHashTable *format) +@@ -1049,7 +1053,7 @@ zak_form_element_set_format (ZakFormElement *element, GHashTable *format) { ZakFormElementPrivate *priv; @@ -408,7 +408,7 @@ index 9e6db5e..c0eb87e 100644 if (priv->format != NULL) { -@@ -906,7 +910,7 @@ GHashTable +@@ -1073,7 +1077,7 @@ GHashTable GHashTable *ret; @@ -417,7 +417,7 @@ index 9e6db5e..c0eb87e 100644 ret = g_hash_table_ref (priv->format); -@@ -924,7 +928,7 @@ zak_form_element_set_visible (ZakFormElement *element, gboolean visible) +@@ -1091,7 +1095,7 @@ zak_form_element_set_visible (ZakFormElement *element, gboolean visible) { ZakFormElementPrivate *priv; @@ -426,7 +426,7 @@ index 9e6db5e..c0eb87e 100644 priv->visible = visible; -@@ -946,7 +950,7 @@ zak_form_element_get_visible (ZakFormElement *element) +@@ -1113,7 +1117,7 @@ zak_form_element_get_visible (ZakFormElement *element) gboolean ret; @@ -435,7 +435,7 @@ index 9e6db5e..c0eb87e 100644 if (ZAK_FORM_ELEMENT_GET_CLASS (element)->get_visible != NULL) { -@@ -971,7 +975,7 @@ zak_form_element_set_editable (ZakFormElement *element, gboolean editable) +@@ -1138,7 +1142,7 @@ zak_form_element_set_editable (ZakFormElement *element, gboolean editable) { ZakFormElementPrivate *priv; @@ -444,7 +444,7 @@ index 9e6db5e..c0eb87e 100644 priv->editable = editable; -@@ -993,7 +997,7 @@ zak_form_element_get_editable (ZakFormElement *element) +@@ -1160,7 +1164,7 @@ zak_form_element_get_editable (ZakFormElement *element) gboolean ret; @@ -453,7 +453,7 @@ index 9e6db5e..c0eb87e 100644 if (ZAK_FORM_ELEMENT_GET_CLASS (element)->get_editable != NULL) { -@@ -1018,7 +1022,7 @@ zak_form_element_set_to_load (ZakFormElement *element, gboolean to_load) +@@ -1185,7 +1189,7 @@ zak_form_element_set_to_load (ZakFormElement *element, gboolean to_load) { ZakFormElementPrivate *priv; @@ -462,7 +462,7 @@ index 9e6db5e..c0eb87e 100644 priv->to_load = to_load; } -@@ -1033,7 +1037,7 @@ zak_form_element_get_to_load (ZakFormElement *element) +@@ -1200,7 +1204,7 @@ zak_form_element_get_to_load (ZakFormElement *element) { ZakFormElementPrivate *priv; @@ -471,7 +471,7 @@ index 9e6db5e..c0eb87e 100644 return priv->to_load; } -@@ -1049,7 +1053,7 @@ zak_form_element_set_to_save (ZakFormElement *element, gboolean to_save) +@@ -1216,7 +1220,7 @@ zak_form_element_set_to_save (ZakFormElement *element, gboolean to_save) { ZakFormElementPrivate *priv; @@ -480,7 +480,7 @@ index 9e6db5e..c0eb87e 100644 priv->to_save = to_save; } -@@ -1064,7 +1068,7 @@ zak_form_element_get_to_save (ZakFormElement *element) +@@ -1231,7 +1235,7 @@ zak_form_element_get_to_save (ZakFormElement *element) { ZakFormElementPrivate *priv; @@ -489,7 +489,7 @@ index 9e6db5e..c0eb87e 100644 return priv->to_save; } -@@ -1079,7 +1083,7 @@ zak_form_element_clear (ZakFormElement *element) +@@ -1246,7 +1250,7 @@ zak_form_element_clear (ZakFormElement *element) { ZakFormElementPrivate *priv; @@ -498,7 +498,7 @@ index 9e6db5e..c0eb87e 100644 zak_form_element_set_value_gvalue (element, priv->default_value); } -@@ -1315,7 +1315,7 @@ zak_form_element_is_valid (ZakFormElement *element) +@@ -1314,7 +1318,7 @@ zak_form_element_is_valid (ZakFormElement *element) ZakFormElementClass *klass = ZAK_FORM_ELEMENT_GET_CLASS (element); @@ -507,7 +507,7 @@ index 9e6db5e..c0eb87e 100644 ret = TRUE; ret_callback = FALSE; -@@ -1155,7 +1159,7 @@ zak_form_element_is_valid (ZakFormElement *element) +@@ -1367,7 +1371,7 @@ zak_form_element_is_valid (ZakFormElement *element) GPtrArray *zak_form_element_get_messages (ZakFormElement *element) { @@ -516,7 +516,7 @@ index 9e6db5e..c0eb87e 100644 return priv->pa_messages; } -@@ -1212,7 +1216,7 @@ zak_form_element_set_property (GObject *object, +@@ -1424,7 +1428,7 @@ zak_form_element_set_property (GObject *object, GParamSpec *pspec) { ZakFormElement *zak_form_element = (ZakFormElement *)object; @@ -525,7 +525,7 @@ index 9e6db5e..c0eb87e 100644 switch (property_id) { -@@ -1277,7 +1281,7 @@ zak_form_element_get_property (GObject *object, +@@ -1489,7 +1493,7 @@ zak_form_element_get_property (GObject *object, GParamSpec *pspec) { ZakFormElement *zak_form_element = (ZakFormElement *)object; @@ -534,7 +534,7 @@ index 9e6db5e..c0eb87e 100644 switch (property_id) { -@@ -1339,7 +1343,7 @@ static void +@@ -1551,7 +1555,7 @@ static void zak_form_element_dispose (GObject *gobject) { ZakFormElement *zak_form_element = (ZakFormElement *)gobject; @@ -543,7 +543,7 @@ index 9e6db5e..c0eb87e 100644 -@@ -1351,7 +1355,7 @@ static void +@@ -1563,7 +1567,7 @@ static void zak_form_element_finalize (GObject *gobject) { ZakFormElement *zak_form_element = (ZakFormElement *)gobject; @@ -553,10 +553,10 @@ index 9e6db5e..c0eb87e 100644 diff --git a/src/formelementfilterluc.c b/src/formelementfilterluc.c -index 543043a..e0f7bf9 100644 +index ee9d928..f4f25ef 100644 --- a/src/formelementfilterluc.c +++ b/src/formelementfilterluc.c -@@ -51,13 +51,6 @@ enum +@@ -52,13 +52,6 @@ enum CAMEL }; @@ -571,10 +571,10 @@ index 543043a..e0f7bf9 100644 typedef struct _ZakFormElementFilterLucPrivate ZakFormElementFilterLucPrivate; diff --git a/src/formelementfiltertrim.c b/src/formelementfiltertrim.c -index 6acafbd..8b658f1 100644 +index 1a891a8..5977952 100644 --- a/src/formelementfiltertrim.c +++ b/src/formelementfiltertrim.c -@@ -41,13 +41,6 @@ +@@ -41,13 +41,6 @@ static void zak_form_element_filter_trim_finalize (GObject *gobject); static gboolean zak_form_element_filter_trim_xml_parsing (ZakFormElementFilter *filter, xmlNode *xnode); static gchar *zak_form_element_filter_trim_filter (ZakFormElementFilter *filter_trim, const gchar *value); @@ -589,10 +589,10 @@ index 6acafbd..8b658f1 100644 typedef struct _ZakFormElementFilterTrimPrivate ZakFormElementFilterTrimPrivate; diff --git a/src/formelementvalidator.c b/src/formelementvalidator.c -index 65fb8db..27c2fbd 100644 +index 063b3b2..2ac0232 100644 --- a/src/formelementvalidator.c +++ b/src/formelementvalidator.c -@@ -47,14 +47,16 @@ static void zak_form_element_validator_get_property (GObject *object, +@@ -47,6 +47,8 @@ static void zak_form_element_validator_get_property (GObject *object, static void zak_form_element_validator_dispose (GObject *gobject); static void zak_form_element_validator_finalize (GObject *gobject); @@ -601,7 +601,7 @@ index 65fb8db..27c2fbd 100644 typedef struct { gchar *id; - gboolean enabled; +@@ -54,7 +56,7 @@ typedef struct gchar *message; } ZakFormElementValidatorPrivate; @@ -610,7 +610,7 @@ index 65fb8db..27c2fbd 100644 static void zak_form_element_validator_class_init (ZakFormElementValidatorClass *class) -@@ -66,6 +66,8 @@ zak_form_element_validator_class_init (ZakFormElementValidatorClass *class) +@@ -66,6 +68,8 @@ zak_form_element_validator_class_init (ZakFormElementValidatorClass *class) object_class->dispose = zak_form_element_validator_dispose; object_class->finalize = zak_form_element_validator_finalize; @@ -619,7 +619,7 @@ index 65fb8db..27c2fbd 100644 g_object_class_install_property (object_class, PROP_ID, g_param_spec_string ("id", "Id", -@@ -195,7 +195,7 @@ void +@@ -195,7 +199,7 @@ void zak_form_element_validator_set_message (ZakFormElementValidator *validator, const gchar *message) { @@ -628,7 +628,7 @@ index 65fb8db..27c2fbd 100644 priv->message = g_strdup (message); } -@@ -209,7 +209,7 @@ zak_form_element_validator_set_message (ZakFormElementValidator *validator, +@@ -209,7 +213,7 @@ zak_form_element_validator_set_message (ZakFormElementValidator *validator, gchar *zak_form_element_validator_get_message (ZakFormElementValidator *validator) { @@ -637,7 +637,7 @@ index 65fb8db..27c2fbd 100644 return g_strdup (priv->message); } -@@ -166,7 +170,7 @@ zak_form_element_validator_set_property (GObject *object, +@@ -250,7 +254,7 @@ zak_form_element_validator_set_property (GObject *object, GParamSpec *pspec) { ZakFormElementValidator *zak_form_element_validator = (ZakFormElementValidator *)object; @@ -646,7 +646,7 @@ index 65fb8db..27c2fbd 100644 switch (property_id) { -@@ -191,7 +195,7 @@ zak_form_element_validator_get_property (GObject *object, +@@ -279,7 +283,7 @@ zak_form_element_validator_get_property (GObject *object, GParamSpec *pspec) { ZakFormElementValidator *zak_form_element_validator = (ZakFormElementValidator *)object; @@ -655,7 +655,7 @@ index 65fb8db..27c2fbd 100644 switch (property_id) { -@@ -213,7 +217,7 @@ static void +@@ -305,7 +309,7 @@ static void zak_form_element_validator_dispose (GObject *gobject) { ZakFormElementValidator *zak_form_element_validator = (ZakFormElementValidator *)gobject; @@ -664,7 +664,7 @@ index 65fb8db..27c2fbd 100644 -@@ -225,7 +229,7 @@ static void +@@ -317,7 +321,7 @@ static void zak_form_element_validator_finalize (GObject *gobject) { ZakFormElementValidator *zak_form_element_validator = (ZakFormElementValidator *)gobject; @@ -674,10 +674,10 @@ index 65fb8db..27c2fbd 100644 diff --git a/src/formelementvalidatordate.c b/src/formelementvalidatordate.c -index df7d0f5..b938f75 100644 +index 55f0ca9..61708b4 100644 --- a/src/formelementvalidatordate.c +++ b/src/formelementvalidatordate.c -@@ -45,13 +45,6 @@ +@@ -45,13 +45,6 @@ static void zak_form_element_validator_date_finalize (GObject *gobject); static gboolean zak_form_element_validator_date_xml_parsing (ZakFormElementValidator *validator, xmlNode *xnode); static gboolean zak_form_element_validator_date_validate (ZakFormElementValidator *validator_date, const gchar *value); @@ -692,10 +692,10 @@ index df7d0f5..b938f75 100644 typedef struct _ZakFormElementValidatorDatePrivate ZakFormElementValidatorDatePrivate; diff --git a/src/formelementvalidatordate.h b/src/formelementvalidatordate.h -index 0406cee..b55fdbe 100644 +index fad3cf3..f803813 100644 --- a/src/formelementvalidatordate.h +++ b/src/formelementvalidatordate.h -@@ -31,7 +31,7 @@ G_BEGIN_DECLS +@@ -32,7 +32,7 @@ G_BEGIN_DECLS #define ZAK_FORM_TYPE_ELEMENT_VALIDATOR_DATE (zak_form_element_validator_date_get_type ()) @@ -705,10 +705,10 @@ index 0406cee..b55fdbe 100644 #define ZAK_FORM_IS_ELEMENT_VALIDATOR_DATE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_DATE)) #define ZAK_FORM_IS_ELEMENT_VALIDATOR_DATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_DATE)) diff --git a/src/formelementvalidatornotempty.c b/src/formelementvalidatornotempty.c -index a3ef4e2..63f6131 100644 +index ad40f64..43a74fc 100644 --- a/src/formelementvalidatornotempty.c +++ b/src/formelementvalidatornotempty.c -@@ -47,13 +47,6 @@ +@@ -47,13 +47,6 @@ static void zak_form_element_validator_notempty_finalize (GObject *gobject); static gboolean zak_form_element_validator_notempty_xml_parsing (ZakFormElementValidator *validator, xmlNode *xnode); static gboolean zak_form_element_validator_notempty_validate (ZakFormElementValidator *validator_notempty, const gchar *value); @@ -723,7 +723,7 @@ index a3ef4e2..63f6131 100644 typedef struct _ZakFormElementValidatorNotemptyPrivate ZakFormElementValidatorNotemptyPrivate; diff --git a/src/formelementvalidatornotempty.h b/src/formelementvalidatornotempty.h -index c6e3a20..3dc4c0e 100644 +index 2fba186..0f7ed77 100644 --- a/src/formelementvalidatornotempty.h +++ b/src/formelementvalidatornotempty.h @@ -31,7 +31,7 @@ G_BEGIN_DECLS @@ -736,10 +736,10 @@ index c6e3a20..3dc4c0e 100644 #define ZAK_FORM_IS_ELEMENT_VALIDATOR_NOTEMPTY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_NOTEMPTY)) #define ZAK_FORM_IS_ELEMENT_VALIDATOR_NOTEMPTY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_NOTEMPTY)) diff --git a/src/formelementvalidatorregex.c b/src/formelementvalidatorregex.c -index a0d5b2b..aa8658a 100644 +index 8614ebf..934426e 100644 --- a/src/formelementvalidatorregex.c +++ b/src/formelementvalidatorregex.c -@@ -47,13 +47,6 @@ +@@ -47,13 +47,6 @@ static void zak_form_element_validator_regex_finalize (GObject *gobject); static gboolean zak_form_element_validator_regex_xml_parsing (ZakFormElementValidator *validator, xmlNode *xnode); static gboolean zak_form_element_validator_regex_validate (ZakFormElementValidator *validator_regex, const gchar *value); @@ -754,7 +754,7 @@ index a0d5b2b..aa8658a 100644 typedef struct _ZakFormElementValidatorRegexPrivate ZakFormElementValidatorRegexPrivate; diff --git a/src/formelementvalidatorregex.h b/src/formelementvalidatorregex.h -index f8e62e0..ac437b6 100644 +index 4308b7a..efb623f 100644 --- a/src/formelementvalidatorregex.h +++ b/src/formelementvalidatorregex.h @@ -31,7 +31,7 @@ G_BEGIN_DECLS @@ -785,10 +785,10 @@ index be970ae..392dae5 100644 typedef struct _ZakFormIProvider ZakFormIProvider; diff --git a/src/formvalidator.c b/src/formvalidator.c -index eba0131..6cc3f4e 100644 +index 24c1f8b..df5cc82 100644 --- a/src/formvalidator.c +++ b/src/formvalidator.c -@@ -48,14 +48,16 @@ static void zak_form_validator_get_property (GObject *object, +@@ -48,6 +48,8 @@ static void zak_form_validator_get_property (GObject *object, static void zak_form_validator_dispose (GObject *gobject); static void zak_form_validator_finalize (GObject *gobject); @@ -797,7 +797,7 @@ index eba0131..6cc3f4e 100644 typedef struct { gchar *id; - gboolean enabled; +@@ -55,7 +57,7 @@ typedef struct gchar *message; } ZakFormValidatorPrivate; @@ -806,7 +806,7 @@ index eba0131..6cc3f4e 100644 static void zak_form_validator_class_init (ZakFormValidatorClass *class) -@@ -67,6 +67,8 @@ zak_form_validator_class_init (ZakFormValidatorClass *class) +@@ -67,6 +69,8 @@ zak_form_validator_class_init (ZakFormValidatorClass *class) object_class->dispose = zak_form_validator_dispose; object_class->finalize = zak_form_validator_finalize; @@ -815,7 +815,7 @@ index eba0131..6cc3f4e 100644 g_object_class_install_property (object_class, PROP_ID, g_param_spec_string ("id", "Id", -@@ -92,7 +92,7 @@ zak_form_validator_class_init (ZakFormValidatorClass *class) +@@ -92,7 +96,7 @@ zak_form_validator_class_init (ZakFormValidatorClass *class) static void zak_form_validator_init (ZakFormValidator *zak_form_validator) { @@ -824,7 +824,7 @@ index eba0131..6cc3f4e 100644 } /** -@@ -206,7 +206,7 @@ void +@@ -206,7 +210,7 @@ void zak_form_validator_set_message (ZakFormValidator *validator, const gchar *message) { @@ -833,7 +833,7 @@ index eba0131..6cc3f4e 100644 priv->message = g_strdup (message); } -@@ -220,7 +220,7 @@ +@@ -220,7 +224,7 @@ zak_form_validator_set_message (ZakFormValidator *validator, gchar *zak_form_validator_get_message (ZakFormValidator *validator) { @@ -842,7 +842,7 @@ index eba0131..6cc3f4e 100644 return g_strdup (priv->message); } -@@ -166,7 +170,7 @@ zak_form_validator_set_property (GObject *object, +@@ -261,7 +265,7 @@ zak_form_validator_set_property (GObject *object, GParamSpec *pspec) { ZakFormValidator *zak_form_validator = (ZakFormValidator *)object; @@ -851,7 +851,7 @@ index eba0131..6cc3f4e 100644 switch (property_id) { -@@ -261,7 +261,7 @@ zak_form_validator_get_property (GObject *object, +@@ -290,7 +294,7 @@ zak_form_validator_get_property (GObject *object, GParamSpec *pspec) { ZakFormValidator *zak_form_validator = (ZakFormValidator *)object; @@ -860,7 +860,7 @@ index eba0131..6cc3f4e 100644 switch (property_id) { -@@ -316,7 +316,7 @@ static void +@@ -316,7 +320,7 @@ static void zak_form_validator_dispose (GObject *gobject) { ZakFormValidator *zak_form_validator = (ZakFormValidator *)gobject; @@ -869,7 +869,7 @@ index eba0131..6cc3f4e 100644 -@@ -328,7 +328,7 @@ static void +@@ -328,7 +332,7 @@ static void zak_form_validator_finalize (GObject *gobject) { ZakFormValidator *zak_form_validator = (ZakFormValidator *)gobject; @@ -879,10 +879,10 @@ index eba0131..6cc3f4e 100644 diff --git a/src/formvalidatorcompare.c b/src/formvalidatorcompare.c -index 02fedf6..6d4eac2 100644 +index 2053b14..d07ec6b 100644 --- a/src/formvalidatorcompare.c +++ b/src/formvalidatorcompare.c -@@ -47,13 +47,6 @@ +@@ -47,13 +47,6 @@ static void zak_form_validator_compare_finalize (GObject *gobject); static gboolean zak_form_validator_compare_xml_parsing (ZakFormValidator *validator, xmlNode *xnode, gpointer form); static gboolean zak_form_validator_compare_validate (ZakFormValidator *validator_notempty); @@ -897,7 +897,7 @@ index 02fedf6..6d4eac2 100644 typedef struct _ZakFormValidatorComparePrivate ZakFormValidatorComparePrivate; diff --git a/src/formvalidatorcompare.h b/src/formvalidatorcompare.h -index d4ab5ac..91b9180 100644 +index 45690ca..6f153de 100644 --- a/src/formvalidatorcompare.h +++ b/src/formvalidatorcompare.h @@ -31,7 +31,7 @@ G_BEGIN_DECLS @@ -910,10 +910,10 @@ index d4ab5ac..91b9180 100644 #define ZAK_FORM_IS_VALIDATOR_COMPARE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPARE)) #define ZAK_FORM_IS_VALIDATOR_COMPARE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_VALIDATOR_COMPARE)) diff --git a/src/formvalidatorcomparedate.c b/src/formvalidatorcomparedate.c -index 78e4360..2546163 100644 +index 13089ee..edb658e 100644 --- a/src/formvalidatorcomparedate.c +++ b/src/formvalidatorcomparedate.c -@@ -47,13 +47,6 @@ +@@ -47,13 +47,6 @@ static void zak_form_validator_compare_date_finalize (GObject *gobject); static gboolean zak_form_validator_compare_date_xml_parsing (ZakFormValidator *validator, xmlNode *xnode, gpointer form); static gboolean zak_form_validator_compare_date_validate (ZakFormValidator *validator_notempty); @@ -928,7 +928,7 @@ index 78e4360..2546163 100644 typedef struct _ZakFormValidatorCompareDatePrivate ZakFormValidatorCompareDatePrivate; diff --git a/src/formvalidatorcomparedate.h b/src/formvalidatorcomparedate.h -index ec11584..655680a 100644 +index a68f3af..e096de0 100644 --- a/src/formvalidatorcomparedate.h +++ b/src/formvalidatorcomparedate.h @@ -31,7 +31,7 @@ G_BEGIN_DECLS diff --git a/debian/patches/0006-Some-new-functions-not-replaced.patch b/debian/patches/0006-Some-new-functions-not-replaced.patch index 623eb89..0995c76 100644 --- a/debian/patches/0006-Some-new-functions-not-replaced.patch +++ b/debian/patches/0006-Some-new-functions-not-replaced.patch @@ -10,10 +10,10 @@ Subject: Some new functions not replaced. 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/form.c b/src/form.c -index 7670029..8223d72 100644 +index 03c076f..4d6a76a 100644 --- a/src/form.c +++ b/src/form.c -@@ -117,7 +117,7 @@ zak_form_form_init (ZakFormForm *zak_form_form) +@@ -113,7 +113,7 @@ zak_form_form_init (ZakFormForm *zak_form_form) { gchar *localedir; @@ -23,10 +23,10 @@ index 7670029..8223d72 100644 priv->ar_modules = NULL; priv->ar_elements = g_ptr_array_new (); diff --git a/src/formelement.c b/src/formelement.c -index c0eb87e..d477a4f 100644 +index ea3542c..93b29c4 100644 --- a/src/formelement.c +++ b/src/formelement.c -@@ -191,7 +191,7 @@ zak_form_element_class_init (ZakFormElementClass *class) +@@ -222,7 +222,7 @@ zak_form_element_class_init (ZakFormElementClass *class) static void zak_form_element_init (ZakFormElement *zak_form_element) { @@ -36,7 +36,7 @@ index c0eb87e..d477a4f 100644 priv->name = g_strdup (""); priv->long_name = NULL; diff --git a/src/formelementfilter.c b/src/formelementfilter.c -index fe3ce9a..6d53784 100644 +index 43e5823..07dc347 100644 --- a/src/formelementfilter.c +++ b/src/formelementfilter.c @@ -44,6 +44,8 @@ static void zak_form_element_filter_get_property (GObject *object, @@ -48,7 +48,7 @@ index fe3ce9a..6d53784 100644 typedef struct { gchar *id; -@@ -80,7 +80,7 @@ zak_form_element_filter_class_init (ZakFormElementFilterClass *class) +@@ -80,7 +82,7 @@ zak_form_element_filter_class_init (ZakFormElementFilterClass *class) static void zak_form_element_filter_init (ZakFormElementFilter *zak_form_element_filter) { @@ -57,7 +57,7 @@ index fe3ce9a..6d53784 100644 } gboolean -@@ -130,7 +132,7 @@ zak_form_element_filter_set_property (GObject *object, +@@ -203,7 +205,7 @@ zak_form_element_filter_set_property (GObject *object, GParamSpec *pspec) { ZakFormElementFilter *zak_form_element_filter = (ZakFormElementFilter *)object; @@ -66,7 +66,7 @@ index fe3ce9a..6d53784 100644 switch (property_id) { -@@ -151,7 +153,7 @@ zak_form_element_filter_get_property (GObject *object, +@@ -228,7 +230,7 @@ zak_form_element_filter_get_property (GObject *object, GParamSpec *pspec) { ZakFormElementFilter *zak_form_element_filter = (ZakFormElementFilter *)object; @@ -75,7 +75,7 @@ index fe3ce9a..6d53784 100644 switch (property_id) { -@@ -169,7 +171,7 @@ static void +@@ -250,7 +252,7 @@ static void zak_form_element_filter_dispose (GObject *gobject) { ZakFormElementFilter *zak_form_element_filter = (ZakFormElementFilter *)gobject; @@ -84,7 +84,7 @@ index fe3ce9a..6d53784 100644 -@@ -181,7 +183,7 @@ static void +@@ -262,7 +264,7 @@ static void zak_form_element_filter_finalize (GObject *gobject) { ZakFormElementFilter *zak_form_element_filter = (ZakFormElementFilter *)gobject; @@ -94,10 +94,10 @@ index fe3ce9a..6d53784 100644 diff --git a/src/formelementvalidator.c b/src/formelementvalidator.c -index 27c2fbd..29869c8 100644 +index 2ac0232..0db180c 100644 --- a/src/formelementvalidator.c +++ b/src/formelementvalidator.c -@@ -86,7 +86,7 @@ zak_form_element_validator_class_init (ZakFormElementValidatorClass *class) +@@ -95,7 +95,7 @@ zak_form_element_validator_class_init (ZakFormElementValidatorClass *class) static void zak_form_element_validator_init (ZakFormElementValidator *zak_form_element_validator) { diff --git a/debian/patches/0007-Glib-old-version-private.patch b/debian/patches/0007-Glib-old-version-private.patch index c881c22..0a01ddb 100644 --- a/debian/patches/0007-Glib-old-version-private.patch +++ b/debian/patches/0007-Glib-old-version-private.patch @@ -11,10 +11,10 @@ Subject: Glib old version private. 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/form.c b/src/form.c -index 8223d72..20c8403 100644 +index 4d6a76a..db77782 100644 --- a/src/form.c +++ b/src/form.c -@@ -562,7 +562,7 @@ ZakFormElement +@@ -556,7 +556,7 @@ ZakFormElement GPtrArray *zak_form_form_get_elements (ZakFormForm *zakform) { @@ -23,7 +23,7 @@ index 8223d72..20c8403 100644 return priv->ar_elements; } -@@ -582,7 +582,7 @@ GPtrArray +@@ -576,7 +576,7 @@ GPtrArray guint i; @@ -32,7 +32,7 @@ index 8223d72..20c8403 100644 ar = g_ptr_array_new (); for (i = 0; i < priv->ar_elements->len; i++) -@@ -628,7 +628,7 @@ zak_form_form_add_validator (ZakFormForm *zakform, ZakFormValidator *validator) +@@ -652,7 +652,7 @@ ZakFormValidator GPtrArray *zak_form_form_get_validators (ZakFormForm *zakform) { @@ -41,7 +41,7 @@ index 8223d72..20c8403 100644 return priv->ar_validators; } -@@ -648,7 +648,7 @@ GPtrArray +@@ -672,7 +672,7 @@ GPtrArray guint i; @@ -51,10 +51,10 @@ index 8223d72..20c8403 100644 ar = g_ptr_array_new (); for (i = 0; i < priv->ar_validators->len; i++) diff --git a/src/formelement.c b/src/formelement.c -index d477a4f..9d307d9 100644 +index 93b29c4..e37ee52 100644 --- a/src/formelement.c +++ b/src/formelement.c -@@ -235,7 +235,7 @@ zak_form_element_add_extension (ZakFormElement *element, GObject *extension) +@@ -268,7 +268,7 @@ zak_form_element_add_extension (ZakFormElement *element, GObject *extension) GPtrArray *zak_form_element_get_extensions (ZakFormElement *element) { @@ -63,7 +63,7 @@ index d477a4f..9d307d9 100644 return priv->pa_extensions; } -@@ -255,7 +255,7 @@ GPtrArray +@@ -288,7 +288,7 @@ GPtrArray guint i; @@ -72,7 +72,7 @@ index d477a4f..9d307d9 100644 ar = g_ptr_array_new (); for (i = 0; i < priv->pa_extensions->len; i++) -@@ -281,7 +281,7 @@ zak_form_element_add_filter (ZakFormElement *element, ZakFormElementFilter *filt +@@ -314,7 +314,7 @@ zak_form_element_add_filter (ZakFormElement *element, ZakFormElementFilter *filt { ZakFormElementPrivate *priv; @@ -81,7 +81,7 @@ index d477a4f..9d307d9 100644 g_ptr_array_add (priv->pa_filters, filter); } -@@ -298,7 +298,7 @@ zak_form_element_filter (ZakFormElement *element) +@@ -331,7 +331,7 @@ zak_form_element_filter (ZakFormElement *element) ZakFormElementPrivate *priv; @@ -90,7 +90,7 @@ index d477a4f..9d307d9 100644 for (i = 0; i < priv->pa_filters->len; i++) { -@@ -322,7 +322,7 @@ zak_form_element_filter (ZakFormElement *element) +@@ -355,7 +355,7 @@ zak_form_element_filter (ZakFormElement *element) GPtrArray *zak_form_element_get_filters (ZakFormElement *element) { @@ -99,7 +99,7 @@ index d477a4f..9d307d9 100644 return priv->pa_filters; } -@@ -342,7 +342,7 @@ GPtrArray +@@ -404,7 +404,7 @@ GPtrArray guint i; @@ -108,7 +108,7 @@ index d477a4f..9d307d9 100644 ar = g_ptr_array_new (); for (i = 0; i < priv->pa_filters->len; i++) -@@ -1099,7 +1099,7 @@ zak_form_element_add_validator (ZakFormElement *element, ZakFormElementValidator +@@ -1266,7 +1266,7 @@ zak_form_element_add_validator (ZakFormElement *element, ZakFormElementValidator { ZakFormElementPrivate *priv; @@ -117,7 +117,7 @@ index d477a4f..9d307d9 100644 g_ptr_array_add (priv->pa_validators, validator); } -@@ -1173,7 +1173,7 @@ GPtrArray +@@ -1385,7 +1385,7 @@ GPtrArray GPtrArray *zak_form_element_get_validators(ZakFormElement *element) { @@ -126,7 +126,7 @@ index d477a4f..9d307d9 100644 return priv->pa_validators; } -@@ -1193,7 +1193,7 @@ GPtrArray +@@ -1405,7 +1405,7 @@ GPtrArray guint i; @@ -136,10 +136,10 @@ index d477a4f..9d307d9 100644 ar = g_ptr_array_new (); for (i = 0; i < priv->pa_validators->len; i++) diff --git a/src/formelementfilter.c b/src/formelementfilter.c -index 6d53784..f17663e 100644 +index 07dc347..1bb9652 100644 --- a/src/formelementfilter.c +++ b/src/formelementfilter.c -@@ -50,7 +50,7 @@ typedef struct +@@ -52,7 +52,7 @@ typedef struct gboolean enabled; } ZakFormElementFilterPrivate; @@ -148,7 +148,7 @@ index 6d53784..f17663e 100644 static void zak_form_element_filter_class_init (ZakFormElementFilterClass *class) -@@ -75,6 +75,8 @@ zak_form_element_filter_class_init (ZakFormElementFilterClass *class) +@@ -77,6 +77,8 @@ zak_form_element_filter_class_init (ZakFormElementFilterClass *class) "Enabled", TRUE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); @@ -157,7 +157,7 @@ index 6d53784..f17663e 100644 } static void -@@ -105,7 +107,7 @@ gchar +@@ -178,7 +180,7 @@ gchar gboolean zak_form_element_filter_get_enabled (ZakFormElementFilter *filter) { @@ -166,7 +166,7 @@ index 6d53784..f17663e 100644 return priv->enabled; } -@@ -119,7 +121,7 @@ zak_form_element_filter_get_enabled (ZakFormElementFilter *filter) +@@ -192,7 +194,7 @@ zak_form_element_filter_get_enabled (ZakFormElementFilter *filter) void zak_form_element_filter_set_enabled (ZakFormElementFilter *filter, gboolean enabled) { @@ -176,10 +176,10 @@ index 6d53784..f17663e 100644 priv->enabled = enabled; } diff --git a/src/formelementvalidator.c b/src/formelementvalidator.c -index 29869c8..5b37879 100644 +index 0db180c..d75db60 100644 --- a/src/formelementvalidator.c +++ b/src/formelementvalidator.c -@@ -143,7 +143,7 @@ gchar +@@ -227,7 +227,7 @@ gchar gboolean zak_form_element_validator_get_enabled (ZakFormElementValidator *validator) { @@ -188,7 +188,7 @@ index 29869c8..5b37879 100644 return priv->enabled; } -@@ -157,7 +157,7 @@ zak_form_element_validator_get_enabled (ZakFormElementValidator *validator) +@@ -241,7 +241,7 @@ zak_form_element_validator_get_enabled (ZakFormElementValidator *validator) void zak_form_element_validator_set_enabled (ZakFormElementValidator *validator, gboolean enabled) { @@ -198,10 +198,10 @@ index 29869c8..5b37879 100644 priv->enabled = enabled; } diff --git a/src/formvalidator.c b/src/formvalidator.c -index 6cc3f4e..7497b27 100644 +index df5cc82..6c95360 100644 --- a/src/formvalidator.c +++ b/src/formvalidator.c -@@ -143,7 +143,7 @@ gchar +@@ -238,7 +238,7 @@ gchar gboolean zak_form_validator_get_enabled (ZakFormValidator *validator) { @@ -210,7 +210,7 @@ index 6cc3f4e..7497b27 100644 return priv->enabled; } -@@ -157,7 +157,7 @@ zak_form_validator_get_enabled (ZakFormValidator *validator) +@@ -252,7 +252,7 @@ zak_form_validator_get_enabled (ZakFormValidator *validator) void zak_form_validator_set_enabled (ZakFormValidator *validator, gboolean enabled) { diff --git a/debian/patches/0008-Glib-old-macro-for-ZakFormValidatorComposite.patch b/debian/patches/0008-Glib-old-macro-for-ZakFormValidatorComposite.patch new file mode 100644 index 0000000..7a43e4f --- /dev/null +++ b/debian/patches/0008-Glib-old-macro-for-ZakFormValidatorComposite.patch @@ -0,0 +1,73 @@ +From: Andrea Zagli +Date: Sun, 21 May 2017 14:47:50 +0200 +Subject: Glib old macro for ZakFormValidatorComposite. + +--- + src/formvalidator.h | 2 +- + src/formvalidatorcomposite.c | 7 ------- + src/formvalidatorcomposite.h | 21 +++++++++++++++++++-- + 3 files changed, 20 insertions(+), 10 deletions(-) + +diff --git a/src/formvalidator.h b/src/formvalidator.h +index 40ef5c5..21e5b0a 100644 +--- a/src/formvalidator.h ++++ b/src/formvalidator.h +@@ -29,7 +29,7 @@ G_BEGIN_DECLS + + + #define ZAK_FORM_TYPE_VALIDATOR (zak_form_validator_get_type ()) +-#define ZAK_FORM_VALIDATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_VALIDATOR, ZakFormValidator) ++#define ZAK_FORM_VALIDATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_VALIDATOR, ZakFormValidator)) + #define ZAK_FORM_VALIDATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_TYPE_VALIDATOR, ZakFormValidatorClass)) + #define ZAK_FORM_IS_VALIDATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_VALIDATOR)) + #define ZAK_FORM_IS_VALIDATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_VALIDATOR)) +diff --git a/src/formvalidatorcomposite.c b/src/formvalidatorcomposite.c +index e5bdbe4..2c57fb4 100644 +--- a/src/formvalidatorcomposite.c ++++ b/src/formvalidatorcomposite.c +@@ -49,13 +49,6 @@ static void zak_form_validator_composite_finalize (GObject *gobject); + static gboolean zak_form_validator_composite_xml_parsing (ZakFormValidator *validator, xmlNode *xnode, gpointer form); + static gboolean zak_form_validator_composite_validate (ZakFormValidator *validator_notempty); + +-struct _ZakFormValidatorComposite +-{ +- ZakFormValidator parent_instance; +- +- /* Other members, including private data. */ +-}; +- + #define ZAK_FORM_VALIDATOR_COMPOSITE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPOSITE, ZakFormValidatorCompositePrivate)) + + typedef struct _ZakFormValidatorCompositePrivate ZakFormValidatorCompositePrivate; +diff --git a/src/formvalidatorcomposite.h b/src/formvalidatorcomposite.h +index e3bd870..47e24f9 100644 +--- a/src/formvalidatorcomposite.h ++++ b/src/formvalidatorcomposite.h +@@ -31,8 +31,25 @@ + G_BEGIN_DECLS + + +-#define ZAK_FORM_TYPE_VALIDATOR_COMPOSITE zak_form_validator_composite_get_type () +-G_DECLARE_FINAL_TYPE (ZakFormValidatorComposite, zak_form_validator_composite, ZAK_FORM, VALIDATOR_COMPOSITE, ZakFormValidator) ++#define ZAK_FORM_TYPE_VALIDATOR_COMPOSITE (zak_form_validator_composite_get_type ()) ++#define ZAK_FORM_VALIDATOR_COMPOSITE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPOSITE, ZakFormValidatorComposite)) ++#define ZAK_FORM_VALIDATOR_COMPOSITE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_TYPE_VALIDATOR_COMPOSITE, ZakFormValidatorCompositeClass)) ++#define ZAK_FORM_IS_VALIDATOR_COMPOSITE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPOSITE)) ++#define ZAK_FORM_IS_VALIDATOR_COMPOSITE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_VALIDATOR_COMPOSITE)) ++#define ZAK_FORM_VALIDATOR_COMPOSITE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPOSITE, ZakFormValidatorCompositeClass)) ++ ++typedef struct _ZakFormValidatorComposite ZakFormValidatorComposite; ++typedef struct _ZakFormValidatorCompositeClass ZakFormValidatorCompositeClass; ++ ++struct _ZakFormValidatorComposite ++ { ++ ZakFormValidator parent; ++ }; ++ ++struct _ZakFormValidatorCompositeClass ++{ ++ ZakFormValidatorClass parent_class; ++}; + + ZakFormValidatorComposite *zak_form_validator_composite_new (void); + diff --git a/debian/patches/series b/debian/patches/series index 6f46b33..132d1e3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 0005-Glib-old-version-private.patch 0006-Some-new-functions-not-replaced.patch 0007-Glib-old-version-private.patch +0008-Glib-old-macro-for-ZakFormValidatorComposite.patch