Change-Id: I73ff9a9d104727629bae9d1797bea24bf3c7c19c
Signed-off-by: jinwang.an <jinwang.an@samsung.com>
static bool dl_is_supported_image_type_load(char *path);
static bool dl_font_config_set(char *font_name);
static bool dl_is_supported_image_type_load(char *path);
static bool dl_font_config_set(char *font_name);
-static char *dl_get_font_info(char *str);
+static char *dl_get_default_font_info();
static int dl_is_available_font(char *str);
static void dl_font_size_set();
static void dl_font_config_set_notification();
static int dl_is_available_font(char *str);
static void dl_font_size_set();
static void dl_font_config_set_notification();
int system_setting_get_default_font_type(system_settings_key_e key, system_setting_data_type_e data_type, void **value)
{
SETTING_TRACE_BEGIN;
int system_setting_get_default_font_type(system_settings_key_e key, system_setting_data_type_e data_type, void **value)
{
SETTING_TRACE_BEGIN;
- char *font_name = dl_get_font_info("default");
+ char *font_name = dl_get_default_font_info();
if (font_name) {
*value = (void *)font_name;
return SYSTEM_SETTINGS_ERROR_NONE;
if (font_name) {
*value = (void *)font_name;
return SYSTEM_SETTINGS_ERROR_NONE;
int system_setting_get_font_type(system_settings_key_e key, system_setting_data_type_e data_type, void **value)
{
SETTING_TRACE_BEGIN;
int system_setting_get_font_type(system_settings_key_e key, system_setting_data_type_e data_type, void **value)
{
SETTING_TRACE_BEGIN;
- char *font_name = dl_get_font_info("cur");
- *value = (void *)font_name;
+ char *font_name = NULL;
+
+ if (system_setting_vconf_get_value_string(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME, &font_name)) {
+ return SYSTEM_SETTINGS_ERROR_IO_ERROR;
+ }
return SYSTEM_SETTINGS_ERROR_NONE;
}
return SYSTEM_SETTINGS_ERROR_NONE;
}
/* LCOV_EXCL_STOP */
/* LCOV_EXCL_START */
/* LCOV_EXCL_STOP */
/* LCOV_EXCL_START */
-static char *dl_get_font_info(char *str)
+static char *dl_get_default_font_info()
{
void *handle = NULL;
char *error;
{
void *handle = NULL;
char *error;
- if (strcmp(str, "cur") == 0)
- get_font_info = dlsym(handle, "_get_cur_font");
- else
- get_font_info = dlsym(handle, "_get_default_font");
+ get_font_info = dlsym(handle, "_get_default_font");
if ((error = dlerror()) != NULL) {
if ((error = dlerror()) != NULL) {
- SETTING_TRACE("ERROR!! canNOT find %s function at libsystem-settings-util.so.0.1.0", str);
+ SETTING_TRACE("ERROR!! canNOT find _get_default_font function at libsystem-settings-util.so.0.1.0");
if (handle)
dlclose(handle);
return false;
if (handle)
dlclose(handle);
return false;
SETTING_TRACE_BEGIN;
char buf[255] = { 0 };
int font_size = __font_size_get();
SETTING_TRACE_BEGIN;
char buf[255] = { 0 };
int font_size = __font_size_get();
- char *font_name = _get_cur_font();
+ char *font_name = NULL;
+
+ font_name = vconf_get_str(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME);
snprintf(buf, sizeof(buf), "font_name: %s, font_size: %d", font_name, font_size);
_efl_config_set(buf);
snprintf(buf, sizeof(buf), "font_name: %s, font_size: %d", font_name, font_size);
_efl_config_set(buf);