GNOME.org
 

[libdmapsharing] Use G_DEFINE_INTERFACE

commit 3c53a0fc0d5ca8b8648dc9df5b9f995e9158f7f0
Author: W. Michael Petullo <mike flyn org>
Date:   Sun Nov 12 18:31:08 2017 -0500

    Use G_DEFINE_INTERFACE
    
    Signed-off-by: W. Michael Petullo <mike flyn org>

 libdmapsharing/daap-record.c              |   32 +--------------------------
 libdmapsharing/daap-record.h              |    6 ++--
 libdmapsharing/dacp-player.c              |   27 +----------------------
 libdmapsharing/dacp-player.h              |    6 ++--
 libdmapsharing/dmap-container-db.c        |   33 +---------------------------
 libdmapsharing/dmap-container-db.h        |    6 ++--
 libdmapsharing/dmap-container-record.c    |   32 +--------------------------
 libdmapsharing/dmap-container-record.h    |    6 ++--
 libdmapsharing/dmap-db.c                  |   32 +--------------------------
 libdmapsharing/dmap-db.h                  |    6 ++--
 libdmapsharing/dmap-record-factory.c      |   31 +-------------------------
 libdmapsharing/dmap-record-factory.h      |    6 ++--
 libdmapsharing/dmap-record.c              |   33 +---------------------------
 libdmapsharing/dmap-record.h              |    6 ++--
 libdmapsharing/dpap-record.c              |   32 +--------------------------
 libdmapsharing/dpap-record.h              |    6 ++--
 libdmapsharing/test-daap-record-factory.c |    2 +-
 libdmapsharing/test-daap-record.c         |    4 +-
 libdmapsharing/test-dpap-record-factory.c |    2 +-
 libdmapsharing/test-dpap-record.c         |    4 +-
 20 files changed, 46 insertions(+), 266 deletions(-)
---
diff --git a/libdmapsharing/daap-record.c b/libdmapsharing/daap-record.c
index 8e9e3c0..173ee00 100644
--- a/libdmapsharing/daap-record.c
+++ b/libdmapsharing/daap-record.c
@@ -21,15 +21,11 @@
 #include <libdmapsharing/daap-record.h>
 #include <libdmapsharing/dmap-enums.h>
 
-static gint daap_record_init_count = 0;
-
 static void
-daap_record_init (DAAPRecordIface * iface)
+daap_record_default_init (DAAPRecordInterface * iface)
 {
        static gboolean is_initialized = FALSE;
 
-       daap_record_init_count++;
-
        if (!is_initialized) {
                g_object_interface_install_property (iface,
                                                     g_param_spec_string
@@ -198,31 +194,7 @@ daap_record_init (DAAPRecordIface * iface)
        }
 }
 
-static void
-daap_record_finalize (DAAPRecordIface * iface)
-{
-       daap_record_init_count--;
-}
-
-/* FIXME: No G_DEFINE_INTERFACE available in GObject headers: */
-GType
-daap_record_get_type (void)
-{
-       static GType object_type = 0;
-
-       if (!object_type) {
-               static const GTypeInfo object_info = {
-                       sizeof (DAAPRecordIface),
-                       (GBaseInitFunc) daap_record_init,
-                       (GBaseFinalizeFunc) daap_record_finalize
-               };
-               object_type =
-                       g_type_register_static (G_TYPE_INTERFACE,
-                                               "DAAPRecord",
-                                               &object_info, 0);
-       }
-       return object_type;
-}
+G_DEFINE_INTERFACE(DAAPRecord, daap_record, G_TYPE_OBJECT)
 
 gboolean
 daap_record_itunes_compat (DAAPRecord * record)
diff --git a/libdmapsharing/daap-record.h b/libdmapsharing/daap-record.h
index b4a0aac..4292463 100644
--- a/libdmapsharing/daap-record.h
+++ b/libdmapsharing/daap-record.h
@@ -61,11 +61,11 @@ G_BEGIN_DECLS
  * Returns: pointer to object interface structure.
  */
 #define DAAP_RECORD_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), \
-                                     DAAP_TYPE_RECORD, DAAPRecordIface))
+                                     DAAP_TYPE_RECORD, DAAPRecordInterface))
 typedef struct _DAAPRecord DAAPRecord;
