From: Eduardo Lima (Etrunko) Date: Tue, 21 Jan 2014 23:00:07 +0000 (-0200) Subject: Imported Upstream version 1.8.3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7b03e269b542f74bb5a59aba36b1e77cc23a839;p=platform%2Fupstream%2Felementary.git Imported Upstream version 1.8.3 --- diff --git a/Makefile.in b/Makefile.in index 68a071a82..66bc31b8b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -99,8 +99,8 @@ DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ $(top_srcdir)/cmakeconfig/ElementaryConfig.cmake.in \ $(top_srcdir)/cmakeconfig/ElementaryConfigVersion.cmake.in \ $(top_srcdir)/pkgbuild/PKGBUILD.in ABOUT-NLS COPYING TODO \ - ar-lib config.guess config.rpath config.sub depcomp install-sh \ - missing ltmain.sh + compile config.guess config.rpath config.sub depcomp \ + install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \ $(top_srcdir)/m4/efl_beta.m4 $(top_srcdir)/m4/efl_binary.m4 \ @@ -532,8 +532,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): elementary_config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/elementary_config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -793,10 +793,16 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -838,9 +844,10 @@ distcheck: dist && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ diff --git a/NEWS b/NEWS index 9a0fda15e..7c2a8736f 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,30 @@ ================ -Elementary 1.8.2 +Elementary 1.8.3 ================ +Changes since Elementary 1.8.2: +------------------------------- + +Additions: + +Improvements: + +Fixes: + * gengrid, genlist: Fallback into default item style if the required item + style does not exist. + * elm: replace 0 or 1 with EINA_FALSE or EINA_TRUE + * elm_test: use EINA_TRUE or FALSE instead of 1 or 0 + * Widget: Don't check if it's the correct class everywhere. + * Updating serbian translation + * elm theme - fix toggle color to hide invisible orange rect + * entry: fix build warning about explicit braces to avoid ambiguous 'else' + * More NULL checks in many widgets + * elm_thumb: Delete ethumb object on smart_del in order to prevent the + ethumb from being left as an artifact after the elm_thumb has been deleted. + * update e startup splash version to 18 + +Removals: + Changes since Elementary 1.8.1: ------------------------------- diff --git a/aclocal.m4 b/aclocal.m4 index ea55d0cfb..a36b9e166 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.13.4 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -180,46 +180,6 @@ else fi[]dnl ])# PKG_CHECK_MODULES - -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. -AC_DEFUN([PKG_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([pkgconfigdir], - [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, - [with_pkgconfigdir=]pkg_default) -AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR - - -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. -AC_DEFUN([PKG_NOARCH_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([noarch-pkgconfigdir], - [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, - [with_noarch_pkgconfigdir=]pkg_default) -AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR - # Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -232,10 +192,10 @@ m4_popdef([pkg_description]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.14' 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.13.4], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -251,7 +211,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.13.4])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -618,6 +578,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -726,7 +692,48 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -734,7 +741,6 @@ dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -948,6 +954,70 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + # Check to make sure that the build environment is sane. -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. diff --git a/ar-lib b/ar-lib deleted file mode 100755 index fe2301e71..000000000 --- a/ar-lib +++ /dev/null @@ -1,270 +0,0 @@ -#! /bin/sh -# Wrapper for Microsoft lib.exe - -me=ar-lib -scriptversion=2012-03-01.08; # UTC - -# Copyright (C) 2010-2013 Free Software Foundation, Inc. -# Written by Peter Rosin . -# -# 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 -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - - -# func_error message -func_error () -{ - echo "$me: $1" 1>&2 - exit 1 -} - -file_conv= - -# func_file_conv build_file -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. -func_file_conv () -{ - file=$1 - case $file in - / | /[!/]*) # absolute file, and not a UNC file - if test -z "$file_conv"; then - # lazily determine how to convert abs files - case `uname -s` in - MINGW*) - file_conv=mingw - ;; - CYGWIN*) - file_conv=cygwin - ;; - *) - file_conv=wine - ;; - esac - fi - case $file_conv in - mingw) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; - cygwin) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine) - file=`winepath -w "$file" || echo "$file"` - ;; - esac - ;; - esac -} - -# func_at_file at_file operation archive -# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE -# for each of them. -# When interpreting the content of the @FILE, do NOT use func_file_conv, -# since the user would need to supply preconverted file names to -# binutils ar, at least for MinGW. -func_at_file () -{ - operation=$2 - archive=$3 - at_file_contents=`cat "$1"` - eval set x "$at_file_contents" - shift - - for member - do - $AR -NOLOGO $operation:"$member" "$archive" || exit $? - done -} - -case $1 in - '') - func_error "no command. Try '$0 --help' for more information." - ;; - -h | --h*) - cat <. +# +# 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + 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 + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + 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 () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + 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*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/config.guess b/config.guess index b79252d6b..d622a44e5 100755 --- a/config.guess +++ b/config.guess @@ -1,12 +1,14 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -20,17 +22,19 @@ timestamp='2013-06-10' # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). +# the same distribution terms that you use for the rest of that program. + + +# Originally written by Per Bothner. Please send patches (context +# diff format) to and include a ChangeLog +# entry. # -# Originally written by Per Bothner. +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -# -# Please send patches with a ChangeLog entry to config-patches@gnu.org. - me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +54,9 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -132,27 +138,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in -Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu - - eval $set_cc_for_build - cat <<-EOF > $dummy.c - #include - #if defined(__UCLIBC__) - LIBC=uclibc - #elif defined(__dietlibc__) - LIBC=dietlibc - #else - LIBC=gnu - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - ;; -esac - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -215,10 +200,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; - *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} - exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -321,7 +302,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm*:riscos:*:*|arm*:RISCOS:*:*) + arm:riscos:*:*|arm:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -820,9 +801,6 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 - exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -874,21 +852,21 @@ EOF exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -901,54 +879,59 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + echo ${UNAME_MACHINE}-unknown-linux-gnueabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -967,63 +950,54 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-unknown-linux-gnu exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-gnu exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-gnu exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} - exit ;; - ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} - exit ;; - ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} + echo powerpc-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1227,9 +1201,6 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; - x86_64:Haiku:*:*) - echo x86_64-unknown-haiku - exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1256,21 +1227,19 @@ EOF exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc - fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - fi + case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1287,7 +1256,7 @@ EOF NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-*:NONSTOP_KERNEL:*:*) + NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1361,6 +1330,9 @@ EOF exit ;; esac +#echo '(No uname command or uname output not recognized.)' 1>&2 +#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 + eval $set_cc_for_build cat >$dummy.c <. @@ -20,12 +26,11 @@ timestamp='2013-04-24' # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). +# the same distribution terms that you use for the rest of that program. -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . Submit a context +# diff and a properly formatted GNU ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -68,7 +73,9 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -116,7 +123,7 @@ esac maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -149,7 +156,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze*) + -apple | -axis | -knuth | -cray | -microblaze) os= basic_machine=$1 ;; @@ -252,10 +259,8 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ - | be32 | be64 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -268,7 +273,7 @@ case $basic_machine in | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -286,17 +291,16 @@ case $basic_machine in | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ + | nios | nios2 \ | ns16k | ns32k \ | open8 \ - | or1k | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -366,7 +370,7 @@ case $basic_machine in | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ @@ -385,8 +389,7 @@ case $basic_machine in | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -404,13 +407,12 @@ case $basic_machine in | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -786,13 +788,9 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze*) + microblaze) basic_machine=microblaze-xilinx ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -1006,7 +1004,7 @@ case $basic_machine in ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown @@ -1021,11 +1019,7 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=-rdos - ;; - rdos32) + rdos) basic_machine=i386-pc os=-rdos ;; @@ -1352,21 +1346,21 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ + | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ + | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1498,6 +1492,9 @@ case $os in -aros*) os=-aros ;; + -kaos*) + os=-kaos + ;; -zvmoe) os=-zvmoe ;; @@ -1589,9 +1586,6 @@ case $basic_machine in mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; diff --git a/config/Makefile.in b/config/Makefile.in index 8811202c4..e8ec6d9fb 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/config/default/Makefile.in b/config/default/Makefile.in index da4762976..01b111c3b 100644 --- a/config/default/Makefile.in +++ b/config/default/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/config/mobile/Makefile.in b/config/mobile/Makefile.in index 1c4449eca..4faef7d8d 100644 --- a/config/mobile/Makefile.in +++ b/config/mobile/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/config/standard/Makefile.in b/config/standard/Makefile.in index c3ef49446..6f2ffe9a2 100644 --- a/config/standard/Makefile.in +++ b/config/standard/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/configure b/configure index 9c137ad6a..1dc005ac4 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.69 for elementary 1.8.2. +# Generated by GNU Autoconf 2.69 for elementary 1.8.3. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='elementary' PACKAGE_TARNAME='elementary' -PACKAGE_VERSION='1.8.2' -PACKAGE_STRING='elementary 1.8.2' +PACKAGE_VERSION='1.8.3' +PACKAGE_STRING='elementary 1.8.3' PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net' PACKAGE_URL='' @@ -1490,7 +1490,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 elementary 1.8.2 to adapt to many kinds of systems. +\`configure' configures elementary 1.8.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1560,7 +1560,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of elementary 1.8.2:";; + short | recursive ) echo "Configuration of elementary 1.8.3:";; esac cat <<\_ACEOF @@ -1777,7 +1777,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -elementary configure 1.8.2 +elementary configure 1.8.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2200,7 +2200,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 elementary $as_me 1.8.2, which was +It was created by elementary $as_me 1.8.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2658,7 +2658,7 @@ ac_config_headers="$ac_config_headers elementary_config.h" -am__api_version='1.13' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3144,7 +3144,7 @@ fi # Define the identity of the package. PACKAGE='elementary' - VERSION='1.8.2' + VERSION='1.8.3' cat >>confdefs.h <<_ACEOF @@ -3195,6 +3195,47 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -4087,6 +4128,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -5495,6 +5595,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -7347,7 +7506,8 @@ else ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -7745,10 +7905,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -7787,11 +7943,11 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) 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 @@ -8865,7 +9021,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -8881,12 +9037,16 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - powerpcle-*linux*) - LD="${LD-ld} -m elf32lppclinux" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; - powerpc-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -8905,10 +9065,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*linux*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*linux*) + ppc*-*linux*|powerpc*-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -10447,7 +10604,7 @@ lt_prog_compiler_static= lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -10925,6 +11082,9 @@ $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 @@ -11146,7 +11306,7 @@ _LT_EOF fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -11323,6 +11483,7 @@ _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 @@ -11776,7 +11937,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -12613,17 +12774,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - 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 - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -12740,7 +12890,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -12789,14 +12939,10 @@ 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="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -12808,6 +12954,18 @@ 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 @@ -13795,7 +13953,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF -#define VMIC 2 +#define VMIC 3 _ACEOF @@ -13803,7 +13961,7 @@ cat >>confdefs.h <<_ACEOF #define VREV 0 _ACEOF -version_info="9:2:8" +version_info="9:3:8" release_info="" @@ -13965,7 +14123,7 @@ case "$host_os" in MODULE_ARCH="$host_os-$host_cpu" ;; *) - MODULE_ARCH="$host_os-$host_cpu-1.8.2" + MODULE_ARCH="$host_os-$host_cpu-1.8.3" ;; esac @@ -19663,7 +19821,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 elementary $as_me 1.8.2, which was +This file was extended by elementary $as_me 1.8.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19729,7 +19887,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="\\ -elementary config.status 1.8.2 +elementary config.status 1.8.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index b7f6f42d1..dc432f0ca 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [1]) m4_define([v_min], [8]) -m4_define([v_mic], [2]) +m4_define([v_mic], [3]) dnl m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n'])) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) diff --git a/data/Makefile.in b/data/Makefile.in index 3b435f5e2..f4214b88f 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/data/desktop/Makefile.in b/data/desktop/Makefile.in index f4906d545..1b461df6a 100644 --- a/data/desktop/Makefile.in +++ b/data/desktop/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/data/edje_externals/Makefile.in b/data/edje_externals/Makefile.in index 544b93942..b259f0124 100644 --- a/data/edje_externals/Makefile.in +++ b/data/edje_externals/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/data/images/Makefile.in b/data/images/Makefile.in index 0f8ee4df1..437ec5585 100644 --- a/data/images/Makefile.in +++ b/data/images/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/data/objects/Makefile.in b/data/objects/Makefile.in index 9ccfeddad..dff764c67 100644 --- a/data/objects/Makefile.in +++ b/data/objects/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/data/themes/Makefile.in b/data/themes/Makefile.in index 7519268da..e02eac836 100644 --- a/data/themes/Makefile.in +++ b/data/themes/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/data/themes/edc/elm/check.edc b/data/themes/edc/elm/check.edc index 404b05b26..af03b2e26 100644 --- a/data/themes/edc/elm/check.edc +++ b/data/themes/edc/elm/check.edc @@ -548,7 +548,7 @@ group { name: "elm/check/base/toggle"; rel2.to: "tog"; min: 15 15; max: 15 99999; - color: 255 128 0 128; + color: 0 0 0 0; } } part { name: "shadow_but"; mouse_events: 0; diff --git a/data/themes/edc/init.edc b/data/themes/edc/init.edc index d5e5997d4..a421169a9 100644 --- a/data/themes/edc/init.edc +++ b/data/themes/edc/init.edc @@ -105,7 +105,7 @@ group { name: "e/init/splash"; color2: 51 153 255 24; color3: 51 153 255 18; text { font: FN; size: 8; - text: "0.17.0"; + text: "0.18"; min: 1 1; align: 1.0 1.0; text_class: "init_version"; diff --git a/depcomp b/depcomp index 4ebd5b3a2..25a39e6cd 100755 --- a/depcomp +++ b/depcomp @@ -1,9 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2013-05-30.07; # UTC +scriptversion=2012-03-27.16; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 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 @@ -27,9 +28,9 @@ scriptversion=2013-05-30.07; # UTC case $1 in '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -56,65 +57,11 @@ EOF ;; esac -# Get the directory component of the given path, and save it in the -# global variables '$dir'. Note that this directory component will -# be either empty or ending with a '/' character. This is deliberate. -set_dir_from () -{ - case $1 in - */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; - *) dir=;; - esac -} - -# Get the suffix-stripped basename of the given path, and save it the -# global variable '$base'. -set_base_from () -{ - base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` -} - -# If no dependency file was actually created by the compiler invocation, -# we still have to create a dummy depfile, to avoid errors with the -# Makefile "include basename.Plo" scheme. -make_dummy_depfile () -{ - echo "#dummy" > "$depfile" -} - -# Factor out some common post-processing of the generated depfile. -# Requires the auxiliary global variable '$tmpdepfile' to be set. -aix_post_process_depfile () -{ - # If the compiler actually managed to produce a dependency file, - # post-process it. - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependency.h'. - # Do two passes, one to just change these to - # $object: dependency.h - # and one to simply output - # dependency.h: - # which is needed to avoid the deleted-header problem. - { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" - sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" - } > "$depfile" - rm -f "$tmpdepfile" - else - make_dummy_depfile - fi -} - # A tabulation character. tab=' ' # A newline character. nl=' ' -# Character ranges might be problematic outside the C locale. -# These definitions help. -upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ -lower=abcdefghijklmnopqrstuvwxyz -digits=0123456789 -alpha=${upper}${lower} if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 @@ -128,9 +75,6 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" -# Avoid interferences from the environment. -gccflag= dashmflag= - # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -142,32 +86,32 @@ if test "$depmode" = hp; then fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 fi if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. - gccflag=-qmakedep=gcc,-MF - depmode=gcc + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -190,7 +134,8 @@ gcc3) done "$@" stat=$? - if test $stat -ne 0; then + if test $stat -eq 0; then : + else rm -f "$tmpdepfile" exit $stat fi @@ -198,17 +143,13 @@ gcc3) ;; gcc) -## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. -## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. -## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). Also, it might not be -## supported by the other compilers which use the 'gcc' depmode. +## -MM, not -M (despite what the docs say). ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -216,14 +157,15 @@ gcc) fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -ne 0; then + if test $stat -eq 0; then : + else rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - # The second -e expression handles DOS-style file names with drive - # letters. + alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz +## 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. @@ -232,15 +174,15 @@ gcc) ## 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 ' ' "$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. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -258,7 +200,8 @@ sgi) "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -ne 0; then + if test $stat -eq 0; then : + else rm -f "$tmpdepfile" exit $stat fi @@ -266,6 +209,7 @@ sgi) if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" + # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in @@ -273,15 +217,19 @@ sgi) # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ - | tr "$nl" ' ' >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ + tr "$nl" ' ' >> "$depfile" echo >> "$depfile" + # The second pass generates a dummy entry for each header file. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - make_dummy_depfile + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" ;; @@ -299,8 +247,9 @@ aix) # 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. - set_dir_from "$object" - set_base_from "$object" + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -313,7 +262,9 @@ aix) "$@" -M fi stat=$? - if test $stat -ne 0; then + + if test $stat -eq 0; then : + else rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -322,113 +273,65 @@ aix) do test -f "$tmpdepfile" && break done - aix_post_process_depfile - ;; - -tcc) - # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 - # FIXME: That version still under development at the moment of writing. - # Make that this statement remains true also for stable, released - # versions. - # It will wrap lines (doesn't matter whether long or short) with a - # trailing '\', as in: - # - # foo.o : \ - # foo.c \ - # foo.h \ - # - # It will put a trailing '\' even on the last line, and will use leading - # spaces rather than leading tabs (at least since its commit 0394caf7 - # "Emit spaces for -MD"). - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat + if test -f "$tmpdepfile"; then + # 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:'. + sed -e "s,^.*\.[a-z]*:,$object:," < "$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 + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" fi - rm -f "$depfile" - # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. - # We have to change lines of the first kind to '$object: \'. - sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" - # And for each line of the second kind, we have to emit a 'dep.h:' - # dummy dependency, to avoid the deleted-header problem. - sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -## The order of this option in the case statement is important, since the -## shell code in configure will try each of these formats in the order -## listed in this file. A plain '-MD' option would be understood by many -## compilers, so we must ensure this comes after the gcc and icc options. -pgcc) - # Portland's C compiler understands '-MD'. - # Will always output deps to 'file.d' where file is the root name of the - # source file under compilation, even if file resides in a subdirectory. - # The object file name does not affect the name of the '.d' file. - # pgcc 10.2 will output +icc) + # 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 + # 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 ... \ # ... - set_dir_from "$object" - # Use the source, not the object, to determine the base name, since - # that's sadly what pgcc will do too. - set_base_from "$source" - tmpdepfile=$base.d - - # For projects that build the same source file twice into different object - # files, the pgcc approach of using the *source* file root name can cause - # problems in parallel builds. Use a locking strategy to avoid stomping on - # the same $tmpdepfile. - lockdir=$base.d-lock - trap " - echo '$0: caught signal, cleaning up...' >&2 - rmdir '$lockdir' - exit 1 - " 1 2 13 15 - numtries=100 - i=$numtries - while test $i -gt 0; do - # mkdir is a portable test-and-set. - if mkdir "$lockdir" 2>/dev/null; then - # This process acquired the lock. - "$@" -MD - stat=$? - # Release the lock. - rmdir "$lockdir" - break - else - # If the lock is being held by a different process, wait - # until the winning process is done or we timeout. - while test -d "$lockdir" && test $i -gt 0; do - sleep 1 - i=`expr $i - 1` - done - fi - i=`expr $i - 1` - done - trap - 1 2 13 15 - if test $i -le 0; then - echo "$0: failed to acquire lock after $numtries attempts" >&2 - echo "$0: check lockdir '$lockdir'" >&2 - exit 1 - fi - - if test $stat -ne 0; then + # 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 : + else rm -f "$tmpdepfile" 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" ;; @@ -439,8 +342,9 @@ hp2) # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - set_dir_from "$object" - set_base_from "$object" + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -451,7 +355,8 @@ hp2) "$@" +Maked fi stat=$? - if test $stat -ne 0; then + if test $stat -eq 0; then : + else rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -461,61 +366,76 @@ hp2) test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" + sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - make_dummy_depfile + echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; 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'. - # 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. - # Subdirectories are respected. - set_dir_from "$object" - set_base_from "$object" - - if test "$libtool" = yes; then - # Libtool generates 2 separate objects for the 2 libraries. These - # two compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir$base.o.d # libtool 1.5 - tmpdepfile2=$dir.libs/$base.o.d # Likewise. - tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done - # Same post-processing that is required for AIX mode. - aix_post_process_depfile - ;; + # The Tru64 compiler uses -MD to generate dependencies as a side + # 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. + # Subdirectories are respected. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + + if test "$libtool" = yes; then + # With Tru64 cc, shared objects can also be used to make a + # static library. This mechanism is used in libtool 1.4 series to + # handle both shared and static libraries in a single compilation. + # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. + # + # With libtool 1.5 this exception was removed, and libtool now + # generates 2 separate objects for the 2 libraries. These two + # compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 + tmpdepfile2=$dir$base.o.d # libtool 1.5 + tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 + tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.o.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + tmpdepfile4=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; msvc7) if test "$libtool" = yes; then @@ -526,7 +446,8 @@ msvc7) "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test $stat -ne 0; then + if test "$stat" = 0; then : + else rm -f "$tmpdepfile" exit $stat fi @@ -552,7 +473,6 @@ $ { G p }' >> "$depfile" - echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; @@ -604,14 +524,13 @@ dashmstdout) # 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. "$@" $dashmflag | - sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this sed invocation - # correctly. Breaking it into two sed invocations is a workaround. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + 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" rm -f "$tmpdepfile" ;; @@ -664,12 +583,10 @@ 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" - # Some versions of the HPUX 10.20 sed can't process the last invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed '1,2d' "$tmpdepfile" \ - | tr ' ' "$nl" \ - | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + 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" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -705,10 +622,10 @@ cpp) esac done - "$@" -E \ - | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - | sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E | + sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -740,15 +657,15 @@ msvisualcpp) shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | diff --git a/doc/Makefile.in b/doc/Makefile.in index 550021ce1..b7a2e1c7c 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/doc/widgets/Makefile.in b/doc/widgets/Makefile.in index 366cc5d13..afdfd62ab 100644 --- a/doc/widgets/Makefile.in +++ b/doc/widgets/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -1431,14 +1431,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/elementary.spec b/elementary.spec index 537e27a3e..b1c4df9dd 100644 --- a/elementary.spec +++ b/elementary.spec @@ -3,7 +3,7 @@ Summary: EFL toolkit for small touchscreens Name: elementary -Version: 1.8.2 +Version: 1.8.3 Release: %{_rel} License: Lesser GPL Group: System Environment/Libraries diff --git a/install-sh b/install-sh index 377bb8687..a9244eb07 100755 --- a/install-sh +++ b/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2011-01-19.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ scriptversion=2011-11-20.07; # UTC # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# 'make' implicit rules from creating a file called install from it +# `make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,7 +156,7 @@ while test $# -ne 0; do -s) stripcmd=$stripprog;; -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. + # Protect names problematic for `test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -190,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then fi shift # arg dst_arg=$arg - # Protect names problematic for 'test' and other utilities. + # Protect names problematic for `test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -202,7 +202,7 @@ if test $# -eq 0; then echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call 'install-sh -d' without argument. + # It's OK to call `install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi @@ -240,7 +240,7 @@ fi for src do - # Protect names problematic for 'test' and other utilities. + # Protect names problematic for `test' and other utilities. case $src in -* | [=\(\)!]) src=./$src;; esac @@ -354,7 +354,7 @@ do if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. + # other-writeable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in diff --git a/ltmain.sh b/ltmain.sh index 63ae69dc6..9fe8f59d0 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 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.6 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.2 +VERSION="2.4.2 Debian-2.4.2-1.6" TIMESTAMP="" package_revision=1.3337 @@ -6124,7 +6124,10 @@ func_mode_link () case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -6444,19 +6447,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 @@ -7349,6 +7352,9 @@ 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 126202f9c..02b4bbec5 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1312,7 +1312,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1324,12 +1324,16 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - powerpcle-*linux*) - LD="${LD-ld} -m elf32lppclinux" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; - powerpc-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1348,10 +1352,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*linux*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*linux*) + ppc*-*linux*|powerpc*-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1694,7 +1695,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -2518,17 +2520,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - 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 - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2645,7 +2636,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -2675,14 +2666,10 @@ 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="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2694,6 +2681,18 @@ 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 @@ -3253,10 +3252,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3295,11 +3290,11 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) 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 @@ -4047,7 +4042,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4111,7 +4106,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4346,7 +4341,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4588,6 +4583,9 @@ 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' ;; @@ -4650,6 +4648,9 @@ 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 @@ -4871,7 +4872,7 @@ _LT_EOF fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5048,6 +5049,7 @@ _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 @@ -5352,7 +5354,7 @@ _LT_EOF _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) 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 @@ -6232,9 +6234,6 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6396,7 +6395,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler diff --git a/missing b/missing index cdea51493..86a8fc31e 100755 --- a/missing +++ b/missing @@ -1,10 +1,11 @@ #! /bin/sh -# Common wrapper for a few potentially missing GNU programs. +# Common stub for a few missing GNU programs while installing. -scriptversion=2012-06-26.16; # UTC +scriptversion=2012-01-06.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Originally written by Fran,cois Pinard , 1996. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +# Originally by Fran,cois Pinard , 1996. # 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 @@ -25,40 +26,68 @@ scriptversion=2012-06-26.16; # UTC # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try '$0 --help' for more information" + echo 1>&2 "Try \`$0 --help' for more information" exit 1 fi -case $1 in +run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - --is-lightweight) - # Used by our autoconf macros to check whether the available missing - # script is modern enough. - exit 0 - ;; +# In the cases where this matters, `missing' is being run in the +# srcdir already. +if test -f configure.ac; then + configure_ac=configure.ac +else + configure_ac=configure.in +fi - --run) - # Back-compat with the calling convention used by older automake. - shift - ;; +msg="missing on your system" + +case $1 in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due -to PROGRAM being missing or too old. +Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +error status if there is no known handling for PROGRAM. Options: -h, --help display this help and exit -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal autoconf autoheader autom4te automake makeinfo - bison yacc flex lex help2man + aclocal touch file \`aclocal.m4' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one + automake touch all \`Makefile.in' files + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file + lex create \`lex.yy.c', if possible, from existing .c + makeinfo touch the output file + yacc create \`y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and -'g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. Send bug reports to ." exit $? @@ -70,141 +99,228 @@ Send bug reports to ." ;; -*) - echo 1>&2 "$0: unknown '$1' option" - echo 1>&2 "Try '$0 --help' for more information" + echo 1>&2 "$0: Unknown \`$1' option" + echo 1>&2 "Try \`$0 --help' for more information" exit 1 ;; esac -# Run the given program, remember its exit status. -"$@"; st=$? - -# If it succeeded, we are done. -test $st -eq 0 && exit 0 - -# Also exit now if we it failed (or wasn't found), and '--version' was -# passed; such an option is passed most likely to detect whether the -# program is present and works. -case $2 in --version|--help) exit $st;; esac - -# Exit code 63 means version mismatch. This often happens when the user -# tries to use an ancient version of a tool on a file that requires a -# minimum version. -if test $st -eq 63; then - msg="probably too old" -elif test $st -eq 127; then - # Program was missing. - msg="missing on your system" -else - # Program was found and executed, but failed. Give up. - exit $st -fi +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + *) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 + fi + ;; +esac + +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want + to install the \`Automake' and \`Perl' packages. Grab them from + any GNU archive site." + touch aclocal.m4 + ;; + + autoconf*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the + \`Autoconf' and \`GNU m4' packages. Grab them from any GNU + archive site." + touch configure + ;; -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software - -program_details () -{ - case $1 in - aclocal|automake) - echo "The '$1' program is part of the GNU Automake package:" - echo "<$gnu_software_URL/automake>" - echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/autoconf>" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - autoconf|autom4te|autoheader) - echo "The '$1' program is part of the GNU Autoconf package:" - echo "<$gnu_software_URL/autoconf/>" - echo "It also requires GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - esac -} - -give_advice () -{ - # Normalize program name to check for. - normalized_program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - - printf '%s\n' "'$1' is $msg." - - configure_deps="'configure.ac' or m4 files included by 'configure.ac'" - case $normalized_program in - autoconf*) - echo "You should only need it if you modified 'configure.ac'," - echo "or m4 files included by it." - program_details 'autoconf' - ;; - autoheader*) - echo "You should only need it if you modified 'acconfig.h' or" - echo "$configure_deps." - program_details 'autoheader' - ;; - automake*) - echo "You should only need it if you modified 'Makefile.am' or" - echo "$configure_deps." - program_details 'automake' - ;; - aclocal*) - echo "You should only need it if you modified 'acinclude.m4' or" - echo "$configure_deps." - program_details 'aclocal' - ;; - autom4te*) - echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." - program_details 'autom4te' - ;; - bison*|yacc*) - echo "You should only need it if you modified a '.y' file." - echo "You may want to install the GNU Bison package:" - echo "<$gnu_software_URL/bison/>" - ;; - lex*|flex*) - echo "You should only need it if you modified a '.l' file." - echo "You may want to install the Fast Lexical Analyzer package:" - echo "<$flex_URL>" - ;; - help2man*) - echo "You should only need it if you modified a dependency" \ - "of a man page." - echo "You may want to install the GNU Help2man package:" - echo "<$gnu_software_URL/help2man/>" + autoheader*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want + to install the \`Autoconf' and \`GNU m4' packages. Grab them + from any GNU archive site." + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` + test -z "$files" && files="config.h" + touch_files= + for f in $files; do + case $f in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; + esac + done + touch $touch_files ;; - makeinfo*) - echo "You should only need it if you modified a '.texi' file, or" - echo "any other file indirectly affecting the aspect of the manual." - echo "You might want to install the Texinfo package:" - echo "<$gnu_software_URL/texinfo/>" - echo "The spurious makeinfo call might also be the consequence of" - echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" - echo "want to install GNU make:" - echo "<$gnu_software_URL/make/>" - ;; - *) - echo "You might have modified some files without having the proper" - echo "tools for further handling them. Check the 'README' file, it" - echo "often tells you about the needed prerequisites for installing" - echo "this package. You may also peek at any GNU archive site, in" - echo "case some other package contains this missing '$1' program." - ;; - esac -} - -give_advice "$1" | sed -e '1s/^/WARNING: /' \ - -e '2,$s/^/ /' >&2 - -# Propagate the correct exit status (expected to be 127 for a program -# not found, 63 for a program that failed due to version mismatch). -exit $st + + automake*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. + You might want to install the \`Automake' and \`Perl' packages. + Grab them from any GNU archive site." + find . -type f -name Makefile.am -print | + sed 's/\.am$/.in/' | + while read f; do touch "$f"; done + ;; + + autom4te*) + echo 1>&2 "\ +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + + bison*|yacc*) + echo 1>&2 "\ +WARNING: \`$1' $msg. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h + if test $# -ne 1; then + eval LASTARG=\${$#} + case $LASTARG in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi + if test ! -f y.tab.h; then + echo >y.tab.h + fi + if test ! -f y.tab.c; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + + lex*|flex*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c + if test $# -ne 1; then + eval LASTARG=\${$#} + case $LASTARG in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi + if test ! -f lex.yy.c; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; + + help2man*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit $? + fi + ;; + + makeinfo*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file + indirectly affecting the aspect of the manual. The spurious + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -z "$file"; then + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 + touch $file + ;; + + *) + echo 1>&2 "\ +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the + proper tools for further handling them. Check the \`README' file, + it often tells you about the needed prerequisites for installing + this package. You may also peek at any GNU archive site, in case + some other package would contain this missing \`$1' program." + exit 1 + ;; +esac + +exit 0 # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/pkgbuild/PKGBUILD b/pkgbuild/PKGBUILD index cb3014dc1..14135d703 100644 --- a/pkgbuild/PKGBUILD +++ b/pkgbuild/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Enlightenment Developers pkgname=('elementary' 'elementary_test' 'elementary_doc') -pkgver=1.8.2 +pkgver=1.8.3 pkgrel=1 pkgdesc="Enlightenment GUI toolkit - GIT development snapshot" arch=('i686' 'x86_64' 'arm') diff --git a/po/ar.gmo b/po/ar.gmo index 8d9ffb02e..9901b1e2a 100644 Binary files a/po/ar.gmo and b/po/ar.gmo differ diff --git a/po/ar.po b/po/ar.po index e05e76f2f..0fdb755bb 100644 --- a/po/ar.po +++ b/po/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2010-12-26 10:05+0200\n" "Last-Translator: Tom Hacohen \n" "Language-Team: General\n" @@ -191,7 +191,7 @@ msgstr "" msgid "Paste" msgstr "" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "" diff --git a/po/az_IR.gmo b/po/az_IR.gmo index 3a64b4dec..52fd4f03f 100644 Binary files a/po/az_IR.gmo and b/po/az_IR.gmo differ diff --git a/po/az_IR.po b/po/az_IR.po index d16d39a10..04913dc19 100644 --- a/po/az_IR.po +++ b/po/az_IR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2010-12-26 10:05+0200\n" "Last-Translator: Tom Hacohen \n" "Language-Team: General\n" @@ -190,7 +190,7 @@ msgstr "" msgid "Paste" msgstr "" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "" diff --git a/po/ca.gmo b/po/ca.gmo index 2bc6bb397..0683a87c1 100644 Binary files a/po/ca.gmo and b/po/ca.gmo differ diff --git a/po/ca.po b/po/ca.po index 15d0220d3..a6210358b 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2013-03-22 00:32+0100\n" "Last-Translator: JoanColl \n" "Language-Team: Catalan\n" @@ -190,7 +190,7 @@ msgstr "Selecciona" msgid "Paste" msgstr "Enganxa " -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "Entrada" diff --git a/po/cs.gmo b/po/cs.gmo index f4c8fc992..85f50a359 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/cs.po b/po/cs.po index 912ece7e4..a3550e4f0 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2012-12-16 21:59+0100\n" "Last-Translator: Tomáš Čech \n" "Language-Team: Czech \n" @@ -197,7 +197,7 @@ msgstr "Vybrat" msgid "Paste" msgstr "Vložit" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "Vstup" diff --git a/po/de.gmo b/po/de.gmo index a9823a0f6..8f939e08a 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index d451df877..9627ad404 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary 0.7.0.57309\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2011-02-25 20:22+0100\n" "Last-Translator: Fabian Nowak \n" "Language-Team: German\n" @@ -192,7 +192,7 @@ msgstr "Auswählen" msgid "Paste" msgstr "Einfügen" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "" diff --git a/po/el.gmo b/po/el.gmo index 702080a2c..c7c2f0b11 100644 Binary files a/po/el.gmo and b/po/el.gmo differ diff --git a/po/el.po b/po/el.po index cee991c64..fa3c7656c 100644 --- a/po/el.po +++ b/po/el.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2012-12-19 15:58+0200\n" "Last-Translator: Efstathios Iosifidis \n" "Language-Team: Ελληνικά, Σύγχρονα \n" @@ -202,7 +202,7 @@ msgstr "Επιλογή" msgid "Paste" msgstr "Επικόλληση" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "Καταχώριση" diff --git a/po/elementary.pot b/po/elementary.pot index 7514453c3..1e9d9e72a 100644 --- a/po/elementary.pot +++ b/po/elementary.pot @@ -7,9 +7,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: elementary 1.8.2\n" +"Project-Id-Version: elementary 1.8.3\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -191,7 +191,7 @@ msgstr "" msgid "Paste" msgstr "" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "" diff --git a/po/eo.gmo b/po/eo.gmo index d632e539f..66f5f1348 100644 Binary files a/po/eo.gmo and b/po/eo.gmo differ diff --git a/po/eo.po b/po/eo.po index 153353cf5..e1d2dc565 100644 --- a/po/eo.po +++ b/po/eo.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2013-01-23 05:24+0000\n" "Last-Translator: Eliovir \n" "Language-Team: Esperanto \n" @@ -193,7 +193,7 @@ msgstr "Elekti" msgid "Paste" msgstr "Alglui" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "Ero" diff --git a/po/es.gmo b/po/es.gmo index 720aaba98..c3209b96d 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index a9e721c81..2b203a0ea 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2013-01-04 14:42+0100\n" "Last-Translator: Adrián Arévalo \n" "Language-Team: Enlightenment Team\n" @@ -191,7 +191,7 @@ msgstr "Seleccionar" msgid "Paste" msgstr "Pegar" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "Entrada" diff --git a/po/fa.gmo b/po/fa.gmo index 3a64b4dec..52fd4f03f 100644 Binary files a/po/fa.gmo and b/po/fa.gmo differ diff --git a/po/fa.po b/po/fa.po index d16d39a10..04913dc19 100644 --- a/po/fa.po +++ b/po/fa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2010-12-26 10:05+0200\n" "Last-Translator: Tom Hacohen \n" "Language-Team: General\n" @@ -190,7 +190,7 @@ msgstr "" msgid "Paste" msgstr "" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "" diff --git a/po/fr.gmo b/po/fr.gmo index d3127e75d..5e4b99d63 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 8feee8953..dfb0a3c67 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2013-06-20 07:08+0000\n" "Last-Translator: Eliovir \n" "Language-Team: French \n" @@ -196,7 +196,7 @@ msgstr "Sélectionner" msgid "Paste" msgstr "Coller" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "" diff --git a/po/gl.gmo b/po/gl.gmo index 6ab7b4a3b..65464aec8 100644 Binary files a/po/gl.gmo and b/po/gl.gmo differ diff --git a/po/gl.po b/po/gl.po index 8b50b29c5..b10dda4f7 100644 --- a/po/gl.po +++ b/po/gl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2013-11-07 09:25+0100\n" "Last-Translator: Aníbal Garrido Hermo \n" "Language-Team: Galician \n" @@ -189,7 +189,7 @@ msgstr "Seleccionar" msgid "Paste" msgstr "Pegar" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "Entrada" diff --git a/po/he.gmo b/po/he.gmo index 819f97e15..eb9eb6148 100644 Binary files a/po/he.gmo and b/po/he.gmo differ diff --git a/po/he.po b/po/he.po index f96763e94..4ffcb72b1 100644 --- a/po/he.po +++ b/po/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2010-12-26 10:05+0200\n" "Last-Translator: Aharon Hillel \n" "Language-Team: General\n" @@ -190,7 +190,7 @@ msgstr "התחל בחירה" msgid "Paste" msgstr "הדבק" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "" diff --git a/po/it.gmo b/po/it.gmo index a30a0513a..86635e4f9 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index cc49fd9d4..51c3de426 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2013-11-10 13:35+0100\n" "Last-Translator: Massimo Maiurana \n" "Language-Team: none\n" @@ -188,7 +188,7 @@ msgstr "Seleziona" msgid "Paste" msgstr "Incolla" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "Voce" diff --git a/po/ko_KR.gmo b/po/ko_KR.gmo index 660cfaaa2..c5b5e2370 100644 Binary files a/po/ko_KR.gmo and b/po/ko_KR.gmo differ diff --git a/po/ko_KR.po b/po/ko_KR.po index 785db8b48..4b7116426 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2013-11-27 11:32+0900\n" "Last-Translator: Seong-ho Cho \n" "Language-Team: General\n" @@ -193,7 +193,7 @@ msgstr "선택" msgid "Paste" msgstr "붙여넣기" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "엔트리" diff --git a/po/nl.gmo b/po/nl.gmo index bb9c47a10..03e3b999a 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nl.po b/po/nl.po index eb69dd98e..4d82cd2b0 100644 --- a/po/nl.po +++ b/po/nl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary 0.7.0.57309\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2011-06-19 16:41+0100\n" "Last-Translator: Heimen Stoffels \n" "Language-Team: Dutch \n" @@ -194,7 +194,7 @@ msgstr "Selecteren" msgid "Paste" msgstr "Plakken" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "" diff --git a/po/pl.gmo b/po/pl.gmo index 88093a010..352e68088 100644 Binary files a/po/pl.gmo and b/po/pl.gmo differ diff --git a/po/pl.po b/po/pl.po index d8e031f77..b3cb657f2 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2013-11-23 14:48+0100\n" "Last-Translator: Konrad Makowski \n" "Language-Team: \n" @@ -189,7 +189,7 @@ msgstr "Wybór" msgid "Paste" msgstr "Wklej" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "Pozycja" diff --git a/po/ps.gmo b/po/ps.gmo index 5623cbc03..2a7ff695a 100644 Binary files a/po/ps.gmo and b/po/ps.gmo differ diff --git a/po/ps.po b/po/ps.po index f3ef66ed8..8c1aebeb3 100644 --- a/po/ps.po +++ b/po/ps.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2010-12-26 10:05+0200\n" "Last-Translator: Tom Hacohen \n" "Language-Team: General\n" @@ -189,7 +189,7 @@ msgstr "" msgid "Paste" msgstr "" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "" diff --git a/po/pt.gmo b/po/pt.gmo index 744e2024f..b99a9f775 100644 Binary files a/po/pt.gmo and b/po/pt.gmo differ diff --git a/po/pt.po b/po/pt.po index 39766d02a..f157d70a1 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2013-11-05 14:11-0000\n" "Last-Translator: Sérgio Marques \n" "Language-Team: \n" @@ -190,7 +190,7 @@ msgstr "Selecionar" msgid "Paste" msgstr "Colar" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "Entrada" diff --git a/po/ru.gmo b/po/ru.gmo index 6ef4d025f..9780faca0 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index fdba87a9e..a457b26dc 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary 1.7.99.76688\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2012-09-14 22:20+0300\n" "Last-Translator: Danny Moshnakov \n" "Language-Team: ru \n" @@ -203,7 +203,7 @@ msgstr "Выбрать" msgid "Paste" msgstr "Вставить" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "Запись" diff --git a/po/sr.gmo b/po/sr.gmo index 7ab6dd2d7..fbc3d7ad5 100644 Binary files a/po/sr.gmo and b/po/sr.gmo differ diff --git a/po/sr.po b/po/sr.po index fc6198e58..f58d2b6f0 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,21 +1,23 @@ # -# Саша Петровић , 2012. +# Саша Петровић , 2012, 2014. # #: src/lib/elm_config.c:2415 msgid "" msgstr "" "Project-Id-Version: а\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" -"PO-Revision-Date: 2013-04-11 16:30+0000\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" +"PO-Revision-Date: 2014-01-05 17:54+0100\n" "Last-Translator: Саша Петровић \n" -"Language-Team: српски \n" +"Language-Team: српски <српски >\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-04-25 05:27+0000\n" -"X-Generator: Launchpad (build 16580)\n" +"X-Launchpad-Export-Date: 2013-12-31 05:52+0000\n" +"X-Generator: Gtranslator 2.91.6\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2) \n" #: src/lib/elc_fileselector.c:1203 msgid "Up" @@ -36,35 +38,35 @@ msgstr "У реду" #: src/lib/elc_multibuttonentry.c:575 msgid "multi button entry label" -msgstr "" +msgstr "ознака улаза са више дугмади" #: src/lib/elc_multibuttonentry.c:597 msgid "multi button entry item" -msgstr "" +msgstr "ставка улаза са више дугмади" #: src/lib/elc_multibuttonentry.c:1471 msgid "multi button entry" -msgstr "" +msgstr "улаз са више дугмади" #: src/lib/elc_naviframe.c:377 msgid "Title" -msgstr "" +msgstr "Наслов" #: src/lib/elc_naviframe.c:906 src/lib/elc_naviframe.c:1130 msgid "Back" -msgstr "" +msgstr "Назад" #: src/lib/elc_naviframe.c:1209 msgid "Next" -msgstr "" +msgstr "Следеће" #: src/lib/elc_popup.c:282 src/lib/elc_popup.c:908 msgid "Popup Title" -msgstr "" +msgstr "Искачући наслов" #: src/lib/elc_popup.c:292 src/lib/elc_popup.c:976 msgid "Popup Body Text" -msgstr "" +msgstr "Тело искачућег текста" #: src/lib/elm_bubble.c:217 msgid "Bubble" @@ -167,9 +169,8 @@ msgid "default:LTR" msgstr "задато:слева на десно" #: src/lib/elm_dayselector.c:422 -#, fuzzy msgid "day selector item" -msgstr "ставка одабира диска" +msgstr "ставка одабирач дана" #: src/lib/elm_diskselector.c:681 msgid "diskselector item" @@ -191,7 +192,7 @@ msgstr "Изаберите" msgid "Paste" msgstr "Прилепи" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "Улаз" @@ -236,13 +237,12 @@ msgid "State: Selected" msgstr "Стање: означено" #: src/lib/elm_segment_control.c:542 -#, fuzzy msgid "State: Unselected" -msgstr "Стање: означено" +msgstr "Стање: неозначено" #: src/lib/elm_segment_control.c:554 msgid "Segment Control Item" -msgstr "" +msgstr "Ставка провере дела" #: src/lib/elm_slider.c:888 msgid "slider" diff --git a/po/ur.gmo b/po/ur.gmo index 5623cbc03..2a7ff695a 100644 Binary files a/po/ur.gmo and b/po/ur.gmo differ diff --git a/po/ur.po b/po/ur.po index f3ef66ed8..8c1aebeb3 100644 --- a/po/ur.po +++ b/po/ur.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2010-12-26 10:05+0200\n" "Last-Translator: Tom Hacohen \n" "Language-Team: General\n" @@ -189,7 +189,7 @@ msgstr "" msgid "Paste" msgstr "" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "" diff --git a/po/yi.gmo b/po/yi.gmo index 5623cbc03..2a7ff695a 100644 Binary files a/po/yi.gmo and b/po/yi.gmo differ diff --git a/po/yi.po b/po/yi.po index f3ef66ed8..8c1aebeb3 100644 --- a/po/yi.po +++ b/po/yi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2010-12-26 10:05+0200\n" "Last-Translator: Tom Hacohen \n" "Language-Team: General\n" @@ -189,7 +189,7 @@ msgstr "" msgid "Paste" msgstr "" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index a6b4bbff4..39e5904aa 100644 Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ diff --git a/po/zh_CN.po b/po/zh_CN.po index 6b70bc0a8..bd147235a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-12-18 09:35+0100\n" +"POT-Creation-Date: 2014-01-07 15:04+0100\n" "PO-Revision-Date: 2012-12-22 03:55+0800\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified)\n" @@ -197,7 +197,7 @@ msgstr "选择" msgid "Paste" msgstr "粘贴" -#: src/lib/elm_entry.c:3301 +#: src/lib/elm_entry.c:3307 msgid "Entry" msgstr "条目" diff --git a/src/Makefile.in b/src/Makefile.in index 12b0ec988..16fc0380c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in index bd47217f8..3dd10313b 100644 --- a/src/bin/Makefile.in +++ b/src/bin/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -953,14 +953,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/src/bin/test_3d.c b/src/bin/test_3d.c index b3b2e6e34..8d6edf38c 100644 --- a/src/bin/test_3d.c +++ b/src/bin/test_3d.c @@ -52,7 +52,7 @@ _cube_new(Evas *evas, Evas_Coord w, Evas_Coord h, Evas_Coord d) evas_object_image_file_set(o, buf, NULL); evas_object_image_fill_set(o, 0, 0, 256, 256); evas_object_resize(o, 256, 256); - evas_object_image_smooth_scale_set(o, 0); + evas_object_image_smooth_scale_set(o, EINA_FALSE); evas_object_show(o); } POINT(0, 0, -w, -h, -d, 0, 0); @@ -99,7 +99,7 @@ _cube_pos(Cube *c, Evas_Coord mz[6]; m = evas_map_new(4); - evas_map_smooth_set(m, 0); + evas_map_smooth_set(m, EINA_FALSE); for (i = 0; i < 6; i++) { @@ -123,7 +123,7 @@ _cube_pos(Cube *c, evas_map_util_3d_perspective(m, cx, cy, foc, z0); if (evas_map_util_clockwise_get(m)) { - evas_object_map_enable_set(c->side[i].o, 1); + evas_object_map_enable_set(c->side[i].o, EINA_TRUE); evas_object_map_set(c->side[i].o, m); evas_object_show(c->side[i].o); } diff --git a/src/bin/test_cursor.c b/src/bin/test_cursor.c index 0e60a68fe..5b5a782a5 100644 --- a/src/bin/test_cursor.c +++ b/src/bin/test_cursor.c @@ -194,7 +194,7 @@ test_cursor2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i evas_object_show(bx); o = elm_toolbar_add(win); - elm_toolbar_homogeneous_set(o, 0); + elm_toolbar_homogeneous_set(o, EINA_FALSE); evas_object_size_hint_weight_set(o, 0.0, 0.0); evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0); tb_it = elm_toolbar_item_append(o, NULL, "Bogosity", NULL, NULL); diff --git a/src/bin/test_datetime.c b/src/bin/test_datetime.c index cc3684016..e0c98b1ef 100644 --- a/src/bin/test_datetime.c +++ b/src/bin/test_datetime.c @@ -20,7 +20,7 @@ test_datetime(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ struct tm time1; win = elm_win_util_standard_add("datetime", "DateTime"); - elm_win_autodel_set(win, 1); + elm_win_autodel_set(win, EINA_TRUE); bx = elm_box_add(win); evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/src/bin/test_entry.c b/src/bin/test_entry.c index e1b8e0edf..a950c8d38 100644 --- a/src/bin/test_entry.c +++ b/src/bin/test_entry.c @@ -138,8 +138,8 @@ test_entry(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -148,8 +148,8 @@ test_entry(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -158,8 +158,8 @@ test_entry(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -168,8 +168,8 @@ test_entry(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -178,8 +178,8 @@ test_entry(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -188,8 +188,8 @@ test_entry(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); elm_box_pack_end(bx, bx2); @@ -489,8 +489,8 @@ test_entry_scrolled(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -499,8 +499,8 @@ test_entry_scrolled(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -509,8 +509,8 @@ test_entry_scrolled(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -519,8 +519,8 @@ test_entry_scrolled(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -529,8 +529,8 @@ test_entry_scrolled(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); elm_box_pack_end(bx, bx2); @@ -775,8 +775,8 @@ test_entry_style_user(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void evas_object_size_hint_weight_set(bt, 0.0, 0.0); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, 0.5); elm_box_pack_end(bx, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt2 = elm_button_add(win); @@ -786,8 +786,8 @@ test_entry_style_user(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void evas_object_size_hint_weight_set(bt2, 0.0, 0.0); evas_object_size_hint_align_set(bt2, EVAS_HINT_FILL, 0.5); elm_box_pack_end(bx, bt2); - evas_object_propagate_events_set(bt2, 0); - elm_object_focus_allow_set(bt2, 0); + evas_object_propagate_events_set(bt2, EINA_FALSE); + elm_object_focus_allow_set(bt2, EINA_FALSE); evas_object_show(bt2); elm_object_focus_set(en, EINA_TRUE); @@ -837,8 +837,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -847,8 +847,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -857,8 +857,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -867,8 +867,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -877,8 +877,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -887,8 +887,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); elm_box_pack_end(bx, bx2); @@ -905,8 +905,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -915,8 +915,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -925,8 +925,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -935,8 +935,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -945,8 +945,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -955,8 +955,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); elm_box_pack_end(bx, bx2); @@ -973,8 +973,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -983,8 +983,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -993,8 +993,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1003,8 +1003,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1013,8 +1013,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1023,8 +1023,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); elm_box_pack_end(bx, bx2); @@ -1041,8 +1041,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1051,8 +1051,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1061,8 +1061,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1071,8 +1071,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); elm_box_pack_end(bx, bx2); @@ -1111,8 +1111,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1121,8 +1121,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1131,8 +1131,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1141,8 +1141,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1151,8 +1151,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1161,8 +1161,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); elm_box_pack_end(bx, bx2); @@ -1179,8 +1179,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1189,8 +1189,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1199,8 +1199,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1209,8 +1209,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1219,8 +1219,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1229,8 +1229,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); elm_box_pack_end(bx, bx2); @@ -1247,8 +1247,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1257,8 +1257,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1267,8 +1267,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1277,8 +1277,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1287,8 +1287,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1297,8 +1297,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); elm_box_pack_end(bx, bx2); @@ -1315,8 +1315,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1325,8 +1325,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1335,8 +1335,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1345,8 +1345,8 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); elm_box_pack_end(bx, bx2); @@ -1464,8 +1464,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1474,8 +1474,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1484,8 +1484,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1494,8 +1494,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1504,8 +1504,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1514,8 +1514,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); elm_box_pack_end(bx, bx2); @@ -1532,8 +1532,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1542,8 +1542,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1552,8 +1552,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1562,8 +1562,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1572,8 +1572,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1582,8 +1582,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); elm_box_pack_end(bx, bx2); @@ -1600,8 +1600,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1610,8 +1610,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1620,8 +1620,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1630,8 +1630,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1640,8 +1640,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1650,8 +1650,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); elm_box_pack_end(bx, bx2); @@ -1668,8 +1668,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1678,8 +1678,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1688,8 +1688,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); bt = elm_button_add(win); @@ -1698,8 +1698,8 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, 0); - elm_object_focus_allow_set(bt, 0); + evas_object_propagate_events_set(bt, EINA_FALSE); + elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); elm_box_pack_end(bx, bx2); diff --git a/src/bin/test_flip_page.c b/src/bin/test_flip_page.c index 945bcd89c..9f7b37ec8 100644 --- a/src/bin/test_flip_page.c +++ b/src/bin/test_flip_page.c @@ -70,8 +70,8 @@ _slice_new(State *st EINA_UNUSED, Evas_Object *obj) sl = calloc(1, sizeof(Slice)); if (!sl) return NULL; sl->obj = evas_object_image_add(evas_object_evas_get(obj)); - evas_object_image_smooth_scale_set(sl->obj, 0); - evas_object_pass_events_set(sl->obj, 1); + evas_object_image_smooth_scale_set(sl->obj, EINA_FALSE); + evas_object_pass_events_set(sl->obj, EINA_TRUE); evas_object_image_source_set(sl->obj, obj); return sl; } @@ -93,7 +93,7 @@ _slice_apply(State *st, Slice *sl, m = evas_map_new(4); if (!m) return; - evas_map_smooth_set(m, 0); + evas_map_smooth_set(m, EINA_FALSE); for (i = 0; i < 4; i++) { evas_map_point_color_set(m, i, 255, 255, 255, 255); diff --git a/src/bin/test_focus3.c b/src/bin/test_focus3.c index 5556746eb..da4576378 100644 --- a/src/bin/test_focus3.c +++ b/src/bin/test_focus3.c @@ -77,7 +77,7 @@ test_focus3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_show(en); bt = elm_button_add(win); - elm_object_focus_allow_set(bt, 0); + elm_object_focus_allow_set(bt, EINA_FALSE); elm_object_text_set(bt, "Add"); evas_object_smart_callback_add(bt, "clicked", _add, bx); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -86,7 +86,7 @@ test_focus3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_show(bt); bt = elm_button_add(win); - elm_object_focus_allow_set(bt, 0); + elm_object_focus_allow_set(bt, EINA_FALSE); elm_object_text_set(bt, "Del"); evas_object_smart_callback_add(bt, "clicked", _del, NULL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -95,7 +95,7 @@ test_focus3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_show(bt); bt = elm_button_add(win); - elm_object_focus_allow_set(bt, 0); + elm_object_focus_allow_set(bt, EINA_FALSE); elm_object_text_set(bt, "Hide"); evas_object_smart_callback_add(bt, "clicked", _hide, NULL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c index fdf148067..d6955245a 100644 --- a/src/bin/test_genlist.c +++ b/src/bin/test_genlist.c @@ -305,7 +305,7 @@ test_genlist(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i over = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_color_set(over, 0, 0, 0, 0); evas_object_event_callback_add(over, EVAS_CALLBACK_MOUSE_MOVE, _move, gl); - evas_object_repeat_events_set(over, 1); + evas_object_repeat_events_set(over, EINA_TRUE); evas_object_show(over); evas_object_size_hint_weight_set(over, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, over); @@ -946,7 +946,7 @@ test_genlist4(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ gl = elm_genlist_add(win); elm_genlist_mode_set(gl, ELM_LIST_COMPRESS); - elm_genlist_multi_select_set(gl, 1); + elm_genlist_multi_select_set(gl, EINA_TRUE); evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(gl); @@ -3189,7 +3189,7 @@ test_genlist19(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event over = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_color_set(over, 0, 0, 0, 0); evas_object_event_callback_add(over, EVAS_CALLBACK_MOUSE_MOVE, _move, gl); - evas_object_repeat_events_set(over, 1); + evas_object_repeat_events_set(over, EINA_TRUE); evas_object_show(over); evas_object_size_hint_weight_set(over, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, over); diff --git a/src/bin/test_hoversel.c b/src/bin/test_hoversel.c index 473f0504a..c963bf987 100644 --- a/src/bin/test_hoversel.c +++ b/src/bin/test_hoversel.c @@ -211,7 +211,7 @@ test_hoversel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ NULL); elm_hoversel_item_add(hoversel, "Item 2", "close", ELM_ICON_STANDARD, NULL, NULL); - elm_object_disabled_set(hoversel, 1); + elm_object_disabled_set(hoversel, EINA_TRUE); elm_box_pack_end(bx, hoversel); evas_object_show(hoversel); diff --git a/src/bin/test_icon.c b/src/bin/test_icon.c index d4a59199b..c17101b86 100644 --- a/src/bin/test_icon.c +++ b/src/bin/test_icon.c @@ -133,8 +133,8 @@ test_icon_transparent(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void ic = elm_icon_add(win); snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get()); elm_image_file_set(ic, buf, NULL); - elm_image_resizable_set(ic, 0, 0); - elm_image_no_scale_set(ic, 1); + elm_image_resizable_set(ic, EINA_FALSE, EINA_FALSE); + elm_image_no_scale_set(ic, EINA_TRUE); evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_fill_set(ic, 0.5, 0.5); elm_win_resize_object_add(win, ic); diff --git a/src/bin/test_launcher.c b/src/bin/test_launcher.c index 9d871720e..a6baf4dbb 100644 --- a/src/bin/test_launcher.c +++ b/src/bin/test_launcher.c @@ -514,7 +514,7 @@ l3_mode_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSE if (elm_mapbuf_enabled_get(mb)) elm_mapbuf_enabled_set(mb, EINA_FALSE); else - elm_mapbuf_enabled_set(mb, 1); + elm_mapbuf_enabled_set(mb, EINA_TRUE); } } @@ -873,7 +873,7 @@ test_launcher3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event ck = elm_check_add(win); elm_object_text_set(ck, "A"); - elm_check_state_set(ck, 1); + elm_check_state_set(ck, EINA_TRUE); evas_object_smart_callback_add(ck, "changed", l3_alpha_cb, win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ck, 0.20, 0.99); @@ -882,7 +882,7 @@ test_launcher3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event ck = elm_check_add(win); elm_object_text_set(ck, "Smo"); - elm_check_state_set(ck, 1); + elm_check_state_set(ck, EINA_TRUE); evas_object_smart_callback_add(ck, "changed", l3_smooth_cb, win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ck, 0.40, 0.99); diff --git a/src/bin/test_list.c b/src/bin/test_list.c index 44ff67c42..51a1cac84 100644 --- a/src/bin/test_list.c +++ b/src/bin/test_list.c @@ -738,7 +738,7 @@ test_list3(void *data EINA_UNUSED, ic2 = elm_button_add(win); elm_object_text_set(ic2, "Click me"); evas_object_smart_callback_add(ic2, "clicked", _bt_clicked, NULL); - evas_object_propagate_events_set(ic2, 0); + evas_object_propagate_events_set(ic2, EINA_FALSE); elm_list_item_append(li, "Hello", ic, ic2, _it_clicked, NULL); ic = elm_icon_add(win); @@ -989,7 +989,7 @@ test_list5_swipe(void *data EINA_UNUSED, button = elm_button_add(info->win); elm_object_text_set(button, "delete"); - evas_object_propagate_events_set(button, 0); + evas_object_propagate_events_set(button, EINA_FALSE); evas_object_smart_callback_add(button, "clicked", test_list5_item_del, event_info); elm_object_item_part_content_set(event_info, "end", button); diff --git a/src/bin/test_map.c b/src/bin/test_map.c index dce7037d9..dfbfd112c 100644 --- a/src/bin/test_map.c +++ b/src/bin/test_map.c @@ -545,7 +545,7 @@ _track_add(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSE char *path = NULL; fs_win = elm_win_util_standard_add("fileselector", "File Selector"); - elm_win_autodel_set(fs_win, 1); + elm_win_autodel_set(fs_win, EINA_TRUE); vbox = elm_box_add(fs_win); evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/src/bin/test_panel.c b/src/bin/test_panel.c index dd984ae99..f4ea10e84 100644 --- a/src/bin/test_panel.c +++ b/src/bin/test_panel.c @@ -180,7 +180,7 @@ test_panel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf evas_object_size_hint_align_set(panel, EVAS_HINT_FILL, EVAS_HINT_FILL); toolbar = elm_toolbar_add(panel); - elm_toolbar_homogeneous_set(toolbar, 0); + elm_toolbar_homogeneous_set(toolbar, EINA_FALSE); elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_NONE); evas_object_size_hint_weight_set(toolbar, EVAS_HINT_EXPAND, 0); evas_object_size_hint_align_set(toolbar, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -251,7 +251,7 @@ test_panel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf elm_panel_hidden_set(panel, EINA_TRUE); toolbar = elm_toolbar_add(panel); - elm_toolbar_homogeneous_set(toolbar, 0); + elm_toolbar_homogeneous_set(toolbar, EINA_FALSE); elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_NONE); evas_object_size_hint_weight_set(toolbar, EVAS_HINT_EXPAND, 0); evas_object_size_hint_align_set(toolbar, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/src/bin/test_photocam.c b/src/bin/test_photocam.c index d687e611b..f33043417 100644 --- a/src/bin/test_photocam.c +++ b/src/bin/test_photocam.c @@ -261,7 +261,7 @@ test_photocam(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ rect = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_color_set(rect, 0, 0, 0, 0); - evas_object_repeat_events_set(rect,1); + evas_object_repeat_events_set(rect, EINA_TRUE); evas_object_show(rect); evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_WHEEL, _photocam_mouse_wheel_cb, ph); evas_object_raise(rect); diff --git a/src/bin/test_progressbar.c b/src/bin/test_progressbar.c index 997a9f442..60a76f98a 100644 --- a/src/bin/test_progressbar.c +++ b/src/bin/test_progressbar.c @@ -145,7 +145,7 @@ test_progressbar(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve pb = elm_progressbar_add(win); elm_object_text_set(pb, "Label"); elm_object_part_content_set(pb, "icon", ic1); - elm_progressbar_inverted_set(pb, 1); + elm_progressbar_inverted_set(pb, EINA_TRUE); elm_progressbar_unit_format_set(pb, "%1.1f units"); elm_progressbar_span_size_set(pb, elm_config_scale_get() * 200); evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5); diff --git a/src/bin/test_toolbar.c b/src/bin/test_toolbar.c index 93be77ea8..433d18819 100644 --- a/src/bin/test_toolbar.c +++ b/src/bin/test_toolbar.c @@ -145,7 +145,7 @@ test_toolbar(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i evas_object_show(tb); tb = elm_table_add(win); - //elm_table_homogeneous_set(tb, 1); + //elm_table_homogeneous_set(tb, EINA_TRUE); evas_object_size_hint_weight_set(tb, 0.0, EVAS_HINT_EXPAND); evas_object_size_hint_fill_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -249,7 +249,7 @@ test_toolbar2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ evas_object_show(tb); tb = elm_table_add(win); - //elm_table_homogeneous_set(tb, 1); + //elm_table_homogeneous_set(tb, EINA_TRUE); evas_object_size_hint_weight_set(tb, 0.0, EVAS_HINT_EXPAND); evas_object_size_hint_fill_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -774,7 +774,7 @@ test_toolbar6(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ evas_object_show(tb); tb = elm_table_add(win); - //elm_table_homogeneous_set(tb, 1); + //elm_table_homogeneous_set(tb, EINA_TRUE); evas_object_size_hint_weight_set(tb, 0.0, EVAS_HINT_EXPAND); evas_object_size_hint_fill_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/src/edje_externals/Makefile.in b/src/edje_externals/Makefile.in index abee6f5c0..4bd7dc899 100644 --- a/src/edje_externals/Makefile.in +++ b/src/edje_externals/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -592,14 +592,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/src/examples/Makefile.in b/src/examples/Makefile.in index 945228a29..48a7a0fe7 100644 --- a/src/examples/Makefile.in +++ b/src/examples/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -1950,14 +1950,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/src/lib/Elementary.h b/src/lib/Elementary.h index af78b84b8..293a1ee33 100644 --- a/src/lib/Elementary.h +++ b/src/lib/Elementary.h @@ -14,9 +14,9 @@ #define ELM_UNIX #undef ELM_WIN32 #undef ELM_WINCE -#define ELM_ELOCATION +#undef ELM_ELOCATION #undef ELM_WEB -#undef ELM_EMAP +#define ELM_EMAP #undef ELM_DEBUG #define ELM_ALLOCA_H #define ELM_LIBINTL_H diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index de0c26d7a..9adc81a6e 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -1155,14 +1155,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c index e6a9b8eb9..6e4635ac2 100644 --- a/src/lib/elc_fileselector.c +++ b/src/lib/elc_fileselector.c @@ -1366,7 +1366,7 @@ _is_save_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Fileselector_Smart_Data *sd = _pd; - *ret = !elm_object_disabled_get(sd->name_entry); + if (ret) *ret = !elm_object_disabled_get(sd->name_entry); } EAPI void @@ -1403,7 +1403,7 @@ _folder_only_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Fileselector_Smart_Data *sd = _pd; - *ret = sd->only_folder; + if (ret) *ret = sd->only_folder; } EAPI void @@ -1468,7 +1468,7 @@ _buttons_ok_cancel_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Fileselector_Smart_Data *sd = _pd; - *ret = sd->ok_button ? EINA_TRUE : EINA_FALSE; + if (ret) *ret = sd->ok_button ? EINA_TRUE : EINA_FALSE; } EAPI void @@ -1504,7 +1504,7 @@ _expandable_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Fileselector_Smart_Data *sd = _pd; - *ret = sd->expand; + if (ret) *ret = sd->expand; } EAPI void @@ -1540,7 +1540,7 @@ _path_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { const char **ret = va_arg(*list, const char **); Elm_Fileselector_Smart_Data *sd = _pd; - *ret = sd->path; + if (ret) *ret = sd->path; } EAPI void @@ -1599,7 +1599,7 @@ _mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { Elm_Fileselector_Mode *ret = va_arg(*list, Elm_Fileselector_Mode *); Elm_Fileselector_Smart_Data *sd = _pd; - *ret = sd->mode; + if (ret) *ret = sd->mode; } EAPI void @@ -1665,7 +1665,7 @@ _multi_select_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Fileselector_Smart_Data *sd = _pd; - *ret = sd->multi; + if (ret) *ret = sd->multi; } EAPI const char * @@ -1696,19 +1696,19 @@ _selected_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) return; } - *ret = sd->path; + if (ret) *ret = sd->path; if (sd->mode == ELM_FILESELECTOR_LIST) { Elm_Object_Item *gl_it = elm_genlist_selected_item_get(sd->files_view); - if (gl_it) *ret = elm_object_item_data_get(gl_it); + if (gl_it && ret) *ret = elm_object_item_data_get(gl_it); } else { Elm_Object_Item *gg_it = elm_gengrid_selected_item_get(sd->files_view); - if (gg_it) *ret = elm_object_item_data_get(gg_it); + if (gg_it && ret) *ret = elm_object_item_data_get(gg_it); } } @@ -1902,21 +1902,21 @@ _hidden_visible_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list EINA_UNUSED) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Fileselector_Smart_Data *sd = _pd; - *ret = sd->hidden_visible; + if (ret) *ret = sd->hidden_visible; } static void _elm_fileselector_smart_focus_next_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; + if (ret) *ret = EINA_FALSE; } static void _elm_fileselector_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; + if (ret) *ret = EINA_FALSE; } static void diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c index a210045e6..cdb6eb9ba 100644 --- a/src/lib/elc_hoversel.c +++ b/src/lib/elc_hoversel.c @@ -291,7 +291,7 @@ static void _elm_hoversel_smart_admits_autorepeat_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; + if (ret) *ret = EINA_FALSE; } EAPI Evas_Object * @@ -351,7 +351,7 @@ _hover_parent_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Evas_Object **ret = va_arg(*list, Evas_Object **); Elm_Hoversel_Smart_Data *sd = _pd; - *ret = sd->hover_parent; + if (ret) *ret = sd->hover_parent; } EAPI void @@ -388,7 +388,7 @@ _horizontal_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Hoversel_Smart_Data *sd = _pd; - *ret = sd->horizontal; + if (ret) *ret = sd->horizontal; } EAPI void @@ -490,7 +490,7 @@ _items_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) const Eina_List **ret = va_arg(*list, const Eina_List **); Elm_Hoversel_Smart_Data *sd = _pd; - *ret = sd->items; + if (ret) *ret = sd->items; } EAPI Elm_Object_Item * diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c index 096cf1269..59c84481b 100644 --- a/src/lib/elm_calendar.c +++ b/src/lib/elm_calendar.c @@ -1391,7 +1391,7 @@ _selected_time_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { struct tm *selected_time = va_arg(*list, struct tm *); Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; + if (ret) *ret = EINA_FALSE; Elm_Calendar_Smart_Data *sd = _pd; EINA_SAFETY_ON_NULL_RETURN(selected_time); @@ -1401,7 +1401,7 @@ _selected_time_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) return; *selected_time = sd->selected_time; - *ret = EINA_TRUE; + if (ret) *ret = EINA_TRUE; } EAPI void @@ -1642,6 +1642,7 @@ _displayed_time_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { struct tm *displayed_time = va_arg(*list, struct tm *); Eina_Bool *ret = va_arg(*list, Eina_Bool *); + if (ret) *ret = EINA_FALSE; EINA_SAFETY_ON_NULL_RETURN(displayed_time); Elm_Calendar_Smart_Data *sd = _pd; *displayed_time = sd->shown_time; diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c index d471ea671..f744fe3b8 100644 --- a/src/lib/elm_colorselector.c +++ b/src/lib/elm_colorselector.c @@ -706,7 +706,7 @@ _color_picker_add(Evas_Object *obj, Elm_Colorselector_Smart_Data *sd) evas_object_image_smooth_scale_set(im, EINA_FALSE); evas_object_image_colorspace_set(im, EVAS_COLORSPACE_ARGB8888); evas_object_image_size_set(im, 17, 17); - evas_object_image_alpha_set(im, 1); + evas_object_image_alpha_set(im, EINA_TRUE); evas_object_image_filled_set(im, EINA_TRUE); edje_object_part_swallow(ed, "elm.picker", im); elm_widget_sub_object_add(obj, im); diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c index ce79771bb..cc50fef5b 100644 --- a/src/lib/elm_datetime.c +++ b/src/lib/elm_datetime.c @@ -1067,12 +1067,12 @@ _value_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { struct tm *currtime = va_arg(*list, struct tm *); Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; + if (ret) *ret = EINA_FALSE; EINA_SAFETY_ON_NULL_RETURN(currtime); Elm_Datetime_Smart_Data *sd = _pd; *currtime = sd->curr_time; - *ret = EINA_TRUE; + if (ret) *ret = EINA_TRUE; } EAPI Eina_Bool @@ -1127,13 +1127,13 @@ _value_min_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { struct tm *mintime = va_arg(*list, struct tm *); Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; + if (ret) *ret = EINA_FALSE; EINA_SAFETY_ON_NULL_RETURN(mintime); Elm_Datetime_Smart_Data *sd = _pd; *mintime = sd->min_limit; - *ret = EINA_TRUE; + if (ret) *ret = EINA_TRUE; } EAPI Eina_Bool @@ -1188,13 +1188,13 @@ _value_max_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { struct tm *maxtime = va_arg(*list, struct tm *); Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; + if (ret) *ret = EINA_FALSE; EINA_SAFETY_ON_NULL_RETURN(maxtime); Elm_Datetime_Smart_Data *sd = _pd; *maxtime = sd->max_limit; - *ret = EINA_TRUE; + if (ret) *ret = EINA_TRUE; } EAPI Eina_Bool diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c index 978a0cfa3..99c60a028 100644 --- a/src/lib/elm_diskselector.c +++ b/src/lib/elm_diskselector.c @@ -1182,7 +1182,7 @@ _icon_duplicate(Evas_Object *icon) elm_image_file_get(icon, &file, &group); ic = elm_icon_add(icon); elm_image_file_set(ic, file, group); - elm_image_resizable_set(ic, 1, 1); + elm_image_resizable_set(ic, EINA_TRUE, EINA_TRUE); return ic; } diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index b00e9a145..09bca31e3 100644 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -2767,7 +2767,7 @@ _elm_entry_smart_text_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) const char *item = va_arg(*list, const char *); const char **ret = va_arg(*list, const char **); const char *text; - *ret = NULL; + if (ret) *ret = NULL; Elm_Entry_Smart_Data *sd = _pd; @@ -2775,9 +2775,15 @@ _elm_entry_smart_text_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) { if (!strcmp(item, "default")) goto proceed; else if (!strcmp(item, "guide")) - *ret = edje_object_part_text_get(sd->entry_edje, "elm.guide"); + { + if (ret) + *ret = edje_object_part_text_get(sd->entry_edje, "elm.guide"); + } else - *ret = edje_object_part_text_get(sd->entry_edje, item); + { + if (ret) + *ret = edje_object_part_text_get(sd->entry_edje, item); + } return; } @@ -2820,7 +2826,7 @@ proceed: eina_stringshare_replace(&sd->text, text); } - *ret = sd->text; + if (ret) *ret = sd->text; } static char * @@ -3529,7 +3535,7 @@ _text_style_user_peek(Eo *obj EINA_UNUSED, void *_pd, va_list *list) const char **ret = va_arg(*list, const char **); Elm_Entry_Smart_Data *sd = _pd; - *ret = edje_object_part_text_style_user_peek(sd->entry_edje, "elm.text"); + if (ret) *ret = edje_object_part_text_style_user_peek(sd->entry_edje, "elm.text"); } EAPI void @@ -3581,7 +3587,7 @@ _single_line_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->single_line; + if (ret) *ret = sd->single_line; } EAPI void @@ -3643,7 +3649,7 @@ _password_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->password; + if (ret) *ret = sd->password; } EAPI void @@ -3735,10 +3741,10 @@ _is_empty(Eo *obj EINA_UNUSED, void *_pd, va_list *list) will be removed once evas 1.0 is out */ cur = evas_object_textblock_cursor_new((Evas_Object *)tb); evas_textblock_cursor_pos_set(cur, 0); - *ret = evas_textblock_cursor_char_next(cur); + if (ret) *ret = evas_textblock_cursor_char_next(cur); evas_textblock_cursor_free(cur); - *ret = !*ret; + if (ret) *ret = !*ret; } EAPI Evas_Object * @@ -3756,8 +3762,9 @@ _textblock_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Evas_Object **ret = va_arg(*list, Evas_Object **); Elm_Entry_Smart_Data *sd = _pd; - *ret = (Evas_Object *)edje_object_part_object_get - (sd->entry_edje, "elm.text"); + if (ret) + *ret = (Evas_Object *)edje_object_part_object_get + (sd->entry_edje, "elm.text"); } EAPI void @@ -3791,10 +3798,10 @@ _selection_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { const char **ret = va_arg(*list, const char **); Elm_Entry_Smart_Data *sd = _pd; - *ret = NULL; + if (ret) *ret = NULL; if ((sd->password)) return; - *ret = edje_object_part_text_selection_get(sd->entry_edje, "elm.text"); + if (ret) *ret = edje_object_part_text_selection_get(sd->entry_edje, "elm.text"); } EAPI void @@ -3830,7 +3837,7 @@ _selection_handler_disabled_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->sel_handler_disabled; + if (ret) *ret = sd->sel_handler_disabled; } EAPI void @@ -3887,7 +3894,7 @@ _line_wrap_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Wrap_Type *ret = va_arg(*list, Elm_Wrap_Type *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->line_wrap; + if (ret) *ret = sd->line_wrap; } EAPI void @@ -3937,7 +3944,7 @@ _editable_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->editable; + if (ret) *ret = sd->editable; } EAPI void @@ -4034,8 +4041,8 @@ _cursor_next(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = edje_object_part_text_cursor_next - (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); + if (ret) *ret = edje_object_part_text_cursor_next + (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); } EAPI Eina_Bool @@ -4053,7 +4060,7 @@ _cursor_prev(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = edje_object_part_text_cursor_prev + if (ret) *ret = edje_object_part_text_cursor_prev (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); } @@ -4072,7 +4079,7 @@ _cursor_up(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = edje_object_part_text_cursor_up + if (ret) *ret = edje_object_part_text_cursor_up (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); } @@ -4091,7 +4098,7 @@ _cursor_down(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = edje_object_part_text_cursor_down + if (ret) *ret = edje_object_part_text_cursor_down (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); } @@ -4204,7 +4211,7 @@ _cursor_is_format_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = edje_object_part_text_cursor_is_format_get + if (ret) *ret = edje_object_part_text_cursor_is_format_get (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); } @@ -4223,7 +4230,7 @@ _cursor_is_visible_format_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = edje_object_part_text_cursor_is_visible_format_get + if (ret) *ret = edje_object_part_text_cursor_is_visible_format_get (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); } @@ -4242,7 +4249,7 @@ _cursor_content_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) char **ret = va_arg(*list, char **); Elm_Entry_Smart_Data *sd = _pd; - *ret = edje_object_part_text_cursor_content_get + if (ret) *ret = edje_object_part_text_cursor_content_get (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); } @@ -4280,7 +4287,7 @@ _cursor_pos_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) int *ret = va_arg(*list, int *); Elm_Entry_Smart_Data *sd = _pd; - *ret = edje_object_part_text_cursor_pos_get + if (ret) *ret = edje_object_part_text_cursor_pos_get (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); } @@ -4424,7 +4431,7 @@ _context_menu_disabled_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = !sd->context_menu; + if (ret) *ret = !sd->context_menu; } EAPI const char * @@ -4907,7 +4914,7 @@ _autosave_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->auto_save; + if (ret) *ret = sd->auto_save; } EINA_DEPRECATED EAPI void @@ -4976,7 +4983,7 @@ _cnp_mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Cnp_Mode *ret = va_arg(*list, Elm_Cnp_Mode *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->cnp_mode; + if (ret) *ret = sd->cnp_mode; } EAPI void @@ -5068,7 +5075,7 @@ _scrollable_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->scroll; + if (ret) *ret = sd->scroll; } EAPI void @@ -5203,7 +5210,7 @@ _input_panel_layout_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Input_Panel_Layout *ret = va_arg(*list, Elm_Input_Panel_Layout *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->input_panel_layout; + if (ret) *ret = sd->input_panel_layout; } EAPI void @@ -5242,7 +5249,7 @@ _input_panel_layout_variation_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) int *ret = va_arg(*list, int *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->input_panel_layout_variation; + if (ret) *ret = sd->input_panel_layout_variation; } EAPI void @@ -5279,7 +5286,7 @@ _autocapital_type_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Autocapital_Type *ret = va_arg(*list, Elm_Autocapital_Type *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->autocapital_type; + if (ret) *ret = sd->autocapital_type; } EAPI void @@ -5316,7 +5323,7 @@ _prediction_allow_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->prediction_allow; + if (ret) *ret = sd->prediction_allow; } EAPI void @@ -5368,7 +5375,7 @@ _input_panel_enabled_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->input_panel_enable; + if (ret) *ret = sd->input_panel_enable; } EAPI void @@ -5435,7 +5442,7 @@ _input_panel_language_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Input_Panel_Lang *ret = va_arg(*list, Elm_Input_Panel_Lang *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->input_panel_lang; + if (ret) *ret = sd->input_panel_lang; } EAPI void @@ -5522,7 +5529,7 @@ _input_panel_return_key_type_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Input_Panel_Return_Key_Type *ret = va_arg(*list, Elm_Input_Panel_Return_Key_Type *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->input_panel_return_key_type; + if (ret) *ret = sd->input_panel_return_key_type; } EAPI void @@ -5560,7 +5567,7 @@ _input_panel_return_key_disabled_get(Eo *obj EINA_UNUSED, void *_pd, va_list *li Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->input_panel_return_key_disabled; + if (ret) *ret = sd->input_panel_return_key_disabled; } EAPI void @@ -5594,6 +5601,8 @@ static void _imf_context_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { void **ret = va_arg(*list, void **); + if (!ret) return; + *ret = NULL; Elm_Entry_Smart_Data *sd = _pd; if (!sd) return; @@ -5653,7 +5662,7 @@ _anchor_hover_parent_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Evas_Object **ret = va_arg(*list, Evas_Object **); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->anchor_hover.hover_parent; + if (ret) *ret = sd->anchor_hover.hover_parent; } EAPI void @@ -5688,7 +5697,7 @@ _anchor_hover_style_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) const char **ret = va_arg(*list, const char **); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->anchor_hover.hover_style; + if (ret) *ret = sd->anchor_hover.hover_style; } EAPI void @@ -5712,14 +5721,14 @@ static void _elm_entry_smart_focus_next_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; + if (ret) *ret = EINA_FALSE; } static void _elm_entry_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; + if (ret) *ret = EINA_FALSE; } static void diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c index c24e25da9..0ba69d2cb 100644 --- a/src/lib/elm_flip.c +++ b/src/lib/elm_flip.c @@ -1170,7 +1170,7 @@ _flip_do(Evas_Object *obj, evas_map_util_3d_lighting(mf, lx, ly, lz, lr, lg, lb, lar, lag, lab); evas_map_util_3d_perspective(mf, px, py, 0, foc); evas_object_map_set(sd->front.content, mf); - evas_object_map_enable_set(sd->front.content, 1); + evas_object_map_enable_set(sd->front.content, EINA_TRUE); if (evas_map_util_clockwise_get(mf)) evas_object_show(sd->front.clip); else evas_object_hide(sd->front.clip); } @@ -1180,7 +1180,7 @@ _flip_do(Evas_Object *obj, evas_map_util_3d_lighting(mb, lx, ly, lz, lr, lg, lb, lar, lag, lab); evas_map_util_3d_perspective(mb, px, py, 0, foc); evas_object_map_set(sd->back.content, mb); - evas_object_map_enable_set(sd->back.content, 1); + evas_object_map_enable_set(sd->back.content, EINA_TRUE); if (evas_map_util_clockwise_get(mb)) evas_object_show(sd->back.clip); else evas_object_hide(sd->back.clip); } @@ -1349,8 +1349,8 @@ _flip(Evas_Object *obj) #endif sd->pageflip = EINA_FALSE; _state_end(sd); - evas_object_map_enable_set(sd->front.content, 0); - evas_object_map_enable_set(sd->back.content, 0); + evas_object_map_enable_set(sd->front.content, EINA_FALSE); + evas_object_map_enable_set(sd->back.content, EINA_FALSE); // FIXME: hack around evas rendering bug (only fix makes evas bitch-slow evas_object_resize(sd->front.content, 0, 0); evas_object_resize(sd->back.content, 0, 0); @@ -1529,8 +1529,8 @@ _event_anim(void *data, sd->pageflip = EINA_FALSE; _state_end(sd); - evas_object_map_enable_set(sd->front.content, 0); - evas_object_map_enable_set(sd->back.content, 0); + evas_object_map_enable_set(sd->front.content, EINA_FALSE); + evas_object_map_enable_set(sd->back.content, EINA_FALSE); // FIXME: hack around evas rendering bug (only fix makes evas bitch-slow evas_object_resize(sd->front.content, 0, 0); evas_object_resize(sd->back.content, 0, 0); @@ -1971,8 +1971,8 @@ _elm_flip_go_to(Evas_Object *obj, evas_smart_objects_calculate(evas_object_evas_get(obj)); _flip(obj); // FIXME: hack around evas rendering bug (only fix makes evas bitch-slow) - evas_object_map_enable_set(sd->front.content, 0); - evas_object_map_enable_set(sd->back.content, 0); + evas_object_map_enable_set(sd->front.content, EINA_FALSE); + evas_object_map_enable_set(sd->back.content, EINA_FALSE); evas_object_resize(sd->front.content, 0, 0); evas_object_resize(sd->back.content, 0, 0); evas_smart_objects_calculate(evas_object_evas_get(obj)); diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c index e872e943a..b7ec14a69 100644 --- a/src/lib/elm_gengrid.c +++ b/src/lib/elm_gengrid.c @@ -757,8 +757,15 @@ _item_realize(Elm_Gen_Item *it) elm_widget_sub_object_add(WIDGET(it), VIEW(it)); snprintf(style, sizeof(style), "item/%s", it->itc->item_style ? it->itc->item_style : "default"); - elm_widget_theme_object_set(WIDGET(it), VIEW(it), "gengrid", style, - elm_widget_style_get(WIDGET(it))); + if (!elm_widget_theme_object_set(WIDGET(it), VIEW(it), "gengrid", style, + elm_widget_style_get(WIDGET(it)))) + { + ERR("%s is not a valid gengrid item style. " + "Automatically falls back into default style.", + it->itc->item_style); + elm_widget_theme_object_set + (WIDGET(it), VIEW(it), "gengrid", "item/default", "default"); + } evas_object_stack_below(VIEW(it), sd->stack); if (edje_object_part_exists(VIEW(it), "elm.swallow.pad")) diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index c43241953..741a77aea 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -1555,9 +1555,17 @@ _item_realize(Elm_Gen_Item *it, sd->mode == ELM_LIST_COMPRESS ? "_compress" : "", it->itc->item_style ? : "default"); - elm_widget_theme_object_set - (WIDGET(it), VIEW(it), "genlist", buf, - elm_widget_style_get(WIDGET(it))); + if (!elm_widget_theme_object_set(WIDGET(it), VIEW(it), + "genlist", buf, + elm_widget_style_get(WIDGET(it)))) + { + ERR("%s is not a valid genlist item style. " + "Automatically falls back into default style.", + it->itc->item_style); + elm_widget_theme_object_set + (WIDGET(it), VIEW(it), "genlist", "item/default", "default"); + } + stacking_even = edje_object_data_get(VIEW(it), "stacking_even"); if (!stacking_even) stacking_even = "above"; @@ -2683,14 +2691,14 @@ static void _elm_genlist_smart_focus_next_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = _elm_genlist_smart_focus_next_enable; + if (ret) *ret = _elm_genlist_smart_focus_next_enable; } static void _elm_genlist_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; + if (ret) *ret = EINA_FALSE; } static void @@ -4778,11 +4786,20 @@ _decorate_item_realize(Elm_Gen_Item *it) strncat(buf, "/", sizeof(buf) - strlen(buf) - 1); strncat(buf, it->itc->decorate_item_style, sizeof(buf) - strlen(buf) - 1); - elm_widget_theme_object_set - (WIDGET(it), it->item->deco_it_view, "genlist", buf, - elm_widget_style_get(WIDGET(it))); + if (!elm_widget_theme_object_set + (WIDGET(it), it->item->deco_it_view, "genlist", buf, + elm_widget_style_get(WIDGET(it)))) + { + + ERR("%s is not a valid genlist item style. " + "Automatically falls back into default style.", + it->itc->decorate_item_style); + elm_widget_theme_object_set + (WIDGET(it), it->item->deco_it_view, + "genlist", "item/default", "default"); + } edje_object_mirrored_set - (it->item->deco_it_view, elm_widget_mirrored_get(WIDGET(it))); + (it->item->deco_it_view, elm_widget_mirrored_get(WIDGET(it))); /* signal callback add */ evas_object_event_callback_add @@ -5414,7 +5431,7 @@ _items_count(Eo *obj EINA_UNUSED, void *_pd, va_list *list) unsigned int *ret = va_arg(*list, unsigned int *); Elm_Genlist_Smart_Data *sd = _pd; - *ret = sd->item_count; + if (ret) *ret = sd->item_count; } EAPI Elm_Object_Item * @@ -5445,7 +5462,7 @@ _item_append(Eo *obj EINA_UNUSED, void *_pd, va_list *list) const void *func_data = va_arg(*list, const void *); Elm_Object_Item **ret = va_arg(*list, Elm_Object_Item **); Elm_Genlist_Smart_Data *sd = _pd; - *ret = NULL; + if (ret) *ret = NULL; it = _elm_genlist_item_new (sd, itc, data, (Elm_Gen_Item *)parent, type, func, func_data); @@ -5475,7 +5492,7 @@ _item_append(Eo *obj EINA_UNUSED, void *_pd, va_list *list) it->item->before = EINA_FALSE; _item_queue(sd, it, NULL); - *ret = (Elm_Object_Item *)it; + if (ret) *ret = (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -5506,7 +5523,7 @@ _item_prepend(Eo *obj EINA_UNUSED, void *_pd, va_list *list) const void *func_data = va_arg(*list, const void *); Elm_Object_Item **ret = va_arg(*list, Elm_Object_Item **); Elm_Genlist_Smart_Data *sd = _pd; - *ret = NULL; + if (ret) *ret = NULL; it = _elm_genlist_item_new (sd, itc, data, (Elm_Gen_Item *)parent, type, func, func_data); @@ -5536,7 +5553,7 @@ _item_prepend(Eo *obj EINA_UNUSED, void *_pd, va_list *list) it->item->before = EINA_TRUE; _item_queue(sd, it, NULL); - *ret = (Elm_Object_Item *)it; + if (ret) *ret = (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -5570,7 +5587,7 @@ _item_insert_after(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Gen_Item *after = (Elm_Gen_Item *)after_it; Elm_Gen_Item *it; - *ret = NULL; + if (ret) *ret = NULL; ELM_GENLIST_ITEM_CHECK(after_it); Elm_Genlist_Smart_Data *sd = _pd; @@ -5602,7 +5619,7 @@ _item_insert_after(Eo *obj EINA_UNUSED, void *_pd, va_list *list) it->item->before = EINA_FALSE; _item_queue(sd, it, NULL); - *ret = (Elm_Object_Item *)it; + if (ret) *ret = (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -5635,7 +5652,7 @@ _item_insert_before(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Gen_Item *before = (Elm_Gen_Item *)before_it; Elm_Gen_Item *it; - *ret = NULL; + if (ret) *ret = NULL; ELM_GENLIST_ITEM_CHECK(before_it); Elm_Genlist_Smart_Data *sd = _pd; @@ -5666,7 +5683,7 @@ _item_insert_before(Eo *obj EINA_UNUSED, void *_pd, va_list *list) it->item->before = EINA_TRUE; _item_queue(sd, it, NULL); - *ret = (Elm_Object_Item *)it; + if (ret) *ret = (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -5699,7 +5716,7 @@ _item_sorted_insert(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Evas_Smart_Cb func = va_arg(*list, Evas_Smart_Cb); const void *func_data = va_arg(*list, const void *); Elm_Object_Item **ret = va_arg(*list, Elm_Object_Item **); - *ret = NULL; + if (ret) *ret = NULL; Elm_Genlist_Smart_Data *sd = _pd; @@ -5776,7 +5793,7 @@ _item_sorted_insert(Eo *obj EINA_UNUSED, void *_pd, va_list *list) _item_queue(sd, it, _elm_genlist_item_list_compare); - *ret = (Elm_Object_Item *)it; + if (ret) *ret = (Elm_Object_Item *)it; } EAPI void @@ -5824,7 +5841,7 @@ _multi_select_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Genlist_Smart_Data *sd = _pd; - *ret = sd->multi; + if (ret) *ret = sd->multi; } EAPI void @@ -5863,7 +5880,7 @@ _multi_select_mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Object_Multi_Select_Mode *ret = va_arg(*list, Elm_Object_Multi_Select_Mode *); Elm_Genlist_Smart_Data *sd = _pd; - *ret = sd->multi_select_mode; + if (ret) *ret = sd->multi_select_mode; } EAPI Elm_Object_Item * @@ -5902,7 +5919,7 @@ _selected_items_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) const Eina_List **ret = va_arg(*list, const Eina_List **); Elm_Genlist_Smart_Data *sd = _pd; - *ret = sd->selected; + if (ret) *ret = sd->selected; } EAPI Eina_List * @@ -5922,7 +5939,7 @@ _realized_items_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_List **ret = va_arg(*list, Eina_List **); Elm_Genlist_Smart_Data *sd = _pd; - *ret = NULL; + if (ret) *ret = NULL; EINA_INLIST_FOREACH(sd->blocks, itb) { @@ -6009,7 +6026,7 @@ _at_xy_item_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) else *posret = -1; } - *ret = NULL; + if (ret) *ret = NULL; } EAPI Elm_Object_Item * @@ -6028,7 +6045,7 @@ _first_item_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Object_Item **ret = va_arg(*list, Elm_Object_Item **); Elm_Genlist_Smart_Data *sd = _pd; - *ret = NULL; + if (ret) *ret = NULL; if (!sd->items) return; @@ -6036,7 +6053,7 @@ _first_item_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) while ((it) && (it->generation < sd->generation)) it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next); - *ret = (Elm_Object_Item *)it; + if (ret) *ret = (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -6054,7 +6071,7 @@ _last_item_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Gen_Item *it; Elm_Object_Item **ret = va_arg(*list, Elm_Object_Item **); - *ret = NULL; + if (ret) *ret = NULL; Elm_Genlist_Smart_Data *sd = _pd; @@ -6064,7 +6081,7 @@ _last_item_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) while ((it) && (it->generation < sd->generation)) it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev); - *ret = (Elm_Object_Item *)it; + if (ret) *ret = (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -6811,7 +6828,7 @@ _mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_List_Mode *ret = va_arg(*list, Elm_List_Mode *); Elm_Genlist_Smart_Data *sd = _pd; - *ret = sd->mode; + if (ret) *ret = sd->mode; } EAPI void @@ -6889,7 +6906,7 @@ _homogeneous_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Genlist_Smart_Data *sd = _pd; - *ret = sd->homogeneous; + if (ret) *ret = sd->homogeneous; } EAPI void @@ -6927,7 +6944,7 @@ _block_count_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) int *ret = va_arg(*list, int *); Elm_Genlist_Smart_Data *sd = _pd; - *ret = sd->max_items_per_block; + if (ret) *ret = sd->max_items_per_block; } EAPI void @@ -6962,7 +6979,7 @@ _longpress_timeout_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) double *ret = va_arg(*list, double *); Elm_Genlist_Smart_Data *sd = _pd; - *ret = sd->longpress_timeout; + if (ret) *ret = sd->longpress_timeout; } EAPI void @@ -7099,7 +7116,7 @@ _decorated_item_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Object_Item **ret = va_arg(*list, Elm_Object_Item **); Elm_Genlist_Smart_Data *sd = _pd; - *ret = (Elm_Object_Item *)sd->mode_item; + if (ret) *ret = (Elm_Object_Item *)sd->mode_item; } EAPI Eina_Bool @@ -7117,7 +7134,7 @@ _decorate_mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Genlist_Smart_Data *sd = _pd; - *ret = sd->decorate_all_mode; + if (ret) *ret = sd->decorate_all_mode; } EAPI void @@ -7233,7 +7250,7 @@ _reorder_mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Genlist_Smart_Data *sd = _pd; - *ret = sd->reorder_mode; + if (ret) *ret = sd->reorder_mode; } EAPI Elm_Genlist_Item_Type @@ -7383,7 +7400,7 @@ _select_mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Object_Select_Mode *ret = va_arg(*list, Elm_Object_Select_Mode *); Elm_Genlist_Smart_Data *sd = _pd; - *ret = sd->select_mode; + if (ret) *ret = sd->select_mode; } EAPI void @@ -7418,7 +7435,7 @@ _highlight_mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Genlist_Smart_Data *sd = _pd; - *ret = sd->highlight; + if (ret) *ret = sd->highlight; } EAPI void @@ -7496,7 +7513,7 @@ _tree_effect_enabled_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Genlist_Smart_Data *sd = _pd; - *ret = sd->tree_effect_enabled; + if (ret) *ret = sd->tree_effect_enabled; } EAPI void @@ -7529,7 +7546,7 @@ _focus_on_selection_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Genlist_Smart_Data *sd = _pd; - *ret = sd->focus_on_selection_enabled; + if (ret) *ret = sd->focus_on_selection_enabled; } EAPI Elm_Object_Item * diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c index e5657bf33..c961d4aab 100644 --- a/src/lib/elm_image.c +++ b/src/lib/elm_image.c @@ -254,6 +254,8 @@ _elm_image_smart_smooth_scale_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Image_Smart_Data *sd = _pd; + if (!ret) return; + if (sd->edje) { *ret = EINA_FALSE; @@ -286,7 +288,7 @@ _elm_image_smart_fill_inside_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Image_Smart_Data *sd = _pd; - *ret = sd->fill_inside; + if (ret) *ret = sd->fill_inside; } static void @@ -313,7 +315,7 @@ _elm_image_smart_resize_up_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Image_Smart_Data *sd = _pd; - *ret = sd->resize_up; + if (ret) *ret = sd->resize_up; } static void @@ -338,7 +340,7 @@ _elm_image_smart_resize_down_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Image_Smart_Data *sd = _pd; - *ret = sd->resize_up; + if (ret) *ret = sd->resize_up; } static void @@ -803,7 +805,7 @@ _elm_image_smart_scale_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Image_Smart_Data *sd = _pd; double *ret = va_arg(*list, double *); - *ret = sd->scale; + if (ret) *ret = sd->scale; } EAPI Evas_Object * @@ -1088,7 +1090,7 @@ _elm_image_smart_smooth_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Image_Smart_Data *sd = _pd; - *ret = sd->smooth; + if (ret) *ret = sd->smooth; } EAPI void @@ -1166,7 +1168,7 @@ _elm_image_smart_no_scale_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Image_Smart_Data *sd = _pd; - *ret = sd->no_scale; + if (ret) *ret = sd->no_scale; } EAPI void @@ -1245,7 +1247,7 @@ _elm_image_smart_fill_outside_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Image_Smart_Data *sd = _pd; - *ret = !sd->fill_inside; + if (ret) *ret = !sd->fill_inside; } EAPI void @@ -1312,7 +1314,7 @@ _elm_image_smart_load_size_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) int *ret = va_arg(*list, int *); - *ret = sd->load_size; + if (ret) *ret = sd->load_size; } EAPI void @@ -1452,7 +1454,7 @@ _elm_image_smart_orient_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Image_Orient *ret = va_arg(*list, Elm_Image_Orient *); - *ret = sd->orient; + if (ret) *ret = sd->orient; } EAPI void @@ -1517,7 +1519,7 @@ _elm_image_smart_editable_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Image_Smart_Data *sd = _pd; Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = sd->edit; + if (ret) *ret = sd->edit; } EAPI Evas_Object * @@ -1537,7 +1539,7 @@ _elm_image_smart_object_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Image_Smart_Data *sd = _pd; - *ret = sd->img; + if (ret) *ret = sd->img; } EAPI void @@ -1577,7 +1579,7 @@ _elm_image_smart_aspect_fixed_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Image_Smart_Data *sd = _pd; Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = sd->aspect_fixed; + if (ret) *ret = sd->aspect_fixed; } EAPI Eina_Bool @@ -1598,11 +1600,11 @@ _elm_image_smart_animated_available_get(Eo *obj, void *_pd, va_list *list) if (sd->edje) { - *ret = EINA_FALSE; + if (ret) *ret = EINA_FALSE; return; } - *ret = evas_object_image_animated_get(elm_image_object_get(obj)); + if (ret) *ret = evas_object_image_animated_get(elm_image_object_get(obj)); } EAPI void @@ -1661,7 +1663,7 @@ _elm_image_smart_animated_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Image_Smart_Data *sd = _pd; - *ret = sd->anim; + if (ret) *ret = sd->anim; } EAPI void @@ -1709,7 +1711,7 @@ _elm_image_smart_animated_play_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list { Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Image_Smart_Data *sd = _pd; - *ret = sd->play; + if (ret) *ret = sd->play; } static void diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c index 71d40407a..beaf23fee 100644 --- a/src/lib/elm_map.c +++ b/src/lib/elm_map.c @@ -3434,7 +3434,7 @@ _source_mod_cb(Eina_Module *m, { INF("Map ROUTE module is loaded \"%s\"", file); Source_Route *s; - s = ELM_NEW(Source_Tile); + s = ELM_NEW(Source_Route); s->name = name_cb(); s->url_cb = route_url_cb; sd->src_routes = eina_list_append(sd->src_routes, s); @@ -3446,7 +3446,7 @@ _source_mod_cb(Eina_Module *m, { INF("Map NAME module is loaded \"%s\"", file); Source_Name *s; - s = ELM_NEW(Source_Tile); + s = ELM_NEW(Source_Name); s->name = name_cb(); s->url_cb = name_url_cb; sd->src_names = eina_list_append(sd->src_names, s); diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c index e7c881b4a..0590873be 100644 --- a/src/lib/elm_spinner.c +++ b/src/lib/elm_spinner.c @@ -763,14 +763,14 @@ static void _elm_spinner_smart_focus_next_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = _elm_spinner_smart_focus_next_enable; + if (ret) *ret = _elm_spinner_smart_focus_next_enable; } static void _elm_spinner_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; + if (ret) *ret = EINA_FALSE; } static Evas_Object * @@ -887,7 +887,7 @@ _elm_spinner_label_format_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { const char **ret = va_arg(*list, const char **); Elm_Spinner_Smart_Data *sd = _pd; - *ret = sd->label; + if (ret) *ret = sd->label; } EAPI void @@ -969,7 +969,7 @@ _elm_spinner_step_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { double *ret = va_arg(*list, double *); Elm_Spinner_Smart_Data *sd = _pd; - *ret = sd->step; + if (ret) *ret = sd->step; } EAPI void @@ -1017,7 +1017,7 @@ _elm_spinner_value_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { double *ret = va_arg(*list, double *); Elm_Spinner_Smart_Data *sd = _pd; - *ret = sd->val; + if (ret) *ret = sd->val; } EAPI void @@ -1050,7 +1050,7 @@ _elm_spinner_wrap_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Spinner_Smart_Data *sd = _pd; - *ret = sd->wrap; + if (ret) *ret = sd->wrap; } EAPI void @@ -1162,7 +1162,7 @@ _elm_spinner_editable_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Spinner_Smart_Data *sd = _pd; - *ret = sd->editable; + if (ret) *ret = sd->editable; } EAPI void @@ -1195,7 +1195,7 @@ _elm_spinner_interval_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { double *ret = va_arg(*list, double *); Elm_Spinner_Smart_Data *sd = _pd; - *ret = sd->first_interval; + if (ret) *ret = sd->first_interval; } EAPI void @@ -1228,7 +1228,7 @@ _elm_spinner_base_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { double *ret = va_arg(*list, double *); Elm_Spinner_Smart_Data *sd = _pd; - *ret = sd->val_base; + if (ret) *ret = sd->val_base; } EAPI void @@ -1261,7 +1261,7 @@ _elm_spinner_round_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { int *ret = va_arg(*list, int *); Elm_Spinner_Smart_Data *sd = _pd; - *ret = sd->round; + if (ret) *ret = sd->round; } static void diff --git a/src/lib/elm_thumb.c b/src/lib/elm_thumb.c index a3e3fd979..4a2c46424 100644 --- a/src/lib/elm_thumb.c +++ b/src/lib/elm_thumb.c @@ -580,6 +580,12 @@ _elm_thumb_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED) (sd->view, EVAS_CALLBACK_IMAGE_PRELOADED, _on_thumb_preloaded, sd); + if (sd->view) + { + evas_object_del(sd->view); + sd->view = NULL; + } + eina_stringshare_del(sd->thumb.thumb_path); eina_stringshare_del(sd->thumb.thumb_key); diff --git a/src/lib/elm_web.c b/src/lib/elm_web.c index 06d3f90dd..b86c6c9fd 100644 --- a/src/lib/elm_web.c +++ b/src/lib/elm_web.c @@ -548,7 +548,7 @@ _run_dialog(Evas_Object *parent, if (type == DIALOG_PROMPT || type == DIALOG_CONFIRM) { Evas_Object *bx_h = elm_box_add(dialog_data->box); - elm_box_horizontal_set(bx_h, 1); + elm_box_horizontal_set(bx_h, EINA_TRUE); elm_box_pack_end(dialog_data->box, bx_h); evas_object_size_hint_weight_set (bx_h, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c index d22399e23..e56f0e55a 100644 --- a/src/lib/elm_widget.c +++ b/src/lib/elm_widget.c @@ -16,8 +16,7 @@ EAPI Eo_Op ELM_WIDGET_BASE_ID = EO_NOOP; #define MY_CLASS_NAME_LEGACY "elm_widget" #define ELM_WIDGET_DATA_GET(o, wd) \ - Elm_Widget_Smart_Data *wd = NULL; \ - if (eo_isa(o, MY_CLASS)) wd = eo_data_scope_get(o, MY_CLASS) + Elm_Widget_Smart_Data *wd = eo_data_scope_get(o, MY_CLASS) #define API_ENTRY \ ELM_WIDGET_DATA_GET(obj, sd); \ diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in index f6f9e81b6..f9ad094c5 100644 --- a/src/modules/Makefile.in +++ b/src/modules/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/src/modules/access_output/Makefile.in b/src/modules/access_output/Makefile.in index bf36ab793..18dc65326 100644 --- a/src/modules/access_output/Makefile.in +++ b/src/modules/access_output/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -509,14 +509,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/src/modules/datetime_input_ctxpopup/Makefile.in b/src/modules/datetime_input_ctxpopup/Makefile.in index 45817e6b6..7695861e6 100644 --- a/src/modules/datetime_input_ctxpopup/Makefile.in +++ b/src/modules/datetime_input_ctxpopup/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -510,14 +510,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/src/modules/prefs/Makefile.in b/src/modules/prefs/Makefile.in index dcb569a3d..ac8226b88 100644 --- a/src/modules/prefs/Makefile.in +++ b/src/modules/prefs/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -560,14 +560,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/src/modules/test_entry/Makefile.in b/src/modules/test_entry/Makefile.in index ee53a1189..05b351f85 100644 --- a/src/modules/test_entry/Makefile.in +++ b/src/modules/test_entry/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -509,14 +509,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/src/modules/test_map/Makefile.in b/src/modules/test_map/Makefile.in index 02a51fff8..c4cb26979 100644 --- a/src/modules/test_map/Makefile.in +++ b/src/modules/test_map/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -509,14 +509,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in index 6c82aa87a..0c67bc5ba 100644 --- a/src/tests/Makefile.in +++ b/src/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -679,14 +679,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<