Remove deprecated class_add_private

11 files changed, 42 insertions, 66 deletions

diff --git a/configure.ac b/configure.ac
index 8983c30..1e08456 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AX_COMPILER_FLAGS([WARN_CFLAGS])
 LT_PREREQ([2.2])
 LT_INIT([win32-dll])
 
-PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.34 \
+PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.38 \
                             libxml-2.0)
 
 # glib-genmarshal
diff --git a/libgupnp-av/gupnp-didl-lite-contributor.c b/libgupnp-av/gupnp-didl-lite-contributor.c
index 9f02638..2d182eb 100644
--- a/libgupnp-av/gupnp-didl-lite-contributor.c
+++ b/libgupnp-av/gupnp-didl-lite-contributor.c
@@ -32,15 +32,15 @@
 #include "gupnp-didl-lite-contributor-private.h"
 #include "xml-util.h"
 
-G_DEFINE_TYPE (GUPnPDIDLLiteContributor,
-               gupnp_didl_lite_contributor,
-               G_TYPE_OBJECT);
-
 struct _GUPnPDIDLLiteContributorPrivate {
         xmlNode     *xml_node;
         GUPnPAVXMLDoc *xml_doc;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (GUPnPDIDLLiteContributor,
+                            gupnp_didl_lite_contributor,
+                            G_TYPE_OBJECT);
+
 enum {
         PROP_0,
         PROP_XML_NODE,
@@ -151,9 +151,6 @@ gupnp_didl_lite_contributor_class_init (GUPnPDIDLLiteContributorClass *klass)
         object_class->set_property = gupnp_didl_lite_contributor_set_property;
         object_class->dispose = gupnp_didl_lite_contributor_dispose;
 
-        g_type_class_add_private (klass,
-                                  sizeof (GUPnPDIDLLiteContributorPrivate));
-
         /**
          * GUPnPDIDLLiteContributor:xml-node:
          *
diff --git a/libgupnp-av/gupnp-didl-lite-createclass.c b/libgupnp-av/gupnp-didl-lite-createclass.c
index c9212f1..b5eaf21 100644
--- a/libgupnp-av/gupnp-didl-lite-createclass.c
+++ b/libgupnp-av/gupnp-didl-lite-createclass.c
@@ -35,15 +35,15 @@
 #include "gupnp-didl-lite-createclass-private.h"
 #include "xml-util.h"
 
-G_DEFINE_TYPE (GUPnPDIDLLiteCreateClass,
-               gupnp_didl_lite_create_class,
-               G_TYPE_OBJECT);
-
 struct _GUPnPDIDLLiteCreateClassPrivate {
         xmlNode     *xml_node;
         GUPnPAVXMLDoc *xml_doc;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (GUPnPDIDLLiteCreateClass,
+                            gupnp_didl_lite_create_class,
+                            G_TYPE_OBJECT);
+
 enum {
         PROP_0,
         PROP_XML_NODE,
@@ -167,9 +167,6 @@ gupnp_didl_lite_create_class_class_init (GUPnPDIDLLiteCreateClassClass *klass)
         object_class->set_property = gupnp_didl_lite_create_class_set_property;
         object_class->dispose = gupnp_didl_lite_create_class_dispose;
 
-        g_type_class_add_private (klass,
-                                  sizeof (GUPnPDIDLLiteCreateClassPrivate));
-
         /**
          * GUPnPDIDLLiteCreateClass:xml-node:
          *
diff --git a/libgupnp-av/gupnp-didl-lite-descriptor.c b/libgupnp-av/gupnp-didl-lite-descriptor.c
index cc9ac06..400ac71 100644
--- a/libgupnp-av/gupnp-didl-lite-descriptor.c
+++ b/libgupnp-av/gupnp-didl-lite-descriptor.c
@@ -33,15 +33,15 @@
 #include "gupnp-didl-lite-descriptor-private.h"
 #include "xml-util.h"
 
-G_DEFINE_TYPE (GUPnPDIDLLiteDescriptor,
-               gupnp_didl_lite_descriptor,
-               G_TYPE_OBJECT);
-
 struct _GUPnPDIDLLiteDescriptorPrivate {
         xmlNode       *xml_node;
         GUPnPAVXMLDoc *xml_doc;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (GUPnPDIDLLiteDescriptor,
+                            gupnp_didl_lite_descriptor,
+                            G_TYPE_OBJECT);
+
 enum {
         PROP_0,
         PROP_XML_NODE,
@@ -174,9 +174,6 @@ gupnp_didl_lite_descriptor_class_init (GUPnPDIDLLiteDescriptorClass *klass)
         object_class->get_property = gupnp_didl_lite_descriptor_get_property;
         object_class->dispose = gupnp_didl_lite_descriptor_dispose;
 
-        g_type_class_add_private (klass,
-                                  sizeof (GUPnPDIDLLiteDescriptorPrivate));
-
         /**
          * GUPnPDIDLLiteDescriptor:xml-node:
          *
diff --git a/libgupnp-av/gupnp-didl-lite-object.c b/libgupnp-av/gupnp-didl-lite-object.c
index ac625b9..b85cf52 100644
--- a/libgupnp-av/gupnp-didl-lite-object.c
+++ b/libgupnp-av/gupnp-didl-lite-object.c
@@ -42,10 +42,6 @@
 #include "fragment-util.h"
 #include "xsd-data.h"
 
-G_DEFINE_ABSTRACT_TYPE (GUPnPDIDLLiteObject,
-                        gupnp_didl_lite_object,
-                        G_TYPE_OBJECT);
-
 struct _GUPnPDIDLLiteObjectPrivate {
         xmlNode       *xml_node;
         GUPnPAVXMLDoc *xml_doc;
@@ -56,6 +52,10 @@ struct _GUPnPDIDLLiteObjectPrivate {
         xmlNs *pv_ns;
 };
 
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GUPnPDIDLLiteObject,
+                                     gupnp_didl_lite_object,
+                                     G_TYPE_OBJECT);
+
 static XSDData *didl_lite_xsd;
 
 enum {
@@ -383,8 +383,6 @@ gupnp_didl_lite_object_class_init (GUPnPDIDLLiteObjectClass *klass)
         object_class->get_property = gupnp_didl_lite_object_get_property;
         object_class->dispose = gupnp_didl_lite_object_dispose;
 
-        g_type_class_add_private (klass, sizeof (GUPnPDIDLLiteObjectPrivate));
-
         /**
          * GUPnPDIDLLiteObject:xml-node:
          *
diff --git a/libgupnp-av/gupnp-didl-lite-resource.c b/libgupnp-av/gupnp-didl-lite-resource.c
index 8bfe436..61f6153 100644
--- a/libgupnp-av/gupnp-didl-lite-resource.c
+++ b/libgupnp-av/gupnp-didl-lite-resource.c
@@ -39,10 +39,6 @@
 #include "time-utils.h"
 #include "xsd-data.h"
 
-G_DEFINE_TYPE (GUPnPDIDLLiteResource,
-               gupnp_didl_lite_resource,
-               G_TYPE_OBJECT);
-
 struct _GUPnPDIDLLiteResourcePrivate {
         xmlNode     *xml_node;
         GUPnPAVXMLDoc *xml_doc;
@@ -52,6 +48,10 @@ struct _GUPnPDIDLLiteResourcePrivate {
         GUPnPProtocolInfo *protocol_info;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (GUPnPDIDLLiteResource,
+                            gupnp_didl_lite_resource,
+                            G_TYPE_OBJECT);
+
 enum {
         PROP_0,
         PROP_XML_NODE,
@@ -409,8 +409,6 @@ gupnp_didl_lite_resource_class_init (GUPnPDIDLLiteResourceClass *klass)
         object_class->get_property = gupnp_didl_lite_resource_get_property;
         object_class->dispose = gupnp_didl_lite_resource_dispose;
 
-        g_type_class_add_private (klass, sizeof (GUPnPDIDLLiteResourcePrivate));
-
         /**
          * GUPnPDIDLLiteResource:xml-node:
          *
diff --git a/libgupnp-av/gupnp-didl-lite-writer.c b/libgupnp-av/gupnp-didl-lite-writer.c
index 5b99c18..0051dea 100644
--- a/libgupnp-av/gupnp-didl-lite-writer.c
+++ b/libgupnp-av/gupnp-didl-lite-writer.c
@@ -38,10 +38,6 @@
 
 #include "xml-util.h"
 
-G_DEFINE_TYPE (GUPnPDIDLLiteWriter,
-               gupnp_didl_lite_writer,
-               G_TYPE_OBJECT);
-
 struct _GUPnPDIDLLiteWriterPrivate {
         xmlNode       *xml_node;
         GUPnPAVXMLDoc *xml_doc;
@@ -54,6 +50,10 @@ struct _GUPnPDIDLLiteWriterPrivate {
         char        *language;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (GUPnPDIDLLiteWriter,
+                            gupnp_didl_lite_writer,
+                            G_TYPE_OBJECT);
+
 enum {
         PROP_0,
         PROP_XML_NODE,
@@ -425,8 +425,6 @@ gupnp_didl_lite_writer_class_init (GUPnPDIDLLiteWriterClass *klass)
         object_class->dispose = gupnp_didl_lite_writer_dispose;
         object_class->finalize = gupnp_didl_lite_writer_finalize;
 
-        g_type_class_add_private (klass, sizeof (GUPnPDIDLLiteWriterPrivate));
-
         /**
          * GUPnPDIDLLiteWriter:xml-node:
          *
diff --git a/libgupnp-av/gupnp-feature.c b/libgupnp-av/gupnp-feature.c
index 872857d..b4fd98b 100644
--- a/libgupnp-av/gupnp-feature.c
+++ b/libgupnp-av/gupnp-feature.c
@@ -28,16 +28,16 @@
 
 #include "gupnp-feature.h"
 
-G_DEFINE_TYPE (GUPnPFeature,
-               gupnp_feature,
-               G_TYPE_OBJECT);
-
 struct _GUPnPFeaturePrivate {
         char *name;
         char *version;
         char *object_ids;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (GUPnPFeature,
+                            gupnp_feature,
+                            G_TYPE_OBJECT);
+
 enum {
         PROP_0,
         PROP_NAME,
@@ -132,8 +132,6 @@ gupnp_feature_class_init (GUPnPFeatureClass *klass)
         object_class->set_property = gupnp_feature_set_property;
         object_class->finalize = gupnp_feature_finalize;
 
-        g_type_class_add_private (klass, sizeof (GUPnPFeaturePrivate));
-
         /**
          * GUPnPFeature:name:
          *
diff --git a/libgupnp-av/gupnp-media-collection.c b/libgupnp-av/gupnp-media-collection.c
index 0b4427e..e7827ae 100644
--- a/libgupnp-av/gupnp-media-collection.c
+++ b/libgupnp-av/gupnp-media-collection.c
@@ -36,10 +36,6 @@
 #define DIDL_S_FILTER "dc:title,dc:creator,upnp:class,upnp:album,res,item," \
                       "container,dlna:lifetime"
 
-G_DEFINE_TYPE (GUPnPMediaCollection,
-               gupnp_media_collection,
-               G_TYPE_OBJECT);
-
 struct _GUPnPMediaCollectionPrivate {
         GUPnPDIDLLiteWriter *writer;
         GUPnPDIDLLiteObject *container;
@@ -48,6 +44,10 @@ struct _GUPnPMediaCollectionPrivate {
         char                *data;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (GUPnPMediaCollection,
+                            gupnp_media_collection,
+                            G_TYPE_OBJECT);
+
 enum {
         PROP_0,
         PROP_AUTHOR,
@@ -284,8 +284,6 @@ gupnp_media_collection_class_init (GUPnPMediaCollectionClass *klass)
         object_class->constructed = gupnp_media_collection_constructed;
         object_class->dispose = gupnp_media_collection_dispose;
 
-        g_type_class_add_private (klass, sizeof (GUPnPMediaCollectionPrivate));
-
         /**
          * GUPnPMediaCollection:author:
          *
diff --git a/libgupnp-av/gupnp-protocol-info.c b/libgupnp-av/gupnp-protocol-info.c
index d89423e..0ddf672 100644
--- a/libgupnp-av/gupnp-protocol-info.c
+++ b/libgupnp-av/gupnp-protocol-info.c
@@ -35,10 +35,6 @@
 #include "gupnp-protocol-info.h"
 #include "gupnp-av-error.h"
 
-G_DEFINE_TYPE (GUPnPProtocolInfo,
-               gupnp_protocol_info,
-               G_TYPE_OBJECT);
-
 struct _GUPnPProtocolInfoPrivate {
         char  *protocol;
         char  *network;
@@ -51,6 +47,10 @@ struct _GUPnPProtocolInfoPrivate {
         GUPnPDLNAFlags      dlna_flags;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (GUPnPProtocolInfo,
+                            gupnp_protocol_info,
+                            G_TYPE_OBJECT);
+
 enum {
         PROP_0,
         PROP_PROTOCOL,
@@ -450,8 +450,6 @@ gupnp_protocol_info_class_init (GUPnPProtocolInfoClass *klass)
         object_class->get_property = gupnp_protocol_info_get_property;
         object_class->finalize = gupnp_protocol_info_finalize;
 
-        g_type_class_add_private (klass, sizeof (GUPnPProtocolInfoPrivate));
-
         /**
          * GUPnPProtocolInfo:protocol:
          *
diff --git a/libgupnp-av/gupnp-search-criteria-parser.c b/libgupnp-av/gupnp-search-criteria-parser.c
index 46635b5..38d0286 100644
--- a/libgupnp-av/gupnp-search-criteria-parser.c
+++ b/libgupnp-av/gupnp-search-criteria-parser.c
@@ -94,15 +94,15 @@ gupnp_search_criteria_parser_error_quark (void)
                 ("gupnp-search-criteria-parser-error-quark");
 }
 
-/* GUPnPSearchCriteriaParser */
-G_DEFINE_TYPE (GUPnPSearchCriteriaParser,
-               gupnp_search_criteria_parser,
-               G_TYPE_OBJECT);
-
 struct _GUPnPSearchCriteriaParserPrivate {
         GScanner *scanner;
 };
 
+/* GUPnPSearchCriteriaParser */
+G_DEFINE_TYPE_WITH_PRIVATE (GUPnPSearchCriteriaParser,
+                         gupnp_search_criteria_parser,
+                         G_TYPE_OBJECT);
+
 enum {
         BEGIN_PARENS,
         END_PARENS,
@@ -329,9 +329,6 @@ gupnp_search_criteria_parser_class_init
                               GUPNP_TYPE_SEARCH_CRITERIA_OP,
                               G_TYPE_STRING,
                               G_TYPE_POINTER);
-
-        g_type_class_add_private (klass,
-                                  sizeof (GUPnPSearchCriteriaParserPrivate));
 }
 
 /**