Enlightenment CVS committal
Author : vapier
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_image.c ewl_image.h
Log Message:
fix building w/out epsilon ... if people want to force epsilon support, do it
in the configure script
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_image.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- ewl_image.c 31 Mar 2006 21:15:16 -0000 1.36
+++ ewl_image.c 1 Apr 2006 01:51:32 -0000 1.37
@@ -530,6 +530,7 @@
ewl_callback_prepend(EWL_WIDGET(image), EWL_CALLBACK_DESTROY,
ewl_image_thumb_destroy_cb, NULL);
+#ifdef BUILD_EPSILON_SUPPORT
if (!ewl_image_epsilon_handler) {
epsilon_thumb_init();
ewl_image_epsilon_handler =
@@ -537,6 +538,7 @@
ewl_image_thumbnail_complete_cb,
NULL);
}
+#endif
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -556,7 +558,11 @@
DCHECK_TYPE("thumb", thumb, EWL_IMAGE_THUMBNAIL_TYPE);
DCHECK_PARAM_PTR("path", path);
+#ifdef BUILD_EPSILON_SUPPORT
thumb->thumb = epsilon_add(path, NULL, EPSILON_THUMB_NORMAL, thumb);
+#else
+ thumb->thumb = NULL;
+#endif
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -573,7 +579,9 @@
thumb = EWL_IMAGE_THUMBNAIL(w);
if (thumb->thumb) {
+#ifdef BUILD_EPSILON_SUPPORT
epsilon_del(thumb->thumb);
+#endif
thumb->thumb = NULL;
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_image.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ewl_image.h 31 Mar 2006 21:15:16 -0000 1.21
+++ ewl_image.h 1 Apr 2006 01:51:32 -0000 1.22
@@ -1,10 +1,10 @@
#ifndef EWL_IMAGE_H
#define EWL_IMAGE_H
-/* #ifdef BUILD_EPSILON_SUPPORT */
+#ifdef BUILD_EPSILON_SUPPORT
#include <Epsilon.h>
#include <Epsilon_Request.h>
-/* #endif */
+#endif
/**
* @addtogroup Ewl_Image Ewl_Image: An Image Display Widget
@@ -82,7 +82,11 @@
struct Ewl_Image_Thumbnail
{
Ewl_Image image; /**< Inherit from Ewl_Image */
+#ifdef BUILD_EPSILON_SUPPORT
Epsilon_Request *thumb; /**< Outstanding request to thumbnail image */
+#else
+ void *thumb; /**< Not supported :( */
+#endif
Ewl_Widget *orig; /**< Reference to image used to create thumb */
};
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
