From 7922e0d8cf83d6be01af1777b33089732344b672 Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Sun, 6 Sep 2020 00:33:33 +0200
Subject: Fix deprecations and build warnings

Fixes AyatanaIndicators/ayatana-indicator-printers#3.
---
 src/indicator-printers.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'src/indicator-printers.c')

diff --git a/src/indicator-printers.c b/src/indicator-printers.c
index c52fdaa..ba263c9 100644
--- a/src/indicator-printers.c
+++ b/src/indicator-printers.c
@@ -36,16 +36,13 @@
 INDICATOR_SET_VERSION
 INDICATOR_SET_TYPE(INDICATOR_PRINTERS_TYPE)
 
-
-G_DEFINE_TYPE (IndicatorPrinters, indicator_printers, INDICATOR_OBJECT_TYPE)
-
-
 struct _IndicatorPrintersPrivate
 {
     IndicatorObjectEntry entry;
     guint name_watch;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE(IndicatorPrinters, indicator_printers, INDICATOR_OBJECT_TYPE)
 
 static void
 dispose (GObject *object)
@@ -75,8 +72,6 @@ indicator_printers_class_init (IndicatorPrintersClass *klass)
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
     IndicatorObjectClass *io_class = INDICATOR_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (klass, sizeof (IndicatorPrintersPrivate));
-
     object_class->dispose = dispose;
 
     io_class->get_entries = get_entries;
@@ -270,9 +265,7 @@ indicator_printers_init (IndicatorPrinters *self)
     DbusmenuClient *client;
     GtkImage *image;
 
-    priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-                                        INDICATOR_PRINTERS_TYPE,
-                                        IndicatorPrintersPrivate);
+    priv = indicator_printers_get_instance_private(self);
     self->priv = priv;
 
     priv->name_watch = g_bus_watch_name(G_BUS_TYPE_SESSION,
-- 
cgit v1.2.3