From c34abb677524d7421e2f63a83cb5c07c9b646b8f Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 28 May 2019 19:45:45 -0400
Subject: [PATCH] label: Make final

---
 gtk/gtklabel.c | 26 ++++++++++++++++++++++++++
 gtk/gtklabel.h | 43 +------------------------------------------
 2 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 332eb13838..fe440701e3 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -250,6 +250,32 @@
  * the #GtkLabel::activate-link signal and the gtk_label_get_current_uri() function.
  */
 
+typedef struct _GtkLabelPrivate       GtkLabelPrivate;
+typedef struct _GtkLabelClass         GtkLabelClass;
+typedef struct _GtkLabelSelectionInfo GtkLabelSelectionInfo;
+
+struct _GtkLabel
+{
+  GtkWidget parent_instance;
+};
+
+struct _GtkLabelClass
+{
+  GtkWidgetClass parent_class;
+
+  void (* move_cursor)     (GtkLabel       *label,
+                            GtkMovementStep step,
+                            gint            count,
+                            gboolean        extend_selection);
+  void (* copy_clipboard)  (GtkLabel       *label);
+
+  void (* populate_popup)   (GtkLabel       *label,
+                             GtkMenu        *menu);
+
+  gboolean (*activate_link) (GtkLabel       *label,
+                             const gchar    *uri);
+};
+
 struct _GtkLabelPrivate
 {
   GtkLabelSelectionInfo *select_info;
diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index 834caa1fc4..6ccc389b73 100644
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -37,50 +37,9 @@ G_BEGIN_DECLS
 
 #define GTK_TYPE_LABEL		  (gtk_label_get_type ())
 #define GTK_LABEL(obj)		  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LABEL, GtkLabel))
-#define GTK_LABEL_CLASS(klass)	  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LABEL, GtkLabelClass))
 #define GTK_IS_LABEL(obj)	  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LABEL))
-#define GTK_IS_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LABEL))
-#define GTK_LABEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LABEL, GtkLabelClass))
 
-
-typedef struct _GtkLabel              GtkLabel;
-typedef struct _GtkLabelPrivate       GtkLabelPrivate;
-typedef struct _GtkLabelClass         GtkLabelClass;
-
-typedef struct _GtkLabelSelectionInfo GtkLabelSelectionInfo;
-
-struct _GtkLabel
-{
-  GtkWidget parent_instance;
-};
-
-struct _GtkLabelClass
-{
-  GtkWidgetClass parent_class;
-
-  void (* move_cursor)     (GtkLabel       *label,
-			    GtkMovementStep step,
-			    gint            count,
-			    gboolean        extend_selection);
-  void (* copy_clipboard)  (GtkLabel       *label);
-
-  /* Hook to customize right-click popup for selectable labels */
-  void (* populate_popup)   (GtkLabel       *label,
-                             GtkMenu        *menu);
-
-  gboolean (*activate_link) (GtkLabel       *label,
-                             const gchar    *uri);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-  void (*_gtk_reserved8) (void);
-};
+typedef struct _GtkLabel GtkLabel;
 
 GDK_AVAILABLE_IN_ALL
 GType                 gtk_label_get_type          (void) G_GNUC_CONST;