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

symbol: Store symbols instead of pointers

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2019-08-03 09:29:03 +00:00
parent 53b89aae45
commit ad86cb531a
4 changed files with 53 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eek/eek-keyboard.c
View File

@ -761,7 +761,7 @@ eek_keyboard_get_keymap(EekKeyboard *keyboard)
g_free(current);
// FIXME: free
char *key_str = squeek_key_to_keymap_entry(
const char *key_str = squeek_key_to_keymap_entry(
(char*)key_name,
eek_key_get_symbol_matrix(key)
);

4
eek/eek-xml-layout.c
View File

@ -748,7 +748,8 @@ symbols_end_element_callback (GMarkupParseContext *pcontext,
g_strcmp0 (element_name, "keysym") == 0 ||
g_strcmp0 (element_name, "text") == 0) {
struct squeek_symbol *symbol = squeek_symbol_new(
squeek_symbols_add(
eek_key_get_symbol_matrix(data->key),
element_name,
text,
data->keyval,
@ -757,7 +758,6 @@ symbols_end_element_callback (GMarkupParseContext *pcontext,
data->tooltip
);
squeek_symbols_append(eek_key_get_symbol_matrix(data->key), symbol);
data->keyval = 0;
g_free(data->label);
data->label = NULL;