-typedef struct _DAAPRecordIface DAAPRecordIface;
+typedef struct _DAAPRecordInterface DAAPRecordInterface;
 
-struct _DAAPRecordIface
+struct _DAAPRecordInterface
 {
        GTypeInterface parent;
 
diff --git a/libdmapsharing/dacp-player.c b/libdmapsharing/dacp-player.c
index 9eaab08..56299b6 100644
--- a/libdmapsharing/dacp-player.c
+++ b/libdmapsharing/dacp-player.c
@@ -20,7 +20,7 @@
 #include <libdmapsharing/daap-record.h>
 
 static void
-dacp_player_init (DACPPlayerIface * iface)
+dacp_player_default_init (DACPPlayerInterface * iface)
 {
        static gboolean initialized = FALSE;
 
@@ -68,30 +68,7 @@ dacp_player_init (DACPPlayerIface * iface)
        }
 }
 
-static void
-dacp_player_finalize (DACPPlayerIface * iface)
-{
-}
-
-GType
-dacp_player_get_type (void)
-{
-       static GType object_type = 0;
-
-       if (!object_type) {
-               static const GTypeInfo object_info = {
-                       sizeof (DACPPlayerIface),
-                       (GBaseInitFunc) dacp_player_init,
-                       (GBaseFinalizeFunc) dacp_player_finalize
-               };
-               object_type = g_type_register_static (G_TYPE_INTERFACE,
-                                                     "DACPPlayer",
-                                                     &object_info, 0);
-               g_type_interface_add_prerequisite (object_type,
-                                                  G_TYPE_OBJECT);
-       }
-       return object_type;
-}
+G_DEFINE_INTERFACE(DACPPlayer, dacp_player, G_TYPE_OBJECT)
 
 DAAPRecord *
 dacp_player_now_playing_record (DACPPlayer * player)
diff --git a/libdmapsharing/dacp-player.h b/libdmapsharing/dacp-player.h
index eb13241..3dd7095 100644
--- a/libdmapsharing/dacp-player.h
+++ b/libdmapsharing/dacp-player.h
@@ -54,8 +54,8 @@ G_BEGIN_DECLS
  * Returns: pointer to object interface structure.
  */
 #define DACP_PLAYER_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), \
-                                        DACP_TYPE_PLAYER, DACPPlayerIface))
-typedef struct _DACPPlayerIface DACPPlayerIface;
+                                        DACP_TYPE_PLAYER, DACPPlayerInterface))
+typedef struct _DACPPlayerInterface DACPPlayerInterface;
 typedef struct _DACPPlayer DACPPlayer;
 
 typedef enum
@@ -72,7 +72,7 @@ typedef enum
        DACP_PLAY_PLAYING = 4
 } DACPPlayState;
 
