From b3b8a53758b5866e5baa8376a2a1ff922a95c991 Mon Sep 17 00:00:00 2001 From: barbieri Date: Wed, 11 Jan 2012 21:50:40 +0000 Subject: [PATCH] eina_value: convert array to string using [] for single items as well. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eina@67095 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/eina_value.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/lib/eina_value.c b/src/lib/eina_value.c index 6c9392f..17eca0c 100644 --- a/src/lib/eina_value.c +++ b/src/lib/eina_value.c @@ -2494,18 +2494,8 @@ _eina_value_type_array_convert_to(const Eina_Value_Type *type __UNUSED__, const const Eina_Value_Array *tmem = type_mem; Eina_Bool ret = EINA_FALSE; - if ((tmem->array) && (tmem->array->len == 1)) - { - const Eina_Value_Type *subtype = tmem->subtype; - void *imem = tmem->array->members; - - if (subtype->convert_to) - ret = subtype->convert_to(subtype, convert, imem, convert_mem); - if ((!ret) && (convert->convert_from)) - ret = convert->convert_from(convert, subtype, convert_mem, imem); - } - else if ((convert == EINA_VALUE_TYPE_STRING) || - (convert == EINA_VALUE_TYPE_STRINGSHARE)) + if ((convert == EINA_VALUE_TYPE_STRING) || + (convert == EINA_VALUE_TYPE_STRINGSHARE)) { Eina_Strbuf *str = eina_strbuf_new(); if (!tmem->array) eina_strbuf_append(str, "[]"); @@ -2559,6 +2549,16 @@ _eina_value_type_array_convert_to(const Eina_Value_Type *type __UNUSED__, const eina_strbuf_free(str); } } + else if ((tmem->array) && (tmem->array->len == 1)) + { + const Eina_Value_Type *subtype = tmem->subtype; + void *imem = tmem->array->members; + + if (subtype->convert_to) + ret = subtype->convert_to(subtype, convert, imem, convert_mem); + if ((!ret) && (convert->convert_from)) + ret = convert->convert_from(convert, subtype, convert_mem, imem); + } if (!ret) { -- 2.7.4