Mercurial > pidgin3 / changeset

--- a/finch/gntmedia.c	Sun Oct 14 19:40:06 2018 -0400
+++ b/finch/gntmedia.c	Wed Oct 31 01:45:24 2018 +0000
@@ -75,16 +75,13 @@
 	PurpleConversation *conv;
 };
 
-#define FINCH_MEDIA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), FINCH_TYPE_MEDIA, FinchMediaPrivate))
-
+static GType finch_media_get_type (void);
 static void finch_media_class_init (FinchMediaClass *klass);
 static void finch_media_init (FinchMedia *media);
 static void finch_media_finalize (GObject *object);
 static void finch_media_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
 static void finch_media_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 
-static GntBoxClass *parent_class = NULL;
-
 enum {
 	MESSAGE,
 	LAST_SIGNAL
@@ -96,35 +93,12 @@
 	PROP_MEDIA,
 };
 
-static GType
-finch_media_get_type(void)
-{
-	static GType type = 0;
-
-	if (type == 0) {
-		static const GTypeInfo info = {
-			sizeof(FinchMediaClass),
-			NULL,
-			NULL,
-			(GClassInitFunc) finch_media_class_init,
-			NULL,
-			NULL,
-			sizeof(FinchMedia),
-			0,
-			(GInstanceInitFunc) finch_media_init,
-			NULL
-		};
-		type = g_type_register_static(GNT_TYPE_BOX, "FinchMedia", &info, 0);
-	}
-	return type;
-}
-
+G_DEFINE_TYPE_WITH_PRIVATE(FinchMedia, finch_media, GNT_TYPE_BOX);
 
 static void
 finch_media_class_init (FinchMediaClass *klass)
 {
 	GObjectClass *gobject_class = (GObjectClass*)klass;
-	parent_class = g_type_class_peek_parent(klass);
 
 	gobject_class->finalize = finch_media_finalize;
 	gobject_class->set_property = finch_media_set_property;
@@ -141,15 +115,13 @@
 					G_SIGNAL_RUN_LAST, 0, NULL, NULL,
 					g_cclosure_marshal_VOID__STRING,
 					G_TYPE_NONE, 1, G_TYPE_STRING);
-
-	g_type_class_add_private(klass, sizeof(FinchMediaPrivate));
 }
 
 
 static void
 finch_media_init (FinchMedia *media)
 {
-	media->priv = FINCH_MEDIA_GET_PRIVATE(media);
+	media->priv = finch_media_get_instance_private(media);
 
 	media->priv->calling = gnt_label_new(_("Calling..."));
 	media->priv->hangup = gnt_button_new(_("Hangup"));

--- a/finch/gntplugin.c	Sun Oct 14 19:40:06 2018 -0400
+++ b/finch/gntplugin.c	Wed Oct 31 01:45:24 2018 +0000
@@ -37,9 +37,6 @@
 #include "gntplugin.h"
 #include "gntrequest.h"
 
-#define FINCH_PLUGIN_INFO_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE((obj), FINCH_TYPE_PLUGIN_INFO, FinchPluginInfoPrivate))
-
 typedef struct
 {
 	FinchPluginPrefFrameCb pref_frame_cb;
@@ -75,6 +72,9 @@
 	} u;
 } FinchPluginUiData;
 
+G_DEFINE_TYPE_WITH_PRIVATE(FinchPluginInfo, finch_plugin_info,
+		PURPLE_TYPE_PLUGIN_INFO);
+
 static GntWidget *process_pref_frame(PurplePluginPrefFrame *frame);
 
 /* Set method for GObject properties */
