From af51c51636eb0ca318e62d4c712f2ba3e60ed9b0 Mon Sep 17 00:00:00 2001
From: Martin Kutlak <mkutlak@redhat.com>
Date: Tue, 28 Aug 2018 10:26:47 +0200
Subject: [PATCH] gui: Replace deprecated g_type_class_add_private
g_type_class_add_private will be deprecated in Glib 2.58 [1].
There is a G_DEFINE_TYPE_WITH_PRIVATE macro that can replace
the deprecated function and it is backwards compatible [2].
[1] blog.gtk.org/2018/07/11/news-from-glib-2-58
[2] bassi.io/articles/2013/06/21/the-king-is-dead
Signed-off-by: Martin Kutlak <mkutlak@redhat.com>
---
src/configuration-gui/abrt-config-widget.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/configuration-gui/abrt-config-widget.c b/src/configuration-gui/abrt-config-widget.c
index 62910db6..aa3b5c01 100644
--- a/src/configuration-gui/abrt-config-widget.c
+++ b/src/configuration-gui/abrt-config-widget.c
@@ -27,9 +27,6 @@
#include "libabrt.h"
#include <assert.h>
-#define ABRT_CONFIG_WIDGET_GET_PRIVATE(o) \
- (G_TYPE_INSTANCE_GET_PRIVATE((o), TYPE_ABRT_CONFIG_WIDGET, AbrtConfigWidgetPrivate))
-
#define WID(s) GTK_WIDGET(gtk_builder_get_object(self->priv->builder, s))
#define UI_FILE_NAME "abrt-config-widget.glade"
@@ -107,7 +104,7 @@ struct AbrtConfigWidgetPrivate {
AbrtConfigWidgetOption options[_ABRT_OPT_END_];
};
-G_DEFINE_TYPE(AbrtConfigWidget, abrt_config_widget, GTK_TYPE_BOX)
+G_DEFINE_TYPE_WITH_PRIVATE(AbrtConfigWidget, abrt_config_widget, GTK_TYPE_BOX)
enum {
SN_CHANGED,
@@ -214,8 +211,6 @@ abrt_config_widget_class_init(AbrtConfigWidgetClass *klass)
object_class->finalize = abrt_config_widget_finalize;
- g_type_class_add_private(klass, sizeof(AbrtConfigWidgetPrivate));
-
s_signals[SN_CHANGED] = g_signal_new ("changed",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
@@ -413,7 +408,7 @@ abrt_config_widget_init(AbrtConfigWidget *self)
{
GError *error = NULL;
- self->priv = ABRT_CONFIG_WIDGET_GET_PRIVATE(self);
+ self->priv = abrt_config_widget_get_instance_private(self);
self->priv->builder = gtk_builder_new();
gtk_builder_set_translation_domain(self->priv->builder, GETTEXT_PACKAGE);
--
2.19.0