Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_wallpaper.c e_widget_desk_preview.c
Log Message:
Fix an issue with desk preview bg set always selecting Use Theme Bg.
Remove some duplicated code.
Minor formatting.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_int_config_wallpaper.c 13 Nov 2006 10:52:17 -0000 1.23
+++ e_int_config_wallpaper.c 14 Nov 2006 05:39:26 -0000 1.24
@@ -391,18 +391,23 @@
cfdata->bg = strdup(cfbg->file);
}
}
-
- if (!cfdata->bg && e_config->desktop_default_background)
+
+ if ((!cfdata->bg) && e_config->desktop_default_background)
cfdata->bg = strdup(e_config->desktop_default_background);
- else
- cfdata->use_theme_bg = 1;
-
+
if (cfdata->bg)
{
+ const char *f;
+
+ f = e_theme_edje_file_get("base/theme/backgrounds",
"e/desktop/background");
+ if (!strcmp(cfdata->bg, f))
+ cfdata->use_theme_bg = 1;
snprintf(path, sizeof(path), "%s/data/backgrounds",
e_prefix_data_get());
if (!strncmp(cfdata->bg, path, strlen(path)))
cfdata->fmdir = 1;
}
+ else
+ cfdata->use_theme_bg = 1;
}
static void *
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_desk_preview.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_widget_desk_preview.c 13 Nov 2006 22:10:25 -0000 1.6
+++ e_widget_desk_preview.c 14 Nov 2006 05:39:26 -0000 1.7
@@ -88,7 +88,6 @@
const char *bgfile;
E_Widget_Desk_Data *dd = NULL;
-
bgfile = e_bg_file_get(zone->container->num, zone->num, x, y);
/* wrap desks in a widget (to set min size) */
@@ -120,7 +119,6 @@
evas_object_show(o);
e_widget_sub_object_add(obj, o);
dd->thumb = o;
-
return obj;
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
