Chameleon

Chameleon Commit Details

Date:2010-10-12 01:49:26 (13 years 5 months ago)
Author:Azimutz
Commit:589
Parents: 588
Message:Fixing issue 41, if we can call it an "issue"; themes still load as usual. Thanks to Fumo Mofu for reporting it.
Changes:
M/branches/azimutz/Chazi/i386/boot2/gui.c

File differences

branches/azimutz/Chazi/i386/boot2/gui.c
236236
237237
238238
239
239
240240
241241
242242
......
679679
680680
681681
682
682
683683
684684
685685
......
18371837
18381838
18391839
1840
1840
18411841
18421842
18431843
if (images[i].image == NULL) {
images[i].image = malloc(sizeof(pixmap_t));
}
sprintf(dirspec, "bt(0.0)/Extra/Themes/%s/%s.png", theme_name, image);
sprintf(dirspec, "bt(0,0)/Extra/Themes/%s/%s.png", theme_name, image);
width = 0;
height = 0;
imagedata = NULL;
if ((strlen(theme_name) + 27) > sizeof(dirspec)) {
return 1;
}
sprintf(dirspec, "bt(0.0)/Extra/Themes/%s/theme.plist", theme_name);
sprintf(dirspec, "bt(0,0)/Extra/Themes/%s/theme.plist", theme_name);
if (loadConfigFile(dirspec, &bootInfo->themeConfig) != 0) {
#ifdef EMBED_THEME
config_file_t*config;
usePngImage = false;
return;
}
sprintf(dirspec, "bt(0.0)/Extra/Themes/%s/boot.png", theme_name);
sprintf(dirspec, "bt(0,0)/Extra/Themes/%s/boot.png", theme_name);
if (loadPngImage(dirspec, &bootImageWidth, &bootImageHeight, &bootImageData) != 0) {
#ifdef EMBED_THEME
if ((loadEmbeddedPngImage(__boot_png, __boot_png_len, &bootImageWidth, &bootImageHeight, &bootImageData)) != 0)

Archive Download the corresponding diff file

Revision: 589