Re: [E-devel] E SVN: englebass IN trunk/efreet: . src/bin src/lib
Oops, will fix. S. Den 24. nov. 2012 kl. 07:54 skrev Vincent Torri : > isn't efreet_alloca.h a new file ? I don't see it added in the commit > > Vincent > > On Sat, Nov 24, 2012 at 7:43 AM, Enlightenment SVN > wrote: >> Log: >> efreet: fix alloca >> >> Author: englebass >> Date: 2012-11-23 22:43:00 -0800 (Fri, 23 Nov 2012) >> New Revision: 79629 >> Trac: http://trac.enlightenment.org/e/changeset/79629 >> >> Modified: >> trunk/efreet/ChangeLog trunk/efreet/src/bin/efreet_icon_cache_create.c >> trunk/efreet/src/lib/Makefile.am trunk/efreet/src/lib/efreet.c >> trunk/efreet/src/lib/efreet_base.c trunk/efreet/src/lib/efreet_desktop.c >> trunk/efreet/src/lib/efreet_desktop_command.c >> trunk/efreet/src/lib/efreet_icon.c trunk/efreet/src/lib/efreet_ini.c >> trunk/efreet/src/lib/efreet_menu.c trunk/efreet/src/lib/efreet_mime.c >> trunk/efreet/src/lib/efreet_utils.c >> >> Modified: trunk/efreet/ChangeLog >> === >> --- trunk/efreet/ChangeLog 2012-11-24 06:37:55 UTC (rev 79628) >> +++ trunk/efreet/ChangeLog 2012-11-24 06:43:00 UTC (rev 79629) >> @@ -162,3 +162,7 @@ >> 2012-11-22 Sebastian Dransfeld >> >>* Accept unquoted values in user-dirs.dirs >> + >> +2012-11-24 Sebastian Dransfeld >> + >> + * Fix alloca >> >> Modified: trunk/efreet/src/bin/efreet_icon_cache_create.c >> === >> --- trunk/efreet/src/bin/efreet_icon_cache_create.c 2012-11-24 06:37:55 >> UTC (rev 79628) >> +++ trunk/efreet/src/bin/efreet_icon_cache_create.c 2012-11-24 06:43:00 >> UTC (rev 79629) >> @@ -2,31 +2,7 @@ >> # include >> #endif >> >> -#ifdef STDC_HEADERS >> -# include >> -# include >> -#else >> -# ifdef HAVE_STDLIB_H >> -# include >> -# endif >> -#endif >> -#ifdef HAVE_ALLOCA_H >> -# include >> -#elif !defined alloca >> -# ifdef __GNUC__ >> -# define alloca __builtin_alloca >> -# elif defined _AIX >> -# define alloca __alloca >> -# elif defined _MSC_VER >> -# include >> -# define alloca _alloca >> -# elif !defined HAVE_ALLOCA >> -# ifdef __cplusplus >> -extern "C" >> -# endif >> -void *alloca (size_t); >> -# endif >> -#endif >> +#include "efreet_alloca.h" >> >> #include >> #include >> >> Modified: trunk/efreet/src/lib/Makefile.am >> === >> --- trunk/efreet/src/lib/Makefile.am2012-11-24 06:37:55 UTC (rev 79628) >> +++ trunk/efreet/src/lib/Makefile.am2012-11-24 06:43:00 UTC (rev 79629) >> @@ -66,4 +66,4 @@ >> libefreet_trash_la_LIBADD = @EFREET_LIBS@ libefreet.la >> libefreet_trash_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ >> -version-info @version_info@ @release_info@ >> >> -EXTRA_DIST = efreet_private.h efreet_xml.h efreet_cache_private.h >> +EXTRA_DIST = efreet_private.h efreet_xml.h efreet_cache_private.h >> efreet_alloca.h >> >> Modified: trunk/efreet/src/lib/efreet.c >> === >> --- trunk/efreet/src/lib/efreet.c 2012-11-24 06:37:55 UTC (rev 79628) >> +++ trunk/efreet/src/lib/efreet.c 2012-11-24 06:43:00 UTC (rev 79629) >> @@ -2,23 +2,7 @@ >> # include >> #endif >> >> -#undef alloca >> -#ifdef HAVE_ALLOCA_H >> -# include >> -#elif defined __GNUC__ >> -# define alloca __builtin_alloca >> -#elif defined _AIX >> -# define alloca __alloca >> -#elif defined _MSC_VER >> -# include >> -# define alloca _alloca >> -#else >> -# include >> -# ifdef __cplusplus >> -extern "C" >> -# endif >> -void *alloca (size_t); >> -#endif >> +#include "efreet_alloca.h" >> >> #include >> #include >> >> Modified: trunk/efreet/src/lib/efreet_base.c >> === >> --- trunk/efreet/src/lib/efreet_base.c 2012-11-24 06:37:55 UTC (rev 79628) >> +++ trunk/efreet/src/lib/efreet_base.c 2012-11-24 06:43:00 UTC (rev 79629) >> @@ -2,23 +2,7 @@ >> # include >> #endif >> >> -#undef alloca >> -#ifdef HAVE_ALLOCA_H >> -# include >> -#elif defined __GNUC__ >> -# define alloca __builtin_alloca >> -#elif defined _AIX >> -# define alloca __alloca >> -#elif defined _MSC_VER >> -# include >> -# define alloca _alloca >> -#else >> -# include >> -# ifdef __cplusplus >> -extern "C" >> -# endif >> -void *alloca (size_t); >> -#endif >> +#include "efreet_alloca.h" >> >> #include >> #include >> >> Modified: trunk/efreet/src/lib/efreet_desktop.c >> === >> --- trunk/efreet/src/lib/efreet_desktop.c 2012-11-24 06:37:55 UTC (rev >> 79628) >> +++ trunk/efreet/src/lib/efreet_desktop.c 2012-11-24 06:43:00 UTC (rev >> 79629) >> @@ -2,23 +2,7 @@ >> # include >> #endif >> >> -#undef alloca >> -#ifdef HAVE_ALLOCA_H >> -# include >> -#elif defined __GNUC__ >> -# define alloca __builtin_alloca >> -#elif defined _AIX >> -# define alloca __alloca >> -#elif defined _MSC_VER >> -
Re: [E-devel] E SVN: englebass IN trunk/efreet: . src/bin src/lib
isn't efreet_alloca.h a new file ? I don't see it added in the commit Vincent On Sat, Nov 24, 2012 at 7:43 AM, Enlightenment SVN wrote: > Log: > efreet: fix alloca > > Author: englebass > Date: 2012-11-23 22:43:00 -0800 (Fri, 23 Nov 2012) > New Revision: 79629 > Trac: http://trac.enlightenment.org/e/changeset/79629 > > Modified: > trunk/efreet/ChangeLog trunk/efreet/src/bin/efreet_icon_cache_create.c > trunk/efreet/src/lib/Makefile.am trunk/efreet/src/lib/efreet.c > trunk/efreet/src/lib/efreet_base.c trunk/efreet/src/lib/efreet_desktop.c > trunk/efreet/src/lib/efreet_desktop_command.c > trunk/efreet/src/lib/efreet_icon.c trunk/efreet/src/lib/efreet_ini.c > trunk/efreet/src/lib/efreet_menu.c trunk/efreet/src/lib/efreet_mime.c > trunk/efreet/src/lib/efreet_utils.c > > Modified: trunk/efreet/ChangeLog > === > --- trunk/efreet/ChangeLog 2012-11-24 06:37:55 UTC (rev 79628) > +++ trunk/efreet/ChangeLog 2012-11-24 06:43:00 UTC (rev 79629) > @@ -162,3 +162,7 @@ > 2012-11-22 Sebastian Dransfeld > > * Accept unquoted values in user-dirs.dirs > + > +2012-11-24 Sebastian Dransfeld > + > + * Fix alloca > > Modified: trunk/efreet/src/bin/efreet_icon_cache_create.c > === > --- trunk/efreet/src/bin/efreet_icon_cache_create.c 2012-11-24 06:37:55 > UTC (rev 79628) > +++ trunk/efreet/src/bin/efreet_icon_cache_create.c 2012-11-24 06:43:00 > UTC (rev 79629) > @@ -2,31 +2,7 @@ > # include > #endif > > -#ifdef STDC_HEADERS > -# include > -# include > -#else > -# ifdef HAVE_STDLIB_H > -# include > -# endif > -#endif > -#ifdef HAVE_ALLOCA_H > -# include > -#elif !defined alloca > -# ifdef __GNUC__ > -# define alloca __builtin_alloca > -# elif defined _AIX > -# define alloca __alloca > -# elif defined _MSC_VER > -# include > -# define alloca _alloca > -# elif !defined HAVE_ALLOCA > -# ifdef __cplusplus > -extern "C" > -# endif > -void *alloca (size_t); > -# endif > -#endif > +#include "efreet_alloca.h" > > #include > #include > > Modified: trunk/efreet/src/lib/Makefile.am > === > --- trunk/efreet/src/lib/Makefile.am2012-11-24 06:37:55 UTC (rev 79628) > +++ trunk/efreet/src/lib/Makefile.am2012-11-24 06:43:00 UTC (rev 79629) > @@ -66,4 +66,4 @@ > libefreet_trash_la_LIBADD = @EFREET_LIBS@ libefreet.la > libefreet_trash_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ > -version-info @version_info@ @release_info@ > > -EXTRA_DIST = efreet_private.h efreet_xml.h efreet_cache_private.h > +EXTRA_DIST = efreet_private.h efreet_xml.h efreet_cache_private.h > efreet_alloca.h > > Modified: trunk/efreet/src/lib/efreet.c > === > --- trunk/efreet/src/lib/efreet.c 2012-11-24 06:37:55 UTC (rev 79628) > +++ trunk/efreet/src/lib/efreet.c 2012-11-24 06:43:00 UTC (rev 79629) > @@ -2,23 +2,7 @@ > # include > #endif > > -#undef alloca > -#ifdef HAVE_ALLOCA_H > -# include > -#elif defined __GNUC__ > -# define alloca __builtin_alloca > -#elif defined _AIX > -# define alloca __alloca > -#elif defined _MSC_VER > -# include > -# define alloca _alloca > -#else > -# include > -# ifdef __cplusplus > -extern "C" > -# endif > -void *alloca (size_t); > -#endif > +#include "efreet_alloca.h" > > #include > #include > > Modified: trunk/efreet/src/lib/efreet_base.c > === > --- trunk/efreet/src/lib/efreet_base.c 2012-11-24 06:37:55 UTC (rev 79628) > +++ trunk/efreet/src/lib/efreet_base.c 2012-11-24 06:43:00 UTC (rev 79629) > @@ -2,23 +2,7 @@ > # include > #endif > > -#undef alloca > -#ifdef HAVE_ALLOCA_H > -# include > -#elif defined __GNUC__ > -# define alloca __builtin_alloca > -#elif defined _AIX > -# define alloca __alloca > -#elif defined _MSC_VER > -# include > -# define alloca _alloca > -#else > -# include > -# ifdef __cplusplus > -extern "C" > -# endif > -void *alloca (size_t); > -#endif > +#include "efreet_alloca.h" > > #include > #include > > Modified: trunk/efreet/src/lib/efreet_desktop.c > === > --- trunk/efreet/src/lib/efreet_desktop.c 2012-11-24 06:37:55 UTC (rev > 79628) > +++ trunk/efreet/src/lib/efreet_desktop.c 2012-11-24 06:43:00 UTC (rev > 79629) > @@ -2,23 +2,7 @@ > # include > #endif > > -#undef alloca > -#ifdef HAVE_ALLOCA_H > -# include > -#elif defined __GNUC__ > -# define alloca __builtin_alloca > -#elif defined _AIX > -# define alloca __alloca > -#elif defined _MSC_VER > -# include > -# define alloca _alloca > -#else > -# include > -# ifdef __cplusplus > -extern "C" > -# endif > -void *alloca (size_t); > -#endif > +#include "efreet_alloca.h" > > #ifdef HAVE_EVIL > # include > > Modified: trunk/efreet/src/l
Re: [E-devel] E SVN: englebass IN trunk/efreet: . src/bin src/lib
vtorri fixed this.
http://trac.enlightenment.org/e/changeset/78302
Thanks.
Daniel Juyung Seo (SeoZ)
On Sun, Oct 21, 2012 at 4:33 PM, Daniel Juyung Seo wrote:
> Build break!
> After this commit, efreet fails to build if there is no edbus2.
> http://pastebin.com/DESGhnwh
>
> Can you fix this?
>
> Daniel Juyung Seo (SeoZ)
>
> On Sun, Oct 21, 2012 at 1:53 PM, Enlightenment SVN
> wrote:
>> Log:
>> efreet: Add dbus efreet daemon
>>
>> Not working yet.
>>
>> Author: englebass
>> Date: 2012-10-20 21:53:23 -0700 (Sat, 20 Oct 2012)
>> New Revision: 78294
>> Trac: http://trac.enlightenment.org/e/changeset/78294
>>
>> Added:
>> trunk/efreet/org.enlightenment.Efreet.service.in
>> trunk/efreet/src/bin/efreetd.c trunk/efreet/src/bin/efreetd.h
>> trunk/efreet/src/bin/efreetd_cache.c trunk/efreet/src/bin/efreetd_cache.h
>> trunk/efreet/src/bin/efreetd_dbus.c trunk/efreet/src/bin/efreetd_dbus.h
>> trunk/efreet/src/lib/efreet_copy.h
>> Modified:
>> trunk/efreet/.gitignore trunk/efreet/Makefile.am trunk/efreet/configure.ac
>> trunk/efreet/src/bin/Makefile.am
>> trunk/efreet/src/bin/efreet_desktop_cache_create.c
>> trunk/efreet/src/bin/efreet_icon_cache_create.c
>>
>> Modified: trunk/efreet/.gitignore
>> ===
>> --- trunk/efreet/.gitignore 2012-10-21 04:53:18 UTC (rev 78293)
>> +++ trunk/efreet/.gitignore 2012-10-21 04:53:23 UTC (rev 78294)
>> @@ -40,12 +40,14 @@
>> /missing
>> src/bin/efreet_desktop_cache_create
>> src/bin/efreet_icon_cache_create
>> +src/bin/efreetd
>> src/tests/compare/efreet_alloc
>> src/tests/compare/efreet_menu_alloc
>> src/tests/efreet_cache_test
>> src/tests/efreet_icon_cache_dump
>> src/tests/efreet_spec_test
>> src/tests/efreet_test
>> +src/tests/efreet_user_dir
>> /m4/codeset.m4
>> /m4/gettext.m4
>> /m4/glibc21.m4
>> @@ -150,3 +152,4 @@
>> /po/*.gmo
>> /po/stamp-po
>> /stamp-h1
>> +/org.enlightenment.Efreet.service
>>
>> Modified: trunk/efreet/Makefile.am
>> ===
>> --- trunk/efreet/Makefile.am2012-10-21 04:53:18 UTC (rev 78293)
>> +++ trunk/efreet/Makefile.am2012-10-21 04:53:23 UTC (rev 78294)
>> @@ -76,6 +76,9 @@
>> pkgconfigdir = $(libdir)/pkgconfig
>> pkgconfig_DATA = efreet.pc efreet-mime.pc efreet-trash.pc
>>
>> +servicedir = $(dbusservicedir)
>> +service_DATA = org.enlightenment.Efreet.service
>> +
>> EXTRA_DIST = \
>> AUTHORS \
>> COPYING \
>>
>> Modified: trunk/efreet/configure.ac
>> ===
>> --- trunk/efreet/configure.ac 2012-10-21 04:53:18 UTC (rev 78293)
>> +++ trunk/efreet/configure.ac 2012-10-21 04:53:23 UTC (rev 78294)
>> @@ -166,11 +166,33 @@
>> AC_SUBST(EFL_EFREET_MIME_BUILD)
>> AC_SUBST(EFL_EFREET_TRASH_BUILD)
>>
>> +service=""
>> +have_efreetd=""
>> +dbusservicedir=""
>> +PKG_CHECK_MODULES(EFREETD, [
>> + eina >= 1.7.99
>> + ecore >= 1.7.99
>> + ecore-file >= 1.7.99
>> + edbus2 >= 1.7.99
>> +], [
>> +have_efreetd="yes"
>> +service="org.enlightenment.Efreet.service"
>> +requirement_efreet="edbus2 ${requirement_efreet}"
>> +dbusservicedir=${datadir}/dbus-1/services
>> +AC_ARG_WITH([dbus-services],
>> +AC_HELP_STRING([--with-dbus-services=DBUS_SERVICES], [specify a
>> directory to store dbus service files.]),
>> +[ dbusservicedir=$withval ]
>> +)
>> +
>> + ], [
>> +have_efreetd="no"
>> +])
>> +AM_CONDITIONAL([HAVE_EFREETD], [test "x${have_efreetd}" = "xyes"])
>> +
>> requirement_efreet="ecore-file >= 1.6.99 ecore >= 1.6.99 eet >= 1.6.99 eina
>> >= 1.6.99 ${requirement_efreet}"
>> PKG_CHECK_MODULES(EFREET, [${requirement_efreet}])
>> PKG_CHECK_MODULES(EINA, [eina >= 1.6.99])
>>
>> -
>> ### Checks for header files
>>
>> AC_CHECK_HEADERS([netinet/in.h arpa/inet.h])
>> @@ -234,6 +256,7 @@
>> fi
>>
>> AC_SUBST(requirement_efreet)
>> +AC_SUBST(dbusservicedir)
>>
>> AC_OUTPUT([
>> efreet.spec
>> @@ -251,6 +274,7 @@
>> src/tests/data/sub/Makefile
>> src/tests/compare/Makefile
>> $po_makefile_in
>> +$service
>> ])
>>
>>
>> @@ -270,6 +294,10 @@
>> echo "Strict.: ${enable_strict_spec}"
>> echo "Sloppy.: ${enable_sloppy_spec}"
>> echo
>> +if test "x$have_efreetd" = "xyes"; then
>> + echo " DBus services dir: ${dbusservicedir}"
>> + echo
>> +fi
>> echo " Tests: ${enable_tests}"
>> echo " Coverage.: ${enable_coverage}"
>> echo
>>
>> Modified: trunk/efreet/src/bin/Makefile.am
>> ===
>> --- trunk/efreet/src/bin/Makefile.am2012-10-21 04:53:18 UTC (rev 78293)
>> +++ trunk/efreet/src/bin/Makefile.am2012-10-21 04:53:23 UTC (rev 78294)
>> @@ -27,3 +27,20 @@
>>
>> efreet_icon_cache_create_SOURCES = \
>> efreet_icon_cache_create.c
>> +
>> +if HAVE_EFREETD
>> +bin_PROGRAMS = \
>> +efreetd
>> +
>> +efreetd_LD
Re: [E-devel] E SVN: englebass IN trunk/efreet: . src/bin src/lib
Build break!
After this commit, efreet fails to build if there is no edbus2.
http://pastebin.com/DESGhnwh
Can you fix this?
Daniel Juyung Seo (SeoZ)
On Sun, Oct 21, 2012 at 1:53 PM, Enlightenment SVN
wrote:
> Log:
> efreet: Add dbus efreet daemon
>
> Not working yet.
>
> Author: englebass
> Date: 2012-10-20 21:53:23 -0700 (Sat, 20 Oct 2012)
> New Revision: 78294
> Trac: http://trac.enlightenment.org/e/changeset/78294
>
> Added:
> trunk/efreet/org.enlightenment.Efreet.service.in
> trunk/efreet/src/bin/efreetd.c trunk/efreet/src/bin/efreetd.h
> trunk/efreet/src/bin/efreetd_cache.c trunk/efreet/src/bin/efreetd_cache.h
> trunk/efreet/src/bin/efreetd_dbus.c trunk/efreet/src/bin/efreetd_dbus.h
> trunk/efreet/src/lib/efreet_copy.h
> Modified:
> trunk/efreet/.gitignore trunk/efreet/Makefile.am trunk/efreet/configure.ac
> trunk/efreet/src/bin/Makefile.am
> trunk/efreet/src/bin/efreet_desktop_cache_create.c
> trunk/efreet/src/bin/efreet_icon_cache_create.c
>
> Modified: trunk/efreet/.gitignore
> ===
> --- trunk/efreet/.gitignore 2012-10-21 04:53:18 UTC (rev 78293)
> +++ trunk/efreet/.gitignore 2012-10-21 04:53:23 UTC (rev 78294)
> @@ -40,12 +40,14 @@
> /missing
> src/bin/efreet_desktop_cache_create
> src/bin/efreet_icon_cache_create
> +src/bin/efreetd
> src/tests/compare/efreet_alloc
> src/tests/compare/efreet_menu_alloc
> src/tests/efreet_cache_test
> src/tests/efreet_icon_cache_dump
> src/tests/efreet_spec_test
> src/tests/efreet_test
> +src/tests/efreet_user_dir
> /m4/codeset.m4
> /m4/gettext.m4
> /m4/glibc21.m4
> @@ -150,3 +152,4 @@
> /po/*.gmo
> /po/stamp-po
> /stamp-h1
> +/org.enlightenment.Efreet.service
>
> Modified: trunk/efreet/Makefile.am
> ===
> --- trunk/efreet/Makefile.am2012-10-21 04:53:18 UTC (rev 78293)
> +++ trunk/efreet/Makefile.am2012-10-21 04:53:23 UTC (rev 78294)
> @@ -76,6 +76,9 @@
> pkgconfigdir = $(libdir)/pkgconfig
> pkgconfig_DATA = efreet.pc efreet-mime.pc efreet-trash.pc
>
> +servicedir = $(dbusservicedir)
> +service_DATA = org.enlightenment.Efreet.service
> +
> EXTRA_DIST = \
> AUTHORS \
> COPYING \
>
> Modified: trunk/efreet/configure.ac
> ===
> --- trunk/efreet/configure.ac 2012-10-21 04:53:18 UTC (rev 78293)
> +++ trunk/efreet/configure.ac 2012-10-21 04:53:23 UTC (rev 78294)
> @@ -166,11 +166,33 @@
> AC_SUBST(EFL_EFREET_MIME_BUILD)
> AC_SUBST(EFL_EFREET_TRASH_BUILD)
>
> +service=""
> +have_efreetd=""
> +dbusservicedir=""
> +PKG_CHECK_MODULES(EFREETD, [
> + eina >= 1.7.99
> + ecore >= 1.7.99
> + ecore-file >= 1.7.99
> + edbus2 >= 1.7.99
> +], [
> +have_efreetd="yes"
> +service="org.enlightenment.Efreet.service"
> +requirement_efreet="edbus2 ${requirement_efreet}"
> +dbusservicedir=${datadir}/dbus-1/services
> +AC_ARG_WITH([dbus-services],
> +AC_HELP_STRING([--with-dbus-services=DBUS_SERVICES], [specify a
> directory to store dbus service files.]),
> +[ dbusservicedir=$withval ]
> +)
> +
> + ], [
> +have_efreetd="no"
> +])
> +AM_CONDITIONAL([HAVE_EFREETD], [test "x${have_efreetd}" = "xyes"])
> +
> requirement_efreet="ecore-file >= 1.6.99 ecore >= 1.6.99 eet >= 1.6.99 eina
> >= 1.6.99 ${requirement_efreet}"
> PKG_CHECK_MODULES(EFREET, [${requirement_efreet}])
> PKG_CHECK_MODULES(EINA, [eina >= 1.6.99])
>
> -
> ### Checks for header files
>
> AC_CHECK_HEADERS([netinet/in.h arpa/inet.h])
> @@ -234,6 +256,7 @@
> fi
>
> AC_SUBST(requirement_efreet)
> +AC_SUBST(dbusservicedir)
>
> AC_OUTPUT([
> efreet.spec
> @@ -251,6 +274,7 @@
> src/tests/data/sub/Makefile
> src/tests/compare/Makefile
> $po_makefile_in
> +$service
> ])
>
>
> @@ -270,6 +294,10 @@
> echo "Strict.: ${enable_strict_spec}"
> echo "Sloppy.: ${enable_sloppy_spec}"
> echo
> +if test "x$have_efreetd" = "xyes"; then
> + echo " DBus services dir: ${dbusservicedir}"
> + echo
> +fi
> echo " Tests: ${enable_tests}"
> echo " Coverage.: ${enable_coverage}"
> echo
>
> Modified: trunk/efreet/src/bin/Makefile.am
> ===
> --- trunk/efreet/src/bin/Makefile.am2012-10-21 04:53:18 UTC (rev 78293)
> +++ trunk/efreet/src/bin/Makefile.am2012-10-21 04:53:23 UTC (rev 78294)
> @@ -27,3 +27,20 @@
>
> efreet_icon_cache_create_SOURCES = \
> efreet_icon_cache_create.c
> +
> +if HAVE_EFREETD
> +bin_PROGRAMS = \
> +efreetd
> +
> +efreetd_LDADD = \
> +$(top_builddir)/src/lib/libefreet.la \
> +@EFREETD_LIBS@
> +
> +efreetd_SOURCES = \
> +efreetd.c \
> +efreetd_dbus.h \
> +efreetd_dbus.c \
> +efreetd_cache.h \
> +efreetd_cache.c
> +endif
> +
>
> Modified: trunk/efreet/src/bin/efreet_desktop_cache_create.c
> =
Re: [E-devel] E SVN: englebass IN trunk/efreet: . src/bin src/lib src/tests
On Thu, 03 Feb 2011 23:13:34 +0100 Sebastian Dransfeld said: > On 02/01/2011 11:05 PM, Carsten Haitzler (The Rasterman) wrote: > > On Tue, 01 Feb 2011 22:36:53 +0100 Sebastian Dransfeld > > said: > > > >> On 02/01/2011 07:45 PM, Sebastian Dransfeld wrote: > >>> On 02/01/2011 03:59 PM, Carsten Haitzler (The Rasterman) wrote: > On Mon, 31 Jan 2011 03:43:31 -0800 "Enlightenment SVN" > said: > > you know that as of this commit onwards efreet icon searching is broken > for e - it doesn't fine icons in like ~/.icons, ~/.e/e/icons or other > places. something broke with icon path hunting from this commit on. i'd > suggest a review of this so see what you broke before you move on :) > >>> > >>> Not ~/.icons ? That should be there... But I know ~/.e/e/icons isn't > >>> supported. It is on the TODO list :) > >> > >> ~/.icons works here. Please report if it does not work for someone. > > > > doesn't work here. > > > > 7:03AM ~/.icons> ls > > total 16K > > 16K xterm.png > > 7:04AM ~/.icons> grep Icon ~/.local/share/applications/xterm.desktop > > Icon=xterm.png > > > > but... icon is blank for xterm. yes - i rm -rf ~/.cache/efreet. doesn't > > help. as of the above revision icon vanished and stays vanished > > > > Think I know the error, could you please try changing > ~/.local/share/applications/xterm.desktop to have Icon=xterm? > > Will fix as well. you fixed it in the meantime while i was away.. so.. yay! :) -- - Codito, ergo sum - "I code, therefore I am" -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] E SVN: englebass IN trunk/efreet: . src/bin src/lib
On 02/07/2011 04:33 PM, Enlightenment SVN wrote: > Log: > Set file owner to calling user > >This fixes cache problems when running programs utilizing efreet with >sudo. > > Author: englebass > Date: 2011-02-07 13:33:33 -0800 (Mon, 07 Feb 2011) > New Revision: 56787 > Trac: http://trac.enlightenment.org/e/changeset/56787 > > Modified: >trunk/efreet/ChangeLog trunk/efreet/src/bin/efreet_desktop_cache_create.c > trunk/efreet/src/bin/efreet_icon_cache_create.c trunk/efreet/src/lib/efreet.c > trunk/efreet/src/lib/efreet_cache.c trunk/efreet/src/lib/efreet_desktop.c > trunk/efreet/src/lib/efreet_private.h > Thank You englebass !!! :) dh -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] E SVN: englebass IN trunk/efreet: . src/bin src/lib src/tests
On 02/01/2011 11:05 PM, Carsten Haitzler (The Rasterman) wrote: > On Tue, 01 Feb 2011 22:36:53 +0100 Sebastian Dransfeld > said: > >> On 02/01/2011 07:45 PM, Sebastian Dransfeld wrote: >>> On 02/01/2011 03:59 PM, Carsten Haitzler (The Rasterman) wrote: On Mon, 31 Jan 2011 03:43:31 -0800 "Enlightenment SVN" said: you know that as of this commit onwards efreet icon searching is broken for e - it doesn't fine icons in like ~/.icons, ~/.e/e/icons or other places. something broke with icon path hunting from this commit on. i'd suggest a review of this so see what you broke before you move on :) >>> >>> Not ~/.icons ? That should be there... But I know ~/.e/e/icons isn't >>> supported. It is on the TODO list :) >> >> ~/.icons works here. Please report if it does not work for someone. > > doesn't work here. > > 7:03AM ~/.icons> ls > total 16K > 16K xterm.png > 7:04AM ~/.icons> grep Icon ~/.local/share/applications/xterm.desktop > Icon=xterm.png > > but... icon is blank for xterm. yes - i rm -rf ~/.cache/efreet. doesn't help. > as of the above revision icon vanished and stays vanished > Think I know the error, could you please try changing ~/.local/share/applications/xterm.desktop to have Icon=xterm? Will fix as well. Sebastian -- The modern datacenter depends on network connectivity to access resources and provide services. The best practices for maximizing a physical server's connectivity to a physical network are well understood - see how these rules translate into the virtual world? http://p.sf.net/sfu/oracle-sfdevnlfb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] E SVN: englebass IN trunk/efreet: . src/bin src/lib src/tests
On 02/01/2011 11:05 PM, Carsten Haitzler (The Rasterman) wrote: > On Tue, 01 Feb 2011 22:36:53 +0100 Sebastian Dransfeld > said: > >> On 02/01/2011 07:45 PM, Sebastian Dransfeld wrote: >>> On 02/01/2011 03:59 PM, Carsten Haitzler (The Rasterman) wrote: On Mon, 31 Jan 2011 03:43:31 -0800 "Enlightenment SVN" said: you know that as of this commit onwards efreet icon searching is broken for e - it doesn't fine icons in like ~/.icons, ~/.e/e/icons or other places. something broke with icon path hunting from this commit on. i'd suggest a review of this so see what you broke before you move on :) >>> >>> Not ~/.icons ? That should be there... But I know ~/.e/e/icons isn't >>> supported. It is on the TODO list :) >> >> ~/.icons works here. Please report if it does not work for someone. > > doesn't work here. > > 7:03AM ~/.icons> ls > total 16K > 16K xterm.png > 7:04AM ~/.icons> grep Icon ~/.local/share/applications/xterm.desktop > Icon=xterm.png > > but... icon is blank for xterm. yes - i rm -rf ~/.cache/efreet. doesn't help. > as of the above revision icon vanished and stays vanished > What returns: eet -l ~/.cache/efreet/icons___efreet_fallback*.eet |grep xterm Sebastian -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] E SVN: englebass IN trunk/efreet: . src/bin src/lib src/tests
On Tue, 01 Feb 2011 22:36:53 +0100 Sebastian Dransfeld said: > On 02/01/2011 07:45 PM, Sebastian Dransfeld wrote: > > On 02/01/2011 03:59 PM, Carsten Haitzler (The Rasterman) wrote: > >> On Mon, 31 Jan 2011 03:43:31 -0800 "Enlightenment SVN" > >>said: > >> > >> you know that as of this commit onwards efreet icon searching is broken > >> for e - it doesn't fine icons in like ~/.icons, ~/.e/e/icons or other > >> places. something broke with icon path hunting from this commit on. i'd > >> suggest a review of this so see what you broke before you move on :) > > > > Not ~/.icons ? That should be there... But I know ~/.e/e/icons isn't > > supported. It is on the TODO list :) > > ~/.icons works here. Please report if it does not work for someone. doesn't work here. 7:03AM ~/.icons > ls total 16K 16K xterm.png 7:04AM ~/.icons > grep Icon ~/.local/share/applications/xterm.desktop Icon=xterm.png but... icon is blank for xterm. yes - i rm -rf ~/.cache/efreet. doesn't help. as of the above revision icon vanished and stays vanished -- - Codito, ergo sum - "I code, therefore I am" -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] E SVN: englebass IN trunk/efreet: . src/bin src/lib src/tests
On 02/01/2011 07:45 PM, Sebastian Dransfeld wrote: > On 02/01/2011 03:59 PM, Carsten Haitzler (The Rasterman) wrote: >> On Mon, 31 Jan 2011 03:43:31 -0800 "Enlightenment SVN" >>said: >> >> you know that as of this commit onwards efreet icon searching is broken for >> e - >> it doesn't fine icons in like ~/.icons, ~/.e/e/icons or other places. >> something >> broke with icon path hunting from this commit on. i'd suggest a review of >> this >> so see what you broke before you move on :) > > Not ~/.icons ? That should be there... But I know ~/.e/e/icons isn't > supported. It is on the TODO list :) ~/.icons works here. Please report if it does not work for someone. Sebastian -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] E SVN: englebass IN trunk/efreet: . src/bin src/lib src/tests
On 02/01/2011 03:59 PM, Carsten Haitzler (The Rasterman) wrote: > On Mon, 31 Jan 2011 03:43:31 -0800 "Enlightenment SVN" > said: > > you know that as of this commit onwards efreet icon searching is broken for e > - > it doesn't fine icons in like ~/.icons, ~/.e/e/icons or other places. > something > broke with icon path hunting from this commit on. i'd suggest a review of this > so see what you broke before you move on :) Not ~/.icons ? That should be there... But I know ~/.e/e/icons isn't supported. It is on the TODO list :) But it would probably be simpler for E to use standard icon locations. Sebastian -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] E SVN: englebass IN trunk/efreet: . src/bin src/lib src/tests
On Mon, 31 Jan 2011 03:43:31 -0800 "Enlightenment SVN"
said:
you know that as of this commit onwards efreet icon searching is broken for e -
it doesn't fine icons in like ~/.icons, ~/.e/e/icons or other places. something
broke with icon path hunting from this commit on. i'd suggest a review of this
so see what you broke before you move on :)
> Log:
> Always use icon cache, remove old code
>
> Author: englebass
> Date: 2011-01-31 03:43:31 -0800 (Mon, 31 Jan 2011)
> New Revision: 56590
> Trac: http://trac.enlightenment.org/e/changeset/56590
>
> Modified:
> trunk/efreet/ChangeLog trunk/efreet/configure.ac
> trunk/efreet/src/bin/Makefile.am trunk/efreet/src/lib/efreet_cache.c
> trunk/efreet/src/lib/efreet_cache_private.h
> trunk/efreet/src/lib/efreet_icon.c trunk/efreet/src/lib/efreet_private.h
> trunk/efreet/src/tests/Makefile.am
>
> Modified: trunk/efreet/ChangeLog
> ===
> --- trunk/efreet/ChangeLog2011-01-31 11:32:45 UTC (rev 56589)
> +++ trunk/efreet/ChangeLog2011-01-31 11:43:31 UTC (rev 56590)
> @@ -21,3 +21,8 @@
> 2011-01-31 Sebastian Dransfeld
>
> * Add temporary memory cache of eet file data
> +
> +2011-01-31 Sebastian Dransfeld
> +
> + * Always use icon cache, remove old code
> +
>
> Modified: trunk/efreet/configure.ac
> ===
> --- trunk/efreet/configure.ac 2011-01-31 11:32:45 UTC (rev 56589)
> +++ trunk/efreet/configure.ac 2011-01-31 11:43:31 UTC (rev 56590)
> @@ -95,23 +95,7 @@
> AC_DEFINE([SLOPPY_SPEC], [1], [Sloppy Spec Compliance])
> fi
>
> -AC_ARG_ENABLE([icon-cache],
> - [AC_HELP_STRING([--enable-icon-cache], [Enable icon cache compliance
> @<:@default=disabled@:>@])],
> - [
> -if test "x${enableval}" = "xyes" ; then
> - enable_icon_cache="yes"
> -else
> - enable_icon_cache="no"
> -fi
> - ],
> - [enable_icon_cache="no"])
>
> -if test "x${enable_icon_cache}" = "xyes" ; then
> - AC_DEFINE([ICON_CACHE], [1], [Icon Cache])
> -fi
> -AM_CONDITIONAL(ICON_CACHE, test "x$enable_icon_cache" = "xyes")
> -
> -
> #AC_ARG_ENABLE(hidden-visibility,
> #[AC_HELP_STRING([--enable-hidden-visibility],[Enable hidden
> #visibility])], [enable_hidden_visibility=$enableval],
> #[enable_hidden_visibility="auto"])
> @@ -266,8 +250,6 @@
> echo "Strict.: ${enable_strict_spec}"
> echo "Sloppy.: ${enable_sloppy_spec}"
> echo
> -echo " Icon cache...: ${enable_icon_cache}"
> -echo
> echo " Tests: ${enable_tests}"
> echo " Coverage.: ${enable_coverage}"
> echo
>
> Modified: trunk/efreet/src/bin/Makefile.am
> ===
> --- trunk/efreet/src/bin/Makefile.am 2011-01-31 11:32:45 UTC (rev
> 56589) +++ trunk/efreet/src/bin/Makefile.am 2011-01-31 11:43:31 UTC
> (rev 56590) @@ -11,12 +11,8 @@
>
> internal_bindir=$(libdir)/efreet
> internal_bin_PROGRAMS = \
> -efreet_desktop_cache_create
> -
> -if ICON_CACHE
> -internal_bin_PROGRAMS += \
> +efreet_desktop_cache_create \
> efreet_icon_cache_create
> -endif
>
> efreet_desktop_cache_create_LDADD = \
> $(top_builddir)/src/lib/libefreet.la \
> @@ -25,13 +21,9 @@
> efreet_desktop_cache_create_SOURCES = \
> efreet_desktop_cache_create.c
>
> -if ICON_CACHE
> -
> efreet_icon_cache_create_LDADD = \
> $(top_builddir)/src/lib/libefreet.la \
> @EFREET_LIBS@
>
> efreet_icon_cache_create_SOURCES = \
> efreet_icon_cache_create.c
> -
> -endif
>
> Modified: trunk/efreet/src/lib/efreet_cache.c
> ===
> --- trunk/efreet/src/lib/efreet_cache.c 2011-01-31 11:32:45 UTC (rev
> 56589) +++ trunk/efreet/src/lib/efreet_cache.c2011-01-31 11:43:31 UTC
> (rev 56590) @@ -32,7 +32,6 @@
> /**
> * Data for cache files
> */
> -#ifdef ICON_CACHE
> static Eet_Data_Descriptor *directory_edd = NULL;
> static Eet_Data_Descriptor *icon_theme_edd = NULL;
> static Eet_Data_Descriptor *icon_theme_directory_edd = NULL;
> @@ -52,7 +51,6 @@
> static const char *theme_name = NULL;
> static Efreet_Cache_Icons *theme_cache = NULL;
> static Efreet_Cache_Icons *fallback_cache = NULL;
> -#endif
>
> static Eet_Data_Descriptor *version_edd = NULL;
> static Eet_Data_Descriptor *desktop_edd = NULL;
> @@ -67,21 +65,17 @@
> static Ecore_File_Monitor *cache_monitor = NULL;
>
> static Ecore_Event_Handler *cache_exe_handler = NULL;
> -#ifdef ICON_CACHE
> static Ecore_Job *icon_cache_job = NULL;
> static Ecore_Exe *icon_cache_exe = NULL;
> static int icon_cache_exe_lock = -1;
> -#endif
> static Ecore_Job *desktop_cache_job = NULL;
> static Ecore_Exe *desktop_cache_exe = NULL;
> static int desktop_cache_exe_lock = -1;
>
> static Eina_List *old_desktop_caches
