From 6d4c38f97b5b6a87bbe8ae7349f343887f0bfa07 Mon Sep 17 00:00:00 2001
From: Christopher Michael <cpmichael1@comcast.net>
Date: Fri, 9 Jul 2010 08:14:24 +0000
Subject: [PATCH] Move Ethumb headers to own directory. Fix trying to free an
 evas_object by using ecore_evas_free...spankies !!

SVN revision: 50152
---
 legacy/ethumb/configure.ac               | 1 +
 legacy/ethumb/ethumb.pc.in               | 2 +-
 legacy/ethumb/ethumb_client.pc.in        | 2 +-
 legacy/ethumb/src/lib/Ethumb.c           | 2 +-
 legacy/ethumb/src/lib/Makefile.am        | 4 +++-
 legacy/ethumb/src/lib/client/Makefile.am | 3 ++-
 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);}'`
 VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'`
 version_info=`expr $VMAJ + $VMIN`
 AC_SUBST(version_info)
+AC_SUBST(VMAJ)
 
 #themesdir="${datadir}/ethumb/data/frames"
 #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
 Requires: @requirement_ethumb@
 Version: @VERSION@
 Libs: -L${libdir} -lethumb
-Cflags: -I${includedir}
+Cflags: -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
 Requires: @requirement_ethumb_client@
 Version: @VERSION@
 Libs: -L${libdir} -lethumb_client
-Cflags: -I${includedir}
+Cflags: -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)
    if (ethumb->frame)
      _ethumb_frame_free(ethumb->frame);
    ethumb_file_free(ethumb);
-   ecore_evas_free(ethumb->o);
+   evas_object_del(ethumb->o);
    ecore_evas_free(ethumb->ee);
    ecore_evas_free(ethumb->sub_ee);
    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 = \
 	@EINA_CFLAGS@ @EVAS_CFLAGS@ @ECORE_EVAS_CFLAGS@ @ECORE_FILE_CFLAGS@ @EDJE_CFLAGS@ \
 	@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
 
 lib_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 = \
 	@EINA_CFLAGS@ \
 	@EFL_ETHUMB_CLIENT_BUILD@
 
-include_HEADERS = Ethumb_Client.h
+includes_HEADERS = Ethumb_Client.h
+includesdir = $(includedir)/ethumb-@VMAJ@
 
 lib_LTLIBRARIES = libethumb_client.la