[meld] Remove unnecessary init_template() calls
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Remove unnecessary init_template() calls
- Date: Sat, 31 Aug 2019 02:06:10 +0000 (UTC)
commit 78d2d04451e23860c327435119dfe4dce133880a
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat Aug 31 10:33:42 2019 +1000
Remove unnecessary init_template() calls
These were for backwards compatibility with old pygobject, and are both
unneeded and fragile with our current required pygobject version.
meld/dirdiff.py | 1 -
meld/filediff.py | 1 -
meld/meldwindow.py | 2 --
meld/newdifftab.py | 1 -
meld/patchdialog.py | 1 -
meld/ui/bufferselectors.py | 1 -
meld/ui/findbar.py | 1 -
meld/ui/notebooklabel.py | 1 -
meld/ui/vcdialogs.py | 2 --
meld/vcview.py | 1 -
10 files changed, 12 deletions(-)
---
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 7d345edd..c6fea7ea 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -400,7 +400,6 @@ class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
# multiple inheritance and we need to inherit from our Widget
# parent to make Template work.
MeldDoc.__init__(self)
- self.init_template()
bind_settings(self)
self.view_action_group = Gio.SimpleActionGroup()
diff --git a/meld/filediff.py b/meld/filediff.py
index 39f13b91..d875ff5a 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -229,7 +229,6 @@ class FileDiff(Gtk.VBox, MeldDoc):
# multiple inheritance and we need to inherit from our Widget
# parent to make Template work.
MeldDoc.__init__(self)
- self.init_template()
bind_settings(self)
widget_lists = [
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index f4c9022d..56b2c3df 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -61,8 +61,6 @@ class MeldWindow(Gtk.ApplicationWindow):
def __init__(self):
super().__init__()
- self.init_template()
-
# Manually handle GAction additions
actions = (
("close", self.action_close),
diff --git a/meld/newdifftab.py b/meld/newdifftab.py
index 468002a9..6ef8ac1f 100644
--- a/meld/newdifftab.py
+++ b/meld/newdifftab.py
@@ -73,7 +73,6 @@ class NewDiffTab(Gtk.Alignment, LabeledObjectMixin):
def __init__(self, parentapp):
super().__init__()
- self.init_template()
map_widgets_into_lists(
self,
["file_chooser", "dir_chooser", "vc_chooser", "filechooserdialog"]
diff --git a/meld/patchdialog.py b/meld/patchdialog.py
index 7e30ae24..485a7a60 100644
--- a/meld/patchdialog.py
+++ b/meld/patchdialog.py
@@ -45,7 +45,6 @@ class PatchDialog(Gtk.Dialog):
def __init__(self, filediff):
super().__init__()
- self.init_template()
self.set_transient_for(filediff.get_toplevel())
self.filediff = filediff
diff --git a/meld/ui/bufferselectors.py b/meld/ui/bufferselectors.py
index 73250306..c5fa0573 100644
--- a/meld/ui/bufferselectors.py
+++ b/meld/ui/bufferselectors.py
@@ -26,7 +26,6 @@ class FilteredListSelector:
def __init__(self):
super().__init__()
- self.init_template()
self.treeview_selection = self.treeview.get_selection()
# FIXME: Should be able to access as a template child, but can't.
diff --git a/meld/ui/findbar.py b/meld/ui/findbar.py
index 63593632..b9bb4af2 100644
--- a/meld/ui/findbar.py
+++ b/meld/ui/findbar.py
@@ -51,7 +51,6 @@ class FindBar(Gtk.Grid):
def __init__(self, parent):
super().__init__()
- self.init_template()
self.search_context = None
self.notify_id = None
diff --git a/meld/ui/notebooklabel.py b/meld/ui/notebooklabel.py
index a1b11d63..6a64548e 100644
--- a/meld/ui/notebooklabel.py
+++ b/meld/ui/notebooklabel.py
@@ -49,7 +49,6 @@ class NotebookLabel(Gtk.EventBox):
def __init__(self, **kwargs):
super().__init__(**kwargs)
- self.init_template()
self.bind_property(
'icon-name', self.icon, 'icon-name',
diff --git a/meld/ui/vcdialogs.py b/meld/ui/vcdialogs.py
index 214d90f1..0111e6c4 100644
--- a/meld/ui/vcdialogs.py
+++ b/meld/ui/vcdialogs.py
@@ -41,7 +41,6 @@ class CommitDialog(Gtk.Dialog):
def __init__(self, parent):
super().__init__()
- self.init_template()
self.set_transient_for(parent.get_toplevel())
selected = parent._get_selected_files()
@@ -118,7 +117,6 @@ class PushDialog(Gtk.MessageDialog):
def __init__(self, parent):
super().__init__()
- self.init_template()
self.set_transient_for(parent.get_toplevel())
self.show_all()
diff --git a/meld/vcview.py b/meld/vcview.py
index 554ef5a0..5bb25bcc 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -185,7 +185,6 @@ class VcView(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
# multiple inheritance and we need to inherit from our Widget
# parent to make Template work.
MeldDoc.__init__(self)
- self.init_template()
bind_settings(self)
# Set up per-view action group for top-level menu insertion
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]