[meld] ui.bufferselectors: Move to non-vendored Template usage

[Kai Willadsen <kaiw src gnome org>]

commit b5b899be349dd760812a595a50500f4caf4148e6
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Aug 31 11:52:55 2019 +1000

    ui.bufferselectors: Move to non-vendored Template usage

 meld/ui/bufferselectors.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/meld/ui/bufferselectors.py b/meld/ui/bufferselectors.py
index c5fa0573..fc93b623 100644
--- a/meld/ui/bufferselectors.py
+++ b/meld/ui/bufferselectors.py
@@ -4,7 +4,6 @@ from gi.repository import Gtk
 from gi.repository import GtkSource
 
 from meld.conf import _
-from meld.ui._gtktemplate import Template
 
 # TODO: Current pygobject support for templates excludes subclassing of
 # templated classes, which is why we have two near-identical UI files
@@ -81,11 +80,11 @@ class FilteredListSelector:
 
 # The subclassing here is weird; the Selector must directly subclass
 # Gtk.Grid; we can't do this on the FilteredListSelector. Likewise, the
-# Template.Child attributes must be per-class, because of how they're
-# registered by the templating engine.
+# Gtk.Template.Child attributes must be per-class, because of how
+# they're registered by the templating engine.
 
 
-@Template(resource_path='/org/gnome/meld/ui/encoding-selector.ui')
+@Gtk.Template(resource_path='/org/gnome/meld/ui/encoding-selector.ui')
 class EncodingSelector(FilteredListSelector, Gtk.Grid):
     # The subclassing here is weird; the Selector must directly
     # subclass Gtk.Grid, or the template building explodes.
@@ -102,8 +101,8 @@ class EncodingSelector(FilteredListSelector, Gtk.Grid):
     value_accessor = 'get_charset'
     change_signal_name = 'encoding-selected'
 
-    entry = Template.Child('entry')
-    treeview = Template.Child('treeview')
+    entry = Gtk.Template.Child('entry')
+    treeview = Gtk.Template.Child('treeview')
 
     def populate_model(self):
         for enc in GtkSource.Encoding.get_all():
@@ -121,7 +120,7 @@ class EncodingSelector(FilteredListSelector, Gtk.Grid):
 # Copyright (C) 2015, 2017 Kai Willadsen <kai willadsen gmail com>
 
 
-@Template(resource_path='/org/gnome/meld/ui/language-selector.ui')
+@Gtk.Template(resource_path='/org/gnome/meld/ui/language-selector.ui')
 class SourceLangSelector(FilteredListSelector, Gtk.Grid):
 
     __gtype_name__ = "SourceLangSelector"
@@ -136,8 +135,8 @@ class SourceLangSelector(FilteredListSelector, Gtk.Grid):
     value_accessor = 'get_id'
     change_signal_name = 'language-selected'
 
-    entry = Template.Child('entry')
-    treeview = Template.Child('treeview')
+    entry = Gtk.Template.Child('entry')
+    treeview = Gtk.Template.Child('treeview')
 
     def populate_model(self):
         self.liststore.append((_("Plain Text"), None))