aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-08-17 18:10:50 +0100
committerAlastair Poole <netstar@gmail.com>2018-08-17 18:10:50 +0100
commita96933f964b1757b9d9f8a4cce14d883f35a6665 (patch)
tree0dfc519a8a562bb6fabdd5329e0fc4d94382e28c
parentefl_wl: Send unique keymap fds to clients (diff)
downloadefl-a96933f964b1757b9d9f8a4cce14d883f35a6665.tar.gz
efl_ui/format: revert some patches to fix some regressions
Summary: it seems that the original patch in this case introduced a regression where format strings ending with %% in progressbar would not be displayed correctly. a followup patch attempted to resolve this, but this second patch introduced another regression where some format strings would always display 0% fixing compiler warnings is always valued, but in the case where the patch to fix the warning creates regressions then we will live with the warnings instead This reverts commit b4112b9735ce75bce95974a257aa1880fa52a6bf. This reverts commit be770d37fb05b8486907796dd16f4635bceb4ce1. Subscribers: cedric, #reviewers, #committers Tags: #efl_widgets Differential Revision: https://phab.enlightenment.org/D6863
-rw-r--r--src/lib/efl/interfaces/efl_ui_format.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/efl/interfaces/efl_ui_format.c b/src/lib/efl/interfaces/efl_ui_format.c
index 1064b078e3..c7b8c59aa9 100644
--- a/src/lib/efl/interfaces/efl_ui_format.c
+++ b/src/lib/efl/interfaces/efl_ui_format.c
@@ -38,7 +38,6 @@ _format_string_check(const char *fmt)
if (itr[1] == '%')
{
itr++;
- ret_type = FORMAT_TYPE_STRING;
continue;
}
@@ -131,7 +130,7 @@ _default_format_cb(void *data, Eina_Strbuf *str, const Eina_Value value)
}
else if (sd->format_type == FORMAT_TYPE_STATIC)
{
- eina_strbuf_append(str, sd->template);
+ eina_strbuf_append_printf(str, sd->template);
}
else
{