Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
config.c desktops.c
Log Message:
Fix selecting "No Background" in background settings dialog.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -3 -r1.116 -r1.117
--- config.c 11 Oct 2004 20:28:55 -0000 1.116
+++ config.c 30 Oct 2004 12:58:55 -0000 1.117
@@ -1945,19 +1945,10 @@
(Conf.backgrounds.user))
{
if (!bg)
- {
- bg = BackgroundCreate(name, &xclr, bg1, i1, i2,
- i3, i4, i5, i6, bg2, j1,
- j2, j3, j4, j5);
- }
- if (!strcmp(bg->name, "NONE"))
- {
- DesktopSetBg(atoi(s2), NULL, 0);
- }
- else
- {
- DesktopSetBg(atoi(s2), bg, 0);
- }
+ bg = BackgroundCreate(name, &xclr, bg1, i1, i2,
+ i3, i4, i5, i6, bg2, j1,
+ j2, j3, j4, j5);
+ DesktopSetBg(atoi(s2), bg, 0);
}
}
}
@@ -1970,16 +1961,7 @@
(Conf.backgrounds.user))
{
if (bg)
- {
- if (!strcmp(bg->name, "NONE"))
- {
- DesktopSetBg(atoi(s2), NULL, 0);
- }
- else
- {
- DesktopSetBg(atoi(s2), bg, 0);
- }
- }
+ DesktopSetBg(atoi(s2), bg, 0);
}
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -3 -r1.101 -r1.102
--- desktops.c 11 Sep 2004 10:45:21 -0000 1.101
+++ desktops.c 30 Oct 2004 12:59:03 -0000 1.102
@@ -575,6 +575,9 @@
if (refresh)
BackgroundPixmapFree(desks.desk[desk].bg);
+ if (bg && !strcmp(BackgroundGetName(bg), "NONE"))
+ bg = NULL;
+
if (desks.desk[desk].bg != bg)
{
if (desks.desk[desk].bg)
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
