From 14bf45a0d53d8037a1fd26bc5b6b3eff57e569bf Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri, 18 Dec 2020 23:14:24 +0000
Subject: [PATCH 1/2] 3to4: Remove GtkCheckButton:draw-indicator

The property was removed from the widget, so we need to remove it from
UI files too.

Fixes: #3492
---
 gtk/tools/gtk-builder-tool-simplify.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gtk/tools/gtk-builder-tool-simplify.c b/gtk/tools/gtk-builder-tool-simplify.c
index add00fe833..151488f272 100644
--- a/gtk/tools/gtk-builder-tool-simplify.c
+++ b/gtk/tools/gtk-builder-tool-simplify.c
@@ -660,6 +660,7 @@ property_has_been_removed (Element      *element,
     { "GtkBox", "pack-type", PROP_KIND_PACKING },
     { "GtkHeaderBar", "position", PROP_KIND_PACKING },
     { "GtkPopoverMenu", "position",PROP_KIND_PACKING },
+    { "GtkCheckButton", "draw-indicator", PROP_KIND_OBJECT },
   };
   char *canonical_name;
   gboolean found;

From f2b16836c25c9a12be1405d22c1a3a4e11a4d2be Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Sat, 19 Dec 2020 15:52:22 +0000
Subject: [PATCH 2/2] 3to4: Add test for GtkCheckButton:draw-indicator removal

---
 .../simplify-data-3to4/checkbutton.expected   | 17 +++++++++++++++++
 .../tools/simplify-data-3to4/checkbutton.ui   | 19 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 testsuite/tools/simplify-data-3to4/checkbutton.expected
 create mode 100644 testsuite/tools/simplify-data-3to4/checkbutton.ui

diff --git a/testsuite/tools/simplify-data-3to4/checkbutton.expected b/testsuite/tools/simplify-data-3to4/checkbutton.expected
new file mode 100644
index 0000000000..63b5655f7e
--- /dev/null
+++ b/testsuite/tools/simplify-data-3to4/checkbutton.expected
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <object class="GtkWindow" id="window1">
+    <property name="child">
+      <object class="GtkBox" id="box1">
+        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+        <child>
+          <object class="GtkCheckButton" id="checkbutton1">
+            <property name="hexpand">1</property>
+            <property name="label">Check</property>
+          </object>
+        </child>
+      </object>
+    </property>
+  </object>
+</interface>
diff --git a/testsuite/tools/simplify-data-3to4/checkbutton.ui b/testsuite/tools/simplify-data-3to4/checkbutton.ui
new file mode 100644
index 0000000000..33e2cf904c
--- /dev/null
+++ b/testsuite/tools/simplify-data-3to4/checkbutton.ui
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow" id="window1">
+    <child>
+      <object class="GtkBox" id="box1">
+        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+        <property name="visible">1</property>
+        <child>
+          <object class="GtkCheckButton" id="checkbutton1">
+            <property name="draw_indicator">1</property>
+            <property name="hexpand">1</property>
+            <property name="label">Check</property>
+            <property name="visible">1</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>