Cosmetic fix.

This commit is contained in:
Daiki Ueno
2010-06-22 17:29:55 +09:00
parent 89cc9ffa46
commit 4623d78e0d
4 changed files with 13 additions and 7 deletions

View File

@ -123,6 +123,7 @@ EekXklLayoutClass
EekXklLayoutPrivate EekXklLayoutPrivate
eek_xkl_layout_new eek_xkl_layout_new
eek_xkl_layout_set_config eek_xkl_layout_set_config
eek_xkl_layout_set_config_full
eek_xkl_layout_set_model eek_xkl_layout_set_model
eek_xkl_layout_set_layouts eek_xkl_layout_set_layouts
eek_xkl_layout_set_variants eek_xkl_layout_set_variants
@ -131,6 +132,9 @@ eek_xkl_layout_get_model
eek_xkl_layout_get_layouts eek_xkl_layout_get_layouts
eek_xkl_layout_get_variants eek_xkl_layout_get_variants
eek_xkl_layout_get_options eek_xkl_layout_get_options
eek_xkl_layout_disable_option
eek_xkl_layout_enable_option
eek_xkl_layout_get_option
<SUBSECTION Standard> <SUBSECTION Standard>
EEK_XKL_LAYOUT EEK_XKL_LAYOUT
EEK_IS_XKL_LAYOUT EEK_IS_XKL_LAYOUT
@ -149,6 +153,7 @@ EekXkbLayoutClass
EekXkbLayoutPrivate EekXkbLayoutPrivate
eek_xkb_layout_new eek_xkb_layout_new
eek_xkb_layout_set_names eek_xkb_layout_set_names
eek_xkb_layout_set_names_full
eek_xkb_layout_set_keycodes eek_xkb_layout_set_keycodes
eek_xkb_layout_set_geometry eek_xkb_layout_set_geometry
eek_xkb_layout_set_symbols eek_xkb_layout_set_symbols

View File

@ -90,7 +90,7 @@ egf_key_callback (EekElement *element,
gdouble font_size; gdouble font_size;
guint keysym; guint keysym;
EekBounds bounds; EekBounds bounds;
const gchar *label; gchar *label;
keysym = eek_key_get_keysym (key); keysym = eek_key_get_keysym (key);
if (keysym == EEK_INVALID_KEYSYM || if (keysym == EEK_INVALID_KEYSYM ||
@ -217,7 +217,7 @@ eek_draw_key_label (cairo_t *cr,
{ {
guint keysym; guint keysym;
EekKeysymCategory category; EekKeysymCategory category;
const gchar *label; gchar *label;
PangoLayout *layout; PangoLayout *layout;
PangoRectangle logical_rect = { 0, }; PangoRectangle logical_rect = { 0, };
EekBounds bounds; EekBounds bounds;

View File

@ -41,7 +41,7 @@ struct eek_keysym_label {
#include "eek-unicode-keysym-labels.h" #include "eek-unicode-keysym-labels.h"
#include "eek-keyname-keysym-labels.h" #include "eek-keyname-keysym-labels.h"
static G_CONST_RETURN gchar * static gchar *
unichar_to_utf8 (gunichar uc) unichar_to_utf8 (gunichar uc)
{ {
if (g_unichar_isgraph (uc)) { if (g_unichar_isgraph (uc)) {
@ -65,7 +65,7 @@ keysym_label_compare (const void *key0, const void *key1)
static gboolean static gboolean
find_keysym (guint keysym, find_keysym (guint keysym,
const gchar **label, gchar **label,
EekKeysymCategory *category) EekKeysymCategory *category)
{ {
struct eek_keysym_label bsearch_key, *bsearch_val; struct eek_keysym_label bsearch_key, *bsearch_val;
@ -144,10 +144,10 @@ find_keysym (guint keysym,
* *
* Return a string representation of @keysym. * Return a string representation of @keysym.
*/ */
G_CONST_RETURN gchar * gchar *
eek_keysym_to_string (guint keysym) eek_keysym_to_string (guint keysym)
{ {
const gchar *label; gchar *label;
if (find_keysym (keysym, &label, NULL)) if (find_keysym (keysym, &label, NULL))
return label; return label;

View File

@ -51,10 +51,11 @@ typedef enum {
EEK_KEYSYM_CATEGORY_FUNCTION, EEK_KEYSYM_CATEGORY_FUNCTION,
EEK_KEYSYM_CATEGORY_KEYNAME, EEK_KEYSYM_CATEGORY_KEYNAME,
EEK_KEYSYM_CATEGORY_UNKNOWN, EEK_KEYSYM_CATEGORY_UNKNOWN,
/*< private >*/
EEK_KEYSYM_CATEGORY_LAST = EEK_KEYSYM_CATEGORY_UNKNOWN EEK_KEYSYM_CATEGORY_LAST = EEK_KEYSYM_CATEGORY_UNKNOWN
} EekKeysymCategory; } EekKeysymCategory;
G_CONST_RETURN gchar *eek_keysym_to_string (guint keysym); gchar *eek_keysym_to_string (guint keysym);
EekKeysymCategory eek_keysym_get_category (guint keysym); EekKeysymCategory eek_keysym_get_category (guint keysym);
#endif /* EEK_KEYSYM_H */ #endif /* EEK_KEYSYM_H */