From 442688c3da9dbd20fa9d56c11232903ecbb8aa87 Mon Sep 17 00:00:00 2001
From: Rusty Lynch <rusty.lynch@intel.com>
Date: Wed, 5 Jun 2013 14:37:08 -0700
Subject: [PATCH] Imported Upstream version 1.7.7

---
 ChangeLog                                  |   47 +
 Makefile.in                                |   47 +-
 NEWS                                       |   32 +-
 aclocal.m4                                 |   20 +-
 compile                                    |   91 +-
 configure                                  |  587 +++----
 configure.ac                               |   51 +-
 data/Makefile.in                           |   40 +-
 data/include/Makefile.in                   |   29 +-
 depcomp                                    |  124 +-
 doc/Makefile.in                            |   24 +-
 edje.spec                                  |    2 +-
 ltmain.sh                                  |   32 +-
 m4/libtool.m4                              |   33 +-
 src/Makefile.in                            |   35 +-
 src/bin/Makefile.in                        |   45 +-
 src/bin/epp/Makefile.in                    |   29 +-
 src/examples/Makefile.in                   |   34 +-
 src/lib/Makefile.in                        |   32 +-
 src/lib/edje_cache.c                       |   10 +-
 src/lib/edje_calc.c                        | 1147 +++++++------
 src/lib/edje_embryo.c                      |    6 +-
 src/lib/edje_entry.c                       |   31 +-
 src/lib/edje_match.c                       |  733 +++++----
 src/lib/edje_program.c                     | 2464 ++++++++++++++--------------
 src/lib/edje_util.c                        | 1593 +++++++++---------
 src/modules/Makefile.in                    |   35 +-
 src/modules/alsa_snd_player/Makefile.in    |   27 +-
 src/modules/eet_snd_reader/Makefile.in     |   27 +-
 src/modules/multisense_factory/Makefile.in |   27 +-
 src/tests/Makefile.in                      |   24 +-
 utils/Makefile.in                          |   29 +-
 32 files changed, 4008 insertions(+), 3479 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a2ced1e..6b83e09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -655,3 +655,50 @@
 
 	* 1.7.5 release
 
+2013-01-14  Daniel Willmann
+
+	* Backport r82767, r82770
+	* edje: Fix off-by-one errors when using alloca in various functions
+
+2013-01-29  Carsten Haitzler (The Rasterman)
+
+        * Fix cache miss bug when edje cache hash is null, but cache
+        list may have entries.
+
+2013-02-07  WooHyun Jung.
+
+	* Backport from r83700 in trunk. Checking walking_callbacks for not removing patterns which are still used.
+
+2013-02-17  Mike Blumenkrantz
+
+        * fix anchor clicked mouse signals for selection-enabled entries
+
+2013-02-18  Carsten Haitzler (The Rasterman)
+
+        * Fix edje edje_color_class_list() and edje_text_class_list() to
+        look at the correct hashes when returning.
+
+2013-02-18  Jihoon Kim (jihoon)
+
+        * edje entry : Fix bug candidate word couldn't be selected with up/down key in the preedit status
+
+2013-02-20  Cedric Bail
+
+	* report file not found properly.
+
+2013-02-28  Mike Blumenkrantz
+
+        * fix custom states for SPACER parts
+        * fix program filters
+
+2013-03-22  Jonas Gastal
+
+        * Fix CURRENT for moving objects.
+
+2013-04-04  Rafael Antognolli
+
+        * 1.7.6 release
+
+2013-05-08  Mike Blumenkrantz
+
+        * Edje: fix custom states for proxy parts
diff --git a/Makefile.in b/Makefile.in
index caec6f9..9b940cb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17,6 +17,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -103,6 +120,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(pkgconfig_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
@@ -444,8 +466,11 @@ edje.spec: $(top_builddir)/config.status $(srcdir)/edje.spec.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -485,8 +510,11 @@ distclean-libtool:
 	-rm -f libtool config.lt
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -671,13 +699,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -763,7 +788,7 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	chmod -R a-w $(distdir); chmod u+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
diff --git a/NEWS b/NEWS
index 0dbd2ad..08134d7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,26 @@
-Edje 1.7.5
+Edje 1.7.7
+
+Changes since Edje 1.7.6:
+-------------------------
+
+Fixes:
+    * fix custom states for proxy parts
+
+Edje 1.7.6
+
+Changes since Edje 1.7.5:
+-------------------------
+
+Fixes:
+    * Fix cache miss when active edje hash is empty.
+    * Checking walking_callbacks for not removing patterns which are still used.
+    * fix anchor clicked mouse signals for selection-enabled entries
+    * Fix edje_color_class_list() and edje_text_class_list() to look at right hashes.
+    * Fix bug candidate word couldn't be selected with up/down key in the preedit status
+    * Report file not found properly.
+    * fix custom states for SPACER parts
+    * fix program filters
+    * Fix CURRENT for moving objects.
 
 Changes since Edje 1.7.4:
 -------------------------
@@ -14,8 +36,6 @@ Fixes:
     * Backport from 78587 in trunk.
     * Fix inheriting groups with programs that have after programs where after programs are duplicated in the list.
 
-Edje 1.7.3
-
 Changes since Edje 1.7.2:
 -------------------------
 
@@ -34,16 +54,12 @@ Fixes:
     * fix to not segv on inheriting group lookups
     * fix build on Solaris 11
     
-Edje 1.7.1
-
 Changes since Edje 1.7.0:
 -------------------------
 
 Fixes:
     * Fix edje_*scale_set() on sub-group.
 
-Edje 1.7.0
-
 Changes since Edje 1.2.0:
 -------------------------
 
@@ -79,8 +95,6 @@ Fixes:
     * Properly destroy color_class and text_class on an Edje_Object.
     * Stop leaking memory on edje block error during signal emit.
 
-Edje 1.2.0
-
 Changes since Edje 1.1.0:
 -------------------------
 
diff --git a/aclocal.m4 b/aclocal.m4
index dbff9fe..211b45a 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -48,8 +48,7 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
 # ----------------------------------
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
 AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
 AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@@ -95,8 +94,7 @@ m4_define([_PKG_CONFIG],
     pkg_cv_[]$1="$$1"
  elif test -n "$PKG_CONFIG"; then
     PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
 		     [pkg_failed=yes])
  else
     pkg_failed=untried
@@ -144,9 +142,9 @@ if test $pkg_failed = yes; then
    	AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -159,7 +157,7 @@ $$1_PKG_ERRORS
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-_PKG_TEXT])[]dnl
+_PKG_TEXT])
         ])
 elif test $pkg_failed = untried; then
      	AC_MSG_RESULT([no])
@@ -170,7 +168,7 @@ path to pkg-config.
 
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
         ])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -198,7 +196,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.3], [],
+m4_if([$1], [1.11.6], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -214,7 +212,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.3])dnl
+[AM_AUTOMAKE_VERSION([1.11.6])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/compile b/compile
index b1f4749..862a14e 100755
--- a/compile
+++ b/compile
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-01-04.17; # UTC
+scriptversion=2012-03-05.13; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
 # Software Foundation, Inc.
@@ -79,6 +79,48 @@ func_file_conv ()
   esac
 }
 
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
 # func_cl_wrapper cl arg...
 # Adjust compile command to suit cl
 func_cl_wrapper ()
@@ -109,43 +151,34 @@ func_cl_wrapper ()
 	      ;;
 	  esac
 	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
 	-I*)
 	  func_file_conv "${1#-I}" mingw
 	  set x "$@" -I"$file"
 	  shift
 	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
 	-l*)
-	  lib=${1#-l}
-	  found=no
-	  save_IFS=$IFS
-	  IFS=';'
-	  for dir in $lib_path $LIB
-	  do
-	    IFS=$save_IFS
-	    if $shared && test -f "$dir/$lib.dll.lib"; then
-	      found=yes
-	      set x "$@" "$dir/$lib.dll.lib"
-	      break
-	    fi
-	    if test -f "$dir/$lib.lib"; then
-	      found=yes
-	      set x "$@" "$dir/$lib.lib"
-	      break
-	    fi
-	  done
-	  IFS=$save_IFS
-
-	  test "$found" != yes && set x "$@" "$lib.lib"
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
 	  shift
 	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
 	-L*)
-	  func_file_conv "${1#-L}"
-	  if test -z "$lib_path"; then
-	    lib_path=$file
-	  else
-	    lib_path="$lib_path;$file"
-	  fi
-	  linker_opts="$linker_opts -LIBPATH:$file"
+	  func_cl_dashL "${1#-L}"
 	  ;;
 	-static)
 	  shared=false
diff --git a/configure b/configure
index c8dd9bf..b9cf50e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for edje 1.7.5.
+# Generated by GNU Autoconf 2.68 for edje 1.7.7.
 #
 # Report bugs to <enlightenment-devel@lists.sourceforge.net>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='edje'
 PACKAGE_TARNAME='edje'
-PACKAGE_VERSION='1.7.5'
-PACKAGE_STRING='edje 1.7.5'
+PACKAGE_VERSION='1.7.7'
+PACKAGE_STRING='edje 1.7.7'
 PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -1472,7 +1472,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures edje 1.7.5 to adapt to many kinds of systems.
+\`configure' configures edje 1.7.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1542,7 +1542,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of edje 1.7.5:";;
+     short | recursive ) echo "Configuration of edje 1.7.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1745,7 +1745,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-edje configure 1.7.5
+edje configure 1.7.7
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2168,7 +2168,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by edje $as_me 1.7.5, which was
+It was created by edje $as_me 1.7.7, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2992,7 +2992,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='edje'
- VERSION='1.7.5'
+ VERSION='1.7.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5685,7 +5685,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd* | netbsdelf*-gnu)
+netbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
@@ -9081,9 +9081,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   openbsd*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu | gnu*)
-    link_all_deplibs=no
-    ;;
   esac
 
   ld_shlibs=yes
@@ -9305,7 +9302,7 @@ _LT_EOF
       fi
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -9482,7 +9479,6 @@ _LT_EOF
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
-	link_all_deplibs=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -9936,7 +9932,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
       link_all_deplibs=yes
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -10949,10 +10945,14 @@ fi
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -10964,18 +10964,6 @@ fi
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -11963,7 +11951,7 @@ _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define VMIC 5
+#define VMIC 7
 _ACEOF
 
 
@@ -11971,7 +11959,7 @@ cat >>confdefs.h <<_ACEOF
 #define VREV 0
 _ACEOF
 
-version_info="8:5:7"
+version_info="8:7:7"
 release_info=""
 
 
@@ -13549,7 +13537,6 @@ fi
 
 
 
-
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -13690,13 +13677,12 @@ if test -n "$EVIL_CFLAGS"; then
     pkg_cv_EVIL_CFLAGS="$EVIL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.7.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "evil >= 1.7.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.7.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "evil >= 1.7.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EVIL_CFLAGS=`$PKG_CONFIG --cflags "evil >= 1.7.5" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+  pkg_cv_EVIL_CFLAGS=`$PKG_CONFIG --cflags "evil >= 1.7.7" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -13707,13 +13693,12 @@ if test -n "$EVIL_LIBS"; then
     pkg_cv_EVIL_LIBS="$EVIL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.7.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "evil >= 1.7.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.7.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "evil >= 1.7.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EVIL_LIBS=`$PKG_CONFIG --libs "evil >= 1.7.5" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+  pkg_cv_EVIL_LIBS=`$PKG_CONFIG --libs "evil >= 1.7.7" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -13733,14 +13718,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evil >= 1.7.5" 2>&1`
+	        EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evil >= 1.7.7" 2>&1`
         else
-	        EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evil >= 1.7.5" 2>&1`
+	        EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors "evil >= 1.7.7" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EVIL_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (evil >= 1.7.5) were not met:
+	as_fn_error $? "Package requirements (evil >= 1.7.7) were not met:
 
 $EVIL_PKG_ERRORS
 
@@ -13750,6 +13735,7 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables EVIL_CFLAGS
 and EVIL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
+
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -13765,6 +13751,7 @@ See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
+
 else
 	EVIL_CFLAGS=$pkg_cv_EVIL_CFLAGS
 	EVIL_LIBS=$pkg_cv_EVIL_LIBS
@@ -13802,7 +13789,6 @@ if test -n "$LUA_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13819,7 +13805,6 @@ if test -n "$LUA_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13839,9 +13824,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua >= 5.1.0" 2>&1`
         else
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua >= 5.1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LUA_PKG_ERRORS" >&5
@@ -13861,7 +13846,6 @@ if test -n "$LUA_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13878,7 +13862,6 @@ if test -n "$LUA_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13898,9 +13881,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua5.1 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua5.1 >= 5.1.0" 2>&1`
         else
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua5.1 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua5.1 >= 5.1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LUA_PKG_ERRORS" >&5
@@ -13920,7 +13903,6 @@ if test -n "$LUA_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13937,7 +13919,6 @@ if test -n "$LUA_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13957,9 +13938,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua-5.1 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua-5.1 >= 5.1.0" 2>&1`
         else
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua-5.1 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua-5.1 >= 5.1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LUA_PKG_ERRORS" >&5
@@ -13979,7 +13960,6 @@ if test -n "$LUA_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua51 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13996,7 +13976,6 @@ if test -n "$LUA_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua51 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14016,9 +13995,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua51 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
         else
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua51 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LUA_PKG_ERRORS" >&5
@@ -14053,7 +14032,6 @@ if test -n "$LUA_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua51 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14070,7 +14048,6 @@ if test -n "$LUA_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua51 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14090,9 +14067,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua51 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
         else
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua51 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LUA_PKG_ERRORS" >&5
@@ -14134,7 +14111,6 @@ if test -n "$LUA_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14151,7 +14127,6 @@ if test -n "$LUA_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14171,9 +14146,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua-5.1 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua-5.1 >= 5.1.0" 2>&1`
         else
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua-5.1 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua-5.1 >= 5.1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LUA_PKG_ERRORS" >&5
@@ -14193,7 +14168,6 @@ if test -n "$LUA_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua51 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14210,7 +14184,6 @@ if test -n "$LUA_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua51 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14230,9 +14203,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua51 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
         else
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua51 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LUA_PKG_ERRORS" >&5
@@ -14267,7 +14240,6 @@ if test -n "$LUA_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua51 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14284,7 +14256,6 @@ if test -n "$LUA_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua51 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14304,9 +14275,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua51 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
         else
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua51 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LUA_PKG_ERRORS" >&5
@@ -14355,7 +14326,6 @@ if test -n "$LUA_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14372,7 +14342,6 @@ if test -n "$LUA_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14392,9 +14361,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua5.1 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua5.1 >= 5.1.0" 2>&1`
         else
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua5.1 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua5.1 >= 5.1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LUA_PKG_ERRORS" >&5
@@ -14414,7 +14383,6 @@ if test -n "$LUA_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14431,7 +14399,6 @@ if test -n "$LUA_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14451,9 +14418,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua-5.1 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua-5.1 >= 5.1.0" 2>&1`
         else
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua-5.1 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua-5.1 >= 5.1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LUA_PKG_ERRORS" >&5
@@ -14473,7 +14440,6 @@ if test -n "$LUA_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua51 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14490,7 +14456,6 @@ if test -n "$LUA_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua51 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14510,9 +14475,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua51 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
         else
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua51 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LUA_PKG_ERRORS" >&5
@@ -14547,7 +14512,6 @@ if test -n "$LUA_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua51 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14564,7 +14528,6 @@ if test -n "$LUA_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua51 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14584,9 +14547,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua51 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
         else
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua51 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LUA_PKG_ERRORS" >&5
@@ -14628,7 +14591,6 @@ if test -n "$LUA_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14645,7 +14607,6 @@ if test -n "$LUA_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14665,9 +14626,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua-5.1 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua-5.1 >= 5.1.0" 2>&1`
         else
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua-5.1 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua-5.1 >= 5.1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LUA_PKG_ERRORS" >&5
@@ -14687,7 +14648,6 @@ if test -n "$LUA_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua51 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14704,7 +14664,6 @@ if test -n "$LUA_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua51 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14724,9 +14683,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua51 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
         else
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua51 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LUA_PKG_ERRORS" >&5
@@ -14761,7 +14720,6 @@ if test -n "$LUA_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua51 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14778,7 +14736,6 @@ if test -n "$LUA_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua51 >= 5.1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14798,9 +14755,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua51 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
         else
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua51 >= 5.1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LUA_PKG_ERRORS" >&5
@@ -14906,21 +14863,20 @@ if test -n "$MINIMAL_CFLAGS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
-    eina >= 1.7.5
-    eet >= 1.7.5
+    eina >= 1.7.7
+    eet >= 1.7.7
    \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
-    eina >= 1.7.5
-    eet >= 1.7.5
+    eina >= 1.7.7
+    eet >= 1.7.7
    ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_MINIMAL_CFLAGS=`$PKG_CONFIG --cflags "
-    eina >= 1.7.5
-    eet >= 1.7.5
+    eina >= 1.7.7
+    eet >= 1.7.7
    " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14932,21 +14888,20 @@ if test -n "$MINIMAL_LIBS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
-    eina >= 1.7.5
-    eet >= 1.7.5
+    eina >= 1.7.7
+    eet >= 1.7.7
    \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
-    eina >= 1.7.5
-    eet >= 1.7.5
+    eina >= 1.7.7
+    eet >= 1.7.7
    ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_MINIMAL_LIBS=`$PKG_CONFIG --libs "
-    eina >= 1.7.5
-    eet >= 1.7.5
+    eina >= 1.7.7
+    eet >= 1.7.7
    " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14966,22 +14921,22 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        MINIMAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
-    eina >= 1.7.5
-    eet >= 1.7.5
+	        MINIMAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
+    eina >= 1.7.7
+    eet >= 1.7.7
    " 2>&1`
         else
-	        MINIMAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
-    eina >= 1.7.5
-    eet >= 1.7.5
+	        MINIMAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "
+    eina >= 1.7.7
+    eet >= 1.7.7
    " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$MINIMAL_PKG_ERRORS" >&5
 
 	as_fn_error $? "Package requirements (
-    eina >= 1.7.5
-    eet >= 1.7.5
+    eina >= 1.7.7
+    eet >= 1.7.7
    ) were not met:
 
 $MINIMAL_PKG_ERRORS
@@ -14992,6 +14947,7 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables MINIMAL_CFLAGS
 and MINIMAL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
+
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -15007,6 +14963,7 @@ See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
+
 else
 	MINIMAL_CFLAGS=$pkg_cv_MINIMAL_CFLAGS
 	MINIMAL_LIBS=$pkg_cv_MINIMAL_LIBS
@@ -15025,39 +14982,38 @@ if test -n "$EDJE_CFLAGS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
-    eina >= 1.7.5
-    eet >= 1.7.5
-    evas >= 1.7.5
-    ecore >= 1.7.5
-    ecore-evas >= 1.7.5
-    ecore-file >= 1.7.5
-    ecore-input >= 1.7.5
-    embryo >= 1.7.5
+    eina >= 1.7.7
+    eet >= 1.7.7
+    evas >= 1.7.7
+    ecore >= 1.7.7
+    ecore-evas >= 1.7.7
+    ecore-file >= 1.7.7
+    ecore-input >= 1.7.7
+    embryo >= 1.7.7
    \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
-    eina >= 1.7.5
-    eet >= 1.7.5
-    evas >= 1.7.5
-    ecore >= 1.7.5
-    ecore-evas >= 1.7.5
-    ecore-file >= 1.7.5
-    ecore-input >= 1.7.5
-    embryo >= 1.7.5
+    eina >= 1.7.7
+    eet >= 1.7.7
+    evas >= 1.7.7
+    ecore >= 1.7.7
+    ecore-evas >= 1.7.7
+    ecore-file >= 1.7.7
+    ecore-input >= 1.7.7
+    embryo >= 1.7.7
    ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EDJE_CFLAGS=`$PKG_CONFIG --cflags "
-    eina >= 1.7.5
-    eet >= 1.7.5
-    evas >= 1.7.5
-    ecore >= 1.7.5
-    ecore-evas >= 1.7.5
-    ecore-file >= 1.7.5
-    ecore-input >= 1.7.5
-    embryo >= 1.7.5
+    eina >= 1.7.7
+    eet >= 1.7.7
+    evas >= 1.7.7
+    ecore >= 1.7.7
+    ecore-evas >= 1.7.7
+    ecore-file >= 1.7.7
+    ecore-input >= 1.7.7
+    embryo >= 1.7.7
    " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15069,39 +15025,38 @@ if test -n "$EDJE_LIBS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
-    eina >= 1.7.5
-    eet >= 1.7.5
-    evas >= 1.7.5
-    ecore >= 1.7.5
-    ecore-evas >= 1.7.5
-    ecore-file >= 1.7.5
-    ecore-input >= 1.7.5
-    embryo >= 1.7.5
+    eina >= 1.7.7
+    eet >= 1.7.7
+    evas >= 1.7.7
+    ecore >= 1.7.7
+    ecore-evas >= 1.7.7
+    ecore-file >= 1.7.7
+    ecore-input >= 1.7.7
+    embryo >= 1.7.7
    \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
-    eina >= 1.7.5
-    eet >= 1.7.5
-    evas >= 1.7.5
-    ecore >= 1.7.5
-    ecore-evas >= 1.7.5
-    ecore-file >= 1.7.5
-    ecore-input >= 1.7.5
-    embryo >= 1.7.5
+    eina >= 1.7.7
+    eet >= 1.7.7
+    evas >= 1.7.7
+    ecore >= 1.7.7
+    ecore-evas >= 1.7.7
+    ecore-file >= 1.7.7
+    ecore-input >= 1.7.7
+    embryo >= 1.7.7
    ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EDJE_LIBS=`$PKG_CONFIG --libs "
-    eina >= 1.7.5
-    eet >= 1.7.5
-    evas >= 1.7.5
-    ecore >= 1.7.5
-    ecore-evas >= 1.7.5
-    ecore-file >= 1.7.5
-    ecore-input >= 1.7.5
-    embryo >= 1.7.5
+    eina >= 1.7.7
+    eet >= 1.7.7
+    evas >= 1.7.7
+    ecore >= 1.7.7
+    ecore-evas >= 1.7.7
+    ecore-file >= 1.7.7
+    ecore-input >= 1.7.7
+    embryo >= 1.7.7
    " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15121,40 +15076,40 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        EDJE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
-    eina >= 1.7.5
-    eet >= 1.7.5
-    evas >= 1.7.5
-    ecore >= 1.7.5
-    ecore-evas >= 1.7.5
-    ecore-file >= 1.7.5
-    ecore-input >= 1.7.5
-    embryo >= 1.7.5
+	        EDJE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
+    eina >= 1.7.7
+    eet >= 1.7.7
+    evas >= 1.7.7
+    ecore >= 1.7.7
+    ecore-evas >= 1.7.7
+    ecore-file >= 1.7.7
+    ecore-input >= 1.7.7
+    embryo >= 1.7.7
    " 2>&1`
         else
-	        EDJE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
-    eina >= 1.7.5
-    eet >= 1.7.5
-    evas >= 1.7.5
-    ecore >= 1.7.5
-    ecore-evas >= 1.7.5
-    ecore-file >= 1.7.5
-    ecore-input >= 1.7.5
-    embryo >= 1.7.5
+	        EDJE_PKG_ERRORS=`$PKG_CONFIG --print-errors "
+    eina >= 1.7.7
+    eet >= 1.7.7
+    evas >= 1.7.7
+    ecore >= 1.7.7
+    ecore-evas >= 1.7.7
+    ecore-file >= 1.7.7
+    ecore-input >= 1.7.7
+    embryo >= 1.7.7
    " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EDJE_PKG_ERRORS" >&5
 
 	as_fn_error $? "Package requirements (
-    eina >= 1.7.5
-    eet >= 1.7.5
-    evas >= 1.7.5
-    ecore >= 1.7.5
-    ecore-evas >= 1.7.5
-    ecore-file >= 1.7.5
-    ecore-input >= 1.7.5
-    embryo >= 1.7.5
+    eina >= 1.7.7
+    eet >= 1.7.7
+    evas >= 1.7.7
+    ecore >= 1.7.7
+    ecore-evas >= 1.7.7
+    ecore-file >= 1.7.7
+    ecore-input >= 1.7.7
+    embryo >= 1.7.7
    ) were not met:
 
 $EDJE_PKG_ERRORS
@@ -15165,6 +15120,7 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables EDJE_CFLAGS
 and EDJE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
+
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -15180,6 +15136,7 @@ See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
+
 else
 	EDJE_CFLAGS=$pkg_cv_EDJE_CFLAGS
 	EDJE_LIBS=$pkg_cv_EDJE_LIBS
@@ -15191,7 +15148,7 @@ fi
 EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}"
 EDJE_CFLAGS="${EDJE_CFLAGS} ${LUA_CFLAGS}"
 
-requirement_edje="embryo >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.7.5 eina >= 1.7.5 ${requirement_edje}"
+requirement_edje="embryo >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.7.7 eina >= 1.7.7 ${requirement_edje}"
 requirement_edje="${requirement_lua} ${requirement_edje}"
 
 have_ecore_imf="no"
@@ -15205,21 +15162,20 @@ if test -n "$ECORE_IMF_CFLAGS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
-    ecore-imf >= 1.7.5
-    ecore-imf-evas >= 1.7.5
+    ecore-imf >= 1.7.7
+    ecore-imf-evas >= 1.7.7
    \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
-    ecore-imf >= 1.7.5
-    ecore-imf-evas >= 1.7.5
+    ecore-imf >= 1.7.7
+    ecore-imf-evas >= 1.7.7
    ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ECORE_IMF_CFLAGS=`$PKG_CONFIG --cflags "
-    ecore-imf >= 1.7.5
-    ecore-imf-evas >= 1.7.5
+    ecore-imf >= 1.7.7
+    ecore-imf-evas >= 1.7.7
    " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15231,21 +15187,20 @@ if test -n "$ECORE_IMF_LIBS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
-    ecore-imf >= 1.7.5
-    ecore-imf-evas >= 1.7.5
+    ecore-imf >= 1.7.7
+    ecore-imf-evas >= 1.7.7
    \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
-    ecore-imf >= 1.7.5
-    ecore-imf-evas >= 1.7.5
+    ecore-imf >= 1.7.7
+    ecore-imf-evas >= 1.7.7
    ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ECORE_IMF_LIBS=`$PKG_CONFIG --libs "
-    ecore-imf >= 1.7.5
-    ecore-imf-evas >= 1.7.5
+    ecore-imf >= 1.7.7
+    ecore-imf-evas >= 1.7.7
    " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15265,14 +15220,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
-    ecore-imf >= 1.7.5
-    ecore-imf-evas >= 1.7.5
+	        ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
+    ecore-imf >= 1.7.7
+    ecore-imf-evas >= 1.7.7
    " 2>&1`
         else
-	        ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
-    ecore-imf >= 1.7.5
-    ecore-imf-evas >= 1.7.5
+	        ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --print-errors "
+    ecore-imf >= 1.7.7
+    ecore-imf-evas >= 1.7.7
    " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -15293,7 +15248,7 @@ $as_echo "yes" >&6; }
 $as_echo "#define HAVE_ECORE_IMF 1" >>confdefs.h
 
     have_ecore_imf="yes"
-    requirement_edje="ecore-imf-evas >= 1.7.5 ecore-imf >= 1.7.5 ${requirement_edje}"
+    requirement_edje="ecore-imf-evas >= 1.7.7 ecore-imf >= 1.7.7 ${requirement_edje}"
 
 fi
 
@@ -15306,13 +15261,12 @@ if test -n "$EIO_CFLAGS"; then
     pkg_cv_EIO_CFLAGS="$EIO_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eio >= 1.7.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "eio >= 1.7.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eio >= 1.7.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "eio >= 1.7.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EIO_CFLAGS=`$PKG_CONFIG --cflags "eio >= 1.7.5" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+  pkg_cv_EIO_CFLAGS=`$PKG_CONFIG --cflags "eio >= 1.7.7" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -15323,13 +15277,12 @@ if test -n "$EIO_LIBS"; then
     pkg_cv_EIO_LIBS="$EIO_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eio >= 1.7.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "eio >= 1.7.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eio >= 1.7.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "eio >= 1.7.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EIO_LIBS=`$PKG_CONFIG --libs "eio >= 1.7.5" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+  pkg_cv_EIO_LIBS=`$PKG_CONFIG --libs "eio >= 1.7.7" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -15349,9 +15302,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        EIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eio >= 1.7.5" 2>&1`
+	        EIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eio >= 1.7.7" 2>&1`
         else
-	        EIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eio >= 1.7.5" 2>&1`
+	        EIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "eio >= 1.7.7" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EIO_PKG_ERRORS" >&5
@@ -15371,7 +15324,7 @@ $as_echo "yes" >&6; }
 $as_echo "#define HAVE_EIO 1" >>confdefs.h
 
     have_eio="yes"
-    requirement_edje="eio >= 1.7.5 ${requirement_edje}"
+    requirement_edje="eio >= 1.7.7 ${requirement_edje}"
 
 fi
 
@@ -15412,7 +15365,6 @@ if test -n "$SNDFILE_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SNDFILE_CFLAGS=`$PKG_CONFIG --cflags "sndfile >= 1.0.21" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15429,7 +15381,6 @@ if test -n "$SNDFILE_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SNDFILE_LIBS=`$PKG_CONFIG --libs "sndfile >= 1.0.21" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15449,9 +15400,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SNDFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sndfile >= 1.0.21" 2>&1`
+	        SNDFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sndfile >= 1.0.21" 2>&1`
         else
-	        SNDFILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sndfile >= 1.0.21" 2>&1`
+	        SNDFILE_PKG_ERRORS=`$PKG_CONFIG --print-errors "sndfile >= 1.0.21" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SNDFILE_PKG_ERRORS" >&5
@@ -15515,7 +15466,6 @@ if test -n "$REMIX_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_REMIX_CFLAGS=`$PKG_CONFIG --cflags "remix >= 0.2.4" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15532,7 +15482,6 @@ if test -n "$REMIX_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_REMIX_LIBS=`$PKG_CONFIG --libs "remix >= 0.2.4" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15552,9 +15501,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        REMIX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "remix >= 0.2.4" 2>&1`
+	        REMIX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "remix >= 0.2.4" 2>&1`
         else
-	        REMIX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "remix >= 0.2.4" 2>&1`
+	        REMIX_PKG_ERRORS=`$PKG_CONFIG --print-errors "remix >= 0.2.4" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$REMIX_PKG_ERRORS" >&5
@@ -15640,7 +15589,6 @@ if test -n "$VORBISENC_CFLAGS"; then
        vorbis >= 1.2.3
        vorbisenc >= 1.2.3
       " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15669,7 +15617,6 @@ if test -n "$VORBISENC_LIBS"; then
        vorbis >= 1.2.3
        vorbisenc >= 1.2.3
       " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15689,13 +15636,13 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        VORBISENC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
+	        VORBISENC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
        ogg >= 1.1.4
        vorbis >= 1.2.3
        vorbisenc >= 1.2.3
       " 2>&1`
         else
-	        VORBISENC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
+	        VORBISENC_PKG_ERRORS=`$PKG_CONFIG --print-errors "
        ogg >= 1.1.4
        vorbis >= 1.2.3
        vorbisenc >= 1.2.3
@@ -15761,7 +15708,6 @@ if test -n "$ALSA_CFLAGS"; then
   pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "
        alsa >= 1.0.21
       " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15784,7 +15730,6 @@ if test -n "$ALSA_LIBS"; then
   pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "
        alsa >= 1.0.21
       " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15804,11 +15749,11 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
+	        ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
        alsa >= 1.0.21
       " 2>&1`
         else
-	        ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
+	        ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "
        alsa >= 1.0.21
       " 2>&1`
         fi
@@ -15881,7 +15826,6 @@ if test -n "$FLAC_CFLAGS"; then
   pkg_cv_FLAC_CFLAGS=`$PKG_CONFIG --cflags "
        flac >= 1.2.1
       " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15904,7 +15848,6 @@ if test -n "$FLAC_LIBS"; then
   pkg_cv_FLAC_LIBS=`$PKG_CONFIG --libs "
        flac >= 1.2.1
       " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15924,11 +15867,11 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        FLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
+	        FLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
        flac >= 1.2.1
       " 2>&1`
         else
-	        FLAC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
+	        FLAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "
        flac >= 1.2.1
       " 2>&1`
         fi
@@ -15983,13 +15926,12 @@ if test -n "$EDJE_CC_CFLAGS"; then
     pkg_cv_EDJE_CC_CFLAGS="$EDJE_CC_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.6.0 eina >= 1.7.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.6.0 eina >= 1.7.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.6.0 eina >= 1.7.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.6.0 eina >= 1.7.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EDJE_CC_CFLAGS=`$PKG_CONFIG --cflags "ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.6.0 eina >= 1.7.5" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+  pkg_cv_EDJE_CC_CFLAGS=`$PKG_CONFIG --cflags "ecore-file >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.6.0 eina >= 1.7.7" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -16000,13 +15942,12 @@ if test -n "$EDJE_CC_LIBS"; then
     pkg_cv_EDJE_CC_LIBS="$EDJE_CC_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.6.0 eina >= 1.7.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.6.0 eina >= 1.7.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.6.0 eina >= 1.7.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.6.0 eina >= 1.7.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EDJE_CC_LIBS=`$PKG_CONFIG --libs "ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.6.0 eina >= 1.7.5" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+  pkg_cv_EDJE_CC_LIBS=`$PKG_CONFIG --libs "ecore-file >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.6.0 eina >= 1.7.7" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -16026,14 +15967,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        EDJE_CC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.6.0 eina >= 1.7.5" 2>&1`
+	        EDJE_CC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-file >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.6.0 eina >= 1.7.7" 2>&1`
         else
-	        EDJE_CC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.6.0 eina >= 1.7.5" 2>&1`
+	        EDJE_CC_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-file >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.6.0 eina >= 1.7.7" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EDJE_CC_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.6.0 eina >= 1.7.5) were not met:
+	as_fn_error $? "Package requirements (ecore-file >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.6.0 eina >= 1.7.7) were not met:
 
 $EDJE_CC_PKG_ERRORS
 
@@ -16043,6 +15984,7 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables EDJE_CC_CFLAGS
 and EDJE_CC_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
+
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -16058,6 +16000,7 @@ See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
+
 else
 	EDJE_CC_CFLAGS=$pkg_cv_EDJE_CC_CFLAGS
 	EDJE_CC_LIBS=$pkg_cv_EDJE_CC_LIBS
@@ -16087,13 +16030,12 @@ if test -n "$EDJE_DECC_CFLAGS"; then
     pkg_cv_EDJE_DECC_CFLAGS="$EDJE_DECC_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.7.5 eina >= 1.7.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.7.5 eina >= 1.7.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.7.7 eina >= 1.7.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.7.7 eina >= 1.7.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EDJE_DECC_CFLAGS=`$PKG_CONFIG --cflags "ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.7.5 eina >= 1.7.5" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+  pkg_cv_EDJE_DECC_CFLAGS=`$PKG_CONFIG --cflags "ecore-file >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.7.7 eina >= 1.7.7" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -16104,13 +16046,12 @@ if test -n "$EDJE_DECC_LIBS"; then
     pkg_cv_EDJE_DECC_LIBS="$EDJE_DECC_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.7.5 eina >= 1.7.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.7.5 eina >= 1.7.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.7.7 eina >= 1.7.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.7.7 eina >= 1.7.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EDJE_DECC_LIBS=`$PKG_CONFIG --libs "ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.7.5 eina >= 1.7.5" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+  pkg_cv_EDJE_DECC_LIBS=`$PKG_CONFIG --libs "ecore-file >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.7.7 eina >= 1.7.7" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -16130,14 +16071,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        EDJE_DECC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.7.5 eina >= 1.7.5" 2>&1`
+	        EDJE_DECC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-file >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.7.7 eina >= 1.7.7" 2>&1`
         else
-	        EDJE_DECC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.7.5 eina >= 1.7.5" 2>&1`
+	        EDJE_DECC_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-file >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.7.7 eina >= 1.7.7" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EDJE_DECC_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.7.5 eina >= 1.7.5) were not met:
+	as_fn_error $? "Package requirements (ecore-file >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.7.7 eina >= 1.7.7) were not met:
 
 $EDJE_DECC_PKG_ERRORS
 
@@ -16147,6 +16088,7 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables EDJE_DECC_CFLAGS
 and EDJE_DECC_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
+
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -16162,6 +16104,7 @@ See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
+
 else
 	EDJE_DECC_CFLAGS=$pkg_cv_EDJE_DECC_CFLAGS
 	EDJE_DECC_LIBS=$pkg_cv_EDJE_DECC_LIBS
@@ -16181,13 +16124,12 @@ if test -n "$EDJE_PLAYER_CFLAGS"; then
     pkg_cv_EDJE_PLAYER_CFLAGS="$EDJE_PLAYER_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EDJE_PLAYER_CFLAGS=`$PKG_CONFIG --cflags "ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+  pkg_cv_EDJE_PLAYER_CFLAGS=`$PKG_CONFIG --cflags "ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -16198,13 +16140,12 @@ if test -n "$EDJE_PLAYER_LIBS"; then
     pkg_cv_EDJE_PLAYER_LIBS="$EDJE_PLAYER_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EDJE_PLAYER_LIBS=`$PKG_CONFIG --libs "ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+  pkg_cv_EDJE_PLAYER_LIBS=`$PKG_CONFIG --libs "ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -16224,14 +16165,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        EDJE_PLAYER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5" 2>&1`
+	        EDJE_PLAYER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7" 2>&1`
         else
-	        EDJE_PLAYER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5" 2>&1`
+	        EDJE_PLAYER_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EDJE_PLAYER_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5) were not met:
+	as_fn_error $? "Package requirements (ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7) were not met:
 
 $EDJE_PLAYER_PKG_ERRORS
 
@@ -16241,6 +16182,7 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables EDJE_PLAYER_CFLAGS
 and EDJE_PLAYER_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
+
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -16256,6 +16198,7 @@ See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
+
 else
 	EDJE_PLAYER_CFLAGS=$pkg_cv_EDJE_PLAYER_CFLAGS
 	EDJE_PLAYER_LIBS=$pkg_cv_EDJE_PLAYER_LIBS
@@ -16275,13 +16218,12 @@ if test -n "$EDJE_INSPECTOR_CFLAGS"; then
     pkg_cv_EDJE_INSPECTOR_CFLAGS="$EDJE_INSPECTOR_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EDJE_INSPECTOR_CFLAGS=`$PKG_CONFIG --cflags "ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+  pkg_cv_EDJE_INSPECTOR_CFLAGS=`$PKG_CONFIG --cflags "ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -16292,13 +16234,12 @@ if test -n "$EDJE_INSPECTOR_LIBS"; then
     pkg_cv_EDJE_INSPECTOR_LIBS="$EDJE_INSPECTOR_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EDJE_INSPECTOR_LIBS=`$PKG_CONFIG --libs "ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+  pkg_cv_EDJE_INSPECTOR_LIBS=`$PKG_CONFIG --libs "ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -16318,14 +16259,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        EDJE_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5" 2>&1`
+	        EDJE_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7" 2>&1`
         else
-	        EDJE_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5" 2>&1`
+	        EDJE_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EDJE_INSPECTOR_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5) were not met:
+	as_fn_error $? "Package requirements (ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7) were not met:
 
 $EDJE_INSPECTOR_PKG_ERRORS
 
@@ -16335,6 +16276,7 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables EDJE_INSPECTOR_CFLAGS
 and EDJE_INSPECTOR_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
+
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -16350,6 +16292,7 @@ See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
+
 else
 	EDJE_INSPECTOR_CFLAGS=$pkg_cv_EDJE_INSPECTOR_CFLAGS
 	EDJE_INSPECTOR_LIBS=$pkg_cv_EDJE_INSPECTOR_LIBS
@@ -16369,13 +16312,12 @@ if test -n "$EDJE_EXTERNAL_INSPECTOR_CFLAGS"; then
     pkg_cv_EDJE_EXTERNAL_INSPECTOR_CFLAGS="$EDJE_EXTERNAL_INSPECTOR_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EDJE_EXTERNAL_INSPECTOR_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+  pkg_cv_EDJE_EXTERNAL_INSPECTOR_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -16386,13 +16328,12 @@ if test -n "$EDJE_EXTERNAL_INSPECTOR_LIBS"; then
     pkg_cv_EDJE_EXTERNAL_INSPECTOR_LIBS="$EDJE_EXTERNAL_INSPECTOR_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EDJE_EXTERNAL_INSPECTOR_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+  pkg_cv_EDJE_EXTERNAL_INSPECTOR_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -16412,14 +16353,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5" 2>&1`
+	        EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7" 2>&1`
         else
-	        EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5" 2>&1`
+	        EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5) were not met:
+	as_fn_error $? "Package requirements (ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7) were not met:
 
 $EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS
 
@@ -16429,6 +16370,7 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables EDJE_EXTERNAL_INSPECTOR_CFLAGS
 and EDJE_EXTERNAL_INSPECTOR_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
+
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -16444,6 +16386,7 @@ See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
+
 else
 	EDJE_EXTERNAL_INSPECTOR_CFLAGS=$pkg_cv_EDJE_EXTERNAL_INSPECTOR_CFLAGS
 	EDJE_EXTERNAL_INSPECTOR_LIBS=$pkg_cv_EDJE_EXTERNAL_INSPECTOR_LIBS
@@ -16463,13 +16406,12 @@ if test -n "$EDJE_WATCH_CFLAGS"; then
     pkg_cv_EDJE_WATCH_CFLAGS="$EDJE_WATCH_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 eina >= 1.7.5 eio >= 1.7.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 eina >= 1.7.5 eio >= 1.7.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 eina >= 1.7.7 eio >= 1.7.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 eina >= 1.7.7 eio >= 1.7.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EDJE_WATCH_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.5 eina >= 1.7.5 eio >= 1.7.5" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+  pkg_cv_EDJE_WATCH_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.7 eina >= 1.7.7 eio >= 1.7.7" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -16480,13 +16422,12 @@ if test -n "$EDJE_WATCH_LIBS"; then
     pkg_cv_EDJE_WATCH_LIBS="$EDJE_WATCH_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 eina >= 1.7.5 eio >= 1.7.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 eina >= 1.7.5 eio >= 1.7.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 eina >= 1.7.7 eio >= 1.7.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 eina >= 1.7.7 eio >= 1.7.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EDJE_WATCH_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.5 eina >= 1.7.5 eio >= 1.7.5" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+  pkg_cv_EDJE_WATCH_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.7 eina >= 1.7.7 eio >= 1.7.7" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -16506,9 +16447,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        EDJE_WATCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore >= 1.7.5 eina >= 1.7.5 eio >= 1.7.5" 2>&1`
+	        EDJE_WATCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore >= 1.7.7 eina >= 1.7.7 eio >= 1.7.7" 2>&1`
         else
-	        EDJE_WATCH_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore >= 1.7.5 eina >= 1.7.5 eio >= 1.7.5" 2>&1`
+	        EDJE_WATCH_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore >= 1.7.7 eina >= 1.7.7 eio >= 1.7.7" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EDJE_WATCH_PKG_ERRORS" >&5
@@ -17618,7 +17559,6 @@ if test -n "$CHECK_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "check >= 0.9.5" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -17635,7 +17575,6 @@ if test -n "$CHECK_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "check >= 0.9.5" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -17655,9 +17594,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "check >= 0.9.5" 2>&1`
+	        CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "check >= 0.9.5" 2>&1`
         else
-	        CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "check >= 0.9.5" 2>&1`
+	        CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors "check >= 0.9.5" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$CHECK_PKG_ERRORS" >&5
@@ -18453,7 +18392,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by edje $as_me 1.7.5, which was
+This file was extended by edje $as_me 1.7.7, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18519,7 +18458,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-edje config.status 1.7.5
+edje config.status 1.7.7
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index c4c7bb3..c354b0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,9 +2,8 @@
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_define([v_maj], [1])
 m4_define([v_min], [7])
-m4_define([v_mic], [5])
-m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
-m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
+m4_define([v_mic], [7])
+m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl
 ##--   When released, remove the dnl on the below line
 m4_undefine([v_rev])
 ##--   When doing snapshots - change soname. remove dnl on below line
@@ -221,7 +220,7 @@ AC_SUBST(pkgconfig_requires_private)
 EFL_EDJE_BUILD=""
 case "$host_os" in
    mingw*)
-      PKG_CHECK_MODULES([EVIL], [evil >= 1.7.5])
+      PKG_CHECK_MODULES([EVIL], [evil >= 1.7.7])
       AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil library is installed])
       requirement_edje="evil ${requirement_edje}"
       EFL_EDJE_BUILD="-DEFL_EDJE_BUILD"
@@ -259,47 +258,47 @@ fi
 
 PKG_CHECK_MODULES([MINIMAL],
    [
-    eina >= 1.7.5
-    eet >= 1.7.5
+    eina >= 1.7.7
+    eet >= 1.7.7
    ])
 
 PKG_CHECK_MODULES([EDJE],
    [
-    eina >= 1.7.5
-    eet >= 1.7.5
-    evas >= 1.7.5
-    ecore >= 1.7.5
-    ecore-evas >= 1.7.5
-    ecore-file >= 1.7.5
-    ecore-input >= 1.7.5
-    embryo >= 1.7.5
+    eina >= 1.7.7
+    eet >= 1.7.7
+    evas >= 1.7.7
+    ecore >= 1.7.7
+    ecore-evas >= 1.7.7
+    ecore-file >= 1.7.7
+    ecore-input >= 1.7.7
+    embryo >= 1.7.7
    ])
 
 EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}"
 EDJE_CFLAGS="${EDJE_CFLAGS} ${LUA_CFLAGS}"
 
-requirement_edje="embryo >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.7.5 eina >= 1.7.5 ${requirement_edje}"
+requirement_edje="embryo >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.7.7 eina >= 1.7.7 ${requirement_edje}"
 requirement_edje="${requirement_lua} ${requirement_edje}"
 
 have_ecore_imf="no"
 PKG_CHECK_MODULES([ECORE_IMF],
    [
-    ecore-imf >= 1.7.5
-    ecore-imf-evas >= 1.7.5
+    ecore-imf >= 1.7.7
+    ecore-imf-evas >= 1.7.7
    ],
    [
     AC_DEFINE([HAVE_ECORE_IMF], [1], [Input Method Support for Edje Entry])
     have_ecore_imf="yes"
-    requirement_edje="ecore-imf-evas >= 1.7.5 ecore-imf >= 1.7.5 ${requirement_edje}"
+    requirement_edje="ecore-imf-evas >= 1.7.7 ecore-imf >= 1.7.7 ${requirement_edje}"
    ],
    [have_ecore_imf="no"])
 
 PKG_CHECK_MODULES([EIO],
-   [eio >= 1.7.5],
+   [eio >= 1.7.7],
    [
     AC_DEFINE([HAVE_EIO], [1], [Eio is available for monitoring file assynchronously])
     have_eio="yes"
-    requirement_edje="eio >= 1.7.5 ${requirement_edje}"
+    requirement_edje="eio >= 1.7.7 ${requirement_edje}"
    ],
    [have_eio="no"])
 
@@ -458,7 +457,7 @@ AC_SUBST([want_multisense])
 
 if test "x${have_edje_cc}" = "xyes" ; then
    PKG_CHECK_MODULES([EDJE_CC],
-      [ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.6.0 eina >= 1.7.5])
+      [ecore-file >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.6.0 eina >= 1.7.7])
    EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}"
 fi
 
@@ -466,27 +465,27 @@ AM_CONDITIONAL([BUILD_EPP], [test "x${have_edje_cc}" = "xyes"])
 
 if test "x${have_edje_decc}" = "xyes" ; then
    PKG_CHECK_MODULES([EDJE_DECC],
-      [ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.7.5 eina >= 1.7.5])
+      [ecore-file >= 1.7.7 ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eet >= 1.7.7 eina >= 1.7.7])
 fi
 
 if test "x${have_edje_player}" = "xyes" ; then
    PKG_CHECK_MODULES([EDJE_PLAYER],
-      [ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5])
+      [ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7])
 fi
 
 if test "x${have_edje_inspector}" = "xyes" ; then
    PKG_CHECK_MODULES([EDJE_INSPECTOR],
-      [ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5])
+      [ecore-evas >= 1.7.7 ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7])
 fi
 
 if test "x${have_edje_external_inspector}" = "xyes" ; then
    PKG_CHECK_MODULES([EDJE_EXTERNAL_INSPECTOR],
-      [ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5])
+      [ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7])
 fi
 
 if test "x${have_edje_watch}" = "xyes" ; then
    PKG_CHECK_MODULES([EDJE_WATCH],
-      [ecore >= 1.7.5 eina >= 1.7.5 eio >= 1.7.5],
+      [ecore >= 1.7.7 eina >= 1.7.7 eio >= 1.7.7],
       [have_edje_watch="yes"],
       [have_edje_watch="no"])
 fi
diff --git a/data/Makefile.in b/data/Makefile.in
index c63f958..9bd00d3 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -66,6 +83,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -364,8 +386,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-mimeDATA: $(mime_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(mimedir)" || $(MKDIR_P) "$(DESTDIR)$(mimedir)"
 	@list='$(mime_DATA)'; test -n "$(mimedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(mimedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(mimedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -548,13 +573,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff --git a/data/include/Makefile.in b/data/include/Makefile.in
index a6abc66..eeee408 100644
--- a/data/include/Makefile.in
+++ b/data/include/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -59,6 +76,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -324,8 +346,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-incDATA: $(inc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(incdir)" || $(MKDIR_P) "$(DESTDIR)$(incdir)"
 	@list='$(inc_DATA)'; test -n "$(incdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(incdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(incdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff --git a/depcomp b/depcomp
index bd0ac08..25a39e6 100755
--- a/depcomp
+++ b/depcomp
@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2011-12-04.11; # UTC
+scriptversion=2012-03-27.16; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# 2011, 2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@ scriptversion=2011-12-04.11; # UTC
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
@@ -40,8 +40,8 @@ as side-effects.
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
   tmpdepfile  Temporary file to use when outputting dependencies.
@@ -57,6 +57,12 @@ EOF
     ;;
 esac
 
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -102,6 +108,12 @@ if test "$depmode" = msvc7msys; then
    depmode=msvc7
 fi
 
+if test "$depmode" = xlc; then
+   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+   gccflag=-qmakedep=gcc,-MF
+   depmode=gcc
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -156,15 +168,14 @@ gcc)
 ## The second -e expression handles DOS-style file names with drive letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
+  tr ' ' "$nl" < "$tmpdepfile" |
+## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
 ## well.  hp depmode also adds that space, but also prefixes the VPATH
 ## to the object.  Take care to not repeat it in the output.
@@ -203,18 +214,15 @@ sgi)
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
+    tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
 
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
    >> "$depfile"
   else
@@ -226,10 +234,17 @@ sgi)
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
@@ -259,12 +274,11 @@ aix)
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
+    # Each line is of the form 'foo.o: dependent.h'.
     # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
+    # '$object: dependent.h' and one to simply 'dependent.h:'.
     sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -275,23 +289,26 @@ aix)
   ;;
 
 icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
+  # However on
+  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
   # ICC 7.0 will fill foo.d with something like
   #    foo.o: sub/foo.c
   #    foo.o: sub/foo.h
-  # which is wrong.  We want:
+  # which is wrong.  We want
   #    sub/foo.o: sub/foo.c
   #    sub/foo.o: sub/foo.h
   #    sub/foo.c:
   #    sub/foo.h:
   # ICC 7.1 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
+  # and will wrap long lines using '\':
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-
+  # tcc 0.9.26 (FIXME still under development at the moment of writing)
+  # will emit a similar output, but also prepend the continuation lines
+  # with horizontal tabulation characters.
   "$@" -MD -MF "$tmpdepfile"
   stat=$?
   if test $stat -eq 0; then :
@@ -300,15 +317,21 @@ icc)
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Each line is of the form 'foo.o: dependent.h',
+  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
   # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
+  # '$object: dependent.h' and one to simply 'dependent.h:'.
+  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
+    < "$tmpdepfile" > "$depfile"
+  sed '
+    s/[ '"$tab"'][ '"$tab"']*/ /g
+    s/^ *//
+    s/ *\\*$//
+    s/^[^:]*: *//
+    /^$/d
+    /:$/d
+    s/$/ :/
+  ' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -344,7 +367,7 @@ hp2)
   done
   if test -f "$tmpdepfile"; then
     sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
+    # Add 'dependent.h:' lines.
     sed -ne '2,${
 	       s/^ *//
 	       s/ \\*$//
@@ -359,9 +382,9 @@ hp2)
 
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
    # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
+   # dependencies in 'foo.d' instead, so we check for that too.
    # Subdirectories are respected.
    dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
    test "x$dir" = "x$object" && dir=
@@ -407,8 +430,7 @@ tru64)
    done
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
    else
       echo "#dummy" > "$depfile"
    fi
@@ -443,11 +465,11 @@ msvc7)
   p
 }' | $cygpath_u | sort -u | sed -n '
 s/ /\\ /g
-s/\(.*\)/	\1 \\/p
+s/\(.*\)/'"$tab"'\1 \\/p
 s/.\(.*\) \\/\1:/
 H
 $ {
-  s/.*/	/
+  s/.*/'"$tab"'/
   G
   p
 }' >> "$depfile"
@@ -478,7 +500,7 @@ dashmstdout)
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -498,15 +520,14 @@ dashmstdout)
   done
 
   test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
+  # Require at least two characters before searching for ':'
   # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
+  tr ' ' "$nl" < "$tmpdepfile" | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -562,8 +583,7 @@ makedepend)
   # makedepend may prepend the VPATH from the source file name to the object.
   # No need to regex-escape $object, excess matching of '.' is harmless.
   sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
+  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -583,7 +603,7 @@ cpp)
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -652,8 +672,8 @@ msvisualcpp)
   sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
   sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
diff --git a/doc/Makefile.in b/doc/Makefile.in
index b1fd361..5b002f4 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -59,6 +76,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
diff --git a/edje.spec b/edje.spec
index 548ecb0..6dcdeda 100644
--- a/edje.spec
+++ b/edje.spec
@@ -4,7 +4,7 @@
 
 Summary: Complex Graphical Design/Layout Engine
 Name: edje
-Version: 1.7.5
+Version: 1.7.7
 Release: %{_rel}
 License: BSD
 Group: System Environment/Libraries
diff --git a/ltmain.sh b/ltmain.sh
index c2852d8..63ae69d 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -70,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
+#         $progname:	(GNU libtool) 2.4.2
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -80,7 +80,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
+VERSION=2.4.2
 TIMESTAMP=""
 package_revision=1.3337
 
@@ -6124,10 +6124,7 @@ func_mode_link ()
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link)
-	  libs="$deplibs %DEPLIBS%"
-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-	  ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
 	esac
       fi
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -6447,19 +6444,19 @@ func_mode_link ()
 	    # It is a libtool convenience library, so add in its objects.
 	    func_append convenience " $ladir/$objdir/$old_library"
 	    func_append old_convenience " $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-	      if $opt_preserve_dup_deps ; then
-		case "$tmp_libs " in
-		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
-		esac
-	      fi
-	      func_append tmp_libs " $deplib"
-	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    func_fatal_error "\`$lib' is not a convenience library"
 	  fi
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    deplibs="$deplib $deplibs"
+	    if $opt_preserve_dup_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done
 	  continue
 	fi # $pass = conv
 
@@ -7352,9 +7349,6 @@ func_mode_link ()
 	    revision="$number_minor"
 	    lt_irix_increment=no
 	    ;;
-	  *)
-	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-	    ;;
 	  esac
 	  ;;
 	no)
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 828104c..56666f0 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -2669,10 +2669,14 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2684,18 +2688,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -3301,7 +3293,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd* | netbsdelf*-gnu)
+netbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -4113,7 +4105,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      netbsd* | netbsdelf*-gnu)
+      netbsd*)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4590,9 +4582,6 @@ m4_if([$1], [CXX], [
       ;;
     esac
     ;;
-  linux* | k*bsd*-gnu | gnu*)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
     ;;
@@ -4655,9 +4644,6 @@ dnl Note also adjust exclude_expsyms for C++ above.
   openbsd*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu | gnu*)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4879,7 +4865,7 @@ _LT_EOF
       fi
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -5056,7 +5042,6 @@ _LT_EOF
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -5361,7 +5346,7 @@ _LT_EOF
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
diff --git a/src/Makefile.in b/src/Makefile.in
index 035fbff..ff9e642 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -65,6 +82,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -497,13 +519,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in
index 07e1db6..e09ea2c 100644
--- a/src/bin/Makefile.in
+++ b/src/bin/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17,6 +17,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -178,6 +195,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -513,8 +535,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p || test -f $$p1; \
@@ -574,8 +599,11 @@ edje_watch$(EXEEXT): $(edje_watch_OBJECTS) $(edje_watch_DEPENDENCIES) $(EXTRA_ed
 	$(AM_V_CCLD)$(edje_watch_LINK) $(edje_watch_OBJECTS) $(edje_watch_LDADD) $(LIBS)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -1016,13 +1044,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff --git a/src/bin/epp/Makefile.in b/src/bin/epp/Makefile.in
index e9e2eaa..f98a36d 100644
--- a/src/bin/epp/Makefile.in
+++ b/src/bin/epp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35,6 +35,23 @@
 #the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -109,6 +126,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(epp_SOURCES)
 DIST_SOURCES = $(epp_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -372,8 +394,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-eppPROGRAMS: $(epp_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(eppdir)" || $(MKDIR_P) "$(DESTDIR)$(eppdir)"
 	@list='$(epp_PROGRAMS)'; test -n "$(eppdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(eppdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(eppdir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p || test -f $$p1; \
diff --git a/src/examples/Makefile.in b/src/examples/Makefile.in
index 83e4264..4b052ed 100644
--- a/src/examples/Makefile.in
+++ b/src/examples/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17,6 +17,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -192,6 +209,11 @@ DIST_SOURCES = animations2.c edje-animations.c edje-basic.c \
 	edje-drag.c edje-multisense.c edje-perspective.c \
 	edje-signals-messages.c edje-swallow.c edje-swallow2.c \
 	edje-table.c edje-text.c signals2.c sigtest.c
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -511,8 +533,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-examplesPROGRAMS: $(examples_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)"
 	@list='$(examples_PROGRAMS)'; test -n "$(examplesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(examplesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(examplesdir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p || test -f $$p1; \
@@ -656,8 +681,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-filesDATA: $(files_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(filesdir)" || $(MKDIR_P) "$(DESTDIR)$(filesdir)"
 	@list='$(files_DATA)'; test -n "$(filesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(filesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(filesdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index fece8df..374ad52 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17,6 +17,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -138,6 +155,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libedje_la_SOURCES) $(nodist_libedje_la_SOURCES)
 DIST_SOURCES = $(am__libedje_la_SOURCES_DIST)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(includes_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -421,7 +443,6 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -429,6 +450,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -516,8 +539,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-includesHEADERS: $(includes_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
 	@list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff --git a/src/lib/edje_cache.c b/src/lib/edje_cache.c
index 303de70..0e202bd 100644
--- a/src/lib/edje_cache.c
+++ b/src/lib/edje_cache.c
@@ -275,12 +275,15 @@ _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, E
    struct stat st;
 
    if (stat(file, &st) != 0)
-      return NULL;
+     {
+        *error_ret = EDJE_LOAD_ERROR_DOES_NOT_EXIST;
+        return NULL;
+     }
 
    if (!_edje_file_hash)
      {
 	_edje_file_hash = eina_hash_string_small_new(NULL);
-	goto open_new;
+	goto find_list;
      }
 
    edf = eina_hash_find(_edje_file_hash, file);
@@ -295,7 +298,8 @@ _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, E
 	edf->references++;
 	goto open;
      }
-
+   
+find_list:
    EINA_LIST_FOREACH(_edje_file_cache, l, edf)
      {
 	if (!strcmp(edf->path, file))
diff --git a/src/lib/edje_calc.c b/src/lib/edje_calc.c
index f00db4e..db9ab1d 100644
--- a/src/lib/edje_calc.c
+++ b/src/lib/edje_calc.c
@@ -1,15 +1,15 @@
 #include "edje_private.h"
 
-static void _edje_part_make_rtl(Edje_Part_Description_Common *desc);
+static void                          _edje_part_make_rtl(Edje_Part_Description_Common *desc);
 static Edje_Part_Description_Common *_edje_get_description_by_orientation(Edje *ed, Edje_Part_Description_Common *src, Edje_Part_Description_Common **dst, unsigned char type);
 
-static void _edje_part_recalc_single(Edje *ed, Edje_Real_Part *ep,
-                                     Edje_Part_Description_Common *desc, Edje_Part_Description_Common *chosen_desc,
-                                     Edje_Real_Part *center, Edje_Real_Part *light, Edje_Real_Part *persp,
-                                     Edje_Real_Part *rel1_to_x, Edje_Real_Part *rel1_to_y,
-                                     Edje_Real_Part *rel2_to_x, Edje_Real_Part *rel2_to_y,
-                                     Edje_Real_Part *confine_to, Edje_Calc_Params *params,
-                                     FLOAT_T pos);
+static void                          _edje_part_recalc_single(Edje *ed, Edje_Real_Part *ep,
+                                                              Edje_Part_Description_Common *desc, Edje_Part_Description_Common *chosen_desc,
+                                                              Edje_Real_Part *center, Edje_Real_Part *light, Edje_Real_Part *persp,
+                                                              Edje_Real_Part *rel1_to_x, Edje_Real_Part *rel1_to_y,
+                                                              Edje_Real_Part *rel2_to_x, Edje_Real_Part *rel2_to_y,
+                                                              Edje_Real_Part *confine_to, Edje_Calc_Params *params,
+                                                              FLOAT_T pos);
 
 void
 _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, FLOAT_T pos, FLOAT_T v1, FLOAT_T v2)
@@ -23,33 +23,37 @@ _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, FLOAT_T pos, FLOAT_T
 
    npos = ZERO;
 #if 0 // old code - easy to enable for comparing float vs fixed point
-   /* take linear pos along timescale and use interpolation method */
+      /* take linear pos along timescale and use interpolation method */
    switch (mode)
      {
       case EDJE_TWEEN_MODE_SINUSOIDAL:
-	 /* npos = (1.0 - cos(pos * PI)) / 2.0; */
-	 npos = DIV2(SUB(FROM_INT(1),
-			 COS(MUL(fp_pos,
-				 PI))));
-	 break;
+        /* npos = (1.0 - cos(pos * PI)) / 2.0; */
+        npos = DIV2(SUB(FROM_INT(1),
+                        COS(MUL(fp_pos,
+                                PI))));
+        break;
+
       case EDJE_TWEEN_MODE_ACCELERATE:
-	 /* npos = 1.0 - sin((PI / 2.0) + (pos * PI / 2.0)); */
-	 npos = SUB(FROM_INT(1),
-		    SIN(ADD(DIV2(PI),
-			    MUL(fp_pos,
-				DIV2(PI)))));
-	 break;
+        /* npos = 1.0 - sin((PI / 2.0) + (pos * PI / 2.0)); */
+        npos = SUB(FROM_INT(1),
+                   SIN(ADD(DIV2(PI),
+                           MUL(fp_pos,
+                               DIV2(PI)))));
+        break;
+
       case EDJE_TWEEN_MODE_DECELERATE:
-	 /* npos = sin(pos * PI / 2.0); */
-	 npos = SIN(MUL(fp_pos,
-			DIV2(PI)));
-	break;
+        /* npos = sin(pos * PI / 2.0); */
+        npos = SIN(MUL(fp_pos,
+                       DIV2(PI)));
+        break;
+
       case EDJE_TWEEN_MODE_LINEAR:
-	 npos = fp_pos;
-	 break;
+        npos = fp_pos;
+        break;
+
       default:
-         npos = fp_pos;
-         break;
+        npos = fp_pos;
+        break;
      }
 #else
    switch (mode & EDJE_TWEEN_MODE_MASK)
@@ -59,53 +63,63 @@ _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, FLOAT_T pos, FLOAT_T
                                                   ECORE_POS_MAP_SINUSOIDAL,
                                                   0.0, 0.0));
         break;
+
       case EDJE_TWEEN_MODE_ACCELERATE:
         npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos),
                                                   ECORE_POS_MAP_ACCELERATE,
                                                   0.0, 0.0));
         break;
+
       case EDJE_TWEEN_MODE_DECELERATE:
         npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos),
                                                   ECORE_POS_MAP_DECELERATE,
                                                   0.0, 0.0));
         break;
+
       case EDJE_TWEEN_MODE_LINEAR:
         npos = fp_pos;
 /*        npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos),
-                                                  ECORE_POS_MAP_LINEAR, 
+                                                  ECORE_POS_MAP_LINEAR,
                                                   0.0, 0.0));
  */
         break;
+
       case EDJE_TWEEN_MODE_ACCELERATE_FACTOR:
         npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos),
                                                   ECORE_POS_MAP_ACCELERATE_FACTOR,
                                                   TO_DOUBLE(v1), 0.0));
         break;
+
       case EDJE_TWEEN_MODE_DECELERATE_FACTOR:
         npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos),
                                                   ECORE_POS_MAP_DECELERATE_FACTOR,
                                                   TO_DOUBLE(v1), 0.0));
         break;
+
       case EDJE_TWEEN_MODE_SINUSOIDAL_FACTOR:
         npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos),
                                                   ECORE_POS_MAP_SINUSOIDAL_FACTOR,
                                                   TO_DOUBLE(v1), 0.0));
         break;
+
       case EDJE_TWEEN_MODE_DIVISOR_INTERP:
         npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos),
                                                   ECORE_POS_MAP_DIVISOR_INTERP,
                                                   TO_DOUBLE(v1), TO_DOUBLE(v2)));
         break;
+
       case EDJE_TWEEN_MODE_BOUNCE:
         npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos),
                                                   ECORE_POS_MAP_BOUNCE,
                                                   TO_DOUBLE(v1), TO_DOUBLE(v2)));
         break;
+
       case EDJE_TWEEN_MODE_SPRING:
         npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos),
                                                   ECORE_POS_MAP_SPRING,
                                                   TO_DOUBLE(v1), TO_DOUBLE(v2)));
         break;
+
       default:
         npos = fp_pos;
         break;
@@ -122,7 +136,6 @@ _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, FLOAT_T pos, FLOAT_T
 #endif
 }
 
-
 /**
  * Returns part description
  *
@@ -139,7 +152,7 @@ _edje_part_make_rtl(Edje_Part_Description_Common *desc)
    double t;
    int i;
 
-   if(!desc)
+   if (!desc)
      return;
 
    /* This makes alignment right-oriented */
@@ -192,63 +205,66 @@ _edje_get_description_by_orientation(Edje *ed, Edje_Part_Description_Common *src
    size_t memsize = 0;
 
    /* RTL flag is not set, return original description */
-   if(!edje_object_mirrored_get(ed->obj))
-      return src;
-
-   if(*dst)
-     return *dst; /* Was allocated before and we should use it */
-
-#define EDIT_ALLOC_POOL_RTL(Short, Type, Name)                          \
-         case EDJE_PART_TYPE_##Short:                                   \
-           {                                                            \
-              Edje_Part_Description_##Type *Name;                       \
-              Name = eina_mempool_malloc(ce->mp_rtl.Short,              \
-                    sizeof (Edje_Part_Description_##Type));             \
-              memset(Name, 0, sizeof(Edje_Part_Description_##Type));    \
-              desc_rtl = &Name->common;                                 \
-              memsize = sizeof(Edje_Part_Description_##Type);           \
-              break;                                                    \
-           }
+   if (!edje_object_mirrored_get(ed->obj))
+     return src;
+
+   if (*dst)
+     return *dst;  /* Was allocated before and we should use it */
+
+#define EDIT_ALLOC_POOL_RTL(Short, Type, Name)                        \
+case EDJE_PART_TYPE_##Short:                                          \
+{                                                                     \
+   Edje_Part_Description_##Type * Name;                               \
+   Name = eina_mempool_malloc(ce->mp_rtl.Short,                       \
+                              sizeof (Edje_Part_Description_##Type)); \
+   memset(Name, 0, sizeof(Edje_Part_Description_##Type));             \
+   desc_rtl = &Name->common;                                          \
+   memsize = sizeof(Edje_Part_Description_##Type);                    \
+   break;                                                             \
+}
 
    ce = eina_hash_find(ed->file->collection, ed->group);
 
    switch (type)
      {
       case EDJE_PART_TYPE_RECTANGLE:
-         desc_rtl = eina_mempool_malloc(ce->mp_rtl.RECTANGLE,
-                                        sizeof (Edje_Part_Description_Common));
-         ce->count.RECTANGLE++;
-         memsize = sizeof(Edje_Part_Description_Common);
-         break;
+        desc_rtl = eina_mempool_malloc(ce->mp_rtl.RECTANGLE,
+                                       sizeof (Edje_Part_Description_Common));
+        ce->count.RECTANGLE++;
+        memsize = sizeof(Edje_Part_Description_Common);
+        break;
+
       case EDJE_PART_TYPE_SWALLOW:
-         desc_rtl = eina_mempool_malloc(ce->mp_rtl.SWALLOW,
-                                        sizeof (Edje_Part_Description_Common));
-         ce->count.SWALLOW++;
-         memsize = sizeof(Edje_Part_Description_Common);
-         break;
+        desc_rtl = eina_mempool_malloc(ce->mp_rtl.SWALLOW,
+                                       sizeof (Edje_Part_Description_Common));
+        ce->count.SWALLOW++;
+        memsize = sizeof(Edje_Part_Description_Common);
+        break;
+
       case EDJE_PART_TYPE_GROUP:
-         desc_rtl = eina_mempool_malloc(ce->mp_rtl.GROUP,
-                                        sizeof (Edje_Part_Description_Common));
-         ce->count.GROUP++;
-         memsize = sizeof(Edje_Part_Description_Common);
-         break;
-     case EDJE_PART_TYPE_SPACER:
-         desc_rtl = eina_mempool_malloc(ce->mp_rtl.SPACER,
-                                        sizeof (Edje_Part_Description_Common));
-         ce->count.SPACER++;
-         memsize = sizeof(Edje_Part_Description_Common);
-         break;
-         EDIT_ALLOC_POOL_RTL(TEXT, Text, text);
-         EDIT_ALLOC_POOL_RTL(TEXTBLOCK, Text, text);
-         EDIT_ALLOC_POOL_RTL(IMAGE, Image, image);
-         EDIT_ALLOC_POOL_RTL(PROXY, Proxy, proxy);
-         EDIT_ALLOC_POOL_RTL(BOX, Box, box);
-         EDIT_ALLOC_POOL_RTL(TABLE, Table, table);
-         EDIT_ALLOC_POOL_RTL(EXTERNAL, External, external_params);
+        desc_rtl = eina_mempool_malloc(ce->mp_rtl.GROUP,
+                                       sizeof (Edje_Part_Description_Common));
+        ce->count.GROUP++;
+        memsize = sizeof(Edje_Part_Description_Common);
+        break;
+
+      case EDJE_PART_TYPE_SPACER:
+        desc_rtl = eina_mempool_malloc(ce->mp_rtl.SPACER,
+                                       sizeof (Edje_Part_Description_Common));
+        ce->count.SPACER++;
+        memsize = sizeof(Edje_Part_Description_Common);
+        break;
+        EDIT_ALLOC_POOL_RTL(TEXT, Text, text);
+        EDIT_ALLOC_POOL_RTL(TEXTBLOCK, Text, text);
+        EDIT_ALLOC_POOL_RTL(IMAGE, Image, image);
+        EDIT_ALLOC_POOL_RTL(PROXY, Proxy, proxy);
+        EDIT_ALLOC_POOL_RTL(BOX, Box, box);
+        EDIT_ALLOC_POOL_RTL(TABLE, Table, table);
+        EDIT_ALLOC_POOL_RTL(EXTERNAL, External, external_params);
      }
 
    if (desc_rtl)
-      memcpy(desc_rtl, src, memsize);
+     memcpy(desc_rtl, src, memsize);
 
    _edje_part_make_rtl(desc_rtl);
 
@@ -268,20 +284,20 @@ _edje_part_description_find(Edje *ed, Edje_Real_Part *rp, const char *name,
    unsigned int i;
 
    /* RTL flag is set, return RTL description */
-   if(edje_object_mirrored_get(ed->obj))
-     if(!ep->other.desc_rtl)
+   if (edje_object_mirrored_get(ed->obj))
+     if (!ep->other.desc_rtl)
        ep->other.desc_rtl = (Edje_Part_Description_Common **)
-          calloc(ep->other.desc_count,
+         calloc(ep->other.desc_count,
                 sizeof (Edje_Part_Description_Common *));
 
    if (!strcmp(name, "default") && val == 0.0)
      return _edje_get_description_by_orientation(ed,
-           ep->default_desc, &ep->default_desc_rtl, ep->type);
+                                                 ep->default_desc, &ep->default_desc_rtl, ep->type);
 
    if (!strcmp(name, "custom"))
      return rp->custom ?
-        _edje_get_description_by_orientation(ed, rp->custom->description,
-              &rp->custom->description_rtl, ep->type) : NULL;
+            _edje_get_description_by_orientation(ed, rp->custom->description,
+                                                 &rp->custom->description_rtl, ep->type) : NULL;
 
    if (!strcmp(name, "default"))
      {
@@ -317,65 +333,65 @@ _edje_part_description_find(Edje *ed, Edje_Real_Part *rp, const char *name,
 static int
 _edje_image_find(Evas_Object *obj, Edje *ed, Edje_Real_Part_Set **eps, Edje_Part_Description_Image *st, Edje_Part_Image_Id *imid)
 {
-  Edje_Image_Directory_Set_Entry *entry;
-  Edje_Image_Directory_Set *set = NULL;
-  Eina_List *l;
-  int w = 0;
-  int h = 0;
-  int id;
-
-  if (!st && !imid)
-    return -1;
-
-  if (st && !st->image.set)
-    return st->image.id;
-
-  if (imid && !imid->set)
-    return imid->id;
-
-  if (imid)
-    id = imid->id;
-  else
-    id = st->image.id;
-
-  evas_object_geometry_get(obj, NULL, NULL, &w, &h);
-
-  if (eps && *eps)
-    {
-       if ((*eps)->id == id)
-         set = (*eps)->set;
-
-       if (set)
-         if ((*eps)->entry->size.min.w <= w && w <= (*eps)->entry->size.max.w)
-           if ((*eps)->entry->size.min.h <= h && h <= (*eps)->entry->size.max.h)
-             return (*eps)->entry->id;
-    }
-
-  if (!set)
-    set = ed->file->image_dir->sets + id;
-
-  EINA_LIST_FOREACH(set->entries, l, entry)
-    {
-       if (entry->size.min.w <= w && w <= entry->size.max.w)
-         if (entry->size.min.h <= h && h <= entry->size.max.h)
-           {
-              if (eps)
-                {
-                   if (!*eps)
-                     *eps = calloc(1, sizeof (Edje_Real_Part_Set));
-
-                   if (*eps)
-                     {
-                        (*eps)->entry = entry;
-                        (*eps)->set = set;
-                        (*eps)->id = id;
-                     }
-                }
-              return entry->id;
-           }
-    }
+   Edje_Image_Directory_Set_Entry *entry;
+   Edje_Image_Directory_Set *set = NULL;
+   Eina_List *l;
+   int w = 0;
+   int h = 0;
+   int id;
+
+   if (!st && !imid)
+     return -1;
+
+   if (st && !st->image.set)
+     return st->image.id;
+
+   if (imid && !imid->set)
+     return imid->id;
+
+   if (imid)
+     id = imid->id;
+   else
+     id = st->image.id;
+
+   evas_object_geometry_get(obj, NULL, NULL, &w, &h);
+
+   if (eps && *eps)
+     {
+        if ((*eps)->id == id)
+          set = (*eps)->set;
+
+        if (set)
+          if ((*eps)->entry->size.min.w <= w && w <= (*eps)->entry->size.max.w)
+            if ((*eps)->entry->size.min.h <= h && h <= (*eps)->entry->size.max.h)
+              return (*eps)->entry->id;
+     }
+
+   if (!set)
+     set = ed->file->image_dir->sets + id;
+
+   EINA_LIST_FOREACH(set->entries, l, entry)
+     {
+        if (entry->size.min.w <= w && w <= entry->size.max.w)
+          if (entry->size.min.h <= h && h <= entry->size.max.h)
+            {
+               if (eps)
+                 {
+                    if (!*eps)
+                      *eps = calloc(1, sizeof (Edje_Real_Part_Set));
+
+                    if (*eps)
+                      {
+                         (*eps)->entry = entry;
+                         (*eps)->set = set;
+                         (*eps)->id = id;
+                      }
+                 }
+               return entry->id;
+            }
+     }
 
-  return -1;
+   return -1;
 }
 
 static void
@@ -386,7 +402,7 @@ _edje_real_part_image_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T pos)
 
    image_id = _edje_image_find(ep->object, ed,
                                &ep->param1.set,
-                               (Edje_Part_Description_Image*) ep->param1.description,
+                               (Edje_Part_Description_Image *)ep->param1.description,
                                NULL);
    if (image_id < 0)
      {
@@ -405,7 +421,7 @@ _edje_real_part_image_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T pos)
      {
         image_count = 2;
         if (ep->param2)
-          image_count += ((Edje_Part_Description_Image*) ep->param2->description)->image.tweens_count;
+          image_count += ((Edje_Part_Description_Image *)ep->param2->description)->image.tweens_count;
         image_num = TO_INT(MUL(pos, SUB(FROM_INT(image_count),
                                         FROM_DOUBLE(0.5))));
         if (image_num > (image_count - 1))
@@ -414,27 +430,27 @@ _edje_real_part_image_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T pos)
           {
              image_id = _edje_image_find(ep->object, ed,
                                          &ep->param1.set,
-                                         (Edje_Part_Description_Image*) ep->param1.description,
+                                         (Edje_Part_Description_Image *)ep->param1.description,
                                          NULL);
           }
         else
-          if (ep->param2)
-            {
-               if (image_num == (image_count - 1))
-                 {
-                    image_id = _edje_image_find(ep->object, ed,
-                                                &ep->param2->set,
-                                                (Edje_Part_Description_Image*) ep->param2->description,
-                                                NULL);
-                 }
-               else
-                 {
-                    Edje_Part_Image_Id *imid;
+        if (ep->param2)
+          {
+             if (image_num == (image_count - 1))
+               {
+                  image_id = _edje_image_find(ep->object, ed,
+                                              &ep->param2->set,
+                                              (Edje_Part_Description_Image *)ep->param2->description,
+                                              NULL);
+               }
+             else
+               {
+                  Edje_Part_Image_Id *imid;
 
-                    imid = ((Edje_Part_Description_Image*) ep->param2->description)->image.tweens[image_num - 1];
-                    image_id = _edje_image_find(ep->object, ed, NULL, NULL, imid);
-                 }
-            }
+                  imid = ((Edje_Part_Description_Image *)ep->param2->description)->image.tweens[image_num - 1];
+                  image_id = _edje_image_find(ep->object, ed, NULL, NULL, imid);
+               }
+          }
         if (image_id < 0)
           {
              ERR("¨Part \"%s\" description, "
@@ -463,26 +479,32 @@ _edje_real_part_image_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T pos)
                   switch (evas_object_image_load_error_get(ep->object))
                     {
                      case EVAS_LOAD_ERROR_GENERIC:
-                        ERR("Error type: EVAS_LOAD_ERROR_GENERIC");
-                        break;
+                       ERR("Error type: EVAS_LOAD_ERROR_GENERIC");
+                       break;
+
                      case EVAS_LOAD_ERROR_DOES_NOT_EXIST:
-                        ERR("Error type: EVAS_LOAD_ERROR_DOES_NOT_EXIST");
-                        break;
+                       ERR("Error type: EVAS_LOAD_ERROR_DOES_NOT_EXIST");
+                       break;
+
                      case EVAS_LOAD_ERROR_PERMISSION_DENIED:
-                        ERR("Error type: EVAS_LOAD_ERROR_PERMISSION_DENIED");
-                        break;
+                       ERR("Error type: EVAS_LOAD_ERROR_PERMISSION_DENIED");
+                       break;
+
                      case EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED:
-                        ERR("Error type: EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED");
-                        break;
+                       ERR("Error type: EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED");
+                       break;
+
                      case EVAS_LOAD_ERROR_CORRUPT_FILE:
-                        ERR("Error type: EVAS_LOAD_ERROR_CORRUPT_FILE");
-                        break;
+                       ERR("Error type: EVAS_LOAD_ERROR_CORRUPT_FILE");
+                       break;
+
                      case EVAS_LOAD_ERROR_UNKNOWN_FORMAT:
-                        ERR("Error type: EVAS_LOAD_ERROR_UNKNOWN_FORMAT");
-                        break;
+                       ERR("Error type: EVAS_LOAD_ERROR_UNKNOWN_FORMAT");
+                       break;
+
                      default:
-                        ERR("Error type: ???");
-                        break;
+                       ERR("Error type: ???");
+                       break;
                     }
                }
           }
@@ -510,7 +532,7 @@ _edje_real_part_rel_to_apply(Edje *ed, Edje_Real_Part *ep, Edje_Real_Part_State
           {
              Edje_Part_Description_External *external;
 
-             external = (Edje_Part_Description_External*) state->description;
+             external = (Edje_Part_Description_External *)state->description;
 
              if (state->external_params)
                _edje_external_parsed_params_free(ep->swallowed_object, state->external_params);
@@ -532,12 +554,12 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, const char *d1, doubl
 
    epd1 = _edje_part_description_find(ed, ep, d1, v1);
    if (!epd1)
-     epd1 = ep->part->default_desc; /* never NULL */
+     epd1 = ep->part->default_desc;  /* never NULL */
 
    if (d2)
      epd2 = _edje_part_description_find(ed, ep, d2, v2);
 
-   epdi = (Edje_Part_Description_Image*) epd2;
+   epdi = (Edje_Part_Description_Image *)epd2;
 
    /* There is an animation if both description are different or if description is an image with tweens */
    if (epd2 && (epd1 != epd2 || (ep->part->type == EDJE_PART_TYPE_IMAGE && epdi->image.tweens_count)))
@@ -554,16 +576,16 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, const char *d1, doubl
         ep->param2->external_params = NULL;
      }
    else
-     if (ep->param2)
-       {
-          if (ep->part->type == EDJE_PART_TYPE_EXTERNAL)
-            _edje_external_parsed_params_free(ep->swallowed_object,
-                                              ep->param2->external_params);
-          if (ep->param2)
-            free(ep->param2->set);
-          eina_mempool_free(_edje_real_part_state_mp, ep->param2);
-          ep->param2 = NULL;
-       }
+   if (ep->param2)
+     {
+        if (ep->part->type == EDJE_PART_TYPE_EXTERNAL)
+          _edje_external_parsed_params_free(ep->swallowed_object,
+                                            ep->param2->external_params);
+        if (ep->param2)
+          free(ep->param2->set);
+        eina_mempool_free(_edje_real_part_state_mp, ep->param2);
+        ep->param2 = NULL;
+     }
 
    chosen_desc = ep->chosen_description;
    ep->param1.description = epd1;
@@ -616,7 +638,7 @@ _edje_recalc(Edje *ed)
 // XXX: dont need this with current smart calc infra. remove me later
 //   if (ed->postponed) return;
 //   if (!ed->calc_only)
-     evas_object_smart_changed(ed->obj);
+   evas_object_smart_changed(ed->obj);
 // XXX: dont need this with current smart calc infra. remove me later
 //   ed->postponed = 1;
 }
@@ -675,7 +697,7 @@ _edje_recalc_do(Edje *ed)
         evas_object_size_hint_min_set(ed->obj, w, h);
      }
 
-   if (!ed->collection) return ;
+   if (!ed->collection) return;
 
    for (i = 0; i < ed->collection->limits.parts_count; i++)
      {
@@ -689,17 +711,20 @@ _edje_recalc_do(Edje *ed)
         switch (limit)
           {
            case 0:
-              ed->collection->limits.parts[i].width = EDJE_PART_LIMIT_UNKNOWN;
-              ed->collection->limits.parts[i].height = EDJE_PART_LIMIT_UNKNOWN;
-              break;
+             ed->collection->limits.parts[i].width = EDJE_PART_LIMIT_UNKNOWN;
+             ed->collection->limits.parts[i].height = EDJE_PART_LIMIT_UNKNOWN;
+             break;
+
            case 1:
-              ed->collection->limits.parts[i].height = EDJE_PART_LIMIT_UNKNOWN;
-              break;
+             ed->collection->limits.parts[i].height = EDJE_PART_LIMIT_UNKNOWN;
+             break;
+
            case 2:
-              ed->collection->limits.parts[i].width = EDJE_PART_LIMIT_UNKNOWN;
-              break;
+             ed->collection->limits.parts[i].width = EDJE_PART_LIMIT_UNKNOWN;
+             break;
+
            case 3:
-              break;
+             break;
           }
 
         if ((limit & 1) == 1)
@@ -750,7 +775,7 @@ _edje_recalc_do(Edje *ed)
 void
 _edje_part_recalc_1(Edje *ed, Edje_Real_Part *ep)
 {
-  _edje_part_recalc(ed, ep, FLAG_XY, NULL);
+   _edje_part_recalc(ed, ep, FLAG_XY, NULL);
 }
 
 int
@@ -764,9 +789,11 @@ _edje_part_dragable_calc(Edje *ed __UNUSED__, Edje_Real_Part *ep, FLOAT_T *x, FL
              int ret = 0;
 
              if ((ep->part->dragable.x != 0) &&
-                 (ep->part->dragable.y != 0 )) ret = 3;
-             else if (ep->part->dragable.x != 0) ret = 1;
-             else if (ep->part->dragable.y != 0) ret = 2;
+                 (ep->part->dragable.y != 0)) ret = 3;
+             else if (ep->part->dragable.x != 0)
+               ret = 1;
+             else if (ep->part->dragable.y != 0)
+               ret = 2;
 
              dx = FROM_INT(ep->x - ep->drag->confine_to->x);
              dw = FROM_INT(ep->drag->confine_to->w - ep->w);
@@ -799,7 +826,7 @@ void
 _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y)
 {
    /* check whether this part is dragable at all */
-   if (!ep->drag) return ;
+   if (!ep->drag) return;
 
    /* instead of checking for equality, we really should check that
     * the difference is greater than foo, but I have no idea what
@@ -915,8 +942,8 @@ _edje_part_recalc_single_aspect(Edje *ed,
    if ((ep->swallow_params.aspect.w > 0) &&
        (ep->swallow_params.aspect.h > 0))
      amin = amax =
-        DIV(FROM_INT(ep->swallow_params.aspect.w),
-            FROM_INT(ep->swallow_params.aspect.h));
+         DIV(FROM_INT(ep->swallow_params.aspect.w),
+             FROM_INT(ep->swallow_params.aspect.h));
    want_x = FROM_INT(params->x);
    want_w = new_w = FROM_INT(params->w);
 
@@ -931,86 +958,94 @@ _edje_part_recalc_single_aspect(Edje *ed,
              switch (ep->swallow_params.aspect.mode)
                {
                 case EDJE_ASPECT_CONTROL_NEITHER:
-                   apref = EDJE_ASPECT_PREFER_NONE;
-                   break;
+                  apref = EDJE_ASPECT_PREFER_NONE;
+                  break;
+
                 case EDJE_ASPECT_CONTROL_HORIZONTAL:
-                   apref = EDJE_ASPECT_PREFER_HORIZONTAL;
-                   break;
+                  apref = EDJE_ASPECT_PREFER_HORIZONTAL;
+                  break;
+
                 case EDJE_ASPECT_CONTROL_VERTICAL:
-                   apref = EDJE_ASPECT_PREFER_VERTICAL;
-                   break;
+                  apref = EDJE_ASPECT_PREFER_VERTICAL;
+                  break;
+
                 case EDJE_ASPECT_CONTROL_BOTH:
-                   apref = EDJE_ASPECT_PREFER_BOTH;
-                   break;
+                  apref = EDJE_ASPECT_PREFER_BOTH;
+                  break;
+
                 default:
-                   break;
+                  break;
                }
           }
         switch (apref)
           {
            case EDJE_ASPECT_PREFER_NONE:
-              /* keep both dimensions in check */
-              /* adjust for min aspect (width / height) */
-              if ((amin > ZERO) && (aspect < amin))
-                {
-                   new_h = DIV(FROM_INT(params->w), amin);
-                   new_w = SCALE(amin, params->h);
-                }
-              /* adjust for max aspect (width / height) */
-              if ((amax > ZERO) && (aspect > amax))
-                {
-                   new_h = DIV(FROM_INT(params->w), amax);
-                   new_w = SCALE(amax, params->h);
-                }
-              if ((amax > ZERO) && (new_w < FROM_INT(params->w)))
-                {
-                   new_w = FROM_INT(params->w);
-                   new_h = DIV(FROM_INT(params->w), amax);
-                }
-              if ((amax > ZERO) && (new_h < FROM_INT(params->h)))
-                {
-                   new_w = SCALE(amax, params->h);
-                   new_h = FROM_INT(params->h);
-                }
-              break;
-              /* prefer vertical size as determiner */
+             /* keep both dimensions in check */
+             /* adjust for min aspect (width / height) */
+             if ((amin > ZERO) && (aspect < amin))
+               {
+                  new_h = DIV(FROM_INT(params->w), amin);
+                  new_w = SCALE(amin, params->h);
+               }
+             /* adjust for max aspect (width / height) */
+             if ((amax > ZERO) && (aspect > amax))
+               {
+                  new_h = DIV(FROM_INT(params->w), amax);
+                  new_w = SCALE(amax, params->h);
+               }
+             if ((amax > ZERO) && (new_w < FROM_INT(params->w)))
+               {
+                  new_w = FROM_INT(params->w);
+                  new_h = DIV(FROM_INT(params->w), amax);
+               }
+             if ((amax > ZERO) && (new_h < FROM_INT(params->h)))
+               {
+                  new_w = SCALE(amax, params->h);
+                  new_h = FROM_INT(params->h);
+               }
+             break;
+
+           /* prefer vertical size as determiner */
            case  EDJE_ASPECT_PREFER_VERTICAL:
-              /* keep both dimensions in check */
-              /* adjust for max aspect (width / height) */
-              if ((amax > ZERO) && (aspect > amax))
-                new_w = SCALE(amax, params->h);
-              /* adjust for min aspect (width / height) */
-              if ((amin > ZERO) && (aspect < amin))
-                new_w = SCALE(amin, params->h);
-              break;
-              /* prefer horizontal size as determiner */
+             /* keep both dimensions in check */
+             /* adjust for max aspect (width / height) */
+             if ((amax > ZERO) && (aspect > amax))
+               new_w = SCALE(amax, params->h);
+             /* adjust for min aspect (width / height) */
+             if ((amin > ZERO) && (aspect < amin))
+               new_w = SCALE(amin, params->h);
+             break;
+
+           /* prefer horizontal size as determiner */
            case EDJE_ASPECT_PREFER_HORIZONTAL:
-              /* keep both dimensions in check */
-              /* adjust for max aspect (width / height) */
-              if ((amax > ZERO) && (aspect > amax))
-                new_h = DIV(FROM_INT(params->w), amax);
-              /* adjust for min aspect (width / height) */
-              if ((amin > ZERO) && (aspect < amin))
-                new_h = DIV(FROM_INT(params->w), amin);
-              break;
+             /* keep both dimensions in check */
+             /* adjust for max aspect (width / height) */
+             if ((amax > ZERO) && (aspect > amax))
+               new_h = DIV(FROM_INT(params->w), amax);
+             /* adjust for min aspect (width / height) */
+             if ((amin > ZERO) && (aspect < amin))
+               new_h = DIV(FROM_INT(params->w), amin);
+             break;
+
            case EDJE_ASPECT_PREFER_SOURCE:
            case EDJE_ASPECT_PREFER_BOTH:
-              /* keep both dimensions in check */
-              /* adjust for max aspect (width / height) */
-              if ((amax > ZERO) && (aspect > amax))
-                {
-                   new_w = SCALE(amax, params->h);
-                   new_h = DIV(FROM_INT(params->w), amax);
-                }
-              /* adjust for min aspect (width / height) */
-              if ((amin > ZERO) && (aspect < amin))
-                {
-                   new_w = SCALE(amin, params->h);
-                   new_h = DIV(FROM_INT(params->w), amin);
-                }
-              break;
+             /* keep both dimensions in check */
+             /* adjust for max aspect (width / height) */
+             if ((amax > ZERO) && (aspect > amax))
+               {
+                  new_w = SCALE(amax, params->h);
+                  new_h = DIV(FROM_INT(params->w), amax);
+               }
+             /* adjust for min aspect (width / height) */
+             if ((amin > ZERO) && (aspect < amin))
+               {
+                  new_w = SCALE(amin, params->h);
+                  new_h = DIV(FROM_INT(params->w), amin);
+               }
+             break;
+
            default:
-              break;
+             break;
           }
 
         if (!((amin > ZERO) && (amax > ZERO) &&
@@ -1146,7 +1181,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
         Evas_Coord tw, th, ins_l, ins_r, ins_t, ins_b;
         const char *text = "";
         const char *style = "";
-        Edje_Style *stl  = NULL;
+        Edje_Style *stl = NULL;
         const char *tmp;
         Eina_List *l;
 
@@ -1168,7 +1203,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
         if (chosen_desc->text.id_text_source >= 0)
           {
              ep->text.text_source = ed->table_parts[chosen_desc->text.id_text_source % ed->table_parts_size];
-             text = edje_string_get(&((Edje_Part_Description_Text*)ep->text.text_source->chosen_description)->text.text);
+             text = edje_string_get(&((Edje_Part_Description_Text *)ep->text.text_source->chosen_description)->text.text);
 
              if (ep->text.text_source->text.text) text = ep->text.text_source->text.text;
           }
@@ -1295,8 +1330,8 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
 
 static void
 _edje_textblock_recalc_apply(Edje *ed, Edje_Real_Part *ep,
-			Edje_Calc_Params *params,
-			Edje_Part_Description_Text *chosen_desc)
+                             Edje_Calc_Params *params,
+                             Edje_Part_Description_Text *chosen_desc)
 {
    /* FIXME: this is just an hack. */
    FLOAT_T sc;
@@ -1305,7 +1340,7 @@ _edje_textblock_recalc_apply(Edje *ed, Edje_Real_Part *ep,
    if (chosen_desc->text.fit_x || chosen_desc->text.fit_y)
      {
         _edje_part_recalc_single_textblock(sc, ed, ep, chosen_desc, params,
-              NULL, NULL, NULL, NULL);
+                                           NULL, NULL, NULL, NULL);
      }
 }
 
@@ -1380,6 +1415,7 @@ _edje_part_recalc_single_text(FLOAT_T sc __UNUSED__,
         if (mh > *minh) *minh = mh;
      }
 }
+
 #else
 {
    char *sfont = NULL;
@@ -1405,12 +1441,12 @@ _edje_part_recalc_single_text(FLOAT_T sc __UNUSED__,
           ep->text.text_source = NULL;
 
         if (ep->text.text_source)
-          text = edje_string_get(&(((Edje_Part_Description_Text*)ep->text.text_source->chosen_description)->text.text));
+          text = edje_string_get(&(((Edje_Part_Description_Text *)ep->text.text_source->chosen_description)->text.text));
         else
           text = edje_string_get(&chosen_desc->text.text);
 
         if (ep->text.source)
-          font = _edje_text_class_font_get(ed, ((Edje_Part_Description_Text*)ep->text.source->chosen_description), &size, &sfont);
+          font = _edje_text_class_font_get(ed, ((Edje_Part_Description_Text *)ep->text.source->chosen_description), &size, &sfont);
         else
           font = _edje_text_class_font_get(ed, chosen_desc, &size, &sfont);
 
@@ -1484,27 +1520,27 @@ _edje_part_recalc_single_text(FLOAT_T sc __UNUSED__,
           {
              int mw, mh;
              Evas_Text_Style_Type
-                style = EVAS_TEXT_STYLE_PLAIN,
-                      shadow = EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_RIGHT;
+               style = EVAS_TEXT_STYLE_PLAIN,
+               shadow = EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_RIGHT;
              const Evas_Text_Style_Type styles[] = {
-                  EVAS_TEXT_STYLE_PLAIN,
-                  EVAS_TEXT_STYLE_PLAIN,
-                  EVAS_TEXT_STYLE_OUTLINE,
-                  EVAS_TEXT_STYLE_SOFT_OUTLINE,
-                  EVAS_TEXT_STYLE_SHADOW,
-                  EVAS_TEXT_STYLE_SOFT_SHADOW,
-                  EVAS_TEXT_STYLE_OUTLINE_SHADOW,
-                  EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW,
-                  EVAS_TEXT_STYLE_FAR_SHADOW,
-                  EVAS_TEXT_STYLE_FAR_SOFT_SHADOW,
-                  EVAS_TEXT_STYLE_GLOW
+                EVAS_TEXT_STYLE_PLAIN,
+                EVAS_TEXT_STYLE_PLAIN,
+                EVAS_TEXT_STYLE_OUTLINE,
+                EVAS_TEXT_STYLE_SOFT_OUTLINE,
+                EVAS_TEXT_STYLE_SHADOW,
+                EVAS_TEXT_STYLE_SOFT_SHADOW,
+                EVAS_TEXT_STYLE_OUTLINE_SHADOW,
+                EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW,
+                EVAS_TEXT_STYLE_FAR_SHADOW,
+                EVAS_TEXT_STYLE_FAR_SOFT_SHADOW,
+                EVAS_TEXT_STYLE_GLOW
              };
              const Evas_Text_Style_Type shadows[] = {
-                  EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_RIGHT,
-                  EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM,
-                  EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_LEFT,
-                  EVAS_TEXT_STYLE_SHADOW_DIRECTION_LEFT,
-                  EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_LEFT,
+                EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_RIGHT,
+                EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM,
+                EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_LEFT,
+                EVAS_TEXT_STYLE_SHADOW_DIRECTION_LEFT,
+                EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_LEFT,
                 EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP,
                 EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_RIGHT,
                 EVAS_TEXT_STYLE_SHADOW_DIRECTION_RIGHT
@@ -1514,7 +1550,7 @@ _edje_part_recalc_single_text(FLOAT_T sc __UNUSED__,
                  < EDJE_TEXT_EFFECT_LAST)
                style = styles[ep->part->effect];
              shadow = shadows
-                [(ep->part->effect & EDJE_TEXT_EFFECT_MASK_SHADOW_DIRECTION) >> 4];
+               [(ep->part->effect & EDJE_TEXT_EFFECT_MASK_SHADOW_DIRECTION) >> 4];
              EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET(style, shadow);
 
              evas_object_text_style_set(ep->object, style);
@@ -1589,38 +1625,41 @@ _edje_part_recalc_single_min(Edje_Part_Description_Common *desc,
    switch (aspect)
      {
       case EDJE_ASPECT_PREFER_NONE:
-         break;
+        break;
+
       case EDJE_ASPECT_PREFER_VERTICAL:
-         tmp = minh * params->w / h;
-         if (tmp >= minw)
-           {
-              minw = tmp;
-              break;
-           }
+        tmp = minh * params->w / h;
+        if (tmp >= minw)
+          {
+             minw = tmp;
+             break;
+          }
+
       case EDJE_ASPECT_PREFER_HORIZONTAL:
-         tmp = minw * params->h / w;
-         if (tmp >= minh)
-           {
-              minh = tmp;
-              break;
-           }
+        tmp = minw * params->h / w;
+        if (tmp >= minh)
+          {
+             minh = tmp;
+             break;
+          }
+
       case EDJE_ASPECT_PREFER_SOURCE:
       case EDJE_ASPECT_PREFER_BOTH:
-         tmp = minh * params->w / h;
-         if (tmp >= minw)
-           {
-              minw = tmp;
-              break;
-           }
+        tmp = minh * params->w / h;
+        if (tmp >= minw)
+          {
+             minw = tmp;
+             break;
+          }
 
-         tmp = minw * params->h / w;
-         if (tmp >= minh)
-           {
-              minh = tmp;
-              break;
-           }
+        tmp = minw * params->h / w;
+        if (tmp >= minh)
+          {
+             minh = tmp;
+             break;
+          }
 
-         break;
+        break;
      }
 
    _edje_part_recalc_single_min_length(desc->align.x, &params->x, &params->w, minw);
@@ -1656,38 +1695,41 @@ _edje_part_recalc_single_max(Edje_Part_Description_Common *desc,
    switch (aspect)
      {
       case EDJE_ASPECT_PREFER_NONE:
-         break;
+        break;
+
       case EDJE_ASPECT_PREFER_VERTICAL:
-         tmp = maxh * params->w / h;
-         if (tmp <= maxw)
-           {
-              maxw = tmp;
-              break;
-           }
+        tmp = maxh * params->w / h;
+        if (tmp <= maxw)
+          {
+             maxw = tmp;
+             break;
+          }
+
       case EDJE_ASPECT_PREFER_HORIZONTAL:
-         tmp = maxw * params->h / w;
-         if (tmp <= maxh)
-           {
-              maxh = tmp;
-              break;
-           }
+        tmp = maxw * params->h / w;
+        if (tmp <= maxh)
+          {
+             maxh = tmp;
+             break;
+          }
+
       case EDJE_ASPECT_PREFER_SOURCE:
       case EDJE_ASPECT_PREFER_BOTH:
-         tmp = maxh * params->w / h;
-         if (tmp <= maxw)
-           {
-              maxw = tmp;
-              break;
-           }
+        tmp = maxh * params->w / h;
+        if (tmp <= maxw)
+          {
+             maxw = tmp;
+             break;
+          }
 
-         tmp = maxw * params->h / w;
-         if (tmp <= maxh)
-           {
-              maxh = tmp;
-              break;
-           }
+        tmp = maxw * params->h / w;
+        if (tmp <= maxh)
+          {
+             maxh = tmp;
+             break;
+          }
 
-         break;
+        break;
      }
 
    _edje_part_recalc_single_max_length(desc->align.x, &params->x, &params->w, maxw);
@@ -1712,22 +1754,23 @@ _edje_part_recalc_single_drag(Edje_Real_Part *ep,
         v = SCALE(ep->drag->size.x, confine_to->w);
 
         if ((minw > 0) && (TO_INT(v) < minw)) params->w = minw;
-        else if ((maxw >= 0) && (TO_INT(v) > maxw)) params->w = maxw;
+        else if ((maxw >= 0) && (TO_INT(v) > maxw))
+          params->w = maxw;
         else params->w = TO_INT(v);
 
         offset = TO_INT(SCALE(ep->drag->x, (confine_to->w - params->w)))
-           + ep->drag->tmp.x;
+          + ep->drag->tmp.x;
         if (ep->part->dragable.step_x > 0)
           {
              params->x = confine_to->x +
-                ((offset / ep->part->dragable.step_x) * ep->part->dragable.step_x);
+               ((offset / ep->part->dragable.step_x) * ep->part->dragable.step_x);
           }
         else if (ep->part->dragable.count_x > 0)
           {
              step = (confine_to->w - params->w) / ep->part->dragable.count_x;
              if (step < 1) step = 1;
              params->x = confine_to->x +
-                ((offset / step) * step);
+               ((offset / step) * step);
           }
         params->req_drag.x = params->x;
         params->req_drag.w = params->w;
@@ -1735,22 +1778,23 @@ _edje_part_recalc_single_drag(Edje_Real_Part *ep,
         v = SCALE(ep->drag->size.y, confine_to->h);
 
         if ((minh > 0) && (TO_INT(v) < minh)) params->h = minh;
-        else if ((maxh >= 0) && (TO_INT(v) > maxh)) params->h = maxh;
+        else if ((maxh >= 0) && (TO_INT(v) > maxh))
+          params->h = maxh;
         else params->h = TO_INT(v);
 
         offset = TO_INT(SCALE(ep->drag->y, (confine_to->h - params->h)))
-           + ep->drag->tmp.y;
+          + ep->drag->tmp.y;
         if (ep->part->dragable.step_y > 0)
           {
              params->y = confine_to->y +
-                ((offset / ep->part->dragable.step_y) * ep->part->dragable.step_y);
+               ((offset / ep->part->dragable.step_y) * ep->part->dragable.step_y);
           }
         else if (ep->part->dragable.count_y > 0)
           {
              step = (confine_to->h - params->h) / ep->part->dragable.count_y;
              if (step < 1) step = 1;
              params->y = confine_to->y +
-                ((offset / step) * step);
+               ((offset / step) * step);
           }
         params->req_drag.y = params->y;
         params->req_drag.h = params->h;
@@ -1802,9 +1846,9 @@ _edje_part_recalc_single_fill(Edje_Real_Part *ep,
      fw = params->w;
 
    params->type.common.fill.x = fill->pos_abs_x
-      + TO_INT(SCALE(fill->pos_rel_x, fw));
+     + TO_INT(SCALE(fill->pos_rel_x, fw));
    params->type.common.fill.w = fill->abs_x
-      + TO_INT(SCALE(fill->rel_x, fw));
+     + TO_INT(SCALE(fill->rel_x, fw));
 
    if (fill->type == EDJE_FILL_TYPE_TILE)
      evas_object_image_size_get(ep->object, NULL, &fh);
@@ -1812,9 +1856,9 @@ _edje_part_recalc_single_fill(Edje_Real_Part *ep,
      fh = params->h;
 
    params->type.common.fill.y = fill->pos_abs_y
-      + TO_INT(SCALE(fill->pos_rel_y, fh));
+     + TO_INT(SCALE(fill->pos_rel_y, fh));
    params->type.common.fill.h = fill->abs_y
-      + TO_INT(SCALE(fill->rel_y, fh));
+     + TO_INT(SCALE(fill->rel_y, fh));
 
    params->type.common.fill.angle = fill->angle;
    params->type.common.fill.spread = fill->spread;
@@ -1938,7 +1982,7 @@ _edje_part_recalc_single_map(Edje *ed,
    params->lighted = params->mapped ? !!light : 0;
    params->persp_on = params->mapped ? !!persp : 0;
 
-   if (!params->mapped) return ;
+   if (!params->mapped) return;
 
    if (center)
      {
@@ -2061,9 +2105,9 @@ _edje_part_recalc_single(Edje *ed,
 
    /* if we have text that wants to make the min size the text size... */
    if (ep->part->type == EDJE_PART_TYPE_TEXTBLOCK)
-     _edje_part_recalc_single_textblock(sc, ed, ep, (Edje_Part_Description_Text*) chosen_desc, params, &minw, &minh, &maxw, &maxh);
+     _edje_part_recalc_single_textblock(sc, ed, ep, (Edje_Part_Description_Text *)chosen_desc, params, &minw, &minh, &maxw, &maxh);
    else if (ep->part->type == EDJE_PART_TYPE_TEXT)
-     _edje_part_recalc_single_text(sc, ed, ep, (Edje_Part_Description_Text*) desc, (Edje_Part_Description_Text*) chosen_desc, params, &minw, &minh, &maxw, &maxh);
+     _edje_part_recalc_single_text(sc, ed, ep, (Edje_Part_Description_Text *)desc, (Edje_Part_Description_Text *)chosen_desc, params, &minw, &minh, &maxw, &maxh);
 
    if ((ep->part->type == EDJE_PART_TYPE_TABLE) &&
        (((((Edje_Part_Description_Table *)chosen_desc)->table.min.h) ||
@@ -2175,55 +2219,57 @@ _edje_part_recalc_single(Edje *ed,
    switch (ep->part->type)
      {
       case EDJE_PART_TYPE_IMAGE:
-           {
-              Edje_Part_Description_Image *img_desc = (Edje_Part_Description_Image*) desc;
+      {
+         Edje_Part_Description_Image *img_desc = (Edje_Part_Description_Image *)desc;
 
-              /* border */
-              params->type.common.spec.image.l = img_desc->image.border.l;
-              params->type.common.spec.image.r = img_desc->image.border.r;
+         /* border */
+         params->type.common.spec.image.l = img_desc->image.border.l;
+         params->type.common.spec.image.r = img_desc->image.border.r;
 
-              params->type.common.spec.image.t = img_desc->image.border.t;
-              params->type.common.spec.image.b = img_desc->image.border.b;
+         params->type.common.spec.image.t = img_desc->image.border.t;
+         params->type.common.spec.image.b = img_desc->image.border.b;
+
+         params->type.common.spec.image.border_scale_by = img_desc->image.border.scale_by;
+         break;
+      }
 
-              params->type.common.spec.image.border_scale_by = img_desc->image.border.scale_by;
-              break;
-           }
       case EDJE_PART_TYPE_TEXT:
       case EDJE_PART_TYPE_TEXTBLOCK:
+      {
+         Edje_Part_Description_Text *text_desc = (Edje_Part_Description_Text *)desc;
+
+         /* text.align */
+         params->type.text.align.x = text_desc->text.align.x;
+         params->type.text.align.y = text_desc->text.align.y;
+         params->type.text.elipsis = text_desc->text.elipsis;
+
+         /* text colors */
+         if (cc)
+           {
+              params->type.text.color2.r = (((int)cc->r2 + 1) * text_desc->common.color2.r) >> 8;
+              params->type.text.color2.g = (((int)cc->g2 + 1) * text_desc->common.color2.g) >> 8;
+              params->type.text.color2.b = (((int)cc->b2 + 1) * text_desc->common.color2.b) >> 8;
+              params->type.text.color2.a = (((int)cc->a2 + 1) * text_desc->common.color2.a) >> 8;
+              params->type.text.color3.r = (((int)cc->r3 + 1) * text_desc->text.color3.r) >> 8;
+              params->type.text.color3.g = (((int)cc->g3 + 1) * text_desc->text.color3.g) >> 8;
+              params->type.text.color3.b = (((int)cc->b3 + 1) * text_desc->text.color3.b) >> 8;
+              params->type.text.color3.a = (((int)cc->a3 + 1) * text_desc->text.color3.a) >> 8;
+           }
+         else
            {
-              Edje_Part_Description_Text *text_desc = (Edje_Part_Description_Text*) desc;
-
-              /* text.align */
-              params->type.text.align.x = text_desc->text.align.x;
-              params->type.text.align.y = text_desc->text.align.y;
-              params->type.text.elipsis = text_desc->text.elipsis;
-
-              /* text colors */
-              if (cc)
-                {
-                   params->type.text.color2.r = (((int)cc->r2 + 1) * text_desc->common.color2.r) >> 8;
-                   params->type.text.color2.g = (((int)cc->g2 + 1) * text_desc->common.color2.g) >> 8;
-                   params->type.text.color2.b = (((int)cc->b2 + 1) * text_desc->common.color2.b) >> 8;
-                   params->type.text.color2.a = (((int)cc->a2 + 1) * text_desc->common.color2.a) >> 8;
-                   params->type.text.color3.r = (((int)cc->r3 + 1) * text_desc->text.color3.r) >> 8;
-                   params->type.text.color3.g = (((int)cc->g3 + 1) * text_desc->text.color3.g) >> 8;
-                   params->type.text.color3.b = (((int)cc->b3 + 1) * text_desc->text.color3.b) >> 8;
-                   params->type.text.color3.a = (((int)cc->a3 + 1) * text_desc->text.color3.a) >> 8;
-                }
-              else
-                {
-                   params->type.text.color2.r = text_desc->common.color2.r;
-                   params->type.text.color2.g = text_desc->common.color2.g;
-                   params->type.text.color2.b = text_desc->common.color2.b;
-                   params->type.text.color2.a = text_desc->common.color2.a;
-                   params->type.text.color3.r = text_desc->text.color3.r;
-                   params->type.text.color3.g = text_desc->text.color3.g;
-                   params->type.text.color3.b = text_desc->text.color3.b;
-                   params->type.text.color3.a = text_desc->text.color3.a;
-                }
-
-              break;
+              params->type.text.color2.r = text_desc->common.color2.r;
+              params->type.text.color2.g = text_desc->common.color2.g;
+              params->type.text.color2.b = text_desc->common.color2.b;
+              params->type.text.color2.a = text_desc->common.color2.a;
+              params->type.text.color3.r = text_desc->text.color3.r;
+              params->type.text.color3.g = text_desc->text.color3.g;
+              params->type.text.color3.b = text_desc->text.color3.b;
+              params->type.text.color3.a = text_desc->text.color3.a;
            }
+
+         break;
+      }
+
       case EDJE_PART_TYPE_SPACER:
       case EDJE_PART_TYPE_RECTANGLE:
       case EDJE_PART_TYPE_BOX:
@@ -2231,12 +2277,14 @@ _edje_part_recalc_single(Edje *ed,
       case EDJE_PART_TYPE_SWALLOW:
       case EDJE_PART_TYPE_GROUP:
       case EDJE_PART_TYPE_PROXY:
-         break;
+        break;
+
       case EDJE_PART_TYPE_GRADIENT:
-         /* FIXME: THIS ONE SHOULD NEVER BE TRIGGERED. */
-         break;
+        /* FIXME: THIS ONE SHOULD NEVER BE TRIGGERED. */
+        break;
+
       default:
-         break;
+        break;
      }
 
    _edje_part_recalc_single_map(ed, ep, center, light, persp, desc, chosen_desc, params);
@@ -2265,7 +2313,7 @@ _edje_proxy_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
    int part_id = -1;
 
    if (pos >= FROM_DOUBLE(0.5))
-     part_id = ((Edje_Part_Description_Proxy*) ep->param2->description)->proxy.id;
+     part_id = ((Edje_Part_Description_Proxy *)ep->param2->description)->proxy.id;
    else
      part_id = chosen_desc->proxy.id;
 
@@ -2286,19 +2334,22 @@ _edje_proxy_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
       case EDJE_PART_TYPE_BOX:
       case EDJE_PART_TYPE_TABLE:
       case EDJE_PART_TYPE_PROXY:
-         evas_object_image_source_set(ep->object, pp->object);
-         break;
+        evas_object_image_source_set(ep->object, pp->object);
+        break;
+
       case EDJE_PART_TYPE_GRADIENT:
-         /* FIXME: THIS ONE SHOULD NEVER BE TRIGGERED. */
-         break;
+        /* FIXME: THIS ONE SHOULD NEVER BE TRIGGERED. */
+        break;
+
       case EDJE_PART_TYPE_GROUP:
       case EDJE_PART_TYPE_SWALLOW:
       case EDJE_PART_TYPE_EXTERNAL:
-         evas_object_image_source_set(ep->object, pp->swallowed_object);
-         break;
+        evas_object_image_source_set(ep->object, pp->swallowed_object);
+        break;
+
       case EDJE_PART_TYPE_SPACER:
-         /* FIXME: detect that at compile time and prevent it */
-         break;
+        /* FIXME: detect that at compile time and prevent it */
+        break;
      }
 
    evas_object_image_fill_set(ep->object, p3->type.common.fill.x, p3->type.common.fill.y,
@@ -2324,13 +2375,13 @@ _edje_image_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
              evas_object_image_border_scale_set(ep->object, TO_DOUBLE(sc2));
           }
         else
-           evas_object_image_border_scale_set(ep->object, TO_DOUBLE(sc));
+          evas_object_image_border_scale_set(ep->object, TO_DOUBLE(sc));
      }
    else
      {
         if (p3->type.common.spec.image.border_scale_by > FROM_DOUBLE(0.0))
-           evas_object_image_border_scale_set
-           (ep->object, TO_DOUBLE(p3->type.common.spec.image.border_scale_by));
+          evas_object_image_border_scale_set
+            (ep->object, TO_DOUBLE(p3->type.common.spec.image.border_scale_by));
         else
           evas_object_image_border_scale_set(ep->object, 1.0);
      }
@@ -2360,7 +2411,7 @@ _edje_real_part_state_get(Edje *ed, Edje_Real_Part *ep, int flags, int id, int *
 #ifdef EDJE_CALC_CACHE
              if (state) *state = result->state;
 #else
-             (void) state;
+             (void)state;
 #endif
           }
      }
@@ -2459,7 +2510,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
 
 #ifdef EDJE_CALC_CACHE
    if (ep->state == ed->state && !state)
-     return ;
+     return;
 #endif
 
    if (flags & FLAG_X)
@@ -2566,9 +2617,9 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
         int part_id = -1;
 
         if (pos >= FROM_DOUBLE(0.5))
-          part_id = ((Edje_Part_Description_Proxy*) ep->param2->description)->proxy.id;
+          part_id = ((Edje_Part_Description_Proxy *)ep->param2->description)->proxy.id;
         else
-          part_id = ((Edje_Part_Description_Proxy*) chosen_desc)->proxy.id;
+          part_id = ((Edje_Part_Description_Proxy *)chosen_desc)->proxy.id;
 
         pp = _edje_real_part_state_get(ed, ep, flags, part_id, NULL);
 #ifdef EDJE_CALC_CACHE
@@ -2619,17 +2670,17 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
             state ||
             ((ep->part->type == EDJE_PART_TYPE_TEXT || ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) && ed->text_part_change))
 #endif
-          {
-             _edje_part_recalc_single(ed, ep, ep->param1.description, chosen_desc, center[0], light[0], persp[0],
-                                      ep->param1.rel1_to_x, ep->param1.rel1_to_y, ep->param1.rel2_to_x, ep->param1.rel2_to_y,
-                                      confine_to,
-                                      p1, pos);
+        {
+           _edje_part_recalc_single(ed, ep, ep->param1.description, chosen_desc, center[0], light[0], persp[0],
+                                    ep->param1.rel1_to_x, ep->param1.rel1_to_y, ep->param1.rel2_to_x, ep->param1.rel2_to_y,
+                                    confine_to,
+                                    p1, pos);
 
 #ifdef EDJE_CALC_CACHE
-             if (flags == FLAG_XY)
-               ep->param1.state = ed->state;
+           if (flags == FLAG_XY)
+             ep->param1.state = ed->state;
 #endif
-          }
+        }
      }
    if (ep->param2)
      {
@@ -2640,14 +2691,6 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
           {
              /* FIXME: except for text, we don't need in that case to recalc p1 at all*/
              memcpy(p1, ep->current, sizeof (Edje_Calc_Params));
-             p1->x += ed->x;
-             p1->y += ed->y;
-             p1->map.center.x += ed->x;
-             p1->map.center.y += ed->y;
-             p1->map.light.x += ed->x;
-             p1->map.light.y += ed->y;
-             p1->map.persp.x += ed->x;
-             p1->map.persp.y += ed->y;
           }
 
         p3 = &lp3;
@@ -2668,25 +2711,26 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
             state ||
             ((ep->part->type == EDJE_PART_TYPE_TEXT || ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) && ed->text_part_change))
 #endif
-          {
-             _edje_part_recalc_single(ed, ep, ep->param2->description,
-                                      chosen_desc,
-                                      center[1], light[1], persp[1],
-                                      ep->param2->rel1_to_x,
-                                      ep->param2->rel1_to_y,
-                                      ep->param2->rel2_to_x,
-                                      ep->param2->rel2_to_y,
-                                      confine_to,
-                                      p2, pos);
+        {
+           _edje_part_recalc_single(ed, ep, ep->param2->description,
+                                    chosen_desc,
+                                    center[1], light[1], persp[1],
+                                    ep->param2->rel1_to_x,
+                                    ep->param2->rel1_to_y,
+                                    ep->param2->rel2_to_x,
+                                    ep->param2->rel2_to_y,
+                                    confine_to,
+                                    p2, pos);
 #ifdef EDJE_CALC_CACHE
-             if (flags == FLAG_XY)
-               ep->param2->state = ed->state;
+           if (flags == FLAG_XY)
+             ep->param2->state = ed->state;
 #endif
-          }
+        }
 
         pos2 = pos;
         if (pos2 < ZERO) pos2 = ZERO;
-        else if (pos2 > FROM_INT(1)) pos2 = FROM_INT(1);
+        else if (pos2 > FROM_INT(1))
+          pos2 = FROM_INT(1);
         beginning_pos = (pos < FROM_DOUBLE(0.5));
         part_type = ep->part->type;
 
@@ -2701,16 +2745,16 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
         p3->smooth = (beginning_pos) ? p1->smooth : p2->smooth;
 
         /* FIXME: do x and y separately base on flag */
-#define FINTP(_x1, _x2, _p)                     \
-        (((_x1) == (_x2))                       \
-         ? FROM_INT((_x1))                      \
-         : ADD(FROM_INT(_x1),                   \
-               SCALE((_p), (_x2) - (_x1))))
+#define FINTP(_x1, _x2, _p) \
+  (((_x1) == (_x2))         \
+   ? FROM_INT((_x1))        \
+   : ADD(FROM_INT(_x1),     \
+         SCALE((_p), (_x2) - (_x1))))
 
-#define FFP(_x1, _x2, _p)                       \
-        (((_x1) == (_x2))                       \
-         ? (_x1)                                \
-         : ADD(_x1, MUL(_p, SUB(_x2, _x1))));
+#define FFP(_x1, _x2, _p) \
+  (((_x1) == (_x2))       \
+   ? (_x1)                \
+   : ADD(_x1, MUL(_p, SUB(_x2, _x1))));
 
 #define INTP(_x1, _x2, _p) TO_INT(FINTP(_x1, _x2, _p))
 
@@ -2743,34 +2787,37 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
         switch (part_type)
           {
            case EDJE_PART_TYPE_IMAGE:
-              p3->type.common.spec.image.l = INTP(p1->type.common.spec.image.l, p2->type.common.spec.image.l, pos);
-              p3->type.common.spec.image.r = INTP(p1->type.common.spec.image.r, p2->type.common.spec.image.r, pos);
-              p3->type.common.spec.image.t = INTP(p1->type.common.spec.image.t, p2->type.common.spec.image.t, pos);
-              p3->type.common.spec.image.b = INTP(p1->type.common.spec.image.b, p2->type.common.spec.image.b, pos);
-              p3->type.common.spec.image.border_scale_by = INTP(p1->type.common.spec.image.border_scale_by, p2->type.common.spec.image.border_scale_by, pos);
+             p3->type.common.spec.image.l = INTP(p1->type.common.spec.image.l, p2->type.common.spec.image.l, pos);
+             p3->type.common.spec.image.r = INTP(p1->type.common.spec.image.r, p2->type.common.spec.image.r, pos);
+             p3->type.common.spec.image.t = INTP(p1->type.common.spec.image.t, p2->type.common.spec.image.t, pos);
+             p3->type.common.spec.image.b = INTP(p1->type.common.spec.image.b, p2->type.common.spec.image.b, pos);
+             p3->type.common.spec.image.border_scale_by = INTP(p1->type.common.spec.image.border_scale_by, p2->type.common.spec.image.border_scale_by, pos);
+
            case EDJE_PART_TYPE_PROXY:
-              p3->type.common.fill.x = INTP(p1->type.common.fill.x, p2->type.common.fill.x, pos);
-              p3->type.common.fill.y = INTP(p1->type.common.fill.y, p2->type.common.fill.y, pos);
-              p3->type.common.fill.w = INTP(p1->type.common.fill.w, p2->type.common.fill.w, pos);
-              p3->type.common.fill.h = INTP(p1->type.common.fill.h, p2->type.common.fill.h, pos);
-              break;
+             p3->type.common.fill.x = INTP(p1->type.common.fill.x, p2->type.common.fill.x, pos);
+             p3->type.common.fill.y = INTP(p1->type.common.fill.y, p2->type.common.fill.y, pos);
+             p3->type.common.fill.w = INTP(p1->type.common.fill.w, p2->type.common.fill.w, pos);
+             p3->type.common.fill.h = INTP(p1->type.common.fill.h, p2->type.common.fill.h, pos);
+             break;
+
            case EDJE_PART_TYPE_TEXT:
-              p3->type.text.size = INTP(p1->type.text.size, p2->type.text.size, pos);
+             p3->type.text.size = INTP(p1->type.text.size, p2->type.text.size, pos);
+
            case EDJE_PART_TYPE_TEXTBLOCK:
-              p3->type.text.color2.r = INTP(p1->type.text.color2.r, p2->type.text.color2.r, pos2);
-              p3->type.text.color2.g = INTP(p1->type.text.color2.g, p2->type.text.color2.g, pos2);
-              p3->type.text.color2.b = INTP(p1->type.text.color2.b, p2->type.text.color2.b, pos2);
-              p3->type.text.color2.a = INTP(p1->type.text.color2.a, p2->type.text.color2.a, pos2);
+             p3->type.text.color2.r = INTP(p1->type.text.color2.r, p2->type.text.color2.r, pos2);
+             p3->type.text.color2.g = INTP(p1->type.text.color2.g, p2->type.text.color2.g, pos2);
+             p3->type.text.color2.b = INTP(p1->type.text.color2.b, p2->type.text.color2.b, pos2);
+             p3->type.text.color2.a = INTP(p1->type.text.color2.a, p2->type.text.color2.a, pos2);
 
-              p3->type.text.color3.r = INTP(p1->type.text.color3.r, p2->type.text.color3.r, pos2);
-              p3->type.text.color3.g = INTP(p1->type.text.color3.g, p2->type.text.color3.g, pos2);
-              p3->type.text.color3.b = INTP(p1->type.text.color3.b, p2->type.text.color3.b, pos2);
-              p3->type.text.color3.a = INTP(p1->type.text.color3.a, p2->type.text.color3.a, pos2);
+             p3->type.text.color3.r = INTP(p1->type.text.color3.r, p2->type.text.color3.r, pos2);
+             p3->type.text.color3.g = INTP(p1->type.text.color3.g, p2->type.text.color3.g, pos2);
+             p3->type.text.color3.b = INTP(p1->type.text.color3.b, p2->type.text.color3.b, pos2);
+             p3->type.text.color3.a = INTP(p1->type.text.color3.a, p2->type.text.color3.a, pos2);
 
-              p3->type.text.align.x = FFP(p1->type.text.align.x, p2->type.text.align.x, pos);
-              p3->type.text.align.y = FFP(p1->type.text.align.y, p2->type.text.align.y, pos);
-              p3->type.text.elipsis = TO_DOUBLE(FINTP(p1->type.text.elipsis, p2->type.text.elipsis, pos2));
-              break;
+             p3->type.text.align.x = FFP(p1->type.text.align.x, p2->type.text.align.x, pos);
+             p3->type.text.align.y = FFP(p1->type.text.align.y, p2->type.text.align.y, pos);
+             p3->type.text.elipsis = TO_DOUBLE(FINTP(p1->type.text.elipsis, p2->type.text.elipsis, pos2));
+             break;
           }
 
         p3->mapped = p1->mapped;
@@ -2785,8 +2832,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
              p3->map.rotation.y = FFP(p1->map.rotation.y, p2->map.rotation.y, pos);
              p3->map.rotation.z = FFP(p1->map.rotation.z, p2->map.rotation.z, pos);
 
-#define MIX(P1, P2, P3, pos, info)              \
-             P3->info = P1->info + TO_INT(SCALE(pos, P2->info - P1->info));
+#define MIX(P1, P2, P3, pos, info) \
+  P3->info = P1->info + TO_INT(SCALE(pos, P2->info - P1->info));
 
              if (p1->lighted && p2->lighted)
                {
@@ -2895,84 +2942,97 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
         switch (ep->part->type)
           {
            case EDJE_PART_TYPE_IMAGE:
-                {
-                   Edje_Part_Description_Image *img_desc = (Edje_Part_Description_Image*) chosen_desc;
+           {
+              Edje_Part_Description_Image *img_desc = (Edje_Part_Description_Image *)chosen_desc;
+
+              evas_object_image_scale_hint_set(ep->object,
+                                               img_desc->image.scale_hint);
+           }
 
-                   evas_object_image_scale_hint_set(ep->object,
-                                                    img_desc->image.scale_hint);
-                }
            case EDJE_PART_TYPE_PROXY:
            case EDJE_PART_TYPE_RECTANGLE:
            case EDJE_PART_TYPE_TEXTBLOCK:
            case EDJE_PART_TYPE_BOX:
            case EDJE_PART_TYPE_TABLE:
-              evas_object_color_set(ep->object,
-                                    (pf->color.r * pf->color.a) / 255,
-                                    (pf->color.g * pf->color.a) / 255,
-                                    (pf->color.b * pf->color.a) / 255,
-                                    pf->color.a);
-              if (!pf->visible)
-                {
-                   evas_object_hide(ep->object);
-                   break;
-                }
-              evas_object_show(ep->object);
-              /* move and resize are needed for all previous object => no break here. */
+             evas_object_color_set(ep->object,
+                                   (pf->color.r * pf->color.a) / 255,
+                                   (pf->color.g * pf->color.a) / 255,
+                                   (pf->color.b * pf->color.a) / 255,
+                                   pf->color.a);
+             if (!pf->visible)
+               {
+                  evas_object_hide(ep->object);
+                  break;
+               }
+             evas_object_show(ep->object);
+
+           /* move and resize are needed for all previous object => no break here. */
            case EDJE_PART_TYPE_SWALLOW:
            case EDJE_PART_TYPE_GROUP:
            case EDJE_PART_TYPE_EXTERNAL:
-              /* visibility and color have no meaning on SWALLOW and GROUP part. */
-              evas_object_move(ep->object, ed->x + pf->x, ed->y + pf->y);
-              evas_object_resize(ep->object, pf->w, pf->h);
-              if (ep->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
-                _edje_entry_real_part_configure(ep);
-              break;
+             /* visibility and color have no meaning on SWALLOW and GROUP part. */
+             evas_object_move(ep->object, ed->x + pf->x, ed->y + pf->y);
+             evas_object_resize(ep->object, pf->w, pf->h);
+             if (ep->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+               _edje_entry_real_part_configure(ep);
+             break;
+
            case EDJE_PART_TYPE_TEXT:
-              /* This is correctly handle in _edje_text_recalc_apply at the moment. */
-              break;
+             /* This is correctly handle in _edje_text_recalc_apply at the moment. */
+             break;
+
            case EDJE_PART_TYPE_GRADIENT:
-              /* FIXME: definitivly remove this code when we switch to new format. */
-              abort();
-              break;
+             /* FIXME: definitivly remove this code when we switch to new format. */
+             abort();
+             break;
+
            case EDJE_PART_TYPE_SPACER:
-              /* We really should do nothing on SPACER part */
-              break;
+             /* We really should do nothing on SPACER part */
+             break;
           }
 
         /* Some object need special recalc. */
         switch (ep->part->type)
           {
            case EDJE_PART_TYPE_TEXT:
-              _edje_text_recalc_apply(ed, ep, pf, (Edje_Part_Description_Text*) chosen_desc);
-              break;
+             _edje_text_recalc_apply(ed, ep, pf, (Edje_Part_Description_Text *)chosen_desc);
+             break;
+
            case EDJE_PART_TYPE_PROXY:
-              _edje_proxy_recalc_apply(ed, ep, pf, (Edje_Part_Description_Proxy*) chosen_desc, pos);
-              break;
+             _edje_proxy_recalc_apply(ed, ep, pf, (Edje_Part_Description_Proxy *)chosen_desc, pos);
+             break;
+
            case EDJE_PART_TYPE_IMAGE:
-              _edje_image_recalc_apply(ed, ep, pf, (Edje_Part_Description_Image*) chosen_desc, pos);
-              break;
+             _edje_image_recalc_apply(ed, ep, pf, (Edje_Part_Description_Image *)chosen_desc, pos);
+             break;
+
            case EDJE_PART_TYPE_BOX:
-              _edje_box_recalc_apply(ed, ep, pf, (Edje_Part_Description_Box*) chosen_desc);
-              break;
+             _edje_box_recalc_apply(ed, ep, pf, (Edje_Part_Description_Box *)chosen_desc);
+             break;
+
            case EDJE_PART_TYPE_TABLE:
-              _edje_table_recalc_apply(ed, ep, pf, (Edje_Part_Description_Table*) chosen_desc);
-              break;
+             _edje_table_recalc_apply(ed, ep, pf, (Edje_Part_Description_Table *)chosen_desc);
+             break;
+
            case EDJE_PART_TYPE_TEXTBLOCK:
-              _edje_textblock_recalc_apply(ed, ep, pf, (Edje_Part_Description_Text*) chosen_desc);
-              break;
+             _edje_textblock_recalc_apply(ed, ep, pf, (Edje_Part_Description_Text *)chosen_desc);
+             break;
+
            case EDJE_PART_TYPE_EXTERNAL:
            case EDJE_PART_TYPE_RECTANGLE:
            case EDJE_PART_TYPE_SWALLOW:
            case EDJE_PART_TYPE_GROUP:
-              /* Nothing special to do for this type of object. */
-              break;
+             /* Nothing special to do for this type of object. */
+             break;
+
            case EDJE_PART_TYPE_GRADIENT:
-              /* FIXME: definitivly remove this code when we switch to new format. */
-              abort();
-              break;
+             /* FIXME: definitivly remove this code when we switch to new format. */
+             abort();
+             break;
+
            case EDJE_PART_TYPE_SPACER:
-              /* We really should do nothing on SPACER part */
-              break;
+             /* We really should do nothing on SPACER part */
+             break;
           }
 
         if (ep->swallowed_object)
@@ -3007,16 +3067,16 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
              if (ep->part->type == EDJE_PART_TYPE_IMAGE ||
                  ((ep->part->type == EDJE_PART_TYPE_SWALLOW) &&
                   (!strcmp(evas_object_type_get(mo), "image") &&
-                  (!evas_object_image_source_get(mo))))
-                )
+                   (!evas_object_image_source_get(mo))))
+                 )
                {
                   int iw = 1, ih = 1;
 
                   evas_object_image_size_get(mo, &iw, &ih);
                   evas_map_point_image_uv_set(map, 0, 0.0, 0.0);
-                  evas_map_point_image_uv_set(map, 1, iw , 0.0);
-                  evas_map_point_image_uv_set(map, 2, iw , ih );
-                  evas_map_point_image_uv_set(map, 3, 0.0, ih );
+                  evas_map_point_image_uv_set(map, 1, iw, 0.0);
+                  evas_map_point_image_uv_set(map, 2, iw, ih);
+                  evas_map_point_image_uv_set(map, 3, 0.0, ih);
                }
              evas_map_util_3d_rotate(map,
                                      TO_DOUBLE(pf->map.rotation.x), TO_DOUBLE(pf->map.rotation.y), TO_DOUBLE(pf->map.rotation.z),
@@ -3083,3 +3143,4 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
      }
 #endif
 }
+
diff --git a/src/lib/edje_embryo.c b/src/lib/edje_embryo.c
index ffcbc64..9d85738 100644
--- a/src/lib/edje_embryo.c
+++ b/src/lib/edje_embryo.c
@@ -1674,10 +1674,12 @@ _edje_embryo_fn_custom_state(Embryo_Program *ep, Embryo_Cell *params)
 	  }
 
 	ALLOC_DESC(RECTANGLE, Common, d);
+	ALLOC_DESC(SPACER, Common, d);
 	ALLOC_DESC(SWALLOW, Common, d);
 	ALLOC_DESC(GROUP, Common, d);
 
 	ALLOC_COPY_DESC(IMAGE, Image, d, image);
+	ALLOC_COPY_DESC(PROXY, Proxy, d, proxy);
 	ALLOC_COPY_DESC(TEXT, Text, d, text);
 	ALLOC_COPY_DESC(TEXTBLOCK, Text, d, text);
 	ALLOC_COPY_DESC(BOX, Box, d, box);
@@ -2790,7 +2792,7 @@ _edje_embryo_fn_external_param_get_str(Embryo_Program *ep, Embryo_Cell *params)
      {
 	char *tmp = alloca(dst_len);
 	memcpy(tmp, eep.s, dst_len - 1);
-	tmp[dst_len] = '\0';
+	tmp[dst_len-1] = '\0';
 	SETSTR(tmp, params[3]);
      }
    return 1;
@@ -2891,7 +2893,7 @@ _edje_embryo_fn_external_param_get_choice(Embryo_Program *ep, Embryo_Cell *param
      {
 	char *tmp = alloca(dst_len);
 	memcpy(tmp, eep.s, dst_len - 1);
-	tmp[dst_len] = '\0';
+	tmp[dst_len-1] = '\0';
 	SETSTR(tmp, params[3]);
      }
    return 1;
diff --git a/src/lib/edje_entry.c b/src/lib/edje_entry.c
index 31fc569..711a7ea 100644
--- a/src/lib/edje_entry.c
+++ b/src/lib/edje_entry.c
@@ -669,17 +669,18 @@ _edje_anchor_mouse_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
 
    en = rp->entry_data;
    ignored = rp->part->ignore_flags & ev->event_flags;
-   if ((rp->part->select_mode == EDJE_ENTRY_SELECTION_MODE_EXPLICIT) &&
-       (en->select_allow))
-     return;
    n = an->name;
    if (!n) n = "";
    len = 200 + strlen(n);
    buf = alloca(len);
-   if ((!ev->event_flags) || (!ignored))
+   if ((rp->part->select_mode != EDJE_ENTRY_SELECTION_MODE_EXPLICIT) ||
+       (!en->select_allow))
      {
-        snprintf(buf, len, "anchor,mouse,up,%i,%s", ev->button, n);
-        _edje_emit(rp->edje, buf, rp->part->name);
+        if ((!ev->event_flags) || (!ignored))
+          {
+             snprintf(buf, len, "anchor,mouse,up,%i,%s", ev->button, n);
+             _edje_emit(rp->edje, buf, rp->part->name);
+          }
      }
    if ((rp->still_in) && (rp->clicked_button == ev->button) && (!ignored))
      {
@@ -1192,12 +1193,24 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
    if (en->imf_context)
      {
         Ecore_IMF_Event_Key_Down ecore_ev;
+        Eina_Bool filter_ret;
         ecore_imf_evas_event_key_down_wrap(ev, &ecore_ev);
         if (!en->composing)
           {
-             if (ecore_imf_context_filter_event(en->imf_context,
-                                                ECORE_IMF_EVENT_KEY_DOWN,
-                                                (Ecore_IMF_Event *)&ecore_ev))
+             filter_ret = ecore_imf_context_filter_event(en->imf_context,
+                                                         ECORE_IMF_EVENT_KEY_DOWN,
+                                                         (Ecore_IMF_Event *)&ecore_ev);
+
+             if (!strcmp(ev->keyname, "Down") ||
+                 (!strcmp(ev->keyname, "KP_Down") && !ev->string) ||
+                 !strcmp(ev->keyname, "Up") ||
+                 (!strcmp(ev->keyname, "KP_Up") && !ev->string))
+               {
+                  if (en->have_preedit)
+                    ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+               }
+
+             if (filter_ret)
                return;
           }
      }
diff --git a/src/lib/edje_match.c b/src/lib/edje_match.c
index 6cb4139..5ab68f4 100644
--- a/src/lib/edje_match.c
+++ b/src/lib/edje_match.c
@@ -2,33 +2,33 @@
 
 /* States manipulations. */
 
-typedef struct _Edje_State      Edje_State;
+typedef struct _Edje_State Edje_State;
 struct _Edje_State
 {
-  size_t        idx;
-  size_t        pos;
+   size_t idx;
+   size_t pos;
 };
 
 struct _Edje_States
 {
-  size_t         size;
-  Edje_State    *states;
-  Eina_Bool     *has;
+   size_t      size;
+   Edje_State *states;
+   Eina_Bool  *has;
 };
 
 static void
-_edje_match_states_free(Edje_States      *states,
-                        size_t            states_size)
+_edje_match_states_free(Edje_States *states,
+                        size_t states_size)
 {
-   (void) states_size;
+   (void)states_size;
    free(states);
 }
 
-#define ALIGN(Size)                             \
-  {                                             \
-     Size--;                                    \
-     Size |= sizeof (void*) - 1;                \
-     Size++;                                    \
+#define ALIGN(Size)               \
+  {                               \
+     Size--;                      \
+     Size |= sizeof (void *) - 1; \
+     Size++;                      \
   };
 
 static int
@@ -41,15 +41,15 @@ _edje_match_states_alloc(Edje_Patterns *ppat, int n)
 
    const size_t array_len = (patterns_max_length + 1) * patterns_size;
 
-   size_t       states_size;
-   size_t       has_size;
-   size_t       states_has_size;
-   size_t       struct_size;
+   size_t states_size;
+   size_t has_size;
+   size_t states_has_size;
+   size_t struct_size;
 
-   unsigned char        *states;
-   unsigned char        *has;
+   unsigned char *states;
+   unsigned char *has;
 
-   int          i;
+   int i;
 
    states_size = sizeof (*l->states) * array_len;
    ALIGN(states_size);
@@ -69,16 +69,16 @@ _edje_match_states_alloc(Edje_Patterns *ppat, int n)
    ppat->states = l;
    ppat->states->size = 0;
 
-   states = (unsigned char *) (l + n);
+   states = (unsigned char *)(l + n);
    has = states + states_size;
 
    for (i = 0; i < n; ++i)
      {
-        l[i].states = (Edje_State *) states;
-        l[i].has = (Eina_Bool *) has;
+        l[i].states = (Edje_State *)states;
+        l[i].has = (Eina_Bool *)has;
         l[i].size = 0;
 
-	memset(l[i].has, 0, has_size);
+        memset(l[i].has, 0, has_size);
 
         states += states_has_size;
         has += states_has_size;
@@ -88,10 +88,10 @@ _edje_match_states_alloc(Edje_Patterns *ppat, int n)
 }
 
 static void
-_edje_match_states_insert(Edje_States    *list,
-                          size_t          patterns_max_length,
-                          size_t          idx,
-                          size_t          pos)
+_edje_match_states_insert(Edje_States *list,
+                          size_t patterns_max_length,
+                          size_t idx,
+                          size_t pos)
 {
    size_t i;
 
@@ -99,7 +99,7 @@ _edje_match_states_insert(Edje_States    *list,
 
    if (i < list->size)
      {
-	if (list->has[i]) return;
+        if (list->has[i]) return;
      }
    list->has[i] = 1;
 
@@ -122,17 +122,17 @@ _edje_match_states_clear(Edje_States *list,
 
 enum status
 {
-   patterns_not_found		= 0,
-   patterns_found		= 1,
-   patterns_syntax_error	= 2
+   patterns_not_found           = 0,
+   patterns_found               = 1,
+   patterns_syntax_error        = 2
 };
 
 static size_t
-_edje_match_patterns_exec_class_token(enum status	*status,
-                                      const char	*cl_tok,
-                                      char		 c)
+_edje_match_patterns_exec_class_token(enum status *status,
+                                      const char *cl_tok,
+                                      char c)
 {
-   if (! *cl_tok)
+   if (!*cl_tok)
      {
         *status = patterns_syntax_error;
         return 0;
@@ -140,13 +140,13 @@ _edje_match_patterns_exec_class_token(enum status	*status,
    else if (cl_tok[1] == '-' && cl_tok[2] != ']')
      {
         if (*cl_tok <= c && c <= cl_tok[2])
-           *status = patterns_found;
+          *status = patterns_found;
         return 3;
      }
    else
      {
         if (c == *cl_tok)
-           *status = patterns_found;
+          *status = patterns_found;
         return 1;
      }
 }
@@ -157,29 +157,29 @@ _edje_match_patterns_exec_class_complement(const char *cl_tok, size_t *ret)
    switch (*cl_tok)
      {
       case 0:
-         return EDJE_MATCH_SYNTAX_ERROR;
+        return EDJE_MATCH_SYNTAX_ERROR;
 
       case '!':
         *ret = 1;
-         return EDJE_MATCH_OK;
+        return EDJE_MATCH_OK;
 
       default:
-         *ret = 0;
-         return EDJE_MATCH_OK;
+        *ret = 0;
+        return EDJE_MATCH_OK;
      }
 }
 
 static Edje_Match_Error
-_edje_match_patterns_exec_class(const char	*cl,
-                                char		 c,
-                                size_t          *ret)
+_edje_match_patterns_exec_class(const char *cl,
+                                char c,
+                                size_t *ret)
 {
-   enum status	status = patterns_not_found;
-   int		pos = 1;
-   size_t       neg;
+   enum status status = patterns_not_found;
+   int pos = 1;
+   size_t neg;
 
    if (_edje_match_patterns_exec_class_complement(cl + 1, &neg) != EDJE_MATCH_OK)
-      return EDJE_MATCH_SYNTAX_ERROR;
+     return EDJE_MATCH_SYNTAX_ERROR;
 
    pos += neg;
 
@@ -189,51 +189,51 @@ _edje_match_patterns_exec_class(const char	*cl,
      }
    while (cl[pos] && cl[pos] != ']');
 
-   if (status == patterns_syntax_error || ! cl[pos])
-      return EDJE_MATCH_SYNTAX_ERROR;
+   if (status == patterns_syntax_error || !cl[pos])
+     return EDJE_MATCH_SYNTAX_ERROR;
 
    if (status == patterns_found)
-      *ret = neg ? 0 : pos + 1;
+     *ret = neg ? 0 : pos + 1;
    else
-      *ret = neg ? pos + 1 : 0;
+     *ret = neg ? pos + 1 : 0;
 
    return EDJE_MATCH_OK;
 }
 
 static Edje_Match_Error
-_edje_match_patterns_exec_token(const char	*tok,
-                                char		 c,
-                                size_t          *ret)
+_edje_match_patterns_exec_token(const char *tok,
+                                char c,
+                                size_t *ret)
 {
-  switch (*tok)
-    {
-    case '\\':
-      if (tok[1])
-        {
-           *ret = tok[1] == c ? 2 : 0;
-           return EDJE_MATCH_OK;
-        }
-      return EDJE_MATCH_SYNTAX_ERROR;
+   switch (*tok)
+     {
+      case '\\':
+        if (tok[1])
+          {
+             *ret = tok[1] == c ? 2 : 0;
+             return EDJE_MATCH_OK;
+          }
+        return EDJE_MATCH_SYNTAX_ERROR;
 
-    case '?':
-      *ret = 1;
-      return EDJE_MATCH_OK;
+      case '?':
+        *ret = 1;
+        return EDJE_MATCH_OK;
 
-    case '[':
-       return _edje_match_patterns_exec_class(tok, c, ret);
+      case '[':
+        return _edje_match_patterns_exec_class(tok, c, ret);
 
-    default:
-       *ret = *tok == c ? 1 : 0;
-       return EDJE_MATCH_OK;
-    }
+      default:
+        *ret = *tok == c ? 1 : 0;
+        return EDJE_MATCH_OK;
+     }
 }
 
 static void
-_edje_match_patterns_exec_init_states(Edje_States       *states,
-                                      size_t		 patterns_size,
-                                      size_t             patterns_max_length)
+_edje_match_patterns_exec_init_states(Edje_States *states,
+                                      size_t patterns_size,
+                                      size_t patterns_max_length)
 {
-   size_t       i;
+   size_t i;
 
    states->size = patterns_size;
 
@@ -247,178 +247,178 @@ _edje_match_patterns_exec_init_states(Edje_States       *states,
 
 /* Exported function. */
 
-#define EDJE_MATCH_INIT_LIST(Func, Type, Source, Show)		\
-  Edje_Patterns*                                                \
-  Func(const Eina_List *lst)					\
-  {                                                             \
-     Edje_Patterns      *r;                                     \
-     size_t              i;                                     \
-                                                                \
-     if (!lst || eina_list_count(lst) <= 0)                     \
-       return NULL;                                             \
-                                                                \
-     r = malloc(sizeof (Edje_Patterns) +                        \
-                eina_list_count(lst)                            \
-                * sizeof(*r->finals)                            \
-                * sizeof(*r->patterns));                        \
-     if (!r) return NULL;                                       \
-                                                                \
-     r->ref = 1;						\
-     r->delete_me = 0;						\
-     r->patterns_size = eina_list_count(lst);                   \
-     r->max_length = 0;                                         \
-     r->patterns = (const char **) r->finals + r->patterns_size + 1;    \
-                                                                \
-     for (i = 0; lst; ++i)                                      \
-       {                                                        \
-          const char    *str;                                   \
-          Type          *data;                                  \
-          size_t         j;                                     \
-          int            special = 0;                           \
-                                                                \
-          data = eina_list_data_get(lst);                       \
-          if (!data)                                            \
-            {                                                   \
-               free(r);                                         \
-               return NULL;                                     \
-            }                                                   \
-                                                                \
-          str = data->Source;                                   \
-          if (!str) str = "";                                   \
-          r->patterns[i] = str;                                 \
-                                                                \
-          if (Show)                                             \
-            INF("%lu [%s]", (unsigned long)i, str);	        \
-                                                                \
-          r->finals[i] = 0;                                     \
-          for (j = 0; str[j]; ++j)                              \
-            if (str[j] != '*')                                  \
-              {                                                 \
-                 r->finals[i] = j + 1;                          \
-                 special++;                                     \
-              }                                                 \
-          j += special ? special + 1 : 0;                       \
-                                                                \
-          if (j > r->max_length)                                \
-            r->max_length = j;                                  \
-	                                                        \
-          lst = eina_list_next(lst);                            \
-       }                                                        \
-     								\
-     if (!_edje_match_states_alloc(r, 2))                       \
-       {                                                        \
-          free(r);                                              \
-          return NULL;                                          \
-       }                                                        \
-                                                                \
-     return r;                                                  \
+#define EDJE_MATCH_INIT_LIST(Func, Type, Source, Show)              \
+  Edje_Patterns *                                                   \
+  Func(const Eina_List *lst)                                        \
+  {                                                                 \
+     Edje_Patterns *r;                                              \
+     size_t i;                                                      \
+                                                                    \
+     if (!lst || eina_list_count(lst) <= 0)                         \
+       return NULL;                                                 \
+                                                                    \
+     r = malloc(sizeof (Edje_Patterns) +                            \
+                eina_list_count(lst)                                \
+                * sizeof(*r->finals)                                \
+                * sizeof(*r->patterns));                            \
+     if (!r) return NULL;                                           \
+                                                                    \
+     r->ref = 1;                                                    \
+     r->delete_me = 0;                                              \
+     r->patterns_size = eina_list_count(lst);                       \
+     r->max_length = 0;                                             \
+     r->patterns = (const char **)r->finals + r->patterns_size + 1; \
+                                                                    \
+     for (i = 0; lst; ++i)                                          \
+       {                                                            \
+          const char *str;                                          \
+          Type *data;                                               \
+          size_t j;                                                 \
+          int special = 0;                                          \
+                                                                    \
+          data = eina_list_data_get(lst);                           \
+          if (!data)                                                \
+            {                                                       \
+               free(r);                                             \
+               return NULL;                                         \
+            }                                                       \
+                                                                    \
+          str = data->Source;                                       \
+          if (!str) str = "";                                       \
+          r->patterns[i] = str;                                     \
+                                                                    \
+          if (Show)                                                 \
+            INF("%lu [%s]", (unsigned long)i, str);                 \
+                                                                    \
+          r->finals[i] = 0;                                         \
+          for (j = 0; str[j]; ++j)                                  \
+            if (str[j] != '*')                                      \
+              {                                                     \
+                 r->finals[i] = j + 1;                              \
+                 special++;                                         \
+              }                                                     \
+          j += special ? special + 1 : 0;                           \
+                                                                    \
+          if (j > r->max_length)                                    \
+            r->max_length = j;                                      \
+                                                                    \
+          lst = eina_list_next(lst);                                \
+       }                                                            \
+                                                                    \
+     if (!_edje_match_states_alloc(r, 2))                           \
+       {                                                            \
+          free(r);                                                  \
+          return NULL;                                              \
+       }                                                            \
+                                                                    \
+     return r;                                                      \
   }
 
-#define EDJE_MATCH_INIT_ARRAY(Func, Type, Source, Show)		\
-  Edje_Patterns*                                                \
-  Func(Type * const *lst, unsigned int count)			\
-  {                                                             \
-     Edje_Patterns      *r;                                     \
-     size_t              i;                                     \
-                                                                \
-     if (!lst || count == 0)					\
-       return NULL;                                             \
-                                                                \
-     r = malloc(sizeof (Edje_Patterns) +                        \
-                count						\
-                * sizeof(*r->finals)                            \
-                * sizeof(*r->patterns));                        \
-     if (!r) return NULL;                                       \
-                                                                \
-     r->ref = 1;						\
-     r->delete_me = 0;						\
-     r->patterns_size = count;					\
-     r->max_length = 0;                                         \
-     r->patterns = (const char **) r->finals + r->patterns_size + 1;    \
-                                                                \
-     for (i = 0; i < count; ++i)				\
-       {                                                        \
-          const char    *str;                                   \
-          size_t         j;                                     \
-          int            special = 0;                           \
-                                                                \
-          if (!lst[i])						\
-            {                                                   \
-               free(r);                                         \
-               return NULL;                                     \
-            }                                                   \
-                                                                \
-          str = lst[i]->Source;					\
-          if (!str) str = "";                                   \
-          r->patterns[i] = str;                                 \
-                                                                \
-          if (Show)                                             \
-            INF("%lu [%s]", (unsigned long)i, str);	        \
-                                                                \
-          r->finals[i] = 0;                                     \
-          for (j = 0; str[j]; ++j)                              \
-            if (str[j] != '*')                                  \
-              {                                                 \
-                 r->finals[i] = j + 1;                          \
-                 special++;                                     \
-              }                                                 \
-          j += special ? special + 1 : 0;                       \
-                                                                \
-          if (j > r->max_length)                                \
-            r->max_length = j;                                  \
-       }                                                        \
-                                                                \
-     if (!_edje_match_states_alloc(r, 2))                       \
-       {                                                        \
-          free(r);                                              \
-          return NULL;                                          \
-       }                                                        \
-                                                                \
-     return r;                                                  \
+#define EDJE_MATCH_INIT_ARRAY(Func, Type, Source, Show)             \
+  Edje_Patterns *                                                   \
+  Func(Type * const *lst, unsigned int count)                       \
+  {                                                                 \
+     Edje_Patterns *r;                                              \
+     size_t i;                                                      \
+                                                                    \
+     if (!lst || count == 0)                                        \
+       return NULL;                                                 \
+                                                                    \
+     r = malloc(sizeof (Edje_Patterns) +                            \
+                count                                               \
+                * sizeof(*r->finals)                                \
+                * sizeof(*r->patterns));                            \
+     if (!r) return NULL;                                           \
+                                                                    \
+     r->ref = 1;                                                    \
+     r->delete_me = 0;                                              \
+     r->patterns_size = count;                                      \
+     r->max_length = 0;                                             \
+     r->patterns = (const char **)r->finals + r->patterns_size + 1; \
+                                                                    \
+     for (i = 0; i < count; ++i)                                    \
+       {                                                            \
+          const char *str;                                          \
+          size_t j;                                                 \
+          int special = 0;                                          \
+                                                                    \
+          if (!lst[i])                                              \
+            {                                                       \
+               free(r);                                             \
+               return NULL;                                         \
+            }                                                       \
+                                                                    \
+          str = lst[i]->Source;                                     \
+          if (!str) str = "";                                       \
+          r->patterns[i] = str;                                     \
+                                                                    \
+          if (Show)                                                 \
+            INF("%lu [%s]", (unsigned long)i, str);                 \
+                                                                    \
+          r->finals[i] = 0;                                         \
+          for (j = 0; str[j]; ++j)                                  \
+            if (str[j] != '*')                                      \
+              {                                                     \
+                 r->finals[i] = j + 1;                              \
+                 special++;                                         \
+              }                                                     \
+          j += special ? special + 1 : 0;                           \
+                                                                    \
+          if (j > r->max_length)                                    \
+            r->max_length = j;                                      \
+       }                                                            \
+                                                                    \
+     if (!_edje_match_states_alloc(r, 2))                           \
+       {                                                            \
+          free(r);                                                  \
+          return NULL;                                              \
+       }                                                            \
+                                                                    \
+     return r;                                                      \
   }
 
 EDJE_MATCH_INIT_LIST(edje_match_collection_dir_init,
-		     Edje_Part_Collection_Directory_Entry,
-		     entry, 0);
+                     Edje_Part_Collection_Directory_Entry,
+                     entry, 0);
 EDJE_MATCH_INIT_ARRAY(edje_match_programs_signal_init,
-		     Edje_Program,
-		     signal, 0);
+                      Edje_Program,
+                      signal, 0);
 EDJE_MATCH_INIT_ARRAY(edje_match_programs_source_init,
-		      Edje_Program,
-		      source, 0);
+                      Edje_Program,
+                      source, 0);
 EDJE_MATCH_INIT_LIST(edje_match_callback_signal_init,
-		     Edje_Signal_Callback,
-		     signal, 0);
+                     Edje_Signal_Callback,
+                     signal, 0);
 EDJE_MATCH_INIT_LIST(edje_match_callback_source_init,
-		     Edje_Signal_Callback,
-		     source, 0);
+                     Edje_Signal_Callback,
+                     source, 0);
 
 static Eina_Bool
-_edje_match_collection_dir_exec_finals(const size_t      *finals,
+_edje_match_collection_dir_exec_finals(const size_t *finals,
                                        const Edje_States *states)
 {
-   size_t       i;
+   size_t i;
 
    for (i = 0; i < states->size; ++i)
      {
         if (states->states[i].pos >= finals[states->states[i].idx])
-           return EINA_TRUE;
+          return EINA_TRUE;
      }
    return EINA_FALSE;
 }
 
 static Eina_Bool
-edje_match_programs_exec_check_finals(const size_t      *signal_finals,
-                                      const size_t      *source_finals,
+edje_match_programs_exec_check_finals(const size_t *signal_finals,
+                                      const size_t *source_finals,
                                       const Edje_States *signal_states,
                                       const Edje_States *source_states,
-                                      Edje_Program     **programs,
+                                      Edje_Program **programs,
                                       Eina_Bool (*func)(Edje_Program *pr, void *data),
-                                      void              *data,
-                                      Eina_Bool          prop __UNUSED__)
+                                      void *data,
+                                      Eina_Bool prop __UNUSED__)
 {
-   size_t       i;
-   size_t       j;
+   size_t i;
+   size_t j;
 
    /* when not enought memory, they could be NULL */
    if (!signal_finals || !source_finals) return EINA_TRUE;
@@ -432,13 +432,13 @@ edje_match_programs_exec_check_finals(const size_t      *signal_finals,
                   if (signal_states->states[i].idx == source_states->states[j].idx
                       && source_states->states[j].pos >= source_finals[source_states->states[j].idx])
                     {
-                       Edje_Program  *pr;
+                       Edje_Program *pr;
 
                        pr = programs[signal_states->states[i].idx];
                        if (pr)
                          {
                             if (func(pr, data))
-                               return EINA_FALSE;
+                              return EINA_FALSE;
                          }
                     }
                }
@@ -451,22 +451,22 @@ edje_match_programs_exec_check_finals(const size_t      *signal_finals,
 static int
 edje_match_callback_exec_check_finals(const Edje_Patterns *signal_ppat,
                                       const Edje_Patterns *source_ppat,
-                                      const size_t      *signal_finals,
-                                      const size_t      *source_finals,
+                                      const size_t *signal_finals,
+                                      const size_t *source_finals,
                                       const Edje_States *signal_states,
                                       const Edje_States *source_states,
-                                      const char        *sig,
-                                      const char        *source,
-                                      Eina_List         *callbacks,
-                                      Edje              *ed,
-                                      Eina_Bool          prop
-                                     )
+                                      const char *sig,
+                                      const char *source,
+                                      Eina_List *callbacks,
+                                      Edje *ed,
+                                      Eina_Bool prop
+                                      )
 {
    Edje_Signal_Callback *escb;
-   Eina_Array   run;
-   size_t       i;
-   size_t       j;
-   int          r = 1;
+   Eina_Array run;
+   size_t i;
+   size_t j;
+   int r = 1;
 
    eina_array_step_set(&run, sizeof (Eina_Array), 4);
 
@@ -499,7 +499,7 @@ edje_match_callback_exec_check_finals(const Edje_Patterns *signal_ppat,
      {
         escb->func(escb->data, ed->obj, sig, source);
         if (_edje_block_break(ed))
-	  {
+          {
              r = 0;
              break;
           }
@@ -515,28 +515,27 @@ edje_match_callback_exec_check_finals(const Edje_Patterns *signal_ppat,
    return r;
 }
 
-
-static Edje_States*
-_edje_match_fn(const Edje_Patterns      *ppat,
-               const char               *string,
-               Edje_States              *states)
+static Edje_States *
+_edje_match_fn(const Edje_Patterns *ppat,
+               const char *string,
+               Edje_States *states)
 {
-   Edje_States  *new_states = states + 1;
-   const char   *c;
+   Edje_States *new_states = states + 1;
+   const char *c;
 
    for (c = string; *c && states->size; ++c)
      {
-        size_t  i;
+        size_t i;
 
         _edje_match_states_clear(new_states, ppat->patterns_size, ppat->max_length);
 
         for (i = 0; i < states->size; ++i)
           {
-             const size_t       idx = states->states[i].idx;
-             const size_t       pos = states->states[i].pos;
+             const size_t idx = states->states[i].idx;
+             const size_t pos = states->states[i].pos;
 
              if (!ppat->patterns[idx][pos])
-                continue;
+               continue;
              else if (ppat->patterns[idx][pos] == '*')
                {
                   _edje_match_states_insert(states, ppat->max_length, idx, pos + 1);
@@ -544,34 +543,34 @@ _edje_match_fn(const Edje_Patterns      *ppat,
                }
              else
                {
-                  size_t        m;
+                  size_t m;
 
                   if (_edje_match_patterns_exec_token(ppat->patterns[idx] + pos,
                                                       *c,
                                                       &m) != EDJE_MATCH_OK)
-                     return NULL;
+                    return NULL;
 
                   if (m)
-                     _edje_match_states_insert(new_states, ppat->max_length, idx, pos + m);
+                    _edje_match_states_insert(new_states, ppat->max_length, idx, pos + m);
                }
           }
-          {
-             Edje_States  *tmp = states;
+        {
+           Edje_States *tmp = states;
 
-             states = new_states;
-             new_states = tmp;
-          }
+           states = new_states;
+           new_states = tmp;
+        }
      }
 
    return states;
 }
 
 Eina_Bool
-edje_match_collection_dir_exec(const Edje_Patterns      *ppat,
-                               const char               *string)
+edje_match_collection_dir_exec(const Edje_Patterns *ppat,
+                               const char *string)
 {
-   Edje_States  *result;
-   Eina_Bool     r = EINA_FALSE;
+   Edje_States *result;
+   Eina_Bool r = EINA_FALSE;
 
    /* under high memory presure, it could be NULL */
    if (!ppat) return EINA_FALSE;
@@ -581,24 +580,24 @@ edje_match_collection_dir_exec(const Edje_Patterns      *ppat,
    result = _edje_match_fn(ppat, string, ppat->states);
 
    if (result)
-      r = _edje_match_collection_dir_exec_finals(ppat->finals, result);
+     r = _edje_match_collection_dir_exec_finals(ppat->finals, result);
 
    return r;
 }
 
 Eina_Bool
-edje_match_programs_exec(const Edje_Patterns    *ppat_signal,
-                         const Edje_Patterns    *ppat_source,
-                         const char             *sig,
-                         const char             *source,
-                         Edje_Program          **programs,
+edje_match_programs_exec(const Edje_Patterns *ppat_signal,
+                         const Edje_Patterns *ppat_source,
+                         const char *sig,
+                         const char *source,
+                         Edje_Program **programs,
                          Eina_Bool (*func)(Edje_Program *pr, void *data),
-                         void                   *data,
-                         Eina_Bool               prop)
+                         void *data,
+                         Eina_Bool prop)
 {
-   Edje_States  *signal_result;
-   Edje_States  *source_result;
-   Eina_Bool     r = EINA_FALSE;
+   Edje_States *signal_result;
+   Edje_States *source_result;
+   Eina_Bool r = EINA_FALSE;
 
    /* under high memory presure, they could be NULL */
    if (!ppat_source || !ppat_signal) return EINA_FALSE;
@@ -614,30 +613,30 @@ edje_match_programs_exec(const Edje_Patterns    *ppat_signal,
    source_result = _edje_match_fn(ppat_source, source, ppat_source->states);
 
    if (signal_result && source_result)
-      r = edje_match_programs_exec_check_finals(ppat_signal->finals,
-                                                ppat_source->finals,
-                                                signal_result,
-                                                source_result,
-                                                programs,
-                                                func,
-                                                data,
-                                                prop);
+     r = edje_match_programs_exec_check_finals(ppat_signal->finals,
+                                               ppat_source->finals,
+                                               signal_result,
+                                               source_result,
+                                               programs,
+                                               func,
+                                               data,
+                                               prop);
    return r;
 }
 
 int
-edje_match_callback_exec(Edje_Patterns          *ppat_signal,
-                         Edje_Patterns          *ppat_source,
-                         const char             *sig,
-                         const char             *source,
-                         Eina_List              *callbacks,
-                         Edje                   *ed,
-                         Eina_Bool               prop
-                        )
+edje_match_callback_exec(Edje_Patterns *ppat_signal,
+                         Edje_Patterns *ppat_source,
+                         const char *sig,
+                         const char *source,
+                         Eina_List *callbacks,
+                         Edje *ed,
+                         Eina_Bool prop
+                         )
 {
-   Edje_States  *signal_result;
-   Edje_States  *source_result;
-   int           r = 0;
+   Edje_States *signal_result;
+   Edje_States *source_result;
+   int r = 0;
 
    /* under high memory presure, they could be NULL */
    if (!ppat_source || !ppat_signal) return 0;
@@ -655,17 +654,17 @@ edje_match_callback_exec(Edje_Patterns          *ppat_signal,
    source_result = _edje_match_fn(ppat_source, source, ppat_source->states);
 
    if (signal_result && source_result)
-      r = edje_match_callback_exec_check_finals(ppat_signal,
-                                                ppat_source,
-                                                ppat_signal->finals,
-                                                ppat_source->finals,
-                                                signal_result,
-                                                source_result,
-                                                sig,
-                                                source,
-                                                callbacks,
-                                                ed,
-                                                prop);
+     r = edje_match_callback_exec_check_finals(ppat_signal,
+                                               ppat_source,
+                                               ppat_signal->finals,
+                                               ppat_source->finals,
+                                               signal_result,
+                                               source_result,
+                                               sig,
+                                               source,
+                                               callbacks,
+                                               ed,
+                                               prop);
    ppat_signal->ref--;
    ppat_source->ref--;
    if (ppat_signal->ref <= 0) edje_match_patterns_free(ppat_signal);
@@ -676,7 +675,7 @@ edje_match_callback_exec(Edje_Patterns          *ppat_signal,
 void
 edje_match_patterns_free(Edje_Patterns *ppat)
 {
-   if (!ppat) return ;
+   if (!ppat) return;
 
    ppat->delete_me = 1;
    ppat->ref--;
@@ -699,8 +698,8 @@ _edje_signals_sources_patterns_clean(Edje_Signals_Sources_Patterns *ssp)
 
 static Eina_Rbtree_Direction
 _edje_signal_source_node_cmp(const Edje_Signal_Source_Char *n1,
-			     const Edje_Signal_Source_Char *n2,
-			     __UNUSED__ void *data)
+                             const Edje_Signal_Source_Char *n2,
+                             __UNUSED__ void *data)
 {
    int cmp;
 
@@ -712,9 +711,9 @@ _edje_signal_source_node_cmp(const Edje_Signal_Source_Char *n1,
 
 static int
 _edje_signal_source_key_cmp(const Edje_Signal_Source_Char *node,
-			    const char *sig,
-			    __UNUSED__ int length,
-			    const char *source)
+                            const char *sig,
+                            __UNUSED__ int length,
+                            const char *source)
 {
    int cmp;
 
@@ -724,11 +723,10 @@ _edje_signal_source_key_cmp(const Edje_Signal_Source_Char *node,
    return strcmp(node->source, source);
 }
 
-
 Eina_List *
-edje_match_program_hash_build(Edje_Program * const *programs,
-			      unsigned int count,
-			      Eina_Rbtree **tree)
+edje_match_program_hash_build(Edje_Program *const *programs,
+                              unsigned int count,
+                              Eina_Rbtree **tree)
 {
    Eina_List *result = NULL;
    Eina_Rbtree *new = NULL;
@@ -736,30 +734,30 @@ edje_match_program_hash_build(Edje_Program * const *programs,
 
    for (i = 0; i < count; ++i)
      {
-	if (programs[i]->signal && !strpbrk(programs[i]->signal, "*?[\\")
-	    && programs[i]->source && !strpbrk(programs[i]->source, "*?[\\"))
-	  {
-	     Edje_Signal_Source_Char *item;
-
-	     item = (Edje_Signal_Source_Char*) eina_rbtree_inline_lookup(new, programs[i]->signal, 0,
-									 EINA_RBTREE_CMP_KEY_CB(_edje_signal_source_key_cmp), programs[i]->source);
-	     if (!item)
-	       {
-		  item = malloc(sizeof (Edje_Signal_Source_Char));
-		  if (!item) continue;
-
-		  item->signal = programs[i]->signal;
-		  item->source = programs[i]->source;
-		  item->list = NULL;
-
-		  new = eina_rbtree_inline_insert(new, EINA_RBTREE_GET(item),
-						  EINA_RBTREE_CMP_NODE_CB(_edje_signal_source_node_cmp), NULL);
-	       }
-
-	     item->list = eina_list_prepend(item->list, programs[i]);
-	  }
-	else
-           result = eina_list_prepend(result, programs[i]);
+        if (programs[i]->signal && !strpbrk(programs[i]->signal, "*?[\\")
+            && programs[i]->source && !strpbrk(programs[i]->source, "*?[\\"))
+          {
+             Edje_Signal_Source_Char *item;
+
+             item = (Edje_Signal_Source_Char *)eina_rbtree_inline_lookup(new, programs[i]->signal, 0,
+                                                                         EINA_RBTREE_CMP_KEY_CB(_edje_signal_source_key_cmp), programs[i]->source);
+             if (!item)
+               {
+                  item = malloc(sizeof (Edje_Signal_Source_Char));
+                  if (!item) continue;
+
+                  item->signal = programs[i]->signal;
+                  item->source = programs[i]->source;
+                  item->list = NULL;
+
+                  new = eina_rbtree_inline_insert(new, EINA_RBTREE_GET(item),
+                                                  EINA_RBTREE_CMP_NODE_CB(_edje_signal_source_node_cmp), NULL);
+               }
+
+             item->list = eina_list_prepend(item->list, programs[i]);
+          }
+        else
+          result = eina_list_prepend(result, programs[i]);
      }
 
    *tree = new;
@@ -768,7 +766,7 @@ edje_match_program_hash_build(Edje_Program * const *programs,
 
 Eina_List *
 edje_match_callback_hash_build(const Eina_List *callbacks,
-			       Eina_Rbtree **tree)
+                               Eina_Rbtree **tree)
 {
    Eina_List *result = NULL;
    Eina_Rbtree *new = NULL;
@@ -777,30 +775,30 @@ edje_match_callback_hash_build(const Eina_List *callbacks,
 
    EINA_LIST_FOREACH(callbacks, l, callback)
      {
-	if (callback->signal && !strpbrk(callback->signal, "*?[\\")
-	    && callback->source && !strpbrk(callback->source, "*?[\\"))
-	  {
-	     Edje_Signal_Source_Char *item;
-
-	     item = (Edje_Signal_Source_Char*) eina_rbtree_inline_lookup(new, callback->signal, 0,
-									 EINA_RBTREE_CMP_KEY_CB(_edje_signal_source_key_cmp), callback->source);
-	     if (!item)
-	       {
-		  item = malloc(sizeof (Edje_Signal_Source_Char));
-		  if (!item) continue;
-
-		  item->signal = callback->signal;
-		  item->source = callback->source;
-		  item->list = NULL;
-
-		  new = eina_rbtree_inline_insert(new, EINA_RBTREE_GET(item),
-						  EINA_RBTREE_CMP_NODE_CB(_edje_signal_source_node_cmp), NULL);
-	       }
-
-	     item->list = eina_list_prepend(item->list, callback);
-	  }
-	else
-           result = eina_list_prepend(result, callback);
+        if (callback->signal && !strpbrk(callback->signal, "*?[\\")
+            && callback->source && !strpbrk(callback->source, "*?[\\"))
+          {
+             Edje_Signal_Source_Char *item;
+
+             item = (Edje_Signal_Source_Char *)eina_rbtree_inline_lookup(new, callback->signal, 0,
+                                                                         EINA_RBTREE_CMP_KEY_CB(_edje_signal_source_key_cmp), callback->source);
+             if (!item)
+               {
+                  item = malloc(sizeof (Edje_Signal_Source_Char));
+                  if (!item) continue;
+
+                  item->signal = callback->signal;
+                  item->source = callback->source;
+                  item->list = NULL;
+
+                  new = eina_rbtree_inline_insert(new, EINA_RBTREE_GET(item),
+                                                  EINA_RBTREE_CMP_NODE_CB(_edje_signal_source_node_cmp), NULL);
+               }
+
+             item->list = eina_list_prepend(item->list, callback);
+          }
+        else
+          result = eina_list_prepend(result, callback);
      }
 
    *tree = new;
@@ -809,13 +807,13 @@ edje_match_callback_hash_build(const Eina_List *callbacks,
 
 const Eina_List *
 edje_match_signal_source_hash_get(const char *sig,
-				  const char *source,
-				  const Eina_Rbtree *tree)
+                                  const char *source,
+                                  const Eina_Rbtree *tree)
 {
    Edje_Signal_Source_Char *lookup;
 
-   lookup = (Edje_Signal_Source_Char*) eina_rbtree_inline_lookup(tree, sig, 0,
-								 EINA_RBTREE_CMP_KEY_CB(_edje_signal_source_key_cmp), source);
+   lookup = (Edje_Signal_Source_Char *)eina_rbtree_inline_lookup(tree, sig, 0,
+                                                                 EINA_RBTREE_CMP_KEY_CB(_edje_signal_source_key_cmp), source);
 
    if (lookup) return lookup->list;
    return NULL;
@@ -827,3 +825,4 @@ edje_match_signal_source_free(Edje_Signal_Source_Char *key, __UNUSED__ void *dat
    eina_list_free(key->list);
    free(key);
 }
+
diff --git a/src/lib/edje_program.c b/src/lib/edje_program.c
index 70d26bf..a53001e 100644
--- a/src/lib/edje_program.c
+++ b/src/lib/edje_program.c
@@ -4,14 +4,13 @@ static void _edje_emit_cb(Edje *ed, const char *sig, const char *src, Edje_Messa
 static void _edje_param_copy(Edje_Real_Part *src_part, const char *src_param, Edje_Real_Part *dst_part, const char *dst_param);
 static void _edje_param_set(Edje_Real_Part *part, const char *param, const char *value);
 
-int             _edje_anim_count = 0;
+int _edje_anim_count = 0;
 Ecore_Animator *_edje_timer = NULL;
-Eina_List      *_edje_animators = NULL;
-
+Eina_List *_edje_animators = NULL;
 
 /*============================================================================*
- *                                   API                                      *
- *============================================================================*/
+*                                   API                                      *
+*============================================================================*/
 
 EAPI void
 edje_frametime_set(double t)
@@ -26,7 +25,7 @@ edje_frametime_get(void)
 }
 
 void
-edje_object_propagate_callback_add(Evas_Object *obj, void (*func) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
+edje_object_propagate_callback_add(Evas_Object *obj, void (*func)(void *data, Evas_Object *o, const char *emission, const char *source), void *data)
 {
    Edje *ed;
    Edje_Signal_Callback *escb;
@@ -43,15 +42,15 @@ edje_object_propagate_callback_add(Evas_Object *obj, void (*func) (void *data, E
    ed->callbacks = eina_list_append(ed->callbacks, escb);
    if (ed->walking_callbacks)
      {
-	escb->just_added = 1;
-	ed->just_added_callbacks = 1;
+        escb->just_added = 1;
+        ed->just_added_callbacks = 1;
      }
    else
      _edje_callbacks_patterns_clean(ed);
 }
 
 EAPI void
-edje_object_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, void (*func) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
+edje_object_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, void (*func)(void *data, Evas_Object *o, const char *emission, const char *source), void *data)
 {
    Edje *ed;
    Edje_Signal_Callback *escb;
@@ -70,15 +69,15 @@ edje_object_signal_callback_add(Evas_Object *obj, const char *emission, const ch
    ed->callbacks = eina_list_append(ed->callbacks, escb);
    if (ed->walking_callbacks)
      {
-	escb->just_added = 1;
-	ed->just_added_callbacks = 1;
+        escb->just_added = 1;
+        ed->just_added_callbacks = 1;
      }
    else
      _edje_callbacks_patterns_clean(ed);
 }
 
 EAPI void *
-edje_object_signal_callback_del(Evas_Object *obj, const char *emission, const char *source, void (*func) (void *data, Evas_Object *o, const char *emission, const char *source))
+edje_object_signal_callback_del(Evas_Object *obj, const char *emission, const char *source, void (*func)(void *data, Evas_Object *o, const char *emission, const char *source))
 {
    Edje *ed;
    Eina_List *l;
@@ -90,31 +89,31 @@ edje_object_signal_callback_del(Evas_Object *obj, const char *emission, const ch
    if (ed->delete_me) return NULL;
    EINA_LIST_FOREACH(ed->callbacks, l, escb)
      {
-	if ((escb->func == func) &&
-	    ((!escb->signal && !emission[0]) ||
+        if ((escb->func == func) &&
+            ((!escb->signal && !emission[0]) ||
              (escb->signal && !strcmp(escb->signal, emission))) &&
-	    ((!escb->source && !source[0]) ||
+            ((!escb->source && !source[0]) ||
              (escb->source && !strcmp(escb->source, source))))
-	  {
-	     void *data;
-
-	     data = escb->data;
-	     if (ed->walking_callbacks)
-	       {
-		  escb->delete_me = 1;
-		  ed->delete_callbacks = 1;
-	       }
-	     else
-	       {
-		  _edje_callbacks_patterns_clean(ed);
-
-		  ed->callbacks = eina_list_remove_list(ed->callbacks, l);
-		  if (escb->signal) eina_stringshare_del(escb->signal);
-		  if (escb->source) eina_stringshare_del(escb->source);
-		  free(escb);
-	       }
-	     return data;
-	  }
+          {
+             void *data;
+
+             data = escb->data;
+             if (ed->walking_callbacks)
+               {
+                  escb->delete_me = 1;
+                  ed->delete_callbacks = 1;
+               }
+             else
+               {
+                  _edje_callbacks_patterns_clean(ed);
+
+                  ed->callbacks = eina_list_remove_list(ed->callbacks, l);
+                  if (escb->signal) eina_stringshare_del(escb->signal);
+                  if (escb->source) eina_stringshare_del(escb->source);
+                  free(escb);
+               }
+             return data;
+          }
      }
    return NULL;
 }
@@ -132,31 +131,31 @@ edje_object_signal_callback_del_full(Evas_Object *obj, const char *emission, con
    if (ed->delete_me) return NULL;
    EINA_LIST_FOREACH(ed->callbacks, l, escb)
      {
-	if ((escb->func == func) && (escb->data == data) &&
-	    ((!escb->signal && !emission[0]) ||
+        if ((escb->func == func) && (escb->data == data) &&
+            ((!escb->signal && !emission[0]) ||
              (escb->signal && !strcmp(escb->signal, emission))) &&
-	    ((!escb->source && !source[0]) ||
+            ((!escb->source && !source[0]) ||
              (escb->source && !strcmp(escb->source, source))))
-	  {
-	     void *data2;
-
-	     data2 = escb->data;
-	     if (ed->walking_callbacks)
-	       {
-		  escb->delete_me = 1;
-		  ed->delete_callbacks = 1;
-	       }
-	     else
-	       {
-		  _edje_callbacks_patterns_clean(ed);
-
-		  ed->callbacks = eina_list_remove_list(ed->callbacks, l);
-		  if (escb->signal) eina_stringshare_del(escb->signal);
-		  if (escb->source) eina_stringshare_del(escb->source);
-		  free(escb);
-	       }
-	     return data2;
-	  }
+          {
+             void *data2;
+
+             data2 = escb->data;
+             if (ed->walking_callbacks)
+               {
+                  escb->delete_me = 1;
+                  ed->delete_callbacks = 1;
+               }
+             else
+               {
+                  _edje_callbacks_patterns_clean(ed);
+
+                  ed->callbacks = eina_list_remove_list(ed->callbacks, l);
+                  if (escb->signal) eina_stringshare_del(escb->signal);
+                  if (escb->source) eina_stringshare_del(escb->source);
+                  free(escb);
+               }
+             return data2;
+          }
      }
    return NULL;
 }
@@ -188,25 +187,25 @@ edje_object_play_set(Evas_Object *obj, Eina_Bool play)
    if (ed->delete_me) return;
    if (play)
      {
-	if (!ed->paused) return;
-	ed->paused = 0;
-	t = ecore_time_get() - ed->paused_at;
-	EINA_LIST_FOREACH(ed->actions, l, runp)
-	  runp->start_time += t;
+        if (!ed->paused) return;
+        ed->paused = 0;
+        t = ecore_time_get() - ed->paused_at;
+        EINA_LIST_FOREACH(ed->actions, l, runp)
+          runp->start_time += t;
      }
    else
      {
-	if (ed->paused) return;
-	ed->paused = EINA_TRUE;
-	ed->paused_at = ecore_time_get();
+        if (ed->paused) return;
+        ed->paused = EINA_TRUE;
+        ed->paused_at = ecore_time_get();
      }
 
    for (i = 0; i < ed->table_parts_size; i++)
      {
-	Edje_Real_Part *rp;
-	rp = ed->table_parts[i];
-	if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object)
-	  edje_object_play_set(rp->swallowed_object, play);
+        Edje_Real_Part *rp;
+        rp = ed->table_parts[i];
+        if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object)
+          edje_object_play_set(rp->swallowed_object, play);
      }
 }
 
@@ -238,49 +237,48 @@ edje_object_animation_set(Evas_Object *obj, Eina_Bool on)
    _edje_freeze(ed);
    if (!on)
      {
-	Eina_List *newl = NULL;
-	const void *data;
-
-	EINA_LIST_FOREACH(ed->actions, l, data)
-	  newl = eina_list_append(newl, data);
-	while (newl)
-	  {
-	     Edje_Running_Program *runp;
-
-	     runp = eina_list_data_get(newl);
-	     newl = eina_list_remove(newl, eina_list_data_get(newl));
-	     _edje_program_run_iterate(runp, runp->start_time + TO_DOUBLE(runp->program->tween.time));
-	     if (_edje_block_break(ed))
-	       {
-		  eina_list_free(newl);
-		  goto break_prog;
-	       }
-	  }
+        Eina_List *newl = NULL;
+        const void *data;
+
+        EINA_LIST_FOREACH(ed->actions, l, data)
+          newl = eina_list_append(newl, data);
+        while (newl)
+          {
+             Edje_Running_Program *runp;
+
+             runp = eina_list_data_get(newl);
+             newl = eina_list_remove(newl, eina_list_data_get(newl));
+             _edje_program_run_iterate(runp, runp->start_time + TO_DOUBLE(runp->program->tween.time));
+             if (_edje_block_break(ed))
+               {
+                  eina_list_free(newl);
+                  goto break_prog;
+               }
+          }
      }
    else
      {
-	_edje_emit(ed, "load", NULL);
-	if (evas_object_visible_get(obj))
-	  {
-	     evas_object_hide(obj);
-	     evas_object_show(obj);
-	  }
+        _edje_emit(ed, "load", NULL);
+        if (evas_object_visible_get(obj))
+          {
+             evas_object_hide(obj);
+             evas_object_show(obj);
+          }
      }
-   break_prog:
+break_prog:
 
    for (i = 0; i < ed->table_parts_size; i++)
      {
-	Edje_Real_Part *rp;
-	rp = ed->table_parts[i];
-	if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object)
-	  edje_object_animation_set(rp->swallowed_object, on);
+        Edje_Real_Part *rp;
+        rp = ed->table_parts[i];
+        if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object)
+          edje_object_animation_set(rp->swallowed_object, on);
      }
 
    _edje_thaw(ed);
    _edje_unblock(ed);
 }
 
-
 EAPI Eina_Bool
 edje_object_animation_get(const Evas_Object *obj)
 {
@@ -315,76 +313,77 @@ _edje_program_run_iterate(Edje_Running_Program *runp, double tim)
    if (t > FROM_INT(1)) t = FROM_INT(1);
    EINA_LIST_FOREACH(runp->program->targets, l, pt)
      {
-	if (pt->id >= 0)
-	  {
-	     rp = ed->table_parts[pt->id % ed->table_parts_size];
-	     if (rp) _edje_part_pos_set(ed, rp,
-					runp->program->tween.mode, t,
-                                        runp->program->tween.v1,
-                                        runp->program->tween.v2);
-	  }
+        if (pt->id >= 0)
+          {
+             rp = ed->table_parts[pt->id % ed->table_parts_size];
+             if (rp)
+               _edje_part_pos_set(ed, rp,
+                                  runp->program->tween.mode, t,
+                                  runp->program->tween.v1,
+                                  runp->program->tween.v2);
+          }
      }
    if (t >= FROM_INT(1))
      {
         Edje_Program_After *pa;
 
         EINA_LIST_FOREACH(runp->program->targets, l, pt)
-	  {
-	     if (pt->id >= 0)
-	       {
-		  rp = ed->table_parts[pt->id % ed->table_parts_size];
-		  if (rp)
-		    {
-		       _edje_part_description_apply(ed, rp,
-						    runp->program->state,
-						    runp->program->value,
-						    NULL,
-						    0.0);
-		       _edje_part_pos_set(ed, rp,
-					  runp->program->tween.mode, ZERO,
+          {
+             if (pt->id >= 0)
+               {
+                  rp = ed->table_parts[pt->id % ed->table_parts_size];
+                  if (rp)
+                    {
+                       _edje_part_description_apply(ed, rp,
+                                                    runp->program->state,
+                                                    runp->program->value,
+                                                    NULL,
+                                                    0.0);
+                       _edje_part_pos_set(ed, rp,
+                                          runp->program->tween.mode, ZERO,
                                           runp->program->tween.v1,
                                           runp->program->tween.v2);
-		       rp->program = NULL;
-		    }
-	       }
-	  }
-	_edje_recalc(ed);
-	runp->delete_me = 1;
-	if (!ed->walking_actions)
-	  {
-	     _edje_anim_count--;
-	     ed->actions = eina_list_remove(ed->actions, runp);
-	     if (!ed->actions)
-	       _edje_animators = eina_list_remove(_edje_animators, ed);
-	  }
+                       rp->program = NULL;
+                    }
+               }
+          }
+        _edje_recalc(ed);
+        runp->delete_me = 1;
+        if (!ed->walking_actions)
+          {
+             _edje_anim_count--;
+             ed->actions = eina_list_remove(ed->actions, runp);
+             if (!ed->actions)
+               _edje_animators = eina_list_remove(_edje_animators, ed);
+          }
 //	_edje_emit(ed, "program,stop", runp->program->name);
-	if (_edje_block_break(ed))
-	  {
-	     if (!ed->walking_actions) free(runp);
-	     goto break_prog;
-	  }
-	EINA_LIST_FOREACH(runp->program->after, l, pa)
-	  {
-	     Edje_Program *pr;
-
-	     if (pa->id >= 0)
-	       {
-		  pr = ed->table_programs[pa->id % ed->table_programs_size];
-		  if (pr) _edje_program_run(ed, pr, 0, "", "");
-		  if (_edje_block_break(ed))
-		    {
-		       if (!ed->walking_actions) free(runp);
-		       goto break_prog;
-		    }
-	       }
-	  }
-	_edje_thaw(ed);
-	_edje_unref(ed);
-	if (!ed->walking_actions) free(runp);
-	_edje_unblock(ed);
-	return  EINA_FALSE;
+        if (_edje_block_break(ed))
+          {
+             if (!ed->walking_actions) free(runp);
+             goto break_prog;
+          }
+        EINA_LIST_FOREACH(runp->program->after, l, pa)
+          {
+             Edje_Program *pr;
+
+             if (pa->id >= 0)
+               {
+                  pr = ed->table_programs[pa->id % ed->table_programs_size];
+                  if (pr) _edje_program_run(ed, pr, 0, "", "");
+                  if (_edje_block_break(ed))
+                    {
+                       if (!ed->walking_actions) free(runp);
+                       goto break_prog;
+                    }
+               }
+          }
+        _edje_thaw(ed);
+        _edje_unref(ed);
+        if (!ed->walking_actions) free(runp);
+        _edje_unblock(ed);
+        return EINA_FALSE;
      }
-   break_prog:
+break_prog:
    _edje_recalc(ed);
    _edje_thaw(ed);
    _edje_unref(ed);
@@ -405,38 +404,38 @@ _edje_program_end(Edje *ed, Edje_Running_Program *runp)
    _edje_freeze(ed);
    EINA_LIST_FOREACH(runp->program->targets, l, pt)
      {
-	Edje_Real_Part *rp;
-
-	if (pt->id >= 0)
-	  {
-	     rp = ed->table_parts[pt->id % ed->table_parts_size];
-	     if (rp)
-	       {
-		  _edje_part_description_apply(ed, rp,
-					       runp->program->state,
-					       runp->program->value,
-					       NULL,
-					       0.0);
-		  _edje_part_pos_set(ed, rp,
-				     runp->program->tween.mode, ZERO,
+        Edje_Real_Part *rp;
+
+        if (pt->id >= 0)
+          {
+             rp = ed->table_parts[pt->id % ed->table_parts_size];
+             if (rp)
+               {
+                  _edje_part_description_apply(ed, rp,
+                                               runp->program->state,
+                                               runp->program->value,
+                                               NULL,
+                                               0.0);
+                  _edje_part_pos_set(ed, rp,
+                                     runp->program->tween.mode, ZERO,
                                      runp->program->tween.v1,
                                      runp->program->tween.v2);
-		  rp->program = NULL;
-	       }
-	  }
+                  rp->program = NULL;
+               }
+          }
      }
    _edje_recalc(ed);
    runp->delete_me = 1;
 //   pname = runp->program->name;
    if (!ed->walking_actions)
      {
-	_edje_anim_count--;
-	ed->actions = eina_list_remove(ed->actions, runp);
-	free_runp = 1;
-	if (!ed->actions)
-	  {
-	     _edje_animators = eina_list_remove(_edje_animators, ed);
-	  }
+        _edje_anim_count--;
+        ed->actions = eina_list_remove(ed->actions, runp);
+        free_runp = 1;
+        if (!ed->actions)
+          {
+             _edje_animators = eina_list_remove(_edje_animators, ed);
+          }
      }
 //   _edje_emit(ed, "program,stop", pname);
    _edje_thaw(ed);
@@ -459,30 +458,30 @@ _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig,
    if (ed->delete_me) return;
    if ((pr->in.from > 0.0) && (pr->in.range >= 0.0) && (!force))
      {
-	Edje_Pending_Program *pp;
-	double r = 0.0;
-
-	pp = calloc(1, sizeof(Edje_Pending_Program));
-	if (!pp) return;
-	if (pr->in.range > 0.0) r = ((double)rand() / RAND_MAX);
-	pp->timer = ecore_timer_add(pr->in.from + (pr->in.range * r),
-				    _edje_pending_timer_cb, pp);
-	if (!pp->timer)
-	  {
-	     free(pp);
-	     return;
-	  }
-	pp->edje = ed;
-	pp->program = pr;
-	ed->pending_actions = eina_list_append(ed->pending_actions, pp);
-	return;
+        Edje_Pending_Program *pp;
+        double r = 0.0;
+
+        pp = calloc(1, sizeof(Edje_Pending_Program));
+        if (!pp) return;
+        if (pr->in.range > 0.0) r = ((double)rand() / RAND_MAX);
+        pp->timer = ecore_timer_add(pr->in.from + (pr->in.range * r),
+                                    _edje_pending_timer_cb, pp);
+        if (!pp->timer)
+          {
+             free(pp);
+             return;
+          }
+        pp->edje = ed;
+        pp->program = pr;
+        ed->pending_actions = eina_list_append(ed->pending_actions, pp);
+        return;
      }
    if ((recursions >= 64) || (recursion_limit))
      {
-	ERR("Programs recursing up to recursion limit of %i in '%s' with '%s', '%s' from '%s', '%s'. Disabled.",
-	    64, pr->name, ssig, ssrc, ed->path, ed->group);
-	recursion_limit = 1;
-	return;
+        ERR("Programs recursing up to recursion limit of %i in '%s' with '%s', '%s' from '%s', '%s'. Disabled.",
+            64, pr->name, ssig, ssrc, ed->path, ed->group);
+        recursion_limit = 1;
+        return;
      }
    recursions++;
    _edje_block(ed);
@@ -490,370 +489,380 @@ _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig,
    _edje_freeze(ed);
    switch (pr->action)
      {
-     case EDJE_ACTION_TYPE_STATE_SET:
-	if ((pr->tween.time > ZERO) && (!ed->no_anim))
-	  {
-	     Edje_Running_Program *runp;
-
-	     runp = calloc(1, sizeof(Edje_Running_Program));
-	     EINA_LIST_FOREACH(pr->targets, l, pt)
-	       {
-		  if (pt->id >= 0)
-		    {
-		       rp = ed->table_parts[pt->id % ed->table_parts_size];
-		       if (rp)
-			 {
+      case EDJE_ACTION_TYPE_STATE_SET:
+        if ((pr->tween.time > ZERO) && (!ed->no_anim))
+          {
+             Edje_Running_Program *runp;
+
+             runp = calloc(1, sizeof(Edje_Running_Program));
+             EINA_LIST_FOREACH(pr->targets, l, pt)
+               {
+                  if (pt->id >= 0)
+                    {
+                       rp = ed->table_parts[pt->id % ed->table_parts_size];
+                       if (rp)
+                         {
                             if ((rp->object) && (pr->tween.mode & EDJE_TWEEN_MODE_OPT_FROM_CURRENT))
                               {
                                  Edje_Calc_Params *tmp;
 
                                  tmp = calloc(1, sizeof(Edje_Calc_Params));
                                  if (!tmp) goto low_mem_current;
-				 _edje_part_recalc(ed, rp, FLAG_XY, tmp);
+                                 _edje_part_recalc(ed, rp, FLAG_XY, tmp);
 
                                  if (rp->current) free(rp->current);
                                  rp->current = tmp;
-
-				 rp->current->x -= ed->x;
-				 rp->current->y -= ed->y;
-				 rp->current->map.center.x -= ed->x;
-				 rp->current->map.center.y -= ed->y;
-				 rp->current->map.light.x -= ed->x;
-				 rp->current->map.light.y -= ed->y;
-				 rp->current->map.persp.x -= ed->x;
-				 rp->current->map.persp.y -= ed->y;
                               }
                             else
                               {
-                              low_mem_current:
+low_mem_current:
                                  if (rp->current) free(rp->current);
                                  rp->current = NULL;
                               }
 
-			    if (rp->program)
+                            if (rp->program)
                               _edje_program_end(ed, rp->program);
-			    _edje_part_description_apply(ed, rp,
-							 rp->param1.description->state.name,
-							 rp->param1.description->state.value,
-							 pr->state,
-							 pr->value);
-			    _edje_part_pos_set(ed, rp, pr->tween.mode, ZERO,
+                            _edje_part_description_apply(ed, rp,
+                                                         rp->param1.description->state.name,
+                                                         rp->param1.description->state.value,
+                                                         pr->state,
+                                                         pr->value);
+                            _edje_part_pos_set(ed, rp, pr->tween.mode, ZERO,
                                                pr->tween.v1,
                                                pr->tween.v2);
-			    rp->program = runp;
-			 }
-		    }
-	       }
+                            rp->program = runp;
+                         }
+                    }
+               }
              // _edje_emit(ed, "program,start", pr->name);
-	     if (_edje_block_break(ed))
-	       {
-		  ed->actions = eina_list_append(ed->actions, runp);
-		  goto break_prog;
-	       }
-	     if (!ed->actions)
-	       _edje_animators = eina_list_append(_edje_animators, ed);
-	     ed->actions = eina_list_append(ed->actions, runp);
-	     runp->start_time = ecore_loop_time_get();
-	     runp->edje = ed;
-	     runp->program = pr;
-	     if (!_edje_timer)
-	       _edje_timer = ecore_animator_add(_edje_timer_cb, NULL);
-	     _edje_anim_count++;
-	  }
-	else
-	  {
-	     EINA_LIST_FOREACH(pr->targets, l, pt)
-	       {
-		  if (pt->id >= 0)
-		    {
-		       rp = ed->table_parts[pt->id % ed->table_parts_size];
-		       if (rp)
-			 {
-			    if (rp->program)
+             if (_edje_block_break(ed))
+               {
+                  ed->actions = eina_list_append(ed->actions, runp);
+                  goto break_prog;
+               }
+             if (!ed->actions)
+               _edje_animators = eina_list_append(_edje_animators, ed);
+             ed->actions = eina_list_append(ed->actions, runp);
+             runp->start_time = ecore_loop_time_get();
+             runp->edje = ed;
+             runp->program = pr;
+             if (!_edje_timer)
+               _edje_timer = ecore_animator_add(_edje_timer_cb, NULL);
+             _edje_anim_count++;
+          }
+        else
+          {
+             EINA_LIST_FOREACH(pr->targets, l, pt)
+               {
+                  if (pt->id >= 0)
+                    {
+                       rp = ed->table_parts[pt->id % ed->table_parts_size];
+                       if (rp)
+                         {
+                            if (rp->program)
                               _edje_program_end(ed, rp->program);
-			    _edje_part_description_apply(ed, rp,
-							 pr->state,
-							 pr->value,
-							 NULL,
-							 0.0);
-			    _edje_part_pos_set(ed, rp, pr->tween.mode, ZERO,
+                            _edje_part_description_apply(ed, rp,
+                                                         pr->state,
+                                                         pr->value,
+                                                         NULL,
+                                                         0.0);
+                            _edje_part_pos_set(ed, rp, pr->tween.mode, ZERO,
                                                pr->tween.v1,
                                                pr->tween.v2);
-			 }
-		    }
-	       }
+                         }
+                    }
+               }
              // _edje_emit(ed, "program,start", pr->name);
-	     if (_edje_block_break(ed)) goto break_prog;
+             if (_edje_block_break(ed)) goto break_prog;
              // _edje_emit(ed, "program,stop", pr->name);
-	     if (_edje_block_break(ed)) goto break_prog;
-
-	     EINA_LIST_FOREACH(pr->after, l, pa)
-	       {
-		  if (pa->id >= 0)
-		    {
-		       pr2 = ed->table_programs[pa->id % ed->table_programs_size];
-		       if (pr2) _edje_program_run(ed, pr2, 0, "", "");
-		       if (_edje_block_break(ed)) goto break_prog;
-		    }
-	       }
-	     _edje_recalc(ed);
-	  }
+             if (_edje_block_break(ed)) goto break_prog;
+
+             EINA_LIST_FOREACH(pr->after, l, pa)
+               {
+                  if (pa->id >= 0)
+                    {
+                       pr2 = ed->table_programs[pa->id % ed->table_programs_size];
+                       if (pr2) _edje_program_run(ed, pr2, 0, "", "");
+                       if (_edje_block_break(ed)) goto break_prog;
+                    }
+               }
+             _edje_recalc(ed);
+          }
         break;
-     case EDJE_ACTION_TYPE_ACTION_STOP:
+
+      case EDJE_ACTION_TYPE_ACTION_STOP:
         // _edje_emit(ed, "program,start", pr->name);
         EINA_LIST_FOREACH(pr->targets, l, pt)
-	  {
-	     Eina_List *ll;
-	     Edje_Running_Program *runp;
-	     Edje_Pending_Program *pp;
+          {
+             Eina_List *ll;
+             Edje_Running_Program *runp;
+             Edje_Pending_Program *pp;
 
              for (ll = ed->actions; ll; )
                {
                   runp = ll->data;
                   ll = ll->next;
-		  if (pt->id == runp->program->id)
-		    {
-		       _edje_program_end(ed, runp);
+                  if (pt->id == runp->program->id)
+                    {
+                       _edje_program_end(ed, runp);
 //		       goto done;
-		    }
-	       }
+                    }
+               }
              for (ll = ed->pending_actions; ll; )
-              {
+               {
                   pp = ll->data;
                   ll = ll->next;
-		  if (pt->id == pp->program->id)
-		    {
-		       ed->pending_actions = eina_list_remove(ed->pending_actions, pp);
-		       ecore_timer_del(pp->timer);
-		       free(pp);
+                  if (pt->id == pp->program->id)
+                    {
+                       ed->pending_actions = eina_list_remove(ed->pending_actions, pp);
+                       ecore_timer_del(pp->timer);
+                       free(pp);
 //		       goto done;
-		    }
-	       }
+                    }
+               }
 //	     done:
 //	        continue;
-	  }
+          }
         // _edje_emit(ed, "program,stop", pr->name);
-	if (_edje_block_break(ed)) goto break_prog;
+        if (_edje_block_break(ed)) goto break_prog;
         break;
-     case EDJE_ACTION_TYPE_SIGNAL_EMIT:
+
+      case EDJE_ACTION_TYPE_SIGNAL_EMIT:
         // _edje_emit(ed, "program,start", pr->name);
-	if (_edje_block_break(ed)) goto break_prog;
-	_edje_emit(ed, pr->state, pr->state2);
-	if (_edje_block_break(ed)) goto break_prog;
+        if (_edje_block_break(ed)) goto break_prog;
+        _edje_emit(ed, pr->state, pr->state2);
+        if (_edje_block_break(ed)) goto break_prog;
         // _edje_emit(ed, "program,stop", pr->name);
-	if (_edje_block_break(ed)) goto break_prog;
+        if (_edje_block_break(ed)) goto break_prog;
         break;
-     case EDJE_ACTION_TYPE_DRAG_VAL_SET:
+
+      case EDJE_ACTION_TYPE_DRAG_VAL_SET:
         // _edje_emit(ed, "program,start", pr->name);
-	if (_edje_block_break(ed)) goto break_prog;
-	EINA_LIST_FOREACH(pr->targets, l, pt)
-	  {
-	     if (pt->id >= 0)
-	       {
-		  rp = ed->table_parts[pt->id % ed->table_parts_size];
-		  if ((rp) && (rp->drag) && (rp->drag->down.count == 0))
-		    {
-		       rp->drag->val.x = pr->value;
-		       rp->drag->val.y = pr->value2;
-		       if      (rp->drag->val.x < 0.0) rp->drag->val.x = 0.0;
-		       else if (rp->drag->val.x > 1.0) rp->drag->val.x = 1.0;
-		       if      (rp->drag->val.y < 0.0) rp->drag->val.y = 0.0;
-		       else if (rp->drag->val.y > 1.0) rp->drag->val.y = 1.0;
-		       _edje_dragable_pos_set(ed, rp, rp->drag->val.x, rp->drag->val.y);
-		       _edje_emit(ed, "drag,set", rp->part->name);
-		       if (_edje_block_break(ed)) goto break_prog;
-		    }
-	       }
-	  }
+        if (_edje_block_break(ed)) goto break_prog;
+        EINA_LIST_FOREACH(pr->targets, l, pt)
+          {
+             if (pt->id >= 0)
+               {
+                  rp = ed->table_parts[pt->id % ed->table_parts_size];
+                  if ((rp) && (rp->drag) && (rp->drag->down.count == 0))
+                    {
+                       rp->drag->val.x = pr->value;
+                       rp->drag->val.y = pr->value2;
+                       if (rp->drag->val.x < 0.0) rp->drag->val.x = 0.0;
+                       else if (rp->drag->val.x > 1.0)
+                         rp->drag->val.x = 1.0;
+                       if (rp->drag->val.y < 0.0) rp->drag->val.y = 0.0;
+                       else if (rp->drag->val.y > 1.0)
+                         rp->drag->val.y = 1.0;
+                       _edje_dragable_pos_set(ed, rp, rp->drag->val.x, rp->drag->val.y);
+                       _edje_emit(ed, "drag,set", rp->part->name);
+                       if (_edje_block_break(ed)) goto break_prog;
+                    }
+               }
+          }
         // _edje_emit(ed, "program,stop", pr->name);
-	if (_edje_block_break(ed)) goto break_prog;
+        if (_edje_block_break(ed)) goto break_prog;
         break;
-     case EDJE_ACTION_TYPE_DRAG_VAL_STEP:
+
+      case EDJE_ACTION_TYPE_DRAG_VAL_STEP:
         // _edje_emit(ed, "program,start", pr->name);
-	if (_edje_block_break(ed)) goto break_prog;
-	EINA_LIST_FOREACH(pr->targets, l, pt)
-	  {
-	     if (pt->id >= 0)
-	       {
-		  rp = ed->table_parts[pt->id % ed->table_parts_size];
-		  if ((rp) && (rp->drag) && (rp->drag->down.count == 0))
-		    {
-		       rp->drag->val.x += pr->value * rp->drag->step.x * rp->part->dragable.x;
-		       rp->drag->val.y += pr->value2 * rp->drag->step.y * rp->part->dragable.y;
-		       if      (rp->drag->val.x < 0.0) rp->drag->val.x = 0.0;
-		       else if (rp->drag->val.x > 1.0) rp->drag->val.x = 1.0;
-		       if      (rp->drag->val.y < 0.0) rp->drag->val.y = 0.0;
-		       else if (rp->drag->val.y > 1.0) rp->drag->val.y = 1.0;
-		       _edje_dragable_pos_set(ed, rp, rp->drag->val.x, rp->drag->val.y);
-		       _edje_emit(ed, "drag,step", rp->part->name);
-		       if (_edje_block_break(ed)) goto break_prog;
-		    }
-	       }
-	  }
+        if (_edje_block_break(ed)) goto break_prog;
+        EINA_LIST_FOREACH(pr->targets, l, pt)
+          {
+             if (pt->id >= 0)
+               {
+                  rp = ed->table_parts[pt->id % ed->table_parts_size];
+                  if ((rp) && (rp->drag) && (rp->drag->down.count == 0))
+                    {
+                       rp->drag->val.x += pr->value * rp->drag->step.x * rp->part->dragable.x;
+                       rp->drag->val.y += pr->value2 * rp->drag->step.y * rp->part->dragable.y;
+                       if (rp->drag->val.x < 0.0) rp->drag->val.x = 0.0;
+                       else if (rp->drag->val.x > 1.0)
+                         rp->drag->val.x = 1.0;
+                       if (rp->drag->val.y < 0.0) rp->drag->val.y = 0.0;
+                       else if (rp->drag->val.y > 1.0)
+                         rp->drag->val.y = 1.0;
+                       _edje_dragable_pos_set(ed, rp, rp->drag->val.x, rp->drag->val.y);
+                       _edje_emit(ed, "drag,step", rp->part->name);
+                       if (_edje_block_break(ed)) goto break_prog;
+                    }
+               }
+          }
         // _edje_emit(ed, "program,stop", pr->name);
-	if (_edje_block_break(ed)) goto break_prog;
+        if (_edje_block_break(ed)) goto break_prog;
         break;
-     case EDJE_ACTION_TYPE_DRAG_VAL_PAGE:
+
+      case EDJE_ACTION_TYPE_DRAG_VAL_PAGE:
         // _edje_emit(ed, "program,start", pr->name);
-	if (_edje_block_break(ed)) goto break_prog;
-	EINA_LIST_FOREACH(pr->targets, l, pt)
-	  {
-	     if (pt->id >= 0)
-	       {
-		  rp = ed->table_parts[pt->id % ed->table_parts_size];
-		  if ((rp) && (rp->drag) && (rp->drag->down.count == 0))
-		    {
-		       rp->drag->val.x += pr->value * rp->drag->page.x * rp->part->dragable.x;
-		       rp->drag->val.y += pr->value2 * rp->drag->page.y * rp->part->dragable.y;
-		       if      (rp->drag->val.x < 0.0) rp->drag->val.x = 0.0;
-		       else if (rp->drag->val.x > 1.0) rp->drag->val.x = 1.0;
-		       if      (rp->drag->val.y < 0.0) rp->drag->val.y = 0.0;
-		       else if (rp->drag->val.y > 1.0) rp->drag->val.y = 1.0;
-		       _edje_dragable_pos_set(ed, rp, rp->drag->val.x, rp->drag->val.y);
-		       _edje_emit(ed, "drag,page", rp->part->name);
-		       if (_edje_block_break(ed)) goto break_prog;
-		    }
-	       }
-	  }
+        if (_edje_block_break(ed)) goto break_prog;
+        EINA_LIST_FOREACH(pr->targets, l, pt)
+          {
+             if (pt->id >= 0)
+               {
+                  rp = ed->table_parts[pt->id % ed->table_parts_size];
+                  if ((rp) && (rp->drag) && (rp->drag->down.count == 0))
+                    {
+                       rp->drag->val.x += pr->value * rp->drag->page.x * rp->part->dragable.x;
+                       rp->drag->val.y += pr->value2 * rp->drag->page.y * rp->part->dragable.y;
+                       if (rp->drag->val.x < 0.0) rp->drag->val.x = 0.0;
+                       else if (rp->drag->val.x > 1.0)
+                         rp->drag->val.x = 1.0;
+                       if (rp->drag->val.y < 0.0) rp->drag->val.y = 0.0;
+                       else if (rp->drag->val.y > 1.0)
+                         rp->drag->val.y = 1.0;
+                       _edje_dragable_pos_set(ed, rp, rp->drag->val.x, rp->drag->val.y);
+                       _edje_emit(ed, "drag,page", rp->part->name);
+                       if (_edje_block_break(ed)) goto break_prog;
+                    }
+               }
+          }
         // _edje_emit(ed, "program,stop", pr->name);
-	if (_edje_block_break(ed)) goto break_prog;
+        if (_edje_block_break(ed)) goto break_prog;
         break;
-     case EDJE_ACTION_TYPE_SCRIPT:
-          {
-             char fname[128];
 
-             // _edje_emit(ed, "program,start", pr->name);
-             if (_edje_block_break(ed)) goto break_prog;
-             snprintf(fname, sizeof(fname), "_p%i", pr->id);
-             _edje_embryo_test_run(ed, fname, ssig, ssrc);
-             // _edje_emit(ed, "program,stop", pr->name);
-             if (_edje_block_break(ed)) goto break_prog;
-             _edje_recalc_do(ed);
+      case EDJE_ACTION_TYPE_SCRIPT:
+      {
+         char fname[128];
+
+         // _edje_emit(ed, "program,start", pr->name);
+         if (_edje_block_break(ed)) goto break_prog;
+         snprintf(fname, sizeof(fname), "_p%i", pr->id);
+         _edje_embryo_test_run(ed, fname, ssig, ssrc);
+         // _edje_emit(ed, "program,stop", pr->name);
+         if (_edje_block_break(ed)) goto break_prog;
+         _edje_recalc_do(ed);
+      }
+      break;
+
+      case EDJE_ACTION_TYPE_FOCUS_SET:
+        if (!pr->targets)
+          ed->focused_part = NULL;
+        else
+          {
+             EINA_LIST_FOREACH(pr->targets, l, pt)
+               {
+                  if (pt->id >= 0)
+                    {
+                       rp = ed->table_parts[pt->id % ed->table_parts_size];
+                       if (rp)
+                         {
+                            if (ed->focused_part != rp)
+                              {
+                                 if (ed->focused_part)
+                                   _edje_emit(ed, "focus,part,out",
+                                              ed->focused_part->part->name);
+                                 ed->focused_part = rp;
+                                 _edje_emit(ed, "focus,part,in",
+                                            ed->focused_part->part->name);
+                              }
+                         }
+                    }
+               }
           }
         break;
-     case EDJE_ACTION_TYPE_FOCUS_SET:
-	if (!pr->targets)
-           ed->focused_part = NULL;
-	else
-	  {
-	     EINA_LIST_FOREACH(pr->targets, l, pt)
-	       {
-		  if (pt->id >= 0)
-		    {
-		       rp = ed->table_parts[pt->id % ed->table_parts_size];
-		       if (rp)
-			 {
-			    if (ed->focused_part != rp)
-			      {
-				 if (ed->focused_part)
-				   _edje_emit(ed, "focus,part,out", 
-					      ed->focused_part->part->name);
-				 ed->focused_part = rp;
-				 _edje_emit(ed, "focus,part,in",
-					    ed->focused_part->part->name);
-			      }
- 			 }
-		    }
-	       }
-	  }
-        break;
-     case EDJE_ACTION_TYPE_FOCUS_OBJECT:
-	if (!pr->targets)
-	  {
-	     Evas_Object *focused;
-
-	     focused = evas_focus_get(evas_object_evas_get(ed->obj));
-	     if (focused)
-	       {
-		  unsigned int i;
-
-		  /* Check if the current swallowed object is one of my child. */
-		  for (i = 0; i < ed->table_parts_size; ++i)
-		    {
-		       rp = ed->table_parts[i];
-		       if (rp && rp->swallowed_object == focused)
-			 {
-			    evas_object_focus_set(focused, EINA_FALSE);
-			    break;
-			 }
-		    }
-	       }
-	  }
-	else
-	  {
-	     EINA_LIST_FOREACH(pr->targets, l, pt)
-	       {
-		  if (pt->id >= 0)
-		    {
-		       rp = ed->table_parts[pt->id % ed->table_parts_size];
-		       if (rp && rp->swallowed_object)
-                          evas_object_focus_set(rp->swallowed_object, EINA_TRUE);
-		    }
-	       }
-	  }
+
+      case EDJE_ACTION_TYPE_FOCUS_OBJECT:
+        if (!pr->targets)
+          {
+             Evas_Object *focused;
+
+             focused = evas_focus_get(evas_object_evas_get(ed->obj));
+             if (focused)
+               {
+                  unsigned int i;
+
+                  /* Check if the current swallowed object is one of my child. */
+                  for (i = 0; i < ed->table_parts_size; ++i)
+                    {
+                       rp = ed->table_parts[i];
+                       if (rp && rp->swallowed_object == focused)
+                         {
+                            evas_object_focus_set(focused, EINA_FALSE);
+                            break;
+                         }
+                    }
+               }
+          }
+        else
+          {
+             EINA_LIST_FOREACH(pr->targets, l, pt)
+               {
+                  if (pt->id >= 0)
+                    {
+                       rp = ed->table_parts[pt->id % ed->table_parts_size];
+                       if (rp && rp->swallowed_object)
+                         evas_object_focus_set(rp->swallowed_object, EINA_TRUE);
+                    }
+               }
+          }
         break;
-     case EDJE_ACTION_TYPE_SOUND_SAMPLE:
+
+      case EDJE_ACTION_TYPE_SOUND_SAMPLE:
         if (_edje_block_break(ed))
           goto break_prog;
         _edje_multisense_internal_sound_sample_play(ed, pr->sample_name, pr->speed);
         break;
-     case EDJE_ACTION_TYPE_SOUND_TONE:
+
+      case EDJE_ACTION_TYPE_SOUND_TONE:
         if (_edje_block_break(ed))
           goto break_prog;
         _edje_multisense_internal_sound_tone_play(ed, pr->tone_name, pr->duration);
         break;
-     case EDJE_ACTION_TYPE_PARAM_COPY:
-          {
-             Edje_Real_Part *src_part, *dst_part;
 
-             // _edje_emit(ed, "program,start", pr->name);
-             if (_edje_block_break(ed)) goto break_prog;
-             
-             src_part = ed->table_parts[pr->param.src % ed->table_parts_size];
-             dst_part = ed->table_parts[pr->param.dst % ed->table_parts_size];
-             _edje_param_copy(src_part, pr->state, dst_part, pr->state2);
-             
-             if (_edje_block_break(ed)) goto break_prog;
-             // _edje_emit(ed, "program,stop", pr->name);
-             if (_edje_block_break(ed)) goto break_prog;
-          }
-        break;
-     case EDJE_ACTION_TYPE_PARAM_SET:
-          {
-             Edje_Real_Part *part;
+      case EDJE_ACTION_TYPE_PARAM_COPY:
+      {
+         Edje_Real_Part *src_part, *dst_part;
 
-             // _edje_emit(ed, "program,start", pr->name);
-             if (_edje_block_break(ed)) goto break_prog;
-             
-             part = ed->table_parts[pr->param.dst % ed->table_parts_size];
-             _edje_param_set(part, pr->state, pr->state2);
-             
-             if (_edje_block_break(ed)) goto break_prog;
-             // _edje_emit(ed, "program,stop", pr->name);
-             if (_edje_block_break(ed)) goto break_prog;
-          }
-        break;
-     default:
+         // _edje_emit(ed, "program,start", pr->name);
+         if (_edje_block_break(ed)) goto break_prog;
+
+         src_part = ed->table_parts[pr->param.src % ed->table_parts_size];
+         dst_part = ed->table_parts[pr->param.dst % ed->table_parts_size];
+         _edje_param_copy(src_part, pr->state, dst_part, pr->state2);
+
+         if (_edje_block_break(ed)) goto break_prog;
+         // _edje_emit(ed, "program,stop", pr->name);
+         if (_edje_block_break(ed)) goto break_prog;
+      }
+      break;
+
+      case EDJE_ACTION_TYPE_PARAM_SET:
+      {
+         Edje_Real_Part *part;
+
+         // _edje_emit(ed, "program,start", pr->name);
+         if (_edje_block_break(ed)) goto break_prog;
+
+         part = ed->table_parts[pr->param.dst % ed->table_parts_size];
+         _edje_param_set(part, pr->state, pr->state2);
+
+         if (_edje_block_break(ed)) goto break_prog;
+         // _edje_emit(ed, "program,stop", pr->name);
+         if (_edje_block_break(ed)) goto break_prog;
+      }
+      break;
+
+      default:
         // _edje_emit(ed, "program,start", pr->name);
         // _edje_emit(ed, "program,stop", pr->name);
         break;
      }
    if (!((pr->action == EDJE_ACTION_TYPE_STATE_SET)
-	 /* hmm this fucks somethgin up. must look into it later */
-	 /* && (pr->tween.time > ZERO) && (!ed->no_anim))) */
-	 ))
+         /* hmm this fucks somethgin up. must look into it later */
+         /* && (pr->tween.time > ZERO) && (!ed->no_anim))) */
+         ))
      {
         EINA_LIST_FOREACH(pr->after, l, pa)
-	  {
-	     if (pa->id >= 0)
-	       {
-		  pr2 = ed->table_programs[pa->id % ed->table_programs_size];
-		  if (pr2) _edje_program_run(ed, pr2, 0, "", "");
-		  if (_edje_block_break(ed)) goto break_prog;
-	       }
-	  }
+          {
+             if (pa->id >= 0)
+               {
+                  pr2 = ed->table_programs[pa->id % ed->table_programs_size];
+                  if (pr2) _edje_program_run(ed, pr2, 0, "", "");
+                  if (_edje_block_break(ed)) goto break_prog;
+               }
+          }
      }
-   break_prog:
+break_prog:
    _edje_thaw(ed);
    _edje_unref(ed);
    recursions--;
@@ -907,23 +916,24 @@ _edje_emit_full(Edje *ed, const char *sig, const char *src, void *data, void (*f
              char *alias;
 
              alias = eina_hash_find(ed->collection->alias, part);
-             if (alias) {
-                char *aliased;
-                int alien;
-                int nslen;
-
-                alien = strlen(alias);
-                nslen = strlen(newsig);
-                length = alien + nslen + 2;
-
-                aliased = alloca(length);
-                memcpy(aliased, alias, alien);
-                aliased[alien] = EDJE_PART_PATH_SEPARATOR;
-                memcpy(aliased + alien + 1, newsig, nslen + 1);
-
-                _edje_emit(ed, aliased, src);
-                return;
-             }
+             if (alias)
+               {
+                  char *aliased;
+                  int alien;
+                  int nslen;
+
+                  alien = strlen(alias);
+                  nslen = strlen(newsig);
+                  length = alien + nslen + 2;
+
+                  aliased = alloca(length);
+                  memcpy(aliased, alias, alien);
+                  aliased[alien] = EDJE_PART_PATH_SEPARATOR;
+                  memcpy(aliased + alien + 1, newsig, nslen + 1);
+
+                  _edje_emit(ed, aliased, src);
+                  return;
+               }
           }
 
         /* search for the index if present and remove it from the part */
@@ -937,7 +947,7 @@ _edje_emit_full(Edje *ed, const char *sig, const char *src, void *data, void (*f
                {
                   char *tmp;
 
-                  tmp = alloca(end - idx - 1);
+                  tmp = alloca(end - idx);
                   memcpy(tmp, idx + 1, end - idx - 1);
                   tmp[end - idx - 1] = '\0';
                   *idx = '\0';
@@ -956,54 +966,54 @@ _edje_emit_full(Edje *ed, const char *sig, const char *src, void *data, void (*f
         switch (rp->part->type)
           {
            case EDJE_PART_TYPE_GROUP:
-              if (!rp->swallowed_object) goto end;
-              ed2 = _edje_fetch(rp->swallowed_object);
-              if (!ed2) goto end;
+             if (!rp->swallowed_object) goto end;
+             ed2 = _edje_fetch(rp->swallowed_object);
+             if (!ed2) goto end;
 
-              _edje_emit(ed2, newsig, src);
-	      broadcast = EINA_FALSE;
-              break;
+             _edje_emit(ed2, newsig, src);
+             broadcast = EINA_FALSE;
+             break;
 
            case EDJE_PART_TYPE_EXTERNAL:
-              if (!rp->swallowed_object) break ;
-
-              if (!idx)
-                {
-                   _edje_external_signal_emit(rp->swallowed_object, newsig, src);
-                }
-              else
-                {
-                   Evas_Object *child;
-
-                   child = _edje_children_get(rp, idx);
-                   ed2 = _edje_fetch(child);
-                   if (!ed2) goto end;
-                   _edje_emit(ed2, newsig, src);
-                }
-	      broadcast = EINA_FALSE;
-              break ;
+             if (!rp->swallowed_object) break;
+
+             if (!idx)
+               {
+                  _edje_external_signal_emit(rp->swallowed_object, newsig, src);
+               }
+             else
+               {
+                  Evas_Object *child;
+
+                  child = _edje_children_get(rp, idx);
+                  ed2 = _edje_fetch(child);
+                  if (!ed2) goto end;
+                  _edje_emit(ed2, newsig, src);
+               }
+             broadcast = EINA_FALSE;
+             break;
 
            case EDJE_PART_TYPE_BOX:
            case EDJE_PART_TYPE_TABLE:
-              if (idx)
-                {
-                   Evas_Object *child;
-
-                   child = _edje_children_get(rp, idx);
-                   ed2 = _edje_fetch(child);
-                   if (!ed2) goto end;
-                   _edje_emit(ed2, newsig, src);
-		   broadcast = EINA_FALSE;
-                }
-              break ;
+             if (idx)
+               {
+                  Evas_Object *child;
+
+                  child = _edje_children_get(rp, idx);
+                  ed2 = _edje_fetch(child);
+                  if (!ed2) goto end;
+                  _edje_emit(ed2, newsig, src);
+                  broadcast = EINA_FALSE;
+               }
+             break;
 
            default:
 //              ERR("SPANK SPANK SPANK !!!\nYou should never be here !");
-              break;
+             break;
           }
      }
 
- end:
+end:
    emsg.sig = sig;
    emsg.src = src;
    if (data)
@@ -1046,12 +1056,13 @@ _edje_emit_full(Edje *ed, const char *sig, const char *src, void *data, void (*f
 
 struct _Edje_Program_Data
 {
-  Eina_List     *matches;
-  Edje          *ed;
-  const char    *source;
+   Eina_List  *matches;
+   Edje       *ed;
+   const char *source;
 };
 
-static Eina_Bool _edje_glob_callback(Edje_Program *pr, void *dt)
+static Eina_Bool
+_edje_glob_callback(Edje_Program *pr, void *dt)
 {
    struct _Edje_Program_Data *data = dt;
    Edje_Real_Part *rp = NULL;
@@ -1059,9 +1070,9 @@ static Eina_Bool _edje_glob_callback(Edje_Program *pr, void *dt)
 
    if (pr->filter.state)
      {
-	rp = _edje_real_part_get(data->ed, pr->filter.part ? pr->filter.part : data->source);
-	if (rp)
-          exec = (rp->chosen_description->state.name == pr->filter.state);
+        rp = _edje_real_part_get(data->ed, pr->filter.part ? pr->filter.part : data->source);
+        if (rp)
+          exec = !strcmp(rp->chosen_description->state.name, pr->filter.state);
      }
 
    pr->exec = exec;
@@ -1074,11 +1085,13 @@ static Eina_Bool _edje_glob_callback(Edje_Program *pr, void *dt)
 void
 _edje_callbacks_patterns_clean(Edje *ed)
 {
+   if (ed->walking_callbacks > 0) return;
+
    _edje_signals_sources_patterns_clean(&ed->patterns.callbacks);
 
    eina_rbtree_delete(ed->patterns.callbacks.exact_match,
-		      EINA_RBTREE_FREE_CB(edje_match_signal_source_free),
-		      NULL);
+                      EINA_RBTREE_FREE_CB(edje_match_signal_source_free),
+                      NULL);
    ed->patterns.callbacks.exact_match = NULL;
 
    ed->patterns.callbacks.u.callbacks.globing = eina_list_free(ed->patterns.callbacks.u.callbacks.globing);
@@ -1094,7 +1107,7 @@ _edje_callbacks_patterns_init(Edje *ed)
      return;
 
    ssp->u.callbacks.globing = edje_match_callback_hash_build(ed->callbacks,
-							     &ssp->exact_match);
+                                                             &ssp->exact_match);
 
    ssp->signals_patterns = edje_match_callback_signal_init(ssp->u.callbacks.globing);
    ssp->sources_patterns = edje_match_callback_source_init(ssp->u.callbacks.globing);
@@ -1112,106 +1125,106 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src,
    _edje_block(ed);
    _edje_ref(ed);
    _edje_freeze(ed);
-   
+
    if (ed->collection && ed->L)
      _edje_lua2_script_func_signal(ed, sig, src);
 
    if (ed->collection)
      {
 #ifdef EDJE_PROGRAM_CACHE
-	Edje_Part_Collection *ec;
-	char *tmps;
-	int l1, l2;
+        Edje_Part_Collection *ec;
+        char *tmps;
+        int l1, l2;
 #endif
-	int done;
+        int done;
 
 #ifdef EDJE_PROGRAM_CACHE
-	ec = ed->collection;
-	l1 = strlen(sig);
-	l2 = strlen(src);
-	tmps = alloca(l1 + l2 + 3); /* \0, \337, \0 */
-	strcpy(tmps, sig);
-	tmps[l1] = '\377';
-	strcpy(&(tmps[l1 + 1]), src);
+        ec = ed->collection;
+        l1 = strlen(sig);
+        l2 = strlen(src);
+        tmps = alloca(l1 + l2 + 3); /* \0, \337, \0 */
+        strcpy(tmps, sig);
+        tmps[l1] = '\377';
+        strcpy(&(tmps[l1 + 1]), src);
 #endif
-	done = 0;
+        done = 0;
 
 #ifdef EDJE_PROGRAM_CACHE
-	  {
-	     Eina_List *matches;
-	     Eina_List *l;
-	     Edje_Program *pr;
-
-	     if (eina_hash_find(ec->prog_cache.no_matches, tmps))
-	       {
- 		  done = 1;
-	       }
-	     else if ((matches = eina_hash_find(ec->prog_cache.matches, tmps)))
-	       {
-                  EINA_LIST_FOREACH(matches, l, pr)
-		    {
-                       Eina_Bool exec = EINA_TRUE;
-
-                       if (pr->filter.state)
+        {
+           Eina_List *matches;
+           Eina_List *l;
+           Edje_Program *pr;
+
+           if (eina_hash_find(ec->prog_cache.no_matches, tmps))
+             {
+                done = 1;
+             }
+           else if ((matches = eina_hash_find(ec->prog_cache.matches, tmps)))
+             {
+                EINA_LIST_FOREACH(matches, l, pr)
+                  {
+                     Eina_Bool exec = EINA_TRUE;
+
+                     if (pr->filter.state)
+                       {
+                          Edje_Real_Part *rp;
+
+                          rp = _edje_real_part_get(ed, pr->filter.part ? pr->filter.part : src);
+                          if (rp)
+                            {
+                               if (rp->program)
+                                 exec = EINA_FALSE;
+                               else
+                                 exec = (rp->chosen_description->state.name == pr->filter.state);
+                            }
+                       }
+
+                     pr->exec = exec;
+                  }
+
+                EINA_LIST_FOREACH(matches, l, pr)
+                  if (pr->exec)
+                    {
+                       _edje_program_run(ed, pr, 0, sig, src);
+                       if (_edje_block_break(ed))
                          {
-                            Edje_Real_Part *rp;
-
-                            rp = _edje_real_part_get(ed, pr->filter.part ? pr->filter.part : src);
-                            if (rp)
-                              {
-                                 if (rp->program)
-                                   exec = EINA_FALSE;
-                                 else
-                                   exec = (rp->chosen_description->state.name == pr->filter.state);
-                              }
+                            goto break_prog;
                          }
+                    }
 
-                       pr->exec = exec;
-		    }
-
-                  EINA_LIST_FOREACH(matches, l, pr)
-                    if (pr->exec)
-                      {
-                         _edje_program_run(ed, pr, 0, sig, src);
-                         if (_edje_block_break(ed))
-                           {
-                              goto break_prog;
-                           }
-                      }
-
-		  done = 1;
-	       }
-	  }
+                done = 1;
+             }
+        }
 #endif
-	if (!done)
-	  {
-             struct _Edje_Program_Data  data;
+        if (!done)
+          {
+             struct _Edje_Program_Data data;
 
              data.ed = ed;
              data.source = src;
-	     data.matches = NULL;
+             data.matches = NULL;
 
              if (ed->table_programs_size > 0)
                {
-		  const Eina_List *match;
-		  const Eina_List *l;
-		  Edje_Program *pr;
-
-		  if (ed->patterns.programs.u.programs.globing)
-		    if (edje_match_programs_exec(ed->patterns.programs.signals_patterns,
-						 ed->patterns.programs.sources_patterns,
-						 sig,
-						 src,
-						 ed->patterns.programs.u.programs.globing,
-						 _edje_glob_callback,
-						 &data,
+                  const Eina_List *match;
+                  const Eina_List *l;
+                  Edje_Program *pr;
+
+                  if (ed->patterns.programs.u.programs.globing)
+                    if (edje_match_programs_exec(ed->patterns.programs.signals_patterns,
+                                                 ed->patterns.programs.sources_patterns,
+                                                 sig,
+                                                 src,
+                                                 ed->patterns.programs.u.programs.globing,
+                                                 _edje_glob_callback,
+                                                 &data,
                                                  prop) == 0)
-		      goto break_prog;
+                      goto break_prog;
 
-		  match = edje_match_signal_source_hash_get(sig, src,
-							    ed->patterns.programs.exact_match);
-		  EINA_LIST_FOREACH(match, l, pr)
-		    _edje_glob_callback(pr, &data);
+                  match = edje_match_signal_source_hash_get(sig, src,
+                                                            ed->patterns.programs.exact_match);
+                  EINA_LIST_FOREACH(match, l, pr)
+                    _edje_glob_callback(pr, &data);
 
 #ifdef EDJE_PROGRAM_CACHE
                   EINA_LIST_FOREACH(data.matches, l, pr)
@@ -1232,30 +1245,30 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src,
                }
 
 #ifdef EDJE_PROGRAM_CACHE
-	     if (tmps)
-	       {
-		  if (data.matches == NULL)
-		    {
-		      if (!ec->prog_cache.no_matches)
-			ec->prog_cache.no_matches = eina_hash_string_superfast_new(NULL);
-		      eina_hash_add(ec->prog_cache.no_matches, tmps, ed);
-		    }
-		  else
-		    {
-		      if (!ec->prog_cache.matches)
-			ec->prog_cache.matches = eina_hash_string_superfast_new(NULL);
-		      eina_hash_add(ec->prog_cache.matches, tmps, data.matches);
-		    }
-	       }
+             if (tmps)
+               {
+                  if (data.matches == NULL)
+                    {
+                       if (!ec->prog_cache.no_matches)
+                         ec->prog_cache.no_matches = eina_hash_string_superfast_new(NULL);
+                       eina_hash_add(ec->prog_cache.no_matches, tmps, ed);
+                    }
+                  else
+                    {
+                       if (!ec->prog_cache.matches)
+                         ec->prog_cache.matches = eina_hash_string_superfast_new(NULL);
+                       eina_hash_add(ec->prog_cache.matches, tmps, data.matches);
+                    }
+               }
 #endif
-	  }
-	_edje_emit_cb(ed, sig, src, sdata, prop);
-	if (_edje_block_break(ed))
-	  {
-	     goto break_prog;
-	  }
+          }
+        _edje_emit_cb(ed, sig, src, sdata, prop);
+        if (_edje_block_break(ed))
+          {
+             goto break_prog;
+          }
      }
-   break_prog:
+break_prog:
    _edje_thaw(ed);
    _edje_unref(ed);
    _edje_unblock(ed);
@@ -1274,7 +1287,7 @@ edje_object_signal_callback_extra_data_get(void)
 static void
 _edje_emit_cb(Edje *ed, const char *sig, const char *src, Edje_Message_Signal_Data *data, Eina_Bool prop)
 {
-   Eina_List            *l;
+   Eina_List *l;
 
    if (ed->delete_me) return;
    _edje_ref(ed);
@@ -1288,28 +1301,28 @@ _edje_emit_cb(Edje *ed, const char *sig, const char *src, Edje_Message_Signal_Da
 
    if (ed->callbacks)
      {
-	Edje_Signal_Callback *escb;
-	const Eina_List *match;
-	const Eina_List *l2;
+        Edje_Signal_Callback *escb;
+        const Eina_List *match;
+        const Eina_List *l2;
         int r = 1;
         callback_extra_data = (data) ? data->data : NULL;
 
-	_edje_callbacks_patterns_init(ed);
-	if (ed->patterns.callbacks.u.callbacks.globing)
-	  r = edje_match_callback_exec(ed->patterns.callbacks.signals_patterns,
-				       ed->patterns.callbacks.sources_patterns,
-				       sig,
-				       src,
-				       ed->patterns.callbacks.u.callbacks.globing,
-				       ed,
+        _edje_callbacks_patterns_init(ed);
+        if (ed->patterns.callbacks.u.callbacks.globing)
+          r = edje_match_callback_exec(ed->patterns.callbacks.signals_patterns,
+                                       ed->patterns.callbacks.sources_patterns,
+                                       sig,
+                                       src,
+                                       ed->patterns.callbacks.u.callbacks.globing,
+                                       ed,
                                        prop);
 
         if (!r)
           goto break_prog;
 
-	match = edje_match_signal_source_hash_get(sig, src,
-						  ed->patterns.callbacks.exact_match);
-	EINA_LIST_FOREACH(match, l2, escb)
+        match = edje_match_signal_source_hash_get(sig, src,
+                                                  ed->patterns.callbacks.exact_match);
+        EINA_LIST_FOREACH(match, l2, escb)
           {
              if ((prop) && (escb->propagate)) continue;
              if ((!escb->just_added) && (!escb->delete_me))
@@ -1320,31 +1333,31 @@ _edje_emit_cb(Edje *ed, const char *sig, const char *src, Edje_Message_Signal_Da
                }
           }
      }
-   break_prog:
+break_prog:
 
    ed->walking_callbacks--;
    if (!ed->walking_callbacks &&
        ((ed->delete_callbacks) || (ed->just_added_callbacks)))
      {
-	ed->delete_callbacks = 0;
-	ed->just_added_callbacks = 0;
-	l = ed->callbacks;
-	while (l)
-	  {
-	     Edje_Signal_Callback *escb = l->data;
-	     Eina_List *next_l = l->next;
-
-	     if (escb->just_added)
-	       escb->just_added = 0;
-	     if (escb->delete_me)
-	       {
-		  ed->callbacks = eina_list_remove_list(ed->callbacks, l);
-		  if (escb->signal) eina_stringshare_del(escb->signal);
-		  if (escb->source) eina_stringshare_del(escb->source);
-		  free(escb);
-	       }
-	     l = next_l;
-	  }
+        ed->delete_callbacks = 0;
+        ed->just_added_callbacks = 0;
+        l = ed->callbacks;
+        while (l)
+          {
+             Edje_Signal_Callback *escb = l->data;
+             Eina_List *next_l = l->next;
+
+             if (escb->just_added)
+               escb->just_added = 0;
+             if (escb->delete_me)
+               {
+                  ed->callbacks = eina_list_remove_list(ed->callbacks, l);
+                  if (escb->signal) eina_stringshare_del(escb->signal);
+                  if (escb->source) eina_stringshare_del(escb->source);
+                  free(escb);
+               }
+             l = next_l;
+          }
 
         _edje_callbacks_patterns_clean(ed);
      }
@@ -1391,146 +1404,146 @@ _edje_param_native_get(Edje_Real_Part *rp, const char *name, Edje_External_Param
    if ((rp->part->type == EDJE_PART_TYPE_TEXT) ||
        (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK))
      {
-	if (!strcmp(name, "text"))
-	  {
-	     param->name = name;
-	     param->type = EDJE_EXTERNAL_PARAM_TYPE_STRING;
-
-	     _edje_recalc_do(rp->edje);
-	     if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
-	       param->s = _edje_entry_text_get(rp);
-	     else if (rp->part->type == EDJE_PART_TYPE_TEXT)
-		    param->s = rp->text.text;
-	     else
-	       param->s = evas_object_textblock_text_markup_get(rp->object);
-	     return param;
-	  }
-	if (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK)
-	  {
-	     if (!strcmp(name, "text_unescaped"))
-	       {
-		  param->name = name;
-		  param->type = EDJE_EXTERNAL_PARAM_TYPE_STRING;
-
-		  _edje_recalc_do(rp->edje);
-		  if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
-		    {
-		       const char *tmp = _edje_entry_text_get(rp);
-		       char *unescaped = _edje_text_unescape(tmp);
-		       *free_ptr = unescaped;
-		       param->s = unescaped;
-		    }
-		  else if (rp->part->type == EDJE_PART_TYPE_TEXT)
-		    param->s = rp->text.text;
-		  else
-		    {
-		       const char *tmp;
-		       char *unescaped;
-
-		       tmp = evas_object_textblock_text_markup_get(rp->object);
-		       unescaped = _edje_text_unescape(tmp);
-		       *free_ptr = unescaped;
-		       param->s = unescaped;
-		    }
-
-		  return param;
-	       }
-
-	     if ((rp->entry_data) &&
-		 (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) &&
-		 (!strcmp(name, "select_allow")))
-	       {
-		  param->name = name;
-		  param->type = EDJE_EXTERNAL_PARAM_TYPE_BOOL;
-		  param->i = _edje_entry_select_allow_get(rp);
-		  return param;
-	       }
-	  }
+        if (!strcmp(name, "text"))
+          {
+             param->name = name;
+             param->type = EDJE_EXTERNAL_PARAM_TYPE_STRING;
+
+             _edje_recalc_do(rp->edje);
+             if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+               param->s = _edje_entry_text_get(rp);
+             else if (rp->part->type == EDJE_PART_TYPE_TEXT)
+               param->s = rp->text.text;
+             else
+               param->s = evas_object_textblock_text_markup_get(rp->object);
+             return param;
+          }
+        if (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK)
+          {
+             if (!strcmp(name, "text_unescaped"))
+               {
+                  param->name = name;
+                  param->type = EDJE_EXTERNAL_PARAM_TYPE_STRING;
+
+                  _edje_recalc_do(rp->edje);
+                  if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+                    {
+                       const char *tmp = _edje_entry_text_get(rp);
+                       char *unescaped = _edje_text_unescape(tmp);
+                       *free_ptr = unescaped;
+                       param->s = unescaped;
+                    }
+                  else if (rp->part->type == EDJE_PART_TYPE_TEXT)
+                    param->s = rp->text.text;
+                  else
+                    {
+                       const char *tmp;
+                       char *unescaped;
+
+                       tmp = evas_object_textblock_text_markup_get(rp->object);
+                       unescaped = _edje_text_unescape(tmp);
+                       *free_ptr = unescaped;
+                       param->s = unescaped;
+                    }
+
+                  return param;
+               }
+
+             if ((rp->entry_data) &&
+                 (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) &&
+                 (!strcmp(name, "select_allow")))
+               {
+                  param->name = name;
+                  param->type = EDJE_EXTERNAL_PARAM_TYPE_BOOL;
+                  param->i = _edje_entry_select_allow_get(rp);
+                  return param;
+               }
+          }
      }
 
    if ((rp->drag) && (rp->drag->down.count == 0))
      {
-	if (!strncmp(name, "drag_", sizeof("drag_") - 1))
-	  {
-	     const char *sub_name = name + sizeof("drag_") - 1;
-	     if (!strcmp(sub_name, "value_x"))
-	       {
-		  double d;
-
-		  _edje_recalc_do(rp->edje);
-		  d = TO_DOUBLE(rp->drag->val.x);
-		  if (rp->part->dragable.x < 0) d = 1.0 - d;
-		  param->name = name;
-		  param->type = EDJE_EXTERNAL_PARAM_TYPE_DOUBLE;
-		  param->d = d;
-		  return param;
-	       }
-	     if (!strcmp(sub_name, "value_y"))
-	       {
-		  double d;
-
-		  _edje_recalc_do(rp->edje);
-		  d = TO_DOUBLE(rp->drag->val.y);
-		  if (rp->part->dragable.y < 0) d = 1.0 - d;
-		  param->name = name;
-		  param->type = EDJE_EXTERNAL_PARAM_TYPE_DOUBLE;
-		  param->d = d;
-		  return param;
-	       }
-
-	     if (!strcmp(sub_name, "size_w"))
-	       {
-		  _edje_recalc_do(rp->edje);
-		  param->name = name;
-		  param->type = EDJE_EXTERNAL_PARAM_TYPE_DOUBLE;
-		  param->d = TO_DOUBLE(rp->drag->size.x);
-		  return param;
-	       }
-	     if (!strcmp(sub_name, "size_h"))
-	       {
-		  _edje_recalc_do(rp->edje);
-		  param->name = name;
-		  param->type = EDJE_EXTERNAL_PARAM_TYPE_DOUBLE;
-		  param->d = TO_DOUBLE(rp->drag->size.y);
-		  return param;
-	       }
-
-	     if (!strcmp(sub_name, "step_x"))
-	       {
-		  _edje_recalc_do(rp->edje);
-		  param->name = name;
-		  param->type = EDJE_EXTERNAL_PARAM_TYPE_DOUBLE;
-		  param->d = TO_DOUBLE(rp->drag->step.x);
-		  return param;
-	       }
-	     if (!strcmp(sub_name, "step_y"))
-	       {
-		  _edje_recalc_do(rp->edje);
-		  param->name = name;
-		  param->type = EDJE_EXTERNAL_PARAM_TYPE_DOUBLE;
-		  param->d = TO_DOUBLE(rp->drag->step.y);
-		  return param;
-	       }
-
-	     if (!strcmp(sub_name, "page_x"))
-	       {
-		  _edje_recalc_do(rp->edje);
-		  param->name = name;
-		  param->type = EDJE_EXTERNAL_PARAM_TYPE_DOUBLE;
-		  param->d = TO_DOUBLE(rp->drag->page.x);
-		  return param;
-	       }
-	     if (!strcmp(sub_name, "page_y"))
-	       {
-		  _edje_recalc_do(rp->edje);
-		  param->name = name;
-		  param->type = EDJE_EXTERNAL_PARAM_TYPE_DOUBLE;
-		  param->d = TO_DOUBLE(rp->drag->page.y);
-		  return param;
-	       }
-
-	     return NULL;
-	  }
+        if (!strncmp(name, "drag_", sizeof("drag_") - 1))
+          {
+             const char *sub_name = name + sizeof("drag_") - 1;
+             if (!strcmp(sub_name, "value_x"))
+               {
+                  double d;
+
+                  _edje_recalc_do(rp->edje);
+                  d = TO_DOUBLE(rp->drag->val.x);
+                  if (rp->part->dragable.x < 0) d = 1.0 - d;
+                  param->name = name;
+                  param->type = EDJE_EXTERNAL_PARAM_TYPE_DOUBLE;
+                  param->d = d;
+                  return param;
+               }
+             if (!strcmp(sub_name, "value_y"))
+               {
+                  double d;
+
+                  _edje_recalc_do(rp->edje);
+                  d = TO_DOUBLE(rp->drag->val.y);
+                  if (rp->part->dragable.y < 0) d = 1.0 - d;
+                  param->name = name;
+                  param->type = EDJE_EXTERNAL_PARAM_TYPE_DOUBLE;
+                  param->d = d;
+                  return param;
+               }
+
+             if (!strcmp(sub_name, "size_w"))
+               {
+                  _edje_recalc_do(rp->edje);
+                  param->name = name;
+                  param->type = EDJE_EXTERNAL_PARAM_TYPE_DOUBLE;
+                  param->d = TO_DOUBLE(rp->drag->size.x);
+                  return param;
+               }
+             if (!strcmp(sub_name, "size_h"))
+               {
+                  _edje_recalc_do(rp->edje);
+                  param->name = name;
+                  param->type = EDJE_EXTERNAL_PARAM_TYPE_DOUBLE;
+                  param->d = TO_DOUBLE(rp->drag->size.y);
+                  return param;
+               }
+
+             if (!strcmp(sub_name, "step_x"))
+               {
+                  _edje_recalc_do(rp->edje);
+                  param->name = name;
+                  param->type = EDJE_EXTERNAL_PARAM_TYPE_DOUBLE;
+                  param->d = TO_DOUBLE(rp->drag->step.x);
+                  return param;
+               }
+             if (!strcmp(sub_name, "step_y"))
+               {
+                  _edje_recalc_do(rp->edje);
+                  param->name = name;
+                  param->type = EDJE_EXTERNAL_PARAM_TYPE_DOUBLE;
+                  param->d = TO_DOUBLE(rp->drag->step.y);
+                  return param;
+               }
+
+             if (!strcmp(sub_name, "page_x"))
+               {
+                  _edje_recalc_do(rp->edje);
+                  param->name = name;
+                  param->type = EDJE_EXTERNAL_PARAM_TYPE_DOUBLE;
+                  param->d = TO_DOUBLE(rp->drag->page.x);
+                  return param;
+               }
+             if (!strcmp(sub_name, "page_y"))
+               {
+                  _edje_recalc_do(rp->edje);
+                  param->name = name;
+                  param->type = EDJE_EXTERNAL_PARAM_TYPE_DOUBLE;
+                  param->d = TO_DOUBLE(rp->drag->page.y);
+                  return param;
+               }
+
+             return NULL;
+          }
      }
 
    return NULL;
@@ -1542,163 +1555,163 @@ _edje_param_native_set(Edje_Real_Part *rp, const char *name, const Edje_External
    if ((rp->part->type == EDJE_PART_TYPE_TEXT) ||
        (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK))
      {
-	if (!strcmp(name, "text"))
-	  {
-	     if (param->type != EDJE_EXTERNAL_PARAM_TYPE_STRING)
-	       return EINA_FALSE;
-
-	     _edje_object_part_text_raw_set
-	       (rp->edje->obj, rp, rp->part->name, param->s);
-	     return EINA_TRUE;
-	  }
-	if (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK)
-	  {
-	     if (!strcmp(name, "text_unescaped"))
-	       {
-		  if (param->type != EDJE_EXTERNAL_PARAM_TYPE_STRING)
-		    return EINA_FALSE;
-
-		  if (rp->part->type == EDJE_PART_TYPE_TEXT)
-		    _edje_object_part_text_raw_set
-		      (rp->edje->obj, rp, rp->part->name, param->s);
-		  else
-		    {
-		       char *escaped = _edje_text_escape(param->s);
-		      _edje_object_part_text_raw_set
-			 (rp->edje->obj, rp, rp->part->name, escaped);
-		       free(escaped);
-		    }
-
-		  return EINA_TRUE;
-	       }
-
-	     if ((rp->entry_data) &&
-		 (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) &&
-		 (!strcmp(name, "select_allow")))
-	       {
-		  if (param->type != EDJE_EXTERNAL_PARAM_TYPE_BOOL)
-		    return EINA_FALSE;
-		  _edje_entry_select_allow_set(rp, param->i);
-		  return EINA_TRUE;
-	       }
-	  }
+        if (!strcmp(name, "text"))
+          {
+             if (param->type != EDJE_EXTERNAL_PARAM_TYPE_STRING)
+               return EINA_FALSE;
+
+             _edje_object_part_text_raw_set
+               (rp->edje->obj, rp, rp->part->name, param->s);
+             return EINA_TRUE;
+          }
+        if (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK)
+          {
+             if (!strcmp(name, "text_unescaped"))
+               {
+                  if (param->type != EDJE_EXTERNAL_PARAM_TYPE_STRING)
+                    return EINA_FALSE;
+
+                  if (rp->part->type == EDJE_PART_TYPE_TEXT)
+                    _edje_object_part_text_raw_set
+                      (rp->edje->obj, rp, rp->part->name, param->s);
+                  else
+                    {
+                       char *escaped = _edje_text_escape(param->s);
+                       _edje_object_part_text_raw_set
+                         (rp->edje->obj, rp, rp->part->name, escaped);
+                       free(escaped);
+                    }
+
+                  return EINA_TRUE;
+               }
+
+             if ((rp->entry_data) &&
+                 (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) &&
+                 (!strcmp(name, "select_allow")))
+               {
+                  if (param->type != EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+                    return EINA_FALSE;
+                  _edje_entry_select_allow_set(rp, param->i);
+                  return EINA_TRUE;
+               }
+          }
      }
 
    if ((rp->drag) && (rp->drag->down.count == 0))
      {
-	if (!strncmp(name, "drag_", sizeof("drag_") - 1))
-	  {
-	     const char *sub_name = name + sizeof("drag_") - 1;
-	     if (!strcmp(sub_name, "value_x"))
-	       {
-		  double d;
-		  if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
-		    return EINA_FALSE;
-		  d = param->d;
-		  if (rp->part->dragable.confine_id != -1)
-		    d = CLAMP(d, 0.0, 1.0);
-		  if (rp->part->dragable.x < 0) d = 1.0 - d;
-		  if (rp->drag->val.x == FROM_DOUBLE(d)) return EINA_TRUE;
-		  rp->drag->val.x = FROM_DOUBLE(d);
+        if (!strncmp(name, "drag_", sizeof("drag_") - 1))
+          {
+             const char *sub_name = name + sizeof("drag_") - 1;
+             if (!strcmp(sub_name, "value_x"))
+               {
+                  double d;
+                  if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+                    return EINA_FALSE;
+                  d = param->d;
+                  if (rp->part->dragable.confine_id != -1)
+                    d = CLAMP(d, 0.0, 1.0);
+                  if (rp->part->dragable.x < 0) d = 1.0 - d;
+                  if (rp->drag->val.x == FROM_DOUBLE(d)) return EINA_TRUE;
+                  rp->drag->val.x = FROM_DOUBLE(d);
 #ifdef EDJE_CALC_CACHE
-		  rp->invalidate = 1;
+                  rp->invalidate = 1;
 #endif
-		  _edje_dragable_pos_set
-		    (rp->edje, rp, rp->drag->val.x, rp->drag->val.y);
-		  _edje_emit(rp->edje, "drag,set", rp->part->name);
-		  return EINA_TRUE;
-	       }
-	     if (!strcmp(sub_name, "value_y"))
-	       {
-		  double d;
-		  if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
-		    return EINA_FALSE;
-		  d = param->d;
-		  if (rp->part->dragable.confine_id != -1)
-		    d = CLAMP(d, 0.0, 1.0);
-		  if (rp->part->dragable.y < 0) d = 1.0 - d;
-		  if (rp->drag->val.y == FROM_DOUBLE(d)) return EINA_TRUE;
-		  rp->drag->val.y = FROM_DOUBLE(d);
+                  _edje_dragable_pos_set
+                    (rp->edje, rp, rp->drag->val.x, rp->drag->val.y);
+                  _edje_emit(rp->edje, "drag,set", rp->part->name);
+                  return EINA_TRUE;
+               }
+             if (!strcmp(sub_name, "value_y"))
+               {
+                  double d;
+                  if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+                    return EINA_FALSE;
+                  d = param->d;
+                  if (rp->part->dragable.confine_id != -1)
+                    d = CLAMP(d, 0.0, 1.0);
+                  if (rp->part->dragable.y < 0) d = 1.0 - d;
+                  if (rp->drag->val.y == FROM_DOUBLE(d)) return EINA_TRUE;
+                  rp->drag->val.y = FROM_DOUBLE(d);
 #ifdef EDJE_CALC_CACHE
-		  rp->invalidate = 1;
+                  rp->invalidate = 1;
 #endif
-		  _edje_dragable_pos_set
-		    (rp->edje, rp, rp->drag->val.x, rp->drag->val.y);
-		  _edje_emit(rp->edje, "drag,set", rp->part->name);
-		  return EINA_TRUE;
-	       }
-
-	     if (!strcmp(sub_name, "size_w"))
-	       {
-		  if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
-		    return EINA_FALSE;
-		  rp->drag->size.x = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0));
+                  _edje_dragable_pos_set
+                    (rp->edje, rp, rp->drag->val.x, rp->drag->val.y);
+                  _edje_emit(rp->edje, "drag,set", rp->part->name);
+                  return EINA_TRUE;
+               }
+
+             if (!strcmp(sub_name, "size_w"))
+               {
+                  if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+                    return EINA_FALSE;
+                  rp->drag->size.x = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0));
                   rp->edje->recalc_call = 1;
-		  rp->edje->dirty = 1;
+                  rp->edje->dirty = 1;
 #ifdef EDJE_CALC_CACHE
-		  rp->invalidate = 1;
+                  rp->invalidate = 1;
 #endif
-		  _edje_recalc(rp->edje);
-		  return EINA_TRUE;
-	       }
-	     if (!strcmp(sub_name, "size_h"))
-	       {
-		  if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
-		    return EINA_FALSE;
-		  rp->drag->size.y = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0));
+                  _edje_recalc(rp->edje);
+                  return EINA_TRUE;
+               }
+             if (!strcmp(sub_name, "size_h"))
+               {
+                  if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+                    return EINA_FALSE;
+                  rp->drag->size.y = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0));
                   rp->edje->recalc_call = 1;
-		  rp->edje->dirty = 1;
+                  rp->edje->dirty = 1;
 #ifdef EDJE_CALC_CACHE
-		  rp->invalidate = 1;
+                  rp->invalidate = 1;
 #endif
-		  _edje_recalc(rp->edje);
-		  return EINA_TRUE;
-	       }
-
-	     if (!strcmp(sub_name, "step_x"))
-	       {
-		  if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
-		    return EINA_FALSE;
-		  rp->drag->step.x = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0));
+                  _edje_recalc(rp->edje);
+                  return EINA_TRUE;
+               }
+
+             if (!strcmp(sub_name, "step_x"))
+               {
+                  if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+                    return EINA_FALSE;
+                  rp->drag->step.x = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0));
 #ifdef EDJE_CALC_CACHE
-		  rp->invalidate = 1;
+                  rp->invalidate = 1;
 #endif
-		  return EINA_TRUE;
-	       }
-	     if (!strcmp(sub_name, "step_y"))
-	       {
-		  if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
-		    return EINA_FALSE;
-		  rp->drag->step.y = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0));
+                  return EINA_TRUE;
+               }
+             if (!strcmp(sub_name, "step_y"))
+               {
+                  if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+                    return EINA_FALSE;
+                  rp->drag->step.y = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0));
 #ifdef EDJE_CALC_CACHE
-		  rp->invalidate = 1;
+                  rp->invalidate = 1;
 #endif
-		  return EINA_TRUE;
-	       }
-
-	     if (!strcmp(sub_name, "page_x"))
-	       {
-		  if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
-		    return EINA_FALSE;
-		  rp->drag->page.x = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0));
+                  return EINA_TRUE;
+               }
+
+             if (!strcmp(sub_name, "page_x"))
+               {
+                  if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+                    return EINA_FALSE;
+                  rp->drag->page.x = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0));
 #ifdef EDJE_CALC_CACHE
-		  rp->invalidate = 1;
+                  rp->invalidate = 1;
 #endif
-		  return EINA_TRUE;
-	       }
-	     if (!strcmp(sub_name, "page_y"))
-	       {
-		  if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
-		    return EINA_FALSE;
-		  rp->drag->page.y = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0));
+                  return EINA_TRUE;
+               }
+             if (!strcmp(sub_name, "page_y"))
+               {
+                  if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+                    return EINA_FALSE;
+                  rp->drag->page.y = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0));
 #ifdef EDJE_CALC_CACHE
-		  rp->invalidate = 1;
+                  rp->invalidate = 1;
 #endif
-		  return EINA_TRUE;
-	       }
+                  return EINA_TRUE;
+               }
 
-	     return EINA_FALSE;
-	  }
+             return EINA_FALSE;
+          }
      }
 
    return EINA_FALSE;
@@ -1710,85 +1723,85 @@ _edje_native_param_info_get(const Edje_Real_Part *rp, const char *name)
    if ((rp->part->type == EDJE_PART_TYPE_TEXT) ||
        (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK))
      {
-	if (!strcmp(name, "text"))
-	  {
-	     static const Edje_External_Param_Info pi =
-	       EDJE_EXTERNAL_PARAM_INFO_STRING("text");
-	     return &pi;
-	  }
-	if (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK)
-	  {
-	     if (!strcmp(name, "text_unescaped"))
-	       {
-		  static const Edje_External_Param_Info pi =
-		    EDJE_EXTERNAL_PARAM_INFO_STRING("text_unescaped");
-		  return &pi;
-	       }
-	     if (!strcmp(name, "select_allow"))
-	       {
-		  static const Edje_External_Param_Info pi =
-		    EDJE_EXTERNAL_PARAM_INFO_BOOL("text_unescaped");
-		  return &pi;
-	       }
-	  }
+        if (!strcmp(name, "text"))
+          {
+             static const Edje_External_Param_Info pi =
+               EDJE_EXTERNAL_PARAM_INFO_STRING("text");
+             return &pi;
+          }
+        if (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK)
+          {
+             if (!strcmp(name, "text_unescaped"))
+               {
+                  static const Edje_External_Param_Info pi =
+                    EDJE_EXTERNAL_PARAM_INFO_STRING("text_unescaped");
+                  return &pi;
+               }
+             if (!strcmp(name, "select_allow"))
+               {
+                  static const Edje_External_Param_Info pi =
+                    EDJE_EXTERNAL_PARAM_INFO_BOOL("text_unescaped");
+                  return &pi;
+               }
+          }
      }
 
    if ((rp->drag) && (rp->drag->down.count == 0))
      {
-	if (!strncmp(name, "drag_", sizeof("drag_") - 1))
-	  {
-	     name += sizeof("drag_") - 1;
-	     if (!strcmp(name, "value_x"))
-	       {
-		  static const Edje_External_Param_Info pi =
-		    EDJE_EXTERNAL_PARAM_INFO_DOUBLE("drag_value_x");
-		  return &pi;
-	       }
-	     if (!strcmp(name, "value_y"))
-	       {
-		  static const Edje_External_Param_Info pi =
-		    EDJE_EXTERNAL_PARAM_INFO_DOUBLE("drag_value_y");
-		  return &pi;
-	       }
-	     if (!strcmp(name, "size_w"))
-	       {
-		  static const Edje_External_Param_Info pi =
-		    EDJE_EXTERNAL_PARAM_INFO_DOUBLE("drag_size_w");
-		  return &pi;
-	       }
-	     if (!strcmp(name, "size_h"))
-	       {
-		  static const Edje_External_Param_Info pi =
-		    EDJE_EXTERNAL_PARAM_INFO_DOUBLE("drag_size_h");
-		  return &pi;
-	       }
-	     if (!strcmp(name, "step_x"))
-	       {
-		  static const Edje_External_Param_Info pi =
-		    EDJE_EXTERNAL_PARAM_INFO_DOUBLE("drag_step_x");
-		  return &pi;
-	       }
-	     if (!strcmp(name, "step_y"))
-	       {
-		  static const Edje_External_Param_Info pi =
-		    EDJE_EXTERNAL_PARAM_INFO_DOUBLE("drag_step_y");
-		  return &pi;
-	       }
-	     if (!strcmp(name, "page_x"))
-	       {
-		  static const Edje_External_Param_Info pi =
-		    EDJE_EXTERNAL_PARAM_INFO_DOUBLE("drag_page_x");
-		  return &pi;
-	       }
-	     if (!strcmp(name, "page_y"))
-	       {
-		  static const Edje_External_Param_Info pi =
-		    EDJE_EXTERNAL_PARAM_INFO_DOUBLE("drag_page_y");
-		  return &pi;
-	       }
-
-	     return NULL;
-	  }
+        if (!strncmp(name, "drag_", sizeof("drag_") - 1))
+          {
+             name += sizeof("drag_") - 1;
+             if (!strcmp(name, "value_x"))
+               {
+                  static const Edje_External_Param_Info pi =
+                    EDJE_EXTERNAL_PARAM_INFO_DOUBLE("drag_value_x");
+                  return &pi;
+               }
+             if (!strcmp(name, "value_y"))
+               {
+                  static const Edje_External_Param_Info pi =
+                    EDJE_EXTERNAL_PARAM_INFO_DOUBLE("drag_value_y");
+                  return &pi;
+               }
+             if (!strcmp(name, "size_w"))
+               {
+                  static const Edje_External_Param_Info pi =
+                    EDJE_EXTERNAL_PARAM_INFO_DOUBLE("drag_size_w");
+                  return &pi;
+               }
+             if (!strcmp(name, "size_h"))
+               {
+                  static const Edje_External_Param_Info pi =
+                    EDJE_EXTERNAL_PARAM_INFO_DOUBLE("drag_size_h");
+                  return &pi;
+               }
+             if (!strcmp(name, "step_x"))
+               {
+                  static const Edje_External_Param_Info pi =
+                    EDJE_EXTERNAL_PARAM_INFO_DOUBLE("drag_step_x");
+                  return &pi;
+               }
+             if (!strcmp(name, "step_y"))
+               {
+                  static const Edje_External_Param_Info pi =
+                    EDJE_EXTERNAL_PARAM_INFO_DOUBLE("drag_step_y");
+                  return &pi;
+               }
+             if (!strcmp(name, "page_x"))
+               {
+                  static const Edje_External_Param_Info pi =
+                    EDJE_EXTERNAL_PARAM_INFO_DOUBLE("drag_page_x");
+                  return &pi;
+               }
+             if (!strcmp(name, "page_y"))
+               {
+                  static const Edje_External_Param_Info pi =
+                    EDJE_EXTERNAL_PARAM_INFO_DOUBLE("drag_page_y");
+                  return &pi;
+               }
+
+             return NULL;
+          }
      }
 
    return NULL;
@@ -1803,103 +1816,115 @@ _edje_param_convert(Edje_External_Param *param, const Edje_External_Param_Info *
      {
       case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
       case EDJE_EXTERNAL_PARAM_TYPE_INT:
-	{
-	   int i;
-	   switch (param->type)
-	     {
-	      case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
-		 i = (int)param->d;
-		 break;
-	      case EDJE_EXTERNAL_PARAM_TYPE_STRING:
-	      case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
-		 i = (param->s) ? atoi(param->s) : 0;
-		 break;
-	      case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
-	      case EDJE_EXTERNAL_PARAM_TYPE_INT:
-		 i = param->i;
-                 break;
-	      default:
-		 return NULL;
-	     }
-	   if (dst_info->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
-	     i = !!i;
-	   param->type = dst_info->type;
-	   param->i = i;
-	   return param;
-	}
+      {
+         int i;
+         switch (param->type)
+           {
+            case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
+              i = (int)param->d;
+              break;
+
+            case EDJE_EXTERNAL_PARAM_TYPE_STRING:
+            case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
+              i = (param->s) ? atoi(param->s) : 0;
+              break;
+
+            case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
+            case EDJE_EXTERNAL_PARAM_TYPE_INT:
+              i = param->i;
+              break;
+
+            default:
+              return NULL;
+           }
+         if (dst_info->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+           i = !!i;
+         param->type = dst_info->type;
+         param->i = i;
+         return param;
+      }
 
       case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
-	{
-	   double d;
-	   switch (param->type)
-	     {
-	      case EDJE_EXTERNAL_PARAM_TYPE_INT:
-		 d = (double)param->i;
-		 break;
-	      case EDJE_EXTERNAL_PARAM_TYPE_STRING:
-	      case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
-		 d = (param->s) ? atof(param->s) : 0.0;
-		 break;
-	      case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
-		 d = (double)param->i;
-                 break;
-	      default:
-		 return NULL;
-	     }
-	   param->type = dst_info->type;
-	   param->d = d;
-	   return param;
-	}
+      {
+         double d;
+         switch (param->type)
+           {
+            case EDJE_EXTERNAL_PARAM_TYPE_INT:
+              d = (double)param->i;
+              break;
+
+            case EDJE_EXTERNAL_PARAM_TYPE_STRING:
+            case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
+              d = (param->s) ? atof(param->s) : 0.0;
+              break;
+
+            case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
+              d = (double)param->i;
+              break;
+
+            default:
+              return NULL;
+           }
+         param->type = dst_info->type;
+         param->d = d;
+         return param;
+      }
 
       case EDJE_EXTERNAL_PARAM_TYPE_STRING:
-	{
-	   static char s[64];
-	   switch (param->type)
-	     {
-	      case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
-	      case EDJE_EXTERNAL_PARAM_TYPE_INT:
-		 if (!snprintf(s, sizeof(s), "%i", param->i)) return NULL;
-		 break;
-	      case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
-		 if (!snprintf(s, sizeof(s), "%f", param->d)) return NULL;
-		 break;
-	      case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
-		 param->type = dst_info->type;
-		 return param;
-	      default:
-		 return NULL;
-	     }
-	   param->type = dst_info->type;
-	   param->s = s;
-	   return param;
-	}
+      {
+         static char s[64];
+         switch (param->type)
+           {
+            case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
+            case EDJE_EXTERNAL_PARAM_TYPE_INT:
+              if (!snprintf(s, sizeof(s), "%i", param->i)) return NULL;
+              break;
+
+            case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
+              if (!snprintf(s, sizeof(s), "%f", param->d)) return NULL;
+              break;
+
+            case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
+              param->type = dst_info->type;
+              return param;
+
+            default:
+              return NULL;
+           }
+         param->type = dst_info->type;
+         param->s = s;
+         return param;
+      }
 
       case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
-	{
-	   static char s[64];
-	   const char *val;
-	   switch (param->type)
-	     {
-	      case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
-	      case EDJE_EXTERNAL_PARAM_TYPE_INT:
-		 if (!snprintf(s, sizeof(s), "%i", param->i)) return NULL;
-		 val = s;
-		 break;
-	      case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
-		 if (!snprintf(s, sizeof(s), "%f", param->d)) return NULL;
-		 val = s;
-		 break;
-	      case EDJE_EXTERNAL_PARAM_TYPE_STRING:
-		 val = param->s;
-		 break;
-	      default:
-		 return NULL;
-	     }
-
-	   param->type = dst_info->type;
-	   if (param->s != val) param->s = val;
-	   return param;
-	}
+      {
+         static char s[64];
+         const char *val;
+         switch (param->type)
+           {
+            case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
+            case EDJE_EXTERNAL_PARAM_TYPE_INT:
+              if (!snprintf(s, sizeof(s), "%i", param->i)) return NULL;
+              val = s;
+              break;
+
+            case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
+              if (!snprintf(s, sizeof(s), "%f", param->d)) return NULL;
+              val = s;
+              break;
+
+            case EDJE_EXTERNAL_PARAM_TYPE_STRING:
+              val = param->s;
+              break;
+
+            default:
+              return NULL;
+           }
+
+         param->type = dst_info->type;
+         if (param->s != val) param->s = val;
+         return param;
+      }
 
       default: return NULL;
      }
@@ -1911,47 +1936,47 @@ _edje_param_validate(const Edje_External_Param *param, const Edje_External_Param
    switch (info->type)
      {
       case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
-	 return ((param->i == 0) || (param->i == 1));
+        return (param->i == 0) || (param->i == 1);
 
       case EDJE_EXTERNAL_PARAM_TYPE_INT:
-	 if ((info->info.i.min != EDJE_EXTERNAL_INT_UNSET) &&
-	     (info->info.i.min > param->i))
-	   return EINA_FALSE;
+        if ((info->info.i.min != EDJE_EXTERNAL_INT_UNSET) &&
+            (info->info.i.min > param->i))
+          return EINA_FALSE;
 
-	 if ((info->info.i.max != EDJE_EXTERNAL_INT_UNSET) &&
-	     (info->info.i.max < param->i))
-	   return EINA_FALSE;
+        if ((info->info.i.max != EDJE_EXTERNAL_INT_UNSET) &&
+            (info->info.i.max < param->i))
+          return EINA_FALSE;
 
-	 return EINA_TRUE;
+        return EINA_TRUE;
 
       case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
-	 if ((info->info.d.min != EDJE_EXTERNAL_DOUBLE_UNSET) &&
-	     (info->info.d.min > param->d))
-	   return EINA_FALSE;
+        if ((info->info.d.min != EDJE_EXTERNAL_DOUBLE_UNSET) &&
+            (info->info.d.min > param->d))
+          return EINA_FALSE;
 
-	 if ((info->info.d.max != EDJE_EXTERNAL_DOUBLE_UNSET) &&
-	     (info->info.d.max < param->d))
-	   return EINA_FALSE;
+        if ((info->info.d.max != EDJE_EXTERNAL_DOUBLE_UNSET) &&
+            (info->info.d.max < param->d))
+          return EINA_FALSE;
 
-	 return EINA_TRUE;
+        return EINA_TRUE;
 
       case EDJE_EXTERNAL_PARAM_TYPE_STRING:
-	 if (!param->s) return EINA_FALSE;
-	 if (info->info.s.accept_fmt)
-	   INF("string 'accept_fmt' validation not implemented.");
-	 if (info->info.s.deny_fmt)
-	   INF("string 'deny_fmt' validation not implemented.");
-	 return EINA_TRUE;
+        if (!param->s) return EINA_FALSE;
+        if (info->info.s.accept_fmt)
+          INF("string 'accept_fmt' validation not implemented.");
+        if (info->info.s.deny_fmt)
+          INF("string 'deny_fmt' validation not implemented.");
+        return EINA_TRUE;
 
       case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
-	{
-	   const char **itr = info->info.c.choices;
-	   if (!itr) return EINA_FALSE;
-	   for (; *itr; itr++)
-	     if (!strcmp(*itr, param->s))
-	       return EINA_TRUE;
-	   return EINA_FALSE;
-	}
+      {
+         const char **itr = info->info.c.choices;
+         if (!itr) return EINA_FALSE;
+         for (; *itr; itr++)
+           if (!strcmp(*itr, param->s))
+             return EINA_TRUE;
+         return EINA_FALSE;
+      }
 
       default: return EINA_FALSE;
      }
@@ -1969,75 +1994,75 @@ _edje_param_copy(Edje_Real_Part *src_part, const char *src_param, Edje_Real_Part
 
    if (dst_part->part->type == EDJE_PART_TYPE_EXTERNAL)
      dst_info = _edje_external_param_info_get
-       (dst_part->swallowed_object, dst_param);
+         (dst_part->swallowed_object, dst_param);
    else
      dst_info = _edje_native_param_info_get(dst_part, dst_param);
 
    if (!dst_info)
      {
-	ERR("cannot copy, invalid destination parameter '%s' of part '%s'",
-	    dst_param, dst_part->part->name);
-	return;
+        ERR("cannot copy, invalid destination parameter '%s' of part '%s'",
+            dst_param, dst_part->part->name);
+        return;
      }
 
    if (src_part->part->type == EDJE_PART_TYPE_EXTERNAL)
      {
-	if (!_edje_param_external_get
-	    (src_part, src_param, &val))
-	  {
-	     ERR("cannot get parameter '%s' of part '%s'",
-		 src_param, src_part->part->name);
-	     return;
-	  }
+        if (!_edje_param_external_get
+              (src_part, src_param, &val))
+          {
+             ERR("cannot get parameter '%s' of part '%s'",
+                 src_param, src_part->part->name);
+             return;
+          }
      }
    else
      {
-	if (!_edje_param_native_get(src_part, src_param, &val, &free_ptr))
-	  {
-	     ERR("cannot get parameter '%s' of part '%s'",
-		 src_param, src_part->part->name);
-	     return;
-	  }
+        if (!_edje_param_native_get(src_part, src_param, &val, &free_ptr))
+          {
+             ERR("cannot get parameter '%s' of part '%s'",
+                 src_param, src_part->part->name);
+             return;
+          }
      }
 
    if (!_edje_param_convert(&val, dst_info))
      {
-	ERR("cannot convert parameter type %s to requested type %s",
-	    edje_external_param_type_str(val.type),
-	    edje_external_param_type_str(dst_info->type));
-	goto end;
+        ERR("cannot convert parameter type %s to requested type %s",
+            edje_external_param_type_str(val.type),
+            edje_external_param_type_str(dst_info->type));
+        goto end;
      }
 
    if (!_edje_param_validate(&val, dst_info))
      {
-	ERR("incorrect parameter value failed validation for type %s",
-	    edje_external_param_type_str(dst_info->type));
-	goto end;
+        ERR("incorrect parameter value failed validation for type %s",
+            edje_external_param_type_str(dst_info->type));
+        goto end;
      }
 
    if (dst_part->part->type == EDJE_PART_TYPE_EXTERNAL)
      {
-	val.name = dst_param;
-	if (!_edje_external_param_set(NULL, dst_part, &val))
-	  {
-	     ERR("failed to set parameter '%s' (%s) of part '%s'",
-		 dst_param, edje_external_param_type_str(dst_info->type),
-		 dst_part->part->name);
-	     goto end;
-	  }
+        val.name = dst_param;
+        if (!_edje_external_param_set(NULL, dst_part, &val))
+          {
+             ERR("failed to set parameter '%s' (%s) of part '%s'",
+                 dst_param, edje_external_param_type_str(dst_info->type),
+                 dst_part->part->name);
+             goto end;
+          }
      }
    else
      {
-	if (!_edje_param_native_set(dst_part, dst_param, &val))
-	  {
-	     ERR("failed to set parameter '%s' (%s) of part '%s'",
-		 dst_param, edje_external_param_type_str(dst_info->type),
-		 dst_part->part->name);
-	     goto end;
-	  }
+        if (!_edje_param_native_set(dst_part, dst_param, &val))
+          {
+             ERR("failed to set parameter '%s' (%s) of part '%s'",
+                 dst_param, edje_external_param_type_str(dst_info->type),
+                 dst_part->part->name);
+             goto end;
+          }
      }
 
- end:
+end:
    free(free_ptr);
 }
 
@@ -2057,9 +2082,9 @@ _edje_param_set(Edje_Real_Part *part, const char *param, const char *value)
 
    if (!info)
      {
-	ERR("cannot copy, invalid destination parameter '%s' of part '%s'",
-	    param, part->part->name);
-	return;
+        ERR("cannot copy, invalid destination parameter '%s' of part '%s'",
+            param, part->part->name);
+        return;
      }
 
    val.name = "(temp)";
@@ -2068,37 +2093,38 @@ _edje_param_set(Edje_Real_Part *part, const char *param, const char *value)
 
    if (!_edje_param_convert(&val, info))
      {
-	ERR("cannot convert parameter type STRING to requested type %s",
-	    edje_external_param_type_str(info->type));
-	return;
+        ERR("cannot convert parameter type STRING to requested type %s",
+            edje_external_param_type_str(info->type));
+        return;
      }
 
    if (!_edje_param_validate(&val, info))
      {
-	ERR("incorrect parameter value failed validation for type %s",
-	    edje_external_param_type_str(info->type));
-	return;
+        ERR("incorrect parameter value failed validation for type %s",
+            edje_external_param_type_str(info->type));
+        return;
      }
 
    if (part->part->type == EDJE_PART_TYPE_EXTERNAL)
      {
-	val.name = param;
-	if (!_edje_external_param_set(NULL, part, &val))
-	  {
-	     ERR("failed to set parameter '%s' (%s) of part '%s'",
-		 param, edje_external_param_type_str(info->type),
-		 part->part->name);
-	     return;
-	  }
+        val.name = param;
+        if (!_edje_external_param_set(NULL, part, &val))
+          {
+             ERR("failed to set parameter '%s' (%s) of part '%s'",
+                 param, edje_external_param_type_str(info->type),
+                 part->part->name);
+             return;
+          }
      }
    else
      {
-	if (!_edje_param_native_set(part, param, &val))
-	  {
-	     ERR("failed to set parameter '%s' (%s) of part '%s'",
-		 param, edje_external_param_type_str(info->type),
-		 part->part->name);
-	     return;
-	  }
+        if (!_edje_param_native_set(part, param, &val))
+          {
+             ERR("failed to set parameter '%s' (%s) of part '%s'",
+                 param, edje_external_param_type_str(info->type),
+                 part->part->name);
+             return;
+          }
      }
 }
+
diff --git a/src/lib/edje_util.c b/src/lib/edje_util.c
index b6d2b3f..cc7a43c 100644
--- a/src/lib/edje_util.c
+++ b/src/lib/edje_util.c
@@ -5,11 +5,11 @@ struct _Edje_Box_Layout
 {
    EINA_RBTREE;
    Evas_Object_Box_Layout func;
-   void *(*layout_data_get)(void *);
-   void (*layout_data_free)(void *);
-   void *data;
-   void (*free_data)(void *);
-   char name[];
+   void                  *(*layout_data_get)(void *);
+   void                   (*layout_data_free)(void *);
+   void                  *data;
+   void                   (*free_data)(void *);
+   char                   name[];
 };
 
 static Eina_Hash *_edje_color_class_hash = NULL;
@@ -44,13 +44,13 @@ struct _Edje_List_Refcount
 
 static Eina_Bool _edje_color_class_list_foreach(const Eina_Hash *hash, const void *key, void *data, void *fdata);
 static Eina_Bool _edje_text_class_list_foreach(const Eina_Hash *hash, const void *key, void *data, void *fdata);
-static void _edje_object_image_preload_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static void _edje_object_signal_preload_cb(void *data, Evas_Object *obj, const char *emission, const char *source);
-static void _edje_user_def_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *child __UNUSED__, void *einfo __UNUSED__);
-static void _edje_table_child_remove(Edje_Real_Part *rp, Evas_Object *child);
-static void _edje_box_child_remove(Edje_Real_Part *rp, Evas_Object *child);
+static void      _edje_object_image_preload_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void      _edje_object_signal_preload_cb(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void      _edje_user_def_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *child __UNUSED__, void *einfo __UNUSED__);
+static void      _edje_table_child_remove(Edje_Real_Part *rp, Evas_Object *child);
+static void      _edje_box_child_remove(Edje_Real_Part *rp, Evas_Object *child);
 
-Edje_Real_Part *_edje_real_part_recursive_get_helper(const Edje *ed, char **path);
+Edje_Real_Part  *_edje_real_part_recursive_get_helper(const Edje *ed, char **path);
 
 static Edje_User_Defined *
 _edje_user_definition_new(Edje_User_Defined_Type type, const char *part, Edje *ed)
@@ -89,40 +89,43 @@ _edje_user_definition_free(Edje_User_Defined *eud)
    switch (eud->type)
      {
       case EDJE_USER_SWALLOW:
-	child = eud->u.swallow.child;
-	rp = _edje_real_part_recursive_get(eud->ed, eud->part);
-	if (rp)
-	  {
-	    _edje_real_part_swallow_clear(rp);
-	    rp->swallowed_object = NULL;
-	    rp->swallow_params.min.w = 0;
-	    rp->swallow_params.min.h = 0;
-	    rp->swallow_params.max.w = 0;
-	    rp->swallow_params.max.h = 0;
-	    rp->edje->dirty = 1;
-	    rp->edje->recalc_call = 1;
+        child = eud->u.swallow.child;
+        rp = _edje_real_part_recursive_get(eud->ed, eud->part);
+        if (rp)
+          {
+             _edje_real_part_swallow_clear(rp);
+             rp->swallowed_object = NULL;
+             rp->swallow_params.min.w = 0;
+             rp->swallow_params.min.h = 0;
+             rp->swallow_params.max.w = 0;
+             rp->swallow_params.max.h = 0;
+             rp->edje->dirty = 1;
+             rp->edje->recalc_call = 1;
 #ifdef EDJE_CALC_CACHE
-	    rp->invalidate = 1;
+             rp->invalidate = 1;
 #endif
-	    _edje_recalc_do(rp->edje);
-	  }
-	break;
+             _edje_recalc_do(rp->edje);
+          }
+        break;
+
       case EDJE_USER_BOX_PACK:
-	child = eud->u.box.child;
-	rp = _edje_real_part_recursive_get(eud->ed, eud->part);
-	_edje_box_child_remove(rp, child);
-	break;
+        child = eud->u.box.child;
+        rp = _edje_real_part_recursive_get(eud->ed, eud->part);
+        _edje_box_child_remove(rp, child);
+        break;
+
       case EDJE_USER_TABLE_PACK:
-	child = eud->u.table.child;
-	rp = _edje_real_part_recursive_get(eud->ed, eud->part);
-	_edje_table_child_remove(rp, child);
-	break;
+        child = eud->u.table.child;
+        rp = _edje_real_part_recursive_get(eud->ed, eud->part);
+        _edje_table_child_remove(rp, child);
+        break;
+
       case EDJE_USER_STRING:
       case EDJE_USER_DRAG_STEP:
       case EDJE_USER_DRAG_PAGE:
       case EDJE_USER_DRAG_VALUE:
       case EDJE_USER_DRAG_SIZE:
-         break;
+        break;
      }
 
    _edje_user_definition_remove(eud, child);
@@ -163,7 +166,7 @@ _edje_class_member_add(Edje *ed, Eina_Hash **ehash, Eina_Hash **ghash, const cha
      }
 
    lookup = malloc(sizeof (Edje_List_Refcount));
-   if (!lookup) return ;
+   if (!lookup) return;
    EINA_REFCOUNT_INIT(lookup);
 
    /* Get members list */
@@ -194,7 +197,7 @@ _edje_class_member_del(Eina_Hash **ehash, Eina_Hash **ghash, const char *class)
    if (!members) return;
 
    lookup = eina_hash_find(*ehash, class);
-   if (!lookup) return ;
+   if (!lookup) return;
 
    EINA_REFCOUNT_UNREF(lookup)
    {
@@ -250,19 +253,20 @@ _edje_thaw_edje(Edje *ed)
 
    for (i = 0; i < ed->table_parts_size; i++)
      {
-	Edje_Real_Part *rp;
+        Edje_Real_Part *rp;
 
-	rp = ed->table_parts[i];
-	if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object)
-	  {
-	     Edje *ed2;
+        rp = ed->table_parts[i];
+        if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object)
+          {
+             Edje *ed2;
 
-	     ed2 = _edje_fetch(rp->swallowed_object);
-	     if (ed2) _edje_thaw_edje(ed2);
-	  }
+             ed2 = _edje_fetch(rp->swallowed_object);
+             if (ed2) _edje_thaw_edje(ed2);
+          }
      }
    if ((ed->recalc) && (ed->freeze <= 0)) _edje_recalc_do(ed);
 }
+
 #endif
 
 EAPI void
@@ -274,15 +278,15 @@ edje_thaw(void)
      {
         Edje *ed;
 
-	_edje_freeze_calc_count = 0;
-	EINA_LIST_FREE(_edje_freeze_calc_list, ed)
-	  {
-	     _edje_thaw_edje(ed);
+        _edje_freeze_calc_count = 0;
+        EINA_LIST_FREE(_edje_freeze_calc_list, ed)
+          {
+             _edje_thaw_edje(ed);
              ed->freeze_calc = 0;
-	  }
+          }
      }
 #else
-  Evas_Object *data;
+   Evas_Object *data;
 
 // FIXME: could just have a global freeze instead of per object
 // comment as above.. why?
@@ -322,7 +326,7 @@ edje_scale_set(double scale)
 EAPI double
 edje_scale_get(void)
 {
-  return TO_DOUBLE(_edje_scale);
+   return TO_DOUBLE(_edje_scale);
 }
 
 EAPI void
@@ -352,10 +356,10 @@ edje_object_scale_set(Evas_Object *obj, double scale)
    if (ed->scale == scale) return EINA_TRUE;
    ed->scale = FROM_DOUBLE(scale);
    EINA_LIST_FOREACH(ed->groups, l, ged)
-      ged->scale = ed->scale;
+     ged->scale = ed->scale;
    EINA_LIST_FOREACH(ed->subobjs, l, o)
-      edje_object_calc_force(o);
-   for(i = 0; i < ed->table_parts_size; ++i)
+     edje_object_calc_force(o);
+   for (i = 0; i < ed->table_parts_size; ++i)
      {
         Edje_Real_Part *ep;
         ep = ed->table_parts[i];
@@ -363,7 +367,7 @@ edje_object_scale_set(Evas_Object *obj, double scale)
             || (ep->part->type == EDJE_PART_TYPE_TABLE))
           {
              EINA_LIST_FOREACH(ep->items, l, o)
-                edje_object_scale_set(o, scale);
+               edje_object_scale_set(o, scale);
           }
      }
    edje_object_calc_force(obj);
@@ -412,16 +416,16 @@ edje_object_mirrored_set(Evas_Object *obj, Eina_Bool rtl)
 
    ed->is_rtl = rtl;
 
-   for (i = 0 ; i < ed->table_parts_size ; i++)
+   for (i = 0; i < ed->table_parts_size; i++)
      {
-	Edje_Real_Part *ep;
+        Edje_Real_Part *ep;
         const char *s;
         double v;
 
-	ep = ed->table_parts[i];
-	s = ep->param1.description->state.name,
-	v = ep->param1.description->state.value;
-        _edje_part_description_apply(ed, ep, s, v , NULL, 0.0);
+        ep = ed->table_parts[i];
+        s = ep->param1.description->state.name,
+        v = ep->param1.description->state.value;
+        _edje_part_description_apply(ed, ep, s, v, NULL, 0.0);
         ep->chosen_description = ep->param1.description;
      }
    _edje_recalc_do(ed);
@@ -454,10 +458,10 @@ edje_object_freeze(Evas_Object *obj)
    if (!ed) return 0;
    for (i = 0; i < ed->table_parts_size; i++)
      {
-	Edje_Real_Part *rp;
-	rp = ed->table_parts[i];
-	if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object)
-	  edje_object_freeze(rp->swallowed_object);
+        Edje_Real_Part *rp;
+        rp = ed->table_parts[i];
+        if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object)
+          edje_object_freeze(rp->swallowed_object);
      }
    return _edje_freeze(ed);
 }
@@ -472,11 +476,11 @@ edje_object_thaw(Evas_Object *obj)
    if (!ed) return 0;
    for (i = 0; i < ed->table_parts_size; i++)
      {
-	Edje_Real_Part *rp;
+        Edje_Real_Part *rp;
 
-	rp = ed->table_parts[i];
-	if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object)
-	  edje_object_thaw(rp->swallowed_object);
+        rp = ed->table_parts[i];
+        if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object)
+          edje_object_thaw(rp->swallowed_object);
      }
    return _edje_thaw(ed);
 }
@@ -493,26 +497,30 @@ edje_color_class_set(const char *color_class, int r, int g, int b, int a, int r2
    if (!cc)
      {
         cc = calloc(1, sizeof(Edje_Color_Class));
-	if (!cc) return EINA_FALSE;
-	cc->name = eina_stringshare_add(color_class);
-	if (!cc->name)
-	  {
-	     free(cc);
-	     return EINA_FALSE;
-	  }
-	if (!_edje_color_class_hash)
+        if (!cc) return EINA_FALSE;
+        cc->name = eina_stringshare_add(color_class);
+        if (!cc->name)
+          {
+             free(cc);
+             return EINA_FALSE;
+          }
+        if (!_edje_color_class_hash)
           _edje_color_class_hash = eina_hash_string_superfast_new(NULL);
         eina_hash_add(_edje_color_class_hash, color_class, cc);
      }
 
-   if (r < 0)        r = 0;
-   else if (r > 255) r = 255;
-   if (g < 0)        g = 0;
-   else if (g > 255) g = 255;
-   if (b < 0)        b = 0;
-   else if (b > 255) b = 255;
-   if (a < 0)        a = 0;
-   else if (a > 255) a = 255;
+   if (r < 0) r = 0;
+   else if (r > 255)
+     r = 255;
+   if (g < 0) g = 0;
+   else if (g > 255)
+     g = 255;
+   if (b < 0) b = 0;
+   else if (b > 255)
+     b = 255;
+   if (a < 0) a = 0;
+   else if (a > 255)
+     a = 255;
    if ((cc->r == r) && (cc->g == g) &&
        (cc->b == b) && (cc->a == a) &&
        (cc->r2 == r2) && (cc->g2 == g2) &&
@@ -536,17 +544,17 @@ edje_color_class_set(const char *color_class, int r, int g, int b, int a, int r2
    members = eina_hash_find(_edje_color_class_member_hash, color_class);
    while (members)
      {
-	Edje *ed;
+        Edje *ed;
 
-	ed = eina_list_data_get(members);
-	ed->dirty = 1;
+        ed = eina_list_data_get(members);
+        ed->dirty = 1;
         ed->recalc_call = 1;
 #ifdef EDJE_CALC_CACHE
-	ed->all_part_change = 1;
+        ed->all_part_change = 1;
 #endif
-	_edje_recalc(ed);
-	_edje_emit(ed, "color_class,set", color_class);
-	members = eina_list_next(members);
+        _edje_recalc(ed);
+        _edje_emit(ed, "color_class,set", color_class);
+        members = eina_list_next(members);
      }
    return EINA_TRUE;
 }
@@ -563,25 +571,27 @@ edje_color_class_get(const char *color_class, int *r, int *g, int *b, int *a, in
 
    if (cc)
      {
-#define X(C) if (C) *C = cc->C
+#define X(C)              if (C) \
+    *C = cc->C
 #define S(_r, _g, _b, _a) X(_r); X(_g); X(_b); X(_a)
-	S(r, g, b, a);
-	S(r2, g2, b2, a2);
-	S(r3, g3, b3, a3);
+        S(r, g, b, a);
+        S(r2, g2, b2, a2);
+        S(r3, g3, b3, a3);
 #undef S
 #undef X
-	return EINA_TRUE;
+        return EINA_TRUE;
      }
    else
      {
-#define X(C) if (C) *C = 0
+#define X(C)              if (C) \
+    *C = 0
 #define S(_r, _g, _b, _a) X(_r); X(_g); X(_b); X(_a)
-	S(r, g, b, a);
-	S(r2, g2, b2, a2);
-	S(r3, g3, b3, a3);
+        S(r, g, b, a);
+        S(r2, g2, b2, a2);
+        S(r3, g3, b3, a3);
 #undef S
 #undef X
-	return EINA_FALSE;
+        return EINA_FALSE;
      }
 }
 
@@ -603,17 +613,17 @@ edje_color_class_del(const char *color_class)
    members = eina_hash_find(_edje_color_class_member_hash, color_class);
    while (members)
      {
-	Edje *ed;
+        Edje *ed;
 
-	ed = eina_list_data_get(members);
-	ed->dirty = 1;
+        ed = eina_list_data_get(members);
+        ed->dirty = 1;
         ed->recalc_call = 1;
 #ifdef EDJE_CALC_CACHE
-	ed->all_part_change = 1;
+        ed->all_part_change = 1;
 #endif
-	_edje_recalc(ed);
-	_edje_emit(ed, "color_class,del", color_class);
-	members = eina_list_next(members);
+        _edje_recalc(ed);
+        _edje_emit(ed, "color_class,del", color_class);
+        members = eina_list_next(members);
      }
 }
 
@@ -622,10 +632,9 @@ edje_color_class_list(void)
 {
    Edje_List_Foreach_Data fdata;
 
-   if (!_edje_color_class_member_hash) return NULL;
-
+   if (!_edje_color_class_hash) return NULL;
    memset(&fdata, 0, sizeof(Edje_List_Foreach_Data));
-   eina_hash_foreach(_edje_color_class_member_hash,
+   eina_hash_foreach(_edje_color_class_hash,
                      _edje_color_class_list_foreach, &fdata);
 
    return fdata.list;
@@ -650,43 +659,47 @@ edje_object_color_class_set(Evas_Object *obj, const char *color_class, int r, in
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!color_class)) return EINA_FALSE;
-   if (r < 0)        r = 0;
-   else if (r > 255) r = 255;
-   if (g < 0)        g = 0;
-   else if (g > 255) g = 255;
-   if (b < 0)        b = 0;
-   else if (b > 255) b = 255;
-   if (a < 0)        a = 0;
-   else if (a > 255) a = 255;
+   if (r < 0) r = 0;
+   else if (r > 255)
+     r = 255;
+   if (g < 0) g = 0;
+   else if (g > 255)
+     g = 255;
+   if (b < 0) b = 0;
+   else if (b > 255)
+     b = 255;
+   if (a < 0) a = 0;
+   else if (a > 255)
+     a = 255;
    cc = eina_hash_find(ed->color_classes, color_class);
    if (cc)
      {
-       if ((cc->r == r) && (cc->g == g) &&
-	   (cc->b == b) && (cc->a == a) &&
-	   (cc->r2 == r2) && (cc->g2 == g2) &&
-	   (cc->b2 == b2) && (cc->a2 == a2) &&
-	   (cc->r3 == r3) && (cc->g3 == g3) &&
-	   (cc->b3 == b3) && (cc->a3 == a3))
-	 return EINA_TRUE;
-       cc->r = r;
-       cc->g = g;
-       cc->b = b;
-       cc->a = a;
-       cc->r2 = r2;
-       cc->g2 = g2;
-       cc->b2 = b2;
-       cc->a2 = a2;
-       cc->r3 = r3;
-       cc->g3 = g3;
-       cc->b3 = b3;
-       cc->a3 = a3;
-       ed->dirty = 1;
-       ed->recalc_call = 1;
+        if ((cc->r == r) && (cc->g == g) &&
+            (cc->b == b) && (cc->a == a) &&
+            (cc->r2 == r2) && (cc->g2 == g2) &&
+            (cc->b2 == b2) && (cc->a2 == a2) &&
+            (cc->r3 == r3) && (cc->g3 == g3) &&
+            (cc->b3 == b3) && (cc->a3 == a3))
+          return EINA_TRUE;
+        cc->r = r;
+        cc->g = g;
+        cc->b = b;
+        cc->a = a;
+        cc->r2 = r2;
+        cc->g2 = g2;
+        cc->b2 = b2;
+        cc->a2 = a2;
+        cc->r3 = r3;
+        cc->g3 = g3;
+        cc->b3 = b3;
+        cc->a3 = a3;
+        ed->dirty = 1;
+        ed->recalc_call = 1;
 #ifdef EDJE_CALC_CACHE
-       ed->all_part_change = 1;
+        ed->all_part_change = 1;
 #endif
-       _edje_recalc(ed);
-       return EINA_TRUE;
+        _edje_recalc(ed);
+        return EINA_TRUE;
      }
 
    color_class = eina_stringshare_add(color_class);
@@ -694,8 +707,8 @@ edje_object_color_class_set(Evas_Object *obj, const char *color_class, int r, in
    cc = malloc(sizeof(Edje_Color_Class));
    if (!cc)
      {
-	eina_stringshare_del(color_class);
-	return EINA_FALSE;
+        eina_stringshare_del(color_class);
+        return EINA_FALSE;
      }
    cc->name = color_class;
    cc->r = r;
@@ -719,11 +732,11 @@ edje_object_color_class_set(Evas_Object *obj, const char *color_class, int r, in
 
    for (i = 0; i < ed->table_parts_size; i++)
      {
-	Edje_Real_Part *rp;
+        Edje_Real_Part *rp;
 
-	rp = ed->table_parts[i];
-	if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object)
-	  edje_object_color_class_set(rp->swallowed_object, color_class,
+        rp = ed->table_parts[i];
+        if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object)
+          edje_object_color_class_set(rp->swallowed_object, color_class,
                                       r, g, b, a, r2, g2, b2, a2, r3, g3, b3,
                                       a3);
      }
@@ -741,25 +754,27 @@ edje_object_color_class_get(const Evas_Object *obj, const char *color_class, int
 
    if (cc)
      {
-#define X(C) if (C) *C = cc->C
+#define X(C)              if (C) \
+    *C = cc->C
 #define S(_r, _g, _b, _a) X(_r); X(_g); X(_b); X(_a)
-	S(r, g, b, a);
-	S(r2, g2, b2, a2);
-	S(r3, g3, b3, a3);
+        S(r, g, b, a);
+        S(r2, g2, b2, a2);
+        S(r3, g3, b3, a3);
 #undef S
 #undef X
-	return EINA_TRUE;
+        return EINA_TRUE;
      }
    else
      {
-#define X(C) if (C) *C = 0
+#define X(C)              if (C) \
+    *C = 0
 #define S(_r, _g, _b, _a) X(_r); X(_g); X(_b); X(_a)
-	S(r, g, b, a);
-	S(r2, g2, b2, a2);
-	S(r3, g3, b3, a3);
+        S(r, g, b, a);
+        S(r2, g2, b2, a2);
+        S(r3, g3, b3, a3);
 #undef S
 #undef X
-	return EINA_FALSE;
+        return EINA_FALSE;
      }
 }
 
@@ -778,11 +793,11 @@ edje_object_color_class_del(Evas_Object *obj, const char *color_class)
 
    for (i = 0; i < ed->table_parts_size; i++)
      {
-	Edje_Real_Part *rp;
+        Edje_Real_Part *rp;
 
-	rp = ed->table_parts[i];
-	if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object)
-	  edje_object_color_class_del(rp->swallowed_object, color_class);
+        rp = ed->table_parts[i];
+        if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object)
+          edje_object_color_class_del(rp->swallowed_object, color_class);
      }
 
    ed->dirty = 1;
@@ -808,18 +823,18 @@ edje_text_class_set(const char *text_class, const char *font, Evas_Font_Size siz
    if (!tc)
      {
         tc = calloc(1, sizeof(Edje_Text_Class));
-	if (!tc) return EINA_FALSE;
-	tc->name = eina_stringshare_add(text_class);
-	if (!tc->name)
-	  {
-	     free(tc);
-	     return EINA_FALSE;
-	  }
-	if (!_edje_text_class_hash) _edje_text_class_hash = eina_hash_string_superfast_new(NULL);
+        if (!tc) return EINA_FALSE;
+        tc->name = eina_stringshare_add(text_class);
+        if (!tc->name)
+          {
+             free(tc);
+             return EINA_FALSE;
+          }
+        if (!_edje_text_class_hash) _edje_text_class_hash = eina_hash_string_superfast_new(NULL);
         eina_hash_add(_edje_text_class_hash, text_class, tc);
 
-	tc->font = eina_stringshare_add(font);
-	tc->size = size;
+        tc->font = eina_stringshare_add(font);
+        tc->size = size;
      }
    else
      {
@@ -837,17 +852,17 @@ edje_text_class_set(const char *text_class, const char *font, Evas_Font_Size siz
    members = eina_hash_find(_edje_text_class_member_hash, text_class);
    while (members)
      {
-	Edje *ed;
+        Edje *ed;
 
-	ed = eina_list_data_get(members);
-	ed->dirty = 1;
+        ed = eina_list_data_get(members);
+        ed->dirty = 1;
         ed->recalc_call = 1;
-	_edje_textblock_style_all_update(ed);
+        _edje_textblock_style_all_update(ed);
 #ifdef EDJE_CALC_CACHE
-	ed->text_part_change = 1;
+        ed->text_part_change = 1;
 #endif
-	_edje_recalc(ed);
-	members = eina_list_next(members);
+        _edje_recalc(ed);
+        members = eina_list_next(members);
      }
    return EINA_TRUE;
 }
@@ -871,16 +886,16 @@ edje_text_class_del(const char *text_class)
    members = eina_hash_find(_edje_text_class_member_hash, text_class);
    while (members)
      {
-	Edje *ed;
+        Edje *ed;
 
-	ed = eina_list_data_get(members);
-	ed->dirty = 1;
-	_edje_textblock_style_all_update(ed);
+        ed = eina_list_data_get(members);
+        ed->dirty = 1;
+        _edje_textblock_style_all_update(ed);
 #ifdef EDJE_CALC_CACHE
-	ed->text_part_change = 1;
+        ed->text_part_change = 1;
 #endif
-	_edje_recalc(ed);
-	members = eina_list_next(members);
+        _edje_recalc(ed);
+        members = eina_list_next(members);
      }
 }
 
@@ -889,8 +904,9 @@ edje_text_class_list(void)
 {
    Edje_List_Foreach_Data fdata;
 
+   if (!_edje_text_class_hash) return NULL;
    memset(&fdata, 0, sizeof(Edje_List_Foreach_Data));
-   eina_hash_foreach(_edje_text_class_member_hash,
+   eina_hash_foreach(_edje_text_class_hash,
                      _edje_text_class_list_foreach, &fdata);
    return fdata.list;
 }
@@ -919,19 +935,19 @@ edje_object_text_class_set(Evas_Object *obj, const char *text_class, const char
    /* for each text_class in the edje */
    EINA_LIST_FOREACH(ed->text_classes, l, tc)
      {
-	if ((tc->name) && (!strcmp(tc->name, text_class)))
-	  {
-	     /* Match and the same, return */
+        if ((tc->name) && (!strcmp(tc->name, text_class)))
+          {
+             /* Match and the same, return */
              if ((tc->size == size) &&
                  ((tc->font == font) ||
-                     (tc->font && font && !strcmp(tc->font, font))))
-                return EINA_TRUE;
+                  (tc->font && font && !strcmp(tc->font, font))))
+               return EINA_TRUE;
 
-	     /* Update new text class properties */
+             /* Update new text class properties */
              eina_stringshare_replace(&tc->font, font);
-	     tc->size = size;
+             tc->size = size;
              break;
-	  }
+          }
      }
 
    if (!tc)
@@ -953,11 +969,11 @@ edje_object_text_class_set(Evas_Object *obj, const char *text_class, const char
 
    for (i = 0; i < ed->table_parts_size; i++)
      {
-	Edje_Real_Part *rp;
+        Edje_Real_Part *rp;
 
-	rp = ed->table_parts[i];
-	if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object)
-	  edje_object_text_class_set(rp->swallowed_object, text_class,
+        rp = ed->table_parts[i];
+        if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object)
+          edje_object_text_class_set(rp->swallowed_object, text_class,
                                      font, size);
      }
 
@@ -1002,7 +1018,7 @@ edje_object_part_object_get(const Evas_Object *obj, const char *part)
 }
 
 EAPI Eina_Bool
-edje_object_part_geometry_get(const Evas_Object *obj, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h )
+edje_object_part_geometry_get(const Evas_Object *obj, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -1010,11 +1026,11 @@ edje_object_part_geometry_get(const Evas_Object *obj, const char *part, Evas_Coo
    ed = _edje_fetch(obj);
    if ((!ed) || (!part))
      {
-	if (x) *x = 0;
-	if (y) *y = 0;
-	if (w) *w = 0;
-	if (h) *h = 0;
-	return EINA_FALSE;
+        if (x) *x = 0;
+        if (y) *y = 0;
+        if (w) *w = 0;
+        if (h) *h = 0;
+        return EINA_FALSE;
      }
 
    /* Need to recalc before providing the object. */
@@ -1023,11 +1039,11 @@ edje_object_part_geometry_get(const Evas_Object *obj, const char *part, Evas_Coo
    rp = _edje_real_part_recursive_get(ed, part);
    if (!rp)
      {
-	if (x) *x = 0;
-	if (y) *y = 0;
-	if (w) *w = 0;
-	if (h) *h = 0;
-	return EINA_FALSE;
+        if (x) *x = 0;
+        if (y) *y = 0;
+        if (w) *w = 0;
+        if (h) *h = 0;
+        return EINA_FALSE;
      }
    if (x) *x = rp->x;
    if (y) *y = rp->y;
@@ -1061,11 +1077,11 @@ edje_object_text_change_cb_set(Evas_Object *obj, Edje_Text_Change_Cb func, void
 
    for (i = 0; i < ed->table_parts_size; i++)
      {
-	Edje_Real_Part *rp;
+        Edje_Real_Part *rp;
 
-	rp = ed->table_parts[i];
-	if ((rp->part->type == EDJE_PART_TYPE_GROUP) && (rp->swallowed_object))
-           edje_object_text_change_cb_set(rp->swallowed_object, func, data);
+        rp = ed->table_parts[i];
+        if ((rp->part->type == EDJE_PART_TYPE_GROUP) && (rp->swallowed_object))
+          edje_object_text_change_cb_set(rp->swallowed_object, func, data);
      }
 }
 
@@ -1073,19 +1089,20 @@ Eina_Bool
 _edje_object_part_text_raw_set(Evas_Object *obj, Edje_Real_Part *rp, const char *part, const char *text)
 {
    if ((!rp->text.text) && (!text))
-     return EINA_TRUE; /* nothing to do, no error */
+     return EINA_TRUE;  /* nothing to do, no error */
    if ((rp->text.text) && (text) &&
        (!strcmp(rp->text.text, text)))
-     return EINA_TRUE; /* nothing to do, no error */
+     return EINA_TRUE;  /* nothing to do, no error */
    if (rp->text.text)
      {
-	eina_stringshare_del(rp->text.text);
-	rp->text.text = NULL;
+        eina_stringshare_del(rp->text.text);
+        rp->text.text = NULL;
      }
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      _edje_entry_text_markup_set(rp, text);
    else
-     if (text) rp->text.text = eina_stringshare_add(text);
+   if (text)
+     rp->text.text = eina_stringshare_add(text);
    rp->edje->dirty = 1;
    rp->edje->recalc_call = 1;
    rp->edje->recalc_hints = 1;
@@ -1135,7 +1152,7 @@ _edje_object_part_text_raw_append(Evas_Object *obj, Edje_Real_Part *rp, const ch
 
 EAPI void
 edje_object_part_text_style_user_push(Evas_Object *obj, const char *part,
-                                const char *style)
+                                      const char *style)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -1193,17 +1210,17 @@ edje_object_part_text_style_user_peek(const Evas_Object *obj, const char *part)
 
    ts = evas_object_textblock_style_user_peek(rp->object);
    if (ts)
-      return evas_textblock_style_get(ts);
+     return evas_textblock_style_get(ts);
    else
-      return NULL;
+     return NULL;
 }
 
 static void
 _edje_user_define_string(Edje *ed, const char *part, const char *raw_text)
 {
    /* NOTE: This one is tricky, text is referenced in rp->text.text for the life of the
-    rp. So on edje_object_file_set, we should first ref it, before destroying the old
-    layout. */
+      rp. So on edje_object_file_set, we should first ref it, before destroying the old
+      layout. */
    Edje_User_Defined *eud;
    Eina_List *l;
 
@@ -1213,14 +1230,14 @@ _edje_user_define_string(Edje *ed, const char *part, const char *raw_text)
           if (!raw_text)
             {
                _edje_user_definition_free(eud);
-               return ;
+               return;
             }
           eud->u.string.text = raw_text;
-          return ;
+          return;
        }
 
    eud = _edje_user_definition_new(EDJE_USER_STRING, part, ed);
-   if (!eud) return ;
+   if (!eud) return;
    eud->u.string.text = raw_text;
 }
 
@@ -1260,9 +1277,9 @@ edje_object_part_text_get(const Evas_Object *obj, const char *part)
      return _edje_entry_text_get(rp);
    else
      {
-	if (rp->part->type == EDJE_PART_TYPE_TEXT) return rp->text.text;
-	if (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK)
-	  return evas_object_textblock_text_markup_get(rp->object);
+        if (rp->part->type == EDJE_PART_TYPE_TEXT) return rp->text.text;
+        if (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK)
+          return evas_object_textblock_text_markup_get(rp->object);
      }
    return NULL;
 }
@@ -1283,36 +1300,36 @@ edje_object_part_text_escaped_set(Evas_Object *obj, const char *part, const char
         Eina_Strbuf *sbuf;
         char *esc_start = NULL, *esc_end = NULL;
         char *s, *p;
-        
+
         sbuf = eina_strbuf_new();
         p = (char *)text;
         s = p;
-        for (;;)
+        for (;; )
           {
              if ((*p == 0) || (esc_end) || (esc_start))
                {
                   if (esc_end)
                     {
                        const char *escape;
-                       
+
                        escape = evas_textblock_escape_string_range_get
-                         (esc_start, esc_end + 1);
+                           (esc_start, esc_end + 1);
                        if (escape) eina_strbuf_append(sbuf, escape);
                        esc_start = esc_end = NULL;
                     }
                   else if (*p == 0)
                     {
-                       if (!s) s = esc_start; /* This would happen when there is & that isn't escaped */
+                       if (!s) s = esc_start;  /* This would happen when there is & that isn't escaped */
                        eina_strbuf_append_length(sbuf, s, p - s);
                        s = NULL;
                     }
                   if (*p == 0)
                     break;
                }
-             
+
              if (*p == '&')
                {
-                  if (!s) s = esc_start; /* This would happen when there is & that isn't escaped */
+                  if (!s) s = esc_start;  /* This would happen when there is & that isn't escaped */
                   esc_start = p;
                   esc_end = NULL;
                   eina_strbuf_append_length(sbuf, s, p - s);
@@ -1329,7 +1346,7 @@ edje_object_part_text_escaped_set(Evas_Object *obj, const char *part, const char
              p++;
           }
         ret = _edje_object_part_text_raw_set
-          (obj, rp, part, eina_strbuf_string_get(sbuf));
+            (obj, rp, part, eina_strbuf_string_get(sbuf));
         _edje_user_define_string(ed, part, rp->text.text);
         eina_strbuf_free(sbuf);
         return ret;
@@ -1340,7 +1357,6 @@ edje_object_part_text_escaped_set(Evas_Object *obj, const char *part, const char
    return ret;
 }
 
-
 char *
 _edje_text_escape(const char *text)
 {
@@ -1357,17 +1373,17 @@ _edje_text_escape(const char *text)
    text_end = text + text_len;
    while (text < text_end)
      {
-	int advance;
-	const char *escaped = evas_textblock_string_escape_get(text, &advance);
-	if (!escaped)
-	  {
-	     eina_strbuf_append_char(txt, text[0]);
-	     advance = 1;
-	  }
-	else
-	  eina_strbuf_append(txt, escaped);
+        int advance;
+        const char *escaped = evas_textblock_string_escape_get(text, &advance);
+        if (!escaped)
+          {
+             eina_strbuf_append_char(txt, text[0]);
+             advance = 1;
+          }
+        else
+          eina_strbuf_append(txt, escaped);
 
-	text += advance;
+        text += advance;
      }
 
    ret = eina_strbuf_string_steal(txt);
@@ -1393,46 +1409,46 @@ _edje_text_unescape(const char *text)
    escape_start = NULL;
    for (; text < text_end; text++)
      {
-	if (*text == '&')
-	  {
-	     size_t len;
-	     const char *str;
-
-	     if (last)
-	       {
-		  len = text - last;
-		  str = last;
-	       }
-	     else
-	       {
-		  len = text - escape_start;
-		  str = escape_start;
-	       }
-
-	     if (len > 0)
-	       eina_strbuf_append_n(txt, str, len);
-
-	     escape_start = text;
-	     last = NULL;
-	  }
-	else if ((*text == ';') && (escape_start))
-	  {
-	     size_t len;
-	     const char *str = evas_textblock_escape_string_range_get(escape_start, text);
-
-	     if (str)
-	       len = strlen(str);
-	     else
-	       {
-		  str = escape_start;
-		  len = text + 1 - escape_start;
-	       }
-
-	     eina_strbuf_append_n(txt, str, len);
-
-	     escape_start = NULL;
-	     last = text + 1;
-	  }
+        if (*text == '&')
+          {
+             size_t len;
+             const char *str;
+
+             if (last)
+               {
+                  len = text - last;
+                  str = last;
+               }
+             else
+               {
+                  len = text - escape_start;
+                  str = escape_start;
+               }
+
+             if (len > 0)
+               eina_strbuf_append_n(txt, str, len);
+
+             escape_start = text;
+             last = NULL;
+          }
+        else if ((*text == ';') && (escape_start))
+          {
+             size_t len;
+             const char *str = evas_textblock_escape_string_range_get(escape_start, text);
+
+             if (str)
+               len = strlen(str);
+             else
+               {
+                  str = escape_start;
+                  len = text + 1 - escape_start;
+               }
+
+             eina_strbuf_append_n(txt, str, len);
+
+             escape_start = NULL;
+             last = text + 1;
+          }
      }
 
    if (!last && escape_start)
@@ -1440,8 +1456,8 @@ _edje_text_unescape(const char *text)
 
    if (last && (text > last))
      {
-	size_t len = text - last;
-	eina_strbuf_append_n(txt, last, len);
+        size_t len = text - last;
+        eina_strbuf_append_n(txt, last, len);
      }
 
    ret = eina_strbuf_string_steal(txt);
@@ -1464,10 +1480,10 @@ edje_object_part_text_unescaped_set(Evas_Object *obj, const char *part, const ch
      ret = _edje_object_part_text_raw_set(obj, rp, part, text_to_escape);
    else if (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK)
      {
-	char *text = _edje_text_escape(text_to_escape);
+        char *text = _edje_text_escape(text_to_escape);
 
-	ret = _edje_object_part_text_raw_set(obj, rp, part, text);
-	free(text);
+        ret = _edje_object_part_text_raw_set(obj, rp, part, text);
+        free(text);
      }
    _edje_user_define_string(ed, part, rp->text.text);
    return ret;
@@ -1489,17 +1505,17 @@ edje_object_part_text_unescaped_get(const Evas_Object *obj, const char *part)
    if (!rp) return NULL;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
-	const char *t = _edje_entry_text_get(rp);
-	return _edje_text_unescape(t);
+        const char *t = _edje_entry_text_get(rp);
+        return _edje_text_unescape(t);
      }
    else
      {
-	if (rp->part->type == EDJE_PART_TYPE_TEXT) return strdup(rp->text.text);
-	if (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK)
-	  {
-	     const char *t = evas_object_textblock_text_markup_get(rp->object);
-	     return _edje_text_unescape(t);
-	  }
+        if (rp->part->type == EDJE_PART_TYPE_TEXT) return strdup(rp->text.text);
+        if (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK)
+          {
+             const char *t = evas_object_textblock_text_markup_get(rp->object);
+             return _edje_text_unescape(t);
+          }
      }
    return NULL;
 }
@@ -1670,9 +1686,9 @@ edje_object_part_text_cursor_geometry_get(const Evas_Object *obj, const char *pa
    if (!rp) return;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
-	_edje_entry_cursor_geometry_get(rp, x, y, w, h);
-	if (x) *x -= rp->edje->x;
-	if (y) *y -= rp->edje->y;
+        _edje_entry_cursor_geometry_get(rp, x, y, w, h);
+        if (x) *x -= rp->edje->x;
+        if (y) *y -= rp->edje->y;
      }
 }
 
@@ -1914,9 +1930,9 @@ edje_object_part_text_cursor_line_end_set(Evas_Object *obj, const char *part, Ed
 
 EAPI Eina_Bool
 edje_object_part_text_cursor_coord_set(Evas_Object *obj, const char *part,
-		Edje_Cursor cur, Evas_Coord x, Evas_Coord y)
+                                       Edje_Cursor cur, Evas_Coord x, Evas_Coord y)
 {
- Edje *ed;
+   Edje *ed;
    Edje_Real_Part *rp;
 
    ed = _edje_fetch(obj);
@@ -2352,7 +2368,7 @@ edje_object_text_insert_filter_callback_del(Evas_Object *obj, const char *part,
           {
              void *data = cb->data;
              ed->text_insert_filter_callbacks =
-                eina_list_remove_list(ed->text_insert_filter_callbacks, l);
+               eina_list_remove_list(ed->text_insert_filter_callbacks, l);
              eina_stringshare_del(cb->part);
              free(cb);
              return data;
@@ -2377,7 +2393,7 @@ edje_object_text_insert_filter_callback_del_full(Evas_Object *obj, const char *p
           {
              void *tmp = cb->data;
              ed->text_insert_filter_callbacks =
-                eina_list_remove_list(ed->text_insert_filter_callbacks, l);
+               eina_list_remove_list(ed->text_insert_filter_callbacks, l);
              eina_stringshare_del(cb->part);
              free(cb);
              return tmp;
@@ -2417,7 +2433,7 @@ edje_object_text_markup_filter_callback_del(Evas_Object *obj, const char *part,
           {
              void *data = cb->data;
              ed->markup_filter_callbacks =
-                eina_list_remove_list(ed->markup_filter_callbacks, l);
+               eina_list_remove_list(ed->markup_filter_callbacks, l);
              eina_stringshare_del(cb->part);
              free(cb);
              return data;
@@ -2442,7 +2458,7 @@ edje_object_text_markup_filter_callback_del_full(Evas_Object *obj, const char *p
           {
              void *tmp = cb->data;
              ed->markup_filter_callbacks =
-                eina_list_remove_list(ed->markup_filter_callbacks, l);
+               eina_list_remove_list(ed->markup_filter_callbacks, l);
              eina_stringshare_del(cb->part);
              free(cb);
              return tmp;
@@ -2486,8 +2502,8 @@ edje_object_part_swallow(Evas_Object *obj, const char *part, Evas_Object *obj_sw
      }
    if (rp->part->type != EDJE_PART_TYPE_SWALLOW)
      {
-	ERR("cannot swallow part %s: not swallow type!", rp->part->name);
-	return EINA_FALSE;
+        ERR("cannot swallow part %s: not swallow type!", rp->part->name);
+        return EINA_FALSE;
      }
    _edje_real_part_swallow(rp, obj_swallow, EINA_TRUE);
 
@@ -2499,7 +2515,7 @@ edje_object_part_swallow(Evas_Object *obj, const char *part, Evas_Object *obj_sw
              evas_object_event_callback_add(obj_swallow, EVAS_CALLBACK_DEL, _edje_user_def_del_cb, eud);
           }
         else ed->user_defined = eina_list_append(ed->user_defined, eud);
-          
+
         if (eud)
           {
              eud->u.swallow.child = obj_swallow;
@@ -2532,10 +2548,10 @@ edje_extern_object_min_size_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord mi
    rp = evas_object_data_get(obj, "\377 edje.swallowing_part");
    if (rp)
      {
-	rp->swallow_params.min.w = minw;
-	rp->swallow_params.min.h = minh;
+        rp->swallow_params.min.w = minw;
+        rp->swallow_params.min.h = minh;
 
-	_recalc_extern_parent(obj);
+        _recalc_extern_parent(obj);
      }
 }
 
@@ -2548,10 +2564,10 @@ edje_extern_object_max_size_set(Evas_Object *obj, Evas_Coord maxw, Evas_Coord ma
    rp = evas_object_data_get(obj, "\377 edje.swallowing_part");
    if (rp)
      {
-	rp->swallow_params.max.w = maxw;
-	rp->swallow_params.max.h = maxh;
+        rp->swallow_params.max.w = maxw;
+        rp->swallow_params.max.h = maxh;
 
-	_recalc_extern_parent(obj);
+        _recalc_extern_parent(obj);
      }
 }
 
@@ -2565,10 +2581,15 @@ edje_extern_object_aspect_set(Evas_Object *obj, Edje_Aspect_Control aspect, Evas
    switch (aspect)
      {
       case EDJE_ASPECT_CONTROL_NONE: asp = EVAS_ASPECT_CONTROL_NONE; break;
+
       case EDJE_ASPECT_CONTROL_NEITHER: asp = EVAS_ASPECT_CONTROL_NEITHER; break;
+
       case EDJE_ASPECT_CONTROL_HORIZONTAL: asp = EVAS_ASPECT_CONTROL_HORIZONTAL; break;
+
       case EDJE_ASPECT_CONTROL_VERTICAL: asp = EVAS_ASPECT_CONTROL_VERTICAL; break;
+
       case EDJE_ASPECT_CONTROL_BOTH: asp = EVAS_ASPECT_CONTROL_BOTH; break;
+
       default: break;
      }
    if (aw < 1) aw = 1;
@@ -2577,15 +2598,16 @@ edje_extern_object_aspect_set(Evas_Object *obj, Edje_Aspect_Control aspect, Evas
    rp = evas_object_data_get(obj, "\377 edje.swallowing_part");
    if (rp)
      {
-	rp->swallow_params.aspect.mode = aspect;
-	rp->swallow_params.aspect.w = aw;
-	rp->swallow_params.aspect.h = ah;
+        rp->swallow_params.aspect.mode = aspect;
+        rp->swallow_params.aspect.w = aw;
+        rp->swallow_params.aspect.h = ah;
         _recalc_extern_parent(obj);
      }
 }
 
-struct edje_box_layout_builtin {
-   const char *name;
+struct edje_box_layout_builtin
+{
+   const char            *name;
    Evas_Object_Box_Layout cb;
 };
 
@@ -2593,32 +2615,35 @@ static Evas_Object_Box_Layout
 _edje_box_layout_builtin_find(const char *name)
 {
    const struct edje_box_layout_builtin _edje_box_layout_builtin[] = {
-     {"horizontal", evas_object_box_layout_horizontal},
-     {"horizontal_flow", evas_object_box_layout_flow_horizontal},
-     {"horizontal_homogeneous", evas_object_box_layout_homogeneous_horizontal},
-     {"horizontal_max", evas_object_box_layout_homogeneous_max_size_horizontal},
-     {"stack", evas_object_box_layout_stack},
-     {"vertical", evas_object_box_layout_vertical},
-     {"vertical_flow", evas_object_box_layout_flow_vertical},
-     {"vertical_homogeneous", evas_object_box_layout_homogeneous_vertical},
-     {"vertical_max", evas_object_box_layout_homogeneous_max_size_vertical},
-     {NULL, NULL}
+      {"horizontal", evas_object_box_layout_horizontal},
+      {"horizontal_flow", evas_object_box_layout_flow_horizontal},
+      {"horizontal_homogeneous", evas_object_box_layout_homogeneous_horizontal},
+      {"horizontal_max", evas_object_box_layout_homogeneous_max_size_horizontal},
+      {"stack", evas_object_box_layout_stack},
+      {"vertical", evas_object_box_layout_vertical},
+      {"vertical_flow", evas_object_box_layout_flow_vertical},
+      {"vertical_homogeneous", evas_object_box_layout_homogeneous_vertical},
+      {"vertical_max", evas_object_box_layout_homogeneous_max_size_vertical},
+      {NULL, NULL}
    };
    const struct edje_box_layout_builtin *base;
 
    switch (name[0])
      {
       case 'h':
-	 base = _edje_box_layout_builtin + 0;
-	 break;
+        base = _edje_box_layout_builtin + 0;
+        break;
+
       case 's':
-	 base = _edje_box_layout_builtin + 4;
-	 break;
+        base = _edje_box_layout_builtin + 4;
+        break;
+
       case 'v':
-	 base = _edje_box_layout_builtin + 5;
-	 break;
+        base = _edje_box_layout_builtin + 5;
+        break;
+
       default:
-	 return NULL;
+        return NULL;
      }
 
    for (; (base->name) && (base->name[0] == name[0]); base++)
@@ -2651,12 +2676,12 @@ static Edje_Box_Layout *
 _edje_box_layout_external_find(const char *name)
 {
    return (Edje_Box_Layout *)eina_rbtree_inline_lookup
-     (_edje_box_layout_registry, name, 0, _edje_box_layout_external_find_cmp,
-      NULL);
+            (_edje_box_layout_registry, name, 0, _edje_box_layout_external_find_cmp,
+            NULL);
 }
 
 Eina_Bool
-_edje_box_layout_find(const char *name, Evas_Object_Box_Layout *cb, void **data, void (**free_data)(void *data))
+_edje_box_layout_find(const char *name, Evas_Object_Box_Layout *cb, void **data, void(**free_data) (void *data))
 {
    const Edje_Box_Layout *l;
 
@@ -2665,9 +2690,9 @@ _edje_box_layout_find(const char *name, Evas_Object_Box_Layout *cb, void **data,
    *cb = _edje_box_layout_builtin_find(name);
    if (*cb)
      {
-	*free_data = NULL;
-	*data = NULL;
-	return EINA_TRUE;
+        *free_data = NULL;
+        *data = NULL;
+        return EINA_TRUE;
      }
 
    l = _edje_box_layout_external_find(name);
@@ -2723,52 +2748,52 @@ edje_box_layout_register(const char *name, Evas_Object_Box_Layout func, void *(*
 
    if (_edje_box_layout_builtin_find(name))
      {
-	ERR("Cannot register layout '%s': would override builtin!",
-	    name);
+        ERR("Cannot register layout '%s': would override builtin!",
+            name);
 
-	if (data && free_data) free_data(data);
-	return;
+        if (data && free_data) free_data(data);
+        return;
      }
 
    l = _edje_box_layout_external_find(name);
    if (!l)
      {
-	if (!func)
-	  {
-	     if (data && free_data) free_data(data);
-	     return;
-	  }
+        if (!func)
+          {
+             if (data && free_data) free_data(data);
+             return;
+          }
 
-	l = _edje_box_layout_external_new
-	  (name, func, layout_data_get, layout_data_free, free_data, data);
-	if (!l)
-	  return;
+        l = _edje_box_layout_external_new
+            (name, func, layout_data_get, layout_data_free, free_data, data);
+        if (!l)
+          return;
 
-	_edje_box_layout_registry = eina_rbtree_inline_insert
-	  (_edje_box_layout_registry, (Eina_Rbtree *)l,
-	   _edje_box_layout_external_node_cmp, NULL);
+        _edje_box_layout_registry = eina_rbtree_inline_insert
+            (_edje_box_layout_registry, (Eina_Rbtree *)l,
+            _edje_box_layout_external_node_cmp, NULL);
      }
    else
      {
-	if (func)
-	  {
-	     if (l->data && l->free_data) l->free_data(l->data);
+        if (func)
+          {
+             if (l->data && l->free_data) l->free_data(l->data);
 
-	     l->func = func;
-	     l->layout_data_get = layout_data_get;
-	     l->layout_data_free = layout_data_free;
-	     l->free_data = free_data;
-	     l->data = data;
-	  }
-	else
-	  {
-	     if (data && free_data) free_data(data);
+             l->func = func;
+             l->layout_data_get = layout_data_get;
+             l->layout_data_free = layout_data_free;
+             l->free_data = free_data;
+             l->data = data;
+          }
+        else
+          {
+             if (data && free_data) free_data(data);
 
-	     _edje_box_layout_registry = eina_rbtree_inline_remove
-	       (_edje_box_layout_registry, (Eina_Rbtree *)l,
-		_edje_box_layout_external_node_cmp, NULL);
-	     _edje_box_layout_external_free((Eina_Rbtree *)l, NULL);
-	  }
+             _edje_box_layout_registry = eina_rbtree_inline_remove
+                 (_edje_box_layout_registry, (Eina_Rbtree *)l,
+                 _edje_box_layout_external_node_cmp, NULL);
+             _edje_box_layout_external_free((Eina_Rbtree *)l, NULL);
+          }
      }
 }
 
@@ -2784,8 +2809,8 @@ edje_object_part_unswallow(Evas_Object *obj, Evas_Object *obj_swallow)
      return;
    if (rp->part->type != EDJE_PART_TYPE_SWALLOW)
      {
-	ERR("cannot unswallow part %s: not swallow type!", rp->part->name);
-	return;
+        ERR("cannot unswallow part %s: not swallow type!", rp->part->name);
+        return;
      }
 
    if (rp->swallowed_object == obj_swallow)
@@ -2809,24 +2834,24 @@ edje_object_part_unswallow(Evas_Object *obj, Evas_Object *obj_swallow)
                     if (eud->type == EDJE_USER_SWALLOW && eud->u.swallow.child == obj_swallow)
                       {
                          _edje_user_definition_free(eud);
-                         return ;
+                         return;
                       }
                }
           }
 
         _edje_real_part_swallow_clear(rp);
-	rp->swallowed_object = NULL;
-	rp->swallow_params.min.w = 0;
-	rp->swallow_params.min.h = 0;
-	rp->swallow_params.max.w = 0;
-	rp->swallow_params.max.h = 0;
-	rp->edje->dirty = 1;
+        rp->swallowed_object = NULL;
+        rp->swallow_params.min.w = 0;
+        rp->swallow_params.min.h = 0;
+        rp->swallow_params.max.w = 0;
+        rp->swallow_params.max.h = 0;
+        rp->edje->dirty = 1;
         rp->edje->recalc_call = 1;
 #ifdef EDJE_CALC_CACHE
-	rp->invalidate = 1;
+        rp->invalidate = 1;
 #endif
-	_edje_recalc_do(rp->edje);
-	return;
+        _edje_recalc_do(rp->edje);
+        return;
      }
 }
 
@@ -2855,9 +2880,9 @@ edje_object_size_min_get(const Evas_Object *obj, Evas_Coord *minw, Evas_Coord *m
    ed = _edje_fetch(obj);
    if ((!ed) || (!ed->collection))
      {
-	if (minw) *minw = 0;
-	if (minh) *minh = 0;
-	return;
+        if (minw) *minw = 0;
+        if (minh) *minh = 0;
+        return;
      }
    if (minw) *minw = ed->collection->prop.min.w;
    if (minh) *minh = ed->collection->prop.min.h;
@@ -2871,9 +2896,9 @@ edje_object_size_max_get(const Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *m
    ed = _edje_fetch(obj);
    if ((!ed) || (!ed->collection))
      {
-	if (maxw) *maxw = 0;
-	if (maxh) *maxh = 0;
-	return;
+        if (maxw) *maxw = 0;
+        if (maxh) *maxh = 0;
+        return;
      }
 
    /* Need to recalc before providing the object. */
@@ -2881,21 +2906,21 @@ edje_object_size_max_get(const Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *m
 
    if (ed->collection->prop.max.w == 0)
      {
-	/* XXX TODO: convert maxw to 0, fix things that break. */
-	if (maxw) *maxw = EDJE_INF_MAX_W;
+        /* XXX TODO: convert maxw to 0, fix things that break. */
+        if (maxw) *maxw = EDJE_INF_MAX_W;
      }
    else
      {
-	if (maxw) *maxw = ed->collection->prop.max.w;
+        if (maxw) *maxw = ed->collection->prop.max.w;
      }
    if (ed->collection->prop.max.h == 0)
      {
-	/* XXX TODO: convert maxh to 0, fix things that break. */
-	if (maxh) *maxh = EDJE_INF_MAX_H;
+        /* XXX TODO: convert maxh to 0, fix things that break. */
+        if (maxh) *maxh = EDJE_INF_MAX_H;
      }
    else
      {
-	if (maxh) *maxh = ed->collection->prop.max.h;
+        if (maxh) *maxh = ed->collection->prop.max.h;
      }
 }
 
@@ -2941,11 +2966,11 @@ edje_object_parts_extends_calc(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, E
    ed = _edje_fetch(obj);
    if (!ed)
      {
-	if (x) *x = 0;
-	if (y) *y = 0;
-	if (w) *w = 0;
-	if (h) *h = 0;
-	return EINA_FALSE;
+        if (x) *x = 0;
+        if (y) *y = 0;
+        if (w) *w = 0;
+        if (h) *h = 0;
+        return EINA_FALSE;
      }
 
    ed->calc_only = 1;
@@ -2962,15 +2987,15 @@ edje_object_parts_extends_calc(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, E
 
         rp = ed->table_parts[i];
 
-	rpx1 = rp->x;
-	rpy1 = rp->y;
-	rpx2 = rpx1 + rp->w;
-	rpy2 = rpy1 + rp->h;
+        rpx1 = rp->x;
+        rpy1 = rp->y;
+        rpx2 = rpx1 + rp->w;
+        rpy2 = rpy1 + rp->h;
 
-	if (xx1 > rpx1) xx1 = rpx1;
-	if (yy1 > rpy1) yy1 = rpy1;
-	if (xx2 < rpx2) xx2 = rpx2;
-	if (yy2 < rpy2) yy2 = rpy2;
+        if (xx1 > rpx1) xx1 = rpx1;
+        if (yy1 > rpy1) yy1 = rpy1;
+        if (xx2 < rpx2) xx2 = rpx2;
+        if (yy2 < rpy2) yy2 = rpy2;
      }
 
    ed->calc_only = 0;
@@ -2997,16 +3022,16 @@ edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Co
    ed = _edje_fetch(obj);
    if ((!ed) || (!ed->collection))
      {
-	if (minw) *minw = restrictedw;
-	if (minh) *minh = restrictedh;
-	return;
+        if (minw) *minw = restrictedw;
+        if (minh) *minh = restrictedh;
+        return;
      }
    reset_maxwh = 1;
    ed->calc_only = 1;
    pw = ed->w;
    ph = ed->h;
 
-   again:
+again:
    ed->w = restrictedw;
    ed->h = restrictedh;
 
@@ -3015,107 +3040,107 @@ edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Co
 
    do
      {
-	unsigned int i;
+        unsigned int i;
 
         okw = okh = 0;
-	ed->dirty = 1;
+        ed->dirty = 1;
 #ifdef EDJE_CALC_CACHE
-	ed->all_part_change = 1;
+        ed->all_part_change = 1;
 #endif
-	_edje_recalc_do(ed);
-	if (reset_maxwh)
-	  {
-	     maxw = 0;
-	     maxh = 0;
-	  }
-	pep = NULL;
-	has_non_fixed_tb = EINA_FALSE;
-	for (i = 0; i < ed->table_parts_size; i++)
-	  {
-	     Edje_Real_Part *ep;
-	     int w, h;
-	     int didw;
-
-	     ep = ed->table_parts[i];
-	     w = ep->w - ep->req.w;
-	     h = ep->h - ep->req.h;
-	     didw = 0;
-	     if (ep->chosen_description)
-	       {
-		  if (!ep->chosen_description->fixed.w)
-		    {
-		       if ((ep->part->type == EDJE_PART_TYPE_TEXTBLOCK))
-			 {
+        _edje_recalc_do(ed);
+        if (reset_maxwh)
+          {
+             maxw = 0;
+             maxh = 0;
+          }
+        pep = NULL;
+        has_non_fixed_tb = EINA_FALSE;
+        for (i = 0; i < ed->table_parts_size; i++)
+          {
+             Edje_Real_Part *ep;
+             int w, h;
+             int didw;
+
+             ep = ed->table_parts[i];
+             w = ep->w - ep->req.w;
+             h = ep->h - ep->req.h;
+             didw = 0;
+             if (ep->chosen_description)
+               {
+                  if (!ep->chosen_description->fixed.w)
+                    {
+                       if ((ep->part->type == EDJE_PART_TYPE_TEXTBLOCK))
+                         {
                             Evas_Coord tb_mw;
                             evas_object_textblock_size_formatted_get(ep->object,
-                               &tb_mw, NULL);
+                                                                     &tb_mw, NULL);
                             tb_mw -= ep->req.w;
                             if (tb_mw > w)
                               {
                                  w = tb_mw;
                               }
                             has_non_fixed_tb = EINA_TRUE;
-			 }
-		       if (w > maxw)
-			 {
-			    maxw = w;
-			    okw = 1;
-			    pep = ep;
-			    didw = 1;
-			 }
-		    }
-		  if (!ep->chosen_description->fixed.h)
-		    {
-		       if (!((ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) &&
-			     (!((Edje_Part_Description_Text *)ep->chosen_description)->text.min_x) &&
-			     (didw)))
-			 {
-			    if (h > maxh)
-			      {
-				 maxh = h;
-				 okh = 1;
-				 pep = ep;
-			      }
-			 }
+                         }
+                       if (w > maxw)
+                         {
+                            maxw = w;
+                            okw = 1;
+                            pep = ep;
+                            didw = 1;
+                         }
+                    }
+                  if (!ep->chosen_description->fixed.h)
+                    {
+                       if (!((ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) &&
+                             (!((Edje_Part_Description_Text *)ep->chosen_description)->text.min_x) &&
+                             (didw)))
+                         {
+                            if (h > maxh)
+                              {
+                                 maxh = h;
+                                 okh = 1;
+                                 pep = ep;
+                              }
+                         }
 
                        if (ep->part->type == EDJE_PART_TYPE_TEXTBLOCK)
                          {
                             has_non_fixed_tb = EINA_TRUE;
                          }
-		    }
-	       }
-	  }
-	if (okw)
-	  {
-	     ed->w += maxw;
-	     if (ed->w < restrictedw) ed->w = restrictedw;
+                    }
+               }
+          }
+        if (okw)
+          {
+             ed->w += maxw;
+             if (ed->w < restrictedw) ed->w = restrictedw;
           }
         if (okh)
           {
-	     ed->h += maxh;
-	     if (ed->h < restrictedh) ed->h = restrictedh;
-	  }
-	if ((ed->w > 4000) || (ed->h > 4000))
-	  {
+             ed->h += maxh;
+             if (ed->h < restrictedh) ed->h = restrictedh;
+          }
+        if ((ed->w > 4000) || (ed->h > 4000))
+          {
              /* Only print it if we have a non-fixed textblock.
               * We should possibly avoid all of this if in this case, but in
               * the meanwhile, just doing this. */
              if (!has_non_fixed_tb)
                {
                   if (pep)
-                     ERR("file %s, group %s has a non-fixed part '%s'. Adding 'fixed: 1 1;' to source EDC may help. Continuing discarding faulty part.",
-                         ed->path, ed->group, pep->part->name);
+                    ERR("file %s, group %s has a non-fixed part '%s'. Adding 'fixed: 1 1;' to source EDC may help. Continuing discarding faulty part.",
+                        ed->path, ed->group, pep->part->name);
                   else
-                     ERR("file %s, group %s overflowed 4000x4000 with minimum size of %dx%d. Continuing discarding faulty parts.",
-                         ed->path, ed->group, ed->w, ed->h);
+                    ERR("file %s, group %s overflowed 4000x4000 with minimum size of %dx%d. Continuing discarding faulty parts.",
+                        ed->path, ed->group, ed->w, ed->h);
                }
 
-	     if (reset_maxwh)
-	       {
-		  reset_maxwh = 0;
-		  goto again;
-	       }
-	  }
+             if (reset_maxwh)
+               {
+                  reset_maxwh = 0;
+                  goto again;
+               }
+          }
      }
    while (okw || okh);
    ed->min.w = ed->w;
@@ -3144,8 +3169,8 @@ edje_object_part_state_get(const Evas_Object *obj, const char *part, double *val
    ed = _edje_fetch(obj);
    if ((!ed) || (!part))
      {
-	if (val_ret) *val_ret = 0;
-	return "";
+        if (val_ret) *val_ret = 0;
+        return "";
      }
 
    /* Need to recalc before providing the object. */
@@ -3154,26 +3179,26 @@ edje_object_part_state_get(const Evas_Object *obj, const char *part, double *val
    rp = _edje_real_part_recursive_get(ed, part);
    if (!rp)
      {
-	if (val_ret) *val_ret = 0;
-	INF("part not found");
-	return "";
+        if (val_ret) *val_ret = 0;
+        INF("part not found");
+        return "";
      }
    if (rp->chosen_description)
      {
-	if (val_ret) *val_ret = rp->chosen_description->state.value;
-	if (rp->chosen_description->state.name)
-	  return rp->chosen_description->state.name;
-	return "default";
+        if (val_ret) *val_ret = rp->chosen_description->state.value;
+        if (rp->chosen_description->state.name)
+          return rp->chosen_description->state.name;
+        return "default";
      }
    else
      {
-	if (rp->param1.description)
-	  {
-	     if (val_ret) *val_ret = rp->param1.description->state.value;
-	     if (rp->param1.description->state.name)
-	       return rp->param1.description->state.name;
-	     return "default";
-	  }
+        if (rp->param1.description)
+          {
+             if (val_ret) *val_ret = rp->param1.description->state.value;
+             if (rp->param1.description->state.name)
+               return rp->param1.description->state.name;
+             return "default";
+          }
      }
    if (val_ret) *val_ret = 0;
    return "";
@@ -3194,8 +3219,10 @@ edje_object_part_drag_dir_get(const Evas_Object *obj, const char *part)
    rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return EDJE_DRAG_DIR_NONE;
    if ((rp->part->dragable.x) && (rp->part->dragable.y)) return EDJE_DRAG_DIR_XY;
-   else if (rp->part->dragable.x) return EDJE_DRAG_DIR_X;
-   else if (rp->part->dragable.y) return EDJE_DRAG_DIR_Y;
+   else if (rp->part->dragable.x)
+     return EDJE_DRAG_DIR_X;
+   else if (rp->part->dragable.y)
+     return EDJE_DRAG_DIR_Y;
    return EDJE_DRAG_DIR_NONE;
 }
 
@@ -3228,13 +3255,13 @@ edje_object_part_drag_value_set(Evas_Object *obj, const char *part, double dx, d
           {
              eud->u.drag_position.x = dx;
              eud->u.drag_position.y = dy;
-          } 
+          }
      }
 
    if (rp->part->dragable.confine_id != -1)
      {
-	dx = CLAMP(dx, 0.0, 1.0);
-	dy = CLAMP(dy, 0.0, 1.0);
+        dx = CLAMP(dx, 0.0, 1.0);
+        dy = CLAMP(dy, 0.0, 1.0);
      }
    if (rp->part->dragable.x < 0) dx = 1.0 - dx;
    if (rp->part->dragable.y < 0) dy = 1.0 - dy;
@@ -3260,9 +3287,9 @@ edje_object_part_drag_value_get(const Evas_Object *obj, const char *part, double
    ed = _edje_fetch(obj);
    if ((!ed) || (!part))
      {
-	if (dx) *dx = 0;
-	if (dy) *dy = 0;
-	return EINA_FALSE;
+        if (dx) *dx = 0;
+        if (dy) *dy = 0;
+        return EINA_FALSE;
      }
 
    /* Need to recalc before providing the object. */
@@ -3271,9 +3298,9 @@ edje_object_part_drag_value_get(const Evas_Object *obj, const char *part, double
    rp = _edje_real_part_recursive_get(ed, part);
    if (!rp || !rp->drag)
      {
-	if (dx) *dx = 0;
-	if (dy) *dy = 0;
-	return EINA_FALSE;
+        if (dx) *dx = 0;
+        if (dy) *dy = 0;
+        return EINA_FALSE;
      }
    ddx = TO_DOUBLE(rp->drag->val.x);
    ddy = TO_DOUBLE(rp->drag->val.y);
@@ -3312,13 +3339,15 @@ edje_object_part_drag_size_set(Evas_Object *obj, const char *part, double dw, do
           {
              eud->u.drag_size.w = dw;
              eud->u.drag_size.h = dh;
-          } 
+          }
      }
 
    if (dw < 0.0) dw = 0.0;
-   else if (dw > 1.0) dw = 1.0;
+   else if (dw > 1.0)
+     dw = 1.0;
    if (dh < 0.0) dh = 0.0;
-   else if (dh > 1.0) dh = 1.0;
+   else if (dh > 1.0)
+     dh = 1.0;
    if ((rp->drag->size.x == FROM_DOUBLE(dw)) && (rp->drag->size.y == FROM_DOUBLE(dh))) return EINA_TRUE;
    rp->drag->size.x = FROM_DOUBLE(dw);
    rp->drag->size.y = FROM_DOUBLE(dh);
@@ -3340,9 +3369,9 @@ edje_object_part_drag_size_get(const Evas_Object *obj, const char *part, double
    ed = _edje_fetch(obj);
    if ((!ed) || (!part))
      {
-	if (dw) *dw = 0;
-	if (dh) *dh = 0;
-	return EINA_FALSE;
+        if (dw) *dw = 0;
+        if (dh) *dh = 0;
+        return EINA_FALSE;
      }
 
    /* Need to recalc before providing the object. */
@@ -3351,9 +3380,9 @@ edje_object_part_drag_size_get(const Evas_Object *obj, const char *part, double
    rp = _edje_real_part_recursive_get(ed, part);
    if (!rp || !rp->drag)
      {
-	if (dw) *dw = 0;
-	if (dh) *dh = 0;
-	return EINA_FALSE;
+        if (dw) *dw = 0;
+        if (dh) *dh = 0;
+        return EINA_FALSE;
      }
    if (dw) *dw = TO_DOUBLE(rp->drag->size.x);
    if (dh) *dh = TO_DOUBLE(rp->drag->size.y);
@@ -3388,13 +3417,15 @@ edje_object_part_drag_step_set(Evas_Object *obj, const char *part, double dx, do
           {
              eud->u.drag_position.x = dx;
              eud->u.drag_position.y = dy;
-          } 
+          }
      }
 
    if (dx < 0.0) dx = 0.0;
-   else if (dx > 1.0) dx = 1.0;
+   else if (dx > 1.0)
+     dx = 1.0;
    if (dy < 0.0) dy = 0.0;
-   else if (dy > 1.0) dy = 1.0;
+   else if (dy > 1.0)
+     dy = 1.0;
    rp->drag->step.x = FROM_DOUBLE(dx);
    rp->drag->step.y = FROM_DOUBLE(dy);
 #ifdef EDJE_CALC_CACHE
@@ -3412,9 +3443,9 @@ edje_object_part_drag_step_get(const Evas_Object *obj, const char *part, double
    ed = _edje_fetch(obj);
    if ((!ed) || (!part))
      {
-	if (dx) *dx = 0;
-	if (dy) *dy = 0;
-	return EINA_FALSE;
+        if (dx) *dx = 0;
+        if (dy) *dy = 0;
+        return EINA_FALSE;
      }
 
    /* Need to recalc before providing the object. */
@@ -3423,9 +3454,9 @@ edje_object_part_drag_step_get(const Evas_Object *obj, const char *part, double
    rp = _edje_real_part_recursive_get(ed, part);
    if (!rp || !rp->drag)
      {
-	if (dx) *dx = 0;
-	if (dy) *dy = 0;
-	return EINA_FALSE;
+        if (dx) *dx = 0;
+        if (dy) *dy = 0;
+        return EINA_FALSE;
      }
    if (dx) *dx = TO_DOUBLE(rp->drag->step.x);
    if (dy) *dy = TO_DOUBLE(rp->drag->step.y);
@@ -3460,13 +3491,15 @@ edje_object_part_drag_page_set(Evas_Object *obj, const char *part, double dx, do
           {
              eud->u.drag_position.x = dx;
              eud->u.drag_position.y = dy;
-          } 
+          }
      }
 
    if (dx < 0.0) dx = 0.0;
-   else if (dx > 1.0) dx = 1.0;
+   else if (dx > 1.0)
+     dx = 1.0;
    if (dy < 0.0) dy = 0.0;
-   else if (dy > 1.0) dy = 1.0;
+   else if (dy > 1.0)
+     dy = 1.0;
    rp->drag->page.x = FROM_DOUBLE(dx);
    rp->drag->page.y = FROM_DOUBLE(dy);
 #ifdef EDJE_CALC_CACHE
@@ -3484,9 +3517,9 @@ edje_object_part_drag_page_get(const Evas_Object *obj, const char *part, double
    ed = _edje_fetch(obj);
    if ((!ed) || (!part))
      {
-	if (dx) *dx = 0;
-	if (dy) *dy = 0;
-	return EINA_FALSE;
+        if (dx) *dx = 0;
+        if (dy) *dy = 0;
+        return EINA_FALSE;
      }
 
    /* Need to recalc before providing the object. */
@@ -3495,9 +3528,9 @@ edje_object_part_drag_page_get(const Evas_Object *obj, const char *part, double
    rp = _edje_real_part_recursive_get(ed, part);
    if (!rp || !rp->drag)
      {
-	if (dx) *dx = 0;
-	if (dy) *dy = 0;
-	return EINA_FALSE;
+        if (dx) *dx = 0;
+        if (dy) *dy = 0;
+        return EINA_FALSE;
      }
    if (dx) *dx = TO_DOUBLE(rp->drag->page.x);
    if (dy) *dy = TO_DOUBLE(rp->drag->page.y);
@@ -3534,17 +3567,17 @@ edje_object_part_drag_step(Evas_Object *obj, const char *part, double dx, double
           {
              eud->u.drag_position.x = dx;
              eud->u.drag_position.y = dy;
-          } 
+          }
      }
 
    px = rp->drag->val.x;
    py = rp->drag->val.y;
    rp->drag->val.x = ADD(px, MUL(FROM_DOUBLE(dx),
-				 MUL(rp->drag->step.x, rp->part->dragable.x)));
+                                 MUL(rp->drag->step.x, rp->part->dragable.x)));
    rp->drag->val.y = ADD(py, MUL(FROM_DOUBLE(dy),
-				 MUL(rp->drag->step.y, rp->part->dragable.y)));
-   rp->drag->val.x = CLAMP (rp->drag->val.x, ZERO, FROM_DOUBLE(1.0));
-   rp->drag->val.y = CLAMP (rp->drag->val.y, ZERO, FROM_DOUBLE(1.0));
+                                 MUL(rp->drag->step.y, rp->part->dragable.y)));
+   rp->drag->val.x = CLAMP(rp->drag->val.x, ZERO, FROM_DOUBLE(1.0));
+   rp->drag->val.y = CLAMP(rp->drag->val.y, ZERO, FROM_DOUBLE(1.0));
    if ((px == rp->drag->val.x) && (py == rp->drag->val.y)) return EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
    rp->invalidate = 1;
@@ -3584,15 +3617,15 @@ edje_object_part_drag_page(Evas_Object *obj, const char *part, double dx, double
           {
              eud->u.drag_position.x = dx;
              eud->u.drag_position.y = dy;
-          } 
+          }
      }
 
    px = rp->drag->val.x;
    py = rp->drag->val.y;
    rp->drag->val.x = ADD(px, MUL(FROM_DOUBLE(dx), MUL(rp->drag->page.x, rp->part->dragable.x)));
    rp->drag->val.y = ADD(py, MUL(FROM_DOUBLE(dy), MUL(rp->drag->page.y, rp->part->dragable.y)));
-   rp->drag->val.x = CLAMP (rp->drag->val.x, ZERO, FROM_DOUBLE(1.0));
-   rp->drag->val.y = CLAMP (rp->drag->val.y, ZERO, FROM_DOUBLE(1.0));
+   rp->drag->val.x = CLAMP(rp->drag->val.x, ZERO, FROM_DOUBLE(1.0));
+   rp->drag->val.y = CLAMP(rp->drag->val.y, ZERO, FROM_DOUBLE(1.0));
    if ((px == rp->drag->val.x) && (py == rp->drag->val.y)) return EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
    rp->invalidate = 1;
@@ -3605,7 +3638,6 @@ edje_object_part_drag_page(Evas_Object *obj, const char *part, double dx, double
 void
 _edje_box_init(void)
 {
-
 }
 
 void
@@ -4003,19 +4035,19 @@ _edje_real_part_box_remove_all(Edje_Real_Part *rp, Eina_Bool clear)
    children = evas_object_box_children_get(rp->object);
    while (children)
      {
-	Evas_Object *child_obj = children->data;
-	if (evas_object_data_get(child_obj, "\377 edje.box_item"))
-	  i++;
-	else
-	  {
+        Evas_Object *child_obj = children->data;
+        if (evas_object_data_get(child_obj, "\377 edje.box_item"))
+          i++;
+        else
+          {
              _edje_box_layout_remove_child(rp, child_obj);
-	     _edje_box_child_remove(rp, child_obj);
-	     if (!evas_object_box_remove_at(rp->object, i))
-	       return EINA_FALSE;
-	     if (clear)
-	       evas_object_del(child_obj);
-	  }
-	children = eina_list_remove_list(children, children);
+             _edje_box_child_remove(rp, child_obj);
+             if (!evas_object_box_remove_at(rp->object, i))
+               return EINA_FALSE;
+             if (clear)
+               evas_object_del(child_obj);
+          }
+        children = eina_list_remove_list(children, children);
      }
    return EINA_TRUE;
 }
@@ -4130,7 +4162,7 @@ edje_object_part_table_pack(Evas_Object *obj, const char *part, Evas_Object *chi
 
         evas_object_event_callback_add(child_obj, EVAS_CALLBACK_DEL, _edje_user_def_del_cb, eud);
      }
-   return r;                                   
+   return r;
 }
 
 EAPI Eina_Bool
@@ -4153,7 +4185,7 @@ edje_object_part_table_unpack(Evas_Object *obj, const char *part, Evas_Object *c
      {
         Edje_User_Defined *eud;
         Eina_List *l;
-        
+
         EINA_LIST_FOREACH(ed->user_defined, l, eud)
           if (eud->type == EDJE_USER_TABLE_PACK &&
               eud->u.table.child == child_obj &&
@@ -4373,7 +4405,7 @@ edje_object_perspective_get(const Evas_Object *obj)
 }
 
 #define EDJE_PRELOAD_EMISSION "preload,done"
-#define EDJE_PRELOAD_SOURCE NULL
+#define EDJE_PRELOAD_SOURCE   NULL
 
 EAPI Eina_Bool
 edje_object_preload(Evas_Object *obj, Eina_Bool cancel)
@@ -4389,75 +4421,76 @@ edje_object_preload(Evas_Object *obj, Eina_Bool cancel)
 
    for (i = 0, count = 0; i < ed->table_parts_size; i++)
      {
-	Edje_Real_Part *rp;
-	Edje_Part *ep;
+        Edje_Real_Part *rp;
+        Edje_Part *ep;
 
-	rp = ed->table_parts[i];
-	ep = rp->part;
+        rp = ed->table_parts[i];
+        ep = rp->part;
 
-	if (ep->type == EDJE_PART_TYPE_IMAGE ||
-	    (ep->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object))
-	  count++;
+        if (ep->type == EDJE_PART_TYPE_IMAGE ||
+            (ep->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object))
+          count++;
      }
 
    ed->preload_count = count;
 
    if (count > 0)
      {
-	for (i = 0; i < ed->table_parts_size; i++)
-	  {
-	     Edje_Real_Part *rp;
-	     Edje_Part *ep;
-
-	     rp = ed->table_parts[i];
-	     ep = rp->part;
-
-	     if (ep->type == EDJE_PART_TYPE_IMAGE)
-	       {
-		  const char *file = NULL;
-		  const char *key = NULL;
-
-		  evas_object_event_callback_del_full(rp->object, EVAS_CALLBACK_IMAGE_PRELOADED, _edje_object_image_preload_cb, ed);
-
-		  evas_object_image_file_get(rp->object, &file, &key);
-		  if (!file && !key)
-		    {
-		       ed->preload_count--;
-		    }
-		  else
-		    {
-		       evas_object_event_callback_add(rp->object, EVAS_CALLBACK_IMAGE_PRELOADED, _edje_object_image_preload_cb, ed);
-		       evas_object_image_preload(rp->object, cancel);
-		    }
-		  count--;
-	       }
-	     else if (ep->type == EDJE_PART_TYPE_GROUP)
-	       {
-		  if (rp->swallowed_object) {
-                     char *tmp;
-
-                     if (rp->part->name)
-                       {
-                          tmp = alloca(strlen(rp->part->name) + 2);
-                          sprintf(tmp, "%s:", rp->part->name);
-
-                          edje_object_signal_callback_del(obj, EDJE_PRELOAD_EMISSION, tmp, _edje_object_signal_preload_cb);
-                          edje_object_signal_callback_add(obj, EDJE_PRELOAD_EMISSION, tmp, _edje_object_signal_preload_cb, ed);
-                          edje_object_preload(rp->swallowed_object, cancel);
-                       }
-                     else
-                       {
-                          ed->preload_count--;
-                       }
-
-		     count--;
-		  }
-	       }
-	  }
+        for (i = 0; i < ed->table_parts_size; i++)
+          {
+             Edje_Real_Part *rp;
+             Edje_Part *ep;
+
+             rp = ed->table_parts[i];
+             ep = rp->part;
+
+             if (ep->type == EDJE_PART_TYPE_IMAGE)
+               {
+                  const char *file = NULL;
+                  const char *key = NULL;
+
+                  evas_object_event_callback_del_full(rp->object, EVAS_CALLBACK_IMAGE_PRELOADED, _edje_object_image_preload_cb, ed);
+
+                  evas_object_image_file_get(rp->object, &file, &key);
+                  if (!file && !key)
+                    {
+                       ed->preload_count--;
+                    }
+                  else
+                    {
+                       evas_object_event_callback_add(rp->object, EVAS_CALLBACK_IMAGE_PRELOADED, _edje_object_image_preload_cb, ed);
+                       evas_object_image_preload(rp->object, cancel);
+                    }
+                  count--;
+               }
+             else if (ep->type == EDJE_PART_TYPE_GROUP)
+               {
+                  if (rp->swallowed_object)
+                    {
+                       char *tmp;
+
+                       if (rp->part->name)
+                         {
+                            tmp = alloca(strlen(rp->part->name) + 2);
+                            sprintf(tmp, "%s:", rp->part->name);
+
+                            edje_object_signal_callback_del(obj, EDJE_PRELOAD_EMISSION, tmp, _edje_object_signal_preload_cb);
+                            edje_object_signal_callback_add(obj, EDJE_PRELOAD_EMISSION, tmp, _edje_object_signal_preload_cb, ed);
+                            edje_object_preload(rp->swallowed_object, cancel);
+                         }
+                       else
+                         {
+                            ed->preload_count--;
+                         }
+
+                       count--;
+                    }
+               }
+          }
      }
    else
      {
-	_edje_emit(ed, EDJE_PRELOAD_EMISSION, EDJE_PRELOAD_SOURCE);
+        _edje_emit(ed, EDJE_PRELOAD_EMISSION, EDJE_PRELOAD_SOURCE);
      }
 
    return EINA_TRUE;
@@ -4469,8 +4502,8 @@ edje_object_update_hints_set(Evas_Object *obj, Eina_Bool update)
    Edje *ed;
 
    ed = _edje_fetch(obj);
-   if (!ed) return ;
-   if (ed->update_hints == !!update) return ;
+   if (!ed) return;
+   if (ed->update_hints == !!update) return;
 
    ed->update_hints = !!update;
    if (update)
@@ -4521,16 +4554,16 @@ _edje_real_part_table_clear(Edje_Real_Part *rp, Eina_Bool clear)
    children = evas_object_table_children_get(rp->object);
    while (children)
      {
-	Evas_Object *child_obj = children->data;
+        Evas_Object *child_obj = children->data;
 
-	_edje_table_child_remove(rp, child_obj);
-	if (!evas_object_data_get(child_obj, "\377 edje.table_item"))
-	  {
-	     evas_object_table_unpack(rp->object, child_obj);
-	     if (clear)
-	       evas_object_del(child_obj);
-	  }
-	children = eina_list_remove_list(children, children);
+        _edje_table_child_remove(rp, child_obj);
+        if (!evas_object_data_get(child_obj, "\377 edje.table_item"))
+          {
+             evas_object_table_unpack(rp->object, child_obj);
+             if (clear)
+               evas_object_del(child_obj);
+          }
+        children = eina_list_remove_list(children, children);
      }
 }
 
@@ -4563,15 +4596,18 @@ _edje_children_get(Edje_Real_Part *rp, const char *partid)
    switch (rp->part->type)
      {
       case EDJE_PART_TYPE_EXTERNAL:
-         return _edje_external_content_get(rp->swallowed_object, partid);
+        return _edje_external_content_get(rp->swallowed_object, partid);
+
       case EDJE_PART_TYPE_BOX:
-         l = evas_object_box_children_get(rp->object);
-         break;
+        l = evas_object_box_children_get(rp->object);
+        break;
+
       case EDJE_PART_TYPE_TABLE:
-         l = evas_object_table_children_get(rp->object);
-         break;
+        l = evas_object_table_children_get(rp->object);
+        break;
+
       default:
-         return NULL;
+        return NULL;
      }
 
    v = strtol(partid, &p, 10);
@@ -4600,7 +4636,7 @@ _edje_children_get(Edje_Real_Part *rp, const char *partid)
 
 /* rebuild alternative path */
 char *
-_edje_merge_path(const char *alias, char * const *path)
+_edje_merge_path(const char *alias, char *const *path)
 {
    char *tmp;
    unsigned int length = 1;
@@ -4627,7 +4663,6 @@ _edje_merge_path(const char *alias, char * const *path)
    return tmp;
 }
 
-
 Edje_Real_Part *
 _edje_real_part_recursive_get_helper(const Edje *ed, char **path)
 {
@@ -4643,26 +4678,27 @@ _edje_real_part_recursive_get_helper(const Edje *ed, char **path)
         char *alias;
 
         alias = _edje_merge_path(eina_hash_find(ed->collection->alias, path[0]), path + 1);
-        if (alias) {
-           rp = _edje_real_part_recursive_get(ed, alias);
-           free(alias);
-           return rp;
-        }
+        if (alias)
+          {
+             rp = _edje_real_part_recursive_get(ed, alias);
+             free(alias);
+             return rp;
+          }
      }
 
    //printf("  lookup: %s on %s\n", path[0], ed->parent ? ed->parent : "-");
    idx = strchr(path[0], EDJE_PART_PATH_SEPARATOR_INDEXL);
    if (idx)
      {
-	char *end;
+        char *end;
 
-	end = strchr(idx + 1, EDJE_PART_PATH_SEPARATOR_INDEXR);
-	if (end)
-	  {
-	     *end = '\0';
-	     *idx = '\0';
-	     idx++;
-	  }
+        end = strchr(idx + 1, EDJE_PART_PATH_SEPARATOR_INDEXR);
+        if (end)
+          {
+             *end = '\0';
+             *idx = '\0';
+             idx++;
+          }
      }
 
    rp = _edje_real_part_get(ed, path[0]);
@@ -4672,25 +4708,27 @@ _edje_real_part_recursive_get_helper(const Edje *ed, char **path)
    switch (rp->part->type)
      {
       case EDJE_PART_TYPE_GROUP:
-	 if (!rp->swallowed_object) return NULL;
-	 ed = _edje_fetch(rp->swallowed_object);
-	 if (!ed) return NULL;
-	 path++;
-	 return _edje_real_part_recursive_get_helper(ed, path);
+        if (!rp->swallowed_object) return NULL;
+        ed = _edje_fetch(rp->swallowed_object);
+        if (!ed) return NULL;
+        path++;
+        return _edje_real_part_recursive_get_helper(ed, path);
+
       case EDJE_PART_TYPE_BOX:
       case EDJE_PART_TYPE_TABLE:
       case EDJE_PART_TYPE_EXTERNAL:
-	 if (!idx) return rp;
-	 path++;
+        if (!idx) return rp;
+        path++;
+
+        child = _edje_children_get(rp, idx);
 
-	 child = _edje_children_get(rp, idx);
+        ed = _edje_fetch(child);
 
-         ed = _edje_fetch(child);
+        if (!ed) return NULL;
+        return _edje_real_part_recursive_get_helper(ed, path);
 
-	 if (!ed) return NULL;
-	 return _edje_real_part_recursive_get_helper(ed, path);
       default:
-	 return NULL;
+        return NULL;
      }
 }
 
@@ -4704,10 +4742,10 @@ _edje_real_part_get(const Edje *ed, const char *part)
 
    for (i = 0; i < ed->table_parts_size; i++)
      {
-	Edje_Real_Part *rp;
+        Edje_Real_Part *rp;
 
-	rp = ed->table_parts[i];
-	if ((rp->part->name) && (!strcmp(rp->part->name, part))) return rp;
+        rp = ed->table_parts[i];
+        if ((rp->part->name) && (!strcmp(rp->part->name, part))) return rp;
      }
    return NULL;
 }
@@ -4883,12 +4921,12 @@ _edje_thaw(Edje *ed)
    if (ed->freeze < 0)
      {
 //	printf("-------------########### OVER THAW\n");
-	ed->freeze = 0;
+        ed->freeze = 0;
      }
    if ((ed->freeze == 0) && (ed->recalc))
      {
 //	printf("thaw recalc\n");
-	_edje_recalc(ed);
+        _edje_recalc(ed);
      }
    return ed->freeze;
 }
@@ -4960,68 +4998,73 @@ _edje_real_part_swallow_hints_update(Edje_Real_Part *rp)
    rp->swallow_params.max.h = -1;
    if ((type) && (!strcmp(type, "edje")))
      {
-	Evas_Coord w, h;
+        Evas_Coord w, h;
 
 #if 0
-	edje_object_size_min_get(rp->swallowed_object, &w, &h);
-	rp->swallow_params.min.w = w;
-	rp->swallow_params.min.h = h;
+        edje_object_size_min_get(rp->swallowed_object, &w, &h);
+        rp->swallow_params.min.w = w;
+        rp->swallow_params.min.h = h;
 #endif
-	edje_object_size_max_get(rp->swallowed_object, &w, &h);
-	rp->swallow_params.max.w = w;
-	rp->swallow_params.max.h = h;
+        edje_object_size_max_get(rp->swallowed_object, &w, &h);
+        rp->swallow_params.max.w = w;
+        rp->swallow_params.max.h = h;
      }
    else if ((type) && ((!strcmp(type, "text")) || (!strcmp(type, "polygon")) ||
-		       (!strcmp(type, "line"))))
+                       (!strcmp(type, "line"))))
      {
-	Evas_Coord w, h;
+        Evas_Coord w, h;
 
-	evas_object_geometry_get(rp->swallowed_object, NULL, NULL, &w, &h);
+        evas_object_geometry_get(rp->swallowed_object, NULL, NULL, &w, &h);
 #if 0
-	rp->swallow_params.min.w = w;
-	rp->swallow_params.min.h = h;
+        rp->swallow_params.min.w = w;
+        rp->swallow_params.min.h = h;
 #endif
-	rp->swallow_params.max.w = w;
-	rp->swallow_params.max.h = h;
-     }
-     {
-	Evas_Coord w1, h1, w2, h2, aw, ah;
-	Evas_Aspect_Control am;
-
-	evas_object_size_hint_min_get(rp->swallowed_object, &w1, &h1);
-	evas_object_size_hint_max_get(rp->swallowed_object, &w2, &h2);
-	evas_object_size_hint_aspect_get(rp->swallowed_object, &am, &aw, &ah);
-	rp->swallow_params.min.w = w1;
-	rp->swallow_params.min.h = h1;
-	if (w2 > 0) rp->swallow_params.max.w = w2;
-	if (h2 > 0) rp->swallow_params.max.h = h2;
-  	switch (am)
-	  {
-	   case EVAS_ASPECT_CONTROL_NONE:
-             rp->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_NONE;
-             break;
-	   case EVAS_ASPECT_CONTROL_NEITHER:
-             rp->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_NEITHER;
-             break;
-	   case EVAS_ASPECT_CONTROL_HORIZONTAL:
-             rp->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_HORIZONTAL;
-             break;
-	   case EVAS_ASPECT_CONTROL_VERTICAL:
-             rp->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_VERTICAL;
-             break;
-	   case EVAS_ASPECT_CONTROL_BOTH:
-             rp->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_BOTH;
-             break;
-	   default:
-             break;
-	  }
-	rp->swallow_params.aspect.w = aw;
-	rp->swallow_params.aspect.h = ah;
-        evas_object_data_set(rp->swallowed_object, "\377 edje.swallowing_part", rp);
+        rp->swallow_params.max.w = w;
+        rp->swallow_params.max.h = h;
      }
+   {
+      Evas_Coord w1, h1, w2, h2, aw, ah;
+      Evas_Aspect_Control am;
+
+      evas_object_size_hint_min_get(rp->swallowed_object, &w1, &h1);
+      evas_object_size_hint_max_get(rp->swallowed_object, &w2, &h2);
+      evas_object_size_hint_aspect_get(rp->swallowed_object, &am, &aw, &ah);
+      rp->swallow_params.min.w = w1;
+      rp->swallow_params.min.h = h1;
+      if (w2 > 0) rp->swallow_params.max.w = w2;
+      if (h2 > 0) rp->swallow_params.max.h = h2;
+      switch (am)
+        {
+         case EVAS_ASPECT_CONTROL_NONE:
+           rp->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_NONE;
+           break;
+
+         case EVAS_ASPECT_CONTROL_NEITHER:
+           rp->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_NEITHER;
+           break;
+
+         case EVAS_ASPECT_CONTROL_HORIZONTAL:
+           rp->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_HORIZONTAL;
+           break;
+
+         case EVAS_ASPECT_CONTROL_VERTICAL:
+           rp->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_VERTICAL;
+           break;
+
+         case EVAS_ASPECT_CONTROL_BOTH:
+           rp->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_BOTH;
+           break;
+
+         default:
+           break;
+        }
+      rp->swallow_params.aspect.w = aw;
+      rp->swallow_params.aspect.h = ah;
+      evas_object_data_set(rp->swallowed_object, "\377 edje.swallowing_part", rp);
+   }
 
 #ifdef EDJE_CALC_CACHE
-     rp->invalidate = 1;
+   rp->invalidate = 1;
 #endif
 }
 
@@ -5040,8 +5083,8 @@ _edje_object_part_swallow_changed_hints_cb(void *data, __UNUSED__ Evas *e, __UNU
 
 void
 _edje_real_part_swallow(Edje_Real_Part *rp,
-			Evas_Object *obj_swallow,
-			Eina_Bool hints_update)
+                        Evas_Object *obj_swallow,
+                        Eina_Bool hints_update)
 {
    if (rp->swallowed_object)
      {
@@ -5072,12 +5115,12 @@ _edje_real_part_swallow(Edje_Real_Part *rp,
    evas_object_stack_above(rp->swallowed_object, rp->object);
    evas_object_event_callback_add(rp->swallowed_object,
                                   EVAS_CALLBACK_DEL,
-				  _edje_object_part_swallow_free_cb,
-				  rp);
+                                  _edje_object_part_swallow_free_cb,
+                                  rp);
    evas_object_event_callback_add(rp->swallowed_object,
                                   EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-				  _edje_object_part_swallow_changed_hints_cb,
-				  rp);
+                                  _edje_object_part_swallow_changed_hints_cb,
+                                  rp);
 
    if (hints_update)
      _edje_real_part_swallow_hints_update(rp);
@@ -5085,11 +5128,11 @@ _edje_real_part_swallow(Edje_Real_Part *rp,
    if (rp->part->mouse_events)
      {
         _edje_callbacks_add(obj_swallow, rp->edje, rp);
-	if (rp->part->repeat_events)
-           evas_object_repeat_events_set(obj_swallow, 1);
-	if (rp->part->pointer_mode != EVAS_OBJECT_POINTER_MODE_AUTOGRAB)
-	  evas_object_pointer_mode_set(obj_swallow, rp->part->pointer_mode);
-	evas_object_pass_events_set(obj_swallow, 0);
+        if (rp->part->repeat_events)
+          evas_object_repeat_events_set(obj_swallow, 1);
+        if (rp->part->pointer_mode != EVAS_OBJECT_POINTER_MODE_AUTOGRAB)
+          evas_object_pointer_mode_set(obj_swallow, rp->part->pointer_mode);
+        evas_object_pass_events_set(obj_swallow, 0);
      }
    else
      evas_object_pass_events_set(obj_swallow, 1);
@@ -5152,7 +5195,7 @@ _edje_object_signal_preload_cb(void *data, Evas_Object *obj, __UNUSED__ const ch
 
 /**
  * @internal
- * 
+ *
  * for edje_cc
  */
 EAPI void
@@ -5164,45 +5207,45 @@ _edje_program_remove(Edje_Part_Collection *edc, Edje_Program *p)
 
    if (!p->signal && !p->source)
      {
-	array = &edc->programs.nocmp;
-	count = &edc->programs.nocmp_count;
+        array = &edc->programs.nocmp;
+        count = &edc->programs.nocmp_count;
      }
    else if (p->signal && !strpbrk(p->signal, "*?[\\")
-	    && p->source && !strpbrk(p->source, "*?[\\"))
+            && p->source && !strpbrk(p->source, "*?[\\"))
      {
-	array = &edc->programs.strcmp;
-	count = &edc->programs.strcmp_count;
+        array = &edc->programs.strcmp;
+        count = &edc->programs.strcmp_count;
      }
    else if (p->signal && edje_program_is_strncmp(p->signal)
-	    && p->source && edje_program_is_strncmp(p->source))
+            && p->source && edje_program_is_strncmp(p->source))
      {
-	array = &edc->programs.strncmp;
-	count = &edc->programs.strncmp_count;
+        array = &edc->programs.strncmp;
+        count = &edc->programs.strncmp_count;
      }
    else if (p->signal && edje_program_is_strrncmp(p->signal)
-	    && p->source && edje_program_is_strrncmp(p->source))
+            && p->source && edje_program_is_strrncmp(p->source))
      {
-	array = &edc->programs.strrncmp;
-	count = &edc->programs.strrncmp_count;
+        array = &edc->programs.strrncmp;
+        count = &edc->programs.strrncmp_count;
      }
    else
      {
-	array = &edc->programs.fnmatch;
-	count = &edc->programs.fnmatch_count;
+        array = &edc->programs.fnmatch;
+        count = &edc->programs.fnmatch_count;
      }
 
    for (i = 0; i < *count; ++i)
      if ((*array)[i] == p)
        {
-	  memmove(*array + i, *array + i + 1, sizeof (Edje_Program *) * (*count - i -1));
-	  (*count)--;
-	  break;
+          memmove(*array + i, *array + i + 1, sizeof (Edje_Program *) * (*count - i - 1));
+          (*count)--;
+          break;
        }
 }
 
 /**
  * @internal
- * 
+ *
  * for edje_cc
  */
 EAPI void
@@ -5213,31 +5256,31 @@ _edje_program_insert(Edje_Part_Collection *edc, Edje_Program *p)
 
    if (!p->signal && !p->source)
      {
-	array = &edc->programs.nocmp;
-	count = &edc->programs.nocmp_count;
+        array = &edc->programs.nocmp;
+        count = &edc->programs.nocmp_count;
      }
    else if (p->signal && !strpbrk(p->signal, "*?[\\")
-	    && p->source && !strpbrk(p->source, "*?[\\"))
+            && p->source && !strpbrk(p->source, "*?[\\"))
      {
-	array = &edc->programs.strcmp;
-	count = &edc->programs.strcmp_count;
+        array = &edc->programs.strcmp;
+        count = &edc->programs.strcmp_count;
      }
    else if (p->signal && edje_program_is_strncmp(p->signal)
-	    && p->source && edje_program_is_strncmp(p->source))
+            && p->source && edje_program_is_strncmp(p->source))
      {
-	array = &edc->programs.strncmp;
-	count = &edc->programs.strncmp_count;
+        array = &edc->programs.strncmp;
+        count = &edc->programs.strncmp_count;
      }
    else if (p->signal && edje_program_is_strrncmp(p->signal)
-	    && p->source && edje_program_is_strrncmp(p->source))
+            && p->source && edje_program_is_strrncmp(p->source))
      {
-	array = &edc->programs.strrncmp;
-	count = &edc->programs.strrncmp_count;
+        array = &edc->programs.strrncmp;
+        count = &edc->programs.strrncmp_count;
      }
    else
      {
-	array = &edc->programs.fnmatch;
-	count = &edc->programs.fnmatch_count;
+        array = &edc->programs.fnmatch;
+        count = &edc->programs.fnmatch_count;
      }
 
    *array = realloc(*array, sizeof (Edje_Program *) * (*count + 1));
diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
index 0c361b9..f257958 100644
--- a/src/modules/Makefile.in
+++ b/src/modules/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -65,6 +82,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -499,13 +521,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff --git a/src/modules/alsa_snd_player/Makefile.in b/src/modules/alsa_snd_player/Makefile.in
index 3b7ca70..ba1af25 100644
--- a/src/modules/alsa_snd_player/Makefile.in
+++ b/src/modules/alsa_snd_player/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -118,6 +135,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libalsa_snd_player_la_SOURCES)
 DIST_SOURCES = $(libalsa_snd_player_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -362,7 +384,6 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
 	@list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -370,6 +391,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
 	}
diff --git a/src/modules/eet_snd_reader/Makefile.in b/src/modules/eet_snd_reader/Makefile.in
index ac85035..55b17de 100644
--- a/src/modules/eet_snd_reader/Makefile.in
+++ b/src/modules/eet_snd_reader/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -119,6 +136,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libeet_sndfile_reader_la_SOURCES)
 DIST_SOURCES = $(libeet_sndfile_reader_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -362,7 +384,6 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
 	@list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -370,6 +391,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
 	}
diff --git a/src/modules/multisense_factory/Makefile.in b/src/modules/multisense_factory/Makefile.in
index a876b66..ae9b5b8 100644
--- a/src/modules/multisense_factory/Makefile.in
+++ b/src/modules/multisense_factory/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -116,6 +133,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(module_la_SOURCES)
 DIST_SOURCES = $(module_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -363,7 +385,6 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
 	@list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -371,6 +392,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
 	}
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index 66eaedc..c70d47a 100644
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -92,6 +109,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(edje_suite_SOURCES)
 DIST_SOURCES = $(am__edje_suite_SOURCES_DIST)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
diff --git a/utils/Makefile.in b/utils/Makefile.in
index 4fbcd84..2c3a81c 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -88,6 +105,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -316,8 +338,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-- 
2.7.4