don't add program icons to tabs for previous users, for backwards compatibility, but leave it as default for new users

This commit is contained in:
Mark Tiefenbruck 2008-04-29 05:51:43 -07:00
parent 7bc04b37e3
commit 6cb26c97a9
3 changed files with 12 additions and 2 deletions

View file

@ -30,4 +30,4 @@ session.colorsPerChannel: 4
session.doubleClickInterval: 250 session.doubleClickInterval: 250
session.cacheMax: 200 session.cacheMax: 200
session.imageDither: True session.imageDither: True
session.configVersion: 7 session.configVersion: 8

View file

@ -592,7 +592,7 @@ void Fluxbox::setupConfigFiles() {
if (create_init) if (create_init)
FbTk::FileUtil::copyFile(DEFAULT_INITFILE, init_file.c_str()); FbTk::FileUtil::copyFile(DEFAULT_INITFILE, init_file.c_str());
#define CONFIG_VERSION 7 #define CONFIG_VERSION 8
FbTk::Resource<int> config_version(m_resourcemanager, 0, FbTk::Resource<int> config_version(m_resourcemanager, 0,
"session.configVersion", "Session.ConfigVersion"); "session.configVersion", "Session.ConfigVersion");
if (*config_version < CONFIG_VERSION) { if (*config_version < CONFIG_VERSION) {

View file

@ -291,6 +291,16 @@ int run_updates(int old_version, FbTk::ResourceManager &rm) {
new_version = 7; new_version = 7;
} }
if (old_version < 8) { // disable icons in tabs for backwards compatibility
FbTk::Resource<bool> *show =
new FbTk::Resource<bool>(rm, false,
"session.screen0.tabs.usePixmap",
"Session.Screen0.Tabs.UsePixmap");
if (!*show) // only change if the setting didn't already exist
*show = false;
new_version = 8;
}
return new_version; return new_version;
} }