Make GtkPasswordEntry a true final type

Use G_DECLARE_FINAL_TYPE in the header, and G_DEFINE_FINAL_TYPE in the
source.

gtk/gtkbinlayout.c

@@ -38,7 +38,7 @@ struct _GtkBinLayout
   GtkLayoutManager parent_instance;
 };
 
-G_DEFINE_TYPE (GtkBinLayout, gtk_bin_layout, GTK_TYPE_LAYOUT_MANAGER)
+G_DEFINE_FINAL_TYPE (GtkBinLayout, gtk_bin_layout, GTK_TYPE_LAYOUT_MANAGER)
 
 static void
 gtk_bin_layout_measure (GtkLayoutManager *layout_manager,

gtk/gtkbookmarklist.c

@@ -117,8 +117,8 @@ static void     bookmark_file_changed (GFileMonitor       *monitor,
 static void gtk_bookmark_list_set_filename (GtkBookmarkList *self,
                                                 const char         *filename);
 
-G_DEFINE_TYPE_WITH_CODE (GtkBookmarkList, gtk_bookmark_list, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_bookmark_list_model_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkBookmarkList, gtk_bookmark_list, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_bookmark_list_model_init))
 
 static void
 gtk_bookmark_list_set_property (GObject      *object,

gtk/gtkboolfilter.c

@@ -46,7 +46,7 @@ enum {
   NUM_PROPERTIES
 };
 
-G_DEFINE_TYPE (GtkBoolFilter, gtk_bool_filter, GTK_TYPE_FILTER)
+G_DEFINE_FINAL_TYPE (GtkBoolFilter, gtk_bool_filter, GTK_TYPE_FILTER)
 
 static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
 
@@ -106,7 +106,7 @@ gtk_bool_filter_set_property (GObject      *object,
     }
 }
 
-static void 
+static void
 gtk_bool_filter_get_property (GObject     *object,
                               guint        prop_id,
                               GValue      *value,

gtk/gtkboxlayout.c

@@ -58,8 +58,8 @@ struct _GtkBoxLayout
   GtkBaselinePosition baseline_position;
 };
 
-G_DEFINE_TYPE_WITH_CODE (GtkBoxLayout, gtk_box_layout, GTK_TYPE_LAYOUT_MANAGER,
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, NULL))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkBoxLayout, gtk_box_layout, GTK_TYPE_LAYOUT_MANAGER,
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, NULL))
 
 enum {
   PROP_HOMOGENEOUS = 1,
@@ -342,7 +342,7 @@ distribute_remaining_size (GtkRequestedSize *sizes,
       else
         max = test;
     }
-    
+
   return available - total_size;
 }
 

gtk/gtkcenterlayout.c

@@ -54,7 +54,7 @@ struct _GtkCenterLayout
   };
 };
 
