M data/init.in → data/init.in

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

M src/fluxbox.cc → src/fluxbox.cc

@@ -592,7 +592,7 @@ // copy init file
     if (create_init)
         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,
             "session.configVersion", "Session.ConfigVersion");
     if (*config_version < CONFIG_VERSION) {

M util/fluxbox-update_configs.cc → util/fluxbox-update_configs.cc

@@ -291,6 +291,16 @@
         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;
 }