From 49ef5a77f94811ef4067b9f2be8b994e0dc52640 Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Tue, 2 Feb 2010 04:50:04 +0000 Subject: [PATCH] Remove Ecore_Txt SVN revision: 45791 --- configure.ac | 9 +-------- src/modules/temperature/e_mod_main.c | 6 ++---- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index b3880b5d7..6502fd08c 100644 --- a/configure.ac +++ b/configure.ac @@ -384,13 +384,6 @@ esac AC_SUBST(BATTERY_LDFLAGS) -AM_CONDITIONAL(HAVE_TEMPERATURE, false) -define([CHECK_MODULE_TEMPERATURE], -[ - PKG_CHECK_MODULES(ECORE_TXT, [ecore-txt], [], [TEMPERATURE=false]) - AC_E_CHECK_PKG(TEMPERATURE, [ecore ecore-file eina-0], [], [TEMPERATURE=false]) -]) - AM_CONDITIONAL(HAVE_EXCHANGE, false) define([CHECK_MODULE_CONF_THEME], [ @@ -440,7 +433,7 @@ AC_E_OPTIONAL_MODULE([dropshadow], true) AC_E_OPTIONAL_MODULE([clock], true) AC_E_OPTIONAL_MODULE([pager], true) AC_E_OPTIONAL_MODULE([battery], true, [CHECK_MODULE_BATTERY]) -AC_E_OPTIONAL_MODULE([temperature], true, [CHECK_MODULE_TEMPERATURE]) +AC_E_OPTIONAL_MODULE([temperature], true) AC_E_OPTIONAL_MODULE([cpufreq], true) AC_E_OPTIONAL_MODULE([ibox], true) AC_E_OPTIONAL_MODULE([start], true) diff --git a/src/modules/temperature/e_mod_main.c b/src/modules/temperature/e_mod_main.c index 80fd3e1be..a67ba6310 100644 --- a/src/modules/temperature/e_mod_main.c +++ b/src/modules/temperature/e_mod_main.c @@ -4,8 +4,6 @@ #include "e.h" #include "e_mod_main.h" -#include - #ifdef __FreeBSD__ #include #include @@ -221,13 +219,13 @@ _temperature_cb_exe_data(void *data, int type, void *event) snprintf(buf, sizeof(buf), "%i°F", temp); else snprintf(buf, sizeof(buf), "%i°C", temp); - utf8 = ecore_txt_convert("iso-8859-1", "utf-8", buf); + utf8 = eina_str_convert("iso-8859-1", "utf-8", buf); _temperature_face_level_set(inst, (double)(temp - inst->low) / (double)(inst->high - inst->low)); edje_object_part_text_set(inst->o_temp, "e.text.reading", utf8); - free(utf8); + if (utf8) free(utf8); } else {