E CVS: libs/emotion raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/modules
Modified Files:
emotion_xine.c emotion_xine.h
Log Message:
work around xine deadlock
===
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- emotion_xine.c 6 May 2007 06:40:00 - 1.37
+++ emotion_xine.c 18 Jul 2007 05:13:19 - 1.38
@@ -128,6 +128,7 @@
ev->queue = xine_event_new_queue(ev->stream);
xine_event_create_listener_thread(ev->queue, _em_event,
ev);
ev->opening = 0;
+ ev->play_ok = 1;
_em_module_event(ev, 1); /* event - open done */
}
break;
@@ -405,6 +406,7 @@
ev->delete_me = 0;
ev->get_pos_thread_deleted = 0;
ev->opening = 1;
+ ev->play_ok = 0;
if (opt)
{
@@ -471,6 +473,7 @@
ev = (Emotion_Xine_Video *)ef;
ev->play = 1;
+ ev->play_ok = 0;
ppos = malloc(sizeof(double));
*ppos = pos;
_em_slave_event(ev, 4, ppos);
@@ -483,6 +486,7 @@
ev = (Emotion_Xine_Video *)ef;
ev->play = 0;
+ ev->play_ok = 0;
_em_slave_event(ev, 5, NULL);
}
@@ -591,7 +595,7 @@
Emotion_Xine_Video *ev;
ev = (Emotion_Xine_Video *)ef;
- if (ev->opening) return 0;
+ if (ev->opening || (!ev->play_ok)) return 0;
return (xine_get_stream_info(ev->stream, XINE_STREAM_INFO_HAS_VIDEO) &&
xine_get_stream_info(ev->stream, XINE_STREAM_INFO_VIDEO_HANDLED));
}
@@ -602,7 +606,7 @@
Emotion_Xine_Video *ev;
ev = (Emotion_Xine_Video *)ef;
- if (ev->opening) return 0;
+ if (ev->opening || (!ev->play_ok)) return 0;
return (xine_get_stream_info(ev->stream, XINE_STREAM_INFO_HAS_AUDIO) &&
xine_get_stream_info(ev->stream, XINE_STREAM_INFO_AUDIO_HANDLED));
}
@@ -613,7 +617,7 @@
Emotion_Xine_Video *ev;
ev = (Emotion_Xine_Video *)ef;
- if (ev->opening) return 0;
+ if (ev->opening || (!ev->play_ok)) return 0;
return xine_get_stream_info(ev->stream, XINE_STREAM_INFO_SEEKABLE);
}
@@ -707,7 +711,7 @@
xine_event_t xine_event;
ev = (Emotion_Xine_Video *)ef;
- if (ev->opening) return;
+ if ((ev->opening) || (!ev->play_ok)) return;
xine_event.data_length = 0;
xine_event.data= NULL;
xine_event.stream = ev->stream;
@@ -813,7 +817,7 @@
xine_input_data_t xine_input;
ev = (Emotion_Xine_Video *)ef;
- if (ev->opening) return;
+ if ((ev->opening) || (!ev->play_ok)) return;
xine_event.stream = ev->stream;
gettimeofday(&xine_event.tv, NULL);
xine_event.type = XINE_EVENT_INPUT_MOUSE_BUTTON;
@@ -833,7 +837,7 @@
xine_input_data_t xine_input;
ev = (Emotion_Xine_Video *)ef;
- if (ev->opening) return;
+ if ((ev->opening) || (!ev->play_ok)) return;
xine_event.stream = ev->stream;
gettimeofday(&xine_event.tv, NULL);
xine_event.type = XINE_EVENT_INPUT_MOUSE_MOVE;
@@ -852,7 +856,7 @@
int v;
ev = (Emotion_Xine_Video *)ef;
- if (ev->opening) return 0;
+ if (ev->opening || (!ev->play_ok)) return 0;
v = xine_get_stream_info(ev->stream, XINE_STREAM_INFO_VIDEO_CHANNELS);
if ((v < 1) &&
xine_get_stream_info(ev->stream, XINE_STREAM_INFO_HAS_VIDEO)) return 1;
@@ -876,7 +880,7 @@
Emotion_Xine_Video *ev;
ev = (Emotion_Xine_Video *)ef;
- if (ev->opening) return 0;
+ if (ev->opening || (!ev->play_ok)) return 0;
return xine_get_param(ev->stream, XINE_PARAM_VIDEO_CHANNEL);
}
@@ -913,7 +917,7 @@
Emotion_Xine_Video *ev;
ev = (Emotion_Xine_Video *)ef;
- if (ev->opening) return 0;
+ if (ev->opening || (!ev->play_ok)) return 0;
return xine_get_stream_info(ev->stream, XINE_STREAM_INFO_MAX_AUDIO_CHANNEL);
}
@@ -934,7 +938,7 @@
Emotion_Xine_Video *ev;
ev = (Emotion_Xine_Video *)ef;
- if (ev->opening) return 0;
+ if (ev->opening || (!ev->play_ok)) return 0;
return xine_get_param(ev->stream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL);
}
@@ -988,7 +992,7 @@
Emotion_Xine_Video *ev;
ev = (Emotion_Xine_Video *)ef;
- if (ev->opening) return 0;
+ if (ev->opening || (!ev->play_ok)) return 0;
return (double)xine_get_param(ev->stream, XINE_PARAM_AUDIO_VOLUME) / 100.0;
}
@@ -998,7 +1002,7 @@
Emotion_Xine_Video *ev;
ev = (Emotion_Xine_Video *)ef;
- if (ev->opening) return 0;
+ if (ev->opening || (!ev->play_ok)) return 0;
return xine_get_stream_info(ev->stream, XINE_STREAM_INFO_MAX_SPU_CHANNEL);
}
@@ -1019,7 +1023,7 @@
Emotion_Xine_Video *ev;
ev = (Emotion_Xine_Video *)ef;
- if (ev->opening) return 0;
+ if (ev->opening || (!ev->play_ok)) return 0;
return xine_get_param(ev->stream, XINE_PARAM_SPU_CHANNEL);
}
@@ -1061,7 +1065,7 @@
Emotion_
E CVS: apps/evfs kaethorn
Enlightenment CVS committal Author : kaethorn Project : e17 Module : apps/evfs Dir : e17/apps/evfs/debian Modified Files: libevfs0-dev.install Log Message: add pkg-config file to debian package. === RCS file: /cvs/e/e17/apps/evfs/debian/libevfs0-dev.install,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- libevfs0-dev.install16 Jul 2007 17:51:10 - 1.3 +++ libevfs0-dev.install18 Jul 2007 04:54:40 - 1.4 @@ -2,3 +2,4 @@ debian/tmp/usr/lib/libevfs.la debian/tmp/usr/lib/libevfs.a debian/tmp/usr/include/evfs/* +debian/tmp/usr/lib/pkgconfig/*.pc - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/data
Modified Files:
theme.edc
Log Message:
debugging emotion.
===
RCS file: /cvs/e/e17/libs/emotion/data/theme.edc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- theme.edc 27 May 2007 06:47:44 - 1.8
+++ theme.edc 18 Jul 2007 04:42:31 - 1.9
@@ -138,7 +138,6 @@
relative: 0.0 0.0;
offset: 14 14;
}
- color: 0 0 0 0;
}
}
part {
@@ -771,7 +770,6 @@
relative: 0.0 1.0;
offset: 7-25;
}
- color: 0 0 0 0;
}
}
part {
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/lib
Modified Files:
emotion_smart.c
Log Message:
debugging emotion.
===
RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- emotion_smart.c 6 May 2007 05:05:26 - 1.28
+++ emotion_smart.c 18 Jul 2007 04:42:31 - 1.29
@@ -822,6 +822,7 @@
Smart_Data *sd;
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
+// printf("pix get set 1 %p\n", sd->obj);
evas_object_image_pixels_dirty_set(sd->obj, 1);
}
@@ -1036,6 +1037,7 @@
}
if ((iw < 1) || (ih < 1))
{
+// printf("pix get set 0 (1)\n");
evas_object_image_pixels_dirty_set(obj, 0);
}
else
@@ -1056,6 +1058,7 @@
evas_object_image_data_update_add(obj, 0, 0, iw, ih);
}
evas_object_image_data_set(obj, rows);
+// printf("pix get set 0 (2)\n");
evas_object_image_pixels_dirty_set(obj, 0);
}
else if (format == EMOTION_FORMAT_BGRA)
@@ -1063,6 +1066,7 @@
if (sd->module->bgra_data_get(sd->video, &bgra_data));
{
evas_object_image_data_set(obj, bgra_data);
+// printf("pix get set 0 (3)\n");
evas_object_image_pixels_dirty_set(obj, 0);
}
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/canvas Modified Files: evas_object_image.c Log Message: 0 cedric's patches broke emotion - fix. === RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_object_image.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -3 -r1.54 -r1.55 --- evas_object_image.c 16 Jul 2007 07:25:33 - 1.54 +++ evas_object_image.c 18 Jul 2007 04:42:23 - 1.55 @@ -27,8 +27,8 @@ const char*key; intcspace; - char smooth_scale : 1; - char has_alpha :1; + unsigned char smooth_scale : 1; + unsigned char has_alpha :1; } cur, prev; int pixels_checked_out; @@ -48,8 +48,8 @@ void *engine_data; - char changed : 1; - char dirty_pixels : 1; + unsigned char changed : 1; + unsigned char dirty_pixels : 1; }; /* private methods for image objects */ - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/modules
Modified Files:
emotion_xine_vo_out.c
Log Message:
debugging emotion.
===
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_xine_vo_out.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- emotion_xine_vo_out.c 13 Mar 2007 02:30:14 - 1.5
+++ emotion_xine_vo_out.c 18 Jul 2007 04:42:31 - 1.6
@@ -461,7 +461,7 @@
ret = write(dv->ev->fd_write, &buf, sizeof(void *));
// printf("-- FRAME DEC %p == %i\n", fr->frame.obj, ret);
fr->in_use = 1;
-// dv->ev->fq++;
+ dv->ev->fq++;
}
/* hmm - must find a way to sanely copy data out... FIXME problem */
// fr->vo_frame.free(&fr->vo_frame);
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
evas_image_main.c
Log Message:
0
cedric's patches broke emotion - fix.
===
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_image_main.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- evas_image_main.c 17 Jul 2007 10:08:16 - 1.52
+++ evas_image_main.c 18 Jul 2007 04:42:23 - 1.53
@@ -306,7 +306,8 @@
EAPI void
evas_common_image_colorspace_normalize(RGBA_Image *im)
{
- if ((!im->cs.data) || (!im->cs.dirty)) return;
+ if ((!im->cs.data) ||
+ ((!im->cs.dirty) && (!(im->flags & RGBA_IMAGE_IS_DIRTY return;
switch (im->cs.space)
{
case EVAS_COLORSPACE_ARGB:
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_widget.c
Log Message:
- revert this as it's causing things to go all screwy. notebook tabs turn
the window white, windows would randomly flicker to white and back
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -3 -r1.136 -r1.137
--- ewl_widget.c16 Jul 2007 19:23:17 - 1.136
+++ ewl_widget.c18 Jul 2007 04:31:12 - 1.137
@@ -2497,7 +2497,6 @@
* caching.
*/
if (w->theme_object) {
- edje_object_file_set(w->theme_object, NULL, NULL);
ewl_embed_object_cache(emb, w->theme_object);
w->theme_object = NULL;
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/engines/common Modified Files: evas_image_load.c Log Message: - don't free the passed in im structure. leave it up to the caller to cleanup as needed on error. - this should hopefully fix bug 97 === RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_image_load.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -3 -r1.41 -r1.42 --- evas_image_load.c 16 Jul 2007 07:25:33 - 1.41 +++ evas_image_load.c 18 Jul 2007 03:23:35 - 1.42 @@ -79,7 +79,6 @@ } } - evas_common_image_delete(im); return -1; ok: - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto davemds
Enlightenment CVS committal Author : davemds Project : e17 Module : proto Dir : e17/proto/edje_editor/m4 Removed Files: ac_path_generic.m4 Log Message: Remove unused file - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto Dir : e17/proto/python-efl/python-emotion/emotion Added Files: .cvsignore Log Message: ignore generated .c - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto Dir : e17/proto/python-efl/python-edje/edje Modified Files: edje.c_edje_object.pxi Log Message: Show exception tracebacks for exceptions ignored inside C callbacks. === RCS file: /cvs/e/e17/proto/python-efl/python-edje/edje/edje.c_edje_object.pxi,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- edje.c_edje_object.pxi 12 Jul 2007 19:11:53 - 1.10 +++ edje.c_edje_object.pxi 17 Jul 2007 23:07:20 - 1.11 @@ -6,7 +6,11 @@ if self._text_change_cb is None: return func, args, kargs = self._text_change_cb -func(self, part, *args, **kargs) +try: +func(self, part, *args, **kargs) +except Exception, e: +import traceback +traceback.print_exc() cdef void message_handler_cb(void *data, evas.c_evas.Evas_Object *obj, @@ -16,7 +20,11 @@ if self._message_handler_cb is None: return func, args, kargs = self._message_handler_cb -func(self, Message_from_type(type, id, msg), *args, **kargs) +try: +func(self, Message_from_type(type, id, msg), *args, **kargs) +except Exception, e: +import traceback +traceback.print_exc() cdef void signal_cb(void *data, evas.c_evas.Evas_Object *obj, @@ -25,7 +33,11 @@ self = evas.c_evas._Object_from_instance(obj) lst = data for func, args, kargs in lst: -func(self, emission, source, *args, **kargs) +try: +func(self, emission, source, *args, **kargs) +except Exception, e: +import traceback +traceback.print_exc() class EdjeLoadError(Exception): - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto Dir : e17/proto/python-efl/python-ecore/ecore Modified Files: ecore.c_ecore_animator.pxi ecore.c_ecore_fd_handler.pxi ecore.c_ecore_idle_enterer.pxi ecore.c_ecore_idle_exiter.pxi ecore.c_ecore_idler.pxi ecore.c_ecore_timer.pxi Log Message: Show exception tracebacks for exceptions ignored inside C callbacks. === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_animator.pxi,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore.c_ecore_animator.pxi 3 May 2007 16:17:58 - 1.1 +++ ecore.c_ecore_animator.pxi 17 Jul 2007 23:07:20 - 1.2 @@ -45,7 +45,14 @@ cdef int r obj = _td -r = bool(obj._exec()) + +try: +r = bool(obj._exec()) +except Exception, e: +import traceback +traceback.print_exc() +r = 0 + if not r: obj.delete() return r === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_fd_handler.pxi,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore.c_ecore_fd_handler.pxi13 May 2007 20:51:38 - 1.1 +++ ecore.c_ecore_fd_handler.pxi17 Jul 2007 23:07:20 - 1.2 @@ -110,7 +110,14 @@ cdef int r obj = _td -r = bool(obj._exec()) + +try: +r = bool(obj._exec()) +except Exception, e: +import traceback +traceback.print_exc() +r = 0 + if not r: obj.delete() return r === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_idle_enterer.pxi,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore.c_ecore_idle_enterer.pxi 13 May 2007 20:50:05 - 1.1 +++ ecore.c_ecore_idle_enterer.pxi 17 Jul 2007 23:07:20 - 1.2 @@ -45,7 +45,14 @@ cdef int r obj = _td -r = bool(obj._exec()) + +try: +r = bool(obj._exec()) +except Exception, e: +import traceback +traceback.print_exc() +r = 0 + if not r: obj.delete() return r === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_idle_exiter.pxi,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore.c_ecore_idle_exiter.pxi 13 May 2007 20:50:05 - 1.1 +++ ecore.c_ecore_idle_exiter.pxi 17 Jul 2007 23:07:20 - 1.2 @@ -45,7 +45,14 @@ cdef int r obj = _td -r = bool(obj._exec()) + +try: +r = bool(obj._exec()) +except Exception, e: +import traceback +traceback.print_exc() +r = 0 + if not r: obj.delete() return r === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_idler.pxi,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore.c_ecore_idler.pxi 13 May 2007 20:50:05 - 1.1 +++ ecore.c_ecore_idler.pxi 17 Jul 2007 23:07:20 - 1.2 @@ -45,7 +45,14 @@ cdef int r obj = _td -r = bool(obj._exec()) + +try: +r = bool(obj._exec()) +except Exception, e: +import traceback +traceback.print_exc() +r = 0 + if not r: obj.delete() return r === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_timer.pxi,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore.c_ecore_timer.pxi 3 May 2007 16:17:58 - 1.1 +++ ecore.c_ecore_timer.pxi 17 Jul 2007 23:07:20 - 1.2 @@ -61,7 +61,14 @@ cdef int r obj = _td -r = bool(obj._exec()) + +try: +r = bool(obj._exec()) +except Exception, e: +import traceback +traceback.print_exc() +r = 0 + if not r: obj.delete() return r - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto Dir : e17/proto/python-efl/python-emotion/emotion Modified Files: emotion.c_emotion.pyx Log Message: Show exception tracebacks for exceptions ignored inside C callbacks. === RCS file: /cvs/e/e17/proto/python-efl/python-emotion/emotion/emotion.c_emotion.pyx,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- emotion.c_emotion.pyx 12 Jul 2007 19:11:53 - 1.2 +++ emotion.c_emotion.pyx 17 Jul 2007 23:07:20 - 1.3 @@ -7,7 +7,11 @@ event = data lst = obj._emotion_callbacks[event] for func, args, kargs in lst: -func(obj, *args, **kargs) +try: +func(obj, *args, **kargs) +except Exception, e: +import traceback +traceback.print_exc() class EmotionModuleInitError(Exception): - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto Dir : e17/proto/python-efl/python-evas/evas Modified Files: evas.c_evas_object_callbacks.pxi Log Message: Show exception tracebacks for exceptions ignored inside C callbacks. === RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_callbacks.pxi,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- evas.c_evas_object_callbacks.pxi3 May 2007 14:29:22 - 1.1 +++ evas.c_evas_object_callbacks.pxi17 Jul 2007 23:07:20 - 1.2 @@ -4,7 +4,11 @@ # iterate over copy since users may delete callback from callback lst = list(self._callbacks[type]) for func, args, kargs in lst: -func(self, event, *args, **kargs) +try: +func(self, event, *args, **kargs) +except Exception, e: +import traceback +traceback.print_exc() return 1 @@ -12,7 +16,11 @@ # iterate over copy since users may delete callback from callback lst = list(self._callbacks[type]) for func, args, kargs in lst: -func(self, *args, **kargs) +try: +func(self, *args, **kargs) +except Exception, e: +import traceback +traceback.print_exc() return 1 - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_text.c
Log Message:
- use the Ewl_Color_Set
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_text.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -3 -r1.167 -r1.168
--- ewl_text.c 1 Jul 2007 20:14:09 - 1.167
+++ ewl_text.c 17 Jul 2007 22:38:20 - 1.168
@@ -58,9 +58,7 @@
static void ewl_text_selection_select_to(Ewl_Text_Trigger *s,
unsigned int char_idx);
-static void ewl_text_theme_color_get(Ewl_Text *t, unsigned char *r,
- unsigned char *g, unsigned char *b,
- unsigned char *a, char *name);
+static void ewl_text_theme_color_get(Ewl_Text *t, Ewl_Color_Set *color, char
*name);
static Ewl_Text_Context *ewl_text_context_default_create(Ewl_Text *t);
@@ -2537,8 +2535,7 @@
}
static void
-ewl_text_theme_color_get(Ewl_Text *t, unsigned char *r, unsigned char *g,
- unsigned char *b, unsigned char *a, char *name)
+ewl_text_theme_color_get(Ewl_Text *t, Ewl_Color_Set *color, char *name)
{
char buf[128];
int pos;
@@ -2549,16 +2546,16 @@
pos = strlen(name) + 1;
snprintf(buf, sizeof(buf), "%s/r", name);
- if (r) *r = ewl_theme_data_int_get(EWL_WIDGET(t), buf);
+ color->r = ewl_theme_data_int_get(EWL_WIDGET(t), buf);
buf[pos] = 'g';
- if (g) *g = ewl_theme_data_int_get(EWL_WIDGET(t), buf);
+ color->g = ewl_theme_data_int_get(EWL_WIDGET(t), buf);
buf[pos] = 'b';
- if (b) *b = ewl_theme_data_int_get(EWL_WIDGET(t), buf);
+ color->b = ewl_theme_data_int_get(EWL_WIDGET(t), buf);
buf[pos] = 'a';
- if (a) *a = ewl_theme_data_int_get(EWL_WIDGET(t), buf);
+ color->a = ewl_theme_data_int_get(EWL_WIDGET(t), buf);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -2593,17 +2590,12 @@
tmp->font_source = NULL;
tmp->size = ewl_theme_data_int_get(EWL_WIDGET(t), "font_size");
- ewl_text_theme_color_get(t, &(tmp->color.r), &(tmp->color.g),
- &(tmp->color.b), &(tmp->color.a), "color");
-
+ ewl_text_theme_color_get(t, &(tmp->color), "color");
i = ewl_theme_data_int_get(EWL_WIDGET(t), "underline");
if (i)
{
tmp->styles |= EWL_TEXT_STYLE_UNDERLINE;
- ewl_text_theme_color_get(t, &(tmp->style_colors.underline.r),
- &(tmp->style_colors.underline.g),
- &(tmp->style_colors.underline.b),
- &(tmp->style_colors.underline.a),
+ ewl_text_theme_color_get(t, &(tmp->style_colors.underline),
"underline/color");
}
@@ -2611,10 +2603,7 @@
if (i)
{
tmp->styles |= EWL_TEXT_STYLE_DOUBLE_UNDERLINE;
- ewl_text_theme_color_get(t,
&(tmp->style_colors.double_underline.r),
- &(tmp->style_colors.double_underline.g),
- &(tmp->style_colors.double_underline.b),
- &(tmp->style_colors.double_underline.a),
+ ewl_text_theme_color_get(t,
&(tmp->style_colors.double_underline),
"double_underline/color");
}
@@ -2622,10 +2611,7 @@
if (i)
{
tmp->styles |= EWL_TEXT_STYLE_STRIKETHROUGH;
- ewl_text_theme_color_get(t,
&(tmp->style_colors.strikethrough.r),
- &(tmp->style_colors.strikethrough.g),
- &(tmp->style_colors.strikethrough.b),
- &(tmp->style_colors.strikethrough.a),
+ ewl_text_theme_color_get(t, &(tmp->style_colors.strikethrough),
"strikethrough/color");
}
@@ -2633,10 +2619,7 @@
if (i)
{
tmp->styles |= EWL_TEXT_STYLE_SHADOW;
- ewl_text_theme_color_get(t, &(tmp->style_colors.shadow.r),
- &(tmp->style_colors.shadow.g),
- &(tmp->style_colors.shadow.b),
- &(tmp->style_colors.shadow.a),
+ ewl_text_theme_color_get(t, &(tmp->style_colors.shadow),
"shadow/color");
}
@@ -2644,10 +2627,7 @@
if (i)
{
tmp->styles |= EWL_TEXT_STYLE_SOFT_SHADOW;
- ewl_text_theme_color_get(t, &(tmp->style_colors.shadow.r),
- &(tmp->style_colors.shadow.g),
-
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_text_context.c Log Message: - minor cleanup. use the ewl_color_set === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_text_context.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- ewl_text_context.c 17 Jul 2007 22:09:46 - 1.4 +++ ewl_text_context.c 17 Jul 2007 22:22:01 - 1.5 @@ -524,96 +524,28 @@ DENTER_FUNCTION(DLEVEL_STABLE); +#define KEY_BUILD(c) (c.r | c.g | c.b | c.a) #define KEY_COMPARE(k1, k2) if (k1 > k2) goto CTX1_LARGER; else if (k2 > k1) goto CTX2_LARGER; - key1 = 0; - key2 = 0; - - if (tx1->font) - key1 = ecore_str_hash(tx1->font); - if (tx2->font) - key2 = ecore_str_hash(tx2->font); + key1 = ((tx1->font) ? ecore_str_hash(tx1->font) : 0); + key2 = ((tx2->font) ? ecore_str_hash(tx2->font) : 0); KEY_COMPARE(key1, key2); KEY_COMPARE(tx1->size, tx2->size); KEY_COMPARE(tx1->styles, tx2->styles); - - key1 = (tx1->color.r | tx1->color.g | tx1->color.b | tx1->color.a); - key2 = (tx2->color.r | tx2->color.g | tx2->color.b | tx2->color.a); - - KEY_COMPARE(key1, key2); - - key1 = (tx1->style_colors.bg.r | - tx1->style_colors.bg.g | - tx1->style_colors.bg.b | - tx1->style_colors.bg.a); - - key2 = (tx2->style_colors.bg.r | - tx2->style_colors.bg.g | - tx2->style_colors.bg.b | - tx2->style_colors.bg.a); - - KEY_COMPARE(key1, key2); - - key1 = (tx1->style_colors.outline.r | - tx1->style_colors.outline.g | - tx1->style_colors.outline.b | - tx1->style_colors.outline.a); - - key2 = (tx2->style_colors.outline.r | - tx2->style_colors.outline.g | - tx2->style_colors.outline.b | - tx2->style_colors.outline.a); - - KEY_COMPARE(key1, key2); - - key1 = (tx1->style_colors.shadow.r | - tx1->style_colors.shadow.g | - tx1->style_colors.shadow.b | - tx1->style_colors.shadow.a); - - key2 = (tx2->style_colors.shadow.r | - tx2->style_colors.shadow.g | - tx2->style_colors.shadow.b | - tx2->style_colors.shadow.a); - - KEY_COMPARE(key1, key2); - - key1 = (tx1->style_colors.strikethrough.r | - tx1->style_colors.strikethrough.g | - tx1->style_colors.strikethrough.b | - tx1->style_colors.strikethrough.a); - - key2 = (tx2->style_colors.strikethrough.r | - tx2->style_colors.strikethrough.g | - tx2->style_colors.strikethrough.b | - tx2->style_colors.strikethrough.a); - - KEY_COMPARE(key1, key2); - - key1 = (tx1->style_colors.underline.r | - tx1->style_colors.underline.g | - tx1->style_colors.underline.b | - tx1->style_colors.underline.a); - - key2 = (tx2->style_colors.underline.r | - tx2->style_colors.underline.g | - tx2->style_colors.underline.b | - tx2->style_colors.underline.a); - - KEY_COMPARE(key1, key2); - - key1 = (tx1->style_colors.double_underline.r | - tx1->style_colors.double_underline.g | - tx1->style_colors.double_underline.b | - tx1->style_colors.double_underline.a); - - key2 = (tx2->style_colors.double_underline.r | - tx2->style_colors.double_underline.g | - tx2->style_colors.double_underline.b | - tx2->style_colors.double_underline.a); - - KEY_COMPARE(key1, key2); + KEY_COMPARE(KEY_BUILD(tx1->color), KEY_BUILD(tx2->color)); + KEY_COMPARE(KEY_BUILD(tx1->style_colors.bg), + KEY_BUILD(tx2->style_colors.bg)); + KEY_COMPARE(KEY_BUILD(tx1->style_colors.outline), + KEY_BUILD(tx2->style_colors.outline)); + KEY_COMPARE(KEY_BUILD(tx1->style_colors.shadow), + KEY_BUILD(tx2->style_colors.shadow)); + KEY_COMPARE(KEY_BUILD(tx1->style_colors.strikethrough), + KEY_BUILD(tx2->style_col
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_text_context.c
Log Message:
- cleanup context_find. use memcpy instead of copying each item over
- shoudln't be else if's in here
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_text_context.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_text_context.c 17 Jul 2007 22:02:06 - 1.3
+++ ewl_text_context.c 17 Jul 2007 22:09:46 - 1.4
@@ -114,74 +114,58 @@
if (tx_change->font_source)
new_tx->font_source =
strdup(tx_change->font_source);
}
- else if (context_mask & EWL_TEXT_CONTEXT_MASK_SIZE)
+
+ if (context_mask & EWL_TEXT_CONTEXT_MASK_SIZE)
new_tx->size = tx_change->size;
- else if (context_mask & EWL_TEXT_CONTEXT_MASK_STYLES)
+ if (context_mask & EWL_TEXT_CONTEXT_MASK_STYLES)
new_tx->styles = tx_change->styles;
- else if (context_mask & EWL_TEXT_CONTEXT_MASK_ALIGN)
+ if (context_mask & EWL_TEXT_CONTEXT_MASK_ALIGN)
new_tx->align = tx_change->align;
- else if (context_mask & EWL_TEXT_CONTEXT_MASK_WRAP)
+ if (context_mask & EWL_TEXT_CONTEXT_MASK_WRAP)
new_tx->wrap = tx_change->wrap;
- else if (context_mask & EWL_TEXT_CONTEXT_MASK_COLOR)
- {
- new_tx->color.r = tx_change->color.r;
- new_tx->color.g = tx_change->color.g;
- new_tx->color.b = tx_change->color.b;
- new_tx->color.a = tx_change->color.a;
- }
- else if (context_mask & EWL_TEXT_CONTEXT_MASK_BG_COLOR)
- {
- new_tx->style_colors.bg.r =
tx_change->style_colors.bg.r;
- new_tx->style_colors.bg.g =
tx_change->style_colors.bg.g;
- new_tx->style_colors.bg.b =
tx_change->style_colors.bg.b;
- new_tx->style_colors.bg.a =
tx_change->style_colors.bg.a;
- }
- else if (context_mask &
EWL_TEXT_CONTEXT_MASK_GLOW_COLOR)
- {
- new_tx->style_colors.glow.r =
tx_change->style_colors.glow.r;
- new_tx->style_colors.glow.g =
tx_change->style_colors.glow.g;
- new_tx->style_colors.glow.b =
tx_change->style_colors.glow.b;
- new_tx->style_colors.glow.a =
tx_change->style_colors.glow.a;
- }
- else if (context_mask &
EWL_TEXT_CONTEXT_MASK_OUTLINE_COLOR)
- {
- new_tx->style_colors.outline.r =
tx_change->style_colors.outline.r;
- new_tx->style_colors.outline.g =
tx_change->style_colors.outline.g;
- new_tx->style_colors.outline.b =
tx_change->style_colors.outline.b;
- new_tx->style_colors.outline.a =
tx_change->style_colors.outline.a;
- }
- else if (context_mask &
EWL_TEXT_CONTEXT_MASK_SHADOW_COLOR)
- {
- new_tx->style_colors.shadow.r =
tx_change->style_colors.shadow.r;
- new_tx->style_colors.shadow.g =
tx_change->style_colors.shadow.g;
- new_tx->style_colors.shadow.b =
tx_change->style_colors.shadow.b;
- new_tx->style_colors.shadow.a =
tx_change->style_colors.shadow.a;
- }
- else if (context_mask &
EWL_TEXT_CONTEXT_MASK_STRIKETHROUGH_COLOR)
- {
- new_tx->style_colors.strikethrough.r =
tx_change->style_colors.strikethrough.r;
- new_tx->style_colors.strikethrough.g =
tx_change->style_colors.strikethrough.g;
- new_tx->style_colors.strikethrough.b =
tx_change->style_colors.strikethrough.b;
- new_tx->style_colors.strikethrough.a =
tx_change->style_colors.strikethrough.a;
- }
- else if (context_mask &
EWL_TEXT_CONTEXT_MASK_UNDERLINE_COLOR)
- {
- new_tx->style_colors.underline.r =
tx_change->style_colors.underline.r;
-
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_text_context.c Log Message: - convert COLOR_HASH to to an ewl_color_set === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_text_context.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ewl_text_context.c 17 Jul 2007 21:56:47 - 1.2 +++ ewl_text_context.c 17 Jul 2007 22:02:06 - 1.3 @@ -518,37 +518,15 @@ key ^= (tx->size << 5); key ^= (tx->styles << 7); -#define COLOR_HASH(r, g, b, a) (r << 24 | g << 16 | b << 8 | a) - key ^= COLOR_HASH(tx->color.r, tx->color.g, tx->color.b, tx->color.a); - - key ^= (COLOR_HASH(tx->style_colors.bg.r, - tx->style_colors.bg.g, - tx->style_colors.bg.b, - tx->style_colors.bg.a) << 1); - key ^= (COLOR_HASH(tx->style_colors.glow.r, - tx->style_colors.glow.g, - tx->style_colors.glow.b, - tx->style_colors.glow.a) >> 1); - key ^= (COLOR_HASH(tx->style_colors.outline.r, - tx->style_colors.outline.g, - tx->style_colors.outline.b, - tx->style_colors.outline.a) << 3); - key ^= (COLOR_HASH(tx->style_colors.shadow.r, - tx->style_colors.shadow.g, - tx->style_colors.shadow.b, - tx->style_colors.shadow.a) >> 3); - key ^= (COLOR_HASH(tx->style_colors.strikethrough.r, - tx->style_colors.strikethrough.g, - tx->style_colors.strikethrough.b, - tx->style_colors.strikethrough.a) << 5); - key ^= (COLOR_HASH(tx->style_colors.underline.r, - tx->style_colors.underline.g, - tx->style_colors.underline.b, - tx->style_colors.underline.a) >> 5); - key ^= (COLOR_HASH(tx->style_colors.double_underline.r, - tx->style_colors.double_underline.g, - tx->style_colors.double_underline.b, - tx->style_colors.double_underline.a) << 7); +#define COLOR_HASH(c) (c.r << 24 | c.g << 16 | c.b << 8 | c.a) + key ^= COLOR_HASH(tx->color); + key ^= (COLOR_HASH(tx->style_colors.bg) << 1); + key ^= (COLOR_HASH(tx->style_colors.glow) >> 1); + key ^= (COLOR_HASH(tx->style_colors.outline) << 3); + key ^= (COLOR_HASH(tx->style_colors.shadow) >> 3); + key ^= (COLOR_HASH(tx->style_colors.strikethrough) << 5); + key ^= (COLOR_HASH(tx->style_colors.underline) >> 5); + key ^= (COLOR_HASH(tx->style_colors.double_underline) << 7); DRETURN_INT(key, DLEVEL_STABLE); } - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_text_context.c
Log Message:
- pass the color set instead of each individual component
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_text_context.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_text_context.c 25 Apr 2007 15:12:02 - 1.1
+++ ewl_text_context.c 17 Jul 2007 21:56:47 - 1.2
@@ -20,7 +20,7 @@
static unsigned int ewl_text_context_hash_key(const void *ctx);
static int ewl_text_context_hash_cmp(const void *ctx1, const void *ctx2);
-static char *ewl_text_context_color_string_get(int r, int g, int b, int a);
+static char *ewl_text_context_color_string_get(Ewl_Color_Set *colour);
/**
* @internal
@@ -310,20 +310,14 @@
fmt[pos].key = "underline_color";
fmt[pos].val = ewl_text_context_color_string_get(
- ctx->style_colors.underline.r,
- ctx->style_colors.underline.g,
- ctx->style_colors.underline.b,
- ctx->style_colors.underline.a);
+
&(ctx->style_colors.underline));
fmt[pos++].free = TRUE;
if (ctx->styles & EWL_TEXT_STYLE_DOUBLE_UNDERLINE)
{
fmt[pos].key = "underline2_color";
fmt[pos].val =
ewl_text_context_color_string_get(
-
ctx->style_colors.double_underline.r,
-
ctx->style_colors.double_underline.g,
-
ctx->style_colors.double_underline.b,
-
ctx->style_colors.double_underline.a);
+
&(ctx->style_colors.double_underline));
fmt[pos++].free = TRUE;
}
}
@@ -339,10 +333,7 @@
fmt[pos].key = "strikethrough_color";
fmt[pos].val = ewl_text_context_color_string_get(
- ctx->style_colors.strikethrough.r,
- ctx->style_colors.strikethrough.g,
- ctx->style_colors.strikethrough.b,
- ctx->style_colors.strikethrough.a);
+
&(ctx->style_colors.strikethrough));
fmt[pos++].free = TRUE;
}
else t = "off";
@@ -359,10 +350,7 @@
{
fmt[pos].key = "shadow_color";
fmt[pos].val = ewl_text_context_color_string_get(
- ctx->style_colors.shadow.r,
- ctx->style_colors.shadow.g,
- ctx->style_colors.shadow.b,
- ctx->style_colors.shadow.a);
+ &(ctx->style_colors.shadow));
fmt[pos++].free = TRUE;
if (ctx->styles & EWL_TEXT_STYLE_GLOW)
@@ -371,10 +359,7 @@
fmt[pos].key = "glow_color";
fmt[pos].val =
ewl_text_context_color_string_get(
- ctx->style_colors.glow.r,
- ctx->style_colors.glow.g,
- ctx->style_colors.glow.b,
- ctx->style_colors.glow.a);
+
&(ctx->style_colors.glow));
fmt[pos++].free = TRUE;
}
else if (ctx->styles & EWL_TEXT_STYLE_OUTLINE)
@@ -387,10 +372,7 @@
fmt[pos].key = "outline_color";
fmt[pos].val =
ewl_text_context_color_string_get(
- ctx->style_colors.outline.r,
- ctx->style_colors.outline.g,
- ctx->style_colors.outline.b,
- ctx->style_colors.outline.a);
+
&(ctx->style_colors.outline));
fmt[pos++].free = TRUE;
}
else if (ctx->styles & EWL_TEXT_STYLE_SHADOW)
@@ -472,15 +454,11 @@
fmt[pos++].free =
E CVS: emu onefang
Enlightenment CVS committal Author : onefang Project : e_modules Module : emu Dir : e_modules/emu Modified Files: configure.in Added Files: acinclude.m4 Log Message: Don't look for compilers we dont use. Experimental for now. Thanks caro. === RCS file: /cvs/e/e_modules/emu/configure.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- configure.in15 Jul 2007 20:51:03 - 1.12 +++ configure.in17 Jul 2007 21:52:42 - 1.13 @@ -9,6 +9,7 @@ AM_INIT_AUTOMAKE(emu, 2006.01.27) AM_CONFIG_HEADER(config.h) +AC_LIBTOOL_TAGS([]) AC_ISC_POSIX AC_PROG_CC AM_PROG_CC_STDC - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: deskshow onefang
Enlightenment CVS committal Author : onefang Project : e_modules Module : deskshow Dir : e_modules/deskshow Modified Files: configure.in Added Files: acinclude.m4 Log Message: Don't look for compilers we dont use. Experimental for now. Thanks caro. === RCS file: /cvs/e/e_modules/deskshow/configure.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- configure.in28 Apr 2007 12:31:17 - 1.8 +++ configure.in17 Jul 2007 21:52:18 - 1.9 @@ -7,6 +7,7 @@ AM_INIT_AUTOMAKE(deskshow, 0.0.1) AM_CONFIG_HEADER(config.h) +AC_LIBTOOL_TAGS([]) AC_ISC_POSIX AC_PROG_CC AM_PROG_CC_STDC - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto davemds
Enlightenment CVS committal Author : davemds Project : e17 Module : proto Dir : e17/proto/edje_editor/data Modified Files: Makefile.am Added Files: edje_editor.desktop edje_editor.png Log Message: Add .desktop file and the editor icon, thanks :) === RCS file: /cvs/e/e17/proto/edje_editor/data/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 13 Jul 2007 17:13:02 - 1.2 +++ Makefile.am 17 Jul 2007 19:53:14 - 1.3 @@ -11,6 +11,14 @@ filesdir = $(pkgdatadir) files_DATA = edje_editor.edj +desktopdir = $(datadir)/applications +desktop_DATA = edje_editor.desktop + +#http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html +icondir = $(datadir)/icons/hicolor/48x48/apps +icon_DATA = edje_editor.png + + edje_editor.edj: Makefile $(EDJE_CC) $(EDJE_FLAGS) \ $(top_srcdir)/data/edje_editor.edc \ - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/efreet mekius
Enlightenment CVS committal
Author : mekius
Project : e17
Module : libs/efreet
Dir : e17/libs/efreet/src/lib
Modified Files:
Efreet_Mime.h efreet_icon.c efreet_icon.h efreet_mime.c
Log Message:
Added efreet_mime_type_icon_get which will retrieve a mimetype icon. This
follows the loose specification described in the fdo icon spec. Also added
efreet_icon_list_find which will search for a list of icons in a theme before
falling back to inherited themes. Also made a slight modification to the
fallback detection for efreet_mime. Tabs will no longer trigger the return of
application/octet-stream.
===
RCS file: /cvs/e/e17/libs/efreet/src/lib/Efreet_Mime.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Efreet_Mime.h 6 Jul 2007 03:01:21 - 1.4
+++ Efreet_Mime.h 17 Jul 2007 19:21:20 - 1.5
@@ -34,6 +34,9 @@
const char *efreet_mime_globs_type_get(const char *file);
const char *efreet_mime_special_type_get(const char *file);
const char *efreet_mime_fallback_type_get(const char *file);
+
+const char *efreet_mime_type_icon_get(const char *mime, const char *theme,
+ const char
*size);
/**
* @}
===
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_icon.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- efreet_icon.c 22 Jun 2007 10:20:44 - 1.22
+++ efreet_icon.c 17 Jul 2007 19:21:20 - 1.23
@@ -11,10 +11,26 @@
Ecore_List *efreet_icon_extensions = NULL;
static Ecore_List *efreet_extra_icon_dirs = NULL;
+static char *efreet_icon_remove_extension(const char *icon);
+static Efreet_Icon_Theme *efreet_icon_find_theme_check(const char *theme_name);
+
+
+static Efreet_Icon *efreet_icon_find_fallback(Efreet_Icon_Theme *theme,
+ const char *cache_key,
+ const char *icon,
+ const char *size);
+static Efreet_Icon *efreet_icon_list_find_fallback(Efreet_Icon_Theme *theme,
+Ecore_List *cache_keys,
+Ecore_List *icons,
+const char *size);
static Efreet_Icon *efreet_icon_find_helper(Efreet_Icon_Theme *theme,
const char *cache_key,
const char *icon,
const char *size);
+static Efreet_Icon *efreet_icon_list_find_helper(Efreet_Icon_Theme *theme,
+Ecore_List *cache_keys,
+Ecore_List *icons,
+const char *size);
static Efreet_Icon *efreet_icon_lookup_icon(Efreet_Icon_Theme *theme,
const char *icon_name,
const char *size);
@@ -238,6 +254,63 @@
}
/**
+ * @internal
+ * @param icon: The icon name to strip extension
+ * @return Extension removed if in list of extensions, else untouched.
+ * @brief Removes extension from icon name if in list of extensions.
+ */
+static char *
+efreet_icon_remove_extension(const char *icon)
+{
+char *tmp = NULL, *ext = NULL;
+
+tmp = strdup(icon);
+ext = strrchr(tmp, '.');
+if (ext)
+{
+const char *ext2;
+ecore_list_goto_first(efreet_icon_extensions);
+while ((ext2 = ecore_list_next(efreet_icon_extensions)))
+{
+if (!strcmp(ext, ext2))
+{
+#ifdef STRICT_SPEC
+printf("[Efreet]: Requesting an icon with an extension: %s\n",
+icon);
+#endif
+*ext = '\0';
+break;
+}
+}
+}
+
+return tmp;
+}
+
+/**
+ * @internal
+ * @param theme_name: The icon theme to look for
+ * @return Returns the Efreet_Icon_Theme structure representing this theme
+ * or a new blank theme if not found
+ * @brief Retrieves a theme, or creates a blank one if not found.
+ */
+static Efreet_Icon_Theme *
+efreet_icon_find_theme_check(const char *theme_name)
+{
+Efreet_Icon_Theme *theme = NULL;
+theme = efreet_icon_theme_find(theme_name);
+if (!theme)
+{
+theme = efreet_icon_theme_new();
+theme->fake = 1;
+theme->name.internal = ecore_string_instance(theme_name);
+ecore_hash_set(efreet_icon_themes, (void *)theme->name.internal,
theme);
+}
+
+return theme;
+}
+
+/**
* @param theme_name: The icon theme to look for
* @param icon
E CVS: proto onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : proto Dir : e17/proto/epdf Modified Files: autogen.sh Log Message: No more m4 directory. === RCS file: /cvs/e/e17/proto/epdf/autogen.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- autogen.sh 15 Feb 2006 21:45:08 - 1.1 +++ autogen.sh 17 Jul 2007 16:08:49 - 1.2 @@ -3,7 +3,7 @@ rm -rf autom4te.cache rm -f aclocal.m4 ltmain.sh -echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1 +echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1 echo "Running autoheader..." ; autoheader || exit 1 echo "Running autoconf..." ; autoconf || exit 1 echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/efreet mekius
Enlightenment CVS committal
Author : mekius
Project : e17
Module : libs/efreet
Dir : e17/libs/efreet/src/lib
Modified Files:
efreet_desktop.c efreet_private.h
Log Message:
Adding efreet_desktop_environment_get
===
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_desktop.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- efreet_desktop.c22 Jun 2007 09:39:58 - 1.21
+++ efreet_desktop.c17 Jul 2007 15:07:59 - 1.22
@@ -543,6 +543,17 @@
}
/**
+ * @internal
+ * @return environment: the environment name
+ * @brief sets the global desktop environment name
+ */
+const char *
+efreet_desktop_environment_get(void)
+{
+return desktop_environment;
+}
+
+/**
* @param desktop: The desktop to work with
* @return Returns the number of categories assigned to this desktop
* @brief Retrieves the number of categories the given @a desktop belongs
===
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_private.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- efreet_private.h22 Jun 2007 09:45:09 - 1.7
+++ efreet_private.h17 Jul 2007 15:07:59 - 1.8
@@ -201,6 +201,8 @@
size_t efreet_array_cat(char *buffer, size_t size, const char *strs[]);
+const char *efreet_desktop_environment_get(void);
+
/**
* @}
*/
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/bin Modified Files: Makefile.am Log Message: compile ecore_config program only if ecore_config is available === RCS file: /cvs/e/e17/libs/ecore/src/bin/Makefile.am,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- Makefile.am 16 Jul 2007 07:23:10 - 1.25 +++ Makefile.am 17 Jul 2007 11:08:28 - 1.26 @@ -1,8 +1,10 @@ MAINTAINERCLEANFILES = Makefile.in if BUILD_ECORE_CONFIG +ECORE_CONFIG_PROG = ecore_config ECORE_CONFIG_LIB = $(top_builddir)/src/lib/ecore_config/libecore_config.la else +ECORE_CONFIG_PROG = ECORE_CONFIG_LIB = endif @@ -16,8 +18,7 @@ -DPACKAGE_LIB_DIR=\"@[EMAIL PROTECTED]" \ -DPACKAGE_DATA_DIR=\"@[EMAIL PROTECTED]" -bin_PROGRAMS = \ -ecore_config +bin_PROGRAMS = $(ECORE_CONFIG_PROG) ecore_config_SOURCES = \ ecore_config.c - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/data
Modified Files:
evas_list.c
Log Message:
Patch from cedric to fix evas_list_sort issue(s). Keybinding dialog shows
all Actions now :)
===
RCS file: /cvs/e/e17/libs/evas/src/lib/data/evas_list.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- evas_list.c 16 Jul 2007 07:32:44 - 1.27
+++ evas_list.c 17 Jul 2007 10:12:51 - 1.28
@@ -893,6 +893,7 @@
EAPI Evas_List *
evas_list_sort(Evas_List *list, int size, int (*func)(void *, void *))
{
+ Evas_List* last;
unsigned intlist_number;
unsigned intmiddle;
int list_size;
@@ -905,6 +906,7 @@
(size > ((Evas_List_Accounting *)(list->accounting))->count))
size = ((Evas_List_Accounting *)(list->accounting))->count;
+ last = ((Evas_List_Accounting *)(list->accounting))->last;
middle = size - size / 2;
for (list_number = middle, list_size = 1;
@@ -976,7 +978,9 @@
--size2;
if (head1 == list)
-list = head2;
+ list = head2;
+ if (head2 == last)
+ last = prev2;
head2 = next;
}
@@ -985,7 +989,8 @@
}
}
- return(list);
+ ((Evas_List_Accounting *)(list->accounting))->last = last;
+ return list;
}
/**
* Return the memory allocation failure flag after any operation needin
allocation
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
evas_image_main.c
Log Message:
fix Bug#: 111
http://bugzilla.enlightenment.org/show_bug.cgi?id=111
===
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_image_main.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- evas_image_main.c 16 Jul 2007 07:25:33 - 1.51
+++ evas_image_main.c 17 Jul 2007 10:08:16 - 1.52
@@ -118,6 +118,7 @@
_evas_common_image_dirty(RGBA_Image* dst, const RGBA_Image* src)
{
evas_common_image_colorspace_normalize(dst);
+ evas_common_image_surface_alloc(dst->image);
evas_common_blit_rectangle(src, dst, 0, 0, src->image->w, src->image->h, 0,
0);
evas_common_cpu_end_opt();
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/etk-perl leviathan
Enlightenment CVS committal Author : leviathan Project : e17 Module : libs/etk-perl Dir : e17/libs/etk-perl/xs Modified Files: Makefile.PL Log Message: oops.. === RCS file: /cvs/e/e17/libs/etk-perl/xs/Makefile.PL,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.PL 17 Jul 2007 08:47:15 - 1.2 +++ Makefile.PL 17 Jul 2007 08:51:54 - 1.3 @@ -32,7 +32,7 @@ ($] >= 5.005 ? (ABSTRACT => 'Perl bindings for the Enlightened ToolKit (Etk)', AUTHOR => q|Chady 'Leviathan' Kassouf <[EMAIL PROTECTED]>|) : ()), -LIBS => [`etk-config --libs`], +LIBS => [`pkg-config --libs etk`], DEFINE=> '', #'-DDEBUG', INC => "-g -I. `pkg-config --cflags etk`", XSPROTOARG=> '-noprototypes', - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/etk-perl leviathan
Enlightenment CVS committal
Author : leviathan
Project : e17
Module : libs/etk-perl
Dir : e17/libs/etk-perl/xs
Modified Files:
Makefile.PL
Log Message:
pkg-config patch from Jerome Pinot
===
RCS file: /cvs/e/e17/libs/etk-perl/xs/Makefile.PL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.PL 3 Jul 2007 19:26:05 - 1.1
+++ Makefile.PL 17 Jul 2007 08:47:15 - 1.2
@@ -34,7 +34,7 @@
AUTHOR => q|Chady 'Leviathan' Kassouf <[EMAIL PROTECTED]>|) :
()),
LIBS => [`etk-config --libs`],
DEFINE=> '', #'-DDEBUG',
-INC => "-g -I. `etk-config --cflags`",
+INC => "-g -I. `pkg-config --cflags etk`",
XSPROTOARG=> '-noprototypes',
OBJECT=> '$(O_FILES)',
clean => {FILES=>"Etk.xs"},
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/etk-perl leviathan
Enlightenment CVS committal
Author : leviathan
Project : e17
Module : libs/etk-perl
Dir : e17/libs/etk-perl
Modified Files:
Makefile.PL
Log Message:
pkg-config patch from Jerome Pinot
===
RCS file: /cvs/e/e17/libs/etk-perl/Makefile.PL,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- Makefile.PL 3 Jul 2007 19:26:05 - 1.11
+++ Makefile.PL 17 Jul 2007 08:44:18 - 1.12
@@ -4,8 +4,8 @@
# dependency check
print "Checking for Etk...";
-my $etklib = `etk-config --version`;
-die "I can't run etk-config, make sure that etk is installed, and that
etk-config is in your path" unless $etklib;
+my $etklib = `pkg-config --variable=version etk`;
+die "pkg-config can't find etk, make sure that etk is installed, and that your
PKG_CONFIG_PATH is correct" unless $etklib;
print "Ok\n";
Devel::PPPort::WriteFile();
@@ -18,9 +18,9 @@
($] >= 5.005 ?
(ABSTRACT => 'Perl bindings for the Enlightened ToolKit (Etk)',
AUTHOR => q|Chady 'Leviathan' Kassouf <[EMAIL PROTECTED]>|) :
()),
-LIBS => [`etk-config --libs`],
+LIBS => [`pkg-config --libs etk`],
DEFINE=> '', #'-DDEBUG',
-INC => "-g -I. `etk-config --cflags`",
+INC => "-g -I. `pkg-config --cflags etk`",
XSPROTOARG=> '-noprototypes',
test => {TESTS=>'t/Etk/*.t'},
clean => {FILES=>"ppport.h"},
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/include Modified Files: evas_common.h Log Message: Cedric's fixes === RCS file: /cvs/e/e17/libs/evas/src/lib/include/evas_common.h,v retrieving revision 1.89 retrieving revision 1.90 diff -u -3 -r1.89 -r1.90 --- evas_common.h 16 Jul 2007 07:38:48 - 1.89 +++ evas_common.h 17 Jul 2007 08:39:50 - 1.90 @@ -1275,7 +1275,7 @@ RGBA_Engine_Image* evas_cache_engine_image_dirty(RGBA_Engine_Image *eim, int x, int y, int w, int h); RGBA_Engine_Image* evas_cache_engine_image_copied_data(Evas_Cache_Engine_Image *cache, int w, int h, DATA32 *image_data, int alpha, int cspace, void* engine_data); RGBA_Engine_Image* evas_cache_engine_image_data(Evas_Cache_Engine_Image *cache, int w, int h, DATA32 *image_data, int alpha, int cspace, void* engine_data); -voidevas_cache_engine_colorspace(RGBA_Engine_Image *eim, int cspace, void* engine_data); +void evas_cache_engine_image_colorspace(RGBA_Engine_Image *eim, int cspace, void* engine_data); RGBA_Engine_Image* evas_cache_engine_image_size_set(RGBA_Engine_Image *eim, int w, int h); void evas_cache_engine_image_load_data(RGBA_Engine_Image *eim); - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/evas Dir : e17/libs/evas/src/modules/engines/software_sdl Modified Files: evas_engine.c Log Message: Cedric's fixes === RCS file: /cvs/e/e17/libs/evas/src/modules/engines/software_sdl/evas_engine.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- evas_engine.c 17 Jul 2007 07:47:04 - 1.2 +++ evas_engine.c 17 Jul 2007 08:39:51 - 1.3 @@ -354,7 +354,7 @@ if (!eim) return; if (eim->src->cs.space == cspace) return; - evas_cache_image_colorspace(eim, cspace); + evas_cache_engine_image_colorspace(eim, cspace, NULL); } static void* - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/evas Dir : e17/libs/evas/src/modules/engines/software_sdl Modified Files: Makefile.am evas_engine.c Log Message: fix the build. Create the shared lib on Windows(tm) === RCS file: /cvs/e/e17/libs/evas/src/modules/engines/software_sdl/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 17 Jul 2007 04:34:20 - 1.2 +++ Makefile.am 17 Jul 2007 07:47:04 - 1.3 @@ -15,7 +15,7 @@ evas_engine.h module_la_LIBADD = @sdl_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs +module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs module_la_DEPENDENCIES = $(top_builddir)/config.h include_HEADERS = Evas_Engine_SDL.h === RCS file: /cvs/e/e17/libs/evas/src/modules/engines/software_sdl/evas_engine.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- evas_engine.c 17 Jul 2007 04:34:20 - 1.1 +++ evas_engine.c 17 Jul 2007 07:47:04 - 1.2 @@ -354,7 +354,7 @@ if (!eim) return; if (eim->src->cs.space == cspace) return; - evas_cache_engine_colorspace(eim, cspace, NULL); + evas_cache_image_colorspace(eim, cspace); } static void* - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
