aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-04-29 12:51:43 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-04-29 12:51:43 (GMT)
commit6cb26c97a9c11bc971d19539549456096abfd025 (patch)
tree9f44260fdd1336b70193235eb8e63a640bfd2ec2
parent7bc04b37e3d11930e8b6f858852352253e15e229 (diff)
downloadfluxbox-6cb26c97a9c11bc971d19539549456096abfd025.zip
fluxbox-6cb26c97a9c11bc971d19539549456096abfd025.tar.bz2
don't add program icons to tabs for previous users, for backwards compatibility, but leave it as default for new users
-rw-r--r--data/init.in2
-rw-r--r--src/fluxbox.cc2
-rw-r--r--util/fluxbox-update_configs.cc10
3 files changed, 12 insertions, 2 deletions
diff --git a/data/init.in b/data/init.in
index 86cfa08..e1741bb 100644
--- a/data/init.in
+++ b/data/init.in
@@ -30,4 +30,4 @@ session.colorsPerChannel: 4
30session.doubleClickInterval: 250 30session.doubleClickInterval: 250
31session.cacheMax: 200 31session.cacheMax: 200
32session.imageDither: True 32session.imageDither: True
33session.configVersion: 7 33session.configVersion: 8
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 8fcc194..a6ce035 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -592,7 +592,7 @@ void Fluxbox::setupConfigFiles() {
592 if (create_init) 592 if (create_init)
593 FbTk::FileUtil::copyFile(DEFAULT_INITFILE, init_file.c_str()); 593 FbTk::FileUtil::copyFile(DEFAULT_INITFILE, init_file.c_str());
594 594
595#define CONFIG_VERSION 7 595#define CONFIG_VERSION 8
596 FbTk::Resource<int> config_version(m_resourcemanager, 0, 596 FbTk::Resource<int> config_version(m_resourcemanager, 0,
597 "session.configVersion", "Session.ConfigVersion"); 597 "session.configVersion", "Session.ConfigVersion");
598 if (*config_version < CONFIG_VERSION) { 598 if (*config_version < CONFIG_VERSION) {
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc
index eb080de..be22383 100644
--- a/util/fluxbox-update_configs.cc
+++ b/util/fluxbox-update_configs.cc
@@ -291,6 +291,16 @@ int run_updates(int old_version, FbTk::ResourceManager &rm) {
291 new_version = 7; 291 new_version = 7;
292 } 292 }
293 293
294 if (old_version < 8) { // disable icons in tabs for backwards compatibility
295 FbTk::Resource<bool> *show =
296 new FbTk::Resource<bool>(rm, false,
297 "session.screen0.tabs.usePixmap",
298 "Session.Screen0.Tabs.UsePixmap");
299 if (!*show) // only change if the setting didn't already exist
300 *show = false;
301 new_version = 8;
302 }
303
294 return new_version; 304 return new_version;
295} 305}
296 306