styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove Ecore_Txt 

SVN revision: 45791
This commit is contained in:
Sebastian Dransfeld 2010-02-02 04:50:04 +00:00
parent a67d3b8484
commit 49ef5a77f9
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

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

6
src/modules/temperature/e_mod_main.c
View File

@ -4,8 +4,6 @@
#include "e.h"
#include "e_mod_main.h"
#include <Ecore_Txt.h>
#ifdef __FreeBSD__
#include <sys/types.h>
#include <sys/sysctl.h>
@ -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
{