enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

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).
This commit is contained in:
Carsten Haitzler 2016-07-11 13:46:21 +09:00
parent 8e93b88175
commit 899d2d957a
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/edje/edje_load.c
View File

@ -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))

10
src/lib/edje/edje_util.c
View File

@ -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)
{