Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
e_mod_main.c
Log Message:
Free config list.
Use switch to check gadman change.
Cleanup naming.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- e_mod_main.c 15 Feb 2005 12:15:22 -0000 1.51
+++ e_mod_main.c 16 Feb 2005 11:41:40 -0000 1.52
@@ -10,8 +10,8 @@
*/
/* module private routines */
-static Pager *_pager_init();
-static void _pager_shutdown(Pager *pager);
+static Pager *_pager_new();
+static void _pager_free(Pager *pager);
static void _pager_config_menu_new(Pager *pager);
static Pager_Face *_pager_face_new(E_Zone *zone);
@@ -81,7 +81,7 @@
return NULL;
}
/* actually init pager */
- pager = _pager_init(module);
+ pager = _pager_new(module);
module->config_menu = pager->config_menu;
return pager;
@@ -97,7 +97,7 @@
pager = module->data;
if (pager)
- _pager_shutdown(pager);
+ _pager_free(pager);
return 1;
}
@@ -134,7 +134,7 @@
/* module private routines */
static Pager *
-_pager_init()
+_pager_new()
{
Pager *pager;
Pager_Face *face;
@@ -235,10 +235,13 @@
}
static void
-_pager_shutdown(Pager *pager)
+_pager_free(Pager *pager)
{
Evas_List *list;
+ E_CONFIG_DD_FREE(_conf_edd);
+ E_CONFIG_DD_FREE(_conf_face_edd);
+
for (list = pager->faces; list; list = list->next)
_pager_face_free(list->data);
evas_list_free(pager->faces);
@@ -248,9 +251,7 @@
evas_list_free(pager->menus);
e_object_del(E_OBJECT(pager->config_menu));
- E_CONFIG_DD_FREE(_conf_edd);
- E_CONFIG_DD_FREE(_conf_face_edd);
-
+ evas_list_free(pager->conf->faces);
free(pager->conf);
free(pager);
}
@@ -841,32 +842,39 @@
face->fy = y;
face->fw = deskw;
face->fh = deskh;
- if (change == E_GADMAN_CHANGE_MOVE_RESIZE)
- {
- _pager_face_draw(face);
- }
- else if (change == E_GADMAN_CHANGE_RAISE)
+ switch (change)
{
- evas_object_raise(face->base);
-
- desks = face->desks;
- while (desks)
- {
- desk = desks->data;
- evas_object_raise(desk->obj);
-
- wins = desk->wins;
- while (wins)
- {
- win = wins->data;
- evas_object_raise(win->obj);
-
- wins = wins->next;
- }
- desks = desks->next;
- }
-
- evas_object_raise(face->screen);
+ case E_GADMAN_CHANGE_MOVE_RESIZE:
+ _pager_face_draw(face);
+ break;
+ case E_GADMAN_CHANGE_RAISE:
+ evas_object_raise(face->base);
+
+ desks = face->desks;
+ while (desks)
+ {
+ desk = desks->data;
+ evas_object_raise(desk->obj);
+
+ wins = desk->wins;
+ while (wins)
+ {
+ win = wins->data;
+ evas_object_raise(win->obj);
+
+ wins = wins->next;
+ }
+ desks = desks->next;
+ }
+
+ evas_object_raise(face->screen);
+ break;
+ case E_GADMAN_CHANGE_EDGE:
+ case E_GADMAN_CHANGE_ZONE:
+ /* FIXME
+ * Must we do something here?
+ */
+ break;
}
}
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
