From: Andrea Zagli <azagli@libero.it>
Date: Wed, 1 Mar 2017 18:54:48 +0000 (+0100)
Subject: Debian pkg: fixed patch 0006.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=f8367e1e2695346c4affdc5bb16532785118435d;p=zakform%2Flibzakform

Debian pkg: fixed patch 0006.
---

diff --git a/debian/patches/0006-Some-new-functions-not-replaced.patch b/debian/patches/0006-Some-new-functions-not-replaced.patch
index 4e4047d..155cd77 100644
--- a/debian/patches/0006-Some-new-functions-not-replaced.patch
+++ b/debian/patches/0006-Some-new-functions-not-replaced.patch
@@ -16,10 +16,10 @@ index bdb23a3..06240bc 100644
 @@ -116,7 +116,7 @@ zak_form_form_init (ZakFormForm *zak_form_form)
  {
  	gchar *localedir;
- 
+
 -	ZakFormFormPrivate *priv = zak_form_form_get_instance_private (zak_form_form);
 +	ZakFormFormPrivate *priv = ZAK_FORM_FORM_GET_PRIVATE (zak_form_form);
- 
+
  	priv->ar_modules = NULL;
  	priv->ar_elements = g_ptr_array_new ();
 diff --git a/src/formelement.c b/src/formelement.c
@@ -32,7 +32,7 @@ index f2fa40b..838302b 100644
  {
 -	ZakFormElementPrivate *priv = zak_form_element_get_instance_private (zak_form_element);
 +	ZakFormElementPrivate *priv = ZAK_FORM_ELEMENT_GET_PRIVATE (zak_form_element);
- 
+
  	priv->name = g_strdup ("");
  	priv->long_name = NULL;
 diff --git a/src/formelementfilter.c b/src/formelementfilter.c
@@ -42,12 +42,12 @@ index ba30a32..6ff1a57 100644
 @@ -37,6 +37,8 @@ static void zak_form_element_filter_get_property (GObject *object,
  static void zak_form_element_filter_dispose (GObject *gobject);
  static void zak_form_element_filter_finalize (GObject *gobject);
- 
+
 +#define ZAK_FORM_ELEMENT_FILTER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_ELEMENT_FILTER, ZakFormElementFilterPrivate))
 +
  typedef struct
  	{
- 	    gpointer nothing;
+ 		gboolean enabled;
 @@ -58,7 +60,7 @@ zak_form_element_filter_class_init (ZakFormElementFilterClass *class)
  static void
  zak_form_element_filter_init (ZakFormElementFilter *zak_form_element_filter)
@@ -55,7 +55,7 @@ index ba30a32..6ff1a57 100644
 -	ZakFormElementFilterPrivate *priv = zak_form_element_filter_get_instance_private (zak_form_element_filter);
 +	ZakFormElementFilterPrivate *priv = ZAK_FORM_ELEMENT_FILTER_GET_PRIVATE (zak_form_element_filter);
  }
- 
+
  gchar
 @@ -87,7 +89,7 @@ zak_form_element_filter_set_property (GObject *object,
                     GParamSpec *pspec)
@@ -63,7 +63,7 @@ index ba30a32..6ff1a57 100644
  	ZakFormElementFilter *zak_form_element_filter = (ZakFormElementFilter *)object;
 -	ZakFormElementFilterPrivate *priv = zak_form_element_filter_get_instance_private (zak_form_element_filter);
 +	ZakFormElementFilterPrivate *priv = ZAK_FORM_ELEMENT_FILTER_GET_PRIVATE (zak_form_element_filter);
- 
+
  	switch (property_id)
  		{
 @@ -104,7 +106,7 @@ zak_form_element_filter_get_property (GObject *object,
@@ -72,7 +72,7 @@ index ba30a32..6ff1a57 100644
  	ZakFormElementFilter *zak_form_element_filter = (ZakFormElementFilter *)object;
 -	ZakFormElementFilterPrivate *priv = zak_form_element_filter_get_instance_private (zak_form_element_filter);
 +	ZakFormElementFilterPrivate *priv = ZAK_FORM_ELEMENT_FILTER_GET_PRIVATE (zak_form_element_filter);
- 
+
  	switch (property_id)
  		{
 @@ -118,7 +120,7 @@ static void
@@ -81,18 +81,18 @@ index ba30a32..6ff1a57 100644
  	ZakFormElementFilter *zak_form_element_filter = (ZakFormElementFilter *)gobject;
 -	ZakFormElementFilterPrivate *priv = zak_form_element_filter_get_instance_private (zak_form_element_filter);
 +	ZakFormElementFilterPrivate *priv = ZAK_FORM_ELEMENT_FILTER_GET_PRIVATE (zak_form_element_filter);
- 
- 
- 
+
+
+
 @@ -130,7 +132,7 @@ static void
  zak_form_element_filter_finalize (GObject *gobject)
  {
  	ZakFormElementFilter *zak_form_element_filter = (ZakFormElementFilter *)gobject;
 -	ZakFormElementFilterPrivate *priv = zak_form_element_filter_get_instance_private (zak_form_element_filter);
 +	ZakFormElementFilterPrivate *priv = ZAK_FORM_ELEMENT_FILTER_GET_PRIVATE (zak_form_element_filter);
- 
- 
- 
+
+
+
 diff --git a/src/formelementvalidator.c b/src/formelementvalidator.c
 index 715f2a7..5291b98 100644
 --- a/src/formelementvalidator.c
@@ -104,5 +104,5 @@ index 715f2a7..5291b98 100644
 -	ZakFormElementValidatorPrivate *priv = zak_form_element_validator_get_instance_private (zak_form_element_validator);
 +	ZakFormElementValidatorPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_GET_PRIVATE (zak_form_element_validator);
  }
- 
+
  gboolean