-struct _DACPPlayerIface
+struct _DACPPlayerInterface
 {
        GTypeInterface parent_class;
 
diff --git a/libdmapsharing/dmap-container-db.c b/libdmapsharing/dmap-container-db.c
index 9677687..e89d5c9 100644
--- a/libdmapsharing/dmap-container-db.c
+++ b/libdmapsharing/dmap-container-db.c
@@ -20,41 +20,12 @@
 
 #include <libdmapsharing/dmap-container-db.h>
 
-static gint dmap_container_db_init_count = 0;
-
-static void
-dmap_container_db_init (DMAPContainerDbIface * iface)
-{
-       dmap_container_db_init_count++;
-}
-
 static void
-dmap_container_db_finalize (DMAPContainerDbIface * iface)
+dmap_container_db_default_init (DMAPContainerDbInterface * iface)
 {
-       dmap_container_db_init_count--;
 }
 
-/* FIXME: No G_DEFINE_INTERFACE available in GObject headers: */
-GType
-dmap_container_db_get_type (void)
-{
-       static GType object_type = 0;
-
-       if (!object_type) {
-               static const GTypeInfo object_info = {
-                       sizeof (DMAPContainerDbIface),
-                       (GBaseInitFunc) dmap_container_db_init,
-                       (GBaseFinalizeFunc) dmap_container_db_finalize
-               };
-               object_type =
-                       g_type_register_static (G_TYPE_INTERFACE,
-                                               "DMAPContainerDb",
-                                               &object_info, 0);
-               g_type_interface_add_prerequisite (object_type,
-                                                  G_TYPE_OBJECT);
-       }
-       return object_type;
-}
+G_DEFINE_INTERFACE(DMAPContainerDb, dmap_container_db, G_TYPE_OBJECT)
 
 void
 dmap_container_db_add (DMAPContainerDb * db, DMAPContainerRecord *record)
diff --git a/libdmapsharing/dmap-container-db.h b/libdmapsharing/dmap-container-db.h
index 12b2dc8..968ea0a 100644
--- a/libdmapsharing/dmap-container-db.h
+++ b/libdmapsharing/dmap-container-db.h
@@ -60,9 +60,9 @@ G_BEGIN_DECLS
  * Returns: pointer to object interface structure.
  */
 #define DMAP_CONTAINER_DB_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), \
-                                           DMAP_TYPE_CONTAINER_DB, DMAPContainerDbIface))
+                                           DMAP_TYPE_CONTAINER_DB, DMAPContainerDbInterface))
 typedef struct _DMAPContainerDb DMAPContainerDb;
-typedef struct _DMAPContainerDbIface DMAPContainerDbIface;
+typedef struct _DMAPContainerDbInterface DMAPContainerDbInterface;
 
 /**
  * DMAPIdContainerRecordFunc:
@@ -74,7 +74,7 @@ typedef struct _DMAPContainerDbIface DMAPContainerDbIface;
  */
 typedef void (*DMAPIdContainerRecordFunc) (guint id, DMAPContainerRecord *record, gpointer user_data);
 
-struct _DMAPContainerDbIface
+struct _DMAPContainerDbInterface
 {
        GTypeInterface parent;
 
diff --git a/libdmapsharing/dmap-container-record.c b/libdmapsharing/dmap-container-record.c
index 2e70706..9b775c7 100644
--- a/libdmapsharing/dmap-container-record.c
+++ b/libdmapsharing/dmap-container-record.c
@@ -20,15 +20,11 @@
 
 #include <libdmapsharing/dmap-container-record.h>
 
-static gint dmap_container_record_init_count = 0;
-
 static void
-dmap_container_record_init (DMAPContainerRecordIface * iface)
+dmap_container_record_default_init (DMAPContainerRecordInterface * iface)
 {
        static gboolean is_initialized = FALSE;
 
-       dmap_container_record_init_count++;
-
        if (!is_initialized) {
                g_object_interface_install_property (iface,
                                                     g_param_spec_string
@@ -41,31 +37,7 @@ dmap_container_record_init (DMAPContainerRecordIface * iface)
        }
 }
 
-static void
-dmap_container_record_finalize (DMAPContainerRecordIface * iface)
-{
-       dmap_container_record_init_count--;
-}
-
-/* FIXME: No G_DEFINE_INTERFACE available in GObject headers: */
-GType
-dmap_container_record_get_type (void)
-{
-       static GType object_type = 0;
-
-       if (!object_type) {
-               static const GTypeInfo object_info = {
-                       sizeof (DMAPContainerRecordIface),
-                       (GBaseInitFunc) dmap_container_record_init,
-                       (GBaseFinalizeFunc) dmap_container_record_finalize
-               };
-               object_type =
-                       g_type_register_static (G_TYPE_INTERFACE,
-                                               "DMAPContainerRecord",
-                                               &object_info, 0);
-       }
-       return object_type;
-}
+G_DEFINE_INTERFACE(DMAPContainerRecord, dmap_container_record, G_TYPE_OBJECT)
 
 guint
 dmap_container_record_get_id (DMAPContainerRecord * record)
diff --git a/libdmapsharing/dmap-container-record.h b/libdmapsharing/dmap-container-record.h
index 56d7577..c031a4a 100644
--- a/libdmapsharing/dmap-container-record.h
+++ b/libdmapsharing/dmap-container-record.h
@@ -59,11 +59,11 @@ G_BEGIN_DECLS
  * Returns: pointer to object interface structure.
  */
 #define DMAP_CONTAINER_RECORD_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), \
-                                     DMAP_TYPE_CONTAINER_RECORD, DMAPContainerRecordIface))
+                                     DMAP_TYPE_CONTAINER_RECORD, DMAPContainerRecordInterface))
 typedef struct _DMAPContainerRecord DMAPContainerRecord;
