Xml parsing of long-name in ZakFormElement.

diff --git a/src/formelement.c b/src/formelement.c
index aa4bf6d514dd0c2440c257870d9de2c23ddb95e2..7cc020a3bcf80d7f7663ceacedd840595c6df87a 100644 (file)
--- a/src/formelement.c
+++ b/src/formelement.c
@@ -471,7 +471,14 @@ zak_form_element_set_long_name (ZakFormElement *element, const gchar *long_name)
                        g_free (priv->long_name);
                }
 
-       priv->long_name = g_strdup (long_name);
+       if (long_name == NULL)
+               {
+                       priv->long_name = NULL;
+               }
+       else
+               {
+                       priv->long_name = g_strdup (long_name);
+               }
 }
 
 /**
@@ -1477,27 +1484,32 @@ zak_form_element_xml_parsing (ZakFormElement *element, xmlNode *xmlnode)
                {
                        to_unlink = FALSE;
 
-                       if (xmlStrcmp (cur->name, (const xmlChar *)"name") == 0)
+                       if (xmlStrEqual (cur->name, (const xmlChar *)"name"))
                                {
                                        zak_form_element_set_name (element, (const gchar *)xmlNodeGetContent (cur));
                                        to_unlink = TRUE;
                                }
-                       else if (xmlStrcmp (cur->name, (const xmlChar *)"is-key") == 0)
+                       else if (xmlStrEqual (cur->name, (const xmlChar *)"long-name"))
+                               {
+                                       zak_form_element_set_long_name (element, (const gchar *)xmlNodeGetContent (cur));
+                                       to_unlink = TRUE;
+                               }
+                       else if (xmlStrEqual (cur->name, (const xmlChar *)"is-key"))
                                {
-                                       zak_form_element_set_is_key (element, xmlStrEqual ((const gchar *)xmlNodeGetContent (cur), "TRUE"));
+                                       zak_form_element_set_is_key (element, xmlStrEqual (xmlNodeGetContent (cur), (const xmlChar *)"TRUE"));
                                        to_unlink = TRUE;
                                }
-                       else if (xmlStrcmp (cur->name, (const xmlChar *)"type") == 0)
+                       else if (xmlStrEqual (cur->name, (const xmlChar *)"type"))
                                {
                                        zak_form_element_set_provider_type (element, (const gchar *)xmlNodeGetContent (cur));
                                        to_unlink = TRUE;
                                }
-                       else if (xmlStrcmp (cur->name, (const xmlChar *)"default-value") == 0)
+                       else if (xmlStrEqual (cur->name, (const xmlChar *)"default-value"))
                                {
                                        zak_form_element_set_default_value (element, (const gchar *)xmlNodeGetContent (cur));
                                        to_unlink = TRUE;
                                }
-                       else if (xmlStrcmp (cur->name, (const xmlChar *)"format") == 0)
+                       else if (xmlStrEqual (cur->name, (const xmlChar *)"format"))
                                {
                                        GHashTable *ht;
 
@@ -1507,7 +1519,7 @@ zak_form_element_xml_parsing (ZakFormElement *element, xmlNode *xmlnode)
                                        attr = cur->properties;
                                        while (attr)
                                                {
-                                                       g_hash_table_insert (ht, g_strdup (attr->name), g_strdup ((const gchar *)xmlNodeGetContent (attr->children)));
+                                                       g_hash_table_insert (ht, g_strdup ((gchar *)attr->name), g_strdup ((const gchar *)xmlNodeGetContent (attr->children)));
 
                                                        attr = attr->next;
                                                }
@@ -1518,24 +1530,24 @@ zak_form_element_xml_parsing (ZakFormElement *element, xmlNode *xmlnode)
                                        g_hash_table_unref (ht);
                                        to_unlink = TRUE;
                                }
-                       else if (xmlStrcmp (cur->name, (const xmlChar *)"visible") == 0)
+                       else if (xmlStrEqual (cur->name, (const xmlChar *)"visible"))
                                {
-                                       zak_form_element_set_visible (element, xmlStrEqual ((const gchar *)xmlNodeGetContent (cur), "TRUE"));
+                                       zak_form_element_set_visible (element, xmlStrEqual (xmlNodeGetContent (cur), (const xmlChar *)"TRUE"));
                                        to_unlink = TRUE;
                                }
-                       else if (xmlStrcmp (cur->name, (const xmlChar *)"editable") == 0)
+                       else if (xmlStrEqual (cur->name, (const xmlChar *)"editable"))
                                {
-                                       zak_form_element_set_editable (element, xmlStrEqual ((const gchar *)xmlNodeGetContent (cur), "TRUE"));
+                                       zak_form_element_set_editable (element, xmlStrEqual (xmlNodeGetContent (cur), (const xmlChar *)"TRUE"));
                                        to_unlink = TRUE;
                                }
-                       else if (xmlStrcmp (cur->name, (const xmlChar *)"to-load") == 0)
+                       else if (xmlStrEqual (cur->name, (const xmlChar *)"to-load"))
                                {
-                                       zak_form_element_set_to_load (element, xmlStrEqual ((const gchar *)xmlNodeGetContent (cur), "TRUE"));
+                                       zak_form_element_set_to_load (element, xmlStrEqual (xmlNodeGetContent (cur), (const xmlChar *)"TRUE"));
                                        to_unlink = TRUE;
                                }
-                       else if (xmlStrcmp (cur->name, (const xmlChar *)"to-save") == 0)
+                       else if (xmlStrEqual (cur->name, (const xmlChar *)"to-save"))
                                {
-                                       zak_form_element_set_to_save (element, xmlStrEqual ((const gchar *)xmlNodeGetContent (cur), "TRUE"));
+                                       zak_form_element_set_to_save (element, xmlStrEqual (xmlNodeGetContent (cur), (const xmlChar *)"TRUE"));
                                        to_unlink = TRUE;
                                }
 

diff --git a/src/formvalidatorcompare.c b/src/formvalidatorcompare.c
index 68a4e5ebf27b7f9b7ebe795389496929da6cea08..1d0f89bcefc368a9bb8a0e616124fa44a8aea2df 100644 (file)
--- a/src/formvalidatorcompare.c
+++ b/src/formvalidatorcompare.c
@@ -32,13 +32,13 @@ static void zak_form_validator_compare_class_init (ZakFormValidatorCompareClass
 static void zak_form_validator_compare_init (ZakFormValidatorCompare *validator);
 
 static void zak_form_validator_compare_set_property (GObject *object,
-                               guint property_id,
-                               const GValue *value,
-                               GParamSpec *pspec);
+                                                     guint property_id,
+                                                     const GValue *value,
+                                                     GParamSpec *pspec);
 static void zak_form_validator_compare_get_property (GObject *object,
-                               guint property_id,
-                               GValue *value,
-                               GParamSpec *pspec);
+                                                     guint property_id,
+                                                     GValue *value,
+                                                     GParamSpec *pspec);
 
 static void zak_form_validator_compare_dispose (GObject *gobject);
 static void zak_form_validator_compare_finalize (GObject *gobject);

diff --git a/src/formvalidatorcomparedate.c b/src/formvalidatorcomparedate.c
index ab7dc8291d3b296b7f9ffaed032c21398739960c..d56864c779d5af4e15fbf18ca4f6917fdcd28283 100644 (file)
--- a/src/formvalidatorcomparedate.c
+++ b/src/formvalidatorcomparedate.c
@@ -32,13 +32,13 @@ static void zak_form_validator_compare_date_class_init (ZakFormValidatorCompareD
 static void zak_form_validator_compare_date_init (ZakFormValidatorCompareDate *validator);
 
 static void zak_form_validator_compare_date_set_property (GObject *object,
-                               guint property_id,
-                               const GValue *value,
-                               GParamSpec *pspec);
+                                                          guint property_id,
+                                                          const GValue *value,
+                                                          GParamSpec *pspec);
 static void zak_form_validator_compare_date_get_property (GObject *object,
-                               guint property_id,
-                               GValue *value,
-                               GParamSpec *pspec);
+                                                          guint property_id,
+                                                          GValue *value,
+                                                          GParamSpec *pspec);
 
 static void zak_form_validator_compare_date_dispose (GObject *gobject);
 static void zak_form_validator_compare_date_finalize (GObject *gobject);