[balsa/wip/gtk4: 308/351] balsa-print-object-image: Declare it final

[Peter Bloomfield <peterb src gnome org>]

commit 36b265c324d5b0f2b259b11620155d1214215cea
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sun Apr 29 11:50:28 2018 -0400

    balsa-print-object-image: Declare it final
    
    and take the object private; no getters or setters needed.

 src/balsa-print-object-image.c |   49 +++++++++------------------------------
 src/balsa-print-object-image.h |   32 +++++---------------------
 2 files changed, 18 insertions(+), 63 deletions(-)
---
diff --git a/src/balsa-print-object-image.c b/src/balsa-print-object-image.c
index d7c3da9..6b18438 100644
--- a/src/balsa-print-object-image.c
+++ b/src/balsa-print-object-image.c
@@ -26,9 +26,6 @@
 #include <gtk/gtk.h>
 
 /* object related functions */
-static void balsa_print_object_image_class_init(BalsaPrintObjectImageClass *klass);
-static void balsa_print_object_image_init(GTypeInstance *instance,
-                                          gpointer       g_class);
 static void balsa_print_object_image_dispose(GObject *self);
 
 static void balsa_print_object_image_draw(BalsaPrintObject *self,
@@ -36,53 +33,31 @@ static void balsa_print_object_image_draw(BalsaPrintObject *self,
                                           cairo_t          *cairo_ctx);
 
 
-static BalsaPrintObjectClass *parent_class = NULL;
+struct _BalsaPrintObjectImage {
+    BalsaPrintObject parent;
 
+    GdkPixbuf *pixbuf;
+    gdouble c_img_offs;
+    gdouble scale;
+};
 
-GType
-balsa_print_object_image_get_type()
-{
-    static GType balsa_print_object_image_type = 0;
-
-    if (!balsa_print_object_image_type) {
-        static const GTypeInfo balsa_print_object_image_info = {
-            sizeof(BalsaPrintObjectImageClass),
-            NULL,               /* base_init */
-            NULL,               /* base_finalize */
-            (GClassInitFunc) balsa_print_object_image_class_init,
-            NULL,               /* class_finalize */
-            NULL,               /* class_data */
-            sizeof(BalsaPrintObjectImage),
-            0,                  /* n_preallocs */
-            (GInstanceInitFunc) balsa_print_object_image_init
-        };
-
-        balsa_print_object_image_type =
-            g_type_register_static(BALSA_TYPE_PRINT_OBJECT,
-                                   "BalsaPrintObjectImage",
-                                   &balsa_print_object_image_info, 0);
-    }
 
-    return balsa_print_object_image_type;
-}
+G_DEFINE_TYPE(BalsaPrintObjectImage,
+              balsa_print_object_image,
+              BALSA_TYPE_PRINT_OBJECT)
 
 
 static void
 balsa_print_object_image_class_init(BalsaPrintObjectImageClass *klass)
 {
-    parent_class                          = g_type_class_ref(BALSA_TYPE_PRINT_OBJECT);
-    BALSA_PRINT_OBJECT_CLASS(klass)->draw =
-        balsa_print_object_image_draw;
+    BALSA_PRINT_OBJECT_CLASS(klass)->draw = balsa_print_object_image_draw;
     G_OBJECT_CLASS(klass)->dispose = balsa_print_object_image_dispose;
 }
 
 
 static void
-balsa_print_object_image_init(GTypeInstance *instance,
-                              gpointer       g_class)
+balsa_print_object_image_init(BalsaPrintObjectImage *poi)
 {
-    BalsaPrintObjectImage *poi = BALSA_PRINT_OBJECT_IMAGE(instance);
-
     poi->pixbuf = NULL;
     poi->scale  = 1.0;
 }
@@ -95,7 +70,7 @@ balsa_print_object_image_dispose(GObject *self)
 
     g_clear_object(&poi->pixbuf);
 
-    G_OBJECT_CLASS(parent_class)->dispose(self);
+    G_OBJECT_CLASS(balsa_print_object_image_parent_class)->dispose(self);
 }
 
 
diff --git a/src/balsa-print-object-image.h b/src/balsa-print-object-image.h
index 04baae4..cc15ee0 100644
--- a/src/balsa-print-object-image.h
+++ b/src/balsa-print-object-image.h
@@ -24,35 +24,15 @@
 
 G_BEGIN_DECLS
 
-#define BALSA_TYPE_PRINT_OBJECT_IMAGE   \
-    (balsa_print_object_image_get_type())
-#define BALSA_PRINT_OBJECT_IMAGE(obj)                           \
-    G_TYPE_CHECK_INSTANCE_CAST(obj, BALSA_TYPE_PRINT_OBJECT_IMAGE, BalsaPrintObjectImage)
-#define BALSA_PRINT_OBJECT_IMAGE_CLASS(klass)                   \
-    G_TYPE_CHECK_CLASS_CAST(klass, BALSA_TYPE_PRINT_OBJECT_IMAGE, BalsaPrintObjectImageClass)
-#define BALSA_IS_PRINT_OBJECT_IMAGE(obj)                        \
-    G_TYPE_CHECK_INSTANCE_TYPE(obj, BALSA_TYPE_PRINT_OBJECT_IMAGE)
+#define BALSA_TYPE_PRINT_OBJECT_IMAGE balsa_print_object_image_get_type()
 
+G_DECLARE_FINAL_TYPE(BalsaPrintObjectImage,
+                     balsa_print_object_image,
+                     BALSA,
+                     PRINT_OBJECT_IMAGE,
+                     BalsaPrintObject)
 
-typedef struct _BalsaPrintObjectImageClass BalsaPrintObjectImageClass;
-typedef struct _BalsaPrintObjectImage BalsaPrintObjectImage;
 
-
-struct _BalsaPrintObjectImage {
-    BalsaPrintObject parent;
-
-    GdkPixbuf *pixbuf;
-    gdouble c_img_offs;
-    gdouble scale;
-};
-
-
-struct _BalsaPrintObjectImageClass {
-    BalsaPrintObjectClass parent;
-};
-
-
-GType  balsa_print_object_image_get_type(void);
 GList *balsa_print_object_image(GList               *list,
                                 GtkPrintContext     *context,
                                 LibBalsaMessageBody *body,