[meld/ui-next] meldwindow: Remove the now-unused toolbar

[Kai Willadsen <kaiw src gnome org>]

commit 069e0714782f21dc4d0fddb591a465e30f941f2f
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Tue Feb 26 06:56:43 2019 +1000

    meldwindow: Remove the now-unused toolbar

 data/ui/meldapp-ui.xml         |  3 ---
 meld/meldwindow.py             | 14 --------------
 meld/resources/ui/appwindow.ui | 11 -----------
 3 files changed, 28 deletions(-)
---
diff --git a/data/ui/meldapp-ui.xml b/data/ui/meldapp-ui.xml
index c2cabadc..d664eff2 100644
--- a/data/ui/meldapp-ui.xml
+++ b/data/ui/meldapp-ui.xml
@@ -20,9 +20,6 @@
     </menu>
   </menubar>
 
-  <toolbar action="Toolbar">
-  </toolbar>
-
   <popup name="Popup">
   </popup>
 </ui>
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index fcd4c1fd..4c23a364 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -55,7 +55,6 @@ class MeldWindow(Gtk.ApplicationWindow):
     gear_menu_button = Template.Child("gear_menu_button")
     notebook = Template.Child("notebook")
     spinner = Template.Child("spinner")
-    toolbar_holder = Template.Child("toolbar_holder")
     vc_filter_button = Template.Child()
 
     def __init__(self):
@@ -103,21 +102,8 @@ class MeldWindow(Gtk.ApplicationWindow):
 
         self.add_accel_group(self.ui.get_accel_group())
         self.menubar = self.ui.get_widget('/Menubar')
-        self.toolbar = self.ui.get_widget('/Toolbar')
-        self.toolbar.get_style_context().add_class(
-            Gtk.STYLE_CLASS_PRIMARY_TOOLBAR)
 
         self.appvbox.pack_start(self.menubar, False, True, 0)
-        self.toolbar_holder.pack_start(self.toolbar, True, True, 0)
-
-        # This double toolbar works around integrating non-UIManager widgets
-        # into the toolbar. It's no longer used, but kept as a possible
-        # GAction porting helper.
-        self.secondary_toolbar = Gtk.Toolbar()
-        self.secondary_toolbar.get_style_context().add_class(
-            Gtk.STYLE_CLASS_PRIMARY_TOOLBAR)
-        self.toolbar_holder.pack_end(self.secondary_toolbar, False, True, 0)
-        self.secondary_toolbar.show_all()
 
         # Manually handle GAction additions
         actions = (
diff --git a/meld/resources/ui/appwindow.ui b/meld/resources/ui/appwindow.ui
index 8a812f14..93d21826 100644
--- a/meld/resources/ui/appwindow.ui
+++ b/meld/resources/ui/appwindow.ui
@@ -167,17 +167,6 @@
       <object class="GtkVBox" id="appvbox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <child>
-          <object class="GtkBox" id="toolbar_holder">
-            <property name="visible">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
         <child>
           <object class="MeldNotebook" id="notebook">
             <property name="visible">True</property>