1 files changed, 18 insertions, 36 deletions

diff --git a/libgupnp-dlna/gupnp-dlna-image-information.h b/libgupnp-dlna/gupnp-dlna-image-information.h
index 56b39c3..4608dc8 100644
--- a/libgupnp-dlna/gupnp-dlna-image-information.h
+++ b/libgupnp-dlna/gupnp-dlna-image-information.h
@@ -27,40 +27,25 @@
 
 G_BEGIN_DECLS
 
-#define GUPNP_TYPE_DLNA_IMAGE_INFORMATION \
-        (gupnp_dlna_image_information_get_type())
-
-#define GUPNP_DLNA_IMAGE_INFORMATION(obj) \
-        (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-                                     GUPNP_TYPE_DLNA_IMAGE_INFORMATION, \
-                                     GUPnPDLNAImageInformation))
-
-#define GUPNP_DLNA_IMAGE_INFORMATION_CLASS(klass) \
-        (G_TYPE_CHECK_CLASS_CAST ((klass), \
-                                  GUPNP_TYPE_DLNA_IMAGE_INFORMATION, \
-                                  GUPnPDLNAImageInformationClass))
-
-#define GUPNP_IS_DLNA_IMAGE_INFORMATION(obj) \
-        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-                                     GUPNP_TYPE_DLNA_IMAGE_INFORMATION))
-
-#define GUPNP_IS_DLNA_IMAGE_INFORMATION_CLASS(klass) \
-        (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                                  GUPNP_TYPE_DLNA_IMAGE_INFORMATION))
-
-#define GUPNP_DLNA_IMAGE_INFORMATION_GET_CLASS(obj) \
-        (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-                                    GUPNP_TYPE_DLNA_IMAGE_INFORMATION, \
-                                    GUPnPDLNAImageInformationClass))
+G_DECLARE_DERIVABLE_TYPE(GUPnPDLNAImageInformation,
+                          gupnp_dlna_image_information,
+                          GUPNP_DLNA,
+                          IMAGE_INFORMATION,
+                          GObject)
 
-typedef struct _GUPnPDLNAImageInformationPrivate
-                GUPnPDLNAImageInformationPrivate;
 
-typedef struct {
-        GObject parent;
+#define GUPNP_TYPE_DLNA_IMAGE_INFORMATION \
+        (gupnp_dlna_image_information_get_type())
 
-        GUPnPDLNAImageInformationPrivate *priv;
-} GUPnPDLNAImageInformation;
+// Backwards-compatible defines
+/**
+ * GUPNP_IS_DLNA_IMAGE_INFORMATION: (skip)
+ */
+#define GUPNP_IS_DLNA_IMAGE_INFORMATION GUPNP_DLNA_IS_IMAGE_INFORMATION
+/**
+ * GUPNP_IS_DLNA_IMAGE_INFORMATION_CLASS: (skip)
+ */
+#define GUPNP_IS_DLNA_IMAGE_INFORMATION_CLASS GUPNP_DLNA_IS_IMAGE_INFORMATION_CLASS
 
 /**
  * GUPnPDLNAImageInformationClass:
@@ -75,7 +60,7 @@ typedef struct {
  * type.
  * @_reserved: Padding. Ignore it.
  */
-typedef struct {
+struct _GUPnPDLNAImageInformationClass {
         GObjectClass parent_class;
 
         GUPnPDLNAIntValue
@@ -91,10 +76,7 @@ typedef struct {
         (* get_mime) (GUPnPDLNAImageInformation *info);
 
         gpointer _reserved[12];
-} GUPnPDLNAImageInformationClass;
-
-GType
-gupnp_dlna_image_information_get_type (void);
+};
 
 GUPnPDLNAIntValue
 gupnp_dlna_image_information_get_depth (GUPnPDLNAImageInformation *info);