Index: trunk/version =================================================================== --- trunk/version (revision 165) +++ trunk/version (revision 166) @@ -1 +1 @@ -2.0-RC5pre11 \ No newline at end of file +2.0-RC5 \ No newline at end of file Index: trunk/i386/boot2/gui.c =================================================================== --- trunk/i386/boot2/gui.c (revision 165) +++ trunk/i386/boot2/gui.c (revision 166) @@ -557,14 +557,6 @@ int initGUI(void) { int val; -#ifdef EMBED_THEME - config_file_t *config; - - config = &bootInfo->themeConfig; - if (ParseXMLFile((char *)__theme_plist, &config->dictionary) != 0) { - return 1; - } -#else int len; char dirspec[256]; @@ -574,9 +566,17 @@ } sprintf(dirspec, "/Extra/Themes/%s/theme.plist", theme_name); if (loadConfigFile(dirspec, &bootInfo->themeConfig) != 0) { +#ifdef EMBED_THEME + config_file_t *config; + + config = &bootInfo->themeConfig; + if (ParseXMLFile((char *)__theme_plist, &config->dictionary) != 0) { + return 1; + } +#else return 1; +#endif } -#endif // parse display size parameters if (getIntForKey("screen_width", &val, &bootInfo->themeConfig)) { screen_params[0] = val;