[meld/deprecation-cleanup: 28/48] meldwindow: Remove support for hiding the toolbar

[Kai Willadsen <kaiw src gnome org>]

commit 3c65dfc906e43d2225451ccb044c29787135faaa
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Dec 1 08:49:02 2018 +1000

    meldwindow: Remove support for hiding the toolbar
    
    This isn't really a sensible thing to do any more, and doesn't fit with
    the current or future application design.

 data/org.gnome.meld.gschema.xml |  7 -------
 data/ui/meldapp-ui.xml          |  1 -
 meld/meldwindow.py              | 10 +---------
 3 files changed, 1 insertion(+), 17 deletions(-)
---
diff --git a/data/org.gnome.meld.gschema.xml b/data/org.gnome.meld.gschema.xml
index 16417d00..932be968 100644
--- a/data/org.gnome.meld.gschema.xml
+++ b/data/org.gnome.meld.gschema.xml
@@ -45,13 +45,6 @@
   </schema>
 
   <schema id="org.gnome.meld" path="/org/gnome/meld/">
-      <!-- Application settings -->
-
-      <key name="toolbar-visible" type="b">
-          <default>true</default>
-          <summary>Show toolbar</summary>
-          <description>If true, the window toolbar is visible.</description>
-      </key>
 
       <!-- File loading settings -->
       <key name="detect-encodings" type="as">
diff --git a/data/ui/meldapp-ui.xml b/data/ui/meldapp-ui.xml
index a23f8fce..19475f18 100644
--- a/data/ui/meldapp-ui.xml
+++ b/data/ui/meldapp-ui.xml
@@ -36,7 +36,6 @@
       <placeholder name="ChangesActions" />
     </menu>
     <menu action="ViewMenu">
-      <menuitem action="ToolbarVisible" />
       <placeholder name="ViewBarPlaceholder" />
       <menuitem action="Fullscreen" />
       <separator/>
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index 40da2b96..5456e6ba 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -29,7 +29,7 @@ from meld.filemerge import FileMerge
 from meld.melddoc import ComparisonState, MeldDoc
 from meld.newdifftab import NewDiffTab
 from meld.recent import recent_comparisons, RecentType
-from meld.settings import interface_settings, settings
+from meld.settings import interface_settings
 from meld.task import LifoScheduler
 from meld.ui._gtktemplate import Template
 from meld.ui.gnomeglade import ui_file
@@ -125,9 +125,6 @@ class MeldWindow(Gtk.ApplicationWindow):
             ("Fullscreen", None, _("Fullscreen"), "F11",
                 _("View the comparison in fullscreen"),
                 self.on_action_fullscreen_toggled, False),
-            ("ToolbarVisible", None, _("_Toolbar"), None,
-                _("Show or hide the toolbar"),
-                None, True),
         )
         self.actiongroup = Gtk.ActionGroup(name='MainActions')
         self.actiongroup.set_translation_domain("meld")
@@ -155,11 +152,6 @@ class MeldWindow(Gtk.ApplicationWindow):
         self.toolbar.get_style_context().add_class(
             Gtk.STYLE_CLASS_PRIMARY_TOOLBAR)
 
-        settings.bind('toolbar-visible',
-                      self.actiongroup.get_action('ToolbarVisible'), 'active',
-                      Gio.SettingsBindFlags.DEFAULT)
-        settings.bind('toolbar-visible', self.toolbar, 'visible',
-                      Gio.SettingsBindFlags.DEFAULT)
         interface_settings.bind('toolbar-style', self.toolbar, 'toolbar-style',
                                 Gio.SettingsBindFlags.DEFAULT)