From 8a2c518ae30cd39ae4e4ece7bdd24ec859dd0b44 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Fri, 8 Mar 2013 01:02:09 -0800 Subject: [PATCH] Imported Upstream version 1.7.5 --- ChangeLog | 8 ++ NEWS | 11 +++ configure | 168 ++++++++++++++++++++-------------------- configure.ac | 100 ++++++++++++------------ ecore.spec | 2 +- po/LINGUAS | 2 +- po/cs.gmo | Bin 3004 -> 3004 bytes po/cs.po | 2 +- po/de.gmo | Bin 3001 -> 3001 bytes po/de.po | 2 +- po/ecore.pot | 4 +- po/el.gmo | Bin 3487 -> 3487 bytes po/el.po | 2 +- po/fr.gmo | Bin 3199 -> 3199 bytes po/fr.po | 2 +- po/it.gmo | Bin 2931 -> 2931 bytes po/it.po | 2 +- po/nl.gmo | Bin 2978 -> 2978 bytes po/nl.po | 2 +- po/pt.gmo | Bin 3030 -> 3030 bytes po/pt.po | 2 +- po/sl.gmo | Bin 3015 -> 3015 bytes po/sl.po | 2 +- po/zh_CN.gmo | Bin 0 -> 2828 bytes po/zh_CN.po | 174 ++++++++++++++++++++++++++++++++++++++++++ src/lib/ecore/Ecore.h | 4 +- src/lib/ecore_con/ecore_con.c | 82 +++++++++++++++----- 27 files changed, 402 insertions(+), 169 deletions(-) create mode 100644 po/zh_CN.gmo create mode 100644 po/zh_CN.po diff --git a/ChangeLog b/ChangeLog index dbeefef..a8a5985 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1042,3 +1042,11 @@ * 1.7.4 release +2013-01-03 Carsten Haitzler (The Rasterman) + + * Fixed ecore_con case where freeing server double-frees clients + + +2013-01-04 Luis Felipe Strano Moraes + + * 1.7.5 release diff --git a/NEWS b/NEWS index d8d81b9..646aedb 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +Ecore 1.7.5 + +Changes since Ecore 1.7.4: +-------------------------- + +Fixes: + * Fix ecore_con case where freeing server double-frees clients + +Improvements: + * New simplified chinese translation. + Ecore 1.7.4 Changes since Ecore 1.7.3: diff --git a/configure b/configure index 45811d2..8a1b379 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for ecore 1.7.4. +# Generated by GNU Autoconf 2.68 for ecore 1.7.5. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ecore' PACKAGE_TARNAME='ecore' -PACKAGE_VERSION='1.7.4' -PACKAGE_STRING='ecore 1.7.4' +PACKAGE_VERSION='1.7.5' +PACKAGE_STRING='ecore 1.7.5' PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net' PACKAGE_URL='' @@ -1794,7 +1794,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 ecore 1.7.4 to adapt to many kinds of systems. +\`configure' configures ecore 1.7.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1868,7 +1868,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ecore 1.7.4:";; + short | recursive ) echo "Configuration of ecore 1.7.5:";; esac cat <<\_ACEOF @@ -2275,7 +2275,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ecore configure 1.7.4 +ecore configure 1.7.5 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -3127,7 +3127,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 ecore $as_me 1.7.4, which was +It was created by ecore $as_me 1.7.5, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3952,7 +3952,7 @@ fi # Define the identity of the package. PACKAGE='ecore' - VERSION='1.7.4' + VERSION='1.7.5' cat >>confdefs.h <<_ACEOF @@ -12986,7 +12986,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF -#define VERS_MIC 4 +#define VERS_MIC 5 _ACEOF @@ -12994,7 +12994,7 @@ cat >>confdefs.h <<_ACEOF #define VERS_REV 0 _ACEOF -version_info="8:4:7" +version_info="8:5:7" release_info="" @@ -19970,12 +19970,12 @@ if test -n "$EVIL_CFLAGS"; then pkg_cv_EVIL_CFLAGS="$EVIL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.6.99\""; } >&5 - ($PKG_CONFIG --exists --print-errors "evil >= 1.6.99") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.7.5\""; } >&5 + ($PKG_CONFIG --exists --print-errors "evil >= 1.7.5") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EVIL_CFLAGS=`$PKG_CONFIG --cflags "evil >= 1.6.99" 2>/dev/null` + pkg_cv_EVIL_CFLAGS=`$PKG_CONFIG --cflags "evil >= 1.7.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -19987,12 +19987,12 @@ if test -n "$EVIL_LIBS"; then pkg_cv_EVIL_LIBS="$EVIL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.6.99\""; } >&5 - ($PKG_CONFIG --exists --print-errors "evil >= 1.6.99") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.7.5\""; } >&5 + ($PKG_CONFIG --exists --print-errors "evil >= 1.7.5") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EVIL_LIBS=`$PKG_CONFIG --libs "evil >= 1.6.99" 2>/dev/null` + pkg_cv_EVIL_LIBS=`$PKG_CONFIG --libs "evil >= 1.7.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -20013,14 +20013,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evil >= 1.6.99" 2>&1` + EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evil >= 1.7.5" 2>&1` else - EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evil >= 1.6.99" 2>&1` + EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evil >= 1.7.5" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EVIL_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (evil >= 1.6.99) were not met: + as_fn_error $? "Package requirements (evil >= 1.7.5) were not met: $EVIL_PKG_ERRORS @@ -20534,12 +20534,12 @@ if test -n "$EINA_CFLAGS"; then pkg_cv_EINA_CFLAGS="$EINA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.6.99\""; } >&5 - ($PKG_CONFIG --exists --print-errors "eina >= 1.6.99") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.7.5\""; } >&5 + ($PKG_CONFIG --exists --print-errors "eina >= 1.7.5") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EINA_CFLAGS=`$PKG_CONFIG --cflags "eina >= 1.6.99" 2>/dev/null` + pkg_cv_EINA_CFLAGS=`$PKG_CONFIG --cflags "eina >= 1.7.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -20551,12 +20551,12 @@ if test -n "$EINA_LIBS"; then pkg_cv_EINA_LIBS="$EINA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.6.99\""; } >&5 - ($PKG_CONFIG --exists --print-errors "eina >= 1.6.99") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.7.5\""; } >&5 + ($PKG_CONFIG --exists --print-errors "eina >= 1.7.5") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EINA_LIBS=`$PKG_CONFIG --libs "eina >= 1.6.99" 2>/dev/null` + pkg_cv_EINA_LIBS=`$PKG_CONFIG --libs "eina >= 1.7.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -20577,14 +20577,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EINA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eina >= 1.6.99" 2>&1` + EINA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eina >= 1.7.5" 2>&1` else - EINA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eina >= 1.6.99" 2>&1` + EINA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eina >= 1.7.5" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EINA_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (eina >= 1.6.99) were not met: + as_fn_error $? "Package requirements (eina >= 1.7.5) were not met: $EINA_PKG_ERRORS @@ -20617,24 +20617,24 @@ $as_echo "yes" >&6; } fi #FIXME check all the requirements when the eina move will be finished -requirements_ecore="eina >= 1.6.99 ${requirements_ecore}" -requirements_ecore_con="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_con}" -#requirements_ecore_config="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_config}" -requirements_ecore_directfb="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_directfb}" -requirements_ecore_evas="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_evas}" -requirements_ecore_fb="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_fb}" -requirements_ecore_file="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_file}" -requirements_ecore_imf="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_imf}" -requirements_ecore_imf_evas="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_imf_evas}" -requirements_ecore_input="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_input}" -requirements_ecore_input_evas="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_input_evas}" -requirements_ecore_ipc="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_ipc}" -requirements_ecore_cocoa="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_cocoa}" -requirements_ecore_sdl="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_sdl}" -requirements_ecore_psl1ght="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_psl1ght}" -requirements_ecore_win32="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_win32}" -requirements_ecore_wince="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_wince}" -requirements_ecore_x="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_x}" +requirements_ecore="eina >= 1.7.5 ${requirements_ecore}" +requirements_ecore_con="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_con}" +#requirements_ecore_config="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_config}" +requirements_ecore_directfb="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_directfb}" +requirements_ecore_evas="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_evas}" +requirements_ecore_fb="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_fb}" +requirements_ecore_file="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_file}" +requirements_ecore_imf="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_imf}" +requirements_ecore_imf_evas="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_imf_evas}" +requirements_ecore_input="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_input}" +requirements_ecore_input_evas="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_input_evas}" +requirements_ecore_ipc="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_ipc}" +requirements_ecore_cocoa="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_cocoa}" +requirements_ecore_sdl="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_sdl}" +requirements_ecore_psl1ght="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_psl1ght}" +requirements_ecore_win32="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_win32}" +requirements_ecore_wince="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_wince}" +requirements_ecore_x="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_x}" # glib support (main loop integration) @@ -20959,7 +20959,7 @@ fi # Eet library (ecore_config) #PKG_CHECK_MODULES([EET], -# [eet >= 1.6.99], +# [eet >= 1.7.5], # [have_eet="yes"], # [have_eet="no"]) @@ -24883,12 +24883,12 @@ if test -n "$EVAS_CFLAGS"; then pkg_cv_EVAS_CFLAGS="$EVAS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas >= 1.6.99\""; } >&5 - ($PKG_CONFIG --exists --print-errors "evas >= 1.6.99") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas >= 1.7.5\""; } >&5 + ($PKG_CONFIG --exists --print-errors "evas >= 1.7.5") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EVAS_CFLAGS=`$PKG_CONFIG --cflags "evas >= 1.6.99" 2>/dev/null` + pkg_cv_EVAS_CFLAGS=`$PKG_CONFIG --cflags "evas >= 1.7.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -24900,12 +24900,12 @@ if test -n "$EVAS_LIBS"; then pkg_cv_EVAS_LIBS="$EVAS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas >= 1.6.99\""; } >&5 - ($PKG_CONFIG --exists --print-errors "evas >= 1.6.99") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas >= 1.7.5\""; } >&5 + ($PKG_CONFIG --exists --print-errors "evas >= 1.7.5") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EVAS_LIBS=`$PKG_CONFIG --libs "evas >= 1.6.99" 2>/dev/null` + pkg_cv_EVAS_LIBS=`$PKG_CONFIG --libs "evas >= 1.7.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -24926,9 +24926,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evas >= 1.6.99" 2>&1` + EVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evas >= 1.7.5" 2>&1` else - EVAS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evas >= 1.6.99" 2>&1` + EVAS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evas >= 1.7.5" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EVAS_PKG_ERRORS" >&5 @@ -27964,8 +27964,8 @@ fi if test "x$have_ecore_ipc" = "xyes"; then : - requirements_ecore_ipc="ecore-con >= 1.6.99 ${requirements_ecore_ipc}" - requirements_ecore_evas="ecore-ipc >= 1.6.99 ${requirements_ecore_evas}" + requirements_ecore_ipc="ecore-con >= 1.7.5 ${requirements_ecore_ipc}" + requirements_ecore_evas="ecore-ipc >= 1.7.5 ${requirements_ecore_evas}" fi @@ -28219,7 +28219,7 @@ fi if test "x${have_ecore_con}" = "xyes" ; then - requirements_ecore_file="ecore-con >= 1.6.99 ${requirements_ecore_file}" + requirements_ecore_file="ecore-con >= 1.7.5 ${requirements_ecore_file}" else _ecore_want_curl=${want_curl} @@ -28336,7 +28336,7 @@ fi #fi #ECORE_CHECK_MODULE([config], [${want_ecore_config}], [Config], [${ecore_config_deps}], -# [requirements_ecore_config="ecore-ipc >= 1.6.99 evas >= 1.6.99 eet >= 1.6.99 ${requirements_ecore_config}"]) +# [requirements_ecore_config="ecore-ipc >= 1.7.5 evas >= 1.7.5 eet >= 1.7.5 ${requirements_ecore_config}"]) if false; then BUILD_ECORE_CONFIG_TRUE= @@ -28466,7 +28466,7 @@ fi if test "x$have_ecore_imf_evas" = "xyes"; then : - requirements_ecore_imf_evas="ecore-imf >= 1.6.99 evas >= 1.6.99 ${requirements_ecore_imf_evas}" + requirements_ecore_imf_evas="ecore-imf >= 1.7.5 evas >= 1.7.5 ${requirements_ecore_imf_evas}" fi @@ -28586,7 +28586,7 @@ fi if test "x$have_ecore_input_evas" = "xyes"; then : - requirements_ecore_input_evas="ecore-input >= 1.6.99 evas >= 1.6.99 ${requirements_ecore_input}" + requirements_ecore_input_evas="ecore-input >= 1.7.5 evas >= 1.7.5 ${requirements_ecore_input}" fi @@ -28666,7 +28666,7 @@ fi if test "x$have_ecore_imf_xim" = "xyes"; then : - requirements_ecore_imf_xim="ecore-imf >= 1.6.99 ecore-x >= 1.6.99 ecore-input >= 1.6.99 ${requirements_ecore_imf_xim}" + requirements_ecore_imf_xim="ecore-imf >= 1.7.5 ecore-x >= 1.7.5 ecore-input >= 1.7.5 ${requirements_ecore_imf_xim}" fi @@ -28818,7 +28818,7 @@ fi if test "x$have_ecore_imf_scim" = "xyes"; then : - requirements_ecore_imf_scim="ecore-imf >= 1.6.99 ecore-x >= 1.6.99 ecore-input >= 1.6.99 ${requirements_ecore_imf_scim}" + requirements_ecore_imf_scim="ecore-imf >= 1.7.5 ecore-x >= 1.7.5 ecore-input >= 1.7.5 ${requirements_ecore_imf_scim}" fi @@ -28971,7 +28971,7 @@ fi if test "x$have_ecore_imf_ibus" = "xyes"; then : - requirements_ecore_imf_ibus="ecore-imf >= 1.6.99 ecore-x >= 1.6.99 ecore-input >= 1.6.99 ${requirements_ecore_imf_ibus}" + requirements_ecore_imf_ibus="ecore-imf >= 1.7.5 ecore-x >= 1.7.5 ecore-input >= 1.7.5 ${requirements_ecore_imf_ibus}" fi @@ -29043,7 +29043,7 @@ fi if test "x$have_ecore_x" = "xyes"; then : ecore_x_libs="$ecore_x_libs $x_libs" - requirements_ecore_x="ecore-input >= 1.6.99 ${requirements_ecore_x}" + requirements_ecore_x="ecore-input >= 1.7.5 ${requirements_ecore_x}" fi @@ -29108,7 +29108,7 @@ fi if test "x$have_ecore_win32" = "xyes"; then : ecore_win32_libs="-lole32 -lgdi32" - requirements_ecore_win32="ecore-input >= 1.6.99 ${requirements_ecore_win32}" + requirements_ecore_win32="ecore-input >= 1.7.5 ${requirements_ecore_win32}" fi @@ -29177,7 +29177,7 @@ fi if test "x$have_ecore_cocoa" = "xyes"; then : - requirements_ecore_cocoa="ecore-input >= 1.6.99 ${requirements_ecore_cocoa}" + requirements_ecore_cocoa="ecore-input >= 1.7.5 ${requirements_ecore_cocoa}" fi @@ -29244,7 +29244,7 @@ fi if test "x$have_ecore_sdl" = "xyes"; then : - requirements_ecore_sdl="ecore-input >= 1.6.99 ${requirements_ecore_sdl}" + requirements_ecore_sdl="ecore-input >= 1.7.5 ${requirements_ecore_sdl}" fi @@ -29304,7 +29304,7 @@ fi if test "x$have_ecore_psl1ght" = "xyes"; then : - requirements_ecore_psl1ght="ecore-input >= 1.6.99 ${requirements_ecore_psl1ght}" + requirements_ecore_psl1ght="ecore-input >= 1.7.5 ${requirements_ecore_psl1ght}" fi @@ -30195,7 +30195,7 @@ fi if test "x$have_ecore_wince" = "xyes"; then : - requirements_ecore_wince="ecore-input >= 1.6.99 ${requirements_ecore_wince}" + requirements_ecore_wince="ecore-input >= 1.7.5 ${requirements_ecore_wince}" fi @@ -30264,7 +30264,7 @@ fi if test "x$have_ecore_evas" = "xyes"; then : - requirements_ecore_evas="ecore-input >= 1.6.99 ecore-input-evas >= 1.6.99 evas >= 1.6.99 ${requirements_ecore_evas}" + requirements_ecore_evas="ecore-input >= 1.7.5 ecore-input-evas >= 1.7.5 evas >= 1.7.5 ${requirements_ecore_evas}" fi @@ -30683,7 +30683,7 @@ if test "x$have_ecore_evas_software_x11" = "xyes" -o \ $as_echo "#define BUILD_ECORE_EVAS_X11 1" >>confdefs.h - requirements_ecore_evas="ecore-x >= 1.6.99 ${requirements_ecore_evas}" + requirements_ecore_evas="ecore-x >= 1.7.5 ${requirements_ecore_evas}" fi # ecore_evas_win32 @@ -30961,19 +30961,19 @@ if test "x${have_ecore_evas_software_gdi}" = "xyes" -o \ $as_echo "#define BUILD_ECORE_EVAS_WIN32 1" >>confdefs.h - requirements_ecore_evas="ecore-win32 >= 1.6.99 ${requirements_ecore_evas}" + requirements_ecore_evas="ecore-win32 >= 1.7.5 ${requirements_ecore_evas}" fi # ecore_evas_software_sdl have_ecore_evas_software_sdl="no" if test "x${have_ecore_sdl}" = "xyes"; then - requirements_ecore_evas="ecore-sdl >= 1.6.99 ${requirements_ecore_evas}" + requirements_ecore_evas="ecore-sdl >= 1.7.5 ${requirements_ecore_evas}" have_ecore_evas_software_sdl="yes" $as_echo "#define BUILD_ECORE_EVAS_SOFTWARE_SDL 1" >>confdefs.h - requirements_ecore_evas="ecore-sdl >= 1.6.99 ${requirements_ecore_evas}" + requirements_ecore_evas="ecore-sdl >= 1.7.5 ${requirements_ecore_evas}" fi # ecore_evas_gl_sdl @@ -31024,7 +31024,7 @@ $as_echo_n "checking whether ecore_evas OpenGL SDL support is built... " >&6; } $as_echo "$have_ecore_evas_opengl_sdl" >&6; } if test "x$have_ecore_evas_opengl_sdl" = "xyes"; then : - requirements_ecore_evas="ecore-sdl >= 1.6.99 ${requirements_ecore_evas}" + requirements_ecore_evas="ecore-sdl >= 1.7.5 ${requirements_ecore_evas}" fi @@ -31079,7 +31079,7 @@ $as_echo_n "checking whether ecore_evas OpenGL Cocoa support is built... " >&6; $as_echo "$have_ecore_evas_opengl_cocoa" >&6; } if test "x$have_ecore_evas_opengl_cocoa" = "xyes"; then : - requirements_ecore_evas="ecore-cocoa >= 1.6.99 ${requirements_ecore_evas}" + requirements_ecore_evas="ecore-cocoa >= 1.7.5 ${requirements_ecore_evas}" fi @@ -31134,7 +31134,7 @@ $as_echo_n "checking whether ecore_evas DirectFB support is built... " >&6; } $as_echo "$have_ecore_evas_directfb" >&6; } if test "x$have_ecore_evas_directfb" = "xyes"; then : - requirements_ecore_evas="ecore-directfb >= 1.6.99 ${requirements_ecore_evas}" + requirements_ecore_evas="ecore-directfb >= 1.7.5 ${requirements_ecore_evas}" fi @@ -31189,7 +31189,7 @@ $as_echo_n "checking whether ecore_evas Linux Framebuffer support is built... " $as_echo "$have_ecore_evas_fb" >&6; } if test "x$have_ecore_evas_fb" = "xyes"; then : - requirements_ecore_evas="ecore-fb >= 1.6.99 ${requirements_ecore_evas}" + requirements_ecore_evas="ecore-fb >= 1.7.5 ${requirements_ecore_evas}" fi @@ -31244,7 +31244,7 @@ $as_echo_n "checking whether ecore_evas 16 bpp Software Windows CE support is bu $as_echo "$have_ecore_evas_software_16_wince" >&6; } if test "x$have_ecore_evas_software_16_wince" = "xyes"; then : - requirements_ecore_evas="ecore-wince >= 1.6.99 ${requirements_ecore_evas}" + requirements_ecore_evas="ecore-wince >= 1.7.5 ${requirements_ecore_evas}" fi @@ -31373,7 +31373,7 @@ $as_echo_n "checking whether ecore_evas PSL1GHT support is built... " >&6; } $as_echo "$have_ecore_evas_psl1ght" >&6; } if test "x$have_ecore_evas_psl1ght" = "xyes"; then : - requirements_ecore_evas="ecore-psl1ght >= 1.6.99 ${requirements_ecore_evas}" + requirements_ecore_evas="ecore-psl1ght >= 1.7.5 ${requirements_ecore_evas}" fi @@ -31521,7 +31521,7 @@ fi if test "x${have_ecore_wayland}" = "xyes" ; then - requirements_ecore_wayland="ecore-input >= 1.6.99 wayland-client wayland-cursor xkbcommon ${requirements_ecore_wayland}" + requirements_ecore_wayland="ecore-input >= 1.7.5 wayland-client wayland-cursor xkbcommon ${requirements_ecore_wayland}" fi @@ -32743,7 +32743,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 ecore $as_me 1.7.4, which was +This file was extended by ecore $as_me 1.7.5, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -32809,7 +32809,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="\\ -ecore config.status 1.7.4 +ecore config.status 1.7.5 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index c5a4326..b4ec95b 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [1]) m4_define([v_min], [7]) -m4_define([v_mic], [4]) +m4_define([v_mic], [5]) m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n' | sed 's/Unversioneddirectory/0/' | tr -d '\n'])) m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) ##-- When released, remove the dnl on the below line @@ -422,7 +422,7 @@ fi case "$host_os" in mingw*) - PKG_CHECK_MODULES([EVIL], [evil >= 1.6.99]) + PKG_CHECK_MODULES([EVIL], [evil >= 1.7.5]) AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if Evil library is installed]) requirements_ecore="evil ${requirements_ecore}" requirements_ecore_evas="evil ${requirements_ecore_evas}" @@ -542,26 +542,26 @@ AC_SUBST(rt_libs) # Eina library -PKG_CHECK_MODULES(EINA, [eina >= 1.6.99]) +PKG_CHECK_MODULES(EINA, [eina >= 1.7.5]) #FIXME check all the requirements when the eina move will be finished -requirements_ecore="eina >= 1.6.99 ${requirements_ecore}" -requirements_ecore_con="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_con}" -#requirements_ecore_config="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_config}" -requirements_ecore_directfb="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_directfb}" -requirements_ecore_evas="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_evas}" -requirements_ecore_fb="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_fb}" -requirements_ecore_file="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_file}" -requirements_ecore_imf="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_imf}" -requirements_ecore_imf_evas="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_imf_evas}" -requirements_ecore_input="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_input}" -requirements_ecore_input_evas="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_input_evas}" -requirements_ecore_ipc="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_ipc}" -requirements_ecore_cocoa="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_cocoa}" -requirements_ecore_sdl="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_sdl}" -requirements_ecore_psl1ght="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_psl1ght}" -requirements_ecore_win32="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_win32}" -requirements_ecore_wince="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_wince}" -requirements_ecore_x="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_x}" +requirements_ecore="eina >= 1.7.5 ${requirements_ecore}" +requirements_ecore_con="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_con}" +#requirements_ecore_config="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_config}" +requirements_ecore_directfb="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_directfb}" +requirements_ecore_evas="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_evas}" +requirements_ecore_fb="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_fb}" +requirements_ecore_file="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_file}" +requirements_ecore_imf="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_imf}" +requirements_ecore_imf_evas="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_imf_evas}" +requirements_ecore_input="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_input}" +requirements_ecore_input_evas="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_input_evas}" +requirements_ecore_ipc="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_ipc}" +requirements_ecore_cocoa="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_cocoa}" +requirements_ecore_sdl="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_sdl}" +requirements_ecore_psl1ght="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_psl1ght}" +requirements_ecore_win32="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_win32}" +requirements_ecore_wince="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_wince}" +requirements_ecore_x="ecore >= 1.7.5 eina >= 1.7.5 ${requirements_ecore_x}" # glib support (main loop integration) @@ -623,7 +623,7 @@ PKG_CHECK_MODULES([DIRECTFB], # Eet library (ecore_config) #PKG_CHECK_MODULES([EET], -# [eet >= 1.6.99], +# [eet >= 1.7.5], # [have_eet="yes"], # [have_eet="no"]) @@ -1203,7 +1203,7 @@ AM_CONDITIONAL(BUILD_ECORE_X_XCB, test $have_ecore_x_xcb = yes) # Evas library (ecore_config, ecore_input_evas, ecore_imf_evas and ecore_evas) -PKG_CHECK_MODULES([EVAS], [evas >= 1.6.99], +PKG_CHECK_MODULES([EVAS], [evas >= 1.7.5], [have_evas="yes"], [have_evas="no"]) @@ -1555,8 +1555,8 @@ AM_CONDITIONAL([HAVE_CARES], [test "x${have_cares}" = "xyes"]) # ecore_ipc ECORE_CHECK_MODULE([ipc], [${want_ecore_ipc}], [Ipc], [${have_ecore_con}], [ - requirements_ecore_ipc="ecore-con >= 1.6.99 ${requirements_ecore_ipc}" - requirements_ecore_evas="ecore-ipc >= 1.6.99 ${requirements_ecore_evas}" + requirements_ecore_ipc="ecore-con >= 1.7.5 ${requirements_ecore_ipc}" + requirements_ecore_evas="ecore-ipc >= 1.7.5 ${requirements_ecore_evas}" ]) # ecore_file @@ -1571,7 +1571,7 @@ if test "x${have_ecore_file}" = "xyes" ; then ECORE_CHECK_NOTIFY_WIN32([${want_notify_win32}], [have_notify_win32="yes"], [have_notify_win32="no"]) if test "x${have_ecore_con}" = "xyes" ; then - requirements_ecore_file="ecore-con >= 1.6.99 ${requirements_ecore_file}" + requirements_ecore_file="ecore-con >= 1.7.5 ${requirements_ecore_file}" else ECORE_CHECK_CURL([${want_curl}], [ @@ -1590,7 +1590,7 @@ fi #fi #ECORE_CHECK_MODULE([config], [${want_ecore_config}], [Config], [${ecore_config_deps}], -# [requirements_ecore_config="ecore-ipc >= 1.6.99 evas >= 1.6.99 eet >= 1.6.99 ${requirements_ecore_config}"]) +# [requirements_ecore_config="ecore-ipc >= 1.7.5 evas >= 1.7.5 eet >= 1.7.5 ${requirements_ecore_config}"]) AM_CONDITIONAL(BUILD_ECORE_CONFIG, false) @@ -1606,12 +1606,12 @@ if test "x${have_ecore_imf}" = "xyes" -a "x${have_evas}" = "xyes" ; then fi ECORE_CHECK_MODULE([imf-evas], [${want_ecore_imf}], [Imf_Evas], [${ecore_imf_evas_deps}], - [requirements_ecore_imf_evas="ecore-imf >= 1.6.99 evas >= 1.6.99 ${requirements_ecore_imf_evas}"]) + [requirements_ecore_imf_evas="ecore-imf >= 1.7.5 evas >= 1.7.5 ${requirements_ecore_imf_evas}"]) # ecore_input{_evas} ECORE_CHECK_MODULE([input], [${want_ecore_input}], [Input]) ECORE_CHECK_MODULE([input-evas], [${want_ecore_input}], [Input_Evas], [${have_evas}], - [requirements_ecore_input_evas="ecore-input >= 1.6.99 evas >= 1.6.99 ${requirements_ecore_input}"]) + [requirements_ecore_input_evas="ecore-input >= 1.7.5 evas >= 1.7.5 ${requirements_ecore_input}"]) # ecore_imf_xim AM_CONDITIONAL(BUILD_ECORE_IMF_XIM, false) @@ -1625,7 +1625,7 @@ if test "x${have_ecore_imf}" = "xyes" \ fi ECORE_CHECK_MODULE([imf-xim], [${want_ecore_imf}], [Imf_XIM], [${ecore_imf_xim_deps}], - [requirements_ecore_imf_xim="ecore-imf >= 1.6.99 ecore-x >= 1.6.99 ecore-input >= 1.6.99 ${requirements_ecore_imf_xim}"]) + [requirements_ecore_imf_xim="ecore-imf >= 1.7.5 ecore-x >= 1.7.5 ecore-input >= 1.7.5 ${requirements_ecore_imf_xim}"]) # ecore_imf_scim PKG_CHECK_MODULES([SCIM], [scim], [have_scim="yes"], [have_scim="no"]) @@ -1641,7 +1641,7 @@ if test "x${have_ecore_imf}" = "xyes" \ fi ECORE_CHECK_MODULE([imf-scim], [${want_ecore_imf}], [Imf_SCIM], [${ecore_imf_scim_deps}], - [requirements_ecore_imf_scim="ecore-imf >= 1.6.99 ecore-x >= 1.6.99 ecore-input >= 1.6.99 ${requirements_ecore_imf_scim}"]) + [requirements_ecore_imf_scim="ecore-imf >= 1.7.5 ecore-x >= 1.7.5 ecore-input >= 1.7.5 ${requirements_ecore_imf_scim}"]) # ecore_imf_ibus PKG_CHECK_MODULES([IBUS], [ibus-1.0 >= 1.4], [have_ibus="yes"], [have_ibus="no"]) @@ -1658,7 +1658,7 @@ if test "x${have_ecore_imf}" = "xyes" \ fi ECORE_CHECK_MODULE([imf-ibus], [${want_ecore_imf}], [Imf_IBUS], [${ecore_imf_ibus_deps}], - [requirements_ecore_imf_ibus="ecore-imf >= 1.6.99 ecore-x >= 1.6.99 ecore-input >= 1.6.99 ${requirements_ecore_imf_ibus}"]) + [requirements_ecore_imf_ibus="ecore-imf >= 1.7.5 ecore-x >= 1.7.5 ecore-input >= 1.7.5 ${requirements_ecore_imf_ibus}"]) ## Graphic systems @@ -1673,7 +1673,7 @@ fi ECORE_CHECK_MODULE([x], [${want_ecore_x}], [X], [${ecore_x_deps}], [ ecore_x_libs="$ecore_x_libs $x_libs" - requirements_ecore_x="ecore-input >= 1.6.99 ${requirements_ecore_x}" + requirements_ecore_x="ecore-input >= 1.7.5 ${requirements_ecore_x}" ]) # ecore_win32 @@ -1681,7 +1681,7 @@ ECORE_CHECK_MODULE([x], [${want_ecore_x}], [X], [${ecore_x_deps}], ECORE_CHECK_MODULE([win32], [${want_ecore_win32}], [Win32], [${have_ecore_input}], [ ecore_win32_libs="-lole32 -lgdi32" - requirements_ecore_win32="ecore-input >= 1.6.99 ${requirements_ecore_win32}" + requirements_ecore_win32="ecore-input >= 1.7.5 ${requirements_ecore_win32}" ]) AC_SUBST(ecore_win32_libs) @@ -1693,7 +1693,7 @@ if test "x${have_ecore_input}" = "xyes" -a "x${have_cocoa}" = "xyes" ; then fi ECORE_CHECK_MODULE([cocoa], [${want_ecore_cocoa}], [Cocoa], [${ecore_cocoa_deps}], - [requirements_ecore_cocoa="ecore-input >= 1.6.99 ${requirements_ecore_cocoa}"]) + [requirements_ecore_cocoa="ecore-input >= 1.7.5 ${requirements_ecore_cocoa}"]) # ecore_sdl @@ -1703,10 +1703,10 @@ if test "x${have_sdl}" = "xyes" -a "x${have_ecore_input}" = "xyes" ; then fi ECORE_CHECK_MODULE([sdl], [${want_ecore_sdl}], [Sdl], [${ecore_sdl_deps}], - [requirements_ecore_sdl="ecore-input >= 1.6.99 ${requirements_ecore_sdl}"]) + [requirements_ecore_sdl="ecore-input >= 1.7.5 ${requirements_ecore_sdl}"]) ECORE_CHECK_MODULE([psl1ght], [${want_ecore_psl1ght}], [psl1ght], [${ecore_psl1ght_deps}], - [requirements_ecore_psl1ght="ecore-input >= 1.6.99 ${requirements_ecore_psl1ght}"]) + [requirements_ecore_psl1ght="ecore-input >= 1.7.5 ${requirements_ecore_psl1ght}"]) # ecore_fb ECORE_CHECK_MODULE([fb], [${want_ecore_fb}], [FB], [$have_fb]) @@ -1728,7 +1728,7 @@ ECORE_CHECK_MODULE([directfb], [${want_ecore_directfb}], [DirectFB], [${have_dir # ecore_wince ECORE_CHECK_MODULE([wince], [${want_ecore_wince}], [WinCE], [${have_ecore_input}], - [requirements_ecore_wince="ecore-input >= 1.6.99 ${requirements_ecore_wince}"]) + [requirements_ecore_wince="ecore-input >= 1.7.5 ${requirements_ecore_wince}"]) ## Ecore Evas @@ -1740,7 +1740,7 @@ if test "x${have_evas}" = "xyes" && test "x${have_ecore_input}" = "xyes" && test fi ECORE_CHECK_MODULE([evas], [${want_ecore_evas}], [Evas], [${ecore_evas_deps}], - [requirements_ecore_evas="ecore-input >= 1.6.99 ecore-input-evas >= 1.6.99 evas >= 1.6.99 ${requirements_ecore_evas}"]) + [requirements_ecore_evas="ecore-input >= 1.7.5 ecore-input-evas >= 1.7.5 evas >= 1.7.5 ${requirements_ecore_evas}"]) # ecore_evas_buffer @@ -1830,7 +1830,7 @@ if test "x$have_ecore_evas_software_x11" = "xyes" -o \ "x$have_ecore_evas_software_16_x11" = "xyes" -o \ "x$have_ecore_evas_software_xcb" = "xyes"; then AC_DEFINE(BUILD_ECORE_EVAS_X11, 1, [Support for X Window Engines in Ecore_Evas]) - requirements_ecore_evas="ecore-x >= 1.6.99 ${requirements_ecore_evas}" + requirements_ecore_evas="ecore-x >= 1.7.5 ${requirements_ecore_evas}" fi # ecore_evas_win32 @@ -1866,17 +1866,17 @@ if test "x${have_ecore_evas_software_gdi}" = "xyes" -o \ "x${have_ecore_evas_opengl_glew}" = "xyes" -o \ "x${have_ecore_evas_software_16_ddraw}" = "xyes" ; then AC_DEFINE(BUILD_ECORE_EVAS_WIN32, 1, [Support for Win32 Engine in Ecore_Evas]) - requirements_ecore_evas="ecore-win32 >= 1.6.99 ${requirements_ecore_evas}" + requirements_ecore_evas="ecore-win32 >= 1.7.5 ${requirements_ecore_evas}" fi # ecore_evas_software_sdl have_ecore_evas_software_sdl="no" if test "x${have_ecore_sdl}" = "xyes"; then - requirements_ecore_evas="ecore-sdl >= 1.6.99 ${requirements_ecore_evas}" + requirements_ecore_evas="ecore-sdl >= 1.7.5 ${requirements_ecore_evas}" have_ecore_evas_software_sdl="yes" AC_DEFINE(BUILD_ECORE_EVAS_SOFTWARE_SDL, 1, [Support for Software SDL Engine in Ecore_Evas]) - requirements_ecore_evas="ecore-sdl >= 1.6.99 ${requirements_ecore_evas}" + requirements_ecore_evas="ecore-sdl >= 1.7.5 ${requirements_ecore_evas}" fi # ecore_evas_gl_sdl @@ -1885,7 +1885,7 @@ ECORE_EVAS_CHECK_MODULE([opengl-sdl], [${want_ecore_evas_gl_sdl}], [OpenGL SDL], [${have_ecore_sdl}], - [requirements_ecore_evas="ecore-sdl >= 1.6.99 ${requirements_ecore_evas}"]) + [requirements_ecore_evas="ecore-sdl >= 1.7.5 ${requirements_ecore_evas}"]) # ecore_evas_cocoa @@ -1893,7 +1893,7 @@ ECORE_EVAS_CHECK_MODULE([opengl-cocoa], [${want_ecore_evas_gl_cocoa}], [OpenGL Cocoa], [${have_ecore_cocoa}], - [requirements_ecore_evas="ecore-cocoa >= 1.6.99 ${requirements_ecore_evas}"]) + [requirements_ecore_evas="ecore-cocoa >= 1.7.5 ${requirements_ecore_evas}"]) # ecore_evas_directfb @@ -1901,7 +1901,7 @@ ECORE_EVAS_CHECK_MODULE([directfb], [${want_ecore_evas_directfb}], [DirectFB], [${have_ecore_directfb}], - [requirements_ecore_evas="ecore-directfb >= 1.6.99 ${requirements_ecore_evas}"]) + [requirements_ecore_evas="ecore-directfb >= 1.7.5 ${requirements_ecore_evas}"]) # ecore_evas_fb @@ -1909,7 +1909,7 @@ ECORE_EVAS_CHECK_MODULE([fb], [${want_ecore_evas_fb}], [Linux Framebuffer], [${have_ecore_fb}], - [requirements_ecore_evas="ecore-fb >= 1.6.99 ${requirements_ecore_evas}"]) + [requirements_ecore_evas="ecore-fb >= 1.7.5 ${requirements_ecore_evas}"]) # ecore_evas_wince @@ -1917,7 +1917,7 @@ ECORE_EVAS_CHECK_MODULE([software-16-wince], [${want_ecore_evas_software_16_wince}], [16 bpp Software Windows CE], [${have_ecore_wince}], - [requirements_ecore_evas="ecore-wince >= 1.6.99 ${requirements_ecore_evas}"]) + [requirements_ecore_evas="ecore-wince >= 1.7.5 ${requirements_ecore_evas}"]) # ecore_evas_ews @@ -1950,7 +1950,7 @@ ECORE_EVAS_CHECK_MODULE([psl1ght], [${want_ecore_evas_psl1ght}], [PSL1GHT], [${have_ecore_psl1ght}], - [requirements_ecore_evas="ecore-psl1ght >= 1.6.99 ${requirements_ecore_evas}"]) + [requirements_ecore_evas="ecore-psl1ght >= 1.7.5 ${requirements_ecore_evas}"]) ### WAYLAND @@ -1965,7 +1965,7 @@ fi ECORE_CHECK_MODULE([wayland], [${want_ecore_wayland}], [Wayland], [${ecore_wayland_deps}]) if test "x${have_ecore_wayland}" = "xyes" ; then - requirements_ecore_wayland="ecore-input >= 1.6.99 wayland-client wayland-cursor xkbcommon ${requirements_ecore_wayland}" + requirements_ecore_wayland="ecore-input >= 1.7.5 wayland-client wayland-cursor xkbcommon ${requirements_ecore_wayland}" fi ECORE_EVAS_CHECK_MODULE_FULL([wayland-shm], [wayland-shm], diff --git a/ecore.spec b/ecore.spec index b75385b..31a15ec 100644 --- a/ecore.spec +++ b/ecore.spec @@ -39,7 +39,7 @@ Summary: Enlightened Core X interface library Name: ecore -Version: 1.7.4 +Version: 1.7.5 Release: %{_rel} License: BSD Group: User Interface/X diff --git a/po/LINGUAS b/po/LINGUAS index 3665c31..8d8c464 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ -cs de el fr it nl pt sl +cs de el fr it nl pt sl zh_CN diff --git a/po/cs.gmo b/po/cs.gmo index 1f4d8770c9ed7ba76a691853923b1e7b6dc3111a..99d7d5f4c6ab8ba4f8117b875cb4c525d282e32c 100644 GIT binary patch delta 29 lcmdlZzDIn+H8ufbT?0d10}};9BP$~VT?3=d&)BZ9004$_2)qCQ delta 29 lcmdlZzDIn+H8uewT|*;XBSQrPV=H3|T?32F&)BZ9004&T2+IHf diff --git a/po/cs.po b/po/cs.po index 3f5fcde..64be8c8 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ecore\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-21 03:38-0800\n" +"POT-Creation-Date: 2013-01-04 12:20-0200\n" "PO-Revision-Date: 2011-10-23 01:28+0100\n" "Last-Translator: Daniel Kolesa \n" "Language-Team: Czech \n" diff --git a/po/de.gmo b/po/de.gmo index ae4d7c1e12667718326acbcb136aae559624f820..8f412e039d09a18fde253245140cb489b83037d7 100644 GIT binary patch delta 29 lcmdlfzEga|BQ^nJT?0d10}};9BP$~VT?3=dpV*GG004&l2)_UT delta 29 lcmdlfzEga|BQ^meT|*;XBSQrPV=H3|T?32FpV*GG004(|2+jZi diff --git a/po/de.po b/po/de.po index 5280a2f..1977de3 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ecore 0.9.9.063-2\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-21 03:38-0800\n" +"POT-Creation-Date: 2013-01-04 12:20-0200\n" "PO-Revision-Date: 2010-01-03 21:52+GMT\n" "Last-Translator: Fabian Nowak \n" "Language-Team: German \n" diff --git a/po/ecore.pot b/po/ecore.pot index 022ad5f..433ef11 100644 --- a/po/ecore.pot +++ b/po/ecore.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: ecore 1.7.4\n" +"Project-Id-Version: ecore 1.7.5\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-21 03:38-0800\n" +"POT-Creation-Date: 2013-01-04 12:20-0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/el.gmo b/po/el.gmo index 16ab0bf3cad609c69e4fc2ffe8c5b8e545e2538f..73cb18cb7d85910ae89e4c51603141f5b64ab422 100644 GIT binary patch delta 29 lcmbO)JzsjmBsKwKT?0d10}};9BP$~VT?3=di`f3M0RVZ^2rB>p delta 29 lcmbO)JzsjmBsKvfT|*;XBSQrPV=H3|T?32Fi`f3M0RVbS2s!`& diff --git a/po/el.po b/po/el.po index 7ed8c41..18f1a6b 100644 --- a/po/el.po +++ b/po/el.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Ecore\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-21 03:38-0800\n" +"POT-Creation-Date: 2013-01-04 12:20-0200\n" "PO-Revision-Date: 2011-11-20 22:42+0200\n" "Last-Translator: George Rizopoulos \n" "Language-Team: Greek\n" diff --git a/po/fr.gmo b/po/fr.gmo index eed680ba20c37a34ebcf5e99d5bae3381edc831f..0170e2cd2fbc11ebbafc37340ad1a39642639f37 100644 GIT binary patch delta 29 lcmew_@n2%YH8ufbT?0d10}};9BP$~VT?3=d&)8\n" "Language-Team: Enlightenment French Team \n" diff --git a/po/it.gmo b/po/it.gmo index 3e29433e9d117c71c9f8740c86c34021734e879c..8d6f56b072cf553d812e1242cc95b30af020b49e 100644 GIT binary patch delta 29 kcmew?_E~JhH8ufbT?0d10}};9BP$~VT?3=d&)9ld0Fko@-v9sr delta 29 kcmew?_E~JhH8uewT|*;XBSQrPV=H3|T?32F&)9ld0Fo;R?f?J) diff --git a/po/it.po b/po/it.po index 1cbe62b..be836d5 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Ecore\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-21 03:38-0800\n" +"POT-Creation-Date: 2013-01-04 12:20-0200\n" "PO-Revision-Date: 2009-10-27 19:36+0100\n" "Last-Translator: quaker66 \n" "Language-Team: none\n" diff --git a/po/nl.gmo b/po/nl.gmo index b84cc0ee04f75e35a5cf0cf2a71a7da74a722de7..50c145040d59ff592cf988afa7ea7aaf181a25fa 100644 GIT binary patch delta 29 lcmZ1^zDRt-H8ufbT?0d10}};9BP$~VT?3=d&)D{`004lG2yOrX delta 29 lcmZ1^zDRt-H8uewT|*;XBSQrPV=H3|T?32F&)D{`004mp2z>wm diff --git a/po/nl.po b/po/nl.po index 4ee46f0..b9f0200 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Ecore\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-21 03:38-0800\n" +"POT-Creation-Date: 2013-01-04 12:20-0200\n" "PO-Revision-Date: 2011-09-03 15:48+0100\n" "Last-Translator: Heimen Stoffels \n" "Language-Team: \n" diff --git a/po/pt.gmo b/po/pt.gmo index f7375785d333bdea7e937abe8a54fafd5244b78b..2c1571c93694a20800e1122891bfc6f4bd96532d 100644 GIT binary patch delta 29 lcmca6eocJCH8ufbT?0d10}};9BP$~VT?3=d&)7b&004|v2?_uJ delta 29 lcmca6eocJCH8uewT|*;XBSQrPV=H3|T?32F&)7b&004~72^jzY diff --git a/po/pt.po b/po/pt.po index d0fdca8..452cd5a 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ecore\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-21 03:38-0800\n" +"POT-Creation-Date: 2013-01-04 12:20-0200\n" "PO-Revision-Date: 2012-08-23 00:30+0100\n" "Last-Translator: Sérgio Marques \n" "Language-Team: \n" diff --git a/po/sl.gmo b/po/sl.gmo index 5d78fea872c8a730edaad78f1bc6d275a2e44161..f12fc7614d8c5f16ab44f81c4af8ffa36ecf692f 100644 GIT binary patch delta 29 lcmX>ueq4OREj9sTT?0d10}};9BP$~VT?3=duh{Og004ueq4OREj9roT|*;XBSQrPV=H3|T?32Fuh{Og004>62=D*^ diff --git a/po/sl.po b/po/sl.po index 08293d2..e46c2be 100644 --- a/po/sl.po +++ b/po/sl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ecore 1.0\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-21 03:38-0800\n" +"POT-Creation-Date: 2013-01-04 12:20-0200\n" "PO-Revision-Date: 2011-02-24 16:54+0100\n" "Last-Translator: r1to \n" "Language-Team: Slovenian \n" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo new file mode 100644 index 0000000000000000000000000000000000000000..93c9bbc7a8c4b34708a6cb7235f19dcdc354bec6 GIT binary patch literal 2828 zcma)+TWl0n7{^CMk;NN$K~eF5T?^J(x2sLaf(9)Z5fD-eF%hHF*|WQ2XJ^(qGlgPI zS|EXPNl|GKtU$R4ASt@0FwoSPxDE7l99f?|@Umb%FfjVBZQ(!MOuQ z!Oy`t;8E~7@F#FKI08NcPMYjb!5VNkNP6c$dhaSoe*OtQ08YQp_hS}# zKlU{N>p+qxz?tAeuohecJ`H{b(z`t%`E?e24E!0K1&)AEf&T=YiO1id?0^ z2XX!jf~LIu4$}U5z`wyqu%7~FC|@%J&H6K&-6E9Hv%G#nH&<&g&U&kRiJ ze~GQ(oXJr&773PeRA3zy>;p4zYo;MSj7W`HQ&YJ}GO5wbw_92!YbT{8Jgqpojl-o) zO{5^3KY%|JSna6tC@^Q&Fy)PYONJY z2IuRzB~a$1q?(SNVuoq^iSsK0Cp5z^gX%Q_n;R8#V{DyQnIMabMel`rhLdYS+S8_$ zQ*0I$5hsTt&);5J07E%Oufx4bMR zhv{P+P0u4uJa1aIyi#Pel>C;H5puJcWZcl{H^U9;RyoDnxV~7|ge_vibS#x4R~a5N zxE)!&s#$KdxI)>Hmnb$8n~2xHD#z>P_-m{_kxazpcp@H$qTIyWG%8(HFCo__snglsrh3%Nwz8bQR91&mCIHxt)`+r7LPQV$QOe3o6Y7M z?N{=;q8SUBnx)^R{rcMGx8(&@J#sP4EqN)v9w~H7k}YV_YkP|14aM4(%?U zIa=!LFCEzG4j(D)_}=T<%7pS`C)~mAo8`rQhl@SiaoM*&(y>_@yIbr%RqWm~dg&WP zQS2FnEHZ(xeBx;F;2wAX$^VeM9fg}Ez9sJ~Rq5?0f7dxW)G<1A$~SVO&^gXXs7l|d zJL$sP(xKzwji`E~u*b?BD9{I81F*t*$Q|cYtiU{Rc)bbd7IHFV->1 ySkU2dao0B7p$omI!!uNdEDddO2lpZX^q?o9SkCn!oO1uA(r`a+R=(WsN&W>9g0^h{ literal 0 HcmV?d00001 diff --git a/po/zh_CN.po b/po/zh_CN.po new file mode 100644 index 0000000..9e94a68 --- /dev/null +++ b/po/zh_CN.po @@ -0,0 +1,174 @@ +# Chinese translations for ecore package +# ecore 软件包的简体中文翻译. +# This file is put in the public domain. +# Aron Xu , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: ecore\n" +"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2013-01-04 12:20-0200\n" +"PO-Revision-Date: 2012-12-22 05:52+0800\n" +"Last-Translator: Aron Xu \n" +"Language-Team: Chinese (simplified)\n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/lib/ecore/ecore_getopt.c:104 +msgid "Version:" +msgstr "版本：" + +#: src/lib/ecore/ecore_getopt.c:113 +msgid "Usage:" +msgstr "用法：" + +#: src/lib/ecore/ecore_getopt.c:118 +#, c-format +msgid "%s [options]\n" +msgstr "%s [选项]\n" + +#: src/lib/ecore/ecore_getopt.c:273 +msgid "Copyright:" +msgstr "版权信息：" + +#: src/lib/ecore/ecore_getopt.c:285 +msgid "License:" +msgstr "许可证：" + +#: src/lib/ecore/ecore_getopt.c:466 +msgid "Type: " +msgstr "类型：" + +#: src/lib/ecore/ecore_getopt.c:542 +msgid "Default: " +msgstr "默认：" + +#: src/lib/ecore/ecore_getopt.c:569 +msgid "Choices: " +msgstr "可选项：" + +#: src/lib/ecore/ecore_getopt.c:670 +msgid "Options:\n" +msgstr "选项：\n" + +#: src/lib/ecore/ecore_getopt.c:797 +#, c-format +msgid "ERROR: unknown option --%s.\n" +msgstr "错误：未知选项 --%s。\n" + +#: src/lib/ecore/ecore_getopt.c:799 +#, c-format +msgid "ERROR: unknown option -%c.\n" +msgstr "错误：未知选项 -%c。\n" + +#: src/lib/ecore/ecore_getopt.c:857 +msgid "ERROR: " +msgstr "错误：" + +#: src/lib/ecore/ecore_getopt.c:940 src/lib/ecore/ecore_getopt.c:1077 +#: src/lib/ecore/ecore_getopt.c:1093 src/lib/ecore/ecore_getopt.c:1108 +#: src/lib/ecore/ecore_getopt.c:1125 src/lib/ecore/ecore_getopt.c:1172 +#: src/lib/ecore/ecore_getopt.c:1292 src/lib/ecore/ecore_getopt.c:1333 +msgid "value has no pointer set.\n" +msgstr "值没有设置指针。\n" + +#: src/lib/ecore/ecore_getopt.c:972 src/lib/ecore/ecore_getopt.c:1192 +#, c-format +msgid "unknown boolean value %s.\n" +msgstr "未知的布尔值 %s。\n" + +#: src/lib/ecore/ecore_getopt.c:1023 src/lib/ecore/ecore_getopt.c:1280 +#, c-format +msgid "invalid number format %s\n" +msgstr "无效的数字格式 %s\n" + +#: src/lib/ecore/ecore_getopt.c:1138 +#, c-format +msgid "invalid choice \"%s\". Valid values are: " +msgstr "无效选项 %s。有效的值有：" + +#: src/lib/ecore/ecore_getopt.c:1166 +msgid "missing parameter to append.\n" +msgstr "缺少要附加的参数。\n" + +#: src/lib/ecore/ecore_getopt.c:1270 +msgid "could not parse value.\n" +msgstr "无法解析值。\n" + +#: src/lib/ecore/ecore_getopt.c:1327 +msgid "missing parameter.\n" +msgstr "缺少参数。\n" + +#: src/lib/ecore/ecore_getopt.c:1340 +msgid "missing callback function!\n" +msgstr "缺少 callback 功能！\n" + +#: src/lib/ecore/ecore_getopt.c:1369 +msgid "no version was defined.\n" +msgstr "未指定版本。\n" + +#: src/lib/ecore/ecore_getopt.c:1386 +msgid "no copyright was defined.\n" +msgstr "未定义版权信息。\n" + +#: src/lib/ecore/ecore_getopt.c:1403 +msgid "no license was defined.\n" +msgstr "未定义许可证。\n" + +#: src/lib/ecore/ecore_getopt.c:1478 +#, c-format +msgid "ERROR: unknown option --%s, ignored.\n" +msgstr "错误：未知选项 --%s，忽略。\n" + +#: src/lib/ecore/ecore_getopt.c:1511 +#, c-format +msgid "ERROR: option --%s requires an argument!\n" +msgstr "错误：选项 --%s 需要一个参数！\n" + +#: src/lib/ecore/ecore_getopt.c:1553 +#, c-format +msgid "ERROR: unknown option -%c, ignored.\n" +msgstr "错误：未知选项 -%c，忽略。\n" + +#: src/lib/ecore/ecore_getopt.c:1591 +#, c-format +msgid "ERROR: option -%c requires an argument!\n" +msgstr "错误：选项 -%c 需要一个参数！\n" + +#: src/lib/ecore/ecore_getopt.c:1802 +msgid "ERROR: no parser provided.\n" +msgstr "错误：未提供解析器。\n" + +#: src/lib/ecore/ecore_getopt.c:1807 +msgid "ERROR: no values provided.\n" +msgstr "错误：未提供值。\n" + +#: src/lib/ecore/ecore_getopt.c:1816 +msgid "ERROR: no arguments provided.\n" +msgstr "错误：未提供参数。\n" + +#: src/lib/ecore/ecore_getopt.c:1842 +msgid "ERROR: invalid options found." +msgstr "错误：无效的选项。" + +#: src/lib/ecore/ecore_getopt.c:1848 +#, c-format +msgid " See --%s.\n" +msgstr " 参看 --%s\n" + +#: src/lib/ecore/ecore_getopt.c:1850 +#, c-format +msgid " See -%c.\n" +msgstr " 参看 -%c\n" + +#: src/lib/ecore/ecore_getopt.c:1896 +#, c-format +msgid "ERROR: incorrect geometry value '%s'\n" +msgstr "错误：不正确的形状 %s\n" + +#: src/lib/ecore/ecore_getopt.c:1928 +#, c-format +msgid "ERROR: incorrect size value '%s'\n" +msgstr "错误：不正确的大小 %s\n" diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h index 9d8041f..e949ed2 100644 --- a/src/lib/ecore/Ecore.h +++ b/src/lib/ecore/Ecore.h @@ -8,8 +8,8 @@ @mainpage Ecore - @version 1.7 - @date 2000-2012 + @version 1.7.5 + @date 2000-2013 Please see the @ref authors page for contact details. diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c index 6d19cb9..ea4c033 100644 --- a/src/lib/ecore_con/ecore_con.c +++ b/src/lib/ecore_con/ecore_con.c @@ -2387,15 +2387,23 @@ _ecore_con_event_client_add_free(Ecore_Con_Server *svr, e = ev; if (e->client) { + Eina_Bool svrfreed = EINA_FALSE; + e->client->event_count = eina_list_remove(e->client->event_count, e); if (e->client->host_server) { e->client->host_server->event_count = eina_list_remove(e->client->host_server->event_count, ev); if ((!svr->event_count) && (svr->delete_me)) - _ecore_con_server_free(svr); + { + _ecore_con_server_free(svr); + svrfreed = EINA_TRUE; + } + } + if (!svrfreed) + { + if ((!e->client->event_count) && (e->client->delete_me)) + ecore_con_client_del(e->client); } - if ((!e->client->event_count) && (e->client->delete_me)) - ecore_con_client_del(e->client); } ecore_con_event_client_add_free(e); @@ -2413,15 +2421,23 @@ _ecore_con_event_client_del_free(Ecore_Con_Server *svr, e = ev; if (e->client) { + Eina_Bool svrfreed = EINA_FALSE; + e->client->event_count = eina_list_remove(e->client->event_count, e); if (e->client->host_server) { e->client->host_server->event_count = eina_list_remove(e->client->host_server->event_count, ev); if ((!svr->event_count) && (svr->delete_me)) - _ecore_con_server_free(svr); + { + _ecore_con_server_free(svr); + svrfreed = EINA_TRUE; + } + } + if (!svrfreed) + { + if (!e->client->event_count) + _ecore_con_client_free(e->client); } - if (!e->client->event_count) - _ecore_con_client_free(e->client); } ecore_con_event_client_del_free(e); _ecore_con_event_count--; @@ -2435,18 +2451,26 @@ _ecore_con_event_client_write_free(Ecore_Con_Server *svr, { if (e->client) { + Eina_Bool svrfreed = EINA_FALSE; + e->client->event_count = eina_list_remove(e->client->event_count, e); if (e->client->host_server) { e->client->host_server->event_count = eina_list_remove(e->client->host_server->event_count, e); if ((!svr->event_count) && (svr->delete_me)) - _ecore_con_server_free(svr); + { + _ecore_con_server_free(svr); + svrfreed = EINA_TRUE; + } + } + if (!svrfreed) + { + if (((!e->client->event_count) && (e->client->delete_me)) || + ((e->client->host_server && + ((e->client->host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_UDP || + (e->client->host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_MCAST)))) + ecore_con_client_del(e->client); } - if (((!e->client->event_count) && (e->client->delete_me)) || - ((e->client->host_server && - ((e->client->host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_UDP || - (e->client->host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_MCAST)))) - ecore_con_client_del(e->client); } ecore_con_event_client_write_free(e); _ecore_con_event_count--; @@ -2463,18 +2487,26 @@ _ecore_con_event_client_data_free(Ecore_Con_Server *svr, e = ev; if (e->client) { + Eina_Bool svrfreed = EINA_FALSE; + e->client->event_count = eina_list_remove(e->client->event_count, e); if (e->client->host_server) { e->client->host_server->event_count = eina_list_remove(e->client->host_server->event_count, ev); } if ((!svr->event_count) && (svr->delete_me)) - _ecore_con_server_free(svr); - if (((!e->client->event_count) && (e->client->delete_me)) || - ((e->client->host_server && - ((e->client->host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_UDP || - (e->client->host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_MCAST)))) - ecore_con_client_del(e->client); + { + _ecore_con_server_free(svr); + svrfreed = EINA_TRUE; + } + if (!svrfreed) + { + if (((!e->client->event_count) && (e->client->delete_me)) || + ((e->client->host_server && + ((e->client->host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_UDP || + (e->client->host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_MCAST)))) + ecore_con_client_del(e->client); + } } free(e->data); ecore_con_event_client_data_free(e); @@ -2581,15 +2613,23 @@ _ecore_con_event_client_error_free(Ecore_Con_Server *svr, Ecore_Con_Event_Client { if (e->client) { + Eina_Bool svrfreed = EINA_FALSE; + if (eina_list_data_find(svr->clients, e->client)) { e->client->event_count = eina_list_remove(e->client->event_count, e); if ((!e->client->event_count) && (e->client->delete_me)) - _ecore_con_client_free(e->client); + { + _ecore_con_client_free(e->client); + svrfreed = EINA_TRUE; + } } svr->event_count = eina_list_remove(svr->event_count, e); - if ((!svr->event_count) && (svr->delete_me)) - _ecore_con_server_free(svr); + if (!svrfreed) + { + if ((!svr->event_count) && (svr->delete_me)) + _ecore_con_server_free(svr); + } } free(e->error); ecore_con_event_client_error_free(e); -- 2.7.4