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

Move Ethumb headers to own directory. 

Fix trying to free an evas_object by using ecore_evas_free...spankies !!



SVN revision: 50152
This commit is contained in:
Christopher Michael 2010-07-09 08:14:24 +00:00
parent b4748494e2
commit 6d4c38f97b
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/ethumb/configure.ac
View File

@ -29,6 +29,7 @@ VMAJ=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $1);}'`
VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'` VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'`
version_info=`expr $VMAJ + $VMIN` version_info=`expr $VMAJ + $VMIN`
AC_SUBST(version_info) AC_SUBST(version_info)
AC_SUBST(VMAJ)
#themesdir="${datadir}/ethumb/data/frames" #themesdir="${datadir}/ethumb/data/frames"
#AC_SUBST(themesdir) #AC_SUBST(themesdir)

2
legacy/ethumb/ethumb.pc.in
View File

@ -8,4 +8,4 @@ Description: Thumbnail Generator Library
Requires: @requirement_ethumb@ Requires: @requirement_ethumb@
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lethumb Libs: -L${libdir} -lethumb
Cflags: -I${includedir} Cflags: -I${includedir}/ethumb-@VMAJ@

2
legacy/ethumb/ethumb_client.pc.in
View File

@ -8,4 +8,4 @@ Description: Thumbnail Client Library
Requires: @requirement_ethumb_client@ Requires: @requirement_ethumb_client@
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lethumb_client Libs: -L${libdir} -lethumb_client
Cflags: -I${includedir} Cflags: -I${includedir}/ethumb-@VMAJ@

2
legacy/ethumb/src/lib/Ethumb.c
View File

@ -316,7 +316,7 @@ ethumb_free(Ethumb *ethumb)
if (ethumb->frame) if (ethumb->frame)
_ethumb_frame_free(ethumb->frame); _ethumb_frame_free(ethumb->frame);
ethumb_file_free(ethumb); ethumb_file_free(ethumb);
ecore_evas_free(ethumb->o); evas_object_del(ethumb->o);
ecore_evas_free(ethumb->ee); ecore_evas_free(ethumb->ee);
ecore_evas_free(ethumb->sub_ee); ecore_evas_free(ethumb->sub_ee);
eina_stringshare_del(ethumb->thumb_dir); eina_stringshare_del(ethumb->thumb_dir);

4
legacy/ethumb/src/lib/Makefile.am
View File

@ -9,7 +9,9 @@ AM_CPPFLAGS = \
@EINA_CFLAGS@ @EVAS_CFLAGS@ @ECORE_EVAS_CFLAGS@ @ECORE_FILE_CFLAGS@ @EDJE_CFLAGS@ \ @EINA_CFLAGS@ @EVAS_CFLAGS@ @ECORE_EVAS_CFLAGS@ @ECORE_FILE_CFLAGS@ @EDJE_CFLAGS@ \
@EFL_ETHUMB_BUILD@ @EFL_ETHUMB_BUILD@
include_HEADERS = Ethumb.h Ethumb_Plugin.h includes_HEADERS = Ethumb.h Ethumb_Plugin.h
includesdir = $(includedir)/ethumb-@VMAJ@
noinst_HEADERS = md5.h ethumb_private.h noinst_HEADERS = md5.h ethumb_private.h
lib_LTLIBRARIES = libethumb.la lib_LTLIBRARIES = libethumb.la

3
legacy/ethumb/src/lib/client/Makefile.am
View File

@ -8,7 +8,8 @@ AM_CPPFLAGS = \
@EINA_CFLAGS@ \ @EINA_CFLAGS@ \
@EFL_ETHUMB_CLIENT_BUILD@ @EFL_ETHUMB_CLIENT_BUILD@
include_HEADERS = Ethumb_Client.h includes_HEADERS = Ethumb_Client.h
includesdir = $(includedir)/ethumb-@VMAJ@
lib_LTLIBRARIES = libethumb_client.la lib_LTLIBRARIES = libethumb_client.la