From 90d7174eb8961db25092d079d84f2da1d8f4f037 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Mon, 12 Aug 2013 13:26:53 +0100 Subject: [PATCH] Revert "Fix elementary building when --disable-ethumb is passed in." NB: Revert this. Breaks terminology building. WHY does terminology NOT use the elm_thumb widget ??? This reverts commit 6049b65339e0cc09d6fe6d6cee35a4ebc3927418. --- legacy/elementary/src/lib/elm_thumb_common.h | 7 ------- legacy/elementary/src/lib/elm_widget_thumb.h | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/legacy/elementary/src/lib/elm_thumb_common.h b/legacy/elementary/src/lib/elm_thumb_common.h index 8cb2d5b46a..484f1a162e 100644 --- a/legacy/elementary/src/lib/elm_thumb_common.h +++ b/legacy/elementary/src/lib/elm_thumb_common.h @@ -14,13 +14,6 @@ typedef enum ELM_THUMB_ANIMATION_LAST } Elm_Thumb_Animation_Setting; -#ifndef ELM_ETHUMB -typedef int Ethumb_Thumb_FDO_Size; -typedef int Ethumb_Thumb_Aspect; -typedef int Ethumb_Thumb_Format; -typedef int Ethumb_Thumb_Orientation; -#endif - /** * Get the ethumb_client handle so custom configuration can be made. * diff --git a/legacy/elementary/src/lib/elm_widget_thumb.h b/legacy/elementary/src/lib/elm_widget_thumb.h index 36f350acc9..fdefe354ae 100644 --- a/legacy/elementary/src/lib/elm_widget_thumb.h +++ b/legacy/elementary/src/lib/elm_widget_thumb.h @@ -37,7 +37,6 @@ struct _Elm_Thumb_Smart_Data const char *thumb_path; const char *thumb_key; Ethumb_Client_Async *request; -#endif double cropx; double cropy; @@ -52,6 +51,7 @@ struct _Elm_Thumb_Smart_Data Ethumb_Thumb_Orientation orient; Eina_Bool retry : 1; +#endif } thumb; Ecore_Event_Handler *eeh;