[krb5-auth-dialog: 13/14] plugins: Drop g_type_class_add_private

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

commit 1a1cd49ed1c8ba892cdaf2ae4af58b1ab973849b
Author: Guido Günther <agx sigxcpu org>
Date:   Tue Jan 5 20:57:15 2021 +0100

    plugins: Drop g_type_class_add_private
    
    This fixes the remaining deprecations

 plugins/ka-plugin-afs.c       | 18 ++++++------------
 plugins/ka-plugin-dummy.c     | 18 ++++++------------
 plugins/ka-plugin-gnomelock.c | 20 ++++++++------------
 plugins/ka-plugin-pam.c       | 19 +++++++------------
 4 files changed, 27 insertions(+), 48 deletions(-)
---
diff --git a/plugins/ka-plugin-afs.c b/plugins/ka-plugin-afs.c
index f163281..ab3af7f 100644
--- a/plugins/ka-plugin-afs.c
+++ b/plugins/ka-plugin-afs.c
@@ -18,10 +18,6 @@
 #include "ka-plugin-afs.h"
 #include <gmodule.h>
 
-G_DEFINE_TYPE (KaPluginAfs, ka_plugin_afs, KA_TYPE_PLUGIN)
-#define GET_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), KA_TYPE_PLUGIN_AFS, KaPluginAfsPrivate))
-
 int ka_plugin_major_version = KA_PLUGIN_MAJOR_VERSION;
 int ka_plugin_minor_version = KA_PLUGIN_MINOR_VERSION;
 
@@ -31,11 +27,11 @@ ka_plugin_create (void)
     return KA_PLUGIN (ka_plugin_afs_new ());
 }
 
-typedef struct _KaPluginAfsPrivate KaPluginAfsPrivate;
-
-struct _KaPluginAfsPrivate {
+typedef struct _KaPluginAfsPrivate {
     gulong handlers[2];
-};
+} KaPluginAfsPrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE (KaPluginAfs, ka_plugin_afs, KA_TYPE_PLUGIN)
 
 static void
 event_cb (gpointer *applet, gchar *princ, guint when, gpointer user_data G_GNUC_UNUSED)