-G_DEFINE_TYPE (GtkCenterLayout, gtk_center_layout, GTK_TYPE_LAYOUT_MANAGER)
+G_DEFINE_FINAL_TYPE (GtkCenterLayout, gtk_center_layout, GTK_TYPE_LAYOUT_MANAGER)
 
 static int
 get_spacing (GtkCenterLayout *self,

gtk/gtkconstraint.c

@@ -60,7 +60,7 @@ enum {
 
 static GParamSpec *obj_props[N_PROPERTIES];
 
-G_DEFINE_TYPE (GtkConstraint, gtk_constraint, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (GtkConstraint, gtk_constraint, G_TYPE_OBJECT)
 
 static void
 gtk_constraint_set_property (GObject      *gobject,

gtk/gtkconstraintguide.c

@@ -59,7 +59,7 @@ typedef enum {
 } GuideValue;
 
 struct _GtkConstraintGuide
-{ 
+{
   GObject parent_instance;
 
   char *name;
@@ -104,9 +104,9 @@ gtk_constraint_guide_constraint_target_iface_init (GtkConstraintTargetInterface
 {
 }
 
-G_DEFINE_TYPE_WITH_CODE (GtkConstraintGuide, gtk_constraint_guide, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_CONSTRAINT_TARGET,
-                                                gtk_constraint_guide_constraint_target_iface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkConstraintGuide, gtk_constraint_guide, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_CONSTRAINT_TARGET,
+                                                      gtk_constraint_guide_constraint_target_iface_init))
 
 static void
 gtk_constraint_guide_init (GtkConstraintGuide *guide)

gtk/gtkconstraintlayout.c

@@ -266,7 +266,7 @@ struct _GtkConstraintLayout
   GListStore *guides_observer;
 };
 
-G_DEFINE_TYPE (GtkConstraintLayoutChild, gtk_constraint_layout_child, GTK_TYPE_LAYOUT_CHILD)
+G_DEFINE_FINAL_TYPE (GtkConstraintLayoutChild, gtk_constraint_layout_child, GTK_TYPE_LAYOUT_CHILD)
 
 GtkConstraintSolver *
 gtk_constraint_layout_get_solver (GtkConstraintLayout *self)
@@ -537,8 +537,8 @@ gtk_constraint_layout_child_init (GtkConstraintLayoutChild *self)
 
 static void gtk_buildable_interface_init (GtkBuildableIface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (GtkConstraintLayout, gtk_constraint_layout, GTK_TYPE_LAYOUT_MANAGER,
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE, gtk_buildable_interface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkConstraintLayout, gtk_constraint_layout, GTK_TYPE_LAYOUT_MANAGER,
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE, gtk_buildable_interface_init))
 
 static void
 gtk_constraint_layout_finalize (GObject *gobject)

gtk/gtkcustomfilter.c

@@ -38,7 +38,7 @@ struct _GtkCustomFilter
   GDestroyNotify user_destroy;
 };
 
-G_DEFINE_TYPE (GtkCustomFilter, gtk_custom_filter, GTK_TYPE_FILTER)
+G_DEFINE_FINAL_TYPE (GtkCustomFilter, gtk_custom_filter, GTK_TYPE_FILTER)
 
 static gboolean
 gtk_custom_filter_match (GtkFilter *filter,

gtk/gtkcustomlayout.c

@@ -22,7 +22,7 @@ struct _GtkCustomLayout
   GtkCustomAllocateFunc allocate_func;
 };
 
-G_DEFINE_TYPE (GtkCustomLayout, gtk_custom_layout, GTK_TYPE_LAYOUT_MANAGER)
+G_DEFINE_FINAL_TYPE (GtkCustomLayout, gtk_custom_layout, GTK_TYPE_LAYOUT_MANAGER)
 
 static GtkSizeRequestMode
 gtk_custom_layout_get_request_mode (GtkLayoutManager *manager,

gtk/gtkcustomsorter.c

@@ -39,7 +39,7 @@ struct _GtkCustomSorter
   GDestroyNotify user_destroy;
 };
 
-G_DEFINE_TYPE (GtkCustomSorter, gtk_custom_sorter, GTK_TYPE_SORTER)
+G_DEFINE_FINAL_TYPE (GtkCustomSorter, gtk_custom_sorter, GTK_TYPE_SORTER)
 
 static GtkOrdering
 gtk_custom_sorter_compare (GtkSorter *sorter,

gtk/gtkdirectorylist.c

@@ -144,8 +144,8 @@ gtk_directory_list_model_init (GListModelInterface *iface)
   iface->get_item = gtk_directory_list_get_item;
 }
 
-G_DEFINE_TYPE_WITH_CODE (GtkDirectoryList, gtk_directory_list, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_directory_list_model_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkDirectoryList, gtk_directory_list, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_directory_list_model_init))
 
 static void
 gtk_directory_list_set_property (GObject      *object,

gtk/gtkdragicon.c

@@ -79,11 +79,11 @@ static GParamSpec *properties[LAST_ARG] = { NULL, };
 static void gtk_drag_icon_root_init   (GtkRootInterface *iface);
 static void gtk_drag_icon_native_init (GtkNativeInterface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (GtkDragIcon, gtk_drag_icon, GTK_TYPE_WIDGET,
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_NATIVE,
-                                                gtk_drag_icon_native_init)
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_ROOT,
-                                                gtk_drag_icon_root_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkDragIcon, gtk_drag_icon, GTK_TYPE_WIDGET,
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_NATIVE,
+                                                      gtk_drag_icon_native_init)
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_ROOT,
+                                                      gtk_drag_icon_root_init))
 
 static GdkDisplay *
 gtk_drag_icon_root_get_display (GtkRoot *self)

gtk/gtkdropdown.c

@@ -132,7 +132,7 @@ enum
   LAST_SIGNAL
 };
 
-G_DEFINE_TYPE (GtkDropDown, gtk_drop_down, GTK_TYPE_WIDGET)
+G_DEFINE_FINAL_TYPE (GtkDropDown, gtk_drop_down, GTK_TYPE_WIDGET)
 
 static GParamSpec *properties[N_PROPS] = { NULL, };
 static guint signals[LAST_SIGNAL] = { 0 };

gtk/gtkeditablelabel.c

@@ -103,9 +103,9 @@ gtk_editable_label_editable_init (GtkEditableInterface *iface)
 }
 
 
