devilhorns pushed a commit to branch master.

commit a0fe9467a6daaf3b74dd482708eb7f5443cef773
Author: Chris Michael <[email protected]>
Date:   Mon Aug 12 13:26:53 2013 +0100

    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.
---
 src/lib/elm_thumb_common.h | 7 -------
 src/lib/elm_widget_thumb.h | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/lib/elm_thumb_common.h b/src/lib/elm_thumb_common.h
index 8cb2d5b..484f1a1 100644
--- a/src/lib/elm_thumb_common.h
+++ b/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/src/lib/elm_widget_thumb.h b/src/lib/elm_widget_thumb.h
index 36f350a..fdefe35 100644
--- a/src/lib/elm_widget_thumb.h
+++ b/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;

-- 

------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk

Reply via email to