Use G_DECLARE for media objects.

6 files changed, 26 insertions, 72 deletions

diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c
index 0d6f753421..921f85422d 100644
--- a/libpurple/media/backend-fs2.c
+++ b/libpurple/media/backend-fs2.c
@@ -39,10 +39,6 @@
 #define gst_registry_get() gst_registry_get_default()
 #endif
 
-/** @copydoc _PurpleMediaBackendFs2Class */
-typedef struct _PurpleMediaBackendFs2Class PurpleMediaBackendFs2Class;
-/** @copydoc _PurpleMediaBackendFs2Private */
-typedef struct _PurpleMediaBackendFs2Private PurpleMediaBackendFs2Private;
 /** @copydoc _PurpleMediaBackendFs2Session */
 typedef struct _PurpleMediaBackendFs2Session PurpleMediaBackendFs2Session;
 /** @copydoc _PurpleMediaBackendFs2Stream */
@@ -104,11 +100,11 @@ static gboolean purple_media_backend_fs2_set_send_rtcp_mux(
 static void free_stream(PurpleMediaBackendFs2Stream *stream);
 static void free_session(PurpleMediaBackendFs2Session *session);
 
-struct _PurpleMediaBackendFs2Class
-{
-	GObjectClass parent_class;
-};
-
+/**
+ * PurpleMediaBackendFs2:
+ *
+ * An opaque structure representing the Farstream media backend.
+ */
 struct _PurpleMediaBackendFs2
 {
 	GObject parent;
@@ -150,7 +146,7 @@ struct _PurpleMediaBackendFs2Session
 	PurpleMediaSessionType type;
 };
 
-struct _PurpleMediaBackendFs2Private
+typedef struct _PurpleMediaBackendFs2Private
 {
 	PurpleMedia *media;
 	GstElement *confbin;
@@ -165,7 +161,7 @@ struct _PurpleMediaBackendFs2Private
 	GList *streams;
 
 	gdouble silence_threshold;
-};
+} PurpleMediaBackendFs2Private;
 
 enum {
 	PROP_0,
diff --git a/libpurple/media/backend-fs2.h b/libpurple/media/backend-fs2.h
index 1aa31c1f9b..4f20710eab 100644
--- a/libpurple/media/backend-fs2.h
+++ b/libpurple/media/backend-fs2.h
@@ -35,19 +35,7 @@
 
 G_BEGIN_DECLS
 
-#define PURPLE_TYPE_MEDIA_BACKEND_FS2            (purple_media_backend_fs2_get_type())
-#define PURPLE_IS_MEDIA_BACKEND_FS2(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_MEDIA_BACKEND_FS2))
-#define PURPLE_IS_MEDIA_BACKEND_FS2_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_MEDIA_BACKEND_FS2))
-#define PURPLE_MEDIA_BACKEND_FS2(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA_BACKEND_FS2, PurpleMediaBackendFs2))
-#define PURPLE_MEDIA_BACKEND_FS2_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_MEDIA_BACKEND_FS2, PurpleMediaBackendFs2))
-#define PURPLE_MEDIA_BACKEND_FS2_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA_BACKEND_FS2, PurpleMediaBackendFs2))
-
-/**
- * PurpleMediaBackendFs2:
- *
- * An opaque structure representing the Farstream media backend.
- */
-typedef struct _PurpleMediaBackendFs2 PurpleMediaBackendFs2;
+#define PURPLE_TYPE_MEDIA_BACKEND_FS2  purple_media_backend_fs2_get_type()
 
 /**
  * purple_media_backend_fs2_get_type:
@@ -56,7 +44,8 @@ typedef struct _PurpleMediaBackendFs2 PurpleMediaBackendFs2;
  *
  * Returns: The Farstream media backend's GType
  */
-GType purple_media_backend_fs2_get_type(void);
+G_DECLARE_FINAL_TYPE(PurpleMediaBackendFs2, purple_media_backend_fs2,
+		PURPLE, MEDIA_BACKEND_FS2, GObject)
 
 /*
  * Temporary function in order to be able to test while
diff --git a/libpurple/media/candidate.c b/libpurple/media/candidate.c
index 9ff451ee7e..1fd0366036 100644
--- a/libpurple/media/candidate.c
+++ b/libpurple/media/candidate.c
@@ -21,22 +21,18 @@
 
 #include "candidate.h"
 
-/** @copydoc _PurpleMediaCandidateClass */
-typedef struct _PurpleMediaCandidateClass PurpleMediaCandidateClass;
-/** @copydoc _PurpleMediaCandidatePrivate */
-typedef struct _PurpleMediaCandidatePrivate PurpleMediaCandidatePrivate;
-
-struct _PurpleMediaCandidateClass
-{
-	GObjectClass parent_class;
-};
-
+/**
+ * PurpleMediaCandidate:
+ *
+ * An opaque structure representing a network candidate (IP Address and port
+ * pair).
+ */
 struct _PurpleMediaCandidate
 {
 	GObject parent;
 };
 
-struct _PurpleMediaCandidatePrivate
+typedef struct _PurpleMediaCandidatePrivate
 {
 	gchar *foundation;
 	guint component_id;
@@ -50,7 +46,7 @@ struct _PurpleMediaCandidatePrivate
 	gchar *username;
 	gchar *password;
 	guint ttl;
-};
+} PurpleMediaCandidatePrivate;
 
 enum {
 	PROP_CANDIDATE_0,
diff --git a/libpurple/media/candidate.h b/libpurple/media/candidate.h
index f0c9f4b479..aa02067c71 100644
--- a/libpurple/media/candidate.h
+++ b/libpurple/media/candidate.h
@@ -34,20 +34,7 @@
 
 G_BEGIN_DECLS
 
-#define PURPLE_TYPE_MEDIA_CANDIDATE            (purple_media_candidate_get_type())
-#define PURPLE_IS_MEDIA_CANDIDATE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_MEDIA_CANDIDATE))
-#define PURPLE_IS_MEDIA_CANDIDATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_MEDIA_CANDIDATE))
-#define PURPLE_MEDIA_CANDIDATE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA_CANDIDATE, PurpleMediaCandidate))
-#define PURPLE_MEDIA_CANDIDATE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_MEDIA_CANDIDATE, PurpleMediaCandidate))
-#define PURPLE_MEDIA_CANDIDATE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA_CANDIDATE, PurpleMediaCandidate))
-
-/**
- * PurpleMediaCandidate:
- *
- * An opaque structure representing a network candidate (IP Address and port
- * pair).
- */
-typedef struct _PurpleMediaCandidate PurpleMediaCandidate;
+#define PURPLE_TYPE_MEDIA_CANDIDATE  purple_media_candidate_get_type()
 
 /**
  * purple_media_candidate_get_type:
@@ -56,7 +43,8 @@ typedef struct _PurpleMediaCandidate PurpleMediaCandidate;
  *
  * Returns: The media canditate's GType
  */
-GType purple_media_candidate_get_type(void);
+G_DECLARE_FINAL_TYPE(PurpleMediaCandidate, purple_media_candidate, PURPLE,
+		MEDIA_CANDIDATE, GObject)
 
 /**
  * purple_media_candidate_new:
diff --git a/libpurple/media/codec.c b/libpurple/media/codec.c
index bab41f5977..70de7bf74b 100644
--- a/libpurple/media/codec.c
+++ b/libpurple/media/codec.c
@@ -23,22 +23,12 @@
 #include "glibcompat.h"
 #include "codec.h"
 
-/** @copydoc _PurpleMediaCodecClass */
-typedef struct _PurpleMediaCodecClass PurpleMediaCodecClass;
-/** @copydoc _PurpleMediaCodecPrivate */
-typedef struct _PurpleMediaCodecPrivate PurpleMediaCodecPrivate;
-
-struct _PurpleMediaCodecClass
-{
-	GObjectClass parent_class;
-};
-
 struct _PurpleMediaCodec
 {
 	GObject parent;
 };
 
-struct _PurpleMediaCodecPrivate
+typedef struct _PurpleMediaCodecPrivate
 {
 	gint id;
 	char *encoding_name;
@@ -46,7 +36,7 @@ struct _PurpleMediaCodecPrivate
 	guint clock_rate;
 	guint channels;
 	GList *optional_params;
-};
+} PurpleMediaCodecPrivate;
 
 enum {
 	PROP_CODEC_0,
diff --git a/libpurple/media/codec.h b/libpurple/media/codec.h
index e35b0453bc..8b3bd42996 100644
--- a/libpurple/media/codec.h
+++ b/libpurple/media/codec.h
@@ -43,13 +43,7 @@ typedef struct _PurpleMediaCodec PurpleMediaCodec;
 
 G_BEGIN_DECLS
 
-#define PURPLE_TYPE_MEDIA_CODEC            (purple_media_codec_get_type())
-#define PURPLE_IS_MEDIA_CODEC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_MEDIA_CODEC))
-#define PURPLE_IS_MEDIA_CODEC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_MEDIA_CODEC))
-#define PURPLE_MEDIA_CODEC(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA_CODEC, PurpleMediaCodec))
-#define PURPLE_MEDIA_CODEC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_MEDIA_CODEC, PurpleMediaCodec))
-#define PURPLE_MEDIA_CODEC_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA_CODEC, PurpleMediaCodec))
-
+#define PURPLE_TYPE_MEDIA_CODEC  purple_media_codec_get_type()
 
 /**
  * purple_media_codec_get_type:
@@ -58,7 +52,8 @@ G_BEGIN_DECLS
  *
  * Returns: The media codec's GType
  */
-GType purple_media_codec_get_type(void);
+G_DECLARE_FINAL_TYPE(PurpleMediaCodec, purple_media_codec, PURPLE,
+		MEDIA_CODEC, GObject)
 
 /**
  * purple_media_codec_new: