Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
backgrounds.c desktops.c
Log Message:
Fix problem with background pixmaps being freed by mistake.
===================================================================
RCS file: /cvs/e/e16/e/src/backgrounds.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- backgrounds.c 16 Apr 2006 13:27:37 -0000 1.65
+++ backgrounds.c 16 Apr 2006 18:34:57 -0000 1.66
@@ -1382,7 +1382,7 @@
((now - bg->last_viewed) <= Conf.backgrounds.timeout))
continue;
- DesksBackgroundRefresh(NULL, DESK_BG_FREE);
+ DesksBackgroundRefresh(bg, DESK_BG_FREE);
BackgroundPixmapFree(bg);
}
}
===================================================================
RCS file: /cvs/e/e16/e/src/desktops.c,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -3 -r1.233 -r1.234
--- desktops.c 16 Apr 2006 13:27:37 -0000 1.233
+++ desktops.c 16 Apr 2006 18:34:57 -0000 1.234
@@ -690,7 +690,7 @@
dsk = _DeskGet(i);
if (!dsk) /* May happen during init */
continue;
- if (dsk->bg.bg != bg && why == DESK_BG_REFRESH)
+ if (bg && dsk->bg.bg != bg)
continue;
DeskBackgroundRefresh(dsk, why);
}
@@ -2734,9 +2734,11 @@
for (desk = 0; desk < Conf.desks.num; desk++)
{
dsk = _DeskGet(desk);
- IpcPrintf("Desk %d: x,y=%d,%d w,h=%d,%d viewable=%d order=%d\n",
- desk, EoGetX(dsk), EoGetY(dsk), EoGetW(dsk), EoGetH(dsk),
- dsk->viewable, desks.order[desk]);
+ IpcPrintf
+ ("Desk %d: viewable=%d order=%d x,y=%4d,%4d wxh=%4dx%4d area
x,y=%d,%d pmap=%#lx\n",
+ desk, dsk->viewable, desks.order[desk],
+ EoGetX(dsk), EoGetY(dsk), EoGetW(dsk), EoGetH(dsk),
+ dsk->current_area_x, dsk->current_area_y, dsk->bg.pmap);
}
}
else if (!strncmp(cmd, "goto", 2))
@@ -2853,6 +2855,7 @@
" desk drag Start deskdrag\n"
" desk set <nd> Set number of desktops\n"
" desk goto <d> Goto specified desktop\n"
+ " desk list Show desk info\n"
" desk next Goto next desktop\n"
" desk prev Goto previous desktop\n"
" desk this Goto this desktop\n"
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
