gsettings-desktop-schemas-3.9.5 breaks cinnamon-settings-daemon

[leigh123linux]

The gnome devs have broken stuff again

(cinnamon-settings-daemon:1366): GLib-GIO-ERROR **: Settings schema 'org.gnome.desktop.interface' does not contain a key named 'menus-have-icons'
cinnamon-session[1315]: WARNING: Application 'cinnamon-settings-daemon.desktop' killed by signal 5
cinnamon-session[1315]: WARNING: Application 'cinnamon-settings-daemon.desktop' failed to register before timeout
cinnamon-session[1315]: CRITICAL: We failed, but the fail whale is dead. Sorry....

here's the commit that breaks it

https://git.gnome.org/browse/gsettings-desktop-schemas/commit/?id=7d48c4ed64bb5f42f1a8a781f06f534903e78d70

Files affected

files/usr/lib/cinnamon-settings/modules/cs_themes.py:        menusHaveIconsCB = GSettingsCheckButton(_("Show icons in menus"), "org.gnome.desktop.interface", "menus-have-icons", None)
files/usr/lib/cinnamon-settings/modules/cs_themes.py:        buttonsHaveIconsCB = GSettingsCheckButton(_("Show icons on buttons"), "org.gnome.desktop.interface", "buttons-have-icons", None)

plugins/xsettings/csd-xsettings-manager.c:        { "org.gnome.desktop.interface", "menus-have-icons",       "Gtk/MenuImages",          translate_bool_int },
plugins/xsettings/csd-xsettings-manager.c:        { "org.gnome.desktop.interface", "buttons-have-icons",     "Gtk/ButtonImages",        translate_bool_int },

[leigh123linux]

I'm going to comment out the broken keys for now

--- a/plugins/xsettings/csd-xsettings-manager.c
+++ b/plugins/xsettings/csd-xsettings-manager.c
@@ -353,15 +353,15 @@
         { "org.gnome.desktop.interface", "gtk-im-status-style",    "Gtk/IMStatusStyle",       translate_string_string },
         { "org.gnome.desktop.interface", "gtk-im-module",          "Gtk/IMModule",            translate_string_string },
         { "org.gnome.desktop.interface", "icon-theme",             "Net/IconThemeName",       translate_string_string },
-        { "org.gnome.desktop.interface", "menus-have-icons",       "Gtk/MenuImages",          translate_bool_int },
-        { "org.gnome.desktop.interface", "buttons-have-icons",     "Gtk/ButtonImages",        translate_bool_int },
+ /*     { "org.gnome.desktop.interface", "menus-have-icons",       "Gtk/MenuImages",          translate_bool_int },
+        { "org.gnome.desktop.interface", "buttons-have-icons",     "Gtk/ButtonImages",        translate_bool_int }, */
         { "org.gnome.desktop.interface", "menubar-accel",          "Gtk/MenuBarAccel",        translate_string_string },
         { "org.gnome.desktop.interface", "enable-animations",      "Gtk/EnableAnimations",    translate_bool_int },
         { "org.gnome.desktop.interface", "cursor-theme",           "Gtk/CursorThemeName",     translate_string_string },
         { "org.gnome.desktop.interface", "cursor-size",            "Gtk/CursorThemeSize",     translate_int_int },
-        { "org.gnome.desktop.interface", "show-input-method-menu", "Gtk/ShowInputMethodMenu", translate_bool_int },
+ /*     { "org.gnome.desktop.interface", "show-input-method-menu", "Gtk/ShowInputMethodMenu", translate_bool_int },
         { "org.gnome.desktop.interface", "show-unicode-menu",      "Gtk/ShowUnicodeMenu",     translate_bool_int },
-        { "org.gnome.desktop.interface", "automatic-mnemonics",    "Gtk/AutoMnemonics",       translate_bool_int },
+        { "org.gnome.desktop.interface", "automatic-mnemonics",    "Gtk/AutoMnemonics",       translate_bool_int }, */

         { "org.gnome.desktop.sound", "theme-name",                 "Net/SoundThemeName",            translate_string_string },
         { "org.gnome.desktop.sound", "event-sounds",               "Net/EnableEventSounds" ,        translate_bool_in

--- a/files/usr/lib/cinnamon-settings/modules/cs_themes.py
+++ b/files/usr/lib/cinnamon-settings/modules/cs_themes.py
@@ -58,11 +58,11 @@ class ThemesViewSidePage (ExtensionSideP
         keybindingThemeSwitcher = GSettingsComboBox(_("Keybindings"), "org.gnome.desktop.interface", "gtk-key-theme", None, self._load_keybinding_themes())
         other_settings_box.pack_start(keybindingThemeSwitcher, False, False, 2)            

-        menusHaveIconsCB = GSettingsCheckButton(_("Show icons in menus"), "org.gnome.desktop.interface", "menus-have-icons", None)
-        other_settings_box.pack_start(menusHaveIconsCB, False, False, 2)
+#        menusHaveIconsCB = GSettingsCheckButton(_("Show icons in menus"), "org.gnome.desktop.interface", "menus-have-icons", None)
+#        other_settings_box.pack_start(menusHaveIconsCB, False, False, 2)

-        buttonsHaveIconsCB = GSettingsCheckButton(_("Show icons on buttons"), "org.gnome.desktop.interface", "buttons-have-icons", None)
-        other_settings_box.pack_start(buttonsHaveIconsCB, False, False, 2)
+#        buttonsHaveIconsCB = GSettingsCheckButton(_("Show icons on buttons"), "org.gnome.desktop.interface", "buttons-have-icons", None)
+#        other_settings_box.pack_start(buttonsHaveIconsCB, False, False, 2)

         return scrolledWindow