Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
e_mod_main.c
Log Message:
Patch from David Stevenson to stop pager module causing E to segfault when
setting the number of desks via enlightenment_remote. Tested, works
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -3 -r1.161 -r1.162
--- e_mod_main.c 11 Jan 2006 13:55:20 -0000 1.161
+++ e_mod_main.c 14 Jan 2006 12:30:46 -0000 1.162
@@ -1462,6 +1462,21 @@
else dh = 0;
dh *= (desks_y - face->ynum);
+ /* Loop to add new desks */
+ for (x = 0; x < desks_x; x++)
+ {
+ for (y = 0; y < desks_y; y++)
+ {
+ if ((x >= face->xnum) || (y >= face->ynum))
+ {
+ /* add desk */
+ desk = e_desk_at_xy_get(ev->zone, x, y);
+ pd = _pager_desk_new(face, desk, x, y);
+ if (pd)
+ face->desks = evas_list_append(face->desks, pd);
+ }
+ }
+ }
/* Loop to remove extra desks */
for (l2 = face->desks; l2;)
{
@@ -1480,21 +1495,6 @@
_pager_desk_free(pd);
}
}
- /* Loop to add new desks */
- for (x = 0; x < desks_x; x++)
- {
- for (y = 0; y < desks_y; y++)
- {
- if ((x >= face->xnum) || (y >= face->ynum))
- {
- /* add desk */
- desk = e_desk_at_xy_get(ev->zone, x, y);
- pd = _pager_desk_new(face, desk, x, y);
- if (pd)
- face->desks = evas_list_append(face->desks, pd);
- }
- }
- }
face->xnum = desks_x;
face->ynum = desks_y;
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
