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

Make the return value of eek_symbol_get_label const.

Browse Source
This commit is contained in:
Daiki Ueno
2011-03-02 16:15:16 +09:00
parent 577fcd7f9e
commit ab08955a5f
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eek/eek-renderer.c
View File

@ -276,14 +276,12 @@ calculate_font_size_key_callback (EekElement *element, gpointer user_data)
gdouble size; gdouble size;
EekSymbol *symbol; EekSymbol *symbol;
EekBounds bounds; EekBounds bounds;
gchar *label = NULL; gchar *label = "M";
symbol = eek_key_get_symbol (EEK_KEY(element)); symbol = eek_key_get_symbol (EEK_KEY(element));
if (symbol && if (symbol &&
eek_symbol_get_category (symbol) == EEK_SYMBOL_CATEGORY_LETTER) eek_symbol_get_category (symbol) == EEK_SYMBOL_CATEGORY_LETTER)
label = eek_symbol_get_label (symbol); label = eek_symbol_get_label (symbol);
if (!label)
label = g_strdup ("M");
base_font = pango_context_get_font_description (priv->pcontext); base_font = pango_context_get_font_description (priv->pcontext);
font = pango_font_description_copy (base_font); font = pango_font_description_copy (base_font);
@ -296,7 +294,6 @@ calculate_font_size_key_callback (EekElement *element, gpointer user_data)
pango_font_description_free (font); pango_font_description_free (font);
pango_layout_set_text (layout, label, -1); pango_layout_set_text (layout, label, -1);
g_free (label);
pango_layout_get_extents (layout, NULL, &extents); pango_layout_get_extents (layout, NULL, &extents);
g_object_unref (layout); g_object_unref (layout);
@ -495,7 +492,6 @@ eek_renderer_real_render_key_label (EekRenderer *self,
pango_font_description_set_size (font, size * priv->scale * scale); pango_font_description_set_size (font, size * priv->scale * scale);
pango_layout_set_font_description (layout, font); pango_layout_set_font_description (layout, font);
pango_layout_set_text (layout, label, -1); pango_layout_set_text (layout, label, -1);
g_free (label);
pango_layout_set_width (layout, pango_layout_set_width (layout,
PANGO_SCALE * bounds.width * priv->scale * scale); PANGO_SCALE * bounds.width * priv->scale * scale);
pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END); pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);

4
eek/eek-symbol.c
View File

@ -277,7 +277,7 @@ eek_symbol_set_label (EekSymbol *symbol,
priv->label = g_strdup (label); priv->label = g_strdup (label);
} }
gchar * G_CONST_RETURN gchar *
eek_symbol_get_label (EekSymbol *symbol) eek_symbol_get_label (EekSymbol *symbol)
{ {
EekSymbolPrivate *priv; EekSymbolPrivate *priv;
@ -287,7 +287,7 @@ eek_symbol_get_label (EekSymbol *symbol)
priv = EEK_SYMBOL_GET_PRIVATE(symbol); priv = EEK_SYMBOL_GET_PRIVATE(symbol);
if (priv->label == NULL || *priv->label == '\0') if (priv->label == NULL || *priv->label == '\0')
return NULL; return NULL;
return g_strdup (priv->label); return priv->label;
} }
/** /**

2
eek/eek-symbol.h
View File

@ -93,7 +93,7 @@ void eek_symbol_set_name (EekSymbol *symbol,
G_CONST_RETURN gchar *eek_symbol_get_name (EekSymbol *symbol); G_CONST_RETURN gchar *eek_symbol_get_name (EekSymbol *symbol);
void eek_symbol_set_label (EekSymbol *symbol, void eek_symbol_set_label (EekSymbol *symbol,
const gchar *label); const gchar *label);
gchar *eek_symbol_get_label (EekSymbol *symbol); G_CONST_RETURN gchar *eek_symbol_get_label (EekSymbol *symbol);
void eek_symbol_set_category (EekSymbol *symbol, void eek_symbol_set_category (EekSymbol *symbol,
EekSymbolCategory category); EekSymbolCategory category);
EekSymbolCategory eek_symbol_get_category (EekSymbol *symbol); EekSymbolCategory eek_symbol_get_category (EekSymbol *symbol);