diff options
| author | Robert Tari <robert@tari.in> | 2020-09-06 00:33:33 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-09-08 15:24:47 +0200 |
| commit | 7922e0d8cf83d6be01af1777b33089732344b672 (patch) | |
| tree | 4c931ae18b832d4c439aba9363ae8576d9b6cf97 /src/indicator-printers-menu.c | |
| parent | 9b28b85284abd8de9dabb8adb9cd74eda065bc79 (diff) | |
| download | ayatana-indicator-printers-7922e0d8cf83d6be01af1777b33089732344b672.tar.gz ayatana-indicator-printers-7922e0d8cf83d6be01af1777b33089732344b672.tar.bz2 ayatana-indicator-printers-7922e0d8cf83d6be01af1777b33089732344b672.zip | |
Fix deprecations and build warnings
Fixes AyatanaIndicators/ayatana-indicator-printers#3.
Diffstat (limited to 'src/indicator-printers-menu.c')
| -rw-r--r-- | src/indicator-printers-menu.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/indicator-printers-menu.c b/src/indicator-printers-menu.c index 69394df..54ea281 100644 --- a/src/indicator-printers-menu.c +++ b/src/indicator-printers-menu.c @@ -24,10 +24,6 @@ #include "spawn-printer-settings.h" - -G_DEFINE_TYPE (IndicatorPrintersMenu, indicator_printers_menu, G_TYPE_OBJECT) - - struct _IndicatorPrintersMenuPrivate { DbusmenuMenuitem *root; @@ -35,6 +31,7 @@ struct _IndicatorPrintersMenuPrivate CupsNotifier *cups_notifier; }; +G_DEFINE_TYPE_WITH_PRIVATE(IndicatorPrintersMenu, indicator_printers_menu, G_TYPE_OBJECT) enum { PROP_0, @@ -107,8 +104,6 @@ indicator_printers_menu_class_init (IndicatorPrintersMenuClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (IndicatorPrintersMenuPrivate)); - object_class->dispose = dispose; object_class->get_property = get_property; object_class->set_property = set_property; @@ -276,9 +271,7 @@ on_printer_state_changed (CupsNotifier *object, static void indicator_printers_menu_init (IndicatorPrintersMenu *self) { - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, - INDICATOR_TYPE_PRINTERS_MENU, - IndicatorPrintersMenuPrivate); + self->priv = indicator_printers_menu_get_instance_private(self); self->priv->root = dbusmenu_menuitem_new (); dbusmenu_menuitem_property_set_bool (self->priv->root, "visible", FALSE); |