diff --git a/legacy/efreet/src/bin/efreet_desktop_cache_create.c b/legacy/efreet/src/bin/efreet_desktop_cache_create.c index 1f50f3df2a..01e4b9e55e 100644 --- a/legacy/efreet/src/bin/efreet_desktop_cache_create.c +++ b/legacy/efreet/src/bin/efreet_desktop_cache_create.c @@ -18,7 +18,7 @@ #include "Efreet.h" #include "efreet_private.h" -#include "efreet_icon_private.h" +#include "efreet_cache_private.h" static Eet_Data_Descriptor *edd = NULL; static Eet_File *ef = NULL; diff --git a/legacy/efreet/src/bin/efreet_icon_cache_create.c b/legacy/efreet/src/bin/efreet_icon_cache_create.c index bd603704de..07068d0e70 100644 --- a/legacy/efreet/src/bin/efreet_icon_cache_create.c +++ b/legacy/efreet/src/bin/efreet_icon_cache_create.c @@ -17,6 +17,7 @@ #include "Efreet.h" #include "efreet_private.h" +#include "efreet_cache_private.h" static const char *exts[] = { ".png", ".xpm", ".svg", NULL }; diff --git a/legacy/efreet/src/bin/efreet_icon_cache_dump.c b/legacy/efreet/src/bin/efreet_icon_cache_dump.c index b71f97786b..31a856f5a8 100644 --- a/legacy/efreet/src/bin/efreet_icon_cache_dump.c +++ b/legacy/efreet/src/bin/efreet_icon_cache_dump.c @@ -17,6 +17,7 @@ #include "Efreet.h" #include "efreet_private.h" +#include "efreet_cache_private.h" static Eet_Data_Descriptor *edd = NULL; diff --git a/legacy/efreet/src/lib/Makefile.am b/legacy/efreet/src/lib/Makefile.am index f3e36d9653..16cc2c848c 100644 --- a/legacy/efreet/src/lib/Makefile.am +++ b/legacy/efreet/src/lib/Makefile.am @@ -63,4 +63,4 @@ libefreet_trash_la_CPPFLAGS = \ 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 +EXTRA_DIST = efreet_private.h efreet_xml.h efreet_cache_private.h diff --git a/legacy/efreet/src/lib/efreet_cache.c b/legacy/efreet/src/lib/efreet_cache.c index 95b7d5bdf2..8ae6d20fc6 100644 --- a/legacy/efreet/src/lib/efreet_cache.c +++ b/legacy/efreet/src/lib/efreet_cache.c @@ -12,7 +12,7 @@ #include "Efreet.h" #include "efreet_private.h" -#include "efreet_icon_private.h" +#include "efreet_cache_private.h" typedef struct _Efreet_Old_Cache Efreet_Old_Cache; diff --git a/legacy/efreet/src/lib/efreet_cache_private.h b/legacy/efreet/src/lib/efreet_cache_private.h new file mode 100644 index 0000000000..89514a9500 --- /dev/null +++ b/legacy/efreet/src/lib/efreet_cache_private.h @@ -0,0 +1,12 @@ +#ifndef EFREET_CACHE_PRIVATE_H +#define EFREET_CACHE_PRIVATE_H + +#include + +EAPI Eet_Data_Descriptor *efreet_desktop_edd_init(void); +#ifdef ICON_CACHE +EAPI Eet_Data_Descriptor *efreet_icon_theme_edd(void); +EAPI Eet_Data_Descriptor *efreet_icon_fallback_edd(void); +#endif + +#endif diff --git a/legacy/efreet/src/lib/efreet_icon.c b/legacy/efreet/src/lib/efreet_icon.c index ecf3db49f3..2b385d501a 100644 --- a/legacy/efreet/src/lib/efreet_icon.c +++ b/legacy/efreet/src/lib/efreet_icon.c @@ -34,7 +34,6 @@ void *alloca (size_t); #include "Efreet.h" #include "efreet_private.h" -#include "efreet_icon_private.h" #ifdef EFREET_MODULE_LOG_DOM #undef EFREET_MODULE_LOG_DOM diff --git a/legacy/efreet/src/lib/efreet_icon_private.h b/legacy/efreet/src/lib/efreet_icon_private.h deleted file mode 100644 index ee42e0d40f..0000000000 --- a/legacy/efreet/src/lib/efreet_icon_private.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef EFREET_ICON_PRIVATE_H -#define EFREET_ICON_PRIVATE_H - -EAPI Eet_Data_Descriptor *efreet_desktop_edd_init(void); - -#endif diff --git a/legacy/efreet/src/lib/efreet_private.h b/legacy/efreet/src/lib/efreet_private.h index 45c22505bf..5d64521c2a 100644 --- a/legacy/efreet/src/lib/efreet_private.h +++ b/legacy/efreet/src/lib/efreet_private.h @@ -1,10 +1,6 @@ #ifndef EFREET_PRIVATE_H #define EFREET_PRIVATE_H -#ifdef ICON_CACHE -# include -#endif - /** * @file efreet_private.h * @brief Contains methods and defines that are private to the Efreet @@ -227,8 +223,6 @@ Efreet_Desktop *efreet_cache_desktop_find(const char *file); #ifdef ICON_CACHE EAPI const char *efreet_icon_cache_file(void); -EAPI Eet_Data_Descriptor *efreet_icon_theme_edd(void); -EAPI Eet_Data_Descriptor *efreet_icon_fallback_edd(void); EAPI void efreet_cache_icon_free(Efreet_Cache_Icon *icon); EAPI void efreet_cache_icon_fallback_free(Efreet_Cache_Fallback_Icon *icon); Efreet_Cache_Icon *efreet_cache_icon_find(Efreet_Icon_Theme *theme, const char *icon);