diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-09-08 15:25:57 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-09-08 15:25:57 +0200 |
| commit | a2f16e793b27769a133acd4a06c6ce86533f06fb (patch) | |
| tree | 4c931ae18b832d4c439aba9363ae8576d9b6cf97 /src/indicator-printers.c | |
| parent | 5859961e3b61fa2ca7fa17ca34f6f60b3921fcaa (diff) | |
| parent | 7922e0d8cf83d6be01af1777b33089732344b672 (diff) | |
| download | ayatana-indicator-printers-a2f16e793b27769a133acd4a06c6ce86533f06fb.tar.gz ayatana-indicator-printers-a2f16e793b27769a133acd4a06c6ce86533f06fb.tar.bz2 ayatana-indicator-printers-a2f16e793b27769a133acd4a06c6ce86533f06fb.zip | |
Merge branch 'tari01-pr/warnings-deprecations'
Attributes GH PR #7: https://github.com/AyatanaIndicators/ayatana-indicator-printers/pull/7
Diffstat (limited to 'src/indicator-printers.c')
| -rw-r--r-- | src/indicator-printers.c | 11 |
1 files changed, 2 insertions, 9 deletions
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, |