Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_media.c
Log Message:
fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_media.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_media.c 2 Oct 2005 09:44:21 -0000 1.4
+++ ewl_media.c 2 Oct 2005 12:18:49 -0000 1.5
@@ -54,13 +54,10 @@
ewl_callback_append(w, EWL_CALLBACK_CONFIGURE,
ewl_media_configure_cb, NULL);
- if (module) {
- ewl_media_module_set(m, module);
- if (media) {
- ewl_media_media_set(m, media);
- }
-
- }
+ if (module)
+ ewl_media_module_set(m, module);
+ if (media)
+ ewl_media_media_set(m, media);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -85,10 +82,10 @@
/*
* Initialize emotion
*/
- if (!m->module || !emotion_object_init(m->video, m->module))
- DRETURN_INT(FALSE, DLEVEL_STABLE);
+ if (m->video && m->module && emotion_object_init(m->video, m->module))
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
- DRETURN_INT(TRUE, DLEVEL_STABLE);
+ DRETURN_INT(FALSE, DLEVEL_STABLE);
}
/**
@@ -371,7 +368,7 @@
* Create the emotion
*/
m->video = emotion_object_add(emb->evas);
- if (m->media) {
+ if (m->module && emotion_object_init(m->video, m->module) && m->media)
{
emotion_object_file_set(m->video, m->media);
ewl_media_size_update(m);
}
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
