Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_media.c ewl_tree2.c
Log Message:
- took a bit too much out of ewl_media
- remove dead code from ewl_tree2, fix comment
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_media.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ewl_media.c 20 Apr 2006 02:58:01 -0000 1.15
+++ ewl_media.c 20 Apr 2006 03:27:07 -0000 1.16
@@ -304,11 +304,18 @@
double
ewl_media_position_get(Ewl_Media *m)
{
+ double p = 0.0;
+
DENTER_FUNCTION(DLEVEL_STABLE)
DCHECK_PARAM_PTR_RET("m", m, 0);
DCHECK_TYPE_RET("m", m, EWL_MEDIA_TYPE, 0);
- DRETURN_FLOAT(m->position, DLEVEL_STABLE);
+#ifdef BUILD_EMOTION_SUPPORT
+ if (m->video)
+ p = emotion_object_position_get(m->video);
+#endif
+
+ DRETURN_FLOAT(p, DLEVEL_STABLE);
}
/**
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ewl_tree2.c 20 Apr 2006 02:58:01 -0000 1.14
+++ ewl_tree2.c 20 Apr 2006 03:27:07 -0000 1.15
@@ -467,29 +467,17 @@
tree = EWL_TREE2(w);
-#if 0
- ecore_list_goto_first(tree->columns);
- while ((col = ecore_list_next(tree->columns)))
- {
- if (ewl_model_dirty_get(col->model))
- {
- dirty = TRUE;
- break;
- }
- }
-#endif
-
/* place the header */
ewl_object_place(EWL_OBJECT(tree->header), CURRENT_X(tree),
CURRENT_Y(tree), CURRENT_W(tree),
CURRENT_H(tree));
-// ewl_widget_configure(tree->header);
- /* if none of the models are dirty we are done */
+ /* if the tree isn't dirty we're done */
if (!ewl_tree2_dirty_get(tree)) DRETURN(DLEVEL_STABLE);
/* setup the headers */
ewl_container_reset(EWL_CONTAINER(tree->header));
+
printf("First column pointer: %p\n",
ecore_list_goto_first(tree->columns));
while ((col = ecore_list_next(tree->columns)))
{
@@ -498,8 +486,8 @@
h = col->view->header_fetch(tree->data, column);
printf("Column: ");
ewl_widget_print(h);
- ewl_container_child_append(EWL_CONTAINER(tree->header), h);
+ ewl_container_child_append(EWL_CONTAINER(tree->header), h);
column ++;
}
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
