Use G_DEFINE_BOXED_TYPE in protocols.

3 files changed, 6 insertions, 36 deletions

diff --git a/libpurple/protocols/jabber/google/google_p2p.c b/libpurple/protocols/jabber/google/google_p2p.c
index fe3ebd9479..54f98f9652 100644
--- a/libpurple/protocols/jabber/google/google_p2p.c
+++ b/libpurple/protocols/jabber/google/google_p2p.c
@@ -89,18 +89,8 @@ jingle_google_p2p_candidate_free(JingleGoogleP2PCandidate *candidate)
 	g_free(candidate->password);
 }
 
-GType
-jingle_google_p2p_candidate_get_type(void)
-{
-	static GType type = 0;
-
-	if (type == 0) {
-		type = g_boxed_type_register_static("JingleGoogleP2PCandidate",
-				(GBoxedCopyFunc)jingle_google_p2p_candidate_copy,
-				(GBoxedFreeFunc)jingle_google_p2p_candidate_free);
-	}
-	return type;
-}
+G_DEFINE_BOXED_TYPE(JingleGoogleP2PCandidate, jingle_google_p2p_candidate,
+		jingle_google_p2p_candidate_copy, jingle_google_p2p_candidate_free)
 
 JingleGoogleP2PCandidate *
 jingle_google_p2p_candidate_new(const gchar *id, guint generation,
diff --git a/libpurple/protocols/jabber/jingle/iceudp.c b/libpurple/protocols/jabber/jingle/iceudp.c
index 61798493d3..a06a2056e3 100644
--- a/libpurple/protocols/jabber/jingle/iceudp.c
+++ b/libpurple/protocols/jabber/jingle/iceudp.c
@@ -96,18 +96,8 @@ jingle_iceudp_candidate_free(JingleIceUdpCandidate *candidate)
 	g_free(candidate->password);
 }
 
-GType
-jingle_iceudp_candidate_get_type()
-{
-	static GType type = 0;
-
-	if (type == 0) {
-		type = g_boxed_type_register_static("JingleIceUdpCandidate",
-				(GBoxedCopyFunc)jingle_iceudp_candidate_copy,
-				(GBoxedFreeFunc)jingle_iceudp_candidate_free);
-	}
-	return type;
-}
+G_DEFINE_BOXED_TYPE(JingleIceUdpCandidate, jingle_iceudp_candidate,
+		jingle_iceudp_candidate_copy, jingle_iceudp_candidate_free)
 
 JingleIceUdpCandidate *
 jingle_iceudp_candidate_new(const gchar *id,
diff --git a/libpurple/protocols/jabber/jingle/rawudp.c b/libpurple/protocols/jabber/jingle/rawudp.c
index b5a2739822..b906bacfad 100644
--- a/libpurple/protocols/jabber/jingle/rawudp.c
+++ b/libpurple/protocols/jabber/jingle/rawudp.c
@@ -80,18 +80,8 @@ jingle_rawudp_candidate_free(JingleRawUdpCandidate *candidate)
 	g_free(candidate->ip);
 }
 
-GType
-jingle_rawudp_candidate_get_type()
-{
-	static GType type = 0;
-
-	if (type == 0) {
-		type = g_boxed_type_register_static("JingleRawUdpCandidate",
-				(GBoxedCopyFunc)jingle_rawudp_candidate_copy,
-				(GBoxedFreeFunc)jingle_rawudp_candidate_free);
-	}
-	return type;
-}
+G_DEFINE_BOXED_TYPE(JingleRawUdpCandidate, jingle_rawudp_candidate,
+		jingle_rawudp_candidate_copy, jingle_rawudp_candidate_free)
 
 JingleRawUdpCandidate *
 jingle_rawudp_candidate_new(const gchar *id, guint generation, guint component, const gchar *ip, guint port)