all: Drop deprecated macro calls

10 files changed, 16 insertions, 38 deletions

diff --git a/libgupnp-av/gupnp-didl-lite-contributor.c b/libgupnp-av/gupnp-didl-lite-contributor.c
index 2d182eb..3e0ddbe 100644
--- a/libgupnp-av/gupnp-didl-lite-contributor.c
+++ b/libgupnp-av/gupnp-didl-lite-contributor.c
@@ -52,10 +52,8 @@ enum {
 static void
 gupnp_didl_lite_contributor_init (GUPnPDIDLLiteContributor *contributor)
 {
-        contributor->priv = G_TYPE_INSTANCE_GET_PRIVATE
-                                        (contributor,
-                                         GUPNP_TYPE_DIDL_LITE_CONTRIBUTOR,
-                                         GUPnPDIDLLiteContributorPrivate);
+        contributor->priv =
+                gupnp_didl_lite_contributor_get_instance_private (contributor);
 }
 
 static void
diff --git a/libgupnp-av/gupnp-didl-lite-createclass.c b/libgupnp-av/gupnp-didl-lite-createclass.c
index b5eaf21..f0e86a9 100644
--- a/libgupnp-av/gupnp-didl-lite-createclass.c
+++ b/libgupnp-av/gupnp-didl-lite-createclass.c
@@ -56,10 +56,8 @@ enum {
 static void
 gupnp_didl_lite_create_class_init (GUPnPDIDLLiteCreateClass *create_class)
 {
-        create_class->priv = G_TYPE_INSTANCE_GET_PRIVATE
-                                        (create_class,
-                                         GUPNP_TYPE_DIDL_LITE_CREATE_CLASS,
-                                         GUPnPDIDLLiteCreateClassPrivate);
+        create_class->priv = gupnp_didl_lite_create_class_get_instance_private (
+                create_class);
 }
 
 static void
diff --git a/libgupnp-av/gupnp-didl-lite-descriptor.c b/libgupnp-av/gupnp-didl-lite-descriptor.c
index 400ac71..ab68ec0 100644
--- a/libgupnp-av/gupnp-didl-lite-descriptor.c
+++ b/libgupnp-av/gupnp-didl-lite-descriptor.c
@@ -56,10 +56,8 @@ enum {
 static void
 gupnp_didl_lite_descriptor_init (GUPnPDIDLLiteDescriptor *descriptor)
 {
-        descriptor->priv = G_TYPE_INSTANCE_GET_PRIVATE
-                                        (descriptor,
-                                         GUPNP_TYPE_DIDL_LITE_DESCRIPTOR,
-                                         GUPnPDIDLLiteDescriptorPrivate);
+        descriptor->priv =
+                gupnp_didl_lite_descriptor_get_instance_private (descriptor);
 }
 
 static void
diff --git a/libgupnp-av/gupnp-didl-lite-object.c b/libgupnp-av/gupnp-didl-lite-object.c
index 782d0e2..b8de85a 100644
--- a/libgupnp-av/gupnp-didl-lite-object.c
+++ b/libgupnp-av/gupnp-didl-lite-object.c
@@ -101,10 +101,7 @@ is_non_transcoded_resource (GUPnPDIDLLiteResource *resource, gpointer data)
 static void
 gupnp_didl_lite_object_init (GUPnPDIDLLiteObject *object)
 {
-        object->priv = G_TYPE_INSTANCE_GET_PRIVATE
-                                        (object,
-                                         GUPNP_TYPE_DIDL_LITE_OBJECT,
-                                         GUPnPDIDLLiteObjectPrivate);
+        object->priv = gupnp_didl_lite_object_get_instance_private (object);
 }
 
 static void
diff --git a/libgupnp-av/gupnp-didl-lite-resource.c b/libgupnp-av/gupnp-didl-lite-resource.c
index 61f6153..a977ebd 100644
--- a/libgupnp-av/gupnp-didl-lite-resource.c
+++ b/libgupnp-av/gupnp-didl-lite-resource.c
@@ -128,10 +128,8 @@ on_protocol_info_changed (GUPnPProtocolInfo        *info,
 static void
 gupnp_didl_lite_resource_init (GUPnPDIDLLiteResource *resource)
 {
-        resource->priv = G_TYPE_INSTANCE_GET_PRIVATE
-                                        (resource,
-                                         GUPNP_TYPE_DIDL_LITE_RESOURCE,
-                                         GUPnPDIDLLiteResourcePrivate);
+        resource->priv =
+                gupnp_didl_lite_resource_get_instance_private (resource);
 }
 
 static void
diff --git a/libgupnp-av/gupnp-didl-lite-writer.c b/libgupnp-av/gupnp-didl-lite-writer.c
index e17b253..6eaf416 100644
--- a/libgupnp-av/gupnp-didl-lite-writer.c
+++ b/libgupnp-av/gupnp-didl-lite-writer.c
@@ -302,9 +302,7 @@ apply_filter (GUPnPDIDLLiteWriter *writer,
 static void
 gupnp_didl_lite_writer_init (GUPnPDIDLLiteWriter *writer)
 {
-        writer->priv = G_TYPE_INSTANCE_GET_PRIVATE (writer,
-                                                    GUPNP_TYPE_DIDL_LITE_WRITER,
-                                                    GUPnPDIDLLiteWriterPrivate);
+        writer->priv = gupnp_didl_lite_writer_get_instance_private (writer);
 }
 
 static void
diff --git a/libgupnp-av/gupnp-feature.c b/libgupnp-av/gupnp-feature.c
index b4fd98b..580bf29 100644
--- a/libgupnp-av/gupnp-feature.c
+++ b/libgupnp-av/gupnp-feature.c
@@ -48,9 +48,7 @@ enum {
 static void
 gupnp_feature_init (GUPnPFeature *object)
 {
-        object->priv = G_TYPE_INSTANCE_GET_PRIVATE (object,
-                                                    GUPNP_TYPE_FEATURE,
-                                                    GUPnPFeaturePrivate);
+        object->priv = gupnp_feature_get_instance_private (object);
 }
 
 static void
diff --git a/libgupnp-av/gupnp-media-collection.c b/libgupnp-av/gupnp-media-collection.c
index e7827ae..11d30b3 100644
--- a/libgupnp-av/gupnp-media-collection.c
+++ b/libgupnp-av/gupnp-media-collection.c
@@ -141,10 +141,8 @@ parse_data (GUPnPMediaCollection *collection, const char *data)
 static void
 gupnp_media_collection_init (GUPnPMediaCollection *collection)
 {
-        collection->priv = G_TYPE_INSTANCE_GET_PRIVATE
-                                        (collection,
-                                         GUPNP_TYPE_MEDIA_COLLECTION,
-                                         GUPnPMediaCollectionPrivate);
+        collection->priv =
+                gupnp_media_collection_get_instance_private (collection);
         /* Initialize as mutable and decide later on in constructed() if we
          * really are. */
         collection->priv->mutable = TRUE;
diff --git a/libgupnp-av/gupnp-protocol-info.c b/libgupnp-av/gupnp-protocol-info.c
index 0ddf672..2c3c5db 100644
--- a/libgupnp-av/gupnp-protocol-info.c
+++ b/libgupnp-av/gupnp-protocol-info.c
@@ -300,10 +300,7 @@ add_dlna_info (GString           *str,
 static void
 gupnp_protocol_info_init (GUPnPProtocolInfo *info)
 {
-        info->priv = G_TYPE_INSTANCE_GET_PRIVATE
-                                        (info,
-                                         GUPNP_TYPE_PROTOCOL_INFO,
-                                         GUPnPProtocolInfoPrivate);
+        info->priv = gupnp_protocol_info_get_instance_private (info);
 
         info->priv->dlna_conversion = GUPNP_DLNA_CONVERSION_NONE;
         info->priv->dlna_operation  = GUPNP_DLNA_OPERATION_NONE;
diff --git a/libgupnp-av/gupnp-search-criteria-parser.c b/libgupnp-av/gupnp-search-criteria-parser.c
index 38d0286..1fcac5b 100644
--- a/libgupnp-av/gupnp-search-criteria-parser.c
+++ b/libgupnp-av/gupnp-search-criteria-parser.c
@@ -171,10 +171,8 @@ gupnp_search_criteria_parser_init (GUPnPSearchCriteriaParser *parser)
 {
         int i;
 
-        parser->priv = G_TYPE_INSTANCE_GET_PRIVATE
-                         (parser,
-                          GUPNP_TYPE_SEARCH_CRITERIA_PARSER,
-                          GUPnPSearchCriteriaParserPrivate);
+        parser->priv =
+                gupnp_search_criteria_parser_get_instance_private (parser);
 
         /* Set up GScanner */
         parser->priv->scanner = g_scanner_new (NULL);