diff options
| author | Sergey V. Udaltsov <svu@gnome.org> | 2012-05-07 03:14:30 +0100 |
|---|---|---|
| committer | Sergey V. Udaltsov <svu@gnome.org> | 2012-05-07 03:14:30 +0100 |
| commit | 766d25da9d06fc757894bf5d7ce36c7189435267 (patch) | |
| tree | 3b92c2c4d861c2f11a4b1fe1d36737e2b8f7c845 | |
| parent | 97077c9a155bdc5cb08acfd042d4792838271ea4 (diff) | |
| download | libxklavier-766d25da9d06fc757894bf5d7ce36c7189435267.tar.gz | |
Consistency, field name criticalSection --> critical_section
| -rw-r--r-- | libxklavier/xklavier_config_xkb.c | 4 | ||||
| -rw-r--r-- | libxklavier/xklavier_evt.c | 2 | ||||
| -rw-r--r-- | libxklavier/xklavier_private.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libxklavier/xklavier_config_xkb.c b/libxklavier/xklavier_config_xkb.c index f18ab7b..baec569 100644 --- a/libxklavier/xklavier_config_xkb.c +++ b/libxklavier/xklavier_config_xkb.c @@ -286,7 +286,7 @@ xkl_config_get_keyboard(XklEngine * engine, XSync(display, False); /* From this point, ALL errors should be intercepted only by libxklavier */ - xkl_engine_priv(engine, criticalSection) = TRUE; + xkl_engine_priv(engine, critical_section) = TRUE; cpid = fork(); switch (cpid) { @@ -401,7 +401,7 @@ xkl_config_get_keyboard(XklEngine * engine, } XSync(display, False); /* Return to normal X error processing */ - xkl_engine_priv(engine, criticalSection) = FALSE; + xkl_engine_priv(engine, critical_section) = FALSE; if (activate) xkl_config_set_group_by_description(engine, diff --git a/libxklavier/xklavier_evt.c b/libxklavier/xklavier_evt.c index 316bd4a..62293f5 100644 --- a/libxklavier/xklavier_evt.c +++ b/libxklavier/xklavier_evt.c @@ -536,7 +536,7 @@ xkl_process_error(Display * dpy, XErrorEvent * evt) (int) evt->error_code, buf, (int) evt->request_code, (int) evt->minor_code); if (engine != NULL) - if (!xkl_engine_priv(engine, criticalSection)) + if (!xkl_engine_priv(engine, critical_section)) (*xkl_engine_priv (engine, default_error_handler)) (dpy, evt); diff --git a/libxklavier/xklavier_private.h b/libxklavier/xklavier_private.h index 47d3a97..6f3b2cf 100644 --- a/libxklavier/xklavier_private.h +++ b/libxklavier/xklavier_private.h @@ -77,7 +77,7 @@ struct _XklEnginePrivate { XklState curr_state; - gboolean criticalSection; + gboolean critical_section; Atom atoms[TOTAL_ATOMS]; |