[krb5-auth-dialog: 8/14] plugin-loader: Use G_DEFINE_TYPE_WITH_PRIVATE

[Guido Günther <guidog src gnome org>]

commit 047ddaffd973a741d05f8ff21d5929835fbbb15d
Author: Guido Günther <agx sigxcpu org>
Date:   Mon Jan 4 18:54:46 2021 +0100

    plugin-loader: Use G_DEFINE_TYPE_WITH_PRIVATE
    
    Gets rid of more deprecations

 src/ka-plugin-loader.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/src/ka-plugin-loader.c b/src/ka-plugin-loader.c
index ebc3791..e02a443 100644
--- a/src/ka-plugin-loader.c
+++ b/src/ka-plugin-loader.c
@@ -22,10 +22,7 @@
 
 #include <gmodule.h>
 
-G_DEFINE_TYPE (KaPluginLoader, ka_plugin_loader, G_TYPE_OBJECT)
 
-#define GET_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), KA_TYPE_PLUGIN_LOADER, KaPluginLoaderPrivate))
 
 typedef struct _KaPluginLoaderPrivate KaPluginLoaderPrivate;
 
@@ -34,6 +31,8 @@ struct _KaPluginLoaderPrivate {
        GSList *active_plugins;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (KaPluginLoader, ka_plugin_loader, G_TYPE_OBJECT)
+
 
 static KaPlugin*
 load_plugin (const char *path)
@@ -94,7 +93,7 @@ static void
 load_plugins (KaPluginLoader *self)
 {
        int i;
-       KaPluginLoaderPrivate *priv = GET_PRIVATE (self);
+       KaPluginLoaderPrivate *priv = ka_plugin_loader_get_instance_private (self);
        GSettings *settings;
        char **plugins = NULL;
 
@@ -151,7 +150,7 @@ static void
 ka_plugin_loader_dispose(GObject *object)
 {
        KaPluginLoader *self = KA_PLUGIN_LOADER(object);
-       KaPluginLoaderPrivate *priv = GET_PRIVATE (self);
+       KaPluginLoaderPrivate *priv = ka_plugin_loader_get_instance_private (self);
        GObjectClass *parent_class = G_OBJECT_CLASS (ka_plugin_loader_parent_class);
 
        /* We need to do this before dropping the ref on applet */
@@ -172,14 +171,14 @@ ka_plugin_loader_class_init (KaPluginLoaderClass *klass)
        GObjectClass *object_class = G_OBJECT_CLASS(klass);
 
        object_class->dispose = ka_plugin_loader_dispose;
-       g_type_class_add_private (klass, sizeof (KaPluginLoaderPrivate));
 }
 
 
 static void
 ka_plugin_loader_init (KaPluginLoader *self)
 {
-       KaPluginLoaderPrivate *priv = GET_PRIVATE (self);
+       KaPluginLoaderPrivate *priv = ka_plugin_loader_get_instance_private (self);
+
        priv->active_plugins = NULL;
 }
 
@@ -198,7 +197,7 @@ ka_plugin_loader_create (KaApplet* applet)
        KaPluginLoaderPrivate *priv;
 
        loader = ka_plugin_loader_new();
-       priv = GET_PRIVATE (loader);
+       priv = ka_plugin_loader_get_instance_private (loader);
        priv->applet = applet;
        load_plugins (loader);