-G_DEFINE_TYPE_WITH_CODE (GtkEditableLabel, gtk_editable_label, GTK_TYPE_WIDGET,
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
-                                                gtk_editable_label_editable_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkEditableLabel, gtk_editable_label, GTK_TYPE_WIDGET,
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
+                                                      gtk_editable_label_editable_init))
 
 static void
 start_editing (GtkWidget  *widget,

gtk/gtkfilechoosernative.c

@@ -206,9 +206,9 @@ static GParamSpec *native_props[LAST_ARG] = { NULL, };
 
 static void    _gtk_file_chooser_native_iface_init   (GtkFileChooserIface  *iface);
 
-G_DEFINE_TYPE_WITH_CODE (GtkFileChooserNative, gtk_file_chooser_native, GTK_TYPE_NATIVE_DIALOG,
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_FILE_CHOOSER,
-                                                _gtk_file_chooser_native_iface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkFileChooserNative, gtk_file_chooser_native, GTK_TYPE_NATIVE_DIALOG,
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_FILE_CHOOSER,
+                                                      _gtk_file_chooser_native_iface_init))
 
 
 /**

gtk/gtkfilterlistmodel.c

@@ -134,8 +134,8 @@ gtk_filter_list_model_model_init (GListModelInterface *iface)
   iface->get_item = gtk_filter_list_model_get_item;
 }
 
-G_DEFINE_TYPE_WITH_CODE (GtkFilterListModel, gtk_filter_list_model, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_filter_list_model_model_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkFilterListModel, gtk_filter_list_model, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_filter_list_model_model_init))
 
 static gboolean
 gtk_filter_list_model_run_filter_on_item (GtkFilterListModel *self,
@@ -163,7 +163,7 @@ gtk_filter_list_model_run_filter (GtkFilterListModel *self,
   gboolean more;
 
   g_return_if_fail (GTK_IS_FILTER_LIST_MODEL (self));
-  
+
   if (self->pending == NULL)
     return;
 
@@ -346,7 +346,7 @@ gtk_filter_list_model_set_property (GObject      *object,
     }
 }
 
-static void 
+static void
 gtk_filter_list_model_get_property (GObject     *object,
                                     guint        prop_id,
                                     GValue      *value,
@@ -473,7 +473,7 @@ gtk_filter_list_model_refilter (GtkFilterListModel *self,
     case GTK_FILTER_MATCH_SOME:
       {
         GtkBitset *old, *pending;
-      
+
         if (self->matches == NULL)
           {
             if (self->strictness == GTK_FILTER_MATCH_ALL)

gtk/gtkfixedlayout.c

@@ -92,7 +92,7 @@ enum
 
 static GParamSpec *child_props[N_CHILD_PROPERTIES];
 
-G_DEFINE_TYPE (GtkFixedLayoutChild, gtk_fixed_layout_child, GTK_TYPE_LAYOUT_CHILD)
+G_DEFINE_FINAL_TYPE (GtkFixedLayoutChild, gtk_fixed_layout_child, GTK_TYPE_LAYOUT_CHILD)
 
 static void
 gtk_fixed_layout_child_set_property (GObject      *gobject,
@@ -215,7 +215,7 @@ gtk_fixed_layout_child_get_transform (GtkFixedLayoutChild *child)
   return child->transform;
 }
 
-G_DEFINE_TYPE (GtkFixedLayout, gtk_fixed_layout, GTK_TYPE_LAYOUT_MANAGER)
+G_DEFINE_FINAL_TYPE (GtkFixedLayout, gtk_fixed_layout, GTK_TYPE_LAYOUT_MANAGER)
 
 static GtkSizeRequestMode
 gtk_fixed_layout_get_request_mode (GtkLayoutManager *layout_manager,

gtk/gtkflattenlistmodel.c

@@ -198,8 +198,8 @@ gtk_flatten_list_model_model_init (GListModelInterface *iface)
   iface->get_item = gtk_flatten_list_model_get_item;
 }
 
-G_DEFINE_TYPE_WITH_CODE (GtkFlattenListModel, gtk_flatten_list_model, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_flatten_list_model_model_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkFlattenListModel, gtk_flatten_list_model, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_flatten_list_model_model_init))
 
 static void
 gtk_flatten_list_model_items_changed_cb (GListModel *model,
@@ -322,7 +322,7 @@ gtk_flatten_list_model_set_property (GObject      *object,
     }
 }
 
-static void 
+static void
 gtk_flatten_list_model_get_property (GObject    *object,
                                      guint       prop_id,
                                      GValue     *value,
@@ -463,7 +463,7 @@ gtk_flatten_list_model_set_model (GtkFlattenListModel *self,
   if (self->model == model)
     return;
 
-  removed = g_list_model_get_n_items (G_LIST_MODEL (self)); 
+  removed = g_list_model_get_n_items (G_LIST_MODEL (self));
   gtk_flatten_list_clear_model (self);
 
   self->model = model;

gtk/gtkgridlayout.c

@@ -84,7 +84,7 @@ enum {
 
 static GParamSpec *child_props[N_CHILD_PROPERTIES];
 
-G_DEFINE_TYPE (GtkGridLayoutChild, gtk_grid_layout_child, GTK_TYPE_LAYOUT_CHILD)
+G_DEFINE_FINAL_TYPE (GtkGridLayoutChild, gtk_grid_layout_child, GTK_TYPE_LAYOUT_CHILD)
 
 static void
 gtk_grid_layout_child_set_property (GObject      *gobject,
@@ -454,7 +454,7 @@ enum {
 
 static GParamSpec *layout_props[N_PROPERTIES];
 
-G_DEFINE_TYPE (GtkGridLayout, gtk_grid_layout, GTK_TYPE_LAYOUT_MANAGER)
+G_DEFINE_FINAL_TYPE (GtkGridLayout, gtk_grid_layout, GTK_TYPE_LAYOUT_MANAGER)
 
 static inline GtkGridLayoutChild *
 get_grid_child (GtkGridLayout *self,

gtk/gtkmaplistmodel.c

@@ -147,7 +147,7 @@ static guint
 gtk_map_list_model_get_n_items (GListModel *list)
 {
   GtkMapListModel *self = GTK_MAP_LIST_MODEL (list);
-  
+
   if (self->model == NULL)
     return 0;
 
@@ -205,8 +205,8 @@ gtk_map_list_model_model_init (GListModelInterface *iface)
   iface->get_item = gtk_map_list_model_get_item;
 }
 
-G_DEFINE_TYPE_WITH_CODE (GtkMapListModel, gtk_map_list_model, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_map_list_model_model_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkMapListModel, gtk_map_list_model, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_map_list_model_model_init))
 
 static void
 gtk_map_list_model_items_changed_cb (GListModel      *model,
@@ -291,7 +291,7 @@ gtk_map_list_model_set_property (GObject      *object,
     }
 }
 
-static void 
+static void
 gtk_map_list_model_get_property (GObject     *object,
                                  guint        prop_id,
                                  GValue      *value,
@@ -527,7 +527,7 @@ gtk_map_list_model_set_map_func (GtkMapListModel        *self,
   self->map_func = map_func;
   self->user_data = user_data;
   self->user_destroy = user_destroy;
-  
+
   gtk_map_list_model_init_items (self);
 
   if (self->model)
@@ -579,7 +579,7 @@ gtk_map_list_model_set_model (GtkMapListModel *self,
     }
 
   gtk_map_list_model_init_items (self);
-  
+
   if (removed > 0 || added > 0)
     g_list_model_items_changed (G_LIST_MODEL (self), 0, removed, added);
 

gtk/gtkmediacontrols.c

@@ -62,7 +62,7 @@ enum
   N_PROPS
 };
 
-G_DEFINE_TYPE (GtkMediaControls, gtk_media_controls, GTK_TYPE_WIDGET)
+G_DEFINE_FINAL_TYPE (GtkMediaControls, gtk_media_controls, GTK_TYPE_WIDGET)
 
 static GParamSpec *properties[N_PROPS] = { NULL, };
 
@@ -138,7 +138,7 @@ time_adjustment_changed (GtkAdjustment    *adjustment,
   if (gtk_adjustment_get_value (adjustment) == (double) gtk_media_stream_get_timestamp (controls->stream) / G_USEC_PER_SEC)
     return;
 
-  gtk_media_stream_seek (controls->stream, 
+  gtk_media_stream_seek (controls->stream,
                          gtk_adjustment_get_value (adjustment) * G_USEC_PER_SEC + 0.5);
 }
 

gtk/gtkmultiselection.c

@@ -201,11 +201,11 @@ gtk_multi_selection_selection_model_init (GtkSelectionModelInterface *iface)
   iface->set_selection = gtk_multi_selection_set_selection;
 }
 
-G_DEFINE_TYPE_EXTENDED (GtkMultiSelection, gtk_multi_selection, G_TYPE_OBJECT, 0,
-                        G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL,
-                                               gtk_multi_selection_list_model_init)
-                        G_IMPLEMENT_INTERFACE (GTK_TYPE_SELECTION_MODEL,
-                                               gtk_multi_selection_selection_model_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkMultiSelection, gtk_multi_selection, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL,
+                                                      gtk_multi_selection_list_model_init)
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_SELECTION_MODEL,
+                                                      gtk_multi_selection_selection_model_init))
 
 static void
 gtk_multi_selection_items_changed_cb (GListModel        *model,

gtk/gtkmultisorter.c

@@ -240,9 +240,9 @@ gtk_multi_sorter_buildable_init (GtkBuildableIface *iface)
   iface->add_child = gtk_multi_sorter_buildable_add_child;
 }
 
-G_DEFINE_TYPE_WITH_CODE (GtkMultiSorter, gtk_multi_sorter, GTK_TYPE_SORTER,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_multi_sorter_list_model_init)
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE, gtk_multi_sorter_buildable_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkMultiSorter, gtk_multi_sorter, GTK_TYPE_SORTER,
+                               G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_multi_sorter_list_model_init)
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE, gtk_multi_sorter_buildable_init))
 
 static GtkOrdering
 gtk_multi_sorter_compare (GtkSorter *sorter,

gtk/gtknoselection.c

@@ -113,11 +113,11 @@ gtk_no_selection_selection_model_init (GtkSelectionModelInterface *iface)
   iface->get_selection_in_range = gtk_no_selection_get_selection_in_range;
 }
 
-G_DEFINE_TYPE_EXTENDED (GtkNoSelection, gtk_no_selection, G_TYPE_OBJECT, 0,
-                        G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL,
-                                               gtk_no_selection_list_model_init)
-                        G_IMPLEMENT_INTERFACE (GTK_TYPE_SELECTION_MODEL,
-                                               gtk_no_selection_selection_model_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkNoSelection, gtk_no_selection, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL,
+                                                      gtk_no_selection_list_model_init)
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_SELECTION_MODEL,
+                                                      gtk_no_selection_selection_model_init))
 
 static void
 gtk_no_selection_clear_model (GtkNoSelection *self)
@@ -125,7 +125,7 @@ gtk_no_selection_clear_model (GtkNoSelection *self)
   if (self->model == NULL)
     return;
 
-  g_signal_handlers_disconnect_by_func (self->model, 
+  g_signal_handlers_disconnect_by_func (self->model,
                                         g_list_model_items_changed,
                                         self);
   g_clear_object (&self->model);

gtk/gtknumericsorter.c

@@ -52,7 +52,7 @@ enum {
   NUM_PROPERTIES
 };
 
-G_DEFINE_TYPE (GtkNumericSorter, gtk_numeric_sorter, GTK_TYPE_SORTER)
+G_DEFINE_FINAL_TYPE (GtkNumericSorter, gtk_numeric_sorter, GTK_TYPE_SORTER)
 
 static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
 
@@ -491,7 +491,7 @@ gtk_numeric_sorter_set_property (GObject      *object,
     }
 }
 
-static void 
+static void
 gtk_numeric_sorter_get_property (GObject     *object,
                                 guint        prop_id,
                                 GValue      *value,

gtk/gtkoverlaylayout.c

@@ -72,7 +72,7 @@ enum
 
 static GParamSpec *child_props[N_CHILD_PROPERTIES];
 
-G_DEFINE_TYPE (GtkOverlayLayoutChild, gtk_overlay_layout_child, GTK_TYPE_LAYOUT_CHILD)
+G_DEFINE_FINAL_TYPE (GtkOverlayLayoutChild, gtk_overlay_layout_child, GTK_TYPE_LAYOUT_CHILD)
 
 static void
 gtk_overlay_layout_child_set_property (GObject      *gobject,
@@ -247,7 +247,7 @@ gtk_overlay_layout_child_get_clip_overlay (GtkOverlayLayoutChild *child)
   return child->clip_overlay;
 }
 
-G_DEFINE_TYPE (GtkOverlayLayout, gtk_overlay_layout, GTK_TYPE_LAYOUT_MANAGER)
+G_DEFINE_FINAL_TYPE (GtkOverlayLayout, gtk_overlay_layout, GTK_TYPE_LAYOUT_MANAGER)
 
 static void
 gtk_overlay_layout_measure (GtkLayoutManager *layout_manager,

gtk/gtkpasswordentry.c

@@ -104,7 +104,7 @@ enum {
   PROP_ACTIVATES_DEFAULT,
   PROP_SHOW_PEEK_ICON,
   PROP_EXTRA_MENU,
-  NUM_PROPERTIES 
+  NUM_PROPERTIES
 };
 
 static GParamSpec *props[NUM_PROPERTIES] = { NULL, };
@@ -112,9 +112,9 @@ static GParamSpec *props[NUM_PROPERTIES] = { NULL, };
 static void gtk_password_entry_editable_init (GtkEditableInterface *iface);
 static void gtk_password_entry_accessible_init (GtkAccessibleInterface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (GtkPasswordEntry, gtk_password_entry, GTK_TYPE_WIDGET,
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_ACCESSIBLE, gtk_password_entry_accessible_init)
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE, gtk_password_entry_editable_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkPasswordEntry, gtk_password_entry, GTK_TYPE_WIDGET,
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_ACCESSIBLE, gtk_password_entry_accessible_init)
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE, gtk_password_entry_editable_init))
 
 static void
 caps_lock_state_changed (GdkDevice  *device,

gtk/gtkpasswordentry.h

@@ -29,15 +29,10 @@
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_PASSWORD_ENTRY                 (gtk_password_entry_get_type ())
-#define GTK_PASSWORD_ENTRY(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PASSWORD_ENTRY, GtkPasswordEntry))
-#define GTK_IS_PASSWORD_ENTRY(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PASSWORD_ENTRY))
-
-typedef struct _GtkPasswordEntry       GtkPasswordEntry;
-typedef struct _GtkPasswordEntryClass  GtkPasswordEntryClass;
+#define GTK_TYPE_PASSWORD_ENTRY (gtk_password_entry_get_type ())
 
 GDK_AVAILABLE_IN_ALL
-GType           gtk_password_entry_get_type (void) G_GNUC_CONST;
+G_DECLARE_FINAL_TYPE (GtkPasswordEntry, gtk_password_entry, GTK, PASSWORD_ENTRY, GtkWidget)
 
 GDK_AVAILABLE_IN_ALL
 GtkWidget *     gtk_password_entry_new      (void);

gtk/gtkpasswordentrybuffer.c

@@ -1,4 +1,4 @@
-/* gtkpasswordentrybuffer.c: Entry buffer with secure allocation 
+/* gtkpasswordentrybuffer.c: Entry buffer with secure allocation
  *
    Copyright 2009  Stefan Walter
  * Copyright 2020  GNOME Foundation
@@ -50,7 +50,7 @@ struct _GtkPasswordEntryBuffer
   guint text_chars;
 };
 
-G_DEFINE_TYPE (GtkPasswordEntryBuffer, gtk_password_entry_buffer, GTK_TYPE_ENTRY_BUFFER)
+G_DEFINE_FINAL_TYPE (GtkPasswordEntryBuffer, gtk_password_entry_buffer, GTK_TYPE_ENTRY_BUFFER)
 
 static const char *
 gtk_password_entry_buffer_real_get_text (GtkEntryBuffer *buffer,

gtk/gtkpicture.c

@@ -111,7 +111,7 @@ struct _GtkPictureClass
 
 static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
 
-G_DEFINE_TYPE (GtkPicture, gtk_picture, GTK_TYPE_WIDGET)
+G_DEFINE_FINAL_TYPE (GtkPicture, gtk_picture, GTK_TYPE_WIDGET)
 
 static void
 gtk_picture_snapshot (GtkWidget   *widget,

gtk/gtkselectionfiltermodel.c

@@ -95,8 +95,8 @@ gtk_selection_filter_model_list_model_init (GListModelInterface *iface)
   iface->get_item = gtk_selection_filter_model_get_item;
 }
 
-G_DEFINE_TYPE_WITH_CODE (GtkSelectionFilterModel, gtk_selection_filter_model, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_selection_filter_model_list_model_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkSelectionFilterModel, gtk_selection_filter_model, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_selection_filter_model_list_model_init))
 
 static void
 selection_filter_model_items_changed (GtkSelectionFilterModel *self,

gtk/gtkshortcut.c

@@ -65,7 +65,7 @@ enum
   N_PROPS
 };
 
-G_DEFINE_TYPE (GtkShortcut, gtk_shortcut, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (GtkShortcut, gtk_shortcut, G_TYPE_OBJECT)
 
 static GParamSpec *properties[N_PROPS] = { NULL, };
 
@@ -387,7 +387,7 @@ gtk_shortcut_set_arguments (GtkShortcut *self,
 
   if (self->args == args)
     return;
-  
+
   g_clear_pointer (&self->args, g_variant_unref);
   if (args)
     self->args = g_variant_ref_sink (args);

gtk/gtksingleselection.c

@@ -157,17 +157,17 @@ gtk_single_selection_unselect_item (GtkSelectionModel *model,
 static void
 gtk_single_selection_selection_model_init (GtkSelectionModelInterface *iface)
 {
-  iface->is_selected = gtk_single_selection_is_selected; 
-  iface->get_selection_in_range = gtk_single_selection_get_selection_in_range; 
-  iface->select_item = gtk_single_selection_select_item; 
-  iface->unselect_item = gtk_single_selection_unselect_item; 
+  iface->is_selected = gtk_single_selection_is_selected;
+  iface->get_selection_in_range = gtk_single_selection_get_selection_in_range;
+  iface->select_item = gtk_single_selection_select_item;
+  iface->unselect_item = gtk_single_selection_unselect_item;
 }
 
-G_DEFINE_TYPE_EXTENDED (GtkSingleSelection, gtk_single_selection, G_TYPE_OBJECT, 0,
-                        G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL,
-                                               gtk_single_selection_list_model_init)
-                        G_IMPLEMENT_INTERFACE (GTK_TYPE_SELECTION_MODEL,
-                                               gtk_single_selection_selection_model_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkSingleSelection, gtk_single_selection, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL,
+                                                      gtk_single_selection_list_model_init)
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_SELECTION_MODEL,
+                                                      gtk_single_selection_selection_model_init))
 
 static void
 gtk_single_selection_items_changed_cb (GListModel         *model,
@@ -281,7 +281,7 @@ gtk_single_selection_clear_model (GtkSingleSelection *self)
   if (self->model == NULL)
     return;
 
-  g_signal_handlers_disconnect_by_func (self->model, 
+  g_signal_handlers_disconnect_by_func (self->model,
                                         gtk_single_selection_items_changed_cb,
                                         self);
   g_clear_object (&self->model);
@@ -510,7 +510,7 @@ gtk_single_selection_set_model (GtkSingleSelection *self,
     return;
 
   g_object_freeze_notify (G_OBJECT (self));
-  
+
   n_items_before = self->model ? g_list_model_get_n_items (self->model) : 0;
   gtk_single_selection_clear_model (self);
 
@@ -674,7 +674,7 @@ gtk_single_selection_set_autoselect (GtkSingleSelection *self,
   self->autoselect = autoselect;
 
   g_object_freeze_notify (G_OBJECT (self));
-  
+
   g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_AUTOSELECT]);
 
   if (self->autoselect && !self->selected_item)

gtk/gtkslicelistmodel.c

@@ -73,7 +73,7 @@ gtk_slice_list_model_get_n_items (GListModel *list)
 {
   GtkSliceListModel *self = GTK_SLICE_LIST_MODEL (list);
   guint n_items;
-  
+
   if (self->model == NULL)
     return 0;
 
@@ -110,8 +110,8 @@ gtk_slice_list_model_model_init (GListModelInterface *iface)
   iface->get_item = gtk_slice_list_model_get_item;
 }
 
-G_DEFINE_TYPE_WITH_CODE (GtkSliceListModel, gtk_slice_list_model, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_slice_list_model_model_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkSliceListModel, gtk_slice_list_model, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_slice_list_model_model_init))
 
 static void
 gtk_slice_list_model_items_changed_cb (GListModel        *model,
@@ -193,7 +193,7 @@ gtk_slice_list_model_set_property (GObject      *object,
     }
 }
 
-static void 
+static void
 gtk_slice_list_model_get_property (GObject     *object,
                                    guint        prop_id,
                                    GValue      *value,

gtk/gtksortlistmodel.c

@@ -173,8 +173,8 @@ gtk_sort_list_model_model_init (GListModelInterface *iface)
   iface->get_item = gtk_sort_list_model_get_item;
 }
 
-G_DEFINE_TYPE_WITH_CODE (GtkSortListModel, gtk_sort_list_model, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_sort_list_model_model_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkSortListModel, gtk_sort_list_model, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_sort_list_model_model_init))
 
 static gboolean
 gtk_sort_list_model_is_sorting (GtkSortListModel *self)
@@ -253,7 +253,7 @@ gtk_sort_list_model_sort_step (GtkSortListModel *self,
           start_change = MIN (start_change, (gpointer *) change.base);
           end_change = MAX (end_change, ((gpointer *) change.base) + change.len);
         }
-     
+
       if (g_get_monotonic_time () >= end_time && !finish)
         break;
     }
@@ -419,7 +419,7 @@ gtk_sort_list_model_clear_items (GtkSortListModel *self,
   g_clear_pointer (&self->positions, g_free);
 
   gtk_sort_list_model_clear_keys (self);
-} 
+}
 
 static gboolean
 gtk_sort_list_model_should_sort (GtkSortListModel *self)
@@ -478,7 +478,7 @@ gtk_sort_list_model_update_items (GtkSortListModel *self,
   n_items = self->n_items;
   start = n_items;
   end = n_items;
-  
+
   /* first, move the keys over */
   old_keys = self->keys;
   gtk_sort_list_model_clear_sort_keys (self, position, removed);
