Use theme from ewebkit

ewebkit.edj was a copy of the default theme that comes with ewebkit. Since now
it's exported through pkg-config, let's eve use it instead of copying from
there every time it changes.



SVN revision: 52557

configure.ac

@@ -71,6 +71,14 @@ AC_ARG_WITH([edje-cc],
    ],[edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc])
 AC_SUBST(edje_cc)
 
+AC_ARG_WITH([ewebkit-datadir],
+   [AC_HELP_STRING([--with-ewebkit-datadir=PATH],
+                   [specify the data directory of webkit default theme])],
+   [ewebkit_datadir=$withval;
+    AC_MSG_NOTICE([ewebkit datadir explicitly set to $ewebkit_datadir])
+   ],[ewebkit_datadir=$(pkg-config --variable=datadir ewebkit)])
+AC_SUBST(ewebkit_datadir)
+
 want_quicklaunch="auto"
 AC_ARG_ENABLE([quicklaunch],
    [AC_HELP_STRING([--disable-quicklaunch],

data/themes/Makefile.am

@@ -4,7 +4,7 @@ EDJE_CC = @edje_cc@
 EDJE_FLAGS = -v -id $(top_srcdir)/data/themes -fd $(top_srcdir)/data/themes
 
 filesdir = $(datadir)/$(PACKAGE)
-files_DATA = ewebkit.edj default.edj
+files_DATA = default.edj
 
 images = \
     more-list-back-button.png \
@@ -48,7 +48,7 @@ images = \
 
 fonts = 
 
-EXTRA_DIST = ewebkit.edj default.edc $(images) $(fonts)
+EXTRA_DIST = default.edc $(images) $(fonts)
 
 default.edj: Makefile $(images) $(fonts) default.edc
 	$(EDJE_CC) $(EDJE_FLAGS) \

src/bin/Makefile.am

@@ -1,9 +1,12 @@
 MAINTAINERCLEANFILES = Makefile.in
 
+EWEBKIT_DATA_DIR=@ewebkit_datadir@
+
 INCLUDES = \
 -I$(top_srcdir) \
 -I$(top_srcdir)/src/bin \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+-DEWEBKIT_DATA_DIR=\"$(EWEBKIT_DATA_DIR)\" \
 -DGETTEXT_PACKAGE=\"$(PACKAGE)\" \
 -DLOCALEDIR=\"$(localedir)\" \
 @ELEMENTARY_CFLAGS@ \

src/bin/view.c

@@ -1032,7 +1032,7 @@ _view_smart_add(Evas_Object *o)
    _parent_sc.sc.add(o);
 
    /* set some common properties, such as theme and default zoom weak method */
-   ewk_view_theme_set(o, PACKAGE_DATA_DIR "/ewebkit.edj");
+   ewk_view_theme_set(o, EWEBKIT_DATA_DIR "/themes/default.edj");
    ewk_view_zoom_weak_smooth_scale_set(o, EINA_FALSE);
 
    evas_object_smart_callback_add