show_toolbar -> ui.gtk.toolbar

src/gpodder/config.py

@@ -228,7 +228,6 @@ defaults = {
 
 # The sooner this goes away, the better
 gPodderSettings_LegacySupport = {
-    'show_toolbar': 'ui.gtk.toolbar',
     'episode_list_descriptions': 'ui.gtk.episode_list.descriptions',
     'podcast_list_view_all': 'ui.gtk.podcast_list.all_episodes',
     'podcast_list_sections': 'ui.gtk.podcast_list.sections',

src/gpodder/gtkui/main.py

@@ -107,7 +107,7 @@ class gPodder(BuilderWidget, dbus.service.Object):
             self.main_window.set_titlebar(self.header_bar)
 
         gpodder.user_extensions.on_ui_object_available('gpodder-gtk', self)
-        self.toolbar.set_property('visible', self.config.show_toolbar)
+        self.toolbar.set_property('visible', self.config.ui.gtk.toolbar)
 
         self.bluetooth_available = util.bluetooth_available()
 
@@ -341,7 +341,7 @@ class gPodder(BuilderWidget, dbus.service.Object):
         self.open_episode_download_folder_action = g.lookup_action('openEpisodeDownloadFolder')
 
         action = Gio.SimpleAction.new_stateful(
-            'showToolbar', None, GLib.Variant.new_boolean(self.config.show_toolbar))
+            'showToolbar', None, GLib.Variant.new_boolean(self.config.ui.gtk.toolbar))
         action.connect('activate', self.on_itemShowToolbar_activate)
         g.add_action(action)
 
@@ -3355,7 +3355,7 @@ class gPodder(BuilderWidget, dbus.service.Object):
 
     def on_itemShowToolbar_activate(self, action, param):
         state = action.get_state()
-        self.config.show_toolbar = not state
+        self.config.ui.gtk.toolbar = not state
         action.set_state(GLib.Variant.new_boolean(not state))
 
     def on_itemShowDescription_activate(self, action, param):

src/gpodder/jsonconfig.py

@@ -77,7 +77,7 @@ class JsonConfig(object):
 
             func(name, old_value, new_value)
 
-            name: The key name, e.g. "ui.gtk.show_toolbar"
+            name: The key name, e.g. "ui.gtk.toolbar"
             old_value: The old value, e.g. False
             new_value: The new value, e.g. True