Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
e_mod_main.c
Log Message:
evas_object_free? what posessed you to use that? it isnt in Evas' header
(api) at all (it HAPPENS by LUCK to be an internal call)
also fix shudwon/startup order
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_mod_main.c 15 Jan 2005 08:31:39 -0000 1.22
+++ e_mod_main.c 15 Jan 2005 09:50:26 -0000 1.23
@@ -231,16 +231,8 @@
free(e->conf);
E_CONFIG_DD_FREE(e->conf_edd);
- if (e->base)
- {
- evas_object_del(e->base);
- evas_object_free(e->base);
- }
- if (e->screen)
- {
- evas_object_del(e->screen);
- evas_object_free(e->screen);
- }
+ if (e->base) evas_object_del(e->base);
+ if (e->screen) evas_object_del(e->screen);
_pager_zone_leave(e);
ecore_event_handler_del(e->ev_handler_container_resize);
@@ -325,12 +317,7 @@
static void
_pager_desk_destroy(Pager_Desk *d)
{
- if (d->obj)
- {
- evas_object_del(d->obj);
- evas_object_free(d->obj);
- }
-
+ if (d->obj) evas_object_del(d->obj);
e_object_unref(E_OBJECT(d->desk));
while (d->wins)
@@ -405,16 +392,8 @@
static void
_pager_window_destroy(Pager_Win *w)
{
- if (w->obj)
- {
- evas_object_del(w->obj);
- evas_object_free(w->obj);
- }
- if (w->icon)
- {
- evas_object_del(w->icon);
- evas_object_free(w->icon);
- }
+ if (w->obj) evas_object_del(w->obj);
+ if (w->icon) evas_object_del(w->icon);
e_object_unref(E_OBJECT(w->border));
E_FREE(w);
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
