* efreet: fix build.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/efreet@55157 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/efreet_cache.c b/src/lib/efreet_cache.c
index b95cae8..d608a12 100644 (file)
--- a/src/lib/efreet_cache.c
+++ b/src/lib/efreet_cache.c
@@ -33,7 +33,6 @@ static int _efreet_cache_log_dom = -1;
  * Data for cache files
  */
 #ifdef ICON_CACHE
-static Eet_Data_Descriptor *cache_version_edd = NULL;
 static Eet_Data_Descriptor *directory_edd = NULL;
 static Eet_Data_Descriptor *cache_theme_edd = NULL;
 static Eet_Data_Descriptor *cache_fallback_edd = NULL;
@@ -49,6 +48,7 @@ static Efreet_Cache_Theme  *theme_cache = NULL;
 static Efreet_Cache_Theme  *fallback_cache = NULL;
 #endif
 
+static Eet_Data_Descriptor *cache_version_edd = NULL;
 static Eet_Data_Descriptor *desktop_edd = NULL;
 
 static Eet_File            *desktop_cache = NULL;
@@ -207,6 +207,28 @@ efreet_icon_cache_file(void)
 /*
  * Needs EAPI because of helper binaries
  */
+EAPI Eet_Data_Descriptor *
+efreet_version_edd(void)
+{
+    Eet_Data_Descriptor_Class eddc;
+
+    if (cache_version_edd) return cache_version_edd;
+
+    EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Efreet_Cache_Version);
+    cache_version_edd = eet_data_descriptor_file_new(&eddc);
+    if (!cache_version_edd) return NULL;
+
+    EET_DATA_DESCRIPTOR_ADD_BASIC(cache_version_edd, Efreet_Cache_Version,
+                                  "minor", minor, EET_T_UCHAR);
+    EET_DATA_DESCRIPTOR_ADD_BASIC(cache_version_edd, Efreet_Cache_Version,
+                                  "major", major, EET_T_UCHAR);
+
+    return cache_version_edd;
+}
+
+/*
+ * Needs EAPI because of helper binaries
+ */
 EAPI const char *
 efreet_desktop_cache_file(void)
 {
@@ -330,28 +352,6 @@ efreet_icon_directory_edd(void)
  * Needs EAPI because of helper binaries
  */
 EAPI Eet_Data_Descriptor *
-efreet_version_edd(void)
-{
-    Eet_Data_Descriptor_Class eddc;
-
-    if (cache_version_edd) return cache_version_edd;
-
-    EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Efreet_Cache_Version);
-    cache_version_edd = eet_data_descriptor_file_new(&eddc);
-    if (!cache_version_edd) return NULL;
-
-    EET_DATA_DESCRIPTOR_ADD_BASIC(cache_version_edd, Efreet_Cache_Version,
-                                  "minor", minor, EET_T_UCHAR);
-    EET_DATA_DESCRIPTOR_ADD_BASIC(cache_version_edd, Efreet_Cache_Version,
-                                  "major", major, EET_T_UCHAR);
-
-    return cache_version_edd;
-}
-
-/*
- * Needs EAPI because of helper binaries
- */
-EAPI Eet_Data_Descriptor *
 efreet_icon_theme_edd(Eina_Bool include_dirs)
 {
     Eet_Data_Descriptor_Class eddc;

diff --git a/src/lib/efreet_private.h b/src/lib/efreet_private.h
index a679825..33395a6 100644 (file)
--- a/src/lib/efreet_private.h
+++ b/src/lib/efreet_private.h
@@ -115,27 +115,21 @@ extern int _efreet_log_dom_global;
 
 extern Eina_Hash *efreet_desktop_cache;
 
-#ifdef ICON_CACHE
-#define EFREET_ICON_CACHE_MAJOR 0
-#define EFREET_ICON_CACHE_MINOR 4
 #define EFREET_DESKTOP_CACHE_MAJOR 0
 #define EFREET_DESKTOP_CACHE_MINOR 1
 #define EFREET_DESKTOP_UTILS_CACHE_MAJOR 0
 #define EFREET_DESKTOP_UTILS_CACHE_MINOR 1
 
-typedef struct _Efreet_Cache_Version Efreet_Cache_Version;
+#ifdef ICON_CACHE
+#define EFREET_ICON_CACHE_MAJOR 0
+#define EFREET_ICON_CACHE_MINOR 4
+
 typedef struct _Efreet_Cache_Theme Efreet_Cache_Theme;
 typedef struct _Efreet_Cache_Directory Efreet_Cache_Directory;
 typedef struct _Efreet_Cache_Icon Efreet_Cache_Icon;
 typedef struct _Efreet_Cache_Icon_Element Efreet_Cache_Icon_Element;
 typedef struct _Efreet_Cache_Fallback_Icon Efreet_Cache_Fallback_Icon;
 
-struct _Efreet_Cache_Version
-{
-    unsigned char major;
-    unsigned char minor;
-};
-
 struct _Efreet_Cache_Theme
 {
     Eina_Hash *icons;
@@ -182,6 +176,13 @@ struct _Efreet_Cache_Fallback_Icon
 };
 #endif
 
+typedef struct _Efreet_Cache_Version Efreet_Cache_Version;
+struct _Efreet_Cache_Version
+{
+    unsigned char major;
+    unsigned char minor;
+};
+
 int efreet_base_init(void);
 void efreet_base_shutdown(void);