forked from enlightenment/efl
Rename efreet_icon_private.h to something better
efreet_icon_private.h should be private to external code interacting with the icon cache, so name it efreet_cache_private.h and only include Eet.h there. SVN revision: 55035
This commit is contained in:
parent
65e808c0af
commit
66e52e2829
|
@ -18,7 +18,7 @@
|
||||||
|
|
||||||
#include "Efreet.h"
|
#include "Efreet.h"
|
||||||
#include "efreet_private.h"
|
#include "efreet_private.h"
|
||||||
#include "efreet_icon_private.h"
|
#include "efreet_cache_private.h"
|
||||||
|
|
||||||
static Eet_Data_Descriptor *edd = NULL;
|
static Eet_Data_Descriptor *edd = NULL;
|
||||||
static Eet_File *ef = NULL;
|
static Eet_File *ef = NULL;
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
|
|
||||||
#include "Efreet.h"
|
#include "Efreet.h"
|
||||||
#include "efreet_private.h"
|
#include "efreet_private.h"
|
||||||
|
#include "efreet_cache_private.h"
|
||||||
|
|
||||||
static const char *exts[] = { ".png", ".xpm", ".svg", NULL };
|
static const char *exts[] = { ".png", ".xpm", ".svg", NULL };
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
|
|
||||||
#include "Efreet.h"
|
#include "Efreet.h"
|
||||||
#include "efreet_private.h"
|
#include "efreet_private.h"
|
||||||
|
#include "efreet_cache_private.h"
|
||||||
|
|
||||||
static Eet_Data_Descriptor *edd = NULL;
|
static Eet_Data_Descriptor *edd = NULL;
|
||||||
|
|
||||||
|
|
|
@ -63,4 +63,4 @@ libefreet_trash_la_CPPFLAGS = \
|
||||||
libefreet_trash_la_LIBADD = @EFREET_LIBS@ libefreet.la
|
libefreet_trash_la_LIBADD = @EFREET_LIBS@ libefreet.la
|
||||||
libefreet_trash_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
|
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
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
#include "Efreet.h"
|
#include "Efreet.h"
|
||||||
#include "efreet_private.h"
|
#include "efreet_private.h"
|
||||||
#include "efreet_icon_private.h"
|
#include "efreet_cache_private.h"
|
||||||
|
|
||||||
typedef struct _Efreet_Old_Cache Efreet_Old_Cache;
|
typedef struct _Efreet_Old_Cache Efreet_Old_Cache;
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
#ifndef EFREET_CACHE_PRIVATE_H
|
||||||
|
#define EFREET_CACHE_PRIVATE_H
|
||||||
|
|
||||||
|
#include <Eet.h>
|
||||||
|
|
||||||
|
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
|
|
@ -34,7 +34,6 @@ void *alloca (size_t);
|
||||||
|
|
||||||
#include "Efreet.h"
|
#include "Efreet.h"
|
||||||
#include "efreet_private.h"
|
#include "efreet_private.h"
|
||||||
#include "efreet_icon_private.h"
|
|
||||||
|
|
||||||
#ifdef EFREET_MODULE_LOG_DOM
|
#ifdef EFREET_MODULE_LOG_DOM
|
||||||
#undef EFREET_MODULE_LOG_DOM
|
#undef EFREET_MODULE_LOG_DOM
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef EFREET_ICON_PRIVATE_H
|
|
||||||
#define EFREET_ICON_PRIVATE_H
|
|
||||||
|
|
||||||
EAPI Eet_Data_Descriptor *efreet_desktop_edd_init(void);
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,10 +1,6 @@
|
||||||
#ifndef EFREET_PRIVATE_H
|
#ifndef EFREET_PRIVATE_H
|
||||||
#define EFREET_PRIVATE_H
|
#define EFREET_PRIVATE_H
|
||||||
|
|
||||||
#ifdef ICON_CACHE
|
|
||||||
# include <Eet.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @file efreet_private.h
|
* @file efreet_private.h
|
||||||
* @brief Contains methods and defines that are private to the Efreet
|
* @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
|
#ifdef ICON_CACHE
|
||||||
EAPI const char *efreet_icon_cache_file(void);
|
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_free(Efreet_Cache_Icon *icon);
|
||||||
EAPI void efreet_cache_icon_fallback_free(Efreet_Cache_Fallback_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);
|
Efreet_Cache_Icon *efreet_cache_icon_find(Efreet_Icon_Theme *theme, const char *icon);
|
||||||
|
|
Loading…
Reference in New Issue