-typedef struct _DMAPContainerRecordIface DMAPContainerRecordIface;
+typedef struct _DMAPContainerRecordInterface DMAPContainerRecordInterface;
 
-struct _DMAPContainerRecordIface
+struct _DMAPContainerRecordInterface
 {
        GTypeInterface parent;
 
diff --git a/libdmapsharing/dmap-db.c b/libdmapsharing/dmap-db.c
index 48448ab..45f7a86 100644
--- a/libdmapsharing/dmap-db.c
+++ b/libdmapsharing/dmap-db.c
@@ -29,40 +29,12 @@ typedef struct FilterData
        GHashTable *ht;
 } FilterData;
 
-static gint dmap_db_init_count = 0;
-
-static void
-dmap_db_init (DMAPDbIface * iface)
-{
-       dmap_db_init_count++;
-}
-
 static void
-dmap_db_finalize (DMAPDbIface * iface)
+dmap_db_default_init (DMAPDbInterface * iface)
 {
-       dmap_db_init_count--;
 }
 
-/* FIXME: No G_DEFINE_INTERFACE available in GObject headers: */
-GType
-dmap_db_get_type (void)
-{
-       static GType object_type = 0;
-
-       if (!object_type) {
-               static const GTypeInfo object_info = {
-                       sizeof (DMAPDbIface),
-                       (GBaseInitFunc) dmap_db_init,
-                       (GBaseFinalizeFunc) dmap_db_finalize
-               };
-               object_type =
-                       g_type_register_static (G_TYPE_INTERFACE,
-                                               "DMAPDb", &object_info, 0);
-               g_type_interface_add_prerequisite (object_type,
-                                                  G_TYPE_OBJECT);
-       }
-       return object_type;
-}
+G_DEFINE_INTERFACE(DMAPDb, dmap_db, G_TYPE_OBJECT)
 
 DMAPRecord *
 dmap_db_lookup_by_id (const DMAPDb * db, guint id)
diff --git a/libdmapsharing/dmap-db.h b/libdmapsharing/dmap-db.h
index ec7e868..4e41268 100644
--- a/libdmapsharing/dmap-db.h
+++ b/libdmapsharing/dmap-db.h
@@ -59,9 +59,9 @@ G_BEGIN_DECLS
  * Returns: pointer to object interface structure.
  */
 #define DMAP_DB_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), \
-                                 DMAP_TYPE_DB, DMAPDbIface))
+                                 DMAP_TYPE_DB, DMAPDbInterface))
 typedef struct _DMAPDb DMAPDb;
-typedef struct _DMAPDbIface DMAPDbIface;
+typedef struct _DMAPDbInterface DMAPDbInterface;
 
 /**
  * DMAPIdRecordFunc:
@@ -73,7 +73,7 @@ typedef struct _DMAPDbIface DMAPDbIface;
  */
 typedef void (*DMAPIdRecordFunc) (guint id, DMAPRecord *record, gpointer user_data);
 