@@ -68,7 +64,7 @@ ka_plugin_afs_finalize (GObject *object)
 static void
 ka_plugin_afs_activate (KaPlugin *self, KaApplet *applet)
 {
-    KaPluginAfsPrivate *priv = GET_PRIVATE (self);
+    KaPluginAfsPrivate *priv = ka_plugin_afs_get_instance_private (KA_PLUGIN_AFS (self));
 
     priv->handlers[0] = g_signal_connect (applet,
                                           "krb-tgt-acquired",
@@ -82,7 +78,7 @@ static void
 ka_plugin_afs_deactivate (KaPlugin *self, KaApplet *applet)
 {
     int i;
-    KaPluginAfsPrivate *priv = GET_PRIVATE (self);
+    KaPluginAfsPrivate *priv = ka_plugin_afs_get_instance_private (KA_PLUGIN_AFS (self));
 
     for (i = 0; i < G_N_ELEMENTS (priv->handlers); i++)
         g_signal_handler_disconnect (applet, priv->handlers[i]);
@@ -94,8 +90,6 @@ ka_plugin_afs_class_init (KaPluginAfsClass *klass)
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
     KaPluginClass *plugin_class = KA_PLUGIN_CLASS (klass);
 
-    g_type_class_add_private (klass, sizeof (KaPluginAfsPrivate));
-
     plugin_class->activate = ka_plugin_afs_activate;
     plugin_class->deactivate = ka_plugin_afs_deactivate;
     object_class->finalize = ka_plugin_afs_finalize;
diff --git a/plugins/ka-plugin-dummy.c b/plugins/ka-plugin-dummy.c
index c7770db..45a066c 100644
--- a/plugins/ka-plugin-dummy.c
+++ b/plugins/ka-plugin-dummy.c
@@ -18,10 +18,6 @@
 #include "ka-plugin-dummy.h"
 #include <gmodule.h>
 
-G_DEFINE_TYPE (KaPluginDummy, ka_plugin_dummy, KA_TYPE_PLUGIN)
-#define GET_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), KA_TYPE_PLUGIN_DUMMY, KaPluginDummyPrivate))
-
 int ka_plugin_major_version = KA_PLUGIN_MAJOR_VERSION;
 int ka_plugin_minor_version = KA_PLUGIN_MINOR_VERSION;
 
@@ -31,11 +27,11 @@ ka_plugin_create (void)
     return KA_PLUGIN (ka_plugin_dummy_new ());
 }
 
-typedef struct _KaPluginDummyPrivate KaPluginDummyPrivate;
-
-struct _KaPluginDummyPrivate {
+typedef struct _KaPluginDummyPrivate {
     gulong handlers[3];
-};
+} KaPluginDummyPrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE (KaPluginDummy, ka_plugin_dummy, KA_TYPE_PLUGIN)
 
 static void
 event_cb (gpointer *applet, gchar *princ, guint when, gpointer user_data)
@@ -52,7 +48,7 @@ ka_plugin_dummy_finalize (GObject *object)
 static void
 ka_plugin_dummy_activate (KaPlugin *self, KaApplet *applet)
 {
-    KaPluginDummyPrivate *priv = GET_PRIVATE (self);
+    KaPluginDummyPrivate *priv = ka_plugin_dummy_get_instance_private (KA_PLUGIN_DUMMY (self));
 
     priv->handlers[0] = g_signal_connect (applet,
                                           "krb-tgt-expired",
@@ -69,7 +65,7 @@ static void
 ka_plugin_dummy_deactivate (KaPlugin *self, KaApplet *applet)
 {
     int i;
-    KaPluginDummyPrivate *priv = GET_PRIVATE (self);
+    KaPluginDummyPrivate *priv = ka_plugin_dummy_get_instance_private (KA_PLUGIN_DUMMY (self));
 
     for (i = 0; i < G_N_ELEMENTS (priv->handlers); i++)
         g_signal_handler_disconnect (applet, priv->handlers[i]);
@@ -81,8 +77,6 @@ ka_plugin_dummy_class_init (KaPluginDummyClass *klass)
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
     KaPluginClass *plugin_class = KA_PLUGIN_CLASS (klass);
 
-    g_type_class_add_private (klass, sizeof (KaPluginDummyPrivate));
-
     plugin_class->activate = ka_plugin_dummy_activate;
     plugin_class->deactivate = ka_plugin_dummy_deactivate;
     object_class->finalize = ka_plugin_dummy_finalize;
diff --git a/plugins/ka-plugin-gnomelock.c b/plugins/ka-plugin-gnomelock.c
index 1c61cc1..78c2ecb 100644
--- a/plugins/ka-plugin-gnomelock.c
+++ b/plugins/ka-plugin-gnomelock.c
@@ -20,10 +20,6 @@
 #include <gmodule.h>
 #include <gio/gio.h>
 
-G_DEFINE_TYPE (KaPluginGnomeLock, ka_plugin_gnomelock, KA_TYPE_PLUGIN)
-#define GET_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), KA_TYPE_PLUGIN_GNOMELOCK, KaPluginGnomeLockPrivate))
-
 int ka_plugin_major_version = KA_PLUGIN_MAJOR_VERSION;
 int ka_plugin_minor_version = KA_PLUGIN_MINOR_VERSION;
 
@@ -33,11 +29,11 @@ ka_plugin_create (void)
     return KA_PLUGIN (ka_plugin_gnomelock_new ());
 }
 
-typedef struct _KaPluginGnomeLockPrivate KaPluginGnomeLockPrivate;
-
-struct _KaPluginGnomeLockPrivate {
+typedef struct _KaPluginGnomeLockPrivate {
     gulong handler;
-};
+} KaPluginGnomeLockPrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE (KaPluginGnomeLock, ka_plugin_gnomelock, KA_TYPE_PLUGIN)
 
 static void
 event_cb (gpointer *applet, gchar *princ, guint when, gpointer user_data)
@@ -88,7 +84,8 @@ ka_plugin_gnomelock_finalize (GObject *object)
 static void
 ka_plugin_gnomelock_activate (KaPlugin *self, KaApplet *applet)
 {
-    KaPluginGnomeLockPrivate *priv = GET_PRIVATE (self);
+    KaPluginGnomeLockPrivate *priv =
+        ka_plugin_gnomelock_get_instance_private (KA_PLUGIN_GNOMELOCK (self));
 
     priv->handler = g_signal_connect (applet,
                                           "krb-tgt-expired",
@@ -99,7 +96,8 @@ static void
 ka_plugin_gnomelock_deactivate (KaPlugin *self, KaApplet *applet)
 {
     int i;
-    KaPluginGnomeLockPrivate *priv = GET_PRIVATE (self);
+    KaPluginGnomeLockPrivate *priv =
+        ka_plugin_gnomelock_get_instance_private (KA_PLUGIN_GNOMELOCK (self));
 
     g_signal_handler_disconnect (applet, priv->handler);
 }
@@ -110,8 +108,6 @@ ka_plugin_gnomelock_class_init (KaPluginGnomeLockClass *klass)
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
     KaPluginClass *plugin_class = KA_PLUGIN_CLASS (klass);
 
-    g_type_class_add_private (klass, sizeof (KaPluginGnomeLockPrivate));
-
     plugin_class->activate = ka_plugin_gnomelock_activate;
     plugin_class->deactivate = ka_plugin_gnomelock_deactivate;
     object_class->finalize = ka_plugin_gnomelock_finalize;
diff --git a/plugins/ka-plugin-pam.c b/plugins/ka-plugin-pam.c
index d1e8b70..8032d79 100644
--- a/plugins/ka-plugin-pam.c
+++ b/plugins/ka-plugin-pam.c
@@ -20,12 +20,6 @@
 
 #include <security/pam_appl.h>
 
-G_DEFINE_TYPE (KaPluginPam, ka_plugin_pam, KA_TYPE_PLUGIN)
-#define GET_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), KA_TYPE_PLUGIN_PAM, KaPluginPamPrivate))
-
-typedef struct _KaPluginPamPrivate KaPluginPamPrivate;
-
 int ka_plugin_major_version = KA_PLUGIN_MAJOR_VERSION;
 int ka_plugin_minor_version = KA_PLUGIN_MINOR_VERSION;
 
@@ -35,9 +29,12 @@ ka_plugin_create (void)
     return KA_PLUGIN (ka_plugin_pam_new ());
 }
 
-struct _KaPluginPamPrivate {
+typedef struct _KaPluginPamPrivate {
     gulong handlers[2];
-};
+} KaPluginPamPrivate;
+
+G_DEFINE_TYPE (KaPluginPam, ka_plugin_pam, KA_TYPE_PLUGIN)
+
 
 static void
 ka_plugin_pam_finalize (GObject *object)
@@ -82,7 +79,7 @@ out:
 static void
 ka_plugin_pam_activate (KaPlugin *self, KaApplet *applet)
 {
-    KaPluginPamPrivate *priv = GET_PRIVATE (self);
+    KaPluginPamPrivate *priv = ka_plugin_pam_get_instance_private (KA_PLUGIN_PAM (self));
 
     priv->handlers[1] = g_signal_connect (applet,
                                           "krb-tgt-acquired",
@@ -96,7 +93,7 @@ ka_plugin_pam_activate (KaPlugin *self, KaApplet *applet)
 static void
 ka_plugin_pam_deactivate (KaPlugin *self, KaApplet *applet)
 {
-    KaPluginPamPrivate *priv = GET_PRIVATE (self);
+    KaPluginPamPrivate *priv = ka_plugin_pam_get_instance_private (KA_PLUGIN_PAM (self));
 
     g_signal_handler_disconnect (applet, priv->handlers[0]);
     g_signal_handler_disconnect (applet, priv->handlers[1]);
@@ -108,8 +105,6 @@ ka_plugin_pam_class_init (KaPluginPamClass *klass)
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
     KaPluginClass *plugin_class = KA_PLUGIN_CLASS (klass);
 
-    g_type_class_add_private (klass, sizeof (KaPluginPamPrivate));
-
     plugin_class->activate = ka_plugin_pam_activate;
     plugin_class->deactivate = ka_plugin_pam_deactivate;
     object_class->finalize = ka_plugin_pam_finalize;