hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=d6d69eb6c7cdd9f4dc6a11013b947c9aaa8d0b6c

commit d6d69eb6c7cdd9f4dc6a11013b947c9aaa8d0b6c
Author: Mykyta Biliavskyi <m.biliavs...@samsung.com>
Date:   Wed Jun 3 18:55:34 2015 +0000

    Fix generation path to theme, for enventor library.
    
    In case when enventor library initialized by another application,
    function elm_app_data_get_dir() return data dir of the parent
    application.
    Now on precompilation stage (automake) path to enventor theme
    will be added to internal usage. It make no dependencies from
    parent application.
    
    @fix T1285
---
 configure.ac            | 3 +++
 src/lib/Makefile.am     | 3 ++-
 src/lib/enventor_main.c | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 890444a..4e5df10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,6 +110,9 @@ EFL_WITH_BIN([eolian-cxx], [eolian-cxx], [eolian_cxx])
 AM_CONDITIONAL([HAVE_EOLIAN_GEN], [true])
 AM_CONDITIONAL([HAVE_EOLIAN_CXX], [true])
 
+ENVENTOR_DEFINE=" -DENVENTOR_THEME_PATH=\\\"${datadir}/enventor/themes/\\\" "
+AC_SUBST([ENVENTOR_DEFINE])
+
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index d9ec05c..08ecafb 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -14,7 +14,8 @@ AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
               -DPACKAGE_LIB_DIR=\"$(libdir)\" \
               -I$(top_srcdir)/src/bin \
               -I$(top_srcdir)/src/include \
-              @ENVENTOR_CFLAGS@
+              @ENVENTOR_CFLAGS@ \
+              @ENVENTOR_DEFINE@
 
 lib_LTLIBRARIES = libenventor.la
 
diff --git a/src/lib/enventor_main.c b/src/lib/enventor_main.c
index ab690a1..ab62ca5 100644
--- a/src/lib/enventor_main.c
+++ b/src/lib/enventor_main.c
@@ -94,8 +94,8 @@ enventor_init(int argc, char **argv)
         _enventor_log_dom = EINA_LOG_DOMAIN_GLOBAL;
      }
 
-   snprintf(EDJE_PATH, sizeof(EDJE_PATH), "%s/themes/enventor.edj",
-            elm_app_data_dir_get());
+   snprintf(EDJE_PATH, sizeof(EDJE_PATH), "%s/enventor.edj",
+            ENVENTOR_THEME_PATH);
 
    srand(time(NULL));
 

-- 


Reply via email to