Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_container.c e_desk.c e_manager.c e_object.c
e_zone.c
Log Message:
actually restart/exit
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- e_border.c 13 Jan 2005 13:54:53 -0000 1.69
+++ e_border.c 13 Jan 2005 14:24:24 -0000 1.70
@@ -899,7 +899,6 @@
{
E_Event_Border_Remove *ev;
- if (e_object_del_get(E_OBJECT(bd))) return;
ev = calloc(1, sizeof(E_Event_Border_Remove));
ev->border = bd;
e_object_ref(E_OBJECT(bd));
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_container.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_container.c 11 Jan 2005 13:11:12 -0000 1.18
+++ e_container.c 13 Jan 2005 14:24:24 -0000 1.19
@@ -49,7 +49,6 @@
con = E_OBJECT_ALLOC(E_Container, _e_container_free);
if (!con) return NULL;
con->manager = man;
- e_object_ref(E_OBJECT(con->manager));
con->manager->containers = evas_list_append(con->manager->containers, con);
con->w = con->manager->w;
con->h = con->manager->h;
@@ -321,12 +320,12 @@
static void
_e_container_free(E_Container *con)
{
- while (con->clients) e_object_del(E_OBJECT(con->clients->data));
+ while (con->clients) e_object_free(E_OBJECT(con->clients->data));
+ while (con->zones) e_object_free(E_OBJECT(con->zones->data));
con->manager->containers = evas_list_remove(con->manager->containers, con);
e_canvas_del(con->bg_ecore_evas);
ecore_evas_free(con->bg_ecore_evas);
ecore_x_window_del(con->win);
- e_object_unref(E_OBJECT(con->manager));
free(con);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_desk.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_desk.c 8 Jan 2005 21:21:56 -0000 1.13
+++ e_desk.c 13 Jan 2005 14:24:24 -0000 1.14
@@ -40,8 +40,6 @@
desk->num = ++desk_count;
snprintf(name, sizeof(name), "Desktop %d, %d", x, y);
desk->name = strdup(name);
- e_object_ref(E_OBJECT(zone));
-
return desk;
}
@@ -199,7 +197,6 @@
if (desk->name)
free(desk->name);
// zone->desks = evas_list_remove(zone->desks, desk);
- e_object_unref(E_OBJECT(desk->zone));
free(desk);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_manager.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_manager.c 5 Jan 2005 08:30:25 -0000 1.6
+++ e_manager.c 13 Jan 2005 14:24:24 -0000 1.7
@@ -168,7 +168,7 @@
ecore_event_handler_del(h);
}
while (man->containers)
- e_object_unref(E_OBJECT(man->containers->data));
+ e_object_free(E_OBJECT(man->containers->data));
ecore_x_window_del(man->win);
managers = evas_list_remove(managers, man);
free(man);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_object.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_object.c 13 Jan 2005 13:55:00 -0000 1.7
+++ e_object.c 13 Jan 2005 14:24:24 -0000 1.8
@@ -97,7 +97,7 @@
E_OBJECT_CHECK_RETURN(obj, -1);
obj->references--;
ref = obj->references;
- if (obj->references <= 0) e_object_free(obj);
+ if (obj->references == 0) e_object_free(obj);
return ref;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_zone.c 12 Jan 2005 16:03:08 -0000 1.16
+++ e_zone.c 13 Jan 2005 14:24:24 -0000 1.17
@@ -46,7 +46,6 @@
zone->h = h;
zone->num = ++zone_count;
- e_object_ref(E_OBJECT(con));
con->zones = evas_list_append(con->zones, zone);
if (1)
@@ -199,11 +198,11 @@
static void
_e_zone_free(E_Zone *zone)
{
- E_Container *con = zone->container;
- if (zone->name)
- free(zone->name);
+ E_Container *con;
+
+ con = zone->container;
+ if (zone->name) free(zone->name);
con->zones = evas_list_remove(con->zones, zone);
- e_object_unref(E_OBJECT(zone->container));
free(zone);
}
-------------------------------------------------------
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
