summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-29 23:04:40 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-29 23:04:40 +0000
commit4bc0210bd31ed1de6554441562bd93ea863ee9d9 (patch)
tree5d83be12538f8c8d3816bbf65916ce383d050c2e
parent727ddbeaf0c53f31cd62c254fdebe26823d537eb (diff)
efl: merge efreet.
seems to be fine, pass distcheck and friends. please report. changes: - documentation hierarchy fixes - replaced __UNUSED__ with EINA_UNUSED - replaced PKG_DATA_DIR with PACKAGE_DATA_DIR"/efreet" SVN revision: 81889
-rw-r--r--AUTHORS12
-rw-r--r--configure.ac64
-rw-r--r--dbus-services/org.enlightenment.Efreet.service.in (renamed from legacy/efreet/org.enlightenment.Efreet.service.in)0
-rw-r--r--doc/Doxyfile.in15
-rw-r--r--doc/main.dox12
-rw-r--r--old/ChangeLog.efreet (renamed from legacy/efreet/ChangeLog)0
-rw-r--r--old/NEWS.efreet (renamed from legacy/efreet/NEWS)0
-rw-r--r--pc/efreet-mime.pc.in (renamed from legacy/efreet/efreet-mime.pc.in)2
-rw-r--r--pc/efreet-trash.pc.in (renamed from legacy/efreet/efreet-trash.pc.in)2
-rw-r--r--pc/efreet.pc.in (renamed from legacy/efreet/efreet.pc.in)2
-rw-r--r--src/Makefile.am4
-rw-r--r--src/Makefile_Ecore_X.am2
-rw-r--r--src/Makefile_Efreet.am222
-rw-r--r--src/bin/efreet/efreet_desktop_cache_create.c (renamed from legacy/efreet/src/bin/efreet_desktop_cache_create.c)2
-rw-r--r--src/bin/efreet/efreet_icon_cache_create.c (renamed from legacy/efreet/src/bin/efreet_icon_cache_create.c)0
-rw-r--r--src/bin/efreet/efreetd.c (renamed from legacy/efreet/src/bin/efreetd.c)0
-rw-r--r--src/bin/efreet/efreetd.h (renamed from legacy/efreet/src/bin/efreetd.h)0
-rw-r--r--src/bin/efreet/efreetd_cache.c (renamed from legacy/efreet/src/bin/efreetd_cache.c)12
-rw-r--r--src/bin/efreet/efreetd_cache.h (renamed from legacy/efreet/src/bin/efreetd_cache.h)0
-rw-r--r--src/bin/efreet/efreetd_dbus.c (renamed from legacy/efreet/src/bin/efreetd_dbus.c)16
-rw-r--r--src/bin/efreet/efreetd_dbus.h (renamed from legacy/efreet/src/bin/efreetd_dbus.h)0
-rw-r--r--src/lib/efreet/Efreet.h (renamed from legacy/efreet/src/lib/Efreet.h)49
-rw-r--r--src/lib/efreet/Efreet_Mime.h (renamed from legacy/efreet/src/lib/Efreet_Mime.h)2
-rw-r--r--src/lib/efreet/Efreet_Trash.h (renamed from legacy/efreet/src/lib/Efreet_Trash.h)2
-rw-r--r--src/lib/efreet/efreet.c (renamed from legacy/efreet/src/lib/efreet.c)4
-rw-r--r--src/lib/efreet/efreet_alloca.h (renamed from legacy/efreet/src/lib/efreet_alloca.h)0
-rw-r--r--src/lib/efreet/efreet_base.c (renamed from legacy/efreet/src/lib/efreet_base.c)0
-rw-r--r--src/lib/efreet/efreet_base.h (renamed from legacy/efreet/src/lib/efreet_base.h)1
-rw-r--r--src/lib/efreet/efreet_cache.c (renamed from legacy/efreet/src/lib/efreet_cache.c)6
-rw-r--r--src/lib/efreet/efreet_cache_private.h (renamed from legacy/efreet/src/lib/efreet_cache_private.h)0
-rw-r--r--src/lib/efreet/efreet_copy.h (renamed from legacy/efreet/src/lib/efreet_copy.h)0
-rw-r--r--src/lib/efreet/efreet_desktop.c (renamed from legacy/efreet/src/lib/efreet_desktop.c)4
-rw-r--r--src/lib/efreet/efreet_desktop.h (renamed from legacy/efreet/src/lib/efreet_desktop.h)1
-rw-r--r--src/lib/efreet/efreet_desktop_command.c (renamed from legacy/efreet/src/lib/efreet_desktop_command.c)14
-rw-r--r--src/lib/efreet/efreet_icon.c (renamed from legacy/efreet/src/lib/efreet_icon.c)2
-rw-r--r--src/lib/efreet/efreet_icon.h (renamed from legacy/efreet/src/lib/efreet_icon.h)1
-rw-r--r--src/lib/efreet/efreet_ini.c (renamed from legacy/efreet/src/lib/efreet_ini.c)4
-rw-r--r--src/lib/efreet/efreet_ini.h (renamed from legacy/efreet/src/lib/efreet_ini.h)1
-rw-r--r--src/lib/efreet/efreet_menu.c (renamed from legacy/efreet/src/lib/efreet_menu.c)6
-rw-r--r--src/lib/efreet/efreet_menu.h (renamed from legacy/efreet/src/lib/efreet_menu.h)1
-rw-r--r--src/lib/efreet/efreet_mime.c (renamed from legacy/efreet/src/lib/efreet_mime.c)6
-rw-r--r--src/lib/efreet/efreet_private.h (renamed from legacy/efreet/src/lib/efreet_private.h)1
-rw-r--r--src/lib/efreet/efreet_trash.c (renamed from legacy/efreet/src/lib/efreet_trash.c)0
-rw-r--r--src/lib/efreet/efreet_uri.c (renamed from legacy/efreet/src/lib/efreet_uri.c)0
-rw-r--r--src/lib/efreet/efreet_uri.h (renamed from legacy/efreet/src/lib/efreet_uri.h)1
-rw-r--r--src/lib/efreet/efreet_utils.c (renamed from legacy/efreet/src/lib/efreet_utils.c)0
-rw-r--r--src/lib/efreet/efreet_utils.h (renamed from legacy/efreet/src/lib/efreet_utils.h)1
-rw-r--r--src/lib/efreet/efreet_xml.c (renamed from legacy/efreet/src/lib/efreet_xml.c)0
-rw-r--r--src/lib/efreet/efreet_xml.h (renamed from legacy/efreet/src/lib/efreet_xml.h)7
-rw-r--r--src/tests/efreet/compare/comp.h (renamed from legacy/efreet/src/tests/compare/comp.h)0
-rw-r--r--src/tests/efreet/compare/efreet_alloc.c (renamed from legacy/efreet/src/tests/compare/efreet_alloc.c)0
-rw-r--r--src/tests/efreet/compare/efreet_menu_alloc.c (renamed from legacy/efreet/src/tests/compare/efreet_menu_alloc.c)0
-rw-r--r--src/tests/efreet/data/entry (renamed from legacy/efreet/src/tests/data/entry)bin647 -> 647 bytes
-rw-r--r--src/tests/efreet/data/entry.png (renamed from legacy/efreet/src/tests/data/entry.png)bin648 -> 648 bytes
-rw-r--r--src/tests/efreet/data/long.ini (renamed from legacy/efreet/src/tests/data/long.ini)0
-rw-r--r--src/tests/efreet/data/preferences.menu (renamed from legacy/efreet/src/tests/data/preferences.menu)0
-rw-r--r--src/tests/efreet/data/sub/Makefile.am8
-rw-r--r--src/tests/efreet/data/sub/test.desktop (renamed from legacy/efreet/src/tests/data/sub/test.desktop)0
-rw-r--r--src/tests/efreet/data/test.desktop (renamed from legacy/efreet/src/tests/data/test.desktop)0
-rw-r--r--src/tests/efreet/data/test.ini (renamed from legacy/efreet/src/tests/data/test.ini)0
-rw-r--r--src/tests/efreet/data/test.menu (renamed from legacy/efreet/src/tests/data/test.menu)0
-rw-r--r--src/tests/efreet/data/test_garbage (renamed from legacy/efreet/src/tests/data/test_garbage)0
-rw-r--r--src/tests/efreet/data/test_menu_bad_comment.menu (renamed from legacy/efreet/src/tests/data/test_menu_bad_comment.menu)0
-rw-r--r--src/tests/efreet/data/test_menu_slash_bad.menu (renamed from legacy/efreet/src/tests/data/test_menu_slash_bad.menu)0
-rw-r--r--src/tests/efreet/data/test_type.desktop (renamed from legacy/efreet/src/tests/data/test_type.desktop)0
-rw-r--r--src/tests/efreet/ef_cache.c (renamed from legacy/efreet/src/tests/ef_cache.c)6
-rw-r--r--src/tests/efreet/ef_data_dirs.c (renamed from legacy/efreet/src/tests/ef_data_dirs.c)0
-rw-r--r--src/tests/efreet/ef_desktop.c (renamed from legacy/efreet/src/tests/ef_desktop.c)22
-rw-r--r--src/tests/efreet/ef_icon_theme.c (renamed from legacy/efreet/src/tests/ef_icon_theme.c)2
-rw-r--r--src/tests/efreet/ef_ini.c (renamed from legacy/efreet/src/tests/ef_ini.c)6
-rw-r--r--src/tests/efreet/ef_locale.c (renamed from legacy/efreet/src/tests/ef_locale.c)0
-rw-r--r--src/tests/efreet/ef_menu.c (renamed from legacy/efreet/src/tests/ef_menu.c)10
-rw-r--r--src/tests/efreet/ef_mime.c (renamed from legacy/efreet/src/tests/ef_mime.c)8
-rw-r--r--src/tests/efreet/ef_test.h (renamed from legacy/efreet/src/tests/ef_test.h)0
-rw-r--r--src/tests/efreet/ef_utils.c (renamed from legacy/efreet/src/tests/ef_utils.c)0
-rw-r--r--src/tests/efreet/efreet_icon_cache_dump.c (renamed from legacy/efreet/src/tests/efreet_icon_cache_dump.c)0
-rw-r--r--src/tests/efreet/efreet_spec_test.c (renamed from legacy/efreet/src/tests/efreet_spec_test.c)2
-rw-r--r--src/tests/efreet/efreet_suite.c (renamed from legacy/efreet/src/tests/efreet_suite.c)0
-rw-r--r--src/tests/efreet/efreet_suite.h (renamed from legacy/efreet/src/tests/efreet_suite.h)0
-rw-r--r--src/tests/efreet/efreet_test_efreet.c (renamed from legacy/efreet/src/tests/efreet_test_efreet.c)0
-rw-r--r--src/tests/efreet/efreet_test_efreet_cache.c (renamed from legacy/efreet/src/tests/efreet_test_efreet_cache.c)0
-rw-r--r--src/tests/efreet/efreet_user_dir.c (renamed from legacy/efreet/src/tests/efreet_user_dir.c)0
-rw-r--r--src/tests/efreet/main.c (renamed from legacy/efreet/src/tests/main.c)0
83 files changed, 457 insertions, 88 deletions
diff --git a/AUTHORS b/AUTHORS
index b8f024e5cb..6403d1ecd9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -213,3 +213,15 @@ Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
213José Roberto de Souza <zehortigoza@profusion.mobi> 213José Roberto de Souza <zehortigoza@profusion.mobi>
214Leandro Pereira <leandro@profusion.mobi> 214Leandro Pereira <leandro@profusion.mobi>
215Lucas De Marchi <lucas.demarchi@profusion.mobi> 215Lucas De Marchi <lucas.demarchi@profusion.mobi>
216
217
218Efreet
219------
220
221dan 'dj2' sinclair
222Brian 'rephorm' Mattern
223Sebastian Dransfeld <sd@tango.flipp.net>
224Nathan 'RbdPngn' Ingersoll
225Nicholas 'Mekius' Hughart
226Albin "Lutin" Tonnerre <albin.tonnerre@gmail.com>
227Mathieu Taillefumier <mathieu.taillefumier@free.fr>
diff --git a/configure.ac b/configure.ac
index 1e5953cba2..9e9d02928d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,6 +116,13 @@ case "${build_tests}" in
116 ;; 116 ;;
117esac 117esac
118 118
119dbusservicedir="${datadir}/dbus-1/services"
120AC_ARG_WITH([dbus-services],
121 [AC_HELP_STRING([--with-dbus-services=DBUS_SERVICES],
122 [specify a directory to store dbus service files.])],
123 [dbusservicedir=$withval])
124AC_SUBST(dbusservicedir)
125
119 126
120#### Default values 127#### Default values
121 128
@@ -156,8 +163,8 @@ requirements_libs_ecore_evas=""
156requirements_libs_embryo="" 163requirements_libs_embryo=""
157requirements_libs_eio="" 164requirements_libs_eio=""
158requirements_libs_edbus="" 165requirements_libs_edbus=""
166requirements_libs_efreet=""
159#requirements_libs_edje="" 167#requirements_libs_edje=""
160#requirements_libs_efreet=""
161#requirements_libs_eeze="" 168#requirements_libs_eeze=""
162#requirements_libs_emotion="" 169#requirements_libs_emotion=""
163#requirements_libs_ethumb="" 170#requirements_libs_ethumb=""
@@ -186,8 +193,8 @@ requirements_pc_ecore_evas=""
186requirements_pc_embryo="" 193requirements_pc_embryo=""
187requirements_pc_eio="" 194requirements_pc_eio=""
188requirements_pc_edbus="" 195requirements_pc_edbus=""
196requirements_pc_efreet=""
189#requirements_pc_edje="" 197#requirements_pc_edje=""
190#requirements_pc_efreet=""
191#requirements_pc_eeze="" 198#requirements_pc_eeze=""
192#requirements_pc_emotion="" 199#requirements_pc_emotion=""
193#requirements_pc_ethumb="" 200#requirements_pc_ethumb=""
@@ -205,8 +212,8 @@ requirements_pc_deps_ecore_wayland=""
205requirements_pc_deps_ecore_evas="" 212requirements_pc_deps_ecore_evas=""
206requirements_pc_deps_embryo="" 213requirements_pc_deps_embryo=""
207requirements_pc_deps_edbus="" 214requirements_pc_deps_edbus=""
215requirements_pc_deps_efreet=""
208#requirements_pc_deps_edje="" 216#requirements_pc_deps_edje=""
209#requirements_pc_deps_efreet=""
210#requirements_pc_deps_eeze="" 217#requirements_pc_deps_eeze=""
211#requirements_pc_deps_emotion="" 218#requirements_pc_deps_emotion=""
212#requirements_pc_deps_ethumb="" 219#requirements_pc_deps_ethumb=""
@@ -235,8 +242,8 @@ AC_SUBST([requirements_libs_ecore_evas])
235AC_SUBST([requirements_libs_embryo]) 242AC_SUBST([requirements_libs_embryo])
236AC_SUBST([requirements_libs_eio]) 243AC_SUBST([requirements_libs_eio])
237AC_SUBST([requirements_libs_edbus]) 244AC_SUBST([requirements_libs_edbus])
245AC_SUBST([requirements_libs_efreet])
238#AC_SUBST([requirements_libs_edje]) 246#AC_SUBST([requirements_libs_edje])
239#AC_SUBST([requirements_libs_efreet])
240#AC_SUBST([requirements_libs_eeze]) 247#AC_SUBST([requirements_libs_eeze])
241#AC_SUBST([requirements_libs_emotion]) 248#AC_SUBST([requirements_libs_emotion])
242#AC_SUBST([requirements_libs_ethumb]) 249#AC_SUBST([requirements_libs_ethumb])
@@ -267,8 +274,8 @@ AC_SUBST([requirements_pc_ecore_evas])
267AC_SUBST([requirements_pc_embryo]) 274AC_SUBST([requirements_pc_embryo])
268AC_SUBST([requirements_pc_eio]) 275AC_SUBST([requirements_pc_eio])
269AC_SUBST([requirements_pc_edbus]) 276AC_SUBST([requirements_pc_edbus])
277AC_SUBST([requirements_pc_efreet])
270#AC_SUBST([requirements_pc_edje]) 278#AC_SUBST([requirements_pc_edje])
271#AC_SUBST([requirements_pc_efreet])
272#AC_SUBST([requirements_pc_eeze]) 279#AC_SUBST([requirements_pc_eeze])
273#AC_SUBST([requirements_pc_emotion]) 280#AC_SUBST([requirements_pc_emotion])
274#AC_SUBST([requirements_pc_ethumb]) 281#AC_SUBST([requirements_pc_ethumb])
@@ -370,6 +377,8 @@ have_po="yes"
370have_po="no" 377have_po="no"
371]) 378])
372AC_SUBST([LTLIBINTL]) 379AC_SUBST([LTLIBINTL])
380LOCALE_DIR="${localedir}"
381AC_SUBST(LOCALE_DIR)
373 382
374if test "x${POSUB}" = "x" ; then 383if test "x${POSUB}" = "x" ; then
375 have_po="no" 384 have_po="no"
@@ -666,6 +675,7 @@ AC_SUBST([SSE3_CFLAGS])
666AC_CHECK_FUNCS([\ 675AC_CHECK_FUNCS([\
667backtrace \ 676backtrace \
668backtrace_symbols \ 677backtrace_symbols \
678clearenv \
669execvp \ 679execvp \
670dirfd \ 680dirfd \
671fpathconf \ 681fpathconf \
@@ -3360,7 +3370,7 @@ AC_MSG_NOTICE([EDBus checks])
3360 3370
3361### Checks for libraries 3371### Checks for libraries
3362 3372
3363## Eina, Ecore, Ecore_Input 3373## Eina, Ecore
3364 3374
3365requirements_pc_edbus="ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION}" 3375requirements_pc_edbus="ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION}"
3366 3376
@@ -3383,6 +3393,44 @@ PKG_CHECK_MODULES([EDBUS], [${requirements_pc_deps_edbus}])
3383#### End of EDBus 3393#### End of EDBus
3384 3394
3385 3395
3396#### Efreet
3397
3398AC_MSG_NOTICE([Efreet checks])
3399
3400### Additional options to configure
3401
3402### Default values
3403
3404AC_DEFINE([SLOPPY_SPEC], [1], [Sloppy Spec Compliance])
3405
3406### Checks for programs
3407
3408### Checks for libraries
3409
3410## Eet, Ecore, Ecore_File, EDBus, Eina, Evil
3411
3412requirements_pc_efreet="eet >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} ecore-file >= ${PACKAGE_VERSION} edbus2 >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${platform_pc_evil}"
3413
3414AC_ARG_VAR([EFREET_CFLAGS], [preprocessor flags for Efreet])
3415AC_SUBST([EFREET_CFLAGS])
3416AC_ARG_VAR([EFREET_LIBS], [linker flags for Efreet])
3417AC_SUBST([EFREET_LIBS])
3418
3419### Checks for header files
3420
3421### Checks for types
3422
3423### Checks for structures
3424
3425### Checks for compiler characteristics
3426
3427### Checks for linker characteristics
3428
3429### Checks for library functions
3430
3431#### End of Efreet
3432
3433
3386 3434
3387AC_CONFIG_FILES([ 3435AC_CONFIG_FILES([
3388Makefile 3436Makefile
@@ -3443,6 +3491,10 @@ pc/ecore-audio.pc
3443pc/embryo.pc 3491pc/embryo.pc
3444pc/eio.pc 3492pc/eio.pc
3445pc/edbus2.pc 3493pc/edbus2.pc
3494pc/efreet.pc
3495pc/efreet-mime.pc
3496pc/efreet-trash.pc
3497dbus-services/org.enlightenment.Efreet.service
3446$po_makefile_in 3498$po_makefile_in
3447]) 3499])
3448 3500
diff --git a/legacy/efreet/org.enlightenment.Efreet.service.in b/dbus-services/org.enlightenment.Efreet.service.in
index 94eedc87e3..94eedc87e3 100644
--- a/legacy/efreet/org.enlightenment.Efreet.service.in
+++ b/dbus-services/org.enlightenment.Efreet.service.in
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index c93922a0c2..ce06e1ebf7 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -806,7 +806,9 @@ evas_ _evas_ Evas_ _Evas_ EVAS_ _EVAS_ \
806eet_ _eet_ Eet_ _Eet_ EET_ _EET_ \ 806eet_ _eet_ Eet_ _Eet_ EET_ _EET_ \
807ecore_ _ecore_ Ecore_ _Ecore_ ECORE_ _ECORE_ \ 807ecore_ _ecore_ Ecore_ _Ecore_ ECORE_ _ECORE_ \
808eio_ _eio_ Eio_ _Eio_ EIO_ _EIO_ \ 808eio_ _eio_ Eio_ _Eio_ EIO_ _EIO_ \
809edbus_ _edbus_ EDBus_ _EDBus_ EDBUS_ _EDBUS_ 809edbus_ _edbus_ EDBus_ _EDBus_ EDBUS_ _EDBUS_ \
810efreet_ _efreet_ Efreet_ _Efreet_ EFREET_ _EFREET_
811
810 812
811#--------------------------------------------------------------------------- 813#---------------------------------------------------------------------------
812# configuration options related to the HTML output 814# configuration options related to the HTML output
@@ -914,13 +916,13 @@ DOCSET_FEEDNAME = "Doxygen generated docs"
914# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 916# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
915# will append .docset to the name. 917# will append .docset to the name.
916 918
917DOCSET_BUNDLE_ID = org.enlightenment.Eina 919DOCSET_BUNDLE_ID = org.enlightenment.Efl
918 920
919# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify 921# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
920# the documentation publisher. This should be a reverse domain-name style 922# the documentation publisher. This should be a reverse domain-name style
921# string, e.g. com.mycompany.MyDocSet.documentation. 923# string, e.g. com.mycompany.MyDocSet.documentation.
922 924
923DOCSET_PUBLISHER_ID = org.enlightenment.Eina 925DOCSET_PUBLISHER_ID = org.enlightenment.Ef;
924 926
925# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. 927# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
926 928
@@ -987,7 +989,7 @@ QCH_FILE =
987# Qt Help Project output. For more information please see 989# Qt Help Project output. For more information please see
988# http://doc.trolltech.com/qthelpproject.html#namespace 990# http://doc.trolltech.com/qthelpproject.html#namespace
989 991
990QHP_NAMESPACE = org.enlightenment.Eina 992QHP_NAMESPACE = org.enlightenment.Efl
991 993
992# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 994# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
993# Qt Help Project output. For more information please see 995# Qt Help Project output. For more information please see
@@ -1038,7 +1040,7 @@ GENERATE_ECLIPSEHELP = NO
1038# the directory name containing the HTML and XML files should also have 1040# the directory name containing the HTML and XML files should also have
1039# this name. 1041# this name.
1040 1042
1041ECLIPSE_DOC_ID = org.enlightenment.Eina 1043ECLIPSE_DOC_ID = org.enlightenment.Efl
1042 1044
1043# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 1045# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
1044# top of each HTML page. The value NO (the default) enables the index and 1046# top of each HTML page. The value NO (the default) enables the index and
@@ -1422,7 +1424,8 @@ PREDEFINED = EINA_MAGIC_DEBUG \
1422 EINA_WARN_UNUSED_RESULT= \ 1424 EINA_WARN_UNUSED_RESULT= \
1423 EAPI= \ 1425 EAPI= \
1424 EINA_PURE= \ 1426 EINA_PURE= \
1425 EINA_CONST= 1427 EINA_CONST= \
1428 EINA_UNUSED=
1426 1429
1427# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 1430# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
1428# this tag can be used to specify a list of macro names that should be expanded. 1431# this tag can be used to specify a list of macro names that should be expanded.
diff --git a/doc/main.dox b/doc/main.dox
index 0b10bae8ea..ef54b214fa 100644
--- a/doc/main.dox
+++ b/doc/main.dox
@@ -17,6 +17,7 @@
17 * @li @ref evil_main microsoft windows portability layer. 17 * @li @ref evil_main microsoft windows portability layer.
18 * @li @ref eio_main asynchronous input/output 18 * @li @ref eio_main asynchronous input/output
19 * @li @ref edbus_main d-bus integration. 19 * @li @ref edbus_main d-bus integration.
20 * @li @ref efreet_main freedesktop.org (xdg) menu and desktop integration.
20 * 21 *
21 */ 22 */
22 23
@@ -77,8 +78,8 @@
77 * @author Mike McCormack <mj.mccormack@@samsung.com> 78 * @author Mike McCormack <mj.mccormack@@samsung.com>
78 * @author Myoungwoon Roy Kim(roy_kim) <myoungwoon.kim@@samsung.com> <myoungwoon@@gmail.com> 79 * @author Myoungwoon Roy Kim(roy_kim) <myoungwoon.kim@@samsung.com> <myoungwoon@@gmail.com>
79 * @author Myungjae Lee <mjae.lee@@samsung.com> 80 * @author Myungjae Lee <mjae.lee@@samsung.com>
80 * @author Nathan Ingersoll <ningerso@@d.umn.edu> 81 * @author Nathan 'RbdPngn' Ingersoll <ningerso@@d.umn.edu>
81 * @author Nathan Ingersoll <rbdpngn@@users.sourceforge.net> 82 * @author Nicholas 'Mekius' Hughart
82 * @author Nicholas Curran <quasar@@bigblue.net.au> 83 * @author Nicholas Curran <quasar@@bigblue.net.au>
83 * @author Nicolas Aguirre <aguirre.nicolas@@gmail.com> 84 * @author Nicolas Aguirre <aguirre.nicolas@@gmail.com>
84 * @author Peter Wehrfritz <peter.wehrfritz@@web.de> 85 * @author Peter Wehrfritz <peter.wehrfritz@@web.de>
@@ -91,7 +92,6 @@
91 * @author Samsung SAIT 92 * @author Samsung SAIT
92 * @author Sangho Park <gouache95@gmail.com> 93 * @author Sangho Park <gouache95@gmail.com>
93 * @author Sebastian Dransfeld <sd@@tango.flipp.net> 94 * @author Sebastian Dransfeld <sd@@tango.flipp.net>
94 * @author Sebastian Dransfeld <sebastid@@tango.flipp.net>
95 * @author Seungsoo Woo <om101.woo@@samsung.com> 95 * @author Seungsoo Woo <om101.woo@@samsung.com>
96 * @author Shilpa Singh <shilpa.singh@@samsung.com> <shilpasingh.o@@gmail.com> 96 * @author Shilpa Singh <shilpa.singh@@samsung.com> <shilpasingh.o@@gmail.com>
97 * @author Simon Poole <simon.armlinux@@themalago.net> 97 * @author Simon Poole <simon.armlinux@@themalago.net>
@@ -177,3 +177,9 @@
177 * 177 *
178 * @brief D-Bus integration with EFL (Ecore). 178 * @brief D-Bus integration with EFL (Ecore).
179 */ 179 */
180
181/**
182 * @defgroup Efreet
183 *
184 * @brief FreeDesktop.Org (XDG) menu and desktop integration.
185 */
diff --git a/legacy/efreet/ChangeLog b/old/ChangeLog.efreet
index f7ef484526..f7ef484526 100644
--- a/legacy/efreet/ChangeLog
+++ b/old/ChangeLog.efreet
diff --git a/legacy/efreet/NEWS b/old/NEWS.efreet
index fe6888d0c9..fe6888d0c9 100644
--- a/legacy/efreet/NEWS
+++ b/old/NEWS.efreet
diff --git a/legacy/efreet/efreet-mime.pc.in b/pc/efreet-mime.pc.in
index d65101799d..b1abc0a3a2 100644
--- a/legacy/efreet/efreet-mime.pc.in
+++ b/pc/efreet-mime.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
5 5
6Name: efreet-mime 6Name: efreet-mime
7Description: Freedesktop Shared Mime Info standard implementation for the EFL 7Description: Freedesktop Shared Mime Info standard implementation for the EFL
8@pkgconfig_requires_private@: @requirement_efreet@
9Version: @VERSION@ 8Version: @VERSION@
9Requires.private: @requirement_efreet@
10Libs: -L${libdir} -lefreet_mime 10Libs: -L${libdir} -lefreet_mime
11Cflags: -I${includedir}/efreet-@VMAJ@ 11Cflags: -I${includedir}/efreet-@VMAJ@
diff --git a/legacy/efreet/efreet-trash.pc.in b/pc/efreet-trash.pc.in
index 5a4ccf87b3..decfa7c0d3 100644
--- a/legacy/efreet/efreet-trash.pc.in
+++ b/pc/efreet-trash.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
5 5
6Name: efreet-trash 6Name: efreet-trash
7Description: Freedesktop Shared Trash implementation for the EFL 7Description: Freedesktop Shared Trash implementation for the EFL
8@pkgconfig_requires_private@: @requirement_efreet@
9Version: @VERSION@ 8Version: @VERSION@
9Requires.private: @requirement_efreet@
10Libs: -L${libdir} -lefreet_trash 10Libs: -L${libdir} -lefreet_trash
11Cflags: -I${includedir}/efreet-@VMAJ@ 11Cflags: -I${includedir}/efreet-@VMAJ@
diff --git a/legacy/efreet/efreet.pc.in b/pc/efreet.pc.in
index 2f4db8ec6d..26d7f568d6 100644
--- a/legacy/efreet/efreet.pc.in
+++ b/pc/efreet.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
5 5
6Name: efreet 6Name: efreet
7Description: Freedesktop standards implementation for the EFL 7Description: Freedesktop standards implementation for the EFL
8@pkgconfig_requires_private@: @requirement_efreet@
9Version: @VERSION@ 8Version: @VERSION@
9Requires.private: @requirement_efreet@
10Libs: -L${libdir} -lefreet 10Libs: -L${libdir} -lefreet
11Cflags: -I${includedir}/efreet-@VMAJ@ 11Cflags: -I${includedir}/efreet-@VMAJ@
diff --git a/src/Makefile.am b/src/Makefile.am
index b109c6500d..8a90462f1d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,6 +7,7 @@ SUBDIRS = . benchmarks examples
7 7
8lib_LTLIBRARIES = 8lib_LTLIBRARIES =
9bin_PROGRAMS = 9bin_PROGRAMS =
10noinst_PROGRAMS =
10check_PROGRAMS = 11check_PROGRAMS =
11EXTRA_DIST = 12EXTRA_DIST =
12 13
@@ -59,6 +60,7 @@ endif
59include Makefile_Embryo.am 60include Makefile_Embryo.am
60include Makefile_Eio.am 61include Makefile_Eio.am
61include Makefile_EDBus.am 62include Makefile_EDBus.am
63include Makefile_Efreet.am
62 64
63.PHONY: benchmark examples 65.PHONY: benchmark examples
64 66
@@ -75,6 +77,7 @@ install-examples:
75 77
76clean-local: 78clean-local:
77 rm -rf bin/eet/*.gcno 79 rm -rf bin/eet/*.gcno
80 rm -rf bin/efreet/*.gcno
78 rm -rf lib/evil/*.gcno 81 rm -rf lib/evil/*.gcno
79 rm -rf lib/eina/*.gcno 82 rm -rf lib/eina/*.gcno
80 rm -rf lib/eo/*.gcno 83 rm -rf lib/eo/*.gcno
@@ -90,6 +93,7 @@ clean-local:
90 rm -rf lib/evas/file/*.gcno 93 rm -rf lib/evas/file/*.gcno
91 rm -rf lib/embryo/*.gcno 94 rm -rf lib/embryo/*.gcno
92 rm -rf lib/edbus/*.gcno 95 rm -rf lib/edbus/*.gcno
96 rm -rf lib/efreet/*.gcno
93 rm -rf modules/eina/mp/pass_through/*.gcno 97 rm -rf modules/eina/mp/pass_through/*.gcno
94 rm -rf modules/eina/mp/one_big/*.gcno 98 rm -rf modules/eina/mp/one_big/*.gcno
95 rm -rf modules/eina/mp/chained_pool/*.gcno 99 rm -rf modules/eina/mp/chained_pool/*.gcno
diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am
index c1c81e826a..36248fb0c9 100644
--- a/src/Makefile_Ecore_X.am
+++ b/src/Makefile_Ecore_X.am
@@ -138,7 +138,7 @@ endif
138 138
139### Utils 139### Utils
140 140
141noinst_PROGRAMS = utils/ecore/makekeys 141noinst_PROGRAMS += utils/ecore/makekeys
142 142
143utils_ecore_makekeys_SOURCES = utils/ecore/makekeys.c 143utils_ecore_makekeys_SOURCES = utils/ecore/makekeys.c
144 144
diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am
new file mode 100644
index 0000000000..dd7bca988b
--- /dev/null
+++ b/src/Makefile_Efreet.am
@@ -0,0 +1,222 @@
1
2### Library
3
4lib_LTLIBRARIES += \
5lib/efreet/libefreet.la \
6lib/efreet/libefreet_mime.la \
7lib/efreet/libefreet_trash.la
8
9EFREET_COMMON_CPPFLAGS = \
10-I$(top_srcdir)/src/lib/eina \
11-I$(top_builddir)/src/lib/eina \
12-I$(top_srcdir)/src/lib/eo \
13-I$(top_builddir)/src/lib/eo \
14-I$(top_srcdir)/src/lib/ecore \
15-I$(top_builddir)/src/lib/ecore \
16-I$(top_srcdir)/src/lib/ecore_file \
17-I$(top_builddir)/src/lib/ecore_file \
18-I$(top_srcdir)/src/lib/eet \
19-I$(top_builddir)/src/lib/eet \
20-I$(top_srcdir)/src/lib/edbus \
21-I$(top_builddir)/src/lib/edbus \
22-I$(top_srcdir)/src/lib/efreet \
23-I$(top_builddir)/src/lib/efreet \
24-DPACKAGE_LIB_DIR=\"$(libdir)\" \
25-DPACKAGE_DATA_DIR=\"$(datadir)\" \
26-DLOCALE_DIR=\"@LOCALE_DIR@\" \
27-DEFL_EFREET_BUILD \
28@EFL_CFLAGS@ \
29@EFL_COV_CFLAGS@ \
30@EFREET_CFLAGS@ \
31@USE_EVIL_CFLAGS@
32
33EFREET_COMMON_LIBADD = \
34lib/eina/libeina.la \
35lib/eo/libeo.la \
36lib/ecore/libecore.la \
37lib/ecore_file/libecore_file.la \
38lib/eet/libeet.la \
39lib/edbus/libedbus2.la \
40@USE_EVIL_LIBS@ \
41@EFREET_LIBS@ \
42@EFL_COV_LIBS@
43
44EFREET_COMMON_USER_LIBADD = $(EFREET_COMMON_LIBADD) lib/efreet/libefreet.la
45
46EFREET_COMMON_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
47
48installed_efreetmainheadersdir = $(includedir)/efreet-@VMAJ@
49dist_installed_efreetmainheaders_DATA = \
50lib/efreet/Efreet.h \
51lib/efreet/efreet_base.h \
52lib/efreet/efreet_desktop.h \
53lib/efreet/efreet_icon.h \
54lib/efreet/efreet_ini.h \
55lib/efreet/efreet_menu.h \
56lib/efreet/efreet_utils.h \
57lib/efreet/efreet_uri.h \
58lib/efreet/Efreet_Mime.h \
59lib/efreet/Efreet_Trash.h
60
61# libefreet.la
62lib_efreet_libefreet_la_SOURCES = \
63lib/efreet/efreet.c \
64lib/efreet/efreet_base.c \
65lib/efreet/efreet_icon.c \
66lib/efreet/efreet_xml.c \
67lib/efreet/efreet_ini.c \
68lib/efreet/efreet_desktop.c \
69lib/efreet/efreet_desktop_command.c \
70lib/efreet/efreet_menu.c \
71lib/efreet/efreet_utils.c \
72lib/efreet/efreet_uri.c \
73lib/efreet/efreet_cache.c \
74lib/efreet/efreet_private.h \
75lib/efreet/efreet_xml.h \
76lib/efreet/efreet_cache_private.h \
77lib/efreet/efreet_alloca.h
78
79lib_efreet_libefreet_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
80lib_efreet_libefreet_la_LIBADD = $(EFREET_COMMON_LIBADD)
81lib_efreet_libefreet_la_LDFLAGS = $(EFREET_COMMON_LDFLAGS)
82
83# libefreet_mime.la
84lib_efreet_libefreet_mime_la_SOURCES = lib/efreet/efreet_mime.c
85lib_efreet_libefreet_mime_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
86lib_efreet_libefreet_mime_la_LIBADD = $(EFREET_COMMON_USER_LIBADD)
87lib_efreet_libefreet_mime_la_LDFLAGS = $(EFREET_COMMON_LDFLAGS)
88
89# libefreet_trash.la
90lib_efreet_libefreet_trash_la_SOURCES = lib/efreet/efreet_trash.c
91lib_efreet_libefreet_trash_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
92lib_efreet_libefreet_trash_la_LIBADD = $(EFREET_COMMON_USER_LIBADD)
93lib_efreet_libefreet_trash_la_LDFLAGS = $(EFREET_COMMON_LDFLAGS)
94
95
96### Binary
97
98bin_PROGRAMS += bin/efreet/efreetd
99
100bin_efreet_efreetd_SOURCES = \
101bin/efreet/efreetd.c \
102bin/efreet/efreetd.h \
103bin/efreet/efreetd_dbus.h \
104bin/efreet/efreetd_dbus.c \
105bin/efreet/efreetd_cache.h \
106bin/efreet/efreetd_cache.c
107
108bin_efreet_efreetd_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
109bin_efreet_efreetd_LDADD = $(EFREET_COMMON_USER_LIBADD)
110
111efreetinternal_bindir=$(libdir)/efreet
112efreetinternal_bin_PROGRAMS = \
113bin/efreet/efreet_desktop_cache_create \
114bin/efreet/efreet_icon_cache_create
115
116bin_efreet_efreet_desktop_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
117bin_efreet_efreet_desktop_cache_create_LDADD = $(EFREET_COMMON_USER_LIBADD)
118bin_efreet_efreet_desktop_cache_create_SOURCES = \
119bin/efreet/efreet_desktop_cache_create.c
120
121bin_efreet_efreet_icon_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
122bin_efreet_efreet_icon_cache_create_LDADD = $(EFREET_COMMON_USER_LIBADD)
123bin_efreet_efreet_icon_cache_create_SOURCES = \
124bin/efreet/efreet_icon_cache_create.c
125
126### Unit tests
127
128if EFL_ENABLE_TESTS
129
130noinst_PROGRAMS += \
131tests/efreet/efreet_test \
132tests/efreet/efreet_spec_test \
133tests/efreet/efreet_cache_test \
134tests/efreet/efreet_icon_cache_dump \
135tests/efreet/efreet_user_dir \
136tests/efreet/compare/efreet_alloc \
137tests/efreet/compare/efreet_menu_alloc
138
139
140# efreet_test
141tests_efreet_efreet_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
142tests_efreet_efreet_test_LDADD = \
143$(EFREET_COMMON_USER_LIBADD) \
144lib/efreet/libefreet_mime.la
145
146tests_efreet_efreet_test_SOURCES = \
147tests/efreet/ef_test.h \
148tests/efreet/ef_data_dirs.c \
149tests/efreet/ef_icon_theme.c \
150tests/efreet/ef_ini.c \
151tests/efreet/ef_utils.c \
152tests/efreet/ef_desktop.c \
153tests/efreet/ef_menu.c \
154tests/efreet/ef_mime.c \
155tests/efreet/main.c
156
157# efreet_spec_test
158tests_efreet_efreet_spec_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
159tests_efreet_efreet_spec_test_LDADD = $(EFREET_COMMON_USER_LIBADD)
160tests_efreet_efreet_spec_test_SOURCES = \
161tests/efreet/efreet_spec_test.c
162
163# efreet_cache_test
164tests_efreet_efreet_cache_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
165tests_efreet_efreet_cache_test_LDADD = $(EFREET_COMMON_USER_LIBADD)
166tests_efreet_efreet_cache_test_SOURCES = \
167tests/efreet/ef_cache.c
168
169# efreet_icon_cache_dump
170tests_efreet_efreet_icon_cache_dump_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
171tests_efreet_efreet_icon_cache_dump_LDADD = $(EFREET_COMMON_USER_LIBADD)
172tests_efreet_efreet_icon_cache_dump_SOURCES = \
173tests/efreet/efreet_icon_cache_dump.c
174
175# efreet_user_dir
176tests_efreet_efreet_user_dir_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
177tests_efreet_efreet_user_dir_LDADD = $(EFREET_COMMON_USER_LIBADD)
178tests_efreet_efreet_user_dir_SOURCES = \
179tests/efreet/efreet_user_dir.c
180
181# efreet_alloc
182tests_efreet_compare_efreet_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
183tests_efreet_compare_efreet_alloc_LDADD = $(EFREET_COMMON_USER_LIBADD)
184tests_efreet_compare_efreet_alloc_SOURCES = \
185tests/efreet/compare/efreet_alloc.c \
186tests/efreet/compare/comp.h
187
188# efreet_menu_alloc
189tests_efreet_compare_efreet_menu_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
190tests_efreet_compare_efreet_menu_alloc_LDADD = $(EFREET_COMMON_USER_LIBADD)
191tests_efreet_compare_efreet_menu_alloc_SOURCES = \
192tests/efreet/compare/efreet_menu_alloc.c \
193tests/efreet/compare/comp.h
194
195efreettestdir = $(datadir)/efreet/test
196efreettest_DATA = \
197tests/efreet/data/test.ini \
198tests/efreet/data/long.ini \
199tests/efreet/data/test.desktop \
200tests/efreet/data/test_type.desktop \
201tests/efreet/data/test.menu \
202tests/efreet/data/test_menu_slash_bad.menu \
203tests/efreet/data/entry.png \
204tests/efreet/data/entry \
205tests/efreet/data/preferences.menu \
206tests/efreet/data/test_garbage
207
208efreettestsubdir = $(datadir)/efreet/test/sub
209efreettestsub_DATA = \
210tests/efreet/data/sub/test.desktop
211
212check_PROGRAMS += tests/efreet/efreet_suite
213
214tests_efreet_efreet_suite_SOURCES = \
215tests/efreet/efreet_suite.c \
216tests/efreet/efreet_test_efreet.c \
217tests/efreet/efreet_test_efreet_cache.c
218
219tests_efreet_efreet_suite_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@
220tests_efreet_efreet_suite_LDADD = $(EFREET_COMMON_USER_LIBADD) @CHECK_LIBS@
221
222endif
diff --git a/legacy/efreet/src/bin/efreet_desktop_cache_create.c b/src/bin/efreet/efreet_desktop_cache_create.c
index 59bc1c223d..db3118ca1d 100644
--- a/legacy/efreet/src/bin/efreet_desktop_cache_create.c
+++ b/src/bin/efreet/efreet_desktop_cache_create.c
@@ -37,7 +37,7 @@ static Eina_Hash *comment = NULL;
37static Eina_Hash *exec = NULL; 37static Eina_Hash *exec = NULL;
38 38
39static int 39static int
40cache_add(const char *path, const char *file_id, int priority __UNUSED__, int *changed) 40cache_add(const char *path, const char *file_id, int priority EINA_UNUSED, int *changed)
41{ 41{
42 Efreet_Desktop *desk; 42 Efreet_Desktop *desk;
43 char *ext; 43 char *ext;
diff --git a/legacy/efreet/src/bin/efreet_icon_cache_create.c b/src/bin/efreet/efreet_icon_cache_create.c
index 662dd09469..662dd09469 100644
--- a/legacy/efreet/src/bin/efreet_icon_cache_create.c
+++ b/src/bin/efreet/efreet_icon_cache_create.c
diff --git a/legacy/efreet/src/bin/efreetd.c b/src/bin/efreet/efreetd.c
index a4ae720a4e..a4ae720a4e 100644
--- a/legacy/efreet/src/bin/efreetd.c
+++ b/src/bin/efreet/efreetd.c
diff --git a/legacy/efreet/src/bin/efreetd.h b/src/bin/efreet/efreetd.h
index a6931e3282..a6931e3282 100644
--- a/legacy/efreet/src/bin/efreetd.h
+++ b/src/bin/efreet/efreetd.h
diff --git a/legacy/efreet/src/bin/efreetd_cache.c b/src/bin/efreet/efreetd_cache.c
index 1e1d4c9ff1..5af928bde0 100644
--- a/legacy/efreet/src/bin/efreetd_cache.c
+++ b/src/bin/efreet/efreetd_cache.c
@@ -38,7 +38,7 @@ static void desktop_changes_monitor_add(const char *path);
38 38
39/* internal */ 39/* internal */
40static Eina_Bool 40static Eina_Bool
41icon_cache_update_cache_cb(void *data __UNUSED__) 41icon_cache_update_cache_cb(void *data EINA_UNUSED)
42{ 42{
43 char file[PATH_MAX]; 43 char file[PATH_MAX];
44 int prio; 44 int prio;
@@ -103,7 +103,7 @@ cache_icon_update(Eina_Bool flush)
103} 103}
104 104
105static Eina_Bool 105static Eina_Bool
106desktop_cache_update_cache_cb(void *data __UNUSED__) 106desktop_cache_update_cache_cb(void *data EINA_UNUSED)
107{ 107{
108 char file[PATH_MAX]; 108 char file[PATH_MAX];
109 int prio; 109 int prio;
@@ -141,7 +141,7 @@ desktop_cache_update_cache_cb(void *data __UNUSED__)
141} 141}
142 142
143static Eina_Bool 143static Eina_Bool
144cache_exe_data_cb(void *data __UNUSED__, int type __UNUSED__, void *event) 144cache_exe_data_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
145{ 145{
146 Ecore_Exe_Event_Data *ev; 146 Ecore_Exe_Event_Data *ev;
147 147
@@ -169,7 +169,7 @@ cache_exe_data_cb(void *data __UNUSED__, int type __UNUSED__, void *event)
169} 169}
170 170
171static Eina_Bool 171static Eina_Bool
172cache_exe_del_cb(void *data __UNUSED__, int type __UNUSED__, void *event) 172cache_exe_del_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
173{ 173{
174 Ecore_Exe_Event_Del *ev; 174 Ecore_Exe_Event_Del *ev;
175 175
@@ -188,7 +188,7 @@ cache_exe_del_cb(void *data __UNUSED__, int type __UNUSED__, void *event)
188} 188}
189 189
190static void 190static void
191icon_changes_cb(void *data __UNUSED__, Ecore_File_Monitor *em __UNUSED__, 191icon_changes_cb(void *data EINA_UNUSED, Ecore_File_Monitor *em EINA_UNUSED,
192 Ecore_File_Event event, const char *path) 192 Ecore_File_Event event, const char *path)
193{ 193{
194 /* TODO: If we get a stale symlink, we need to rerun cache creation */ 194 /* TODO: If we get a stale symlink, we need to rerun cache creation */
@@ -290,7 +290,7 @@ icon_changes_listen(void)
290} 290}
291 291
292static void 292static void
293desktop_changes_cb(void *data __UNUSED__, Ecore_File_Monitor *em __UNUSED__, 293desktop_changes_cb(void *data EINA_UNUSED, Ecore_File_Monitor *em EINA_UNUSED,
294 Ecore_File_Event event, const char *path) 294 Ecore_File_Event event, const char *path)
295{ 295{
296 const char *ext; 296 const char *ext;
diff --git a/legacy/efreet/src/bin/efreetd_cache.h b/src/bin/efreet/efreetd_cache.h
index 2fb520e384..2fb520e384 100644
--- a/legacy/efreet/src/bin/efreetd_cache.h
+++ b/src/bin/efreet/efreetd_cache.h
diff --git a/legacy/efreet/src/bin/efreetd_dbus.c b/src/bin/efreet/efreetd_dbus.c
index 5a69b68b64..b5e98ad083 100644
--- a/legacy/efreet/src/bin/efreetd_dbus.c
+++ b/src/bin/efreet/efreetd_dbus.c
@@ -26,14 +26,14 @@ static Ecore_Timer *shutdown = NULL;
26static int clients = 0; 26static int clients = 0;
27 27
28static Eina_Bool 28static Eina_Bool
29do_shutdown(void *data __UNUSED__) 29do_shutdown(void *data EINA_UNUSED)
30{ 30{
31 quit(); 31 quit();
32 return ECORE_CALLBACK_CANCEL; 32 return ECORE_CALLBACK_CANCEL;
33} 33}
34 34
35static void 35static void
36disconnected(void *context __UNUSED__, EDBus_Connection *connection __UNUSED__, void *event_info __UNUSED__) 36disconnected(void *context EINA_UNUSED, EDBus_Connection *connection EINA_UNUSED, void *event_info EINA_UNUSED)
37{ 37{
38 INF("disconnected"); 38 INF("disconnected");
39 quit(); 39 quit();
@@ -56,7 +56,7 @@ client_name_owner_changed_cb(void *data, const char *bus, const char *old_id, co
56} 56}
57 57
58static EDBus_Message * 58static EDBus_Message *
59do_register(const EDBus_Service_Interface *ifc __UNUSED__, const EDBus_Message *message) 59do_register(const EDBus_Service_Interface *ifc EINA_UNUSED, const EDBus_Message *message)
60{ 60{
61 EDBus_Message *reply; 61 EDBus_Message *reply;
62 const char *lang; 62 const char *lang;
@@ -82,7 +82,7 @@ do_register(const EDBus_Service_Interface *ifc __UNUSED__, const EDBus_Message *
82} 82}
83 83
84static EDBus_Message * 84static EDBus_Message *
85add_desktop_dirs(const EDBus_Service_Interface *ifc __UNUSED__, const EDBus_Message *message) 85add_desktop_dirs(const EDBus_Service_Interface *ifc EINA_UNUSED, const EDBus_Message *message)
86{ 86{
87 EDBus_Message_Iter *array = NULL; 87 EDBus_Message_Iter *array = NULL;
88 const char *dir; 88 const char *dir;
@@ -102,7 +102,7 @@ add_desktop_dirs(const EDBus_Service_Interface *ifc __UNUSED__, const EDBus_Mess
102} 102}
103 103
104static EDBus_Message * 104static EDBus_Message *
105add_icon_dirs(const EDBus_Service_Interface *ifc __UNUSED__, const EDBus_Message *message) 105add_icon_dirs(const EDBus_Service_Interface *ifc EINA_UNUSED, const EDBus_Message *message)
106{ 106{
107 EDBus_Message_Iter *array = NULL; 107 EDBus_Message_Iter *array = NULL;
108 const char *dir; 108 const char *dir;
@@ -122,7 +122,7 @@ add_icon_dirs(const EDBus_Service_Interface *ifc __UNUSED__, const EDBus_Message
122} 122}
123 123
124static EDBus_Message * 124static EDBus_Message *
125build_desktop_cache(const EDBus_Service_Interface *ifc __UNUSED__, const EDBus_Message *message __UNUSED__) 125build_desktop_cache(const EDBus_Service_Interface *ifc EINA_UNUSED, const EDBus_Message *message EINA_UNUSED)
126{ 126{
127 const char *lang; 127 const char *lang;
128 128
@@ -138,7 +138,7 @@ build_desktop_cache(const EDBus_Service_Interface *ifc __UNUSED__, const EDBus_M
138} 138}
139 139
140static EDBus_Message * 140static EDBus_Message *
141add_icon_exts(const EDBus_Service_Interface *ifc __UNUSED__, const EDBus_Message *message) 141add_icon_exts(const EDBus_Service_Interface *ifc EINA_UNUSED, const EDBus_Message *message)
142{ 142{
143 EDBus_Message_Iter *array = NULL; 143 EDBus_Message_Iter *array = NULL;
144 const char *ext; 144 const char *ext;
@@ -192,7 +192,7 @@ static const EDBus_Service_Interface_Desc desc = {
192}; 192};
193 193
194static void 194static void
195on_name_request(void *data __UNUSED__, const EDBus_Message *msg, EDBus_Pending *pending __UNUSED__) 195on_name_request(void *data EINA_UNUSED, const EDBus_Message *msg, EDBus_Pending *pending EINA_UNUSED)
196{ 196{
197 unsigned int reply; 197 unsigned int reply;
198 198
diff --git a/legacy/efreet/src/bin/efreetd_dbus.h b/src/bin/efreet/efreetd_dbus.h
index 9e9fd70700..9e9fd70700 100644
--- a/legacy/efreet/src/bin/efreetd_dbus.h
+++ b/src/bin/efreet/efreetd_dbus.h
diff --git a/legacy/efreet/src/lib/Efreet.h b/src/lib/efreet/Efreet.h
index 397baabb22..ae1ec188b8 100644
--- a/legacy/efreet/src/lib/Efreet.h
+++ b/src/lib/efreet/Efreet.h
@@ -9,9 +9,15 @@
9 */ 9 */
10 10
11/** 11/**
12 * @mainpage The Efreet Library 12 * @page efreet_main Efreet
13 * 13 *
14 * @section intro Introduction 14 * @section toc Table of Contents
15 *
16 * @li @ref efreet_main_intro
17 * @li @ref efreet_main_compiling
18 * @li @ref efreet_main_next_steps
19 *
20 * @section efreet_main_intro Introduction
15 * 21 *
16 * Efreet is a library designed to help apps work several of the 22 * Efreet is a library designed to help apps work several of the
17 * Freedesktop.org standards regarding Icons, Desktop files and Menus. To 23 * Freedesktop.org standards regarding Icons, Desktop files and Menus. To
@@ -24,6 +30,45 @@
24 * @li FDO URI Specification 30 * @li FDO URI Specification
25 * @li Shared Mime Info Specification 31 * @li Shared Mime Info Specification
26 * @li Trash Specification 32 * @li Trash Specification
33 *
34 * @section efreet_main_compiling How to compile
35 *
36 * Efreet is a library your application links to. The procedure for
37 * this is very simple. You simply have to compile your application
38 * with the appropriate compiler flags that the @c pkg-config script
39 * outputs. Mime and Thrash are separated modules. For example, to
40 * compile with mime support:
41 *
42 * Compiling C or C++ files into object files:
43 *
44 * @verbatim
45 gcc -c -o main.o main.c `pkg-config --cflags efreet efreet-mime`
46 @endverbatim
47 *
48 * Linking object files into a binary executable:
49 *
50 * @verbatim
51 gcc -o my_application main.o `pkg-config --libs efreet efreet-mime`
52 @endverbatim
53 *
54 * See @ref pkgconfig
55 *
56 * @section efreet_main_next_steps Next Steps
57 *
58 * After you understood what Efreet is and installed it in your system
59 * you should proceed understanding the programming interface.
60 *
61 * Recommended reading:
62 *
63 * @li @ref Efreet_Base for base directory specification (XDG variables).
64 * @li @ref Efreet_Desktop to access .desktop files
65 * @li @ref Efreet_Menu to access menus of .desktop files
66 * @li @ref Efreet_Mime to identify files based on extension or header.
67 * @li @ref Efreet_Trash to access file trash implementation.
68 * @li @ref Efreet_Ini for parsing INI-like key-value files.
69 * @li @ref Efreet_Uri for URI parsing and encoding.
70 * @li @ref Efreet_Utils general utilities.
71 *
27 */ 72 */
28 73
29#include <Eina.h> 74#include <Eina.h>
diff --git a/legacy/efreet/src/lib/Efreet_Mime.h b/src/lib/efreet/Efreet_Mime.h
index 2abd2943b1..5bfd4182f4 100644
--- a/legacy/efreet/src/lib/Efreet_Mime.h
+++ b/src/lib/efreet/Efreet_Mime.h
@@ -9,6 +9,8 @@
9 * Freedesktop.org Shared Mime Info standard. 9 * Freedesktop.org Shared Mime Info standard.
10 * Efreet_Mime.h provides all of the necessary headers and 10 * Efreet_Mime.h provides all of the necessary headers and
11 * includes to work with Efreet_Mime. 11 * includes to work with Efreet_Mime.
12 *
13 * @ingroup Efreet
12 * @{ 14 * @{
13 */ 15 */
14 16
diff --git a/legacy/efreet/src/lib/Efreet_Trash.h b/src/lib/efreet/Efreet_Trash.h
index 3f86aa2947..a32be6586f 100644
--- a/legacy/efreet/src/lib/Efreet_Trash.h
+++ b/src/lib/efreet/Efreet_Trash.h
@@ -37,6 +37,8 @@ extern "C" {
37 * @addtogroup Efreet_Trash Efreet_Trash: The XDG Trash Specification 37 * @addtogroup Efreet_Trash Efreet_Trash: The XDG Trash Specification
38 * Efreet_Trash.h provides all of the necessary headers and includes to 38 * Efreet_Trash.h provides all of the necessary headers and includes to
39 * work with Efreet_Trash. 39 * work with Efreet_Trash.
40 *
41 * @ingroup Efreet
40 * @{ 42 * @{
41 */ 43 */
42 44
diff --git a/legacy/efreet/src/lib/efreet.c b/src/lib/efreet/efreet.c
index 1a4acafb26..fcc0cfb634 100644
--- a/legacy/efreet/src/lib/efreet.c
+++ b/src/lib/efreet/efreet.c
@@ -342,7 +342,7 @@ efreet_fsetowner(int fd)
342} 342}
343#else 343#else
344EAPI void 344EAPI void
345efreet_fsetowner(int fd __UNUSED__) 345efreet_fsetowner(int fd EINA_UNUSED)
346{ 346{
347} 347}
348#endif 348#endif
@@ -362,7 +362,7 @@ efreet_setowner(const char *path)
362} 362}
363#else 363#else
364EAPI void 364EAPI void
365efreet_setowner(const char *path __UNUSED__) 365efreet_setowner(const char *path EINA_UNUSED)
366{ 366{
367} 367}
368#endif 368#endif
diff --git a/legacy/efreet/src/lib/efreet_alloca.h b/src/lib/efreet/efreet_alloca.h
index 58a739815e..58a739815e 100644
--- a/legacy/efreet/src/lib/efreet_alloca.h
+++ b/src/lib/efreet/efreet_alloca.h
diff --git a/legacy/efreet/src/lib/efreet_base.c b/src/lib/efreet/efreet_base.c
index 0c0b286c64..0c0b286c64 100644
--- a/legacy/efreet/src/lib/efreet_base.c
+++ b/src/lib/efreet/efreet_base.c
diff --git a/legacy/efreet/src/lib/efreet_base.h b/src/lib/efreet/efreet_base.h
index 37a90615fa..ca011d95a3 100644
--- a/legacy/efreet/src/lib/efreet_base.h
+++ b/src/lib/efreet/efreet_base.h
@@ -6,6 +6,7 @@
6 * specification. 6 * specification.
7 * @addtogroup Efreet_Base Efreet_Base: The XDG Base Directory Specification 7 * @addtogroup Efreet_Base Efreet_Base: The XDG Base Directory Specification
8 * functions 8 * functions
9 * @ingroup Efreet
9 * 10 *
10 * @see http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html 11 * @see http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
11 * @see http://0pointer.de/blog/projects/tmp.html 12 * @see http://0pointer.de/blog/projects/tmp.html
diff --git a/legacy/efreet/src/lib/efreet_cache.c b/src/lib/efreet/efreet_cache.c
index f959c762d5..6e99ee3951 100644
--- a/legacy/efreet/src/lib/efreet_cache.c
+++ b/src/lib/efreet/efreet_cache.c
@@ -1056,7 +1056,7 @@ efreet_cache_util_names(const char *key)
1056} 1056}
1057 1057
1058static void 1058static void
1059on_send_register(void *data __UNUSED__, const EDBus_Message *msg, EDBus_Pending *pending __UNUSED__) 1059on_send_register(void *data EINA_UNUSED, const EDBus_Message *msg, EDBus_Pending *pending EINA_UNUSED)
1060{ 1060{
1061 const char *errname, *errmsg; 1061 const char *errname, *errmsg;
1062 Eina_Bool exists; 1062 Eina_Bool exists;
@@ -1079,7 +1079,7 @@ on_send_register(void *data __UNUSED__, const EDBus_Message *msg, EDBus_Pending
1079} 1079}
1080 1080
1081static void 1081static void
1082desktop_cache_update(void *context __UNUSED__, const EDBus_Message *msg) 1082desktop_cache_update(void *context EINA_UNUSED, const EDBus_Message *msg)
1083{ 1083{
1084 Eina_Bool update; 1084 Eina_Bool update;
1085 1085
@@ -1100,7 +1100,7 @@ desktop_cache_update(void *context __UNUSED__, const EDBus_Message *msg)
1100} 1100}
1101 1101
1102static void 1102static void
1103icon_cache_update(void *context __UNUSED__, const EDBus_Message *msg) 1103icon_cache_update(void *context EINA_UNUSED, const EDBus_Message *msg)
1104{ 1104{
1105 Efreet_Event_Cache_Update *ev = NULL; 1105 Efreet_Event_Cache_Update *ev = NULL;
1106 Efreet_Old_Cache *d = NULL; 1106 Efreet_Old_Cache *d = NULL;
diff --git a/legacy/efreet/src/lib/efreet_cache_private.h b/src/lib/efreet/efreet_cache_private.h
index 9729215f9e..9729215f9e 100644
--- a/legacy/efreet/src/lib/efreet_cache_private.h
+++ b/src/lib/efreet/efreet_cache_private.h
diff --git a/legacy/efreet/src/lib/efreet_copy.h b/src/lib/efreet/efreet_copy.h
index ccffa00bea..ccffa00bea 100644
--- a/legacy/efreet/src/lib/efreet_copy.h
+++ b/src/lib/efreet/efreet_copy.h
diff --git a/legacy/efreet/src/lib/efreet_desktop.c b/src/lib/efreet/efreet_desktop.c
index 247251e0bf..df932c0ad7 100644
--- a/legacy/efreet/src/lib/efreet_desktop.c
+++ b/src/lib/efreet/efreet_desktop.c
@@ -884,7 +884,7 @@ efreet_desktop_generic_fields_save(Efreet_Desktop *desktop, Efreet_Ini *ini)
884 * @brief Parses out an X- key from @a node and stores in @a desktop 884 * @brief Parses out an X- key from @a node and stores in @a desktop
885 */ 885 */
886static Eina_Bool 886static Eina_Bool
887efreet_desktop_x_fields_parse(const Eina_Hash *hash __UNUSED__, const void *key, void *value, void *fdata) 887efreet_desktop_x_fields_parse(const Eina_Hash *hash EINA_UNUSED, const void *key, void *value, void *fdata)
888{ 888{
889 Efreet_Desktop * desktop = fdata; 889 Efreet_Desktop * desktop = fdata;
890 890
@@ -907,7 +907,7 @@ efreet_desktop_x_fields_parse(const Eina_Hash *hash __UNUSED__, const void *key,
907 * @brief Stores an X- key from @a node and stores in @a ini 907 * @brief Stores an X- key from @a node and stores in @a ini
908 */ 908 */
909static Eina_Bool 909static Eina_Bool
910efreet_desktop_x_fields_save(const Eina_Hash *hash __UNUSED__, const void *key, void *value, void *fdata) 910efreet_desktop_x_fields_save(const Eina_Hash *hash EINA_UNUSED, const void *key, void *value, void *fdata)
911{ 911{
912 Efreet_Ini *ini = fdata; 912 Efreet_Ini *ini = fdata;
913 efreet_ini_string_set(ini, key, value); 913 efreet_ini_string_set(ini, key, value);
diff --git a/legacy/efreet/src/lib/efreet_desktop.h b/src/lib/efreet/efreet_desktop.h
index 5b5d01517f..fbcce4598d 100644
--- a/legacy/efreet/src/lib/efreet_desktop.h
+++ b/src/lib/efreet/efreet_desktop.h
@@ -7,6 +7,7 @@
7 * FDO desktop entry specificiation. 7 * FDO desktop entry specificiation.
8 * @addtogroup Efreet_Desktop Efreet_Desktop: The FDO Desktop Entry 8 * @addtogroup Efreet_Desktop Efreet_Desktop: The FDO Desktop Entry
9 * Specification functions and structures 9 * Specification functions and structures
10 * @ingroup Efreet
10 * 11 *
11 * @{ 12 * @{
12 */ 13 */
diff --git a/legacy/efreet/src/lib/efreet_desktop_command.c b/src/lib/efreet/efreet_desktop_command.c
index f7f4d13532..c8f80e41c3 100644
--- a/legacy/efreet/src/lib/efreet_desktop_command.c
+++ b/src/lib/efreet/efreet_desktop_command.c
@@ -225,9 +225,9 @@ efreet_desktop_command_progress_get(Efreet_Desktop *desktop, Eina_List *files,
225 225
226static void * 226static void *
227efreet_desktop_exec_cb(void *data, 227efreet_desktop_exec_cb(void *data,
228 Efreet_Desktop *desktop __UNUSED__, 228 Efreet_Desktop *desktop EINA_UNUSED,
229 char *exec, 229 char *exec,
230 int remaining __UNUSED__) 230 int remaining EINA_UNUSED)
231{ 231{
232 ecore_exe_run(exec, data); 232 ecore_exe_run(exec, data);
233 free(exec); 233 free(exec);
@@ -766,8 +766,8 @@ efreet_desktop_command_file_free(Efreet_Desktop_Command_File *file)
766 766
767 767
768static void 768static void
769efreet_desktop_cb_download_complete(void *data, const char *file __UNUSED__, 769efreet_desktop_cb_download_complete(void *data, const char *file EINA_UNUSED,
770 int status __UNUSED__) 770 int status EINA_UNUSED)
771{ 771{
772 Efreet_Desktop_Command_File *f; 772 Efreet_Desktop_Command_File *f;
773 773
@@ -794,10 +794,10 @@ efreet_desktop_cb_download_complete(void *data, const char *file __UNUSED__,
794 794
795static int 795static int
796efreet_desktop_cb_download_progress(void *data, 796efreet_desktop_cb_download_progress(void *data,
797 const char *file __UNUSED__, 797 const char *file EINA_UNUSED,
798 long int dltotal, long int dlnow, 798 long int dltotal, long int dlnow,
799 long int ultotal __UNUSED__, 799 long int ultotal EINA_UNUSED,
800 long int ulnow __UNUSED__) 800 long int ulnow EINA_UNUSED)
801{ 801{
802 Efreet_Desktop_Command_File *dcf; 802 Efreet_Desktop_Command_File *dcf;
803 803
diff --git a/legacy/efreet/src/lib/efreet_icon.c b/src/lib/efreet/efreet_icon.c
index bcc81176e3..4637529da5 100644
--- a/legacy/efreet/src/lib/efreet_icon.c
+++ b/src/lib/efreet/efreet_icon.c
@@ -790,7 +790,7 @@ efreet_icon_fallback_lookup_path_path(Efreet_Cache_Fallback_Icon *icon, const ch
790} 790}
791 791
792static void 792static void
793efreet_cache_icon_dirs_add_cb(void *data __UNUSED__) 793efreet_cache_icon_dirs_add_cb(void *data EINA_UNUSED)
794{ 794{
795 efreet_cache_icon_dirs_add(efreet_extra_icon_dirs); 795 efreet_cache_icon_dirs_add(efreet_extra_icon_dirs);
796} 796}
diff --git a/legacy/efreet/src/lib/efreet_icon.h b/src/lib/efreet/efreet_icon.h
index e6454ad01b..0495622d9b 100644
--- a/legacy/efreet/src/lib/efreet_icon.h
+++ b/src/lib/efreet/efreet_icon.h
@@ -8,6 +8,7 @@
8 * @addtogroup Efreet_Icon Efreet_Icon: The FDO Icon Theme 8 * @addtogroup Efreet_Icon Efreet_Icon: The FDO Icon Theme
9 * Specification functions and structures 9 * Specification functions and structures
10 * 10 *
11 * @ingroup Efreet
11 * @{ 12 * @{
12 */ 13 */
13 14
diff --git a/legacy/efreet/src/lib/efreet_ini.c b/src/lib/efreet/efreet_ini.c
index 391f0e71c3..5ece68c636 100644
--- a/legacy/efreet/src/lib/efreet_ini.c
+++ b/src/lib/efreet/efreet_ini.c
@@ -559,7 +559,7 @@ efreet_ini_unescape(const char *str)
559} 559}
560 560
561static Eina_Bool 561static Eina_Bool
562efreet_ini_section_save(const Eina_Hash *hash __UNUSED__, const void *key, void *value, void *fdata) 562efreet_ini_section_save(const Eina_Hash *hash EINA_UNUSED, const void *key, void *value, void *fdata)
563{ 563{
564 FILE *f = fdata; 564 FILE *f = fdata;
565 565
@@ -569,7 +569,7 @@ efreet_ini_section_save(const Eina_Hash *hash __UNUSED__, const void *key, void
569} 569}
570 570
571static Eina_Bool 571static Eina_Bool
572efreet_ini_value_save(const Eina_Hash *hash __UNUSED__, const void *key, void *value, void *fdata) 572efreet_ini_value_save(const Eina_Hash *hash EINA_UNUSED, const void *key, void *value, void *fdata)
573{ 573{
574 FILE *f = fdata; 574 FILE *f = fdata;
575 575
diff --git a/legacy/efreet/src/lib/efreet_ini.h b/src/lib/efreet/efreet_ini.h
index f5b8a9e390..2dec08aece 100644
--- a/legacy/efreet/src/lib/efreet_ini.h
+++ b/src/lib/efreet/efreet_ini.h
@@ -6,6 +6,7 @@
6 * @file efreet_ini.h 6 * @file efreet_ini.h
7 * @brief A simple and fast INI parser 7 * @brief A simple and fast INI parser
8 * @addtogroup Efreet_Ini Efreet_Ini: An INI parser 8 * @addtogroup Efreet_Ini Efreet_Ini: An INI parser
9 * @ingroup Efreet
9 * 10 *
10 * @{ 11 * @{
11 */ 12 */
diff --git a/legacy/efreet/src/lib/efreet_menu.c b/src/lib/efreet/efreet_menu.c
index cccc467ba8..572f7b887e 100644
--- a/legacy/efreet/src/lib/efreet_menu.c
+++ b/src/lib/efreet/efreet_menu.c
@@ -1027,7 +1027,7 @@ efreet_menu_handle_app_dir(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
1027 * @brief Handles the DefaultAppDirs 1027 * @brief Handles the DefaultAppDirs
1028 */ 1028 */
1029static int 1029static int
1030efreet_menu_handle_default_app_dirs(Efreet_Menu_Internal *parent, Efreet_Xml *xml __UNUSED__) 1030efreet_menu_handle_default_app_dirs(Efreet_Menu_Internal *parent, Efreet_Xml *xml EINA_UNUSED)
1031{ 1031{
1032 Eina_List *prepend = NULL; 1032 Eina_List *prepend = NULL;
1033 Eina_List *dirs; 1033 Eina_List *dirs;
@@ -1097,7 +1097,7 @@ efreet_menu_handle_directory_dir(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
1097 * @brief Handles the DefaultDirectoryDirs tag 1097 * @brief Handles the DefaultDirectoryDirs tag
1098 */ 1098 */
1099static int 1099static int
1100efreet_menu_handle_default_directory_dirs(Efreet_Menu_Internal *parent, Efreet_Xml *xml __UNUSED__) 1100efreet_menu_handle_default_directory_dirs(Efreet_Menu_Internal *parent, Efreet_Xml *xml EINA_UNUSED)
1101{ 1101{
1102 Eina_List *dirs; 1102 Eina_List *dirs;
1103 char *dir; 1103 char *dir;
@@ -1846,7 +1846,7 @@ efreet_menu_handle_legacy_dir_helper(Efreet_Menu_Internal *root,
1846 * @brief Handles the KDELegacyDirs tag 1846 * @brief Handles the KDELegacyDirs tag
1847 */ 1847 */
1848static int 1848static int
1849efreet_menu_handle_kde_legacy_dirs(Efreet_Menu_Internal *parent, Efreet_Xml *xml __UNUSED__) 1849efreet_menu_handle_kde_legacy_dirs(Efreet_Menu_Internal *parent, Efreet_Xml *xml EINA_UNUSED)
1850{ 1850{
1851 Eina_List *l; 1851 Eina_List *l;
1852 const char *dir; 1852 const char *dir;
diff --git a/legacy/efreet/src/lib/efreet_menu.h b/src/lib/efreet/efreet_menu.h
index 8531cd86ed..afefa4cb75 100644
--- a/legacy/efreet/src/lib/efreet_menu.h
+++ b/src/lib/efreet/efreet_menu.h
@@ -7,6 +7,7 @@
7 * Menu Specification. 7 * Menu Specification.
8 * @addtogroup Efreet_Menu Efreet_Menu: The FDO Desktop Menu Specification 8 * @addtogroup Efreet_Menu Efreet_Menu: The FDO Desktop Menu Specification
9 * functions and structures 9 * functions and structures
10 * @ingroup Efreet
10 * 11 *
11 * @{ 12 * @{
12 */ 13 */
diff --git a/legacy/efreet/src/lib/efreet_mime.c b/src/lib/efreet/efreet_mime.c
index ee9829d0e2..56391f3b5d 100644
--- a/legacy/efreet/src/lib/efreet_mime.c
+++ b/src/lib/efreet/efreet_mime.c
@@ -567,9 +567,9 @@ efreet_mime_load_magics(Eina_List *datadirs, const char *datahome)
567 * the globs are updated. 567 * the globs are updated.
568 */ 568 */
569static void 569static void
570efreet_mime_cb_update_file(void *data __UNUSED__, 570efreet_mime_cb_update_file(void *data EINA_UNUSED,
571 Ecore_File_Monitor *monitor __UNUSED__, 571 Ecore_File_Monitor *monitor EINA_UNUSED,
572 Ecore_File_Event event __UNUSED__, 572 Ecore_File_Event event EINA_UNUSED,
573 const char *path) 573 const char *path)
574{ 574{
575 Eina_List *datadirs = NULL; 575 Eina_List *datadirs = NULL;
diff --git a/legacy/efreet/src/lib/efreet_private.h b/src/lib/efreet/efreet_private.h
index 7c9e3c3c72..9eaa9a5c49 100644
--- a/legacy/efreet/src/lib/efreet_private.h
+++ b/src/lib/efreet/efreet_private.h
@@ -13,6 +13,7 @@
13 * @brief Contains methods and defines that are private to the Efreet 13 * @brief Contains methods and defines that are private to the Efreet
14 * implementaion 14 * implementaion
15 * @addtogroup Efreet_Private Efreet_Private: Private methods and defines 15 * @addtogroup Efreet_Private Efreet_Private: Private methods and defines
16 * @ingroup Efreet
16 * 17 *
17 * @{ 18 * @{
18 */ 19 */
diff --git a/legacy/efreet/src/lib/efreet_trash.c b/src/lib/efreet/efreet_trash.c
index 27cc2b1a74..27cc2b1a74 100644
--- a/legacy/efreet/src/lib/efreet_trash.c
+++ b/src/lib/efreet/efreet_trash.c
diff --git a/legacy/efreet/src/lib/efreet_uri.c b/src/lib/efreet/efreet_uri.c
index 20ebe391b0..20ebe391b0 100644
--- a/legacy/efreet/src/lib/efreet_uri.c
+++ b/src/lib/efreet/efreet_uri.c
diff --git a/legacy/efreet/src/lib/efreet_uri.h b/src/lib/efreet/efreet_uri.h
index 32aaeee519..32b1f51ad2 100644
--- a/legacy/efreet/src/lib/efreet_uri.h
+++ b/src/lib/efreet/efreet_uri.h
@@ -5,6 +5,7 @@
5 * @file efreet_uri.h 5 * @file efreet_uri.h
6 * @brief Contains the methods used to support the FDO URI specification. 6 * @brief Contains the methods used to support the FDO URI specification.
7 * @addtogroup Efreet_Uri Efreet_Uri: The FDO URI Specification functions 7 * @addtogroup Efreet_Uri Efreet_Uri: The FDO URI Specification functions
8 * @ingroup Efreet
8 * @{ 9 * @{
9 */ 10 */
10 11
diff --git a/legacy/efreet/src/lib/efreet_utils.c b/src/lib/efreet/efreet_utils.c
index 7037dfd054..7037dfd054 100644
--- a/legacy/efreet/src/lib/efreet_utils.c
+++ b/src/lib/efreet/efreet_utils.c
diff --git a/legacy/efreet/src/lib/efreet_utils.h b/src/lib/efreet/efreet_utils.h
index 6a5e69e3c7..4075abcfa0 100644
--- a/legacy/efreet/src/lib/efreet_utils.h
+++ b/src/lib/efreet/efreet_utils.h
@@ -6,6 +6,7 @@
6 * @brief Contains utility functions to ease usage of Efreet. 6 * @brief Contains utility functions to ease usage of Efreet.
7 * FDO desktop entry specificiation. 7 * FDO desktop entry specificiation.
8 * @addtogroup Efreet_Utils Efreet utilities for FDO 8 * @addtogroup Efreet_Utils Efreet utilities for FDO
9 * @ingroup Efreet
9 * 10 *
10 * @{ 11 * @{
11 */ 12 */
diff --git a/legacy/efreet/src/lib/efreet_xml.c b/src/lib/efreet/efreet_xml.c
index 390499f274..390499f274 100644
--- a/legacy/efreet/src/lib/efreet_xml.c
+++ b/src/lib/efreet/efreet_xml.c
diff --git a/legacy/efreet/src/lib/efreet_xml.h b/src/lib/efreet/efreet_xml.h
index 77473cc144..ba8c51a980 100644
--- a/legacy/efreet/src/lib/efreet_xml.h
+++ b/src/lib/efreet/efreet_xml.h
@@ -5,7 +5,12 @@
5 * @internal 5 * @internal
6 * @file efreet_xml.h 6 * @file efreet_xml.h
7 * @brief A simple and fast XML parser 7 * @brief A simple and fast XML parser
8 * @addtogroup Efreet_Xml Efreet_Xml: An XML parser 8 * @addtogroup Efreet_Xml Efreet_Xml: An XML parser (private)
9 * @ingroup Efreet
10 *
11 * Consider using @ref Eina_Simple_XML_Group instead.
12 *
13 * @private
9 * 14 *
10 * @{ 15 * @{
11 */ 16 */
diff --git a/legacy/efreet/src/tests/compare/comp.h b/src/tests/efreet/compare/comp.h
index c02eebe2cf..c02eebe2cf 100644
--- a/legacy/efreet/src/tests/compare/comp.h
+++ b/src/tests/efreet/compare/comp.h
diff --git a/legacy/efreet/src/tests/compare/efreet_alloc.c b/src/tests/efreet/compare/efreet_alloc.c
index 1527f77e75..1527f77e75 100644
--- a/legacy/efreet/src/tests/compare/efreet_alloc.c
+++ b/src/tests/efreet/compare/efreet_alloc.c
diff --git a/legacy/efreet/src/tests/compare/efreet_menu_alloc.c b/src/tests/efreet/compare/efreet_menu_alloc.c
index fcfb75b4bb..fcfb75b4bb 100644
--- a/legacy/efreet/src/tests/compare/efreet_menu_alloc.c
+++ b/src/tests/efreet/compare/efreet_menu_alloc.c
diff --git a/legacy/efreet/src/tests/data/entry b/src/tests/efreet/data/entry
index 503d8e5ae5..503d8e5ae5 100644
--- a/legacy/efreet/src/tests/data/entry
+++ b/src/tests/efreet/data/entry
Binary files differ
diff --git a/legacy/efreet/src/tests/data/entry.png b/src/tests/efreet/data/entry.png
index 82e5cbe497..82e5cbe497 100644
--- a/legacy/efreet/src/tests/data/entry.png
+++ b/src/tests/efreet/data/entry.png
Binary files differ
diff --git a/legacy/efreet/src/tests/data/long.ini b/src/tests/efreet/data/long.ini
index 32154ddcad..32154ddcad 100644
--- a/legacy/efreet/src/tests/data/long.ini
+++ b/src/tests/efreet/data/long.ini
diff --git a/legacy/efreet/src/tests/data/preferences.menu b/src/tests/efreet/data/preferences.menu
index 904dbd2c06..904dbd2c06 100644
--- a/legacy/efreet/src/tests/data/preferences.menu
+++ b/src/tests/efreet/data/preferences.menu
diff --git a/src/tests/efreet/data/sub/Makefile.am b/src/tests/efreet/data/sub/Makefile.am
new file mode 100644
index 0000000000..7aaf7fc20e
--- /dev/null
+++ b/src/tests/efreet/data/sub/Makefile.am
@@ -0,0 +1,8 @@
1
2MAINTAINERCLEANFILES = Makefile.in
3
4testdir = $(pkgdatadir)/test/sub
5test_DATA = \
6test.desktop
7
8EXTRA_DIST = $(test_DATA)
diff --git a/legacy/efreet/src/tests/data/sub/test.desktop b/src/tests/efreet/data/sub/test.desktop
index 7abf2aed81..7abf2aed81 100644
--- a/legacy/efreet/src/tests/data/sub/test.desktop
+++ b/src/tests/efreet/data/sub/test.desktop
diff --git a/legacy/efreet/src/tests/data/test.desktop b/src/tests/efreet/data/test.desktop
index f2207b4172..f2207b4172 100644
--- a/legacy/efreet/src/tests/data/test.desktop
+++ b/src/tests/efreet/data/test.desktop
diff --git a/legacy/efreet/src/tests/data/test.ini b/src/tests/efreet/data/test.ini
index 7f73d81823..7f73d81823 100644
--- a/legacy/efreet/src/tests/data/test.ini
+++ b/src/tests/efreet/data/test.ini
diff --git a/legacy/efreet/src/tests/data/test.menu b/src/tests/efreet/data/test.menu
index 7ae21ff03f..7ae21ff03f 100644
--- a/legacy/efreet/src/tests/data/test.menu
+++ b/src/tests/efreet/data/test.menu
diff --git a/legacy/efreet/src/tests/data/test_garbage b/src/tests/efreet/data/test_garbage
index 7d178fd436..7d178fd436 100644
--- a/legacy/efreet/src/tests/data/test_garbage
+++ b/src/tests/efreet/data/test_garbage
diff --git a/legacy/efreet/src/tests/data/test_menu_bad_comment.menu b/src/tests/efreet/data/test_menu_bad_comment.menu
index 5815b89f97..5815b89f97 100644
--- a/legacy/efreet/src/tests/data/test_menu_bad_comment.menu
+++ b/src/tests/efreet/data/test_menu_bad_comment.menu
diff --git a/legacy/efreet/src/tests/data/test_menu_slash_bad.menu b/src/tests/efreet/data/test_menu_slash_bad.menu
index 8f7b6f05a6..8f7b6f05a6 100644
--- a/legacy/efreet/src/tests/data/test_menu_slash_bad.menu
+++ b/src/tests/efreet/data/test_menu_slash_bad.menu
diff --git a/legacy/efreet/src/tests/data/test_type.desktop b/src/tests/efreet/data/test_type.desktop
index 18f7103eda..18f7103eda 100644
--- a/legacy/efreet/src/tests/data/test_type.desktop
+++ b/src/tests/efreet/data/test_type.desktop
diff --git a/legacy/efreet/src/tests/ef_cache.c b/src/tests/efreet/ef_cache.c
index 3cbee9e9c4..cf40eaff9f 100644
--- a/legacy/efreet/src/tests/ef_cache.c
+++ b/src/tests/efreet/ef_cache.c
@@ -158,7 +158,7 @@ check(void)
158} 158}
159 159
160static Eina_Bool 160static Eina_Bool
161icon_handler_cb(void *data __UNUSED__, int event_type __UNUSED__, void *event __UNUSED__) 161icon_handler_cb(void *data EINA_UNUSED, int event_type EINA_UNUSED, void *event EINA_UNUSED)
162{ 162{
163 icon_cb = EINA_TRUE; 163 icon_cb = EINA_TRUE;
164 if (icon_cb && desktop_cb) 164 if (icon_cb && desktop_cb)
@@ -170,7 +170,7 @@ icon_handler_cb(void *data __UNUSED__, int event_type __UNUSED__, void *event __
170} 170}
171 171
172static Eina_Bool 172static Eina_Bool
173desktop_handler_cb(void *data __UNUSED__, int event_type __UNUSED__, void *event __UNUSED__) 173desktop_handler_cb(void *data EINA_UNUSED, int event_type EINA_UNUSED, void *event EINA_UNUSED)
174{ 174{
175 desktop_cb = EINA_TRUE; 175 desktop_cb = EINA_TRUE;
176 if (icon_cb && desktop_cb) 176 if (icon_cb && desktop_cb)
@@ -182,7 +182,7 @@ desktop_handler_cb(void *data __UNUSED__, int event_type __UNUSED__, void *event
182} 182}
183 183
184int 184int
185main(int argc __UNUSED__, char **argv __UNUSED__) 185main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
186{ 186{
187 Ecore_Event_Handler *icon_handler; 187 Ecore_Event_Handler *icon_handler;
188 Ecore_Event_Handler *desktop_handler; 188 Ecore_Event_Handler *desktop_handler;
diff --git a/legacy/efreet/src/tests/ef_data_dirs.c b/src/tests/efreet/ef_data_dirs.c
index a99b2ae36e..a99b2ae36e 100644
--- a/legacy/efreet/src/tests/ef_data_dirs.c
+++ b/src/tests/efreet/ef_data_dirs.c
diff --git a/legacy/efreet/src/tests/ef_desktop.c b/src/tests/efreet/ef_desktop.c
index 39f942ac0b..d386b38b17 100644
--- a/legacy/efreet/src/tests/ef_desktop.c
+++ b/src/tests/efreet/ef_desktop.c
@@ -17,7 +17,7 @@ ef_cb_desktop_parse(void)
17 Eina_List *l; 17 Eina_List *l;
18 int ret = 1; 18 int ret = 1;
19 19
20 desktop = efreet_desktop_get(PKG_DATA_DIR"/test/test.desktop"); 20 desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop");
21 if (!desktop) 21 if (!desktop)
22 { 22 {
23 printf("No desktop found.\n"); 23 printf("No desktop found.\n");
@@ -80,7 +80,7 @@ ef_cb_desktop_file_id(void)
80 Efreet_Desktop *desktop; 80 Efreet_Desktop *desktop;
81 int ret = 1; 81 int ret = 1;
82 82
83 desktop = efreet_desktop_get(PKG_DATA_DIR"/test/test.desktop"); 83 desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop");
84 if (desktop) 84 if (desktop)
85 { 85 {
86 const char *id; 86 const char *id;
@@ -92,10 +92,10 @@ ef_cb_desktop_file_id(void)
92 char *prefix; 92 char *prefix;
93 char *expected; 93 char *expected;
94 } tests[] = { 94 } tests[] = {
95 {PKG_DATA_DIR"/test/", 0, NULL, "test.desktop"}, 95 {PACKAGE_DATA_DIR"/efreet/test/", 0, NULL, "test.desktop"},
96 {PKG_DATA_DIR"/", 0, NULL, "test-test.desktop"}, 96 {PACKAGE_DATA_DIR"/efreet/", 0, NULL, "test-test.desktop"},
97 {PKG_DATA_DIR"/", 1, NULL, "test.desktop"}, 97 {PACKAGE_DATA_DIR"/efreet/", 1, NULL, "test.desktop"},
98 {PKG_DATA_DIR"/", 1, "prefix", "prefix-test.desktop"}, 98 {PACKAGE_DATA_DIR"/efreet/", 1, "prefix", "prefix-test.desktop"},
99 {NULL, 0, NULL, NULL} 99 {NULL, 0, NULL, NULL}
100 }; 100 };
101 101
@@ -126,7 +126,7 @@ ef_cb_desktop_save(void)
126 Efreet_Desktop *desktop; 126 Efreet_Desktop *desktop;
127 127
128 printf("\n"); 128 printf("\n");
129 desktop = efreet_desktop_get(PKG_DATA_DIR"/test/test.desktop"); 129 desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop");
130 if (!desktop) 130 if (!desktop)
131 { 131 {
132 printf("Failed to get Desktop file\n"); 132 printf("Failed to get Desktop file\n");
@@ -330,8 +330,8 @@ ef_cb_desktop_command_get(void)
330} 330}
331 331
332static void * 332static void *
333_cb_command(void *data, Efreet_Desktop *desktop __UNUSED__, 333_cb_command(void *data, Efreet_Desktop *desktop EINA_UNUSED,
334 char *exec, int remaining __UNUSED__) 334 char *exec, int remaining EINA_UNUSED)
335{ 335{
336 Test_Info *info = data; 336 Test_Info *info = data;
337 char *expected; 337 char *expected;
@@ -356,7 +356,7 @@ _cb_command(void *data, Efreet_Desktop *desktop __UNUSED__,
356} 356}
357 357
358static void * 358static void *
359cb_type_parse(Efreet_Desktop *desktop __UNUSED__, Efreet_Ini *ini) 359cb_type_parse(Efreet_Desktop *desktop EINA_UNUSED, Efreet_Ini *ini)
360{ 360{
361 const char *val; 361 const char *val;
362 val = efreet_ini_string_get(ini, "X-Test"); 362 val = efreet_ini_string_get(ini, "X-Test");
@@ -376,7 +376,7 @@ ef_cb_desktop_type_parse(void)
376 my_type = efreet_desktop_type_add("My_Type", cb_type_parse, NULL, 376 my_type = efreet_desktop_type_add("My_Type", cb_type_parse, NULL,
377 (Efreet_Desktop_Type_Free_Cb)free); 377 (Efreet_Desktop_Type_Free_Cb)free);
378 378
379 desktop = efreet_desktop_get(PKG_DATA_DIR"/test/test_type.desktop"); 379 desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test_type.desktop");
380 if (!desktop) 380 if (!desktop)
381 { 381 {
382 printf("No desktop found.\n"); 382 printf("No desktop found.\n");
diff --git a/legacy/efreet/src/tests/ef_icon_theme.c b/src/tests/efreet/ef_icon_theme.c
index 1a04cfad1e..6c531db36a 100644
--- a/legacy/efreet/src/tests/ef_icon_theme.c
+++ b/src/tests/efreet/ef_icon_theme.c
@@ -58,7 +58,7 @@ ef_cb_efreet_icon_theme(void)
58} 58}
59 59
60static Eina_Bool 60static Eina_Bool
61_hash_keys(Eina_Hash *hash __UNUSED__, const char *key, void *list) 61_hash_keys(Eina_Hash *hash EINA_UNUSED, const char *key, void *list)
62{ 62{
63 Eina_List **l = list; 63 Eina_List **l = list;
64 64
diff --git a/legacy/efreet/src/tests/ef_ini.c b/src/tests/efreet/ef_ini.c
index 00d459ed50..13a3aa1467 100644
--- a/legacy/efreet/src/tests/ef_ini.c
+++ b/src/tests/efreet/ef_ini.c
@@ -12,7 +12,7 @@ ef_cb_ini_parse(void)
12 12
13 putenv("LC_ALL=en_US"); 13 putenv("LC_ALL=en_US");
14 14
15 ini = efreet_ini_new(PKG_DATA_DIR"/test/test.ini"); 15 ini = efreet_ini_new(PACKAGE_DATA_DIR"/efreet/test/test.ini");
16 if (!ini) 16 if (!ini)
17 { 17 {
18 printf("efreet_ini_parse() Failed to initialize Efreet_Ini\n"); 18 printf("efreet_ini_parse() Failed to initialize Efreet_Ini\n");
@@ -115,7 +115,7 @@ ef_cb_ini_long_line(void)
115 {NULL, 0} 115 {NULL, 0}
116 }; 116 };
117 117
118 ini = efreet_ini_new(PKG_DATA_DIR"/test/long.ini"); 118 ini = efreet_ini_new(PACKAGE_DATA_DIR"/efreet/test/long.ini");
119 if (!ini) 119 if (!ini)
120 { 120 {
121 printf("Ini failed to parse.\n"); 121 printf("Ini failed to parse.\n");
@@ -162,7 +162,7 @@ ef_cb_ini_garbage(void)
162 Efreet_Ini *ini; 162 Efreet_Ini *ini;
163 int ret = 1; 163 int ret = 1;
164 164
165 ini = efreet_ini_new(PKG_DATA_DIR"/test/test_garbage"); 165 ini = efreet_ini_new(PACKAGE_DATA_DIR"/efreet/test/test_garbage");
166 if (!ini) 166 if (!ini)
167 { 167 {
168 printf("Ini failed to parse.\n"); 168 printf("Ini failed to parse.\n");
diff --git a/legacy/efreet/src/tests/ef_locale.c b/src/tests/efreet/ef_locale.c
index cfc50e2626..cfc50e2626 100644
--- a/legacy/efreet/src/tests/ef_locale.c
+++ b/src/tests/efreet/ef_locale.c
diff --git a/legacy/efreet/src/tests/ef_menu.c b/src/tests/efreet/ef_menu.c
index a7519b76d6..be42f128a3 100644
--- a/legacy/efreet/src/tests/ef_menu.c
+++ b/src/tests/efreet/ef_menu.c
@@ -32,7 +32,7 @@ ef_cb_menu_get(void)
32 Efreet_Menu *menu; 32 Efreet_Menu *menu;
33 33
34 menu = efreet_menu_get(); 34 menu = efreet_menu_get();
35// menu = efreet_menu_parse(PKG_DATA_DIR"/test/test.menu"); 35// menu = efreet_menu_parse(PACKAGE_DATA_DIR"/efreet/test/test.menu");
36 if (!menu) 36 if (!menu)
37 { 37 {
38 printf("efreet_menu_get() returned NULL\n"); 38 printf("efreet_menu_get() returned NULL\n");
@@ -50,7 +50,7 @@ ef_cb_menu_with_slashes(void)
50{ 50{
51 Efreet_Menu *menu; 51 Efreet_Menu *menu;
52 52
53 menu = efreet_menu_parse(PKG_DATA_DIR"/test/test_menu_slash_bad.menu"); 53 menu = efreet_menu_parse(PACKAGE_DATA_DIR"/efreet/test/test_menu_slash_bad.menu");
54 if (menu) 54 if (menu)
55 { 55 {
56 printf("efreet_menu_get() didn't return NULL\n"); 56 printf("efreet_menu_get() didn't return NULL\n");
@@ -67,7 +67,7 @@ ef_cb_menu_save(void)
67 int ret; 67 int ret;
68 68
69// menu = efreet_menu_get(); 69// menu = efreet_menu_get();
70 menu = efreet_menu_parse(PKG_DATA_DIR"/test/test.menu"); 70 menu = efreet_menu_parse(PACKAGE_DATA_DIR"/efreet/test/test.menu");
71 if (!menu) 71 if (!menu)
72 { 72 {
73 printf("efreet_menu_get() returned NULL\n"); 73 printf("efreet_menu_get() returned NULL\n");
@@ -86,7 +86,7 @@ ef_cb_menu_edit(void)
86 Efreet_Desktop *desktop; 86 Efreet_Desktop *desktop;
87 87
88// menu = efreet_menu_get(); 88// menu = efreet_menu_get();
89 menu = efreet_menu_parse(PKG_DATA_DIR"/test/test.menu"); 89 menu = efreet_menu_parse(PACKAGE_DATA_DIR"/efreet/test/test.menu");
90 if (!menu) 90 if (!menu)
91 { 91 {
92 printf("efreet_menu_get() returned NULL\n"); 92 printf("efreet_menu_get() returned NULL\n");
@@ -98,7 +98,7 @@ ef_cb_menu_edit(void)
98 printf("\n"); 98 printf("\n");
99#endif 99#endif
100 100
101 desktop = efreet_desktop_get(PKG_DATA_DIR"/test/test.desktop"); 101 desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop");
102 if (!desktop) 102 if (!desktop)
103 { 103 {
104 efreet_menu_free(menu); 104 efreet_menu_free(menu);
diff --git a/legacy/efreet/src/tests/ef_mime.c b/src/tests/efreet/ef_mime.c
index 2cb9e21ffb..84a8b8f341 100644
--- a/legacy/efreet/src/tests/ef_mime.c
+++ b/src/tests/efreet/ef_mime.c
@@ -19,10 +19,10 @@ ef_mime_cb_get(void)
19 char *file; 19 char *file;
20 char *mime; 20 char *mime;
21 } files[] = { 21 } files[] = {
22 {PKG_DATA_DIR"/test/test_type.desktop", "application/x-desktop"}, 22 {PACKAGE_DATA_DIR"/efreet/test/test_type.desktop", "application/x-desktop"},
23 {PKG_DATA_DIR"/test/entry.png", "image/png"}, 23 {PACKAGE_DATA_DIR"/efreet/test/entry.png", "image/png"},
24 {PKG_DATA_DIR"/test/entry", "image/png"}, 24 {PACKAGE_DATA_DIR"/efreet/test/entry", "image/png"},
25 {PKG_DATA_DIR"/test/sub", "inode/directory"}, 25 {PACKAGE_DATA_DIR"/efreet/test/sub", "inode/directory"},
26 {NULL, NULL} 26 {NULL, NULL}
27 }; 27 };
28 double start; 28 double start;
diff --git a/legacy/efreet/src/tests/ef_test.h b/src/tests/efreet/ef_test.h
index 2e88c68d25..2e88c68d25 100644
--- a/legacy/efreet/src/tests/ef_test.h
+++ b/src/tests/efreet/ef_test.h
diff --git a/legacy/efreet/src/tests/ef_utils.c b/src/tests/efreet/ef_utils.c
index 0647ef0416..0647ef0416 100644
--- a/legacy/efreet/src/tests/ef_utils.c
+++ b/src/tests/efreet/ef_utils.c
diff --git a/legacy/efreet/src/tests/efreet_icon_cache_dump.c b/src/tests/efreet/efreet_icon_cache_dump.c
index d1cb126a0c..d1cb126a0c 100644
--- a/legacy/efreet/src/tests/efreet_icon_cache_dump.c
+++ b/src/tests/efreet/efreet_icon_cache_dump.c
diff --git a/legacy/efreet/src/tests/efreet_spec_test.c b/src/tests/efreet/efreet_spec_test.c
index 7c414b5812..a0fb11590c 100644
--- a/legacy/efreet/src/tests/efreet_spec_test.c
+++ b/src/tests/efreet/efreet_spec_test.c
@@ -6,7 +6,7 @@
6static void dump(Efreet_Menu *menu, const char *path); 6static void dump(Efreet_Menu *menu, const char *path);
7 7
8int 8int
9main(int argc __UNUSED__, char **argv __UNUSED__) 9main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
10{ 10{
11 Efreet_Menu *menu; 11 Efreet_Menu *menu;
12 12
diff --git a/legacy/efreet/src/tests/efreet_suite.c b/src/tests/efreet/efreet_suite.c
index 7424435b5f..7424435b5f 100644
--- a/legacy/efreet/src/tests/efreet_suite.c
+++ b/src/tests/efreet/efreet_suite.c
diff --git a/legacy/efreet/src/tests/efreet_suite.h b/src/tests/efreet/efreet_suite.h
index bfb47f9dab..bfb47f9dab 100644
--- a/legacy/efreet/src/tests/efreet_suite.h
+++ b/src/tests/efreet/efreet_suite.h
diff --git a/legacy/efreet/src/tests/efreet_test_efreet.c b/src/tests/efreet/efreet_test_efreet.c
index d35ec9effd..d35ec9effd 100644
--- a/legacy/efreet/src/tests/efreet_test_efreet.c
+++ b/src/tests/efreet/efreet_test_efreet.c
diff --git a/legacy/efreet/src/tests/efreet_test_efreet_cache.c b/src/tests/efreet/efreet_test_efreet_cache.c
index 2f8972de33..2f8972de33 100644
--- a/legacy/efreet/src/tests/efreet_test_efreet_cache.c
+++ b/src/tests/efreet/efreet_test_efreet_cache.c
diff --git a/legacy/efreet/src/tests/efreet_user_dir.c b/src/tests/efreet/efreet_user_dir.c
index 3c4bd60b7b..3c4bd60b7b 100644
--- a/legacy/efreet/src/tests/efreet_user_dir.c
+++ b/src/tests/efreet/efreet_user_dir.c
diff --git a/legacy/efreet/src/tests/main.c b/src/tests/efreet/main.c
index de6cf37add..de6cf37add 100644
--- a/legacy/efreet/src/tests/main.c
+++ b/src/tests/efreet/main.c