From f1fa94fca73930f3cbbdc9874416f0fa8e7a38d1 Mon Sep 17 00:00:00 2001
From: Christopher Davis <christopherdavis@gnome.org>
Date: Wed, 13 Jan 2021 23:05:45 -0800
Subject: [PATCH] Use instance_init() for composite templates

Drops the incorrect use of instance_init() within
constructed.
---
 src/widgets/image_view.rs | 5 ++++-
 src/window.rs             | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/widgets/image_view.rs b/src/widgets/image_view.rs
index 815ea54..a186b56 100644
--- a/src/widgets/image_view.rs
+++ b/src/widgets/image_view.rs
@@ -119,11 +119,14 @@ mod imp {
             klass.set_template_from_resource("/org/gnome/ImageViewer/gtk/image_view.ui");
             Self::bind_template_children(klass);
         }
+
+        fn instance_init(obj: &glib::subclass::InitializingObject<Self::Type>) {
+            obj.init_template();
+        }
     }
 
     impl ObjectImpl for IvImageView {
         fn constructed(&self, obj: &Self::Type) {
-            obj.init_template();
             self.parent_constructed(obj);
 
             obj.bind_property("header-visible", &self.headerbar.get(), "visible")
diff --git a/src/window.rs b/src/window.rs
index 93f92f4..da10ee7 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -83,11 +83,13 @@ mod imp {
             // CompositeTemplate macro to bind all children at once.
             Self::bind_template_children(klass);
         }
+        fn instance_init(obj: &glib::subclass::InitializingObject<Self::Type>) {
+            obj.init_template();
+        }
     }
 
     impl ObjectImpl for IvWindow {
         fn constructed(&self, obj: &Self::Type) {
-            obj.init_template();
             self.parent_constructed(obj);
 
             if config::PROFILE == ".Devel" {