From ac8764b9b7a7441779e13775bc842b808391042b Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Tue, 19 Apr 2011 11:56:00 +0900 Subject: [PATCH] Fix compiler warnings. --- eek/eek-renderer.c | 14 +------------- eek/eek-xkb-layout.c | 3 +-- src/client.c | 2 -- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/eek/eek-renderer.c b/eek/eek-renderer.c index b1ae55e9..28cdadb4 100644 --- a/eek/eek-renderer.c +++ b/eek/eek-renderer.c @@ -482,7 +482,6 @@ render_key (EekRenderer *self, PangoLayout *layout; PangoRectangle extents = { 0, }; EekColor foreground; - EekThemeNode *theme_node; layout = pango_cairo_create_layout (cr); eek_renderer_render_key_label (self, layout, key); @@ -494,11 +493,6 @@ render_key (EekRenderer *self, (bounds.width * priv->scale - extents.width / PANGO_SCALE) / 2, (bounds.height * priv->scale - extents.height / PANGO_SCALE) / 2); - if (eek_key_is_pressed (key)) - theme_node = g_object_get_data (G_OBJECT(key), "theme-node-pressed"); - else - theme_node = g_object_get_data (G_OBJECT(key), "theme-node"); - eek_renderer_get_foreground_color (self, EEK_ELEMENT(key), &foreground); cairo_set_source_rgba (cr, foreground.red, @@ -570,7 +564,7 @@ eek_renderer_real_render_key_label (EekRenderer *self, EekBounds bounds; const TextProperty *prop; PangoFontDescription *font; - gdouble size, scale; + gdouble scale; symbol = eek_key_get_symbol_with_fallback (key, 0, 0); if (!symbol) @@ -1141,7 +1135,6 @@ eek_renderer_get_background_gradient (EekRenderer *renderer, EekColor *start, EekColor *end) { - EekRendererPrivate *priv; EekThemeNode *theme_node; g_return_if_fail (EEK_IS_RENDERER(renderer)); @@ -1150,8 +1143,6 @@ eek_renderer_get_background_gradient (EekRenderer *renderer, g_return_if_fail (start); g_return_if_fail (end); - priv = EEK_RENDERER_GET_PRIVATE(renderer); - theme_node = g_object_get_data (G_OBJECT(element), "theme-node"); if (theme_node) eek_theme_node_get_background_gradient (theme_node, type, start, end); @@ -1234,11 +1225,8 @@ find_key_by_position_section_callback (EekElement *element, { FindKeyByPositionCallbackData *data = user_data; EekBounds bounds; - EekRendererPrivate *priv; EekPoint origin; - priv = EEK_RENDERER_GET_PRIVATE(data->renderer); - origin = data->origin; eek_element_get_bounds (element, &bounds); data->origin.x += bounds.x; diff --git a/eek/eek-xkb-layout.c b/eek/eek-xkb-layout.c index 1aed8155..c46ce438 100644 --- a/eek/eek-xkb-layout.c +++ b/eek/eek-xkb-layout.c @@ -127,7 +127,7 @@ create_key (EekXkbLayout *layout, EekSymbolMatrix *matrix = NULL; gchar name[XkbKeyNameLength + 1]; KeyCode keycode; - gint num_groups, num_levels, num_symbols; + gint num_groups, num_levels; gulong oref; xkbgeometry = priv->xkb->geom; @@ -199,7 +199,6 @@ create_key (EekXkbLayout *layout, num_groups = XkbKeyNumGroups (priv->xkb, keycode); num_levels = XkbKeyGroupsWidth (priv->xkb, keycode); - num_symbols = num_groups * num_levels; matrix = eek_symbol_matrix_new (num_groups, num_levels); for (i = 0; i < num_groups; i++) for (j = 0; j < num_levels; j++) { diff --git a/src/client.c b/src/client.c index dc4fe719..ac6a1c27 100644 --- a/src/client.c +++ b/src/client.c @@ -748,8 +748,6 @@ eekboard_client_load_keyboard_from_file (EekboardClient *client, GFileInputStream *input; GError *error; EekLayout *layout; - EekKeyboard *keyboard; - guint keyboard_id; gboolean retval; file = g_file_new_for_path (keyboard_file);