diff options
| author | Sergey Udaltsov <svu@gnome.org> | 2008-04-21 22:37:33 +0000 |
|---|---|---|
| committer | Sergey Udaltsov <svu@gnome.org> | 2008-04-21 22:37:33 +0000 |
| commit | 068422e3a7a0aae5983cde5d57ce18e4fb5fa560 (patch) | |
| tree | 10a9b45adc0bed36315c118235189d1587a78720 /libxklavier/xklavier_config.c | |
| parent | ae1528e30b7e0a50660a1c69e03b077ad1010dd9 (diff) | |
| download | libxklavier-068422e3a7a0aae5983cde5d57ce18e4fb5fa560.tar.gz | |
adding country/language functions, new dep on iso-codes
Diffstat (limited to 'libxklavier/xklavier_config.c')
| -rw-r--r-- | libxklavier/xklavier_config.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/libxklavier/xklavier_config.c b/libxklavier/xklavier_config.c index 6bdcb07..661b58e 100644 --- a/libxklavier/xklavier_config.c +++ b/libxklavier/xklavier_config.c @@ -35,21 +35,6 @@ static xmlXPathCompExprPtr models_xpath; static xmlXPathCompExprPtr layouts_xpath; static xmlXPathCompExprPtr option_groups_xpath; - -#define XKBCR_MODEL_PATH "/xkbConfigRegistry/modelList/model" -#define XKBCR_LAYOUT_PATH "/xkbConfigRegistry/layoutList/layout" -#define XKBCR_VARIANT_PATH XKBCR_LAYOUT_PATH "/variantList/variant" -#define XKBCR_GROUP_PATH "/xkbConfigRegistry/optionList/group" -#define XKBCR_OPTION_PATH XKBCR_GROUP_PATH "/option" - -#define XML_TAG_DESCR "description" -#define XML_TAG_SHORT_DESCR "shortDescription" -#define XML_TAG_VENDOR "vendor" -#define XML_TAG_COUNTRY_LIST "countryList" -#define XML_TAG_LANGUAGE_LIST "languageList" -#define XML_TAG_ISO3166ID "iso3166Id" -#define XML_TAG_ISO639ID "iso639Id" - // gettext domain for translations #define XKB_DOMAIN "xkeyboard-config" @@ -58,9 +43,6 @@ enum { PROP_ENGINE, }; -#define xkl_config_registry_is_initialized(config) \ - ( xkl_config_registry_priv(config,xpath_context) != NULL ) - static gboolean xkl_xml_find_config_item_child(xmlNodePtr iptr, xmlNodePtr * ptr) { @@ -252,7 +234,7 @@ xkl_config_registry_foreach_in_nodeset(XklConfigRegistry * config, } } -static void +void xkl_config_registry_foreach_in_xpath(XklConfigRegistry * config, xmlXPathCompExprPtr xpath_comp_expr, @@ -275,7 +257,7 @@ xkl_config_registry_foreach_in_xpath(XklConfigRegistry * config, } } -static void +void xkl_config_registry_foreach_in_xpath_with_param(XklConfigRegistry * config, const gchar * |