-struct _DMAPDbIface
+struct _DMAPDbInterface
 {
        GTypeInterface parent;
 
diff --git a/libdmapsharing/dmap-record-factory.c b/libdmapsharing/dmap-record-factory.c
index 6b77862..a3d1d83 100644
--- a/libdmapsharing/dmap-record-factory.c
+++ b/libdmapsharing/dmap-record-factory.c
@@ -20,39 +20,12 @@
 
 #include <libdmapsharing/dmap-record-factory.h>
 
-static gint dmap_record_factory_init_count = 0;
-
-static void
-dmap_record_factory_init (DMAPRecordFactoryIface * iface)
-{
-       dmap_record_factory_init_count++;
-}
-
 static void
-dmap_record_factory_finalize (DMAPRecordFactoryIface * iface)
+dmap_record_factory_default_init (DMAPRecordFactoryInterface * iface)
 {
-       dmap_record_factory_init_count--;
 }
 
-/* FIXME: No G_DEFINE_INTERFACE available in GObject headers: */
-GType
-dmap_record_factory_get_type (void)
-{
-       static GType object_type = 0;
-
-       if (!object_type) {
-               static const GTypeInfo object_info = {
-                       sizeof (DMAPRecordFactoryIface),
-                       (GBaseInitFunc) dmap_record_factory_init,
-                       (GBaseFinalizeFunc) dmap_record_factory_finalize
-               };
-               object_type =
-                       g_type_register_static (G_TYPE_INTERFACE,
-                                               "DMAPRecordFactory",
-                                               &object_info, 0);
-       }
-       return object_type;
-}
+G_DEFINE_INTERFACE(DMAPRecordFactory, dmap_record_factory, G_TYPE_OBJECT)
 
 DMAPRecord *
 dmap_record_factory_create (DMAPRecordFactory * factory, gpointer user_data)
diff --git a/libdmapsharing/dmap-record-factory.h b/libdmapsharing/dmap-record-factory.h
index ad39b19..e9d4309 100644
--- a/libdmapsharing/dmap-record-factory.h
+++ b/libdmapsharing/dmap-record-factory.h
@@ -62,11 +62,11 @@ G_BEGIN_DECLS
 #define DMAP_RECORD_FACTORY_GET_INTERFACE(o) \
                                 (G_TYPE_INSTANCE_GET_INTERFACE ((o), \
                                  DMAP_TYPE_RECORD_FACTORY, \
-                                 DMAPRecordFactoryIface))
+                                 DMAPRecordFactoryInterface))
 typedef struct _DMAPRecordFactory DMAPRecordFactory;
-typedef struct _DMAPRecordFactoryIface DMAPRecordFactoryIface;
+typedef struct _DMAPRecordFactoryInterface DMAPRecordFactoryInterface;
 
-struct _DMAPRecordFactoryIface
+struct _DMAPRecordFactoryInterface
 {
        GTypeInterface parent;
 
diff --git a/libdmapsharing/dmap-record.c b/libdmapsharing/dmap-record.c
index a9071d9..3dad698 100644
--- a/libdmapsharing/dmap-record.c
+++ b/libdmapsharing/dmap-record.c
@@ -20,41 +20,12 @@
 
 #include <libdmapsharing/dmap-record.h>
 
-static gint dmap_record_init_count = 0;
-
-static void
-dmap_record_init (DMAPRecordIface * iface)
-{
-       dmap_record_init_count++;
-}
-
 static void
-dmap_record_finalize (DMAPRecordIface * iface)
+dmap_record_default_init (DMAPRecordInterface * iface)
 {
-       dmap_record_init_count--;
 }
 
-/* FIXME: No G_DEFINE_INTERFACE available in GObject headers: */
-GType
-dmap_record_get_type (void)
-{
-       static GType object_type = 0;
-
-       if (!object_type) {
-               static const GTypeInfo object_info = {
-                       sizeof (DMAPRecordIface),
-                       (GBaseInitFunc) dmap_record_init,
-                       (GBaseFinalizeFunc) dmap_record_finalize
-               };
-               object_type =
-                       g_type_register_static (G_TYPE_INTERFACE,
-                                               "DMAPRecord",
-                                               &object_info, 0);
-               g_type_interface_add_prerequisite (object_type,
-                                                  G_TYPE_OBJECT);
-       }
-       return object_type;
-}
+G_DEFINE_INTERFACE(DMAPRecord, dmap_record, G_TYPE_OBJECT)
 
 GByteArray *
 dmap_record_to_blob (DMAPRecord * record)
diff --git a/libdmapsharing/dmap-record.h b/libdmapsharing/dmap-record.h
index a7856a8..3308f81 100644
--- a/libdmapsharing/dmap-record.h
+++ b/libdmapsharing/dmap-record.h
@@ -57,11 +57,11 @@ G_BEGIN_DECLS
  * Returns: pointer to object class structure.
  */
 #define DMAP_RECORD_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), \
-                                     DMAP_TYPE_RECORD, DMAPRecordIface))
+                                     DMAP_TYPE_RECORD, DMAPRecordInterface))
 typedef struct _DMAPRecord DMAPRecord;
