From 0b38dc678a3a539fc04517dfcffbe84dca68991b Mon Sep 17 00:00:00 2001 From: Chyla Zbigniew Date: Sun, 28 Jan 2001 12:35:09 +0000 Subject: Don't #define __GNOME_I18N_H__ if it's already defined. * gal/util/e-i18n.h: Don't #define __GNOME_I18N_H__ if it's already defined. *gal/util/e-xml-utils.c: Functions moved from Gnumeric: e_xml_get_child_by_name_by_lang_list, e_xml_get_child_by_name_by_lang_list_with_score (static), e_xml_get_child_by_name_no_lang. New functions (for completness): e_xml_get_integer_prop_by_name_with_default, e_xml_get_string_prop_by_name_with_default, e_xml_get_uint_prop_by_name, e_xml_get_uint_prop_by_name_with_default, e_xml_set_uint_prop_by_name. Now every e_xml_get_*_prop_by_name function just calls e_xml_get_*_prop_by_name_with_default with some sensible default value. Formatting fixes here and there. svn path=/trunk/; revision=7874 --- e-util/e-xml-utils.h | 87 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 33 deletions(-) (limited to 'e-util/e-xml-utils.h') diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h index 254e0261cb..d08e99afb0 100644 --- a/e-util/e-xml-utils.h +++ b/e-util/e-xml-utils.h @@ -26,44 +26,65 @@ #include #include -xmlNode *e_xml_get_child_by_name (const xmlNode *parent, - const xmlChar *child_name); +xmlNode *e_xml_get_child_by_name (const xmlNode *parent, + const xmlChar *child_name); /* lang set to NULL means use the current locale. */ -xmlNode *e_xml_get_child_by_name_by_lang (const xmlNode *parent, - const xmlChar *child_name, - const char *lang); +xmlNode *e_xml_get_child_by_name_by_lang (const xmlNode *parent, + const xmlChar *child_name, + const gchar *lang); +/* lang_list set to NULL means use the current locale. */ +xmlNode *e_xml_get_child_by_name_by_lang_list (const xmlNode *parent, + const gchar *name, + GList *lang_list); +xmlNode *e_xml_get_child_by_name_no_lang (const xmlNode *parent, + const gchar *name); -int e_xml_get_integer_prop_by_name (const xmlNode *parent, - const xmlChar *prop_name); -void e_xml_set_integer_prop_by_name (xmlNode *parent, - const xmlChar *prop_name, - int value); +gint e_xml_get_integer_prop_by_name (const xmlNode *parent, + const xmlChar *prop_name); +gint e_xml_get_integer_prop_by_name_with_default (const xmlNode *parent, + const xmlChar *prop_name, + gint def); +void e_xml_set_integer_prop_by_name (xmlNode *parent, + const xmlChar *prop_name, + gint value); -gboolean e_xml_get_bool_prop_by_name (const xmlNode *parent, - const xmlChar *prop_name); -gboolean e_xml_get_bool_prop_by_name_with_default (const xmlNode *parent, - const xmlChar *prop_name, - gboolean def); -void e_xml_set_bool_prop_by_name (xmlNode *parent, - const xmlChar *prop_name, - gboolean value); +guint e_xml_get_uint_prop_by_name (const xmlNode *parent, + const xmlChar *prop_name); +guint e_xml_get_uint_prop_by_name_with_default (const xmlNode *parent, + const xmlChar *prop_name, + guint def); +void e_xml_set_uint_prop_by_name (xmlNode *parent, + const xmlChar *prop_name, + guint value); -double e_xml_get_double_prop_by_name (const xmlNode *parent, - const xmlChar *prop_name); -double e_xml_get_double_prop_by_name_with_default(const xmlNode *parent, - const xmlChar *prop_name, - gdouble def); -void e_xml_set_double_prop_by_name (xmlNode *parent, - const xmlChar *prop_name, - double value); +gboolean e_xml_get_bool_prop_by_name (const xmlNode *parent, + const xmlChar *prop_name); +gboolean e_xml_get_bool_prop_by_name_with_default (const xmlNode *parent, + const xmlChar *prop_name, + gboolean def); +void e_xml_set_bool_prop_by_name (xmlNode *parent, + const xmlChar *prop_name, + gboolean value); -char *e_xml_get_string_prop_by_name (const xmlNode *parent, - const xmlChar *prop_name); -void e_xml_set_string_prop_by_name (xmlNode *parent, - const xmlChar *prop_name, - const char *value); +gdouble e_xml_get_double_prop_by_name (const xmlNode *parent, + const xmlChar *prop_name); +gdouble e_xml_get_double_prop_by_name_with_default (const xmlNode *parent, + const xmlChar *prop_name, + gdouble def); +void e_xml_set_double_prop_by_name ( xmlNode *parent, + const xmlChar *prop_name, + gdouble value); -char *e_xml_get_translated_string_prop_by_name (const xmlNode *parent, - const xmlChar *prop_name); +gchar *e_xml_get_string_prop_by_name (const xmlNode *parent, + const xmlChar *prop_name); +gchar *e_xml_get_string_prop_by_name_with_default (const xmlNode *parent, + const xmlChar *prop_name, + const gchar *def); +void e_xml_set_string_prop_by_name (xmlNode *parent, + const xmlChar *prop_name, + const gchar *value); + +gchar *e_xml_get_translated_string_prop_by_name (const xmlNode *parent, + const xmlChar *prop_name); #endif /* __E_XML_UTILS__ */ -- cgit