From: Jihoon Kim <imfine98@gmail.com>

Subject: [E-devel] [PATCH] fix elementary build error without ethumb
Date: Sun, 26 Jun 2011 13:37:02 +0900

Hello, EFL developers.

Without installing ethumb, when I build elementary, there is build error.
This patch is for fixing it.
Would you please apply this patch?

SVN revision: 60696

diff --git a/legacy/elementary/src/lib/elm_icon.c b/legacy/elementary/src/lib/elm_icon.c
index 777e1f5..dd47180 100644 (file)
--- a/legacy/elementary/src/lib/elm_icon.c
+++ b/legacy/elementary/src/lib/elm_icon.c
@@ -99,6 +99,14 @@ _path_is_absolute(const char *path)
 }
 #endif
 
+static inline int
+_icon_size_min_get(Evas_Object *icon)
+{
+   int size;
+   _els_smart_icon_size_get(icon, &size, NULL);
+   return (size < 32) ? 32 : size;
+}
+
 #ifdef HAVE_ELEMENTARY_ETHUMB
 static void
 _icon_thumb_stop(Widget_Data *wd, void *ethumbd)
@@ -283,14 +291,6 @@ _icon_thumb_exists(Ethumb_Client *client __UNUSED__, Ethumb_Exists *thread, Eina
      }
 }
 
-static inline int
-_icon_size_min_get(Evas_Object *icon)
-{
-   int size;
-   _els_smart_icon_size_get(icon, &size, NULL);
-   return (size < 32) ? 32 : size;
-}
-
 static void
 _icon_thumb_apply(Widget_Data *wd)
 {
@@ -709,8 +709,10 @@ _elm_icon_standard_resize(void *data,
    if (!_elm_icon_standard_set(wd, obj, wd->stdicon, &fdo) || (!fdo))
      evas_object_event_callback_del_full(obj, EVAS_CALLBACK_RESIZE,
                                          _elm_icon_standard_resize, wd);
+#ifdef HAVE_ELEMENTARY_ETHUMB
    if (wd->thumb.file.path)
      elm_icon_thumb_set(obj, wd->thumb.file.path, wd->thumb.file.key);
+#endif
 
    eina_stringshare_del(refup);
 }