summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Lima (Etrunko) <eduardo.lima@intel.com>2014-10-21 19:40:41 -0200
committerEduardo Lima (Etrunko) <eduardo.lima@intel.com>2014-10-22 20:25:43 -0200
commit21db0338cd2a006e8abdf2e22688cdcc2d696f88 (patch)
tree5374fc49e8e624bbfd26bcf42fd21cfd3f550506
parent243096d1f9ad7f6d7040548553ba40512a5ec7fd (diff)
downloadweekeyboard-21db0338cd2a006e8abdf2e22688cdcc2d696f88.tar.gz
weekeyboard-21db0338cd2a006e8abdf2e22688cdcc2d696f88.tar.bz2
weekeyboard-21db0338cd2a006e8abdf2e22688cdcc2d696f88.zip
Fix initialization of custom-font key
Change-Id: Ia5de054faecb6ad64bf0b22d7f7af57e404ec6de Signed-off-by: Eduardo Lima (Etrunko) <eduardo.lima@intel.com>
-rw-r--r--src/wkb-ibus-config-eet.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/wkb-ibus-config-eet.c b/src/wkb-ibus-config-eet.c
index 3bd5b49..1ce0d80 100644
--- a/src/wkb-ibus-config-eet.c
+++ b/src/wkb-ibus-config-eet.c
@@ -527,6 +527,7 @@ _config_panel_edd_new(void)
EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, struct _config_panel);
edd = eet_data_descriptor_stream_new(&eddc);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(edd, struct _config_panel, "custom-font", custom_font, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, struct _config_panel, "show", show, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, struct _config_panel, "x", x, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, struct _config_panel, "y", y, EET_T_INT);
@@ -534,8 +535,6 @@ _config_panel_edd_new(void)
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, struct _config_panel, "show-icon-in-systray", show_icon_in_systray, EET_T_UCHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, struct _config_panel, "show-im-name", show_im_name, EET_T_UCHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, struct _config_panel, "use-custom-font", use_custom_font, EET_T_UCHAR);
- EET_DATA_DESCRIPTOR_ADD_BASIC(edd, struct _config_panel, "custom-font", custom_font, EET_T_STRING);
-
return edd;
}
@@ -544,6 +543,7 @@ _config_panel_set_defaults(struct _config_section *base)
{
struct _config_panel *panel = (struct _config_panel *) base;
+ panel->custom_font = eina_stringshare_add("Sans 10");
panel->show = 0;
panel->x = -1;
panel->y = -1;
@@ -551,12 +551,12 @@ _config_panel_set_defaults(struct _config_section *base)
panel->show_icon_in_systray = EINA_TRUE;
panel->show_im_name = EINA_FALSE;
panel->use_custom_font = EINA_FALSE;
- panel->custom_font = eina_stringshare_add("Sans 10");
}
static void
_config_panel_section_init(struct _config_section *base, struct _config_section *parent)
{
+ _config_section_add_key_string(base, panel, custom_font);
_config_section_init(base, panel);
_config_section_add_key_int(base, panel, show);
_config_section_add_key_int(base, panel, x);
@@ -565,7 +565,6 @@ _config_panel_section_init(struct _config_section *base, struct _config_section
_config_section_add_key_bool(base, panel, show_icon_in_systray);
_config_section_add_key_bool(base, panel, show_im_name);
_config_section_add_key_bool(base, panel, use_custom_font);
- _config_section_add_key_string(base, panel, custom_font);
}
static struct _config_section *