s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compiler warnings.

Browse Source
This commit is contained in:
Daiki Ueno
2011-04-19 11:56:00 +09:00
parent 4cf3f24fbc
commit ac8764b9b7
3 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
eek/eek-renderer.c
View File

@ -482,7 +482,6 @@ render_key (EekRenderer *self,
PangoLayout *layout; PangoLayout *layout;
PangoRectangle extents = { 0, }; PangoRectangle extents = { 0, };
EekColor foreground; EekColor foreground;
EekThemeNode *theme_node;
layout = pango_cairo_create_layout (cr); layout = pango_cairo_create_layout (cr);
eek_renderer_render_key_label (self, layout, key); 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.width * priv->scale - extents.width / PANGO_SCALE) / 2,
(bounds.height * priv->scale - extents.height / 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); eek_renderer_get_foreground_color (self, EEK_ELEMENT(key), &foreground);
cairo_set_source_rgba (cr, cairo_set_source_rgba (cr,
foreground.red, foreground.red,
@ -570,7 +564,7 @@ eek_renderer_real_render_key_label (EekRenderer *self,
EekBounds bounds; EekBounds bounds;
const TextProperty *prop; const TextProperty *prop;
PangoFontDescription *font; PangoFontDescription *font;
gdouble size, scale; gdouble scale;
symbol = eek_key_get_symbol_with_fallback (key, 0, 0); symbol = eek_key_get_symbol_with_fallback (key, 0, 0);
if (!symbol) if (!symbol)
@ -1141,7 +1135,6 @@ eek_renderer_get_background_gradient (EekRenderer *renderer,
EekColor *start, EekColor *start,
EekColor *end) EekColor *end)
{ {
EekRendererPrivate *priv;
EekThemeNode *theme_node; EekThemeNode *theme_node;
g_return_if_fail (EEK_IS_RENDERER(renderer)); 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 (start);
g_return_if_fail (end); g_return_if_fail (end);
priv = EEK_RENDERER_GET_PRIVATE(renderer);
theme_node = g_object_get_data (G_OBJECT(element), "theme-node"); theme_node = g_object_get_data (G_OBJECT(element), "theme-node");
if (theme_node) if (theme_node)
eek_theme_node_get_background_gradient (theme_node, type, start, end); 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; FindKeyByPositionCallbackData *data = user_data;
EekBounds bounds; EekBounds bounds;
EekRendererPrivate *priv;
EekPoint origin; EekPoint origin;
priv = EEK_RENDERER_GET_PRIVATE(data->renderer);
origin = data->origin; origin = data->origin;
eek_element_get_bounds (element, &bounds); eek_element_get_bounds (element, &bounds);
data->origin.x += bounds.x; data->origin.x += bounds.x;

3
eek/eek-xkb-layout.c
View File

@ -127,7 +127,7 @@ create_key (EekXkbLayout *layout,
EekSymbolMatrix *matrix = NULL; EekSymbolMatrix *matrix = NULL;
gchar name[XkbKeyNameLength + 1]; gchar name[XkbKeyNameLength + 1];
KeyCode keycode; KeyCode keycode;
gint num_groups, num_levels, num_symbols; gint num_groups, num_levels;
gulong oref; gulong oref;
xkbgeometry = priv->xkb->geom; xkbgeometry = priv->xkb->geom;
@ -199,7 +199,6 @@ create_key (EekXkbLayout *layout,
num_groups = XkbKeyNumGroups (priv->xkb, keycode); num_groups = XkbKeyNumGroups (priv->xkb, keycode);
num_levels = XkbKeyGroupsWidth (priv->xkb, keycode); num_levels = XkbKeyGroupsWidth (priv->xkb, keycode);
num_symbols = num_groups * num_levels;
matrix = eek_symbol_matrix_new (num_groups, num_levels); matrix = eek_symbol_matrix_new (num_groups, num_levels);
for (i = 0; i < num_groups; i++) for (i = 0; i < num_groups; i++)
for (j = 0; j < num_levels; j++) { for (j = 0; j < num_levels; j++) {

2
src/client.c
View File

@ -748,8 +748,6 @@ eekboard_client_load_keyboard_from_file (EekboardClient *client,
GFileInputStream *input; GFileInputStream *input;
GError *error; GError *error;
EekLayout *layout; EekLayout *layout;
EekKeyboard *keyboard;
guint keyboard_id;
gboolean retval; gboolean retval;
file = g_file_new_for_path (keyboard_file); file = g_file_new_for_path (keyboard_file);