libpurple: Port self-contained code from g_type_class_add_private()

This patch ports the self-contained libpurple GObjects away from the
deprecated g_type_class_add_private() function in favor of the
G_DEFINE_TYPE_WITH_PRIVATE() macro.

1 files changed, 26 insertions, 40 deletions

diff --git a/libpurple/countingnode.c b/libpurple/countingnode.c
index 5aeaaada69..d350e16b4c 100644
--- a/libpurple/countingnode.c
+++ b/libpurple/countingnode.c
@@ -24,9 +24,6 @@
 #include "glibcompat.h"
 #include "countingnode.h"
 
-#define PURPLE_COUNTING_NODE_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE((obj), PURPLE_TYPE_COUNTING_NODE, PurpleCountingNodePrivate))
-
 typedef struct _PurpleCountingNodePrivate  PurpleCountingNodePrivate;
 
 /* Private data of a counting node */
@@ -50,13 +47,17 @@ enum
 
 static GParamSpec *properties[PROP_LAST];
 
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(PurpleCountingNode, purple_counting_node,
+		PURPLE_TYPE_BLIST_NODE);
+
 /******************************************************************************
  * API
  *****************************************************************************/
 int
 purple_counting_node_get_total_size(PurpleCountingNode *counter)
 {
-	PurpleCountingNodePrivate *priv = PURPLE_COUNTING_NODE_GET_PRIVATE(counter);
+	PurpleCountingNodePrivate *priv =
+			purple_counting_node_get_instance_private(counter);
 
 	g_return_val_if_fail(priv != NULL, -1);
 
@@ -66,7 +67,8 @@ purple_counting_node_get_total_size(PurpleCountingNode *counter)
 int
 purple_counting_node_get_current_size(PurpleCountingNode *counter)
 {
-	PurpleCountingNodePrivate *priv = PURPLE_COUNTING_NODE_GET_PRIVATE(counter);
+	PurpleCountingNodePrivate *priv =
+			purple_counting_node_get_instance_private(counter);
 
 	g_return_val_if_fail(priv != NULL, -1);
 
@@ -76,7 +78,8 @@ purple_counting_node_get_current_size(PurpleCountingNode *counter)
 int
 purple_counting_node_get_online_count(PurpleCountingNode *counter)
 {
-	PurpleCountingNodePrivate *priv = PURPLE_COUNTING_NODE_GET_PRIVATE(counter);
+	PurpleCountingNodePrivate *priv =
+			purple_counting_node_get_instance_private(counter);
 
 	g_return_val_if_fail(priv != NULL, -1);
 
@@ -86,7 +89,8 @@ purple_counting_node_get_online_count(PurpleCountingNode *counter)
 void
 purple_counting_node_change_total_size(PurpleCountingNode *counter, int delta)
 {
-	PurpleCountingNodePrivate *priv = PURPLE_COUNTING_NODE_GET_PRIVATE(counter);
+	PurpleCountingNodePrivate *priv =
+			purple_counting_node_get_instance_private(counter);
 
 	g_return_if_fail(priv != NULL);
 
@@ -96,7 +100,8 @@ purple_counting_node_change_total_size(PurpleCountingNode *counter, int delta)
 void
 purple_counting_node_change_current_size(PurpleCountingNode *counter, int delta)
 {
-	PurpleCountingNodePrivate *priv = PURPLE_COUNTING_NODE_GET_PRIVATE(counter);
+	PurpleCountingNodePrivate *priv =
+			purple_counting_node_get_instance_private(counter);
 
 	g_return_if_fail(priv != NULL);
 
@@ -106,7 +111,8 @@ purple_counting_node_change_current_size(PurpleCountingNode *counter, int delta)
 void
 purple_counting_node_change_online_count(PurpleCountingNode *counter, int delta)
 {
-	PurpleCountingNodePrivate *priv = PURPLE_COUNTING_NODE_GET_PRIVATE(counter);
+	PurpleCountingNodePrivate *priv =
+			purple_counting_node_get_instance_private(counter);
 
 	g_return_if_fail(priv != NULL);
 
@@ -116,7 +122,8 @@ purple_counting_node_change_online_count(PurpleCountingNode *counter, int delta)
 void
 purple_counting_node_set_total_size(PurpleCountingNode *counter, int totalsize)
 {
-	PurpleCountingNodePrivate *priv = PURPLE_COUNTING_NODE_GET_PRIVATE(counter);
+	PurpleCountingNodePrivate *priv =
+			purple_counting_node_get_instance_private(counter);
 
 	g_return_if_fail(priv != NULL);
 
@@ -128,7 +135,8 @@ purple_counting_node_set_total_size(PurpleCountingNode *counter, int totalsize)
 void
 purple_counting_node_set_current_size(PurpleCountingNode *counter, int currentsize)
 {
-	PurpleCountingNodePrivate *priv = PURPLE_COUNTING_NODE_GET_PRIVATE(counter);
+	PurpleCountingNodePrivate *priv =
+			purple_counting_node_get_instance_private(counter);
 
 	g_return_if_fail(priv != NULL);
 
@@ -140,7 +148,8 @@ purple_counting_node_set_current_size(PurpleCountingNode *counter, int currentsi
 void
 purple_counting_node_set_online_count(PurpleCountingNode *counter, int onlinecount)
 {
-	PurpleCountingNodePrivate *priv = PURPLE_COUNTING_NODE_GET_PRIVATE(counter);
+	PurpleCountingNodePrivate *priv =
+			purple_counting_node_get_instance_private(counter);
 
 	g_return_if_fail(priv != NULL);
 
@@ -198,6 +207,11 @@ purple_counting_node_get_property(GObject *obj, guint param_id, GValue *value,
 	}
 }
 
+static void
+purple_counting_node_init(PurpleCountingNode *counter)
+{
+}
+
 /* Class initializer function */
 static void
 purple_counting_node_class_init(PurpleCountingNodeClass *klass)
@@ -208,8 +222,6 @@ purple_counting_node_class_init(PurpleCountingNodeClass *klass)
 	obj_class->get_property = purple_counting_node_get_property;
 	obj_class->set_property = purple_counting_node_set_property;
 
-	g_type_class_add_private(klass, sizeof(PurpleCountingNodePrivate));
-
 	properties[PROP_TOTAL_SIZE] = g_param_spec_int(
 		"total-size",
 		"Total size",
@@ -237,29 +249,3 @@ purple_counting_node_class_init(PurpleCountingNodeClass *klass)
 	g_object_class_install_properties(obj_class, PROP_LAST, properties);
 }
 
-GType
-purple_counting_node_get_type(void)
-{
-	static GType type = 0;
-
-	if(type == 0) {
-		static const GTypeInfo info = {
-			sizeof(PurpleCountingNodeClass),
-			NULL,
-			NULL,
-			(GClassInitFunc)purple_counting_node_class_init,
-			NULL,
-			NULL,
-			sizeof(PurpleCountingNode),
-			0,
-			NULL,
-			NULL,
-		};
-
-		type = g_type_register_static(PURPLE_TYPE_BLIST_NODE,
-				"PurpleCountingNode",
-				&info, G_TYPE_FLAG_ABSTRACT);
-	}
-
-	return type;
-}