Merge branch 'setattrs' into newnew

diff --cc src/formelement.c
Simple merge

diff --cc src/formelement.h
Simple merge

diff --cc src/formelementcheck.c
index 466d93b0a8af8852775fa800252e0e8a72b50c74,c7691d1eacd87a3336fb7f491f3f7c60bae1ae97..23479ab4091b6e72f99189a45b60715e0146a7ec
--- 1/src/formelementcheck.c
--- 2/src/formelementcheck.c
+++ b/src/formelementcheck.c
@@@ -236,11 -240,10 +236,11 @@@ static gcha
  
        klass = (ZakFormCgiFormElementClass *)g_type_class_peek_parent (ZAK_FORM_CGI_FORM_ELEMENT_CHECK_GET_CLASS (ZAK_FORM_CGI_FORM_ELEMENT_CHECK (element)));
  
-       ht_attrs = klass->get_ht_attrs (element);
+       ht_attrs = zak_form_cgi_form_element_get_attrs (ZAK_FORM_CGI_FORM_ELEMENT (element));
        ht_label_attrs = klass->get_ht_label_attrs (element);
  
 -      if (ht_label_attrs != NULL)
 +      if (ht_label_attrs != NULL
 +          && g_hash_table_lookup (ht_label_attrs, "zak-cgi-content") != NULL)
                {
                        str = g_string_new ("<br/>\n");
                }

diff --cc src/formelementemail.c
Simple merge

diff --cc src/formelementfile.c
Simple merge

diff --cc src/formelementhidden.c
Simple merge

diff --cc src/formelementpassword.c
Simple merge

diff --cc src/formelementradio.c
Simple merge

diff --cc src/formelementselect.c
Simple merge

diff --cc src/formelementsubmit.c
Simple merge

diff --cc src/formelementtext.c
Simple merge

diff --cc src/formelementtextarea.c
Simple merge