@@ -82,7 +82,8 @@
 finch_plugin_info_set_property(GObject *obj, guint param_id, const GValue *value,
 		GParamSpec *pspec)
 {
-	FinchPluginInfoPrivate *priv = FINCH_PLUGIN_INFO_GET_PRIVATE(obj);
+	FinchPluginInfoPrivate *priv = finch_plugin_info_get_instance_private(
+			FINCH_PLUGIN_INFO(obj));
 
 	switch (param_id) {
 		case PROP_GNT_PREF_FRAME_CB:
@@ -99,7 +100,8 @@
 finch_plugin_info_get_property(GObject *obj, guint param_id, GValue *value,
 		GParamSpec *pspec)
 {
-	FinchPluginInfoPrivate *priv = FINCH_PLUGIN_INFO_GET_PRIVATE(obj);
+	FinchPluginInfoPrivate *priv = finch_plugin_info_get_instance_private(
+			FINCH_PLUGIN_INFO(obj));
 
 	switch (param_id) {
 		case PROP_GNT_PREF_FRAME_CB:
@@ -111,13 +113,16 @@
 	}
 }
 
+static void
+finch_plugin_info_init(FinchPluginInfo *info)
+{
+}
+
 /* Class initializer function */
 static void finch_plugin_info_class_init(FinchPluginInfoClass *klass)
 {
 	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
 
-	g_type_class_add_private(klass, sizeof(FinchPluginInfoPrivate));
-
 	/* Setup properties */
 	obj_class->get_property = finch_plugin_info_get_property;
 	obj_class->set_property = finch_plugin_info_set_property;
@@ -130,25 +135,6 @@
 		                     G_PARAM_STATIC_STRINGS));
 }
 
-GType
-finch_plugin_info_get_type(void)
-{
-	static GType type = 0;
-
-	if (G_UNLIKELY(type == 0)) {
-		static const GTypeInfo info = {
-			.class_size = sizeof(FinchPluginInfoClass),
-			.class_init = (GClassInitFunc)finch_plugin_info_class_init,
-			.instance_size = sizeof(FinchPluginInfo),
-		};
-
-		type = g_type_register_static(PURPLE_TYPE_PLUGIN_INFO,
-		                              "FinchPluginInfo", &info, 0);
-	}
-
-	return type;
-}
-
 FinchPluginInfo *
 finch_plugin_info_new(const char *first_property, ...)
 {
@@ -189,7 +175,8 @@
 		return FALSE;
 
 	if (FINCH_IS_PLUGIN_INFO(info))
-		priv = FINCH_PLUGIN_INFO_GET_PRIVATE(info);
+		priv = finch_plugin_info_get_instance_private(
+				FINCH_PLUGIN_INFO(info));
 
 	ret = ((priv && priv->pref_frame_cb) ||
 			purple_plugin_info_get_pref_frame_cb(info) ||
@@ -388,7 +375,8 @@
 	purple_plugin_info_set_ui_data(info, ui_data);
 
 	if (FINCH_IS_PLUGIN_INFO(info))
-		priv = FINCH_PLUGIN_INFO_GET_PRIVATE(info);
+		priv = finch_plugin_info_get_instance_private(
+				FINCH_PLUGIN_INFO(info));
 
 	if (priv && priv->pref_frame_cb != NULL)
 	{

--- a/finch/libgnt/gntprogressbar.c	Sun Oct 14 19:40:06 2018 -0400
+++ b/finch/libgnt/gntprogressbar.c	Wed Oct 31 01:45:24 2018 +0000
@@ -38,15 +38,13 @@
 	GntWidget parent;
 };
 
-#define GNT_PROGRESS_BAR_GET_PRIVATE(o)   (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNT_TYPE_PROGRESS_BAR, GntProgressBarPrivate))
-
-static GntWidgetClass *parent_class = NULL;
-
+G_DEFINE_TYPE_WITH_PRIVATE (GntProgressBar, gnt_progress_bar, GNT_TYPE_WIDGET);
 
 static void
 gnt_progress_bar_draw (GntWidget *widget)
 {
-	GntProgressBarPrivate *priv = GNT_PROGRESS_BAR_GET_PRIVATE (GNT_PROGRESS_BAR (widget));
+	GntProgressBarPrivate *priv = gnt_progress_bar_get_instance_private (
+			GNT_PROGRESS_BAR (widget));
 	gchar progress[8];
 	gint start, end, i, pos;
 	int color;
@@ -115,23 +113,20 @@
 }
 
 static void
-gnt_progress_bar_class_init (gpointer klass, gpointer class_data)
+gnt_progress_bar_class_init (GntProgressBarClass *klass)
 {
-	GObjectClass *g_class = G_OBJECT_CLASS (klass);
+	GntWidgetClass *wclass = GNT_WIDGET_CLASS(klass);
 
-	parent_class = GNT_WIDGET_CLASS (klass);
-
-	g_type_class_add_private (g_class, sizeof (GntProgressBarPrivate));
-
-	parent_class->draw = gnt_progress_bar_draw;
-	parent_class->size_request = gnt_progress_bar_size_request;
+	wclass->draw = gnt_progress_bar_draw;
+	wclass->size_request = gnt_progress_bar_size_request;
 }
 
 static void
-gnt_progress_bar_init (GTypeInstance *instance, gpointer g_class)
+gnt_progress_bar_init (GntProgressBar *progress_bar)
 {
-	GntWidget *widget = GNT_WIDGET (instance);
-	GntProgressBarPrivate *priv = GNT_PROGRESS_BAR_GET_PRIVATE (GNT_PROGRESS_BAR (widget));
+	GntWidget *widget = GNT_WIDGET (progress_bar);
+	GntProgressBarPrivate *priv =
+			gnt_progress_bar_get_instance_private (progress_bar);
 
 	gnt_widget_set_take_focus (widget, FALSE);
 	GNT_WIDGET_SET_FLAGS (widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW | GNT_WIDGET_GROW_X);
@@ -142,31 +137,6 @@
 	priv->show_value = TRUE;
 }
 
-GType
-gnt_progress_bar_get_type (void)
-{
-	static GType type = 0;
-
-	if (type == 0) {
-		static const GTypeInfo info = {
-			sizeof (GntProgressBarClass),
-			NULL,                         /* base_init */
-			NULL,                         /* base_finalize */
-			gnt_progress_bar_class_init,  /* class_init */
-			NULL,                         /* class_finalize */
-			NULL,                         /* class_data */
-			sizeof (GntProgressBar),
-			0,                            /* n_preallocs */
-			gnt_progress_bar_init,        /* instance_init */
-			NULL                          /* value_table */
-		};
-
-		type = g_type_register_static (GNT_TYPE_WIDGET, "GntProgressBar", &info, 0);
-	}
-
-	return type;
-}
-
 GntWidget *
 gnt_progress_bar_new (void)
 {
@@ -177,7 +147,8 @@
 void
 gnt_progress_bar_set_fraction (GntProgressBar *pbar, gdouble fraction)
 {
-	GntProgressBarPrivate *priv = GNT_PROGRESS_BAR_GET_PRIVATE (pbar);
+	GntProgressBarPrivate *priv =
+			gnt_progress_bar_get_instance_private (pbar);
 
 	if (fraction > 1.0)
 		priv->fraction = 1.0;
@@ -194,7 +165,8 @@
 gnt_progress_bar_set_orientation (GntProgressBar *pbar,
 		GntProgressBarOrientation orientation)
 {
-	GntProgressBarPrivate *priv = GNT_PROGRESS_BAR_GET_PRIVATE (pbar);
+	GntProgressBarPrivate *priv =
+			gnt_progress_bar_get_instance_private (pbar);
 	GntWidget *widget = GNT_WIDGET(pbar);
 
 	priv->orientation = orientation;
@@ -218,28 +190,32 @@
 void
 gnt_progress_bar_set_show_progress (GntProgressBar *pbar, gboolean show)
 {
-	GntProgressBarPrivate *priv = GNT_PROGRESS_BAR_GET_PRIVATE (pbar);
+	GntProgressBarPrivate *priv =
+			gnt_progress_bar_get_instance_private (pbar);
 	priv->show_value = show;
 }
 
 gdouble
 gnt_progress_bar_get_fraction (GntProgressBar *pbar)
 {
-	GntProgressBarPrivate *priv = GNT_PROGRESS_BAR_GET_PRIVATE (pbar);
+	GntProgressBarPrivate *priv =
+			gnt_progress_bar_get_instance_private (pbar);
 	return priv->fraction;
 }
 
 GntProgressBarOrientation
 gnt_progress_bar_get_orientation (GntProgressBar *pbar)
 {
-	GntProgressBarPrivate *priv = GNT_PROGRESS_BAR_GET_PRIVATE (pbar);
+	GntProgressBarPrivate *priv =
+			gnt_progress_bar_get_instance_private (pbar);
 	return priv->orientation;
 }
 
 gboolean
 gnt_progress_bar_get_show_progress (GntProgressBar *pbar)
 {
-	GntProgressBarPrivate *priv = GNT_PROGRESS_BAR_GET_PRIVATE (pbar);
+	GntProgressBarPrivate *priv =
+			gnt_progress_bar_get_instance_private (pbar);
 	return priv->show_value;
 }