@@ -523,7 +523,7 @@ gtk_sort_list_model_update_items (GtkSortListModel *self,
           if (pos >= position + removed)
             pos = pos - removed + added;
           else if (pos >= position)
-            { 
+            {
               start = MIN (start, valid);
               end = n_items - i - 1;
               continue;
@@ -650,7 +650,7 @@ gtk_sort_list_model_set_property (GObject      *object,
     }
 }
 
-static void 
+static void
 gtk_sort_list_model_get_property (GObject     *object,
                                   guint        prop_id,
                                   GValue      *value,
@@ -903,7 +903,7 @@ gtk_sort_list_model_set_model (GtkSortListModel *self,
             gtk_sort_list_model_finish_sorting (self, &ignore1, &ignore2);
         }
     }
-  
+
   if (removed > 0 || self->n_items > 0)
     g_list_model_items_changed (G_LIST_MODEL (self), 0, removed, self->n_items);
 

gtk/gtkstringfilter.c

@@ -64,7 +64,7 @@ enum {
   NUM_PROPERTIES
 };
 
-G_DEFINE_TYPE (GtkStringFilter, gtk_string_filter, GTK_TYPE_FILTER)
+G_DEFINE_FINAL_TYPE (GtkStringFilter, gtk_string_filter, GTK_TYPE_FILTER)
 
 static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
 
@@ -190,7 +190,7 @@ gtk_string_filter_set_property (GObject      *object,
     }
 }
 
-static void 
+static void
 gtk_string_filter_get_property (GObject     *object,
                                 guint        prop_id,
                                 GValue      *value,

gtk/gtkstringlist.c

@@ -83,7 +83,7 @@ enum {
   PROP_NUM_PROPERTIES
 };
 
-G_DEFINE_TYPE (GtkStringObject, gtk_string_object, G_TYPE_OBJECT);
+G_DEFINE_FINAL_TYPE (GtkStringObject, gtk_string_object, G_TYPE_OBJECT)
 
 static void
 gtk_string_object_init (GtkStringObject *object)
@@ -395,11 +395,11 @@ gtk_string_list_buildable_init (GtkBuildableIface *iface)
   iface->custom_finished = gtk_string_list_buildable_custom_finished;
 }
 
-G_DEFINE_TYPE_WITH_CODE (GtkStringList, gtk_string_list, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
-                                                gtk_string_list_buildable_init)
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL,
-                                                gtk_string_list_model_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkStringList, gtk_string_list, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
+                                                      gtk_string_list_buildable_init)
+                               G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL,
+                                                      gtk_string_list_model_init))
 
 static void
 gtk_string_list_dispose (GObject *object)

gtk/gtkstringsorter.c

@@ -54,7 +54,7 @@ enum {
   NUM_PROPERTIES
 };
 
-G_DEFINE_TYPE (GtkStringSorter, gtk_string_sorter, GTK_TYPE_SORTER)
+G_DEFINE_FINAL_TYPE (GtkStringSorter, gtk_string_sorter, GTK_TYPE_SORTER)
 
 static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
 
@@ -238,7 +238,7 @@ gtk_string_sorter_set_property (GObject      *object,
     }
 }
 
-static void 
+static void
 gtk_string_sorter_get_property (GObject     *object,
                                 guint        prop_id,
                                 GValue      *value,

gtk/gtktreeexpander.c

@@ -101,7 +101,7 @@ enum
   N_PROPS
 };
 
-G_DEFINE_TYPE (GtkTreeExpander, gtk_tree_expander, GTK_TYPE_WIDGET)
+G_DEFINE_FINAL_TYPE (GtkTreeExpander, gtk_tree_expander, GTK_TYPE_WIDGET)
 
 static GParamSpec *properties[N_PROPS] = { NULL, };
 

gtk/gtktreelistmodel.c

@@ -165,7 +165,7 @@ tree_node_get_local_position (GtkRbTree *tree,
   TreeNode *left, *parent;
   TreeAugment *left_aug;
   guint n;
-  
+
   left = gtk_rb_tree_node_get_left (node);
   if (left)
     {
@@ -209,7 +209,7 @@ tree_node_get_position (TreeNode *node)
   TreeNode *left, *parent;
   TreeAugment *left_aug;
   guint n;
-  
+
   for (n = 0;
        !node->is_root;
        node = node->parent, n++)
@@ -520,7 +520,7 @@ gtk_tree_list_model_expand_node (GtkTreeListModel *self,
 
   if (node->empty)
     return 0;
-  
+
   if (node->model != NULL)
     return 0;
 
@@ -528,18 +528,18 @@ gtk_tree_list_model_expand_node (GtkTreeListModel *self,
 
   if (model == NULL)
     return 0;
-  
+
   gtk_tree_list_model_init_node (self, node, model);
 
   tree_node_mark_dirty (node);
-  
+
   return tree_node_get_n_children (node);
 }
 
 static guint
 gtk_tree_list_model_collapse_node (GtkTreeListModel *self,
                                    TreeNode         *node)
-{      
+{
   guint n_items;
 
   if (node->model == NULL)
@@ -604,8 +604,8 @@ gtk_tree_list_model_model_init (GListModelInterface *iface)
   iface->get_item = gtk_tree_list_model_get_item;
 }
 
-G_DEFINE_TYPE_WITH_CODE (GtkTreeListModel, gtk_tree_list_model, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_tree_list_model_model_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkTreeListModel, gtk_tree_list_model, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_tree_list_model_model_init))
 
 static void
 gtk_tree_list_model_set_property (GObject      *object,
@@ -631,7 +631,7 @@ gtk_tree_list_model_set_property (GObject      *object,
     }
 }
 
-static void 
+static void
 gtk_tree_list_model_get_property (GObject     *object,
                                   guint        prop_id,
                                   GValue      *value,
@@ -956,7 +956,7 @@ enum {
 
 static GParamSpec *row_properties[NUM_ROW_PROPERTIES] = { NULL, };
 
-G_DEFINE_TYPE (GtkTreeListRow, gtk_tree_list_row, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (GtkTreeListRow, gtk_tree_list_row, G_TYPE_OBJECT)
 
 static void
 gtk_tree_list_row_destroy (GtkTreeListRow *self)
@@ -993,7 +993,7 @@ gtk_tree_list_row_set_property (GObject      *object,
     }
 }
 
-static void 
+static void
 gtk_tree_list_row_get_property (GObject     *object,
                                 guint        prop_id,
                                 GValue      *value,

gtk/gtktreelistrowsorter.c

@@ -60,7 +60,7 @@ enum {
 
 static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
 
-G_DEFINE_TYPE (GtkTreeListRowSorter, gtk_tree_list_row_sorter, GTK_TYPE_SORTER)
+G_DEFINE_FINAL_TYPE (GtkTreeListRowSorter, gtk_tree_list_row_sorter, GTK_TYPE_SORTER)
 
 #define MAX_KEY_DEPTH (8)
 
@@ -155,7 +155,7 @@ gtk_tree_list_row_sort_keys_compare (gconstpointer a,
   resa = unpack (keysa, &keysa, &sizea);
   resb = unpack (keysb, &keysb, &sizeb);
   if (!resa)
-    return resb ? GTK_ORDERING_LARGER : (keysa[2] < keysb[2] ? GTK_ORDERING_SMALLER : 
+    return resb ? GTK_ORDERING_LARGER : (keysa[2] < keysb[2] ? GTK_ORDERING_SMALLER :
                                         (keysb[2] > keysa[2] ? GTK_ORDERING_LARGER : GTK_ORDERING_EQUAL));
   else if (!resb)
     return GTK_ORDERING_SMALLER;
@@ -329,7 +329,7 @@ gtk_tree_list_row_sort_keys_clear_key (GtkSortKeys *keys,
 
   for (i = 0; i < max && key[i] != NULL; i++)
     gtk_tree_list_row_sort_keys_unref_key (self, key[i]);
-  
+
   if (key[0] == NULL)
     g_free (key[1]);
 }

gtk/gtkvideo.c

@@ -81,7 +81,7 @@ enum
   N_PROPS
 };
 
-G_DEFINE_TYPE (GtkVideo, gtk_video, GTK_TYPE_WIDGET)
+G_DEFINE_FINAL_TYPE (GtkVideo, gtk_video, GTK_TYPE_WIDGET)
 
 static GParamSpec *properties[N_PROPS] = { NULL, };
 

gtk/gtkwidgetpaintable.c

@@ -143,9 +143,9 @@ gtk_widget_paintable_paintable_init (GdkPaintableInterface *iface)
   iface->get_intrinsic_height = gtk_widget_paintable_paintable_get_intrinsic_height;
 }
 
-G_DEFINE_TYPE_EXTENDED (GtkWidgetPaintable, gtk_widget_paintable, G_TYPE_OBJECT, 0,
-                        G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                               gtk_widget_paintable_paintable_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkWidgetPaintable, gtk_widget_paintable, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
+                                                      gtk_widget_paintable_paintable_init))
 
 static void
 gtk_widget_paintable_set_property (GObject      *object,
@@ -289,7 +289,7 @@ gtk_widget_paintable_snapshot_widget (GtkWidgetPaintable *self)
 
   if (self->widget->priv->render_node == NULL)
     return gdk_paintable_new_empty (bounds.size.width, bounds.size.height);
-  
+
   return gtk_render_node_paintable_new (self->widget->priv->render_node, &bounds);
 }
 

gtk/gtkwindowcontrols.c

@@ -108,7 +108,7 @@ static GParamSpec *props[LAST_PROP] = { NULL, };
 
 #define WINDOW_ICON_SIZE 16
 
-G_DEFINE_TYPE (GtkWindowControls, gtk_window_controls, GTK_TYPE_WIDGET)
+G_DEFINE_FINAL_TYPE (GtkWindowControls, gtk_window_controls, GTK_TYPE_WIDGET)
 
 static char *
 get_layout (GtkWindowControls *self)

gtk/gtkwindowhandle.c

@@ -74,8 +74,8 @@ static GParamSpec *props[LAST_PROP] = { NULL, };
 
 static void gtk_window_handle_buildable_iface_init (GtkBuildableIface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (GtkWindowHandle, gtk_window_handle, GTK_TYPE_WIDGET,
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE, gtk_window_handle_buildable_iface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (GtkWindowHandle, gtk_window_handle, GTK_TYPE_WIDGET,
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE, gtk_window_handle_buildable_iface_init))
 
 static void
 lower_window (GtkWindowHandle *self)

meson.build

@@ -10,7 +10,7 @@ project('gtk', 'c',
         meson_version : '>= 0.59',
         license: 'LGPL-2.1-or-later')
 
-glib_req           = '>= 2.66.0'
+glib_req           = '>= 2.70.0'
 pango_req          = '>= 1.50.0' # keep this in sync with .gitlab-ci/test-msys.sh
 fribidi_req        = '>= 0.19.7'
 cairo_req          = '>= 1.14.0'