From 899d2d957a790aa3fb0bd6dbcfbed64ea76ba14f Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Mon, 11 Jul 2016 13:46:21 +0900 Subject: [PATCH] edje - language emit - handle null language and convert to none cleans up an emit string being edje,language,(null) if no language is set. use none instead of (null). --- src/lib/edje/edje_load.c | 6 ++++-- src/lib/edje/edje_util.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c index e7c70b1..85dc114 100644 --- a/src/lib/edje/edje_load.c +++ b/src/lib/edje/edje_load.c @@ -1370,8 +1370,10 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch _edje_user_definition_remove(eud, eud->u.box.child); } } - - snprintf(lang, sizeof(lang), "edje,language,%s", _edje_language); + if (_edje_language) + snprintf(lang, sizeof(lang), "edje,language,%s", _edje_language); + else + snprintf(lang, sizeof(lang), "edje,language,%s", "none"); edje_object_signal_emit(obj, lang, "edje"); if (edje_object_mirrored_get(obj)) diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index 83f8d1c..4f82e32 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -364,7 +364,10 @@ _edje_object_language_set(Eo *obj, Edje *ed, const char *locale) eina_stringshare_replace_length(&ed->language, locale, length); signal = alloca(length + 15); - snprintf(signal, length + 15, "edje,language,%s", ed->language); + if (ed->language) + snprintf(signal, length + 15, "edje,language,%s", ed->language); + else + snprintf(signal, length + 15, "edje,language,%s", "none"); _edje_language_signal_emit(ed, obj, signal); } @@ -397,7 +400,10 @@ edje_language_set(const char *locale) eina_stringshare_replace(&_edje_language, loc); signal = alloca(length + 15); - snprintf(signal, length + 15, "edje,language,%s", loc); + if (loc) + snprintf(signal, length + 15, "edje,language,%s", loc); + else + snprintf(signal, length + 15, "edje,language,%s", "none"); EINA_LIST_FOREACH(_edje_edjes, l, obj) { -- 2.7.4