summaryrefslogtreecommitdiff
path: root/libxklavier/xklavier_config_iso.c
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2012-01-08 15:10:11 +0100
committerSergey V. Udaltsov <svu@gnome.org>2012-01-10 23:17:02 +0000
commit4fc08ecdc7ef842a702e6a05959c0056a1422f4b (patch)
tree1c1c0c55b3a7d1739f19a15d3a0b0297dff4f46b /libxklavier/xklavier_config_iso.c
parent52322041a47047681760fa5ee2cee11991d82e90 (diff)
downloadlibxklavier-4fc08ecdc7ef842a702e6a05959c0056a1422f4b.tar.gz
Add Xkl prefix to callback types
Prefix ConfigItemProcessFunc and TwoConfigItemsProcessFunc with "Xkl", so that the GI scanner can process them properly, and also to make the API more consistant. Add typedef aliases for the old names to avoid breaking the API.
Diffstat (limited to 'libxklavier/xklavier_config_iso.c')
-rw-r--r--libxklavier/xklavier_config_iso.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libxklavier/xklavier_config_iso.c b/libxklavier/xklavier_config_iso.c
index ab8ff5f..d544782 100644
--- a/libxklavier/xklavier_config_iso.c
+++ b/libxklavier/xklavier_config_iso.c
@@ -200,7 +200,7 @@ xkl_get_country_name(const gchar * code)
static void
xkl_config_registry_foreach_iso_code(XklConfigRegistry * config,
- ConfigItemProcessFunc func,
+ XklConfigItemProcessFunc func,
const gchar * xpath_exprs[],
DescriptionGetterFunc dgf,
gboolean to_upper, gpointer data)
@@ -282,7 +282,7 @@ xkl_config_registry_foreach_iso_code(XklConfigRegistry * config,
void
xkl_config_registry_foreach_country(XklConfigRegistry *
config,
- ConfigItemProcessFunc
+ XklConfigItemProcessFunc
func, gpointer data)
{
const gchar *xpath_exprs[] = {
@@ -299,7 +299,7 @@ xkl_config_registry_foreach_country(XklConfigRegistry *
void
xkl_config_registry_foreach_language(XklConfigRegistry *
config,
- ConfigItemProcessFunc
+ XklConfigItemProcessFunc
func, gpointer data)
{
const gchar *xpath_exprs[] = {
@@ -318,7 +318,7 @@ xkl_config_registry_foreach_iso_variant(XklConfigRegistry *
config,
const gchar *
iso_code,
- TwoConfigItemsProcessFunc
+ XklTwoConfigItemsProcessFunc
func, gpointer data,
const gchar * layout_xpath_exprs[],
const gboolean
@@ -440,7 +440,7 @@ xkl_config_registry_foreach_country_variant(XklConfigRegistry *
config,
const gchar *
country_code,
- TwoConfigItemsProcessFunc
+ XklTwoConfigItemsProcessFunc
func, gpointer data)
{
const gchar *layout_xpath_exprs[] = {
@@ -477,7 +477,7 @@ xkl_config_registry_foreach_language_variant(XklConfigRegistry *
config,
const gchar *
language_code,
- TwoConfigItemsProcessFunc
+ XklTwoConfigItemsProcessFunc
func, gpointer data)
{
const gchar *layout_xpath_exprs[] = {