From 0912fc58e0b491aeca544e060731124ffe9cb3d1 Mon Sep 17 00:00:00 2001 From: "Sergey V. Udaltsov" Date: Tue, 21 Feb 2012 21:33:12 +0000 Subject: Eliminating some minor annoying build warnings --- libxklavier/xklavier.c | 4 +--- libxklavier/xklavier_config.c | 5 +---- libxklavier/xklavier_props.c | 8 ++++---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/libxklavier/xklavier.c b/libxklavier/xklavier.c index 7c4f6c1..15a4d37 100644 --- a/libxklavier/xklavier.c +++ b/libxklavier/xklavier.c @@ -649,9 +649,7 @@ xkl_engine_constructor(GType type, { /* Invoke parent constructor. */ - XklEngineClass *klass; - klass = - XKL_ENGINE_CLASS(g_type_class_peek(XKL_TYPE_ENGINE)); + g_type_class_peek(XKL_TYPE_ENGINE); obj = parent_class->constructor(type, n_construct_properties, construct_properties); diff --git a/libxklavier/xklavier_config.c b/libxklavier/xklavier_config.c index e926bfc..ac34a20 100644 --- a/libxklavier/xklavier_config.c +++ b/libxklavier/xklavier_config.c @@ -1062,10 +1062,7 @@ xkl_config_registry_constructor(GType type, XklConfigRegistry *config; XklEngine *engine; { /* Invoke parent constructor. */ - XklConfigRegistryClass *klass; - klass = - XKL_CONFIG_REGISTRY_CLASS(g_type_class_peek - (XKL_TYPE_CONFIG_REGISTRY)); + g_type_class_peek(XKL_TYPE_CONFIG_REGISTRY); obj = parent_class->constructor(type, n_construct_properties, diff --git a/libxklavier/xklavier_props.c b/libxklavier/xklavier_props.c index b8a2a2e..dbe249e 100644 --- a/libxklavier/xklavier_props.c +++ b/libxklavier/xklavier_props.c @@ -453,7 +453,7 @@ xkl_config_rec_set_to_root_window_property(const XklConfigRec * data, gchar * rules_file, XklEngine * engine) { - gint len, rv; + gint len; gchar *pval; gchar *next; gchar *all_layouts = xkl_config_rec_merge_layouts(data); @@ -529,7 +529,7 @@ xkl_config_rec_set_to_root_window_property(const XklConfigRec * data, } display = xkl_engine_get_display(engine); - rv = XChangeProperty(display, xkl_engine_priv(engine, root_window), + XChangeProperty(display, xkl_engine_priv(engine, root_window), rules_atom, XA_STRING, 8, PropModeReplace, (unsigned char *) pval, len); XSync(display, False); @@ -537,8 +537,8 @@ xkl_config_rec_set_to_root_window_property(const XklConfigRec * data, for (i = len - 1; --i >= 0;) if (pval[i] == '\0') pval[i] = '?'; - XklDebug(150, "Stored [%s] of length %d to [%s] of %X: %d\n", pval, - len, propName, _xklRootWindow, rv); + XklDebug(150, "Stored [%s] of length %d to [%s] of %X\n", pval, + len, propName, _xklRootWindow); #endif if (all_layouts != NULL) g_free(all_layouts); -- cgit v1.2.3