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

libeek: make temporary copies of config parameters in #set_model() etc.

Browse Source
This commit is contained in:
Daiki Ueno
2010-06-23 16:02:07 +09:00
parent 59076afcb5
commit b2b44a0810
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
eek/eek-xkl-layout.c
View File

@ -400,7 +400,11 @@ eek_xkl_layout_set_model (EekXklLayout *layout,
g_return_val_if_fail (priv, FALSE);
config = xkl_config_rec_new ();
config->model = (gchar *)model;
/* config->model will be freed on g_object_unref (config) */
if (model)
config->model = g_strdup (model);
else
config->model = NULL;
success = eek_xkl_layout_set_config (layout, config);
g_object_unref (config);
return success;
@ -424,6 +428,10 @@ eek_xkl_layout_set_layouts (EekXklLayout *layout,
g_return_val_if_fail (priv, FALSE);
config = xkl_config_rec_new ();
/* config->layouts will be freed on g_object_unref (config) */
if (layouts)
config->layouts = g_strdupv (layouts);
else
config->layouts = layouts;
success = eek_xkl_layout_set_config (layout, config);
g_object_unref (config);
@ -448,7 +456,11 @@ eek_xkl_layout_set_variants (EekXklLayout *layout,
g_return_val_if_fail (priv, FALSE);
config = xkl_config_rec_new ();
config->variants = variants;
/* config->variants will be freed on g_object_unref (config) */
if (variants)
config->variants = g_strdupv (variants);
else
config->variants = NULL;
success = eek_xkl_layout_set_config (layout, config);
g_object_unref (config);
return success;
@ -472,7 +484,11 @@ eek_xkl_layout_set_options (EekXklLayout *layout,
g_return_val_if_fail (priv, FALSE);
config = xkl_config_rec_new ();
/* config->options will be freed on g_object_unref (config) */
if (options)
config->options = options;
else
config->options = NULL;
success = eek_xkl_layout_set_config (layout, config);
g_object_unref (config);
return success;