diff options
| author | Sergey V. Udaltsov <svu@gnome.org> | 2011-08-24 23:18:57 +0100 |
|---|---|---|
| committer | Sergey V. Udaltsov <svu@gnome.org> | 2011-08-24 23:18:57 +0100 |
| commit | d61e9506bf780d0a726281cb377f7bc734196382 (patch) | |
| tree | 395559fcd128c873a67a05f223aab320ae73ff27 | |
| parent | e625f4376e4f58c171b47ddc0d070165de05b12d (diff) | |
| download | libgnomekbd-d61e9506bf780d0a726281cb377f7bc734196382.tar.gz | |
Small warnings eliminated
https://bugzilla.gnome.org/show_bug.cgi?id=653155
| -rw-r--r-- | libgnomekbd/gkbd-configuration.c | 3 | ||||
| -rw-r--r-- | libgnomekbd/gkbd-keyboard-display.c | 3 | ||||
| -rw-r--r-- | libgnomekbd/gkbd-keyboard-drawing.c | 23 |
3 files changed, 5 insertions, 24 deletions
diff --git a/libgnomekbd/gkbd-configuration.c b/libgnomekbd/gkbd-configuration.c index b233f61..02b6548 100644 --- a/libgnomekbd/gkbd-configuration.c +++ b/libgnomekbd/gkbd-configuration.c @@ -26,6 +26,7 @@ #include <gdk/gdkkeysyms.h> #include <gdk/gdkx.h> +#include <X11/XKBlib.h> #include <glib/gi18n-lib.h> #include <gkbd-configuration.h> @@ -401,7 +402,7 @@ gkbd_configuration_get_current_tooltip (GkbdConfiguration * configuration) { XklState *state = xkl_engine_get_current_state (configuration->priv->engine); - gchar *buf; + if (state == NULL || state->group < 0 || state->group >= g_strv_length (configuration->priv->full_group_names)) diff --git a/libgnomekbd/gkbd-keyboard-display.c b/libgnomekbd/gkbd-keyboard-display.c index 4411710..61fab84 100644 --- a/libgnomekbd/gkbd-keyboard-display.c +++ b/libgnomekbd/gkbd-keyboard-display.c @@ -18,6 +18,7 @@ */ #include <stdlib.h> +#include <libintl.h> #include <config.h> #include <gtk/gtk.h> @@ -34,7 +35,7 @@ static GOptionEntry options[] = { "group number (1, 2, 3, 4)"}, {"layout", 'l', 0, G_OPTION_ARG_STRING, &layout, "Layout to display", "layout (with optional variant)"}, - NULL + { NULL } }; static void diff --git a/libgnomekbd/gkbd-keyboard-drawing.c b/libgnomekbd/gkbd-keyboard-drawing.c index 5f5d120..20e0262 100644 --- a/libgnomekbd/gkbd-keyboard-drawing.c +++ b/libgnomekbd/gkbd-keyboard-drawing.c @@ -28,6 +28,7 @@ #include <math.h> #include <glib/gi18n-lib.h> +#include <gkbd-keyboard-config.h> #include <gkbd-keyboard-drawing.h> #include <gkbd-keyboard-drawing-marshal.h> #include <gkbd-util.h> @@ -1345,28 +1346,6 @@ typedef struct { } DrawKeyboardItemData; static void -redraw_overlapping_doodads (GkbdKeyboardDrawingRenderContext * context, - GkbdKeyboardDrawing * drawing, - GkbdKeyboardDrawingKey * key) -{ - GList *list; - gboolean do_draw = FALSE; - - for (list = drawing->keyboard_items; list; list = list->next) { - GkbdKeyboardDrawingItem *item = list->data; - - if (do_draw - && item->type == - GKBD_KEYBOARD_DRAWING_ITEM_TYPE_DOODAD) - draw_doodad (context, drawing, - (GkbdKeyboardDrawingDoodad *) item); - - if (list->data == key) - do_draw = TRUE; - } -} - -static void draw_keyboard_item (GkbdKeyboardDrawingItem * item, DrawKeyboardItemData * data) { |