-typedef struct _DMAPRecordIface DMAPRecordIface;
+typedef struct _DMAPRecordInterface DMAPRecordInterface;
 
-struct _DMAPRecordIface
+struct _DMAPRecordInterface
 {
        GTypeInterface parent;
 
diff --git a/libdmapsharing/dpap-record.c b/libdmapsharing/dpap-record.c
index 0cc75a3..cf2535d 100644
--- a/libdmapsharing/dpap-record.c
+++ b/libdmapsharing/dpap-record.c
@@ -21,15 +21,11 @@
 #include <libdmapsharing/dmap-record.h>
 #include <libdmapsharing/dpap-record.h>
 
-static gint dpap_record_init_count = 0;
-
 static void
-dpap_record_init (DPAPRecordIface * iface)
+dpap_record_default_init (DPAPRecordInterface * iface)
 {
        static gboolean is_initialized = FALSE;
 
-       dpap_record_init_count++;
-
        if (!is_initialized) {
                g_object_interface_install_property (iface,
                                                     g_param_spec_string
@@ -131,31 +127,7 @@ dpap_record_init (DPAPRecordIface * iface)
        }
 }
 
-static void
-dpap_record_finalize (DPAPRecordIface * iface)
-{
-       dpap_record_init_count--;
-}
-
-/* FIXME: No G_DEFINE_INTERFACE available in GObject headers: */
-GType
-dpap_record_get_type (void)
-{
-       static GType object_type = 0;
-
-       if (!object_type) {
-               static const GTypeInfo object_info = {
-                       sizeof (DPAPRecordIface),
-                       (GBaseInitFunc) dpap_record_init,
-                       (GBaseFinalizeFunc) dpap_record_finalize
-               };
-               object_type =
-                       g_type_register_static (G_TYPE_INTERFACE,
-                                               "DPAPRecord",
-                                               &object_info, 0);
-       }
-       return object_type;
-}
+G_DEFINE_INTERFACE(DPAPRecord, dpap_record, G_TYPE_OBJECT)
 
 GInputStream *
 dpap_record_read (DPAPRecord * record, GError ** err)
diff --git a/libdmapsharing/dpap-record.h b/libdmapsharing/dpap-record.h
index 0e9c1c4..ac3c3fa 100644
--- a/libdmapsharing/dpap-record.h
+++ b/libdmapsharing/dpap-record.h
@@ -60,11 +60,11 @@ G_BEGIN_DECLS
  * Returns: pointer to object interface structure.
  */
 #define DPAP_RECORD_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), \
-                                     DPAP_TYPE_RECORD, DPAPRecordIface))
+                                     DPAP_TYPE_RECORD, DPAPRecordInterface))
 typedef struct _DPAPRecord DPAPRecord;
-typedef struct _DPAPRecordIface DPAPRecordIface;
+typedef struct _DPAPRecordInterface DPAPRecordInterface;
 
-struct _DPAPRecordIface
+struct _DPAPRecordInterface
 {
        GTypeInterface parent;
 
diff --git a/libdmapsharing/test-daap-record-factory.c b/libdmapsharing/test-daap-record-factory.c
index c2f03ed..ddc12b9 100644
--- a/libdmapsharing/test-daap-record-factory.c
+++ b/libdmapsharing/test-daap-record-factory.c
@@ -40,7 +40,7 @@ test_daap_record_factory_class_init (TestDAAPRecordFactoryClass *klass)
 static void
 test_daap_record_factory_interface_init (gpointer iface, gpointer data)
 {
-       DMAPRecordFactoryIface *factory = iface;
+       DMAPRecordFactoryInterface *factory = iface;
 
        g_assert (G_TYPE_FROM_INTERFACE (factory) == DMAP_TYPE_RECORD_FACTORY);
 
diff --git a/libdmapsharing/test-daap-record.c b/libdmapsharing/test-daap-record.c
index 2d14872..f35a9f4 100644
--- a/libdmapsharing/test-daap-record.c
+++ b/libdmapsharing/test-daap-record.c
@@ -279,7 +279,7 @@ test_daap_record_class_init (TestDAAPRecordClass *klass)
 static void
 test_daap_record_daap_iface_init (gpointer iface, gpointer data)
 {
-       DAAPRecordIface *daap_record = iface;
+       DAAPRecordInterface *daap_record = iface;
 
        g_assert (G_TYPE_FROM_INTERFACE (daap_record) == DAAP_TYPE_RECORD);
 
@@ -289,7 +289,7 @@ test_daap_record_daap_iface_init (gpointer iface, gpointer data)
 static void
 test_daap_record_dmap_iface_init (gpointer iface, gpointer data)
 {
-       DMAPRecordIface *dmap_record = iface;
+       DMAPRecordInterface *dmap_record = iface;
 
        g_assert (G_TYPE_FROM_INTERFACE (dmap_record) == DMAP_TYPE_RECORD);
 }
diff --git a/libdmapsharing/test-dpap-record-factory.c b/libdmapsharing/test-dpap-record-factory.c
index 66e03cb..89123f8 100644
--- a/libdmapsharing/test-dpap-record-factory.c
+++ b/libdmapsharing/test-dpap-record-factory.c
@@ -40,7 +40,7 @@ test_dpap_record_factory_class_init (TestDPAPRecordFactoryClass *klass)
 static void
 test_dpap_record_factory_interface_init (gpointer iface, gpointer data)
 {
-       DMAPRecordFactoryIface *factory = iface;
+       DMAPRecordFactoryInterface *factory = iface;
 
        g_assert (G_TYPE_FROM_INTERFACE (factory) == DMAP_TYPE_RECORD_FACTORY);
 
diff --git a/libdmapsharing/test-dpap-record.c b/libdmapsharing/test-dpap-record.c
index 3ad9c11..2fc2cf1 100644
--- a/libdmapsharing/test-dpap-record.c
+++ b/libdmapsharing/test-dpap-record.c
@@ -204,7 +204,7 @@ test_dpap_record_class_init (TestDPAPRecordClass *klass)
 static void
 test_dpap_record_dpap_iface_init (gpointer iface, gpointer data)
 {
-       DPAPRecordIface *dpap_record = iface;
+       DPAPRecordInterface *dpap_record = iface;
 
        g_assert (G_TYPE_FROM_INTERFACE (dpap_record) == DPAP_TYPE_RECORD);
 
@@ -214,7 +214,7 @@ test_dpap_record_dpap_iface_init (gpointer iface, gpointer data)
 static void
 test_dpap_record_dmap_iface_init (gpointer iface, gpointer data)
 {
-        DMAPRecordIface *dmap_record = iface;
+        DMAPRecordInterface *dmap_record = iface;
 
        g_assert (G_TYPE_FROM_INTERFACE (dmap_record) == DMAP_TYPE_RECORD);
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]