diff options
| author | Sergey Udaltsov <svu@gnome.org> | 2006-04-21 23:07:56 +0000 |
|---|---|---|
| committer | Sergey Udaltsov <svu@gnome.org> | 2006-04-21 23:07:56 +0000 |
| commit | 394bde5dd0b2d536b6d11d17543dc8cb31f1610f (patch) | |
| tree | 813c3172cf0fe42f58d9aed9b258645156169642 /libxklavier/xklavier_xkb.c | |
| parent | 9b7db3052c50ae8b62e42b1fa1ff1ed423ffc6a8 (diff) | |
| download | libxklavier-394bde5dd0b2d536b6d11d17543dc8cb31f1610f.tar.gz | |
fixing gcc 2.95 compilation
Diffstat (limited to 'libxklavier/xklavier_xkb.c')
| -rw-r--r-- | libxklavier/xklavier_xkb.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libxklavier/xklavier_xkb.c b/libxklavier/xklavier_xkb.c index ebb473a..8c1dfe9 100644 --- a/libxklavier/xklavier_xkb.c +++ b/libxklavier/xklavier_xkb.c @@ -96,12 +96,14 @@ xkl_xkb_free_all_info(XklEngine * engine) { gint i; gchar **pi = xkl_engine_backend(engine, XklXkb, indicator_names); + XkbDescPtr desc; + for (i = 0; i < XkbNumIndicators; i++, pi++) { /* only free non-empty ones */ if (*pi && **pi) XFree(*pi); } - XkbDescPtr desc = xkl_engine_backend(engine, XklXkb, cached_desc); + desc = xkl_engine_backend(engine, XklXkb, cached_desc); if (desc != NULL) { int i; char **group_name = @@ -219,6 +221,7 @@ xkl_xkb_load_all_info(XklEngine * engine) Display *display = xkl_engine_get_display(engine); XkbDescPtr actual = xkl_engine_backend(engine, XklXkb, actual_desc); + XkbDescPtr cached; if (actual == NULL) if (!xkl_xkb_load_actual_desc(engine)) { @@ -227,8 +230,7 @@ xkl_xkb_load_all_info(XklEngine * engine) } /* take it from the cache (in most cases LoadAll is called from ResetAll which in turn ...) */ - XkbDescPtr cached = actual = - xkl_engine_backend(engine, XklXkb, actual_desc); + cached = actual = xkl_engine_backend(engine, XklXkb, actual_desc); xkl_engine_backend(engine, XklXkb, cached_desc) = xkl_engine_backend(engine, XklXkb, actual_desc); xkl_engine_backend(engine, XklXkb, actual_desc) = NULL; |