summaryrefslogtreecommitdiff
path: root/legacy/ethumb
diff options
context:
space:
mode:
authorChristopher Michael <cpmichael1@comcast.net>2010-07-09 08:14:24 +0000
committerChristopher Michael <cpmichael1@comcast.net>2010-07-09 08:14:24 +0000
commit6d4c38f97b5b6a87bbe8ae7349f343887f0bfa07 (patch)
treea3a0ff6a8b23cfd31bd1f596b10e961b20c12ef0 /legacy/ethumb
parentb4748494e21400b58b05f2856de422bdc5744e51 (diff)
Move Ethumb headers to own directory.
Fix trying to free an evas_object by using ecore_evas_free...spankies !! SVN revision: 50152
Diffstat (limited to 'legacy/ethumb')
-rw-r--r--legacy/ethumb/configure.ac1
-rw-r--r--legacy/ethumb/ethumb.pc.in2
-rw-r--r--legacy/ethumb/ethumb_client.pc.in2
-rw-r--r--legacy/ethumb/src/lib/Ethumb.c2
-rw-r--r--legacy/ethumb/src/lib/Makefile.am4
-rw-r--r--legacy/ethumb/src/lib/client/Makefile.am3
6 files changed, 9 insertions, 5 deletions
diff --git a/legacy/ethumb/configure.ac b/legacy/ethumb/configure.ac
index 0382c5aa78..87ed87f66a 100644
--- a/legacy/ethumb/configure.ac
+++ b/legacy/ethumb/configure.ac
@@ -29,6 +29,7 @@ VMAJ=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $1);}'`
29VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'` 29VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'`
30version_info=`expr $VMAJ + $VMIN` 30version_info=`expr $VMAJ + $VMIN`
31AC_SUBST(version_info) 31AC_SUBST(version_info)
32AC_SUBST(VMAJ)
32 33
33#themesdir="${datadir}/ethumb/data/frames" 34#themesdir="${datadir}/ethumb/data/frames"
34#AC_SUBST(themesdir) 35#AC_SUBST(themesdir)
diff --git a/legacy/ethumb/ethumb.pc.in b/legacy/ethumb/ethumb.pc.in
index f1db1a1049..233e2ed397 100644
--- a/legacy/ethumb/ethumb.pc.in
+++ b/legacy/ethumb/ethumb.pc.in
@@ -8,4 +8,4 @@ Description: Thumbnail Generator Library
8Requires: @requirement_ethumb@ 8Requires: @requirement_ethumb@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lethumb 10Libs: -L${libdir} -lethumb
11Cflags: -I${includedir} 11Cflags: -I${includedir}/ethumb-@VMAJ@
diff --git a/legacy/ethumb/ethumb_client.pc.in b/legacy/ethumb/ethumb_client.pc.in
index b1e44b79e2..c9eebc6561 100644
--- a/legacy/ethumb/ethumb_client.pc.in
+++ b/legacy/ethumb/ethumb_client.pc.in
@@ -8,4 +8,4 @@ Description: Thumbnail Client Library
8Requires: @requirement_ethumb_client@ 8Requires: @requirement_ethumb_client@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lethumb_client 10Libs: -L${libdir} -lethumb_client
11Cflags: -I${includedir} 11Cflags: -I${includedir}/ethumb-@VMAJ@
diff --git a/legacy/ethumb/src/lib/Ethumb.c b/legacy/ethumb/src/lib/Ethumb.c
index 898019ebf5..7c0f9e6bf5 100644
--- a/legacy/ethumb/src/lib/Ethumb.c
+++ b/legacy/ethumb/src/lib/Ethumb.c
@@ -316,7 +316,7 @@ ethumb_free(Ethumb *ethumb)
316 if (ethumb->frame) 316 if (ethumb->frame)
317 _ethumb_frame_free(ethumb->frame); 317 _ethumb_frame_free(ethumb->frame);
318 ethumb_file_free(ethumb); 318 ethumb_file_free(ethumb);
319 ecore_evas_free(ethumb->o); 319 evas_object_del(ethumb->o);
320 ecore_evas_free(ethumb->ee); 320 ecore_evas_free(ethumb->ee);
321 ecore_evas_free(ethumb->sub_ee); 321 ecore_evas_free(ethumb->sub_ee);
322 eina_stringshare_del(ethumb->thumb_dir); 322 eina_stringshare_del(ethumb->thumb_dir);
diff --git a/legacy/ethumb/src/lib/Makefile.am b/legacy/ethumb/src/lib/Makefile.am
index 2eb48ede25..c521a0bfe6 100644
--- a/legacy/ethumb/src/lib/Makefile.am
+++ b/legacy/ethumb/src/lib/Makefile.am
@@ -9,7 +9,9 @@ AM_CPPFLAGS = \
9 @EINA_CFLAGS@ @EVAS_CFLAGS@ @ECORE_EVAS_CFLAGS@ @ECORE_FILE_CFLAGS@ @EDJE_CFLAGS@ \ 9 @EINA_CFLAGS@ @EVAS_CFLAGS@ @ECORE_EVAS_CFLAGS@ @ECORE_FILE_CFLAGS@ @EDJE_CFLAGS@ \
10 @EFL_ETHUMB_BUILD@ 10 @EFL_ETHUMB_BUILD@
11 11
12include_HEADERS = Ethumb.h Ethumb_Plugin.h 12includes_HEADERS = Ethumb.h Ethumb_Plugin.h
13includesdir = $(includedir)/ethumb-@VMAJ@
14
13noinst_HEADERS = md5.h ethumb_private.h 15noinst_HEADERS = md5.h ethumb_private.h
14 16
15lib_LTLIBRARIES = libethumb.la 17lib_LTLIBRARIES = libethumb.la
diff --git a/legacy/ethumb/src/lib/client/Makefile.am b/legacy/ethumb/src/lib/client/Makefile.am
index 0ba7fc9fc9..b568e210f5 100644
--- a/legacy/ethumb/src/lib/client/Makefile.am
+++ b/legacy/ethumb/src/lib/client/Makefile.am
@@ -8,7 +8,8 @@ AM_CPPFLAGS = \
8 @EINA_CFLAGS@ \ 8 @EINA_CFLAGS@ \
9 @EFL_ETHUMB_CLIENT_BUILD@ 9 @EFL_ETHUMB_CLIENT_BUILD@
10 10
11include_HEADERS = Ethumb_Client.h 11includes_HEADERS = Ethumb_Client.h
12includesdir = $(includedir)/ethumb-@VMAJ@
12 13
13lib_LTLIBRARIES = libethumb_client.la 14lib_LTLIBRARIES = libethumb